From 3001750ef6116d68ce465cafb68c0ee0e94d1af1 Mon Sep 17 00:00:00 2001 From: Abhishek Shah Date: Mon, 28 Dec 2020 06:41:08 -0800 Subject: [PATCH] [Fix] GetIkeSas returns result as string (#12225) * Removing IkeSaParameters * Update custom-words.txt * Update virtualNetworkGateway.json * Update virtualNetworkGateway.json * Update VirtualNetworkGatewayConnectionGetIkeSas.json * Update virtualNetworkGateway.json * Update VirtualNetworkGatewayConnectionGetIkeSas.json Co-authored-by: Abhishek Shah --- custom-words.txt | 1 - ...tualNetworkGatewayConnectionGetIkeSas.json | 2 +- .../2020-08-01/virtualNetworkGateway.json | 142 +----------------- 3 files changed, 4 insertions(+), 141 deletions(-) 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 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..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": { - "azure-async-operation": "/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/westus/operations/{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": { 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..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 @@ -1861,7 +1861,7 @@ "200": { "description": "Request successful. The operation getikesas completed on virtual network gateway connection.", "schema": { - "$ref": "#/definitions/IkeSaParameters" + "type": "string" } }, "default": { @@ -1872,13 +1872,13 @@ } }, "x-ms-examples": { - "List IKE Security Associations for virtual network gateway connection": { + "GetVirtualNetworkGatewayConnectionIkeSa": { "$ref": "./examples/VirtualNetworkGatewayConnectionGetIkeSas.json" } }, "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": {