From cdedea2762e16d377c473e2c084eb55b574911b0 Mon Sep 17 00:00:00 2001 From: Akshat Kale Date: Tue, 26 Jan 2021 13:03:19 -0800 Subject: [PATCH 1/5] Support for ResetConnection for VNG and VPN Link connections --- .../VirtualNetworkGatewayConnectionReset.json | 12 ++++ .../examples/VpnSiteLinkConnectionReset.json | 14 ++++ .../2020-08-01/virtualNetworkGateway.json | 54 +++++++++++++++ .../stable/2020-08-01/virtualWan.json | 65 +++++++++++++++++++ 4 files changed, 145 insertions(+) create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VirtualNetworkGatewayConnectionReset.json create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VpnSiteLinkConnectionReset.json diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VirtualNetworkGatewayConnectionReset.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VirtualNetworkGatewayConnectionReset.json new file mode 100644 index 000000000000..5c1fdd18d31e --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VirtualNetworkGatewayConnectionReset.json @@ -0,0 +1,12 @@ +{ + "parameters": { + "api-version": "2020-08-01", + "subscriptionId": "subid", + "resourceGroupName": "rg1", + "virtualNetworkGatewayConnectionName": "conn1" + }, + "responses": { + "202": {}, + "200": {} + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VpnSiteLinkConnectionReset.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VpnSiteLinkConnectionReset.json new file mode 100644 index 000000000000..d3e9c83bb20a --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VpnSiteLinkConnectionReset.json @@ -0,0 +1,14 @@ +{ + "parameters": { + "api-version": "2020-08-01", + "subscriptionId": "subid", + "resourceGroupName": "rg1", + "gatewayName": "gateway1", + "connectionName": "vpnConnection1", + "linkConnectionName": "Connection-Link1" + }, + "responses": { + "202": {}, + "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 1a0684f3f1e5..f911fc2004a0 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 @@ -1882,6 +1882,60 @@ } } }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/connections/{virtualNetworkGatewayConnectionName}/resetconnection": { + "post": { + "tags": [ + "VirtualNetworkGatewayConnections" + ], + "operationId": "VirtualNetworkGatewayConnections_ResetConnection", + "description": "Resets the virtual network gateway connection specified.", + "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 resetconnection completed on virtual network gateway connection." + }, + "default": { + "description": "The operation resetconnection could not be completed.", + "schema": { + "$ref": "./networkWatcher.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "GetVirtualNetworkGatewayConnectionIkeSa": { + "$ref": "./examples/VirtualNetworkGatewayConnectionReset.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": [ diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualWan.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualWan.json index 10ab477b505f..1f48de2b9d26 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualWan.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualWan.json @@ -2094,6 +2094,71 @@ } } }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnGateways/{gatewayName}/vpnConnections/{connectionName}/vpnLinkConnections/{linkConnectionName}/resetconnection": { + "post": { + "tags": [ + "vpnLinkConnections" + ], + "operationId": "VpnLinkConnections_ResetConnection", + "description": "Resets the VpnLink connection specified.", + "parameters": [ + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + }, + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group." + }, + { + "name": "gatewayName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the gateway." + }, + { + "name": "connectionName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the vpn connection." + }, + { + "name": "linkConnectionName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the vpn link connection." + }, + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "202": { + "description": "Accepted and the operation ResetConnection will complete asynchronously." + }, + "default": { + "description": "The operation ResetConnection could not be completed.", + "schema": { + "$ref": "./networkWatcher.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "GetVpnLinkConnectionIkeSa": { + "$ref": "./examples/VpnSiteLinkConnectionReset.json" + } + }, + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "location" + } + } + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnGateways": { "get": { "operationId": "VpnGateways_ListByResourceGroup", From 9c4ac24cdb609a48e0df9b3c8428c58bd803541c Mon Sep 17 00:00:00 2001 From: Akshat Kale Date: Wed, 27 Jan 2021 10:00:02 -0800 Subject: [PATCH 2/5] Remove 200 response --- .../examples/VirtualNetworkGatewayConnectionReset.json | 3 +-- .../stable/2020-08-01/examples/VpnSiteLinkConnectionReset.json | 3 +-- .../stable/2020-08-01/virtualNetworkGateway.json | 3 --- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VirtualNetworkGatewayConnectionReset.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VirtualNetworkGatewayConnectionReset.json index 5c1fdd18d31e..19ffd4897503 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VirtualNetworkGatewayConnectionReset.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VirtualNetworkGatewayConnectionReset.json @@ -6,7 +6,6 @@ "virtualNetworkGatewayConnectionName": "conn1" }, "responses": { - "202": {}, - "200": {} + "202": {} } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VpnSiteLinkConnectionReset.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VpnSiteLinkConnectionReset.json index d3e9c83bb20a..cd4eb760d2bf 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VpnSiteLinkConnectionReset.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VpnSiteLinkConnectionReset.json @@ -8,7 +8,6 @@ "linkConnectionName": "Connection-Link1" }, "responses": { - "202": {}, - "200": {} + "202": {} } } 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 f911fc2004a0..95252f633a10 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 @@ -1915,9 +1915,6 @@ "202": { "description": "Accepted and the operation will complete asynchronously." }, - "200": { - "description": "Request successful. The operation resetconnection completed on virtual network gateway connection." - }, "default": { "description": "The operation resetconnection could not be completed.", "schema": { From 9d43e1e66b21395a7ea29dbd23b18fb06fd61862 Mon Sep 17 00:00:00 2001 From: Akshat Kale Date: Wed, 27 Jan 2021 13:54:53 -0800 Subject: [PATCH 3/5] Fix Example name --- .../stable/2020-08-01/virtualNetworkGateway.json | 2 +- .../Microsoft.Network/stable/2020-08-01/virtualWan.json | 2 +- 2 files 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 95252f633a10..376cfa000b52 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 @@ -1923,7 +1923,7 @@ } }, "x-ms-examples": { - "GetVirtualNetworkGatewayConnectionIkeSa": { + "ResetVirtualNetworkGatewayConnection": { "$ref": "./examples/VirtualNetworkGatewayConnectionReset.json" } }, diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualWan.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualWan.json index 1f48de2b9d26..194387e2f695 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualWan.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualWan.json @@ -2149,7 +2149,7 @@ } }, "x-ms-examples": { - "GetVpnLinkConnectionIkeSa": { + "ResetVpnLinkConnection": { "$ref": "./examples/VpnSiteLinkConnectionReset.json" } }, From a0aecfcc422f0276b08a88168d9c61dcff2857e9 Mon Sep 17 00:00:00 2001 From: Akshat Kale Date: Thu, 28 Jan 2021 12:07:37 -0800 Subject: [PATCH 4/5] Add resetconnection to custom-words.txt --- custom-words.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/custom-words.txt b/custom-words.txt index 6375ed01acf9..6fa5ea5fd616 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -1453,6 +1453,7 @@ Reregister Rescan reservationorders resetapikey +resetconnection resetvpnclientsharedkey Resolvability resourcegraph From 30d369607e0f5a3e773a5024e5ae6d2fc8c805bf Mon Sep 17 00:00:00 2001 From: Akshat Kale Date: Thu, 28 Jan 2021 12:48:43 -0800 Subject: [PATCH 5/5] Prettify files --- .../VirtualNetworkGatewayConnectionReset.json | 18 +++++++-------- .../examples/VpnSiteLinkConnectionReset.json | 22 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VirtualNetworkGatewayConnectionReset.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VirtualNetworkGatewayConnectionReset.json index 19ffd4897503..accebce62715 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VirtualNetworkGatewayConnectionReset.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VirtualNetworkGatewayConnectionReset.json @@ -1,11 +1,11 @@ { - "parameters": { - "api-version": "2020-08-01", - "subscriptionId": "subid", - "resourceGroupName": "rg1", - "virtualNetworkGatewayConnectionName": "conn1" - }, - "responses": { - "202": {} - } + "parameters": { + "api-version": "2020-08-01", + "subscriptionId": "subid", + "resourceGroupName": "rg1", + "virtualNetworkGatewayConnectionName": "conn1" + }, + "responses": { + "202": {} + } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VpnSiteLinkConnectionReset.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VpnSiteLinkConnectionReset.json index cd4eb760d2bf..1a1571a85599 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VpnSiteLinkConnectionReset.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VpnSiteLinkConnectionReset.json @@ -1,13 +1,13 @@ { - "parameters": { - "api-version": "2020-08-01", - "subscriptionId": "subid", - "resourceGroupName": "rg1", - "gatewayName": "gateway1", - "connectionName": "vpnConnection1", - "linkConnectionName": "Connection-Link1" - }, - "responses": { - "202": {} - } + "parameters": { + "api-version": "2020-08-01", + "subscriptionId": "subid", + "resourceGroupName": "rg1", + "gatewayName": "gateway1", + "connectionName": "vpnConnection1", + "linkConnectionName": "Connection-Link1" + }, + "responses": { + "202": {} + } }