diff --git a/custom-words.txt b/custom-words.txt index 78acfcea9cd8..f5f1273f1f76 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -1449,6 +1449,7 @@ Reregister Rescan reservationorders resetapikey +resetconnection resetvpnclientsharedkey Resolvability resourcegraph 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..690f82a5b620 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 @@ -2432,11 +2432,11 @@ "readOnly": true, "description": "The IP address allocated by the gateway to which dns requests can be sent." }, - "virtualNetworkExtendedLocationResourceId": { + "vNetExtendedLocationResourceId": { "type": "string", "description": "MAS FIJI customer vnet resource id. VirtualNetworkGateway of type local gateway is associated with the customer vnet." }, - "extendedLocation": { + "virtualNetworkExtendedLocation": { "description": "The extended location of type local virtual network gateway.", "$ref": "./network.json#/definitions/ExtendedLocation" } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/FirewallPolicyGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/FirewallPolicyGet.json index 0041022738f2..ad5694ddbc4a 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/FirewallPolicyGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/FirewallPolicyGet.json @@ -36,12 +36,18 @@ "isEnabled": true, "retentionDays": 100, "logAnalyticsResources": { - "workspaceIds": [ + "workspaces": [ { - "id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace1" + "region": "westus", + "workspaceId": { + "id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace1" + } }, { - "id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace2" + "region": "eastus", + "workspaceId": { + "id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace2" + } } ], "defaultWorkspaceId": { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/FirewallPolicyPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/FirewallPolicyPut.json index c12e14e91651..18bdb9bfe8e5 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/FirewallPolicyPut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/FirewallPolicyPut.json @@ -23,12 +23,18 @@ "isEnabled": true, "retentionDays": 100, "logAnalyticsResources": { - "workspaceIds": [ + "workspaces": [ { - "id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace1" + "region": "westus", + "workspaceId": { + "id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace1" + } }, { - "id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace2" + "region": "eastus", + "workspaceId": { + "id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace2" + } } ], "defaultWorkspaceId": { @@ -121,12 +127,18 @@ "isEnabled": true, "retentionDays": 100, "logAnalyticsResources": { - "workspaceIds": [ + "workspaces": [ { - "id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace1" + "region": "westus", + "workspaceId": { + "id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace1" + } }, { - "id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace2" + "region": "eastus", + "workspaceId": { + "id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace2" + } } ], "defaultWorkspaceId": { @@ -219,12 +231,18 @@ "isEnabled": true, "retentionDays": 100, "logAnalyticsResources": { - "workspaceIds": [ + "workspaces": [ { - "id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace1" + "region": "westus", + "workspaceId": { + "id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace1" + } }, { - "id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace2" + "region": "eastus", + "workspaceId": { + "id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace2" + } } ], "defaultWorkspaceId": { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VirtualNetworkGatewayConnectionReset.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VirtualNetworkGatewayConnectionReset.json new file mode 100644 index 000000000000..accebce62715 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VirtualNetworkGatewayConnectionReset.json @@ -0,0 +1,11 @@ +{ + "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-11-01/examples/VpnConnectionGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VpnConnectionGet.json index 4bd7fbc1b4a9..067d28c42b30 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VpnConnectionGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VpnConnectionGet.json @@ -20,7 +20,6 @@ "enableInternetSecurity": false, "ingressBytesTransferred": 0, "egressBytesTransferred": 0, - "trafficSelectorPolicies": [], "vpnLinkConnections": [ { "name": "Connection-Link1", diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VpnConnectionList.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VpnConnectionList.json index bf7f8bb7980c..8b302487219f 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VpnConnectionList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VpnConnectionList.json @@ -20,7 +20,6 @@ "enableInternetSecurity": false, "ingressBytesTransferred": 0, "egressBytesTransferred": 0, - "trafficSelectorPolicies": [], "vpnLinkConnections": [ { "name": "Connection-Link1", diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VpnConnectionPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VpnConnectionPut.json index 291b2d106189..18e5d0c3c9d6 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VpnConnectionPut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VpnConnectionPut.json @@ -20,12 +20,10 @@ "connectionBandwidth": 200, "vpnConnectionProtocolType": "IKEv2", "sharedKey": "key", - "vpnLinkConnectionMode": "Default", - "usePolicyBasedTrafficSelectors": false + "vpnLinkConnectionMode": "Default" } } - ], - "trafficSelectorPolicies": [] + ] } } }, @@ -93,8 +91,7 @@ "vnetRoutes": { "staticRoutes": [] } - }, - "trafficSelectorPolicies": [] + } } } }, @@ -160,8 +157,7 @@ "vnetRoutes": { "staticRoutes": [] } - }, - "trafficSelectorPolicies": [] + } } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VpnSiteLinkConnectionGetIkeSas.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VpnSiteLinkConnectionGetIkeSas.json new file mode 100644 index 000000000000..5df6560e5667 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VpnSiteLinkConnectionGetIkeSas.json @@ -0,0 +1,20 @@ +{ + "parameters": { + "api-version": "2020-11-01", + "subscriptionId": "subid", + "resourceGroupName": "rg1", + "gatewayName": "gateway1", + "connectionName": "vpnConnection1", + "linkConnectionName": "Connection-Link1" + }, + "responses": { + "202": { + "headers": { + "location": "https://management.azure.com/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/westus/operationResults/{operationId}?api-version=2020-11-01" + } + }, + "200": { + "body": "\"{\"Status\":\"Successful\",\"Data\":null}\"" + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VpnSiteLinkConnectionReset.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VpnSiteLinkConnectionReset.json new file mode 100644 index 000000000000..1a1571a85599 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VpnSiteLinkConnectionReset.json @@ -0,0 +1,13 @@ +{ + "parameters": { + "api-version": "2020-08-01", + "subscriptionId": "subid", + "resourceGroupName": "rg1", + "gatewayName": "gateway1", + "connectionName": "vpnConnection1", + "linkConnectionName": "Connection-Link1" + }, + "responses": { + "202": {} + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/firewallPolicy.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/firewallPolicy.json index 3ddd2720b4e6..0d71d86dc5d0 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/firewallPolicy.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/firewallPolicy.json @@ -1376,11 +1376,11 @@ "description": "Log Analytics Resources for Firewall Policy Insights.", "x-ms-discriminator-value": "FirewallPolicyLogAnalyticsResources", "properties": { - "workspaceIds": { + "workspaces": { "type": "array", - "description": "List of workspace Ids for Firewall Policy Insights.", + "description": "List of workspaces for Firewall Policy Insights.", "items": { - "$ref": "./network.json#/definitions/SubResource" + "$ref": "#/definitions/FirewallPolicyLogAnalyticsWorkspace" } }, "defaultWorkspaceId": { @@ -1388,6 +1388,20 @@ "description": "The default workspace Id for Firewall Policy Insights." } } + }, + "FirewallPolicyLogAnalyticsWorkspace": { + "description": "Log Analytics Workspace for Firewall Policy Insights.", + "x-ms-discriminator-value": "FirewallPolicyLogAnalyticsWorkspace", + "properties": { + "region": { + "type": "string", + "description": "Region to configure the Workspace." + }, + "workspaceId": { + "$ref": "./network.json#/definitions/SubResource", + "description": "The workspace Id for Firewall Policy Insights." + } + } } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/loadBalancer.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/loadBalancer.json index 9119efbdd954..e9ce60ac8315 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/loadBalancer.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/loadBalancer.json @@ -1510,6 +1510,10 @@ "$ref": "./network.json#/definitions/SubResource", "description": "Reference to an existing virtual network." }, + "subnet": { + "$ref": "./network.json#/definitions/SubResource", + "description": "Reference to an existing subnet." + }, "ipAddress": { "type": "string", "description": "IP Address belonging to the referenced virtual network.", diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/virtualNetworkGateway.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/virtualNetworkGateway.json index 33fcb3bfb7c0..77569ee60de6 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/virtualNetworkGateway.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/virtualNetworkGateway.json @@ -1882,6 +1882,57 @@ } } }, + "/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." + }, + "default": { + "description": "The operation resetconnection could not be completed.", + "schema": { + "$ref": "./networkWatcher.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "ResetVirtualNetworkGatewayConnection": { + "$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-11-01/virtualWan.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/virtualWan.json index 8246e556bcd9..9ee66232c41c 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/virtualWan.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-11-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": { + "ResetVpnLinkConnection": { + "$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", @@ -2418,6 +2483,74 @@ } } }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnGateways/{gatewayName}/vpnConnections/{connectionName}/vpnLinkConnections/{linkConnectionName}/getikesas": { + "post": { + "operationId": "VpnLinkConnections_GetIkeSas", + "x-ms-examples": { + "GetVpnLinkConnectionIkeSa": { + "$ref": "./examples/VpnSiteLinkConnectionGetIkeSas.json" + } + }, + "description": "Lists IKE Security Associations for Vpn Site Link Connection in the specified resource group.", + "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 GetIkeSas will complete asynchronously." + }, + "200": { + "description": "Request successful. The operation getikesas completed on vpn site link connection.", + "schema": { + "type": "string" + } + }, + "default": { + "description": "The operation GetIkeSas could not be completed.", + "schema": { + "$ref": "./networkWatcher.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "location" + } + } + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnGateways/{gatewayName}/vpnConnections/{vpnConnectionName}/startpacketcapture": { "post": { "operationId": "VpnConnections_StartPacketCapture", @@ -6224,13 +6357,6 @@ }, "description": "The IPSec Policies to be considered by this connection." }, - "trafficSelectorPolicies": { - "type": "array", - "items": { - "$ref": "./virtualNetworkGateway.json#/definitions/TrafficSelectorPolicy" - }, - "description": "The Traffic Selector Policies to be considered by this connection." - }, "enableRateLimiting": { "type": "boolean", "description": "EnableBgp flag."