From b259e2685f594e5a2c7ee836b2b6ebdc1d7d9e25 Mon Sep 17 00:00:00 2001 From: Abhishek Shah Date: Thu, 5 Nov 2020 18:44:31 -0800 Subject: [PATCH 01/12] Support to List IKE SAs on VNG Connection --- ...ualNetworkGatewayConnectionListIkeSas.json | 14 ++ .../2020-08-01/virtualNetworkGateway.json | 207 ++++++++++++++++++ 2 files changed, 221 insertions(+) create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VirtualNetworkGatewayConnectionListIkeSas.json diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VirtualNetworkGatewayConnectionListIkeSas.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VirtualNetworkGatewayConnectionListIkeSas.json new file mode 100644 index 000000000000..447b786f9c10 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VirtualNetworkGatewayConnectionListIkeSas.json @@ -0,0 +1,14 @@ +{ + "parameters": { + "api-version": "2020-08-01", + "subscriptionId": "subid", + "resourceGroupName": "rg1", + "virtualNetworkGatewayConnectionName": "vpngwcn1" + }, + "responses": { + "202": {}, + "200": { + "body": "\"{\"Status\":\"Successful\",\"Data\":null}\"" + } + } +} 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 8af1e2ef3482..ddd044677dba 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 @@ -1825,6 +1825,63 @@ } } }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/connections/{virtualNetworkGatewayConnectionName}/listikesas": { + "post": { + "tags": [ + "VirtualNetworkGatewayConnections" + ], + "operationId": "VirtualNetworkGatewayConnections_ListIkeSas", + "description": "Lists IKE Security Associations for the virtual network gateway connection in the specified resource group.", + "parameters": [ + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group." + }, + { + "name": "virtualNetworkGatewayConnectionName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the virtual network gateway Connection." + }, + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "202": { + "description": "Accepted and the operation will complete asynchronously." + }, + "200": { + "description": "Request successful. The operation listikesas completed on virtual network gateway connection.", + "schema": { + "type": "string" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./network.json#/definitions/Error" + } + } + }, + "x-ms-examples": { + "List IKE Security Associations for virtual network gateway connection": { + "$ref": "./examples/VirtualNetworkGatewayConnectionListIkeSas.json" + } + }, + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "location" + } + } + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/localNetworkGateways/{localNetworkGatewayName}": { "put": { "tags": [ @@ -3212,6 +3269,156 @@ ], "description": "An IPSec parameters for a virtual network gateway P2S connection." }, + "QuickModeSaPropertiesFormat": { + "localEndpoint": { + "type": "string", + "description": "The local endpoint." + }, + "remoteEndpoint": { + "type": "string", + "description": "The remote endpoint." + }, + "encryption": { + "type": "string", + "$ref": "#/definitions/IpsecEncryption", + "description": "The IPSec encryption algorithm (IKE phase 2)." + }, + "integrity": { + "type": "string", + "$ref": "#/definitions/IpsecIntegrity", + "description": "The IPSec integrity algorithm (IKE phase 2)." + }, + "pfsGroupId": { + "type": "string", + "$ref": "#/definitions/PfsGroup", + "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." + } + }, + "MainModeSaPropertiesFormat": { + "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", + "$ref": "#/definitions/IkeEncryption", + "description": "The IKE encryption algorithm (IKE phase 1)." + }, + "integrity": { + "type": "string", + "$ref": "#/definitions/IkeIntegrity", + "description": "The IKE integrity algorithm (IKE phase 1)." + }, + "dhGroup": { + "type": "string", + "$ref": "#/definitions/DhGroup", + "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": { + "type": "array", + "items": { + "$ref": "#/definitions/QuickModeSaPropertiesFormat" + }, + "description": "A list of quick mode security associations" + } + } + }, + "IkeSaParameters": { + "properties": { + "type": "array", + "items": { + "$ref": "#/definitions/MainModeSaPropertiesFormat" + }, + "description": "A list of main mode security associations" + }, + "description": "IKE security association parameters for virtual network gateway connection. Response for ListIkeSas API service call." + }, "LocalNetworkGatewayPropertiesFormat": { "properties": { "localNetworkAddressSpace": { From fac5e9024ae533d08afbd76cc41938fd601d6205 Mon Sep 17 00:00:00 2001 From: Abhishek Shah Date: Fri, 6 Nov 2020 11:24:48 -0800 Subject: [PATCH 02/12] Updating GetIkeSas --- ...n => VirtualNetworkGatewayConnectionGetIkeSas.json} | 0 .../stable/2020-08-01/virtualNetworkGateway.json | 10 +++++----- 2 files changed, 5 insertions(+), 5 deletions(-) rename specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/{VirtualNetworkGatewayConnectionListIkeSas.json => VirtualNetworkGatewayConnectionGetIkeSas.json} (100%) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VirtualNetworkGatewayConnectionListIkeSas.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VirtualNetworkGatewayConnectionGetIkeSas.json similarity index 100% rename from specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VirtualNetworkGatewayConnectionListIkeSas.json rename to specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VirtualNetworkGatewayConnectionGetIkeSas.json 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 ddd044677dba..b4d324a64a50 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 @@ -1825,12 +1825,12 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/connections/{virtualNetworkGatewayConnectionName}/listikesas": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/connections/{virtualNetworkGatewayConnectionName}/getikesas": { "post": { "tags": [ "VirtualNetworkGatewayConnections" ], - "operationId": "VirtualNetworkGatewayConnections_ListIkeSas", + "operationId": "VirtualNetworkGatewayConnections_GetIkeSas", "description": "Lists IKE Security Associations for the virtual network gateway connection in the specified resource group.", "parameters": [ { @@ -1859,7 +1859,7 @@ "description": "Accepted and the operation will complete asynchronously." }, "200": { - "description": "Request successful. The operation listikesas completed on virtual network gateway connection.", + "description": "Request successful. The operation getikesas completed on virtual network gateway connection.", "schema": { "type": "string" } @@ -1873,7 +1873,7 @@ }, "x-ms-examples": { "List IKE Security Associations for virtual network gateway connection": { - "$ref": "./examples/VirtualNetworkGatewayConnectionListIkeSas.json" + "$ref": "./examples/VirtualNetworkGatewayConnectionGetIkeSas.json" } }, "x-ms-long-running-operation": true, @@ -3417,7 +3417,7 @@ }, "description": "A list of main mode security associations" }, - "description": "IKE security association parameters for virtual network gateway connection. Response for ListIkeSas API service call." + "description": "IKE security association parameters for virtual network gateway connection. Response for GetIkeSas API service call." }, "LocalNetworkGatewayPropertiesFormat": { "properties": { From ae93c0d23b4ea7b899b639b0401dba7e79720cf4 Mon Sep 17 00:00:00 2001 From: Abhishek Shah Date: Mon, 9 Nov 2020 16:40:07 -0800 Subject: [PATCH 03/12] Update virtualNetworkGateway.json --- .../stable/2020-08-01/virtualNetworkGateway.json | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) 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 b4d324a64a50..9c9488e637f3 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": { - "type": "string" + "$ref": "#/definitions/IkeSaParameters" } }, "default": { @@ -3280,17 +3280,14 @@ }, "encryption": { "type": "string", - "$ref": "#/definitions/IpsecEncryption", "description": "The IPSec encryption algorithm (IKE phase 2)." }, "integrity": { "type": "string", - "$ref": "#/definitions/IpsecIntegrity", "description": "The IPSec integrity algorithm (IKE phase 2)." }, "pfsGroupId": { "type": "string", - "$ref": "#/definitions/PfsGroup", "description": "The PFS Group" }, "inboundSPI": { @@ -3372,17 +3369,14 @@ }, "encryption": { "type": "string", - "$ref": "#/definitions/IkeEncryption", "description": "The IKE encryption algorithm (IKE phase 1)." }, "integrity": { "type": "string", - "$ref": "#/definitions/IkeIntegrity", "description": "The IKE integrity algorithm (IKE phase 1)." }, "dhGroup": { "type": "string", - "$ref": "#/definitions/DhGroup", "description": "The DH Group." }, "lifeTimeSeconds": { From 21d5f2d5fc109808b6a91abc689f9f414d47e734 Mon Sep 17 00:00:00 2001 From: Abhishek Shah Date: Mon, 30 Nov 2020 15:32:51 -0800 Subject: [PATCH 04/12] Added location headers --- .../examples/VirtualNetworkGatewayConnectionGetIkeSas.json | 6 +++++- .../stable/2020-08-01/virtualNetworkGateway.json | 5 ++++- 2 files changed, 9 insertions(+), 2 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 447b786f9c10..fba1a389c1c5 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 @@ -6,7 +6,11 @@ "virtualNetworkGatewayConnectionName": "vpngwcn1" }, "responses": { - "202": {}, + "202": { + "headers": { + "azure-async-operation": "/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/westus/operations/{operationId}?api-version=2020-08-01" + } + }, "200": { "body": "\"{\"Status\":\"Successful\",\"Data\":null}\"" } 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 9c9488e637f3..8e5d312d96f7 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 @@ -1856,7 +1856,10 @@ ], "responses": { "202": { - "description": "Accepted and the operation will complete asynchronously." + "description": "Accepted and the operation will complete asynchronously.", + "headers": { + "azure-async-operation": "/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{region}/operations/{operationId}?api-version={api-version}" + } }, "200": { "description": "Request successful. The operation getikesas completed on virtual network gateway connection.", From 17fadd5a18148b8d9888544a391d00a67fb03e88 Mon Sep 17 00:00:00 2001 From: Abhishek Shah Date: Tue, 1 Dec 2020 23:38:33 -0800 Subject: [PATCH 05/12] Update virtualNetworkGateway.json --- .../stable/2020-08-01/virtualNetworkGateway.json | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) 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 8e5d312d96f7..c05ca4413159 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 @@ -1856,10 +1856,7 @@ ], "responses": { "202": { - "description": "Accepted and the operation will complete asynchronously.", - "headers": { - "azure-async-operation": "/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{region}/operations/{operationId}?api-version={api-version}" - } + "description": "Accepted and the operation GetIkeSas will complete asynchronously.", }, "200": { "description": "Request successful. The operation getikesas completed on virtual network gateway connection.", @@ -1881,7 +1878,7 @@ }, "x-ms-long-running-operation": true, "x-ms-long-running-operation-options": { - "final-state-via": "location" + "final-state-via": "azure-async-operation" } } }, From 9142ad2156cf43f6fde3d44a8f289ed47ca3c758 Mon Sep 17 00:00:00 2001 From: Abhishek Shah Date: Wed, 2 Dec 2020 11:06:38 -0800 Subject: [PATCH 06/12] Prettier fix --- ...tualNetworkGatewayConnectionGetIkeSas.json | 28 +++++++++---------- .../2020-08-01/virtualNetworkGateway.json | 2 +- 2 files changed, 15 insertions(+), 15 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 fba1a389c1c5..39ec7fa75075 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 @@ -1,18 +1,18 @@ { - "parameters": { - "api-version": "2020-08-01", - "subscriptionId": "subid", - "resourceGroupName": "rg1", - "virtualNetworkGatewayConnectionName": "vpngwcn1" + "parameters": { + "api-version": "2020-08-01", + "subscriptionId": "subid", + "resourceGroupName": "rg1", + "virtualNetworkGatewayConnectionName": "vpngwcn1" + }, + "responses": { + "202": { + "headers": { + "azure-async-operation": "/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/westus/operations/{operationId}?api-version=2020-08-01" + } }, - "responses": { - "202": { - "headers": { - "azure-async-operation": "/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/westus/operations/{operationId}?api-version=2020-08-01" - } - }, - "200": { - "body": "\"{\"Status\":\"Successful\",\"Data\":null}\"" - } + "200": { + "body": "\"{\"Status\":\"Successful\",\"Data\":null}\"" } + } } 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 c05ca4413159..fb4ddfcc632a 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 @@ -1856,7 +1856,7 @@ ], "responses": { "202": { - "description": "Accepted and the operation GetIkeSas will complete asynchronously.", + "description": "Accepted and the operation GetIkeSas will complete asynchronously." }, "200": { "description": "Request successful. The operation getikesas completed on virtual network gateway connection.", From 78eb4d9bbd0803478532043ea2023b516faba884 Mon Sep 17 00:00:00 2001 From: Abhishek Shah Date: Wed, 2 Dec 2020 11:09:21 -0800 Subject: [PATCH 07/12] Update custom-words.txt --- custom-words.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/custom-words.txt b/custom-words.txt index 6b808790e982..d3d3f5246287 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -656,6 +656,7 @@ getcertificate getconsumergroup GETCONTENTSUMMARY GETFILESTATUS +getikesas getissuers getitems getjob From 7c6353f0890b0a0359710380d3566249590ed3d8 Mon Sep 17 00:00:00 2001 From: Abhishek Shah Date: Fri, 4 Dec 2020 11:42:36 -0800 Subject: [PATCH 08/12] Update virtualNetworkGateway.json --- .../2020-08-01/virtualNetworkGateway.json | 270 +++++++++--------- 1 file changed, 131 insertions(+), 139 deletions(-) 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 fb4ddfcc632a..6d861cb61600 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 @@ -3269,147 +3269,139 @@ ], "description": "An IPSec parameters for a virtual network gateway P2S connection." }, - "QuickModeSaPropertiesFormat": { - "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." - } - }, - "MainModeSaPropertiesFormat": { - "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": { - "type": "array", - "items": { - "$ref": "#/definitions/QuickModeSaPropertiesFormat" - }, - "description": "A list of quick mode security associations" - } - } - }, "IkeSaParameters": { "properties": { - "type": "array", - "items": { - "$ref": "#/definitions/MainModeSaPropertiesFormat" - }, - "description": "A list of main mode security associations" + "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." }, From a7cd6f6d7df9ac8eb72cb65690d6f37b49906d89 Mon Sep 17 00:00:00 2001 From: Abhishek Shah Date: Tue, 8 Dec 2020 14:06:50 -0800 Subject: [PATCH 09/12] Update custom-words.txt --- custom-words.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/custom-words.txt b/custom-words.txt index d3d3f5246287..1928ef5b73d2 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -527,6 +527,7 @@ EDMX Einsteinweg Ekaterinburg ekus +elapsedTimeInseconds Eloqua enableautoscale enablelog From 26d8e8058c9ef4f39890d6a148dbe83474259219 Mon Sep 17 00:00:00 2001 From: Abhishek Shah Date: Fri, 11 Dec 2020 01:28:28 -0800 Subject: [PATCH 10/12] Update virtualNetworkGateway.json --- .../stable/2020-08-01/virtualNetworkGateway.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 6d861cb61600..01a7084c05ea 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 @@ -1865,9 +1865,9 @@ } }, "default": { - "description": "Error response describing why the operation failed.", + "description": "The operation GetIkeSas could not be completed.", "schema": { - "$ref": "./network.json#/definitions/Error" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, From d4c07aa507c48623dbb5f711ea6b8c8b879682b5 Mon Sep 17 00:00:00 2001 From: Abhishek Shah Date: Sun, 13 Dec 2020 23:43:34 -0800 Subject: [PATCH 11/12] 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 01a7084c05ea..b77dc10f4815 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 @@ -1867,7 +1867,7 @@ "default": { "description": "The operation GetIkeSas could not be completed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "./networkWatcher.json#/definitions/ErrorResponse" } } }, From a45ab2217e5737c132c20bb66e99c041349fc066 Mon Sep 17 00:00:00 2001 From: Abhishek Shah Date: Mon, 14 Dec 2020 01:16:25 -0800 Subject: [PATCH 12/12] Update virtualNetworkGateway.json --- .../stable/2020-08-01/virtualNetworkGateway.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 b77dc10f4815..26ec483aa81f 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 @@ -3347,17 +3347,17 @@ }, "pfsGroupId": { "type": "string", - "description": "The PFS Group" + "description": "The PFS Group." }, "inboundSPI": { "type": "integer", "format": "int32", - "description": "The Inbound SPI SA" + "description": "The Inbound SPI SA." }, "outboundSPI": { "type": "integer", "format": "int32", - "description": "The Outbound SPI SA" + "description": "The Outbound SPI SA." }, "localTrafficSelectors": { "type": "array", @@ -3397,10 +3397,10 @@ "description": "The time elapsed in seconds." } }, - "description": "A list of quick mode security associations" + "description": "A list of quick mode security associations." } }, - "description": "A list of main 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."