From 5c448463e7d54f57b7c5b582544faca20599b3d8 Mon Sep 17 00:00:00 2001 From: Abhishek Shah Date: Wed, 23 Dec 2020 01:49:02 -0800 Subject: [PATCH 1/7] Removing IkeSaParameters --- ...tualNetworkGatewayConnectionGetIkeSas.json | 2 +- .../2020-08-01/virtualNetworkGateway.json | 140 +----------------- 2 files changed, 3 insertions(+), 139 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VirtualNetworkGatewayConnectionGetIkeSas.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VirtualNetworkGatewayConnectionGetIkeSas.json index 39ec7fa75075..36939cb82437 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VirtualNetworkGatewayConnectionGetIkeSas.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VirtualNetworkGatewayConnectionGetIkeSas.json @@ -8,7 +8,7 @@ "responses": { "202": { "headers": { - "azure-async-operation": "/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/westus/operations/{operationId}?api-version=2020-08-01" + "locations": "/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/westus/operationResults/{operationId}?api-version=2020-08-01" } }, "200": { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualNetworkGateway.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualNetworkGateway.json index 26ec483aa81f..26cfcc719d67 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualNetworkGateway.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualNetworkGateway.json @@ -1861,7 +1861,7 @@ "200": { "description": "Request successful. The operation getikesas completed on virtual network gateway connection.", "schema": { - "$ref": "#/definitions/IkeSaParameters" + "type": "string" } }, "default": { @@ -1878,7 +1878,7 @@ }, "x-ms-long-running-operation": true, "x-ms-long-running-operation-options": { - "final-state-via": "azure-async-operation" + "final-state-via": "location" } } }, @@ -3269,142 +3269,6 @@ ], "description": "An IPSec parameters for a virtual network gateway P2S connection." }, - "IkeSaParameters": { - "properties": { - "mainModeSa": { - "properties": { - "localEndpoint": { - "type": "string", - "description": "The local endpoint." - }, - "remoteEndpoint": { - "type": "string", - "description": "The remote endpoint." - }, - "initiatorCookie": { - "type": "integer", - "format": "int64", - "description": "The initiator cookie." - }, - "responderCookie": { - "type": "integer", - "format": "int64", - "description": "The responder cookie." - }, - "localUdpEncapsulationPort": { - "type": "integer", - "format": "int32", - "description": "The local UDP encapsulation port." - }, - "remoteUdpEncapsulationPort": { - "type": "integer", - "format": "int32", - "description": "The remote UDP encapsulation port." - }, - "encryption": { - "type": "string", - "description": "The IKE encryption algorithm (IKE phase 1)." - }, - "integrity": { - "type": "string", - "description": "The IKE integrity algorithm (IKE phase 1)." - }, - "dhGroup": { - "type": "string", - "description": "The DH Group." - }, - "lifeTimeSeconds": { - "type": "integer", - "format": "int32", - "description": "The MM SA Lifetime in seconds." - }, - "isSaInitiator": { - "type": "boolean", - "description": "Flag to check if SA Initiator or not." - }, - "elapsedTimeInseconds": { - "type": "integer", - "format": "int32", - "description": "The time elapsed in seconds." - }, - "quickModeSa": { - "properties": { - "localEndpoint": { - "type": "string", - "description": "The local endpoint." - }, - "remoteEndpoint": { - "type": "string", - "description": "The remote endpoint." - }, - "encryption": { - "type": "string", - "description": "The IPSec encryption algorithm (IKE phase 2)." - }, - "integrity": { - "type": "string", - "description": "The IPSec integrity algorithm (IKE phase 2)." - }, - "pfsGroupId": { - "type": "string", - "description": "The PFS Group." - }, - "inboundSPI": { - "type": "integer", - "format": "int32", - "description": "The Inbound SPI SA." - }, - "outboundSPI": { - "type": "integer", - "format": "int32", - "description": "The Outbound SPI SA." - }, - "localTrafficSelectors": { - "type": "array", - "items": { - "type": "string" - }, - "description": "The local traffic selectors." - }, - "remoteTrafficSelectors": { - "type": "array", - "items": { - "type": "string" - }, - "description": "The remote traffic selectors." - }, - "lifetimeKilobytes": { - "type": "integer", - "format": "int64", - "minimum": 1024, - "maximum": 102400000, - "description": "The QM SA Lifetime KBytes." - }, - "lifeTimeSeconds": { - "type": "integer", - "format": "int64", - "minimum": 300, - "maximum": 27000, - "description": "The QM SA Lifetime Seconds." - }, - "isSaInitiator": { - "type": "boolean", - "description": "Flag to check if SA Initiator or not." - }, - "elapsedTimeInseconds": { - "type": "integer", - "format": "int32", - "description": "The time elapsed in seconds." - } - }, - "description": "A list of quick mode security associations." - } - }, - "description": "A list of main mode security associations." - } - }, - "description": "IKE security association parameters for virtual network gateway connection. Response for GetIkeSas API service call." - }, "LocalNetworkGatewayPropertiesFormat": { "properties": { "localNetworkAddressSpace": { From fa88e509842eee5ddd5c597f4d95b960d04f5297 Mon Sep 17 00:00:00 2001 From: Abhishek Shah Date: Wed, 23 Dec 2020 01:59:21 -0800 Subject: [PATCH 2/7] Update custom-words.txt --- custom-words.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/custom-words.txt b/custom-words.txt index 8274ec6cf28b..802ba455e93d 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -527,7 +527,6 @@ EDMX Einsteinweg Ekaterinburg ekus -elapsedTimeInseconds Eloqua enableautoscale enablelog From ab7cff03b3a7ab8949f326325d86c16b7892ca73 Mon Sep 17 00:00:00 2001 From: Abhishek Shah Date: Wed, 23 Dec 2020 12:27:23 -0800 Subject: [PATCH 3/7] Update virtualNetworkGateway.json --- .../stable/2020-08-01/virtualNetworkGateway.json | 1 - 1 file changed, 1 deletion(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualNetworkGateway.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualNetworkGateway.json index 26cfcc719d67..21c461bca3f7 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualNetworkGateway.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualNetworkGateway.json @@ -1878,7 +1878,6 @@ }, "x-ms-long-running-operation": true, "x-ms-long-running-operation-options": { - "final-state-via": "location" } } }, From da3dc9381def294470d4c41f124a7ae928e58482 Mon Sep 17 00:00:00 2001 From: Abhishek Shah Date: Wed, 23 Dec 2020 15:09:34 -0800 Subject: [PATCH 4/7] Update virtualNetworkGateway.json --- .../stable/2020-08-01/virtualNetworkGateway.json | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualNetworkGateway.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualNetworkGateway.json index 21c461bca3f7..26cfcc719d67 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualNetworkGateway.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualNetworkGateway.json @@ -1878,6 +1878,7 @@ }, "x-ms-long-running-operation": true, "x-ms-long-running-operation-options": { + "final-state-via": "location" } } }, From 655d40045432957d6b059b996e2e1225786ccef8 Mon Sep 17 00:00:00 2001 From: Abhishek Shah Date: Wed, 23 Dec 2020 15:13:57 -0800 Subject: [PATCH 5/7] Update VirtualNetworkGatewayConnectionGetIkeSas.json --- .../examples/VirtualNetworkGatewayConnectionGetIkeSas.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VirtualNetworkGatewayConnectionGetIkeSas.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VirtualNetworkGatewayConnectionGetIkeSas.json index 36939cb82437..02077820ebe5 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VirtualNetworkGatewayConnectionGetIkeSas.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VirtualNetworkGatewayConnectionGetIkeSas.json @@ -8,7 +8,7 @@ "responses": { "202": { "headers": { - "locations": "/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/westus/operationResults/{operationId}?api-version=2020-08-01" + "location": "/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/westus/operationResults/{operationId}?api-version=2020-08-01" } }, "200": { From 8849e52aca64f5d1b07dab5ad02d28c6122b71e7 Mon Sep 17 00:00:00 2001 From: Abhishek Shah Date: Sun, 27 Dec 2020 18:53:05 -0800 Subject: [PATCH 6/7] Update virtualNetworkGateway.json --- .../stable/2020-08-01/virtualNetworkGateway.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualNetworkGateway.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualNetworkGateway.json index 26cfcc719d67..1a0684f3f1e5 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualNetworkGateway.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualNetworkGateway.json @@ -1872,7 +1872,7 @@ } }, "x-ms-examples": { - "List IKE Security Associations for virtual network gateway connection": { + "GetVirtualNetworkGatewayConnectionIkeSa": { "$ref": "./examples/VirtualNetworkGatewayConnectionGetIkeSas.json" } }, From 0b0d9dc8dfc71520658dc3d1c03cc24589d853a9 Mon Sep 17 00:00:00 2001 From: Abhishek Shah Date: Sun, 27 Dec 2020 19:22:23 -0800 Subject: [PATCH 7/7] Update VirtualNetworkGatewayConnectionGetIkeSas.json --- .../examples/VirtualNetworkGatewayConnectionGetIkeSas.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VirtualNetworkGatewayConnectionGetIkeSas.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VirtualNetworkGatewayConnectionGetIkeSas.json index 02077820ebe5..7a1dace83818 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VirtualNetworkGatewayConnectionGetIkeSas.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VirtualNetworkGatewayConnectionGetIkeSas.json @@ -8,7 +8,7 @@ "responses": { "202": { "headers": { - "location": "/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/westus/operationResults/{operationId}?api-version=2020-08-01" + "location": "https://management.azure.com/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/westus/operationResults/{operationId}?api-version=2020-08-01" } }, "200": {