From 594c4d17a3a3493172592baa3e37964ec3bd7700 Mon Sep 17 00:00:00 2001 From: nalinrajgupta Date: Mon, 24 Jun 2019 12:56:56 -0700 Subject: [PATCH 01/15] Added VpnSiteLink/VpnSiteLinkConnection operations. --- .../stable/2019-06-01/virtualWan.json | 751 +++++++++++++++++- 1 file changed, 730 insertions(+), 21 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/virtualWan.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/virtualWan.json index d7dc9f91a038..eb8498ffd235 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/virtualWan.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/virtualWan.json @@ -610,6 +610,240 @@ } } }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnSites/{vpnSiteName}/vpnSiteLinks/{vpnSiteLinkName}": { + "get": { + "operationId": "VpnSiteLinks_Get", + "x-ms-examples": { + "VpnSiteGet": { + "$ref": "./examples/VpnSiteLinkGet.json" + } + }, + "description": "Retrieves the details of a VPN site link.", + "parameters": [ + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + }, + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The resource group name of the VpnSite." + }, + { + "name": "vpnSiteName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the VpnSite." + }, + { + "name": "vpnSiteLinkName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the VpnSiteLink being retrieved." + }, + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Request successful. Returns the details of the VpnSiteLink retrieved.", + "schema": { + "$ref": "#/definitions/VpnSiteLink" + } + }, + "default": { + "description": "Error.", + "schema": { + "$ref": "./network.json#/definitions/Error" + } + } + } + }, + "put": { + "operationId": "VpnSiteLinks_CreateOrUpdate", + "x-ms-examples": { + "VpnSiteCreate": { + "$ref": "./examples/VpnSiteLinkPut.json" + } + }, + "description": "Creates a VpnSiteLink resource if it doesn't exist else updates the existing VpnSiteLink.", + "parameters": [ + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + }, + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The resource group name of the VpnSite." + }, + { + "name": "vpnSiteName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the VpnSite being created or updated." + }, + { + "name": "vpnSiteLinkName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the VpnSiteLink being retrieved." + }, + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + }, + { + "name": "VpnSiteLinkParameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/VpnSiteLink" + }, + "description": "Parameters supplied to create or update VpnSiteLink." + } + ], + "responses": { + "200": { + "description": "Request successful. Returns the details of the VpnSiteLink created or updated.", + "schema": { + "$ref": "#/definitions/VpnSiteLink" + } + }, + "201": { + "description": "Request received successfully. Returns the details of the VpnSite created or updated.", + "schema": { + "$ref": "#/definitions/VpnSiteLink" + } + }, + "default": { + "description": "Error.", + "schema": { + "$ref": "./network.json#/definitions/Error" + } + } + }, + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "azure-async-operation" + } + }, + "delete": { + "operationId": "VpnSiteLinks_Delete", + "x-ms-examples": { + "VpnSiteDelete": { + "$ref": "./examples/VpnSiteLinkDelete.json" + } + }, + "description": "Deletes a VpnSiteLink.", + "parameters": [ + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + }, + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The resource group name of the VpnSite." + }, + { + "name": "vpnSiteName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the VpnSite being deleted." + }, + { + "name": "vpnSiteLinkName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the VpnSiteLink being retrieved." + }, + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Request successful. VpnSiteLink deleted." + }, + "202": { + "description": "Request received successfully. VpnSiteLink deletion is in progress." + }, + "204": { + "description": "No VpnSiteLink exist by the name provided." + }, + "default": { + "description": "Error.", + "schema": { + "$ref": "./network.json#/definitions/Error" + } + } + }, + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "location" + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnSites/{vpnSiteName}/vpnSiteLinks": { + "get": { + "operationId": "VpnSiteLinks_ListByVpnSite", + "x-ms-examples": { + "VpnSiteLinkListByVpnSite": { + "$ref": "./examples/VpnSiteLinkListByVpnSite.json" + } + }, + "description": "Lists all the vpnSiteLinks in a resource group for a vpn site.", + "parameters": [ + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + }, + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The resource group name of the VpnSite." + }, + { + "name": "vpnSiteName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the VpnSite." + }, + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Request successful. Returns the details of all the vpnSites in the resource group.", + "schema": { + "$ref": "#/definitions/ListVpnSiteLinksResult" + } + }, + "default": { + "description": "Error.", + "schema": { + "$ref": "./network.json#/definitions/Error" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, "/subscriptions/{subscriptionId}/providers/Microsoft.Network/vpnSites": { "get": { "operationId": "VpnSites_List", @@ -1420,14 +1654,14 @@ } ], "responses": { - "202": { - "description": "Accepted and the operation will complete asynchronously." - }, "200": { "description": "Request successful. The operation reset the primary of the VpnGateway.", "schema": { "$ref": "#/definitions/VpnGateway" } + }, + "202": { + "description": "Accepted and the operation will complete asynchronously." } }, "x-ms-examples": { @@ -1541,14 +1775,205 @@ "description": "The resource group name of the VpnGateway." }, { - "name": "gatewayName", + "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." + }, + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Request successful. Returns the details of the vpn connection.", + "schema": { + "$ref": "#/definitions/VpnConnection" + } + }, + "default": { + "description": "Error.", + "schema": { + "$ref": "./network.json#/definitions/Error" + } + } + } + }, + "put": { + "operationId": "VpnConnections_CreateOrUpdate", + "x-ms-examples": { + "VpnConnectionPut": { + "$ref": "./examples/VpnConnectionPut.json" + } + }, + "description": "Creates a vpn connection to a scalable vpn gateway if it doesn't exist else updates the existing connection.", + "parameters": [ + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + }, + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The resource group name of the VpnGateway." + }, + { + "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 connection." + }, + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + }, + { + "name": "VpnConnectionParameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/VpnConnection" + }, + "description": "Parameters supplied to create or Update a VPN Connection." + } + ], + "responses": { + "200": { + "description": "Request successful. Returns the details of the vpn connection created or updated.", + "schema": { + "$ref": "#/definitions/VpnConnection" + } + }, + "201": { + "description": "Request successful. Returns the details of the vpn connection created or updated.", + "schema": { + "$ref": "#/definitions/VpnConnection" + } + }, + "default": { + "description": "Error.", + "schema": { + "$ref": "./network.json#/definitions/Error" + } + } + }, + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "azure-async-operation" + } + }, + "delete": { + "operationId": "VpnConnections_Delete", + "x-ms-examples": { + "VpnConnectionDelete": { + "$ref": "./examples/VpnConnectionDelete.json" + } + }, + "description": "Deletes a vpn connection.", + "parameters": [ + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + }, + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The resource group name of the VpnGateway." + }, + { + "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 connection." + }, + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Request successful. Vpn Connection deleted." + }, + "202": { + "description": "Request received successfully. Vpn Connection deletion is in progress; follow the Location header to poll for final outcome." + }, + "204": { + "description": "No vpn connections exist by the name provided." + }, + "default": { + "description": "Error.", + "schema": { + "$ref": "./network.json#/definitions/Error" + } + } + }, + "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/{connectionName}/vpnLinkConnections/{linkConnectionName}": { + "get": { + "operationId": "VpnSiteLinkConnections_Get", + "x-ms-examples": { + "VpnSiteLinkConnectionGet": { + "$ref": "./examples/VpnSiteLinkConnectionGet.json" + } + }, + "description": "Retrieves the details of a vpn site link connection.", + "parameters": [ + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + }, + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The resource group name of the VpnGateway." + }, + { + "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 gateway." + "description": "The name of the vpn connection." }, { - "name": "connectionName", + "name": "linkConnectionName", "in": "path", "required": true, "type": "string", @@ -1562,7 +1987,7 @@ "200": { "description": "Request successful. Returns the details of the vpn connection.", "schema": { - "$ref": "#/definitions/VpnConnection" + "$ref": "#/definitions/VpnSiteLinkConnection" } }, "default": { @@ -1574,10 +1999,10 @@ } }, "put": { - "operationId": "VpnConnections_CreateOrUpdate", + "operationId": "VpnSiteLinkConnections_CreateOrUpdate", "x-ms-examples": { - "VpnConnectionPut": { - "$ref": "./examples/VpnConnectionPut.json" + "VpnSiteLinkConnectionPut": { + "$ref": "./examples/VpnSiteLinkConnectionPut.json" } }, "description": "Creates a vpn connection to a scalable vpn gateway if it doesn't exist else updates the existing connection.", @@ -1606,15 +2031,22 @@ "type": "string", "description": "The name of the connection." }, + { + "name": "linkConnectionName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the vpn connection." + }, { "$ref": "./network.json#/parameters/ApiVersionParameter" }, { - "name": "VpnConnectionParameters", + "name": "VpnSiteLinkConnectionProperties", "in": "body", "required": true, "schema": { - "$ref": "#/definitions/VpnConnection" + "$ref": "#/definitions/VpnSiteLinkConnectionProperties" }, "description": "Parameters supplied to create or Update a VPN Connection." } @@ -1623,13 +2055,13 @@ "200": { "description": "Request successful. Returns the details of the vpn connection created or updated.", "schema": { - "$ref": "#/definitions/VpnConnection" + "$ref": "#/definitions/VpnSiteLinkConnection" } }, "201": { "description": "Request successful. Returns the details of the vpn connection created or updated.", "schema": { - "$ref": "#/definitions/VpnConnection" + "$ref": "#/definitions/VpnSiteLinkConnection" } }, "default": { @@ -1645,13 +2077,13 @@ } }, "delete": { - "operationId": "VpnConnections_Delete", + "operationId": "VpnSiteLinkConnections_Delete", "x-ms-examples": { - "VpnConnectionDelete": { - "$ref": "./examples/VpnConnectionDelete.json" + "VpnSiteLinkConnectionDelete": { + "$ref": "./examples/VpnSiteLinkConnectionDelete.json" } }, - "description": "Deletes a vpn connection.", + "description": "Deletes a vpn site link connection.", "parameters": [ { "$ref": "./network.json#/parameters/SubscriptionIdParameter" @@ -1677,19 +2109,26 @@ "type": "string", "description": "The name of the connection." }, + { + "name": "linkConnectionName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the vpn connection." + }, { "$ref": "./network.json#/parameters/ApiVersionParameter" } ], "responses": { "200": { - "description": "Request successful. Vpn Connection deleted." + "description": "Request successful. VpnSiteLinkConnection deleted." }, "202": { - "description": "Request received successfully. Vpn Connection deletion is in progress; follow the Location header to poll for final outcome." + "description": "Request received successfully. VpnSiteLinkConnection deletion is in progress; follow the Location header to poll for final outcome." }, "204": { - "description": "No vpn connections exist by the name provided." + "description": "No vpn site link connection exist by the name provided." }, "default": { "description": "Error.", @@ -1754,6 +2193,63 @@ } } }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnGateways/{gatewayName}/vpnConnections/{connectionName}/vpnLinkConnections": { + "get": { + "operationId": "VpnLinkConnections_ListByVpnConnection", + "x-ms-examples": { + "VpnSiteLinkConnectionList": { + "$ref": "./examples/VpnSiteLinkConnectionList.json" + } + }, + "description": "Retrieves all vpn site link connections for a particular virtual wan vpn gateway vpn connection.", + "parameters": [ + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + }, + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The resource group name of the VpnGateway." + }, + { + "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." + }, + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Request successful. Returns all Vpn connections for a virtual wan vpn gateway.", + "schema": { + "$ref": "#/definitions/ListVpnSiteLinkConnectionsResult" + } + }, + "default": { + "description": "Error.", + "schema": { + "$ref": "./network.json#/definitions/Error" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualWans/{virtualWanName}/p2sVpnServerConfigurations/{p2SVpnServerConfigurationName}": { "get": { "operationId": "P2sVpnServerConfigurations_Get", @@ -2531,6 +3027,13 @@ "isSecuritySite": { "type": "boolean", "description": "IsSecuritySite flag." + }, + "vpnSiteLinks": { + "type": "array", + "description": "List of all vpn site links", + "items": { + "$ref": "#/definitions/VpnSiteLink" + } } }, "description": "Parameters for VpnSite." @@ -2574,6 +3077,67 @@ } } }, + "VpnSiteLinkProperties": { + "properties": { + "linkProperties": { + "description": "The link provider properties.", + "$ref": "#/definitions/VpnLinkProviderProperties" + }, + "ipAddress": { + "type": "string", + "description": "The ip-address for the vpn-site-link." + }, + "bgpProperties": { + "$ref": "/definitions/VpnLinkBgpSettings", + "description": "The set of bgp properties." + }, + "provisioningState": { + "description": "The provisioning state of the resource.", + "$ref": "./network.json#/definitions/ProvisioningState" + } + }, + "description": "Parameters for VpnSite." + }, + "VpnSiteLink": { + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/VpnSiteLinkProperties", + "description": "Properties of the VPN site link." + }, + "etag": { + "type": "string", + "readOnly": true, + "description": "Gets a unique read-only string that changes whenever the resource is updated." + }, + "name": { + "type": "string", + "description": "The name of the resource that is unique within a resource group. This name can be used to access the resource." + } + }, + "allOf": [ + { + "$ref": "./network.json#/definitions/Resource" + } + ], + "description": "VpnSiteLink Resource." + }, + "ListVpnSiteLinksResult": { + "description": "Result of the request to list VpnSiteLinks. It contains a list of VpnSiteLinks and a URL nextLink to get the next set of results.", + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/VpnSiteLink" + }, + "description": "List of VpnSitesLinks." + }, + "nextLink": { + "type": "string", + "description": "URL to get the next set of operation list results if there are any." + } + } + }, "GetVpnSitesConfigurationRequest": { "properties": { "vpnSites": { @@ -2838,6 +3402,13 @@ "provisioningState": { "description": "The provisioning state of the resource.", "$ref": "./network.json#/definitions/ProvisioningState" + }, + "vpnLinkConnections": { + "type": "array", + "description": "List of all vpn site link connections to the gateway.", + "items": { + "$ref": "#/definitions/VpnSiteLinkConnection" + } } }, "description": "Parameters for VpnConnection." @@ -2882,6 +3453,116 @@ } } }, + "VpnSiteLinkConnectionProperties": { + "properties": { + "VpnSiteLink": { + "$ref": "./network.json#/definitions/SubResource", + "description": "Id of the connected vpn site link." + }, + "routingWeight": { + "type": "integer", + "format": "int32", + "description": "Routing weight for vpn connection." + }, + "connectionStatus": { + "description": "The connection status.", + "$ref": "#/definitions/VpnConnectionStatus" + }, + "vpnConnectionProtocolType": { + "description": "Connection protocol used for this connection.", + "$ref": "./virtualNetworkGateway.json#/definitions/ConnectionProtocol" + }, + "ingressBytesTransferred": { + "type": "integer", + "format": "int64", + "readOnly": true, + "description": "Ingress bytes transferred." + }, + "egressBytesTransferred": { + "type": "integer", + "format": "int64", + "readOnly": true, + "description": "Egress bytes transferred." + }, + "connectionBandwidth": { + "type": "integer", + "format": "int32", + "description": "Expected bandwidth in MBPS." + }, + "sharedKey": { + "type": "string", + "description": "SharedKey for the vpn connection." + }, + "enableBgp": { + "type": "boolean", + "description": "EnableBgp flag." + }, + "usePolicyBasedTrafficSelectors": { + "type": "boolean", + "description": "Enable policy-based traffic selectors." + }, + "ipsecPolicies": { + "type": "array", + "items": { + "$ref": "./virtualNetworkGateway.json#/definitions/IpsecPolicy" + }, + "description": "The IPSec Policies to be considered by this connection." + }, + "enableRateLimiting": { + "type": "boolean", + "description": "EnableBgp flag." + }, + "useLocalAzureIpAddress": { + "type": "boolean", + "description": "Use local azure ip to initiate connection." + }, + "provisioningState": { + "description": "The provisioning state of the resource.", + "$ref": "./network.json#/definitions/ProvisioningState" + } + }, + "description": "Parameters for VpnConnection." + }, + "VpnSiteLinkConnection": { + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/VpnSiteLinkConnectionProperties", + "description": "Properties of the VPN site link connection." + }, + "name": { + "type": "string", + "description": "The name of the resource that is unique within a resource group. This name can be used to access the resource." + }, + "etag": { + "type": "string", + "readOnly": true, + "description": "Gets a unique read-only string that changes whenever the resource is updated." + } + }, + "allOf": [ + { + "$ref": "./network.json#/definitions/SubResource" + } + ], + "description": "VpnSiteLinkConnection Resource." + }, + "ListVpnSiteLinkConnectionsResult": { + "description": "Result of the request to list all vpn connections to a virtual wan vpn gateway. It contains a list of Vpn Connections and a URL nextLink to get the next set of results.", + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/VpnSiteLinkConnection" + }, + "description": "List of VpnSiteLinkConnections." + }, + "nextLink": { + "type": "string", + "description": "URL to get the next set of operation list results if there are any." + } + } + }, "HubVirtualNetworkConnectionProperties": { "properties": { "remoteVirtualNetwork": { @@ -3482,6 +4163,34 @@ } }, "description": "Vpn Profile Response for package generation." + }, + "VpnLinkBgpSettings": { + "properties": { + "asn": { + "type": "integer", + "format": "int64", + "description": "The BGP speaker's ASN." + }, + "bgpPeeringAddress": { + "type": "string", + "description": "The BGP peering address and BGP identifier of this BGP speaker." + } + }, + "description": "BGP settings details for a link." + }, + "VpnLinkProviderProperties": { + "properties": { + "linkProviderName": { + "type": "string", + "description": "Name of the link provider." + }, + "linkSpeedInMbps": { + "type": "integer", + "format": "int32", + "description": "Link speed." + } + }, + "description": "List of properties of a link provider." } } } From fcad638c3758f1b22901aa7a711a2b36f8a04f55 Mon Sep 17 00:00:00 2001 From: Nalin Gupta Date: Mon, 1 Jul 2019 14:47:32 -0700 Subject: [PATCH 02/15] Sdk changes for vpn site link. --- .../2019-06-01/examples/VpnConnectionGet.json | 59 +++- .../examples/VpnConnectionList.json | 81 ++++-- .../2019-06-01/examples/VpnConnectionPut.json | 137 ++++++--- .../2019-06-01/examples/VpnGatewayGet.json | 59 +++- .../2019-06-01/examples/VpnGatewayList.json | 59 +++- .../VpnGatewayListByResourceGroup.json | 67 ++++- .../2019-06-01/examples/VpnGatewayPut.json | 95 ++++-- .../2019-06-01/examples/VpnSiteGet.json | 34 ++- .../examples/VpnSiteLinkConnectionGet.json | 38 +++ .../examples/VpnSiteLinkConnectionList.json | 37 +++ .../2019-06-01/examples/VpnSiteLinkGet.json | 32 ++ .../2019-06-01/examples/VpnSiteLinkList.json | 49 ++++ .../2019-06-01/examples/VpnSiteList.json | 74 +++-- .../examples/VpnSiteListByResourceGroup.json | 71 +++-- .../2019-06-01/examples/VpnSitePut.json | 110 ++++--- .../stable/2019-06-01/virtualWan.json | 274 ------------------ 16 files changed, 781 insertions(+), 495 deletions(-) create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkConnectionGet.json create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkConnectionList.json create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkGet.json create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkList.json diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionGet.json index 3f18a84ecd80..60db723c60e2 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionGet.json @@ -17,17 +17,58 @@ "remoteVpnSite": { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1" }, - "connectionStatus": "Connected", - "vpnConnectionProtocolType": "IKEv2", + "enableInternetSecurity": false, "ingressBytesTransferred": 0, "egressBytesTransferred": 0, - "routingWeight": 0, - "connectionBandwidth": 100, - "sharedKey": "key", - "enableBgp": false, - "usePolicyBasedTrafficSelectors": false, - "useLocalAzureIpAddress": false, - "ipsecPolicies": [] + "vpnLinkConnections": [ + { + "name": "Connection-Link1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "vpnSiteLink": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink1" + }, + "connectionBandwidth": 200, + "ipsecPolicies": [], + "vpnConnectionProtocolType": "IKEv2", + "sharedKey": "key", + "ingressBytesTransferred": 0, + "egressBytesTransferred": 0, + "enableBgp": false, + "enableRateLimiting": false, + "useLocalAzureIpAddress": false, + "usePolicyBasedTrafficSelectors": false, + "routingWeight": 0 + }, + "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections" + }, + { + "name": "Connection-Link2", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link2", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "vpnSiteLink": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink2" + }, + "connectionBandwidth": 200, + "ipsecPolicies": [], + "vpnConnectionProtocolType": "IKEv2", + "sharedKey": "key", + "ingressBytesTransferred": 0, + "egressBytesTransferred": 0, + "enableBgp": false, + "enableRateLimiting": false, + "useLocalAzureIpAddress": false, + "usePolicyBasedTrafficSelectors": false, + "routingWeight": 0 + }, + "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections" + } + ], + "type": "Microsoft.Network/vpnGateways/vpnConnections" } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionList.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionList.json index c8e04b467362..7dea5a0bfbbf 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionList.json @@ -9,27 +9,68 @@ "200": { "body": [ { - "name": "vpnConnection1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "properties": { - "provisioningState": "Succeeded", - "remoteVpnSite": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1" - }, - "connectionStatus": "Connected", - "vpnConnectionProtocolType": "IKEv1", - "ingressBytesTransferred": 0, - "egressBytesTransferred": 0, - "routingWeight": 0, - "connectionBandwidth": 100, - "sharedKey": "key", - "enableBgp": false, - "usePolicyBasedTrafficSelectors": false, - "useLocalAzureIpAddress": false, - "ipsecPolicies": [] - } + "name": "vpnConnection1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "remoteVpnSite": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1" + }, + "enableInternetSecurity": false, + "ingressBytesTransferred": 0, + "egressBytesTransferred": 0, + "vpnLinkConnections": [ + { + "name": "Connection-Link1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "vpnSiteLink": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink1" + }, + "connectionBandwidth": 200, + "ipsecPolicies": [], + "vpnConnectionProtocolType": "IKEv2", + "sharedKey": "key", + "ingressBytesTransferred": 0, + "egressBytesTransferred": 0, + "enableBgp": false, + "enableRateLimiting": false, + "useLocalAzureIpAddress": false, + "usePolicyBasedTrafficSelectors": false, + "routingWeight": 0 + }, + "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections" + }, + { + "name": "Connection-Link2", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link2", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "vpnSiteLink": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink2" + }, + "connectionBandwidth": 200, + "ipsecPolicies": [], + "vpnConnectionProtocolType": "IKEv2", + "sharedKey": "key", + "ingressBytesTransferred": 0, + "egressBytesTransferred": 0, + "enableBgp": false, + "enableRateLimiting": false, + "useLocalAzureIpAddress": false, + "usePolicyBasedTrafficSelectors": false, + "routingWeight": 0 + }, + "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections" + } + ], + "type": "Microsoft.Network/vpnGateways/vpnConnections" } + } ] } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionPut.json index 2dca7546aa4e..f797587f6d07 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionPut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionPut.json @@ -10,55 +10,104 @@ "remoteVpnSite": { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1" }, - "vpnConnectionProtocolType": "IKEv1", - "sharedKey": "key" + "vpnLinkConnections": [ + { + "name": "Connection-Link1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "vpnSiteLink": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink1" + }, + "connectionBandwidth": 200, + "vpnConnectionProtocolType": "IKEv2", + "sharedKey": "key" + } + } + ] } } }, "responses": { "200": { - "name": "vpnConnection1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "properties": { - "provisioningState": "Succeeded", - "remoteVpnSite": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1" - }, - "connectionStatus": "Connected", - "vpnConnectionProtocolType": "IKEv1", - "ingressBytesTransferred": 0, - "egressBytesTransferred": 0, - "routingWeight": 0, - "connectionBandwidth": 100, - "sharedKey": "key", - "enableBgp": false, - "usePolicyBasedTrafficSelectors": false, - "useLocalAzureIpAddress": false, - "ipsecPolicies": [] - } - }, + "name": "vpnConnection1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "remoteVpnSite": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1" + }, + "enableInternetSecurity": false, + "ingressBytesTransferred": 0, + "egressBytesTransferred": 0, + "vpnLinkConnections": [ + { + "name": "Connection-Link1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "vpnSiteLink": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink1" + }, + "connectionBandwidth": 200, + "ipsecPolicies": [], + "vpnConnectionProtocolType": "IKEv2", + "sharedKey": "key", + "ingressBytesTransferred": 0, + "egressBytesTransferred": 0, + "enableBgp": false, + "enableRateLimiting": false, + "useLocalAzureIpAddress": false, + "usePolicyBasedTrafficSelectors": false, + "routingWeight": 0 + }, + "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections" + } + ], + "type": "Microsoft.Network/vpnGateways/vpnConnections" + } + }, "201": { - "name": "vpnConnection1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "properties": { - "provisioningState": "Succeeded", - "remoteVpnSite": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1" - }, - "connectionStatus": "Connected", - "vpnConnectionProtocolType": "IKEv1", - "ingressBytesTransferred": 0, - "egressBytesTransferred": 0, - "routingWeight": 0, - "connectionBandwidth": 100, - "sharedKey": "key", - "enableBgp": false, - "usePolicyBasedTrafficSelectors": false, - "useLocalAzureIpAddress": false, - "ipsecPolicies": [] + "name": "vpnConnection1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "remoteVpnSite": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1" + }, + "enableInternetSecurity": false, + "ingressBytesTransferred": 0, + "egressBytesTransferred": 0, + "vpnLinkConnections": [ + { + "name": "Connection-Link1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "vpnSiteLink": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink1" + }, + "connectionBandwidth": 200, + "ipsecPolicies": [], + "vpnConnectionProtocolType": "IKEv2", + "sharedKey": "key", + "ingressBytesTransferred": 0, + "egressBytesTransferred": 0, + "enableBgp": false, + "enableRateLimiting": false, + "useLocalAzureIpAddress": false, + "usePolicyBasedTrafficSelectors": false, + "routingWeight": 0 + }, + "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections" + } + ], + "type": "Microsoft.Network/vpnGateways/vpnConnections" + } } - } - } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayGet.json index 67b8b273687c..efba63e67746 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayGet.json @@ -28,15 +28,58 @@ "remoteVpnSite": { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1" }, - "connectionStatus": "Connected", + "enableInternetSecurity": false, "ingressBytesTransferred": 0, "egressBytesTransferred": 0, - "routingWeight": 0, - "connectionBandwidth": 100, - "sharedKey": "key", - "enableBgp": false, - "useLocalAzureIpAddress": false, - "ipsecPolicies": [] + "vpnLinkConnections": [ + { + "name": "Connection-Link1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "vpnSiteLink": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink1" + }, + "connectionBandwidth": 200, + "ipsecPolicies": [], + "vpnConnectionProtocolType": "IKEv2", + "sharedKey": "key", + "ingressBytesTransferred": 0, + "egressBytesTransferred": 0, + "enableBgp": false, + "enableRateLimiting": false, + "useLocalAzureIpAddress": false, + "usePolicyBasedTrafficSelectors": false, + "routingWeight": 0 + }, + "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections" + }, + { + "name": "Connection-Link2", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link2", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "vpnSiteLink": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink2" + }, + "connectionBandwidth": 200, + "ipsecPolicies": [], + "vpnConnectionProtocolType": "IKEv2", + "sharedKey": "key", + "ingressBytesTransferred": 0, + "egressBytesTransferred": 0, + "enableBgp": false, + "enableRateLimiting": false, + "useLocalAzureIpAddress": false, + "usePolicyBasedTrafficSelectors": false, + "routingWeight": 0 + }, + "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections" + } + ], + "type": "Microsoft.Network/vpnGateways/vpnConnections" } } ], @@ -49,4 +92,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayList.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayList.json index 53634336653f..01b5922ad38d 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayList.json @@ -29,15 +29,58 @@ "remoteVpnSite": { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1" }, - "connectionStatus": "Connected", + "enableInternetSecurity": false, "ingressBytesTransferred": 0, "egressBytesTransferred": 0, - "routingWeight": 0, - "connectionBandwidth": 100, - "sharedKey": "key", - "enableBgp": false, - "useLocalAzureIpAddress": false, - "ipsecPolicies": [] + "vpnLinkConnections": [ + { + "name": "Connection-Link1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "vpnSiteLink": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink1" + }, + "connectionBandwidth": 200, + "ipsecPolicies": [], + "vpnConnectionProtocolType": "IKEv2", + "sharedKey": "key", + "ingressBytesTransferred": 0, + "egressBytesTransferred": 0, + "enableBgp": false, + "enableRateLimiting": false, + "useLocalAzureIpAddress": false, + "usePolicyBasedTrafficSelectors": false, + "routingWeight": 0 + }, + "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections" + }, + { + "name": "Connection-Link2", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link2", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "vpnSiteLink": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink2" + }, + "connectionBandwidth": 200, + "ipsecPolicies": [], + "vpnConnectionProtocolType": "IKEv2", + "sharedKey": "key", + "ingressBytesTransferred": 0, + "egressBytesTransferred": 0, + "enableBgp": false, + "enableRateLimiting": false, + "useLocalAzureIpAddress": false, + "usePolicyBasedTrafficSelectors": false, + "routingWeight": 0 + }, + "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections" + } + ], + "type": "Microsoft.Network/vpnGateways/vpnConnections" } } ], @@ -92,4 +135,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayListByResourceGroup.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayListByResourceGroup.json index 805e129dcd14..01b5922ad38d 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayListByResourceGroup.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayListByResourceGroup.json @@ -29,15 +29,58 @@ "remoteVpnSite": { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1" }, - "connectionStatus": "Connected", + "enableInternetSecurity": false, "ingressBytesTransferred": 0, "egressBytesTransferred": 0, - "routingWeight": 0, - "connectionBandwidth": 100, - "sharedKey": "key", - "enableBgp": false, - "useLocalAzureIpAddress": false, - "ipsecPolicies": [] + "vpnLinkConnections": [ + { + "name": "Connection-Link1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "vpnSiteLink": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink1" + }, + "connectionBandwidth": 200, + "ipsecPolicies": [], + "vpnConnectionProtocolType": "IKEv2", + "sharedKey": "key", + "ingressBytesTransferred": 0, + "egressBytesTransferred": 0, + "enableBgp": false, + "enableRateLimiting": false, + "useLocalAzureIpAddress": false, + "usePolicyBasedTrafficSelectors": false, + "routingWeight": 0 + }, + "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections" + }, + { + "name": "Connection-Link2", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link2", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "vpnSiteLink": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink2" + }, + "connectionBandwidth": 200, + "ipsecPolicies": [], + "vpnConnectionProtocolType": "IKEv2", + "sharedKey": "key", + "ingressBytesTransferred": 0, + "egressBytesTransferred": 0, + "enableBgp": false, + "enableRateLimiting": false, + "useLocalAzureIpAddress": false, + "usePolicyBasedTrafficSelectors": false, + "routingWeight": 0 + }, + "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections" + } + ], + "type": "Microsoft.Network/vpnGateways/vpnConnections" } } ], @@ -50,24 +93,24 @@ }, { "name": "gateway2", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway2", + "id": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/vpnGateways/gateway2", "etag": "w/\\00000000-0000-0000-0000-000000000000\\", "location": "West US", "type": "Microsoft.Network/vpnGateways", "properties": { "provisioningState": "Succeeded", "virtualHub": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2" + "id": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/virtualHubs/virtualHub2" }, "connections": [ { "name": "vpnConnection1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway2/vpnConnections/vpnConnection2", + "id": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/vpnGateways/gateway2/vpnConnections/vpnConnection2", "etag": "w/\\00000000-0000-0000-0000-000000000000\\", "properties": { "provisioningState": "Succeeded", "remoteVpnSite": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite2" + "id": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/vpnSites/vpnSite2" }, "connectionStatus": "Connected", "ingressBytesTransferred": 0, @@ -92,4 +135,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayPut.json index ec6244440119..ddbcc33fec2e 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayPut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayPut.json @@ -20,7 +20,22 @@ "remoteVpnSite": { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1" }, - "sharedKey": "key" + "vpnLinkConnections": [ + { + "name": "Connection-Link1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "vpnSiteLink": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink1" + }, + "connectionBandwidth": 200, + "vpnConnectionProtocolType": "IKEv2", + "sharedKey": "key" + } + } + ] } } ], @@ -36,7 +51,7 @@ "name": "gateway1", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1", "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "location": "westcentralus", + "location": "West US", "type": "Microsoft.Network/vpnGateways", "properties": { "provisioningState": "Succeeded", @@ -53,20 +68,40 @@ "remoteVpnSite": { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1" }, - "connectionStatus": "Connected", + "enableInternetSecurity": false, "ingressBytesTransferred": 0, "egressBytesTransferred": 0, - "routingWeight": 0, - "connectionBandwidth": 100, - "sharedKey": "key", - "enableBgp": false, - "useLocalAzureIpAddress": false, - "ipsecPolicies": [] + "vpnLinkConnections": [ + { + "name": "Connection-Link1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "vpnSiteLink": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink1" + }, + "connectionBandwidth": 200, + "ipsecPolicies": [], + "vpnConnectionProtocolType": "IKEv2", + "sharedKey": "key", + "ingressBytesTransferred": 0, + "egressBytesTransferred": 0, + "enableBgp": false, + "enableRateLimiting": false, + "useLocalAzureIpAddress": false, + "usePolicyBasedTrafficSelectors": false, + "routingWeight": 0 + }, + "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections" + } + ], + "type": "Microsoft.Network/vpnGateways/vpnConnections" } } ], "bgpSettings": { - "asn": 65515, + "asn": 65514, "bgpPeeringAddress": "10.0.1.30", "peerWeight": 0 } @@ -76,7 +111,7 @@ "name": "gateway1", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1", "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "location": "westcentralus", + "location": "West US", "type": "Microsoft.Network/vpnGateways", "properties": { "provisioningState": "Succeeded", @@ -93,24 +128,44 @@ "remoteVpnSite": { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1" }, - "connectionStatus": "Connected", + "enableInternetSecurity": false, "ingressBytesTransferred": 0, "egressBytesTransferred": 0, - "routingWeight": 0, - "connectionBandwidth": 100, - "sharedKey": "key", - "enableBgp": false, - "useLocalAzureIpAddress": false, - "ipsecPolicies": [] + "vpnLinkConnections": [ + { + "name": "Connection-Link1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "vpnSiteLink": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink1" + }, + "connectionBandwidth": 200, + "ipsecPolicies": [], + "vpnConnectionProtocolType": "IKEv2", + "sharedKey": "key", + "ingressBytesTransferred": 0, + "egressBytesTransferred": 0, + "enableBgp": false, + "enableRateLimiting": false, + "useLocalAzureIpAddress": false, + "usePolicyBasedTrafficSelectors": false, + "routingWeight": 0 + }, + "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections" + } + ], + "type": "Microsoft.Network/vpnGateways/vpnConnections" } } ], "bgpSettings": { - "asn": 65515, + "asn": 65514, "bgpPeeringAddress": "10.0.1.30", "peerWeight": 0 } } } } -} +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteGet.json index e12f1480ea50..fb867ae2a0cb 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteGet.json @@ -18,22 +18,38 @@ }, "properties": { "provisioningState": "Succeeded", - "virtualWan": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualWANs/wan1", + "virtualWan": { + "id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualWANs/wan1" + }, "deviceProperties": { - "deviceVendor": "vendor1", - "deviceModel": "model01", - "linkSpeedInMbps": 200 + "linkSpeedInMbps": 0 }, - "ipAddress": "10.0.0.0", "addressSpace": { "addressPrefixes": [ "10.0.0.0/16" ] }, - "bgpProperties": { - "bgpPeeringAddress": "192.168.0.0", - "asn": 1234 - } + "isSecuritySite": false, + "vpnSiteLinks": [ + { + "name": "vpnSiteLink1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/vpnSiteLink1", + "etag": "W/\"00000000-0000-0000-0000-000000000000\"", + "properties": { + "provisioningState": "Succeeded", + "ipAddress": "50.50.50.56", + "linkProperties": { + "linkProviderName": "vendor1" + "linkSpeedInMbps": 0 + } + "bgpProperties": { + "bgpPeeringAddress": "192.168.0.0", + "asn": 1234 + } + }, + "type": "Microsoft.Network/vpnSites/vpnSiteLinks" + } + ] } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkConnectionGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkConnectionGet.json new file mode 100644 index 000000000000..c242a042ab95 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkConnectionGet.json @@ -0,0 +1,38 @@ +{ + "parameters": { + "gatewayName": "gateway1", + "connectionName": "vpnConnection1", + "linkConnectionName": "Connection-Link1", + "resourceGroupName": "rg1", + "api-version": "2019-06-01", + "subscriptionId": "subid" + }, + "responses": { + "200": { + "body": + { + "name": "Connection-Link1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "vpnSiteLink": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink1" + }, + "connectionBandwidth": 200, + "ipsecPolicies": [], + "vpnConnectionProtocolType": "IKEv2", + "sharedKey": "key", + "ingressBytesTransferred": 0, + "egressBytesTransferred": 0, + "enableBgp": false, + "enableRateLimiting": false, + "useLocalAzureIpAddress": false, + "usePolicyBasedTrafficSelectors": false, + "routingWeight": 0 + }, + "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections" + } + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkConnectionList.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkConnectionList.json new file mode 100644 index 000000000000..ec86f9f50204 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkConnectionList.json @@ -0,0 +1,37 @@ +{ + "parameters": { + "gatewayName": "gateway1", + "api-version": "2019-06-01", + "resourceGroupName": "rg1", + "subscriptionId": "subid" + }, + "responses": { + "200": { + "body": [ + { + "name": "Connection-Link1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "vpnSiteLink": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink1" + }, + "connectionBandwidth": 200, + "ipsecPolicies": [], + "vpnConnectionProtocolType": "IKEv2", + "sharedKey": "key", + "ingressBytesTransferred": 0, + "egressBytesTransferred": 0, + "enableBgp": false, + "enableRateLimiting": false, + "useLocalAzureIpAddress": false, + "usePolicyBasedTrafficSelectors": false, + "routingWeight": 0 + }, + "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections" + } + ] + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkGet.json new file mode 100644 index 000000000000..f1c8864860c9 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkGet.json @@ -0,0 +1,32 @@ +{ + "parameters": { + "vpnSiteName": "vpnSite1", + "vpnSiteLinkName": "vpnSiteLink1", + "resourceGroupName": "rg1", + "api-version": "2019-06-01", + "subscriptionId": "subid" + }, + "responses": { + "200": { + "body": { + { + "name": "vpnSiteLink1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/vpnSiteLink1", + "etag": "W/\"00000000-0000-0000-0000-000000000000\"", + "properties": { + "provisioningState": "Succeeded", + "ipAddress": "50.50.50.56", + "linkProperties": { + "linkSpeedInMbps": 0 + } + "bgpProperties": { + "bgpPeeringAddress": "192.168.0.0", + "asn": 1234 + } + }, + "type": "Microsoft.Network/vpnSites/vpnSiteLinks" + } + } + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkList.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkList.json new file mode 100644 index 000000000000..ff015a6c37a4 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkList.json @@ -0,0 +1,49 @@ +{ + "parameters": { + "api-version": "2019-06-01", + "subscriptionId": "subid", + "vpnSiteName": "vpnSite1" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "vpnSiteLink1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/vpnSiteLink1", + "etag": "W/\"00000000-0000-0000-0000-000000000000\"", + "properties": { + "provisioningState": "Succeeded", + "ipAddress": "50.50.50.56", + "linkProperties": { + "linkSpeedInMbps": 200 + } + "bgpProperties": { + "bgpPeeringAddress": "192.168.0.0", + "asn": 1234 + } + }, + "type": "Microsoft.Network/vpnSites/vpnSiteLinks" + }, + { + "name": "vpnSiteLink2", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/vpnSiteLink2", + "etag": "W/\"00000000-0000-0000-0000-000000000000\"", + "properties": { + "provisioningState": "Succeeded", + "ipAddress": "40.40.40.46", + "linkProperties": { + "linkSpeedInMbps": 200 + } + "bgpProperties": { + "bgpPeeringAddress": "192.168.0.1", + "asn": 1234 + } + }, + "type": "Microsoft.Network/vpnSites/vpnSiteLinks" + } + ] + } + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteList.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteList.json index 82febab9283e..5dbf3d0ffee7 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteList.json @@ -8,34 +8,49 @@ "body": { "value": [ { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "location": "West US", - "name": "vpnSite1", - "type": "Microsoft.Network/vpnSites", - "tags": { - "key1": "value1" - }, - "properties": { - "provisioningState": "Succeeded", - "virtualWan": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualWANs/wan1", - "deviceProperties": { - "deviceVendor": "vendor1", - "deviceModel": "model01", - "linkSpeedInMbps": 200 - }, - "ipAddress": "10.0.0.0", - "addressSpace": { - "addressPrefixes": [ - "10.0.0.0/16" - ] - }, - "bgpProperties": { - "bgpPeeringAddress": "192.168.0.0", - "asn": 1234 - } - } - }, + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "location": "West US", + "name": "vpnSite1", + "type": "Microsoft.Network/vpnSites", + "tags": { + "key1": "value1" + }, + "properties": { + "provisioningState": "Succeeded", + "virtualWan": { + "id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualWANs/wan1" + }, + "deviceProperties": { + "linkSpeedInMbps": 0 + }, + "addressSpace": { + "addressPrefixes": [ + "10.0.0.0/16" + ] + }, + "isSecuritySite": false, + "vpnSiteLinks": [ + { + "name": "vpnSiteLink1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/vpnSiteLink1", + "etag": "W/\"00000000-0000-0000-0000-000000000000\"", + "properties": { + "provisioningState": "Succeeded", + "ipAddress": "50.50.50.56", + "linkProperties": { + "linkSpeedInMbps": 0 + } + "bgpProperties": { + "bgpPeeringAddress": "192.168.0.0", + "asn": 1234 + } + }, + "type": "Microsoft.Network/vpnSites/vpnSiteLinks" + } + ] + } + }, { "id": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/vpnSites/vpnSite2", "etag": "w/\\00000000-0000-0000-0000-000000000000\\", @@ -62,7 +77,8 @@ "bgpProperties": { "bgpPeeringAddress": "192.168.0.0", "asn": 1234 - } + }, + "isSecuritySite": false, } } ] diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteListByResourceGroup.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteListByResourceGroup.json index 2442dc194d21..fb238cefca68 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteListByResourceGroup.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteListByResourceGroup.json @@ -9,34 +9,49 @@ "body": { "value": [ { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "location": "West US", - "name": "vpnSite1", - "type": "Microsoft.Network/vpnSites", - "tags": { - "key1": "value1" - }, - "properties": { - "provisioningState": "Succeeded", - "virtualWan": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualWANs/wan1", - "deviceProperties": { - "deviceVendor": "vendor1", - "deviceModel": "model01", - "linkSpeedInMbps": 200 - }, - "ipAddress": "10.0.0.0", - "addressSpace": { - "addressPrefixes": [ - "10.0.0.0/16" - ] - }, - "bgpProperties": { - "bgpPeeringAddress": "192.168.0.0", - "asn": 1234 - } - } - }, + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "location": "West US", + "name": "vpnSite1", + "type": "Microsoft.Network/vpnSites", + "tags": { + "key1": "value1" + }, + "properties": { + "provisioningState": "Succeeded", + "virtualWan": { + "id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualWANs/wan1" + }, + "deviceProperties": { + "linkSpeedInMbps": 0 + }, + "addressSpace": { + "addressPrefixes": [ + "10.0.0.0/16" + ] + }, + "isSecuritySite": false, + "vpnSiteLinks": [ + { + "name": "vpnSiteLink1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/vpnSiteLink1", + "etag": "W/\"00000000-0000-0000-0000-000000000000\"", + "properties": { + "provisioningState": "Succeeded", + "ipAddress": "50.50.50.56", + "linkProperties": { + "linkSpeedInMbps": 0 + } + "bgpProperties": { + "bgpPeeringAddress": "192.168.0.0", + "asn": 1234 + } + }, + "type": "Microsoft.Network/vpnSites/vpnSiteLinks" + } + ] + } + }, { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite2", "etag": "w/\\00000000-0000-0000-0000-000000000000\\", diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSitePut.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSitePut.json index d98e217bdbae..0552a86fcd22 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSitePut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSitePut.json @@ -10,23 +10,33 @@ }, "location": "West US", "properties": { - "virtualWan": { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/VirtualWans/virtualWan1" }, - "deviceProperties": { - "deviceVendor": "vendor1", - "deviceModel": "model01", - "linkSpeedInMbps": 200 - }, - "ipAddress": "10.0.0.0", - "addressSpace": { - "addressPrefixes": [ - "10.0.0.0/16" - ] - }, - "bgpProperties": { - "bgpPeeringAddress": "192.168.0.0", - "asn": 1234 + "virtualWan": { + "id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualWANs/wan1" + }, + "addressSpace": { + "addressPrefixes": [ + "10.0.0.0/16" + ] + }, + "isSecuritySite": false, + "vpnSiteLinks": [ + { + "name": "vpnSiteLink1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/vpnSiteLink1", + "properties": { + "ipAddress": "50.50.50.56", + "linkProperties": { + "linkProviderName": "vendor1", + "linkSpeedInMbps": 0 + } + "bgpProperties": { + "bgpPeeringAddress": "192.168.0.0", + "asn": 1234 + } + } + } + ] } - } } }, "responses": { @@ -42,22 +52,38 @@ }, "properties": { "provisioningState": "Succeeded", - "virtualWan": { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/VirtualWans/virtualWan1" }, + "virtualWan": { + "id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualWANs/wan1" + }, "deviceProperties": { - "deviceVendor": "vendor1", - "deviceModel": "model01", - "linkSpeedInMbps": 200 + "linkSpeedInMbps": 0 }, - "ipAddress": "10.1.0.0", "addressSpace": { "addressPrefixes": [ "10.0.0.0/16" ] }, - "bgpProperties": { - "bgpPeeringAddress": "192.168.0.0", - "asn": 1234 - } + "isSecuritySite": false, + "vpnSiteLinks": [ + { + "name": "vpnSiteLink1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/vpnSiteLink1", + "etag": "W/\"00000000-0000-0000-0000-000000000000\"", + "properties": { + "provisioningState": "Succeeded", + "ipAddress": "50.50.50.56", + "linkProperties": { + "linkProviderName": "vendor1" + "linkSpeedInMbps": 0 + } + "bgpProperties": { + "bgpPeeringAddress": "192.168.0.0", + "asn": 1234 + } + }, + "type": "Microsoft.Network/vpnSites/vpnSiteLinks" + } + ] } } }, @@ -73,22 +99,38 @@ }, "properties": { "provisioningState": "Succeeded", - "virtualWan": { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/VirtualWans/virtualWan1"}, + "virtualWan": { + "id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualWANs/wan1" + }, "deviceProperties": { - "deviceVendor": "vendor1", - "deviceModel": "model01", - "linkSpeedInMbps": 200 + "linkSpeedInMbps": 0 }, - "ipAddress": "10.1.0.0", "addressSpace": { "addressPrefixes": [ "10.0.0.0/16" ] }, - "bgpProperties": { - "bgpPeeringAddress": "192.168.0.0", - "asn": 1234 - } + "isSecuritySite": false, + "vpnSiteLinks": [ + { + "name": "vpnSiteLink1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/vpnSiteLink1", + "etag": "W/\"00000000-0000-0000-0000-000000000000\"", + "properties": { + "provisioningState": "Succeeded", + "ipAddress": "50.50.50.56", + "linkProperties": { + "linkProviderName": "vendor1" + "linkSpeedInMbps": 0 + } + "bgpProperties": { + "bgpPeeringAddress": "192.168.0.0", + "asn": 1234 + } + }, + "type": "Microsoft.Network/vpnSites/vpnSiteLinks" + } + ] } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/virtualWan.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/virtualWan.json index eb8498ffd235..522916257083 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/virtualWan.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/virtualWan.json @@ -663,137 +663,7 @@ } } }, - "put": { - "operationId": "VpnSiteLinks_CreateOrUpdate", - "x-ms-examples": { - "VpnSiteCreate": { - "$ref": "./examples/VpnSiteLinkPut.json" - } - }, - "description": "Creates a VpnSiteLink resource if it doesn't exist else updates the existing VpnSiteLink.", - "parameters": [ - { - "$ref": "./network.json#/parameters/SubscriptionIdParameter" - }, - { - "name": "resourceGroupName", - "in": "path", - "required": true, - "type": "string", - "description": "The resource group name of the VpnSite." - }, - { - "name": "vpnSiteName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the VpnSite being created or updated." - }, - { - "name": "vpnSiteLinkName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the VpnSiteLink being retrieved." - }, - { - "$ref": "./network.json#/parameters/ApiVersionParameter" - }, - { - "name": "VpnSiteLinkParameters", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/VpnSiteLink" - }, - "description": "Parameters supplied to create or update VpnSiteLink." - } - ], - "responses": { - "200": { - "description": "Request successful. Returns the details of the VpnSiteLink created or updated.", - "schema": { - "$ref": "#/definitions/VpnSiteLink" - } - }, - "201": { - "description": "Request received successfully. Returns the details of the VpnSite created or updated.", - "schema": { - "$ref": "#/definitions/VpnSiteLink" - } - }, - "default": { - "description": "Error.", - "schema": { - "$ref": "./network.json#/definitions/Error" - } - } - }, - "x-ms-long-running-operation": true, - "x-ms-long-running-operation-options": { - "final-state-via": "azure-async-operation" - } }, - "delete": { - "operationId": "VpnSiteLinks_Delete", - "x-ms-examples": { - "VpnSiteDelete": { - "$ref": "./examples/VpnSiteLinkDelete.json" - } - }, - "description": "Deletes a VpnSiteLink.", - "parameters": [ - { - "$ref": "./network.json#/parameters/SubscriptionIdParameter" - }, - { - "name": "resourceGroupName", - "in": "path", - "required": true, - "type": "string", - "description": "The resource group name of the VpnSite." - }, - { - "name": "vpnSiteName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the VpnSite being deleted." - }, - { - "name": "vpnSiteLinkName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the VpnSiteLink being retrieved." - }, - { - "$ref": "./network.json#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "Request successful. VpnSiteLink deleted." - }, - "202": { - "description": "Request received successfully. VpnSiteLink deletion is in progress." - }, - "204": { - "description": "No VpnSiteLink exist by the name provided." - }, - "default": { - "description": "Error.", - "schema": { - "$ref": "./network.json#/definitions/Error" - } - } - }, - "x-ms-long-running-operation": true, - "x-ms-long-running-operation-options": { - "final-state-via": "location" - } - } - }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnSites/{vpnSiteName}/vpnSiteLinks": { "get": { "operationId": "VpnSiteLinks_ListByVpnSite", @@ -1997,150 +1867,6 @@ } } } - }, - "put": { - "operationId": "VpnSiteLinkConnections_CreateOrUpdate", - "x-ms-examples": { - "VpnSiteLinkConnectionPut": { - "$ref": "./examples/VpnSiteLinkConnectionPut.json" - } - }, - "description": "Creates a vpn connection to a scalable vpn gateway if it doesn't exist else updates the existing connection.", - "parameters": [ - { - "$ref": "./network.json#/parameters/SubscriptionIdParameter" - }, - { - "name": "resourceGroupName", - "in": "path", - "required": true, - "type": "string", - "description": "The resource group name of the VpnGateway." - }, - { - "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 connection." - }, - { - "name": "linkConnectionName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the vpn connection." - }, - { - "$ref": "./network.json#/parameters/ApiVersionParameter" - }, - { - "name": "VpnSiteLinkConnectionProperties", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/VpnSiteLinkConnectionProperties" - }, - "description": "Parameters supplied to create or Update a VPN Connection." - } - ], - "responses": { - "200": { - "description": "Request successful. Returns the details of the vpn connection created or updated.", - "schema": { - "$ref": "#/definitions/VpnSiteLinkConnection" - } - }, - "201": { - "description": "Request successful. Returns the details of the vpn connection created or updated.", - "schema": { - "$ref": "#/definitions/VpnSiteLinkConnection" - } - }, - "default": { - "description": "Error.", - "schema": { - "$ref": "./network.json#/definitions/Error" - } - } - }, - "x-ms-long-running-operation": true, - "x-ms-long-running-operation-options": { - "final-state-via": "azure-async-operation" - } - }, - "delete": { - "operationId": "VpnSiteLinkConnections_Delete", - "x-ms-examples": { - "VpnSiteLinkConnectionDelete": { - "$ref": "./examples/VpnSiteLinkConnectionDelete.json" - } - }, - "description": "Deletes a vpn site link connection.", - "parameters": [ - { - "$ref": "./network.json#/parameters/SubscriptionIdParameter" - }, - { - "name": "resourceGroupName", - "in": "path", - "required": true, - "type": "string", - "description": "The resource group name of the VpnGateway." - }, - { - "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 connection." - }, - { - "name": "linkConnectionName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the vpn connection." - }, - { - "$ref": "./network.json#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "Request successful. VpnSiteLinkConnection deleted." - }, - "202": { - "description": "Request received successfully. VpnSiteLinkConnection deletion is in progress; follow the Location header to poll for final outcome." - }, - "204": { - "description": "No vpn site link connection exist by the name provided." - }, - "default": { - "description": "Error.", - "schema": { - "$ref": "./network.json#/definitions/Error" - } - } - }, - "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": { From c433da50403e0d5367dfb28c679ba24484e9b124 Mon Sep 17 00:00:00 2001 From: Nalin Gupta Date: Mon, 1 Jul 2019 16:18:11 -0700 Subject: [PATCH 03/15] Fixing error. --- .../examples/VpnSiteLinkListByVpnSite.json | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkListByVpnSite.json diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkListByVpnSite.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkListByVpnSite.json new file mode 100644 index 000000000000..ff015a6c37a4 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkListByVpnSite.json @@ -0,0 +1,49 @@ +{ + "parameters": { + "api-version": "2019-06-01", + "subscriptionId": "subid", + "vpnSiteName": "vpnSite1" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "vpnSiteLink1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/vpnSiteLink1", + "etag": "W/\"00000000-0000-0000-0000-000000000000\"", + "properties": { + "provisioningState": "Succeeded", + "ipAddress": "50.50.50.56", + "linkProperties": { + "linkSpeedInMbps": 200 + } + "bgpProperties": { + "bgpPeeringAddress": "192.168.0.0", + "asn": 1234 + } + }, + "type": "Microsoft.Network/vpnSites/vpnSiteLinks" + }, + { + "name": "vpnSiteLink2", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/vpnSiteLink2", + "etag": "W/\"00000000-0000-0000-0000-000000000000\"", + "properties": { + "provisioningState": "Succeeded", + "ipAddress": "40.40.40.46", + "linkProperties": { + "linkSpeedInMbps": 200 + } + "bgpProperties": { + "bgpPeeringAddress": "192.168.0.1", + "asn": 1234 + } + }, + "type": "Microsoft.Network/vpnSites/vpnSiteLinks" + } + ] + } + } + } +} From 568115b016603a6eb6aa44e9d0f6679b0e31d404 Mon Sep 17 00:00:00 2001 From: Nalin Gupta Date: Mon, 1 Jul 2019 16:45:03 -0700 Subject: [PATCH 04/15] Fixing more comments. --- .../Microsoft.Network/stable/2019-06-01/virtualWan.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/virtualWan.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/virtualWan.json index 522916257083..828f44b81489 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/virtualWan.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/virtualWan.json @@ -2814,7 +2814,7 @@ "description": "The ip-address for the vpn-site-link." }, "bgpProperties": { - "$ref": "/definitions/VpnLinkBgpSettings", + "$ref": "#/definitions/VpnLinkBgpSettings", "description": "The set of bgp properties." }, "provisioningState": { From dd785bce41bdea06375c7e7cb347059df15ca3f4 Mon Sep 17 00:00:00 2001 From: Nalin Gupta Date: Mon, 1 Jul 2019 17:56:56 -0700 Subject: [PATCH 05/15] Fixing json error. --- .../Microsoft.Network/stable/2019-06-01/virtualWan.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/virtualWan.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/virtualWan.json index 828f44b81489..85cedeb38bb7 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/virtualWan.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/virtualWan.json @@ -662,8 +662,8 @@ } } } - }, - }, + } + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnSites/{vpnSiteName}/vpnSiteLinks": { "get": { "operationId": "VpnSiteLinks_ListByVpnSite", @@ -3919,4 +3919,4 @@ "description": "List of properties of a link provider." } } -} +} \ No newline at end of file From bcc4d459dcbdc1453e65c4a4c8155cce35be357e Mon Sep 17 00:00:00 2001 From: Nalin Gupta Date: Mon, 1 Jul 2019 18:44:21 -0700 Subject: [PATCH 06/15] Fixing json files. --- .../2019-06-01/examples/VpnSiteGet.json | 48 +++--- .../examples/VpnSiteLinkConnectionGet.json | 51 +++--- .../examples/VpnSiteLinkConnectionList.json | 46 +++--- .../2019-06-01/examples/VpnSiteLinkGet.json | 36 ++--- .../2019-06-01/examples/VpnSiteLinkList.json | 72 ++++----- .../examples/VpnSiteLinkListByVpnSite.json | 72 ++++----- .../2019-06-01/examples/VpnSiteList.json | 90 +++++------ .../examples/VpnSiteListByResourceGroup.json | 88 +++++------ .../2019-06-01/examples/VpnSitePut.json | 148 +++++++++--------- 9 files changed, 324 insertions(+), 327 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteGet.json index fb867ae2a0cb..581ca969b54b 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteGet.json @@ -19,8 +19,8 @@ "properties": { "provisioningState": "Succeeded", "virtualWan": { - "id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualWANs/wan1" - }, + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualWANs/wan1" + }, "deviceProperties": { "linkSpeedInMbps": 0 }, @@ -29,29 +29,29 @@ "10.0.0.0/16" ] }, - "isSecuritySite": false, - "vpnSiteLinks": [ - { - "name": "vpnSiteLink1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/vpnSiteLink1", - "etag": "W/\"00000000-0000-0000-0000-000000000000\"", - "properties": { - "provisioningState": "Succeeded", - "ipAddress": "50.50.50.56", - "linkProperties": { - "linkProviderName": "vendor1" - "linkSpeedInMbps": 0 - } - "bgpProperties": { - "bgpPeeringAddress": "192.168.0.0", - "asn": 1234 - } - }, - "type": "Microsoft.Network/vpnSites/vpnSiteLinks" - } - ] + "isSecuritySite": false, + "vpnSiteLinks": [ + { + "name": "vpnSiteLink1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/vpnSiteLink1", + "etag": "W/\"00000000-0000-0000-0000-000000000000\"", + "properties": { + "provisioningState": "Succeeded", + "ipAddress": "50.50.50.56", + "linkProperties": { + "linkProviderName": "vendor1", + "linkSpeedInMbps": 0 + }, + "bgpProperties": { + "bgpPeeringAddress": "192.168.0.0", + "asn": 1234 + } + }, + "type": "Microsoft.Network/vpnSites/vpnSiteLinks" + } + ] } } } } -} +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkConnectionGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkConnectionGet.json index c242a042ab95..51cd9125f84e 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkConnectionGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkConnectionGet.json @@ -2,37 +2,36 @@ "parameters": { "gatewayName": "gateway1", "connectionName": "vpnConnection1", - "linkConnectionName": "Connection-Link1", + "linkConnectionName": "Connection-Link1", "resourceGroupName": "rg1", "api-version": "2019-06-01", "subscriptionId": "subid" }, "responses": { "200": { - "body": - { - "name": "Connection-Link1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "properties": { - "provisioningState": "Succeeded", - "vpnSiteLink": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink1" - }, - "connectionBandwidth": 200, - "ipsecPolicies": [], - "vpnConnectionProtocolType": "IKEv2", - "sharedKey": "key", - "ingressBytesTransferred": 0, - "egressBytesTransferred": 0, - "enableBgp": false, - "enableRateLimiting": false, - "useLocalAzureIpAddress": false, - "usePolicyBasedTrafficSelectors": false, - "routingWeight": 0 - }, - "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections" - } + "body": { + "name": "Connection-Link1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "vpnSiteLink": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink1" + }, + "connectionBandwidth": 200, + "ipsecPolicies": [], + "vpnConnectionProtocolType": "IKEv2", + "sharedKey": "key", + "ingressBytesTransferred": 0, + "egressBytesTransferred": 0, + "enableBgp": false, + "enableRateLimiting": false, + "useLocalAzureIpAddress": false, + "usePolicyBasedTrafficSelectors": false, + "routingWeight": 0 + }, + "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections" + } } } -} +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkConnectionList.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkConnectionList.json index ec86f9f50204..370ecc036c0c 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkConnectionList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkConnectionList.json @@ -9,29 +9,29 @@ "200": { "body": [ { - "name": "Connection-Link1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "properties": { - "provisioningState": "Succeeded", - "vpnSiteLink": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink1" - }, - "connectionBandwidth": 200, - "ipsecPolicies": [], - "vpnConnectionProtocolType": "IKEv2", - "sharedKey": "key", - "ingressBytesTransferred": 0, - "egressBytesTransferred": 0, - "enableBgp": false, - "enableRateLimiting": false, - "useLocalAzureIpAddress": false, - "usePolicyBasedTrafficSelectors": false, - "routingWeight": 0 - }, - "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections" - } + "name": "Connection-Link1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "vpnSiteLink": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink1" + }, + "connectionBandwidth": 200, + "ipsecPolicies": [], + "vpnConnectionProtocolType": "IKEv2", + "sharedKey": "key", + "ingressBytesTransferred": 0, + "egressBytesTransferred": 0, + "enableBgp": false, + "enableRateLimiting": false, + "useLocalAzureIpAddress": false, + "usePolicyBasedTrafficSelectors": false, + "routingWeight": 0 + }, + "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections" + } ] } } -} +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkGet.json index f1c8864860c9..8eb484afa5d0 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkGet.json @@ -1,7 +1,7 @@ { "parameters": { "vpnSiteName": "vpnSite1", - "vpnSiteLinkName": "vpnSiteLink1", + "vpnSiteLinkName": "vpnSiteLink1", "resourceGroupName": "rg1", "api-version": "2019-06-01", "subscriptionId": "subid" @@ -9,24 +9,22 @@ "responses": { "200": { "body": { - { - "name": "vpnSiteLink1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/vpnSiteLink1", - "etag": "W/\"00000000-0000-0000-0000-000000000000\"", - "properties": { - "provisioningState": "Succeeded", - "ipAddress": "50.50.50.56", - "linkProperties": { - "linkSpeedInMbps": 0 - } - "bgpProperties": { - "bgpPeeringAddress": "192.168.0.0", - "asn": 1234 - } - }, - "type": "Microsoft.Network/vpnSites/vpnSiteLinks" - } + "name": "vpnSiteLink1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/vpnSiteLink1", + "etag": "W/\"00000000-0000-0000-0000-000000000000\"", + "properties": { + "provisioningState": "Succeeded", + "ipAddress": "50.50.50.56", + "linkProperties": { + "linkSpeedInMbps": 0 + }, + "bgpProperties": { + "bgpPeeringAddress": "192.168.0.0", + "asn": 1234 + } + }, + "type": "Microsoft.Network/vpnSites/vpnSiteLinks" } } } -} +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkList.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkList.json index ff015a6c37a4..629733abf41f 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkList.json @@ -2,48 +2,48 @@ "parameters": { "api-version": "2019-06-01", "subscriptionId": "subid", - "vpnSiteName": "vpnSite1" + "vpnSiteName": "vpnSite1" }, "responses": { "200": { "body": { "value": [ - { - "name": "vpnSiteLink1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/vpnSiteLink1", - "etag": "W/\"00000000-0000-0000-0000-000000000000\"", - "properties": { - "provisioningState": "Succeeded", - "ipAddress": "50.50.50.56", - "linkProperties": { - "linkSpeedInMbps": 200 - } - "bgpProperties": { - "bgpPeeringAddress": "192.168.0.0", - "asn": 1234 - } - }, - "type": "Microsoft.Network/vpnSites/vpnSiteLinks" - }, - { - "name": "vpnSiteLink2", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/vpnSiteLink2", - "etag": "W/\"00000000-0000-0000-0000-000000000000\"", - "properties": { - "provisioningState": "Succeeded", - "ipAddress": "40.40.40.46", - "linkProperties": { - "linkSpeedInMbps": 200 - } - "bgpProperties": { - "bgpPeeringAddress": "192.168.0.1", - "asn": 1234 - } - }, - "type": "Microsoft.Network/vpnSites/vpnSiteLinks" - } + { + "name": "vpnSiteLink1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/vpnSiteLink1", + "etag": "W/\"00000000-0000-0000-0000-000000000000\"", + "properties": { + "provisioningState": "Succeeded", + "ipAddress": "50.50.50.56", + "linkProperties": { + "linkSpeedInMbps": 200 + }, + "bgpProperties": { + "bgpPeeringAddress": "192.168.0.0", + "asn": 1234 + } + }, + "type": "Microsoft.Network/vpnSites/vpnSiteLinks" + }, + { + "name": "vpnSiteLink2", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/vpnSiteLink2", + "etag": "W/\"00000000-0000-0000-0000-000000000000\"", + "properties": { + "provisioningState": "Succeeded", + "ipAddress": "40.40.40.46", + "linkProperties": { + "linkSpeedInMbps": 200 + }, + "bgpProperties": { + "bgpPeeringAddress": "192.168.0.1", + "asn": 1234 + } + }, + "type": "Microsoft.Network/vpnSites/vpnSiteLinks" + } ] } } } -} +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkListByVpnSite.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkListByVpnSite.json index ff015a6c37a4..629733abf41f 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkListByVpnSite.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkListByVpnSite.json @@ -2,48 +2,48 @@ "parameters": { "api-version": "2019-06-01", "subscriptionId": "subid", - "vpnSiteName": "vpnSite1" + "vpnSiteName": "vpnSite1" }, "responses": { "200": { "body": { "value": [ - { - "name": "vpnSiteLink1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/vpnSiteLink1", - "etag": "W/\"00000000-0000-0000-0000-000000000000\"", - "properties": { - "provisioningState": "Succeeded", - "ipAddress": "50.50.50.56", - "linkProperties": { - "linkSpeedInMbps": 200 - } - "bgpProperties": { - "bgpPeeringAddress": "192.168.0.0", - "asn": 1234 - } - }, - "type": "Microsoft.Network/vpnSites/vpnSiteLinks" - }, - { - "name": "vpnSiteLink2", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/vpnSiteLink2", - "etag": "W/\"00000000-0000-0000-0000-000000000000\"", - "properties": { - "provisioningState": "Succeeded", - "ipAddress": "40.40.40.46", - "linkProperties": { - "linkSpeedInMbps": 200 - } - "bgpProperties": { - "bgpPeeringAddress": "192.168.0.1", - "asn": 1234 - } - }, - "type": "Microsoft.Network/vpnSites/vpnSiteLinks" - } + { + "name": "vpnSiteLink1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/vpnSiteLink1", + "etag": "W/\"00000000-0000-0000-0000-000000000000\"", + "properties": { + "provisioningState": "Succeeded", + "ipAddress": "50.50.50.56", + "linkProperties": { + "linkSpeedInMbps": 200 + }, + "bgpProperties": { + "bgpPeeringAddress": "192.168.0.0", + "asn": 1234 + } + }, + "type": "Microsoft.Network/vpnSites/vpnSiteLinks" + }, + { + "name": "vpnSiteLink2", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/vpnSiteLink2", + "etag": "W/\"00000000-0000-0000-0000-000000000000\"", + "properties": { + "provisioningState": "Succeeded", + "ipAddress": "40.40.40.46", + "linkProperties": { + "linkSpeedInMbps": 200 + }, + "bgpProperties": { + "bgpPeeringAddress": "192.168.0.1", + "asn": 1234 + } + }, + "type": "Microsoft.Network/vpnSites/vpnSiteLinks" + } ] } } } -} +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteList.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteList.json index 5dbf3d0ffee7..b9f825752ec9 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteList.json @@ -8,49 +8,49 @@ "body": { "value": [ { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "location": "West US", - "name": "vpnSite1", - "type": "Microsoft.Network/vpnSites", - "tags": { - "key1": "value1" - }, - "properties": { - "provisioningState": "Succeeded", - "virtualWan": { - "id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualWANs/wan1" - }, - "deviceProperties": { - "linkSpeedInMbps": 0 - }, - "addressSpace": { - "addressPrefixes": [ - "10.0.0.0/16" - ] - }, - "isSecuritySite": false, - "vpnSiteLinks": [ - { - "name": "vpnSiteLink1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/vpnSiteLink1", - "etag": "W/\"00000000-0000-0000-0000-000000000000\"", - "properties": { - "provisioningState": "Succeeded", - "ipAddress": "50.50.50.56", - "linkProperties": { - "linkSpeedInMbps": 0 - } - "bgpProperties": { - "bgpPeeringAddress": "192.168.0.0", - "asn": 1234 - } - }, - "type": "Microsoft.Network/vpnSites/vpnSiteLinks" - } - ] - } - }, + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "location": "West US", + "name": "vpnSite1", + "type": "Microsoft.Network/vpnSites", + "tags": { + "key1": "value1" + }, + "properties": { + "provisioningState": "Succeeded", + "virtualWan": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualWANs/wan1" + }, + "deviceProperties": { + "linkSpeedInMbps": 0 + }, + "addressSpace": { + "addressPrefixes": [ + "10.0.0.0/16" + ] + }, + "isSecuritySite": false, + "vpnSiteLinks": [ + { + "name": "vpnSiteLink1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/vpnSiteLink1", + "etag": "W/\"00000000-0000-0000-0000-000000000000\"", + "properties": { + "provisioningState": "Succeeded", + "ipAddress": "50.50.50.56", + "linkProperties": { + "linkSpeedInMbps": 0 + }, + "bgpProperties": { + "bgpPeeringAddress": "192.168.0.0", + "asn": 1234 + } + }, + "type": "Microsoft.Network/vpnSites/vpnSiteLinks" + } + ] + } + }, { "id": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/vpnSites/vpnSite2", "etag": "w/\\00000000-0000-0000-0000-000000000000\\", @@ -78,11 +78,11 @@ "bgpPeeringAddress": "192.168.0.0", "asn": 1234 }, - "isSecuritySite": false, + "isSecuritySite": false } } ] } } } -} +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteListByResourceGroup.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteListByResourceGroup.json index fb238cefca68..50b6ab5e738c 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteListByResourceGroup.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteListByResourceGroup.json @@ -9,49 +9,49 @@ "body": { "value": [ { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "location": "West US", - "name": "vpnSite1", - "type": "Microsoft.Network/vpnSites", - "tags": { - "key1": "value1" - }, - "properties": { - "provisioningState": "Succeeded", - "virtualWan": { - "id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualWANs/wan1" - }, - "deviceProperties": { - "linkSpeedInMbps": 0 - }, - "addressSpace": { - "addressPrefixes": [ - "10.0.0.0/16" - ] - }, - "isSecuritySite": false, - "vpnSiteLinks": [ - { - "name": "vpnSiteLink1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/vpnSiteLink1", - "etag": "W/\"00000000-0000-0000-0000-000000000000\"", - "properties": { - "provisioningState": "Succeeded", - "ipAddress": "50.50.50.56", - "linkProperties": { - "linkSpeedInMbps": 0 - } - "bgpProperties": { - "bgpPeeringAddress": "192.168.0.0", - "asn": 1234 - } - }, - "type": "Microsoft.Network/vpnSites/vpnSiteLinks" - } - ] - } - }, + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "location": "West US", + "name": "vpnSite1", + "type": "Microsoft.Network/vpnSites", + "tags": { + "key1": "value1" + }, + "properties": { + "provisioningState": "Succeeded", + "virtualWan": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualWANs/wan1" + }, + "deviceProperties": { + "linkSpeedInMbps": 0 + }, + "addressSpace": { + "addressPrefixes": [ + "10.0.0.0/16" + ] + }, + "isSecuritySite": false, + "vpnSiteLinks": [ + { + "name": "vpnSiteLink1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/vpnSiteLink1", + "etag": "W/\"00000000-0000-0000-0000-000000000000\"", + "properties": { + "provisioningState": "Succeeded", + "ipAddress": "50.50.50.56", + "linkProperties": { + "linkSpeedInMbps": 0 + }, + "bgpProperties": { + "bgpPeeringAddress": "192.168.0.0", + "asn": 1234 + } + }, + "type": "Microsoft.Network/vpnSites/vpnSiteLinks" + } + ] + } + }, { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite2", "etag": "w/\\00000000-0000-0000-0000-000000000000\\", @@ -85,4 +85,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSitePut.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSitePut.json index 0552a86fcd22..cd7c1d157d60 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSitePut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSitePut.json @@ -10,33 +10,33 @@ }, "location": "West US", "properties": { - "virtualWan": { - "id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualWANs/wan1" - }, - "addressSpace": { - "addressPrefixes": [ - "10.0.0.0/16" - ] - }, - "isSecuritySite": false, - "vpnSiteLinks": [ - { - "name": "vpnSiteLink1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/vpnSiteLink1", - "properties": { - "ipAddress": "50.50.50.56", - "linkProperties": { - "linkProviderName": "vendor1", - "linkSpeedInMbps": 0 - } - "bgpProperties": { - "bgpPeeringAddress": "192.168.0.0", - "asn": 1234 - } - } - } - ] - } + "virtualWan": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualWANs/wan1" + }, + "addressSpace": { + "addressPrefixes": [ + "10.0.0.0/16" + ] + }, + "isSecuritySite": false, + "vpnSiteLinks": [ + { + "name": "vpnSiteLink1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/vpnSiteLink1", + "properties": { + "ipAddress": "50.50.50.56", + "linkProperties": { + "linkProviderName": "vendor1", + "linkSpeedInMbps": 0 + }, + "bgpProperties": { + "bgpPeeringAddress": "192.168.0.0", + "asn": 1234 + } + } + } + ] + } } }, "responses": { @@ -53,8 +53,8 @@ "properties": { "provisioningState": "Succeeded", "virtualWan": { - "id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualWANs/wan1" - }, + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualWANs/wan1" + }, "deviceProperties": { "linkSpeedInMbps": 0 }, @@ -63,27 +63,27 @@ "10.0.0.0/16" ] }, - "isSecuritySite": false, - "vpnSiteLinks": [ - { - "name": "vpnSiteLink1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/vpnSiteLink1", - "etag": "W/\"00000000-0000-0000-0000-000000000000\"", - "properties": { - "provisioningState": "Succeeded", - "ipAddress": "50.50.50.56", - "linkProperties": { - "linkProviderName": "vendor1" - "linkSpeedInMbps": 0 - } - "bgpProperties": { - "bgpPeeringAddress": "192.168.0.0", - "asn": 1234 - } - }, - "type": "Microsoft.Network/vpnSites/vpnSiteLinks" - } - ] + "isSecuritySite": false, + "vpnSiteLinks": [ + { + "name": "vpnSiteLink1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/vpnSiteLink1", + "etag": "W/\"00000000-0000-0000-0000-000000000000\"", + "properties": { + "provisioningState": "Succeeded", + "ipAddress": "50.50.50.56", + "linkProperties": { + "linkProviderName": "vendor1", + "linkSpeedInMbps": 0 + }, + "bgpProperties": { + "bgpPeeringAddress": "192.168.0.0", + "asn": 1234 + } + }, + "type": "Microsoft.Network/vpnSites/vpnSiteLinks" + } + ] } } }, @@ -100,8 +100,8 @@ "properties": { "provisioningState": "Succeeded", "virtualWan": { - "id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualWANs/wan1" - }, + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualWANs/wan1" + }, "deviceProperties": { "linkSpeedInMbps": 0 }, @@ -110,29 +110,29 @@ "10.0.0.0/16" ] }, - "isSecuritySite": false, - "vpnSiteLinks": [ - { - "name": "vpnSiteLink1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/vpnSiteLink1", - "etag": "W/\"00000000-0000-0000-0000-000000000000\"", - "properties": { - "provisioningState": "Succeeded", - "ipAddress": "50.50.50.56", - "linkProperties": { - "linkProviderName": "vendor1" - "linkSpeedInMbps": 0 - } - "bgpProperties": { - "bgpPeeringAddress": "192.168.0.0", - "asn": 1234 - } - }, - "type": "Microsoft.Network/vpnSites/vpnSiteLinks" - } - ] + "isSecuritySite": false, + "vpnSiteLinks": [ + { + "name": "vpnSiteLink1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/vpnSiteLink1", + "etag": "W/\"00000000-0000-0000-0000-000000000000\"", + "properties": { + "provisioningState": "Succeeded", + "ipAddress": "50.50.50.56", + "linkProperties": { + "linkProviderName": "vendor1", + "linkSpeedInMbps": 0 + }, + "bgpProperties": { + "bgpPeeringAddress": "192.168.0.0", + "asn": 1234 + } + }, + "type": "Microsoft.Network/vpnSites/vpnSiteLinks" + } + ] } } } } -} +} \ No newline at end of file From 781aaba4bda689bbda494c89558126daa4779cf6 Mon Sep 17 00:00:00 2001 From: Nalin Gupta Date: Tue, 2 Jul 2019 10:50:51 -0700 Subject: [PATCH 07/15] Fixing comments. --- .../2019-06-01/examples/VpnConnectionPut.json | 137 +++++++++--------- .../examples/VpnSiteLinkConnectionList.json | 4 +- .../2019-06-01/examples/VpnSiteLinkList.json | 49 ------- .../examples/VpnSiteLinkListByVpnSite.json | 1 + .../stable/2019-06-01/virtualWan.json | 2 +- 5 files changed, 74 insertions(+), 119 deletions(-) delete mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkList.json diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionPut.json index f797587f6d07..8bead8764682 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionPut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionPut.json @@ -10,22 +10,22 @@ "remoteVpnSite": { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1" }, - "vpnLinkConnections": [ - { - "name": "Connection-Link1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "properties": { - "provisioningState": "Succeeded", - "vpnSiteLink": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink1" - }, - "connectionBandwidth": 200, - "vpnConnectionProtocolType": "IKEv2", - "sharedKey": "key" - } - } - ] + "vpnLinkConnections": [ + { + "name": "Connection-Link1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "vpnSiteLink": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink1" + }, + "connectionBandwidth": 200, + "vpnConnectionProtocolType": "IKEv2", + "sharedKey": "key" + } + } + ] } } }, @@ -39,35 +39,35 @@ "remoteVpnSite": { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1" }, - "enableInternetSecurity": false, + "enableInternetSecurity": false, "ingressBytesTransferred": 0, "egressBytesTransferred": 0, "vpnLinkConnections": [ - { - "name": "Connection-Link1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "properties": { - "provisioningState": "Succeeded", - "vpnSiteLink": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink1" - }, - "connectionBandwidth": 200, - "ipsecPolicies": [], - "vpnConnectionProtocolType": "IKEv2", - "sharedKey": "key", - "ingressBytesTransferred": 0, - "egressBytesTransferred": 0, - "enableBgp": false, - "enableRateLimiting": false, - "useLocalAzureIpAddress": false, - "usePolicyBasedTrafficSelectors": false, - "routingWeight": 0 - }, - "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections" - } - ], - "type": "Microsoft.Network/vpnGateways/vpnConnections" + { + "name": "Connection-Link1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "vpnSiteLink": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink1" + }, + "connectionBandwidth": 200, + "ipsecPolicies": [], + "vpnConnectionProtocolType": "IKEv2", + "sharedKey": "key", + "ingressBytesTransferred": 0, + "egressBytesTransferred": 0, + "enableBgp": false, + "enableRateLimiting": false, + "useLocalAzureIpAddress": false, + "usePolicyBasedTrafficSelectors": false, + "routingWeight": 0 + }, + "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections" + } + ], + "type": "Microsoft.Network/vpnGateways/vpnConnections" } }, "201": { @@ -79,35 +79,36 @@ "remoteVpnSite": { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1" }, - "enableInternetSecurity": false, + "enableInternetSecurity": false, "ingressBytesTransferred": 0, "egressBytesTransferred": 0, "vpnLinkConnections": [ - { - "name": "Connection-Link1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "properties": { - "provisioningState": "Succeeded", - "vpnSiteLink": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink1" - }, - "connectionBandwidth": 200, - "ipsecPolicies": [], - "vpnConnectionProtocolType": "IKEv2", - "sharedKey": "key", - "ingressBytesTransferred": 0, - "egressBytesTransferred": 0, - "enableBgp": false, - "enableRateLimiting": false, - "useLocalAzureIpAddress": false, - "usePolicyBasedTrafficSelectors": false, - "routingWeight": 0 - }, - "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections" - } - ], - "type": "Microsoft.Network/vpnGateways/vpnConnections" + { + "name": "Connection-Link1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "vpnSiteLink": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink1" + }, + "connectionBandwidth": 200, + "ipsecPolicies": [], + "vpnConnectionProtocolType": "IKEv2", + "sharedKey": "key", + "ingressBytesTransferred": 0, + "egressBytesTransferred": 0, + "enableBgp": false, + "enableRateLimiting": false, + "useLocalAzureIpAddress": false, + "usePolicyBasedTrafficSelectors": false, + "routingWeight": 0 + }, + "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections" + } + ], + "type": "Microsoft.Network/vpnGateways/vpnConnections" } } + } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkConnectionList.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkConnectionList.json index 370ecc036c0c..143d43880d35 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkConnectionList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkConnectionList.json @@ -3,7 +3,9 @@ "gatewayName": "gateway1", "api-version": "2019-06-01", "resourceGroupName": "rg1", - "subscriptionId": "subid" + "subscriptionId": "subid", + "gatewayName": "gateway1", + "connectionName": "vpnConnection1" }, "responses": { "200": { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkList.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkList.json deleted file mode 100644 index 629733abf41f..000000000000 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkList.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "parameters": { - "api-version": "2019-06-01", - "subscriptionId": "subid", - "vpnSiteName": "vpnSite1" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "name": "vpnSiteLink1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/vpnSiteLink1", - "etag": "W/\"00000000-0000-0000-0000-000000000000\"", - "properties": { - "provisioningState": "Succeeded", - "ipAddress": "50.50.50.56", - "linkProperties": { - "linkSpeedInMbps": 200 - }, - "bgpProperties": { - "bgpPeeringAddress": "192.168.0.0", - "asn": 1234 - } - }, - "type": "Microsoft.Network/vpnSites/vpnSiteLinks" - }, - { - "name": "vpnSiteLink2", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/vpnSiteLink2", - "etag": "W/\"00000000-0000-0000-0000-000000000000\"", - "properties": { - "provisioningState": "Succeeded", - "ipAddress": "40.40.40.46", - "linkProperties": { - "linkSpeedInMbps": 200 - }, - "bgpProperties": { - "bgpPeeringAddress": "192.168.0.1", - "asn": 1234 - } - }, - "type": "Microsoft.Network/vpnSites/vpnSiteLinks" - } - ] - } - } - } -} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkListByVpnSite.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkListByVpnSite.json index 629733abf41f..99b5aa4e255f 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkListByVpnSite.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkListByVpnSite.json @@ -2,6 +2,7 @@ "parameters": { "api-version": "2019-06-01", "subscriptionId": "subid", + "resourceGroupName": "rg1", "vpnSiteName": "vpnSite1" }, "responses": { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/virtualWan.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/virtualWan.json index 85cedeb38bb7..b7c786dab1ed 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/virtualWan.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/virtualWan.json @@ -3181,7 +3181,7 @@ }, "VpnSiteLinkConnectionProperties": { "properties": { - "VpnSiteLink": { + "vpnSiteLink": { "$ref": "./network.json#/definitions/SubResource", "description": "Id of the connected vpn site link." }, From 6c622dbf7df4e172970da6df1a8915d61490fd28 Mon Sep 17 00:00:00 2001 From: Nalin Gupta Date: Tue, 2 Jul 2019 13:49:51 -0700 Subject: [PATCH 08/15] Fixing more issues. --- .../2019-06-01/examples/VpnConnectionGet.json | 9 +- .../examples/VpnConnectionList.json | 121 ++++++------ .../2019-06-01/examples/VpnConnectionPut.json | 175 +++++++++--------- .../2019-06-01/examples/VpnGatewayPut.json | 14 +- .../2019-06-01/examples/VpnSiteGet.json | 3 +- .../examples/VpnSiteLinkConnectionGet.json | 3 +- .../examples/VpnSiteLinkConnectionList.json | 3 +- .../2019-06-01/examples/VpnSiteLinkGet.json | 3 +- .../examples/VpnSiteLinkListByVpnSite.json | 6 +- .../2019-06-01/examples/VpnSiteList.json | 3 +- .../examples/VpnSiteListByResourceGroup.json | 3 +- .../2019-06-01/examples/VpnSitePut.json | 7 +- .../stable/2019-06-01/virtualWan.json | 2 +- 13 files changed, 161 insertions(+), 191 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionGet.json index 60db723c60e2..6305baff128d 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionGet.json @@ -41,8 +41,7 @@ "useLocalAzureIpAddress": false, "usePolicyBasedTrafficSelectors": false, "routingWeight": 0 - }, - "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections" + } }, { "name": "Connection-Link2", @@ -64,11 +63,9 @@ "useLocalAzureIpAddress": false, "usePolicyBasedTrafficSelectors": false, "routingWeight": 0 - }, - "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections" + } } - ], - "type": "Microsoft.Network/vpnGateways/vpnConnections" + ] } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionList.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionList.json index 7dea5a0bfbbf..1a743f330ef8 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionList.json @@ -9,69 +9,66 @@ "200": { "body": [ { - "name": "vpnConnection1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "properties": { - "provisioningState": "Succeeded", - "remoteVpnSite": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1" - }, - "enableInternetSecurity": false, - "ingressBytesTransferred": 0, - "egressBytesTransferred": 0, - "vpnLinkConnections": [ - { - "name": "Connection-Link1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "properties": { - "provisioningState": "Succeeded", - "vpnSiteLink": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink1" - }, - "connectionBandwidth": 200, - "ipsecPolicies": [], - "vpnConnectionProtocolType": "IKEv2", - "sharedKey": "key", - "ingressBytesTransferred": 0, - "egressBytesTransferred": 0, - "enableBgp": false, - "enableRateLimiting": false, - "useLocalAzureIpAddress": false, - "usePolicyBasedTrafficSelectors": false, - "routingWeight": 0 - }, - "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections" - }, - { - "name": "Connection-Link2", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link2", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "properties": { - "provisioningState": "Succeeded", - "vpnSiteLink": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink2" - }, - "connectionBandwidth": 200, - "ipsecPolicies": [], - "vpnConnectionProtocolType": "IKEv2", - "sharedKey": "key", - "ingressBytesTransferred": 0, - "egressBytesTransferred": 0, - "enableBgp": false, - "enableRateLimiting": false, - "useLocalAzureIpAddress": false, - "usePolicyBasedTrafficSelectors": false, - "routingWeight": 0 - }, - "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections" - } - ], - "type": "Microsoft.Network/vpnGateways/vpnConnections" + "name": "vpnConnection1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "remoteVpnSite": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1" + }, + "enableInternetSecurity": false, + "ingressBytesTransferred": 0, + "egressBytesTransferred": 0, + "vpnLinkConnections": [ + { + "name": "Connection-Link1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "vpnSiteLink": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink1" + }, + "connectionBandwidth": 200, + "ipsecPolicies": [], + "vpnConnectionProtocolType": "IKEv2", + "sharedKey": "key", + "ingressBytesTransferred": 0, + "egressBytesTransferred": 0, + "enableBgp": false, + "enableRateLimiting": false, + "useLocalAzureIpAddress": false, + "usePolicyBasedTrafficSelectors": false, + "routingWeight": 0 + } + }, + { + "name": "Connection-Link2", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link2", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "vpnSiteLink": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink2" + }, + "connectionBandwidth": 200, + "ipsecPolicies": [], + "vpnConnectionProtocolType": "IKEv2", + "sharedKey": "key", + "ingressBytesTransferred": 0, + "egressBytesTransferred": 0, + "enableBgp": false, + "enableRateLimiting": false, + "useLocalAzureIpAddress": false, + "usePolicyBasedTrafficSelectors": false, + "routingWeight": 0 + } + } + ] + } } - } ] } } -} +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionPut.json index 8bead8764682..9287cbb12ab9 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionPut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionPut.json @@ -11,104 +11,97 @@ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1" }, "vpnLinkConnections": [ - { - "name": "Connection-Link1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "properties": { - "provisioningState": "Succeeded", - "vpnSiteLink": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink1" - }, - "connectionBandwidth": 200, - "vpnConnectionProtocolType": "IKEv2", - "sharedKey": "key" - } + { + "name": "Connection-Link1", + "properties": { + "vpnSiteLink": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink1" + }, + "connectionBandwidth": 200, + "vpnConnectionProtocolType": "IKEv2", + "sharedKey": "key" } + } ] } } }, "responses": { "200": { - "name": "vpnConnection1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "properties": { - "provisioningState": "Succeeded", - "remoteVpnSite": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1" - }, - "enableInternetSecurity": false, - "ingressBytesTransferred": 0, - "egressBytesTransferred": 0, - "vpnLinkConnections": [ - { - "name": "Connection-Link1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "properties": { - "provisioningState": "Succeeded", - "vpnSiteLink": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink1" - }, - "connectionBandwidth": 200, - "ipsecPolicies": [], - "vpnConnectionProtocolType": "IKEv2", - "sharedKey": "key", - "ingressBytesTransferred": 0, - "egressBytesTransferred": 0, - "enableBgp": false, - "enableRateLimiting": false, - "useLocalAzureIpAddress": false, - "usePolicyBasedTrafficSelectors": false, - "routingWeight": 0 - }, - "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections" - } - ], - "type": "Microsoft.Network/vpnGateways/vpnConnections" - } - }, + "name": "vpnConnection1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "remoteVpnSite": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1" + }, + "enableInternetSecurity": false, + "ingressBytesTransferred": 0, + "egressBytesTransferred": 0, + "vpnLinkConnections": [ + { + "name": "Connection-Link1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "vpnSiteLink": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink1" + }, + "connectionBandwidth": 200, + "ipsecPolicies": [], + "vpnConnectionProtocolType": "IKEv2", + "sharedKey": "key", + "ingressBytesTransferred": 0, + "egressBytesTransferred": 0, + "enableBgp": false, + "enableRateLimiting": false, + "useLocalAzureIpAddress": false, + "usePolicyBasedTrafficSelectors": false, + "routingWeight": 0 + } + } + ] + } + }, "201": { - "name": "vpnConnection1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "properties": { - "provisioningState": "Succeeded", - "remoteVpnSite": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1" - }, - "enableInternetSecurity": false, - "ingressBytesTransferred": 0, - "egressBytesTransferred": 0, - "vpnLinkConnections": [ - { - "name": "Connection-Link1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "properties": { - "provisioningState": "Succeeded", - "vpnSiteLink": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink1" - }, - "connectionBandwidth": 200, - "ipsecPolicies": [], - "vpnConnectionProtocolType": "IKEv2", - "sharedKey": "key", - "ingressBytesTransferred": 0, - "egressBytesTransferred": 0, - "enableBgp": false, - "enableRateLimiting": false, - "useLocalAzureIpAddress": false, - "usePolicyBasedTrafficSelectors": false, - "routingWeight": 0 - }, - "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections" - } - ], - "type": "Microsoft.Network/vpnGateways/vpnConnections" - } + "name": "vpnConnection1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "remoteVpnSite": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1" + }, + "enableInternetSecurity": false, + "ingressBytesTransferred": 0, + "egressBytesTransferred": 0, + "vpnLinkConnections": [ + { + "name": "Connection-Link1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "vpnSiteLink": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink1" + }, + "connectionBandwidth": 200, + "ipsecPolicies": [], + "vpnConnectionProtocolType": "IKEv2", + "sharedKey": "key", + "ingressBytesTransferred": 0, + "egressBytesTransferred": 0, + "enableBgp": false, + "enableRateLimiting": false, + "useLocalAzureIpAddress": false, + "usePolicyBasedTrafficSelectors": false, + "routingWeight": 0 + } + } + ] } + } } -} +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayPut.json index ddbcc33fec2e..b4dbe77f162c 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayPut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayPut.json @@ -23,8 +23,6 @@ "vpnLinkConnections": [ { "name": "Connection-Link1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", "properties": { "provisioningState": "Succeeded", "vpnSiteLink": { @@ -92,11 +90,9 @@ "useLocalAzureIpAddress": false, "usePolicyBasedTrafficSelectors": false, "routingWeight": 0 - }, - "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections" + } } - ], - "type": "Microsoft.Network/vpnGateways/vpnConnections" + ] } } ], @@ -152,11 +148,9 @@ "useLocalAzureIpAddress": false, "usePolicyBasedTrafficSelectors": false, "routingWeight": 0 - }, - "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections" + } } - ], - "type": "Microsoft.Network/vpnGateways/vpnConnections" + ] } } ], diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteGet.json index 581ca969b54b..6ef1c4ef224a 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteGet.json @@ -46,8 +46,7 @@ "bgpPeeringAddress": "192.168.0.0", "asn": 1234 } - }, - "type": "Microsoft.Network/vpnSites/vpnSiteLinks" + } } ] } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkConnectionGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkConnectionGet.json index 51cd9125f84e..97c559907e4b 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkConnectionGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkConnectionGet.json @@ -29,8 +29,7 @@ "useLocalAzureIpAddress": false, "usePolicyBasedTrafficSelectors": false, "routingWeight": 0 - }, - "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections" + } } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkConnectionList.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkConnectionList.json index 143d43880d35..367482926270 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkConnectionList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkConnectionList.json @@ -30,8 +30,7 @@ "useLocalAzureIpAddress": false, "usePolicyBasedTrafficSelectors": false, "routingWeight": 0 - }, - "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections" + } } ] } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkGet.json index 8eb484afa5d0..64321fac4b36 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkGet.json @@ -22,8 +22,7 @@ "bgpPeeringAddress": "192.168.0.0", "asn": 1234 } - }, - "type": "Microsoft.Network/vpnSites/vpnSiteLinks" + } } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkListByVpnSite.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkListByVpnSite.json index 99b5aa4e255f..99804594549d 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkListByVpnSite.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkListByVpnSite.json @@ -23,8 +23,7 @@ "bgpPeeringAddress": "192.168.0.0", "asn": 1234 } - }, - "type": "Microsoft.Network/vpnSites/vpnSiteLinks" + } }, { "name": "vpnSiteLink2", @@ -40,8 +39,7 @@ "bgpPeeringAddress": "192.168.0.1", "asn": 1234 } - }, - "type": "Microsoft.Network/vpnSites/vpnSiteLinks" + } } ] } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteList.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteList.json index b9f825752ec9..4196ba529793 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteList.json @@ -45,8 +45,7 @@ "bgpPeeringAddress": "192.168.0.0", "asn": 1234 } - }, - "type": "Microsoft.Network/vpnSites/vpnSiteLinks" + } } ] } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteListByResourceGroup.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteListByResourceGroup.json index 50b6ab5e738c..6bd2c85c8c21 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteListByResourceGroup.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteListByResourceGroup.json @@ -46,8 +46,7 @@ "bgpPeeringAddress": "192.168.0.0", "asn": 1234 } - }, - "type": "Microsoft.Network/vpnSites/vpnSiteLinks" + } } ] } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSitePut.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSitePut.json index cd7c1d157d60..adf569f4fcea 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSitePut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSitePut.json @@ -22,7 +22,6 @@ "vpnSiteLinks": [ { "name": "vpnSiteLink1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/vpnSiteLink1", "properties": { "ipAddress": "50.50.50.56", "linkProperties": { @@ -80,8 +79,7 @@ "bgpPeeringAddress": "192.168.0.0", "asn": 1234 } - }, - "type": "Microsoft.Network/vpnSites/vpnSiteLinks" + } } ] } @@ -127,8 +125,7 @@ "bgpPeeringAddress": "192.168.0.0", "asn": 1234 } - }, - "type": "Microsoft.Network/vpnSites/vpnSiteLinks" + } } ] } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/virtualWan.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/virtualWan.json index b7c786dab1ed..03c53512fbca 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/virtualWan.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/virtualWan.json @@ -2843,7 +2843,7 @@ }, "allOf": [ { - "$ref": "./network.json#/definitions/Resource" + "$ref": "./network.json#/definitions/SubResource" } ], "description": "VpnSiteLink Resource." From b6a2b25cc23e03d914020a87b30d60916b6f779a Mon Sep 17 00:00:00 2001 From: Nalin Gupta Date: Tue, 2 Jul 2019 14:00:18 -0700 Subject: [PATCH 09/15] Fixing more errors. --- .../stable/2019-06-01/examples/VpnGatewayGet.json | 9 +++------ .../stable/2019-06-01/examples/VpnGatewayList.json | 9 +++------ .../examples/VpnGatewayListByResourceGroup.json | 9 +++------ .../stable/2019-06-01/examples/VpnGatewayPut.json | 1 - 4 files changed, 9 insertions(+), 19 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayGet.json index efba63e67746..e4feb093d908 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayGet.json @@ -52,8 +52,7 @@ "useLocalAzureIpAddress": false, "usePolicyBasedTrafficSelectors": false, "routingWeight": 0 - }, - "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections" + } }, { "name": "Connection-Link2", @@ -75,11 +74,9 @@ "useLocalAzureIpAddress": false, "usePolicyBasedTrafficSelectors": false, "routingWeight": 0 - }, - "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections" + } } - ], - "type": "Microsoft.Network/vpnGateways/vpnConnections" + ] } } ], diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayList.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayList.json index 01b5922ad38d..e76acb9db299 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayList.json @@ -53,8 +53,7 @@ "useLocalAzureIpAddress": false, "usePolicyBasedTrafficSelectors": false, "routingWeight": 0 - }, - "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections" + } }, { "name": "Connection-Link2", @@ -76,11 +75,9 @@ "useLocalAzureIpAddress": false, "usePolicyBasedTrafficSelectors": false, "routingWeight": 0 - }, - "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections" + } } - ], - "type": "Microsoft.Network/vpnGateways/vpnConnections" + ] } } ], diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayListByResourceGroup.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayListByResourceGroup.json index 01b5922ad38d..e76acb9db299 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayListByResourceGroup.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayListByResourceGroup.json @@ -53,8 +53,7 @@ "useLocalAzureIpAddress": false, "usePolicyBasedTrafficSelectors": false, "routingWeight": 0 - }, - "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections" + } }, { "name": "Connection-Link2", @@ -76,11 +75,9 @@ "useLocalAzureIpAddress": false, "usePolicyBasedTrafficSelectors": false, "routingWeight": 0 - }, - "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections" + } } - ], - "type": "Microsoft.Network/vpnGateways/vpnConnections" + ] } } ], diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayPut.json index b4dbe77f162c..3aa6445ff78c 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayPut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayPut.json @@ -24,7 +24,6 @@ { "name": "Connection-Link1", "properties": { - "provisioningState": "Succeeded", "vpnSiteLink": { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink1" }, From 22f9c7b522c025432d5a2976251582b36b1265f7 Mon Sep 17 00:00:00 2001 From: Nalin Gupta Date: Tue, 2 Jul 2019 18:44:08 -0700 Subject: [PATCH 10/15] Fixing more error. --- .../stable/2019-06-01/examples/VpnSiteLinkConnectionList.json | 1 - 1 file changed, 1 deletion(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkConnectionList.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkConnectionList.json index 367482926270..ad11751467ab 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkConnectionList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkConnectionList.json @@ -4,7 +4,6 @@ "api-version": "2019-06-01", "resourceGroupName": "rg1", "subscriptionId": "subid", - "gatewayName": "gateway1", "connectionName": "vpnConnection1" }, "responses": { From 29a797de48e6186c288ed71a5ffcecb84849de9e Mon Sep 17 00:00:00 2001 From: Anton Evseev Date: Wed, 3 Jul 2019 15:36:55 +0300 Subject: [PATCH 11/15] Prettify JSON in VpnConnectionGet.json --- .../2019-06-01/examples/VpnConnectionGet.json | 92 +++++++++---------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionGet.json index 6305baff128d..3e9ef4a89cda 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionGet.json @@ -17,55 +17,55 @@ "remoteVpnSite": { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1" }, - "enableInternetSecurity": false, + "enableInternetSecurity": false, "ingressBytesTransferred": 0, "egressBytesTransferred": 0, "vpnLinkConnections": [ - { - "name": "Connection-Link1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "properties": { - "provisioningState": "Succeeded", - "vpnSiteLink": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink1" - }, - "connectionBandwidth": 200, - "ipsecPolicies": [], - "vpnConnectionProtocolType": "IKEv2", - "sharedKey": "key", - "ingressBytesTransferred": 0, - "egressBytesTransferred": 0, - "enableBgp": false, - "enableRateLimiting": false, - "useLocalAzureIpAddress": false, - "usePolicyBasedTrafficSelectors": false, - "routingWeight": 0 - } - }, - { - "name": "Connection-Link2", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link2", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "properties": { - "provisioningState": "Succeeded", - "vpnSiteLink": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink2" - }, - "connectionBandwidth": 200, - "ipsecPolicies": [], - "vpnConnectionProtocolType": "IKEv2", - "sharedKey": "key", - "ingressBytesTransferred": 0, - "egressBytesTransferred": 0, - "enableBgp": false, - "enableRateLimiting": false, - "useLocalAzureIpAddress": false, - "usePolicyBasedTrafficSelectors": false, - "routingWeight": 0 - } - } - ] + { + "name": "Connection-Link1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "vpnSiteLink": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink1" + }, + "connectionBandwidth": 200, + "ipsecPolicies": [], + "vpnConnectionProtocolType": "IKEv2", + "sharedKey": "key", + "ingressBytesTransferred": 0, + "egressBytesTransferred": 0, + "enableBgp": false, + "enableRateLimiting": false, + "useLocalAzureIpAddress": false, + "usePolicyBasedTrafficSelectors": false, + "routingWeight": 0 + } + }, + { + "name": "Connection-Link2", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link2", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "vpnSiteLink": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink2" + }, + "connectionBandwidth": 200, + "ipsecPolicies": [], + "vpnConnectionProtocolType": "IKEv2", + "sharedKey": "key", + "ingressBytesTransferred": 0, + "egressBytesTransferred": 0, + "enableBgp": false, + "enableRateLimiting": false, + "useLocalAzureIpAddress": false, + "usePolicyBasedTrafficSelectors": false, + "routingWeight": 0 + } + } + ] } } } From 3e82c931d32602af5371eb39c0d14473d4e10bdf Mon Sep 17 00:00:00 2001 From: Nalin Gupta Date: Fri, 12 Jul 2019 17:04:42 -0700 Subject: [PATCH 12/15] Resolving more comments. --- .../2019-06-01/examples/VpnConnectionGet.json | 94 ++++++++++--------- .../examples/VpnConnectionList.json | 2 + .../2019-06-01/examples/VpnGatewayGet.json | 2 + .../2019-06-01/examples/VpnGatewayList.json | 2 + .../VpnGatewayListByResourceGroup.json | 2 + .../2019-06-01/examples/VpnSiteGet.json | 1 + .../examples/VpnSiteLinkConnectionGet.json | 1 + .../examples/VpnSiteLinkConnectionList.json | 1 + .../2019-06-01/examples/VpnSiteLinkGet.json | 1 + .../examples/VpnSiteLinkListByVpnSite.json | 2 + .../2019-06-01/examples/VpnSiteList.json | 1 + .../examples/VpnSiteListByResourceGroup.json | 1 + .../stable/2019-06-01/network.json | 15 +++ .../stable/2019-06-01/virtualWan.json | 4 +- 14 files changed, 81 insertions(+), 48 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionGet.json index 6305baff128d..e0b84b2cd6af 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionGet.json @@ -17,55 +17,57 @@ "remoteVpnSite": { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1" }, - "enableInternetSecurity": false, + "enableInternetSecurity": false, "ingressBytesTransferred": 0, "egressBytesTransferred": 0, "vpnLinkConnections": [ - { - "name": "Connection-Link1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "properties": { - "provisioningState": "Succeeded", - "vpnSiteLink": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink1" - }, - "connectionBandwidth": 200, - "ipsecPolicies": [], - "vpnConnectionProtocolType": "IKEv2", - "sharedKey": "key", - "ingressBytesTransferred": 0, - "egressBytesTransferred": 0, - "enableBgp": false, - "enableRateLimiting": false, - "useLocalAzureIpAddress": false, - "usePolicyBasedTrafficSelectors": false, - "routingWeight": 0 - } - }, - { - "name": "Connection-Link2", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link2", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "properties": { - "provisioningState": "Succeeded", - "vpnSiteLink": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink2" - }, - "connectionBandwidth": 200, - "ipsecPolicies": [], - "vpnConnectionProtocolType": "IKEv2", - "sharedKey": "key", - "ingressBytesTransferred": 0, - "egressBytesTransferred": 0, - "enableBgp": false, - "enableRateLimiting": false, - "useLocalAzureIpAddress": false, - "usePolicyBasedTrafficSelectors": false, - "routingWeight": 0 - } - } - ] + { + "name": "Connection-Link1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1", + "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "vpnSiteLink": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink1" + }, + "connectionBandwidth": 200, + "ipsecPolicies": [], + "vpnConnectionProtocolType": "IKEv2", + "sharedKey": "key", + "ingressBytesTransferred": 0, + "egressBytesTransferred": 0, + "enableBgp": false, + "enableRateLimiting": false, + "useLocalAzureIpAddress": false, + "usePolicyBasedTrafficSelectors": false, + "routingWeight": 0 + } + }, + { + "name": "Connection-Link2", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link2", + "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "vpnSiteLink": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink2" + }, + "connectionBandwidth": 200, + "ipsecPolicies": [], + "vpnConnectionProtocolType": "IKEv2", + "sharedKey": "key", + "ingressBytesTransferred": 0, + "egressBytesTransferred": 0, + "enableBgp": false, + "enableRateLimiting": false, + "useLocalAzureIpAddress": false, + "usePolicyBasedTrafficSelectors": false, + "routingWeight": 0 + } + } + ] } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionList.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionList.json index 1a743f330ef8..de99682ee455 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionList.json @@ -24,6 +24,7 @@ { "name": "Connection-Link1", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1", + "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections", "etag": "w/\\00000000-0000-0000-0000-000000000000\\", "properties": { "provisioningState": "Succeeded", @@ -46,6 +47,7 @@ { "name": "Connection-Link2", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link2", + "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections", "etag": "w/\\00000000-0000-0000-0000-000000000000\\", "properties": { "provisioningState": "Succeeded", diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayGet.json index e4feb093d908..a71df926883b 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayGet.json @@ -35,6 +35,7 @@ { "name": "Connection-Link1", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1", + "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections", "etag": "w/\\00000000-0000-0000-0000-000000000000\\", "properties": { "provisioningState": "Succeeded", @@ -57,6 +58,7 @@ { "name": "Connection-Link2", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link2", + "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections", "etag": "w/\\00000000-0000-0000-0000-000000000000\\", "properties": { "provisioningState": "Succeeded", diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayList.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayList.json index e76acb9db299..b9c068af2a38 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayList.json @@ -36,6 +36,7 @@ { "name": "Connection-Link1", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1", + "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections", "etag": "w/\\00000000-0000-0000-0000-000000000000\\", "properties": { "provisioningState": "Succeeded", @@ -58,6 +59,7 @@ { "name": "Connection-Link2", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link2", + "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections", "etag": "w/\\00000000-0000-0000-0000-000000000000\\", "properties": { "provisioningState": "Succeeded", diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayListByResourceGroup.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayListByResourceGroup.json index e76acb9db299..b9c068af2a38 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayListByResourceGroup.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayListByResourceGroup.json @@ -36,6 +36,7 @@ { "name": "Connection-Link1", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1", + "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections", "etag": "w/\\00000000-0000-0000-0000-000000000000\\", "properties": { "provisioningState": "Succeeded", @@ -58,6 +59,7 @@ { "name": "Connection-Link2", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link2", + "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections", "etag": "w/\\00000000-0000-0000-0000-000000000000\\", "properties": { "provisioningState": "Succeeded", diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteGet.json index 6ef1c4ef224a..f5cc07f213ff 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteGet.json @@ -34,6 +34,7 @@ { "name": "vpnSiteLink1", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/vpnSiteLink1", + "type": "Microsoft.Network/vpnSites/vpnSiteLinks", "etag": "W/\"00000000-0000-0000-0000-000000000000\"", "properties": { "provisioningState": "Succeeded", diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkConnectionGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkConnectionGet.json index 97c559907e4b..bdec32e03427 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkConnectionGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkConnectionGet.json @@ -11,6 +11,7 @@ "200": { "body": { "name": "Connection-Link1", + "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1", "etag": "w/\\00000000-0000-0000-0000-000000000000\\", "properties": { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkConnectionList.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkConnectionList.json index ad11751467ab..7a1671673466 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkConnectionList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkConnectionList.json @@ -11,6 +11,7 @@ "body": [ { "name": "Connection-Link1", + "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1", "etag": "w/\\00000000-0000-0000-0000-000000000000\\", "properties": { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkGet.json index 64321fac4b36..a8955f917e48 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkGet.json @@ -10,6 +10,7 @@ "200": { "body": { "name": "vpnSiteLink1", + "type": "Microsoft.Network/vpnSites/vpnSiteLinks", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/vpnSiteLink1", "etag": "W/\"00000000-0000-0000-0000-000000000000\"", "properties": { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkListByVpnSite.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkListByVpnSite.json index 99804594549d..4291b4c430d8 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkListByVpnSite.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteLinkListByVpnSite.json @@ -11,6 +11,7 @@ "value": [ { "name": "vpnSiteLink1", + "type": "Microsoft.Network/vpnSites/vpnSiteLinks", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/vpnSiteLink1", "etag": "W/\"00000000-0000-0000-0000-000000000000\"", "properties": { @@ -27,6 +28,7 @@ }, { "name": "vpnSiteLink2", + "type": "Microsoft.Network/vpnSites/vpnSiteLinks", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/vpnSiteLink2", "etag": "W/\"00000000-0000-0000-0000-000000000000\"", "properties": { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteList.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteList.json index 4196ba529793..1335ef5e8cff 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteList.json @@ -33,6 +33,7 @@ "vpnSiteLinks": [ { "name": "vpnSiteLink1", + "type": "Microsoft.Network/vpnSites/vpnSiteLinks", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/vpnSiteLink1", "etag": "W/\"00000000-0000-0000-0000-000000000000\"", "properties": { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteListByResourceGroup.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteListByResourceGroup.json index 6bd2c85c8c21..4111787ad215 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteListByResourceGroup.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSiteListByResourceGroup.json @@ -34,6 +34,7 @@ "vpnSiteLinks": [ { "name": "vpnSiteLink1", + "type": "Microsoft.Network/vpnSites/vpnSiteLinks", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/vpnSiteLink1", "etag": "W/\"00000000-0000-0000-0000-000000000000\"", "properties": { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/network.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/network.json index 320c22b7796f..db46d7494140 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/network.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/network.json @@ -143,6 +143,21 @@ "description": "Reference to another subresource.", "x-ms-azure-resource": true }, + "ChildResource": { + "properties": { + "id": { + "type": "string", + "description": "Resource ID." + }, + "type": { + "readOnly": true, + "type": "string", + "description": "Resource type." + }, + }, + "description": "Reference to another subresource.", + "x-ms-azure-resource": true + }, "TagsObject": { "properties": { "tags": { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/virtualWan.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/virtualWan.json index 03c53512fbca..361b024e36c9 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/virtualWan.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/virtualWan.json @@ -2843,7 +2843,7 @@ }, "allOf": [ { - "$ref": "./network.json#/definitions/SubResource" + "$ref": "./network.json#/definitions/ChildResource" } ], "description": "VpnSiteLink Resource." @@ -3268,7 +3268,7 @@ }, "allOf": [ { - "$ref": "./network.json#/definitions/SubResource" + "$ref": "./network.json#/definitions/ChildResource" } ], "description": "VpnSiteLinkConnection Resource." From 93b27801b6c16faceb17b2e86c17d2fb3f4148ea Mon Sep 17 00:00:00 2001 From: Nalin Gupta Date: Fri, 12 Jul 2019 17:16:30 -0700 Subject: [PATCH 13/15] Fixing typo. --- .../Microsoft.Network/stable/2019-06-01/network.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/network.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/network.json index db46d7494140..ec9e37130922 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/network.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/network.json @@ -153,9 +153,9 @@ "readOnly": true, "type": "string", "description": "Resource type." - }, + } }, - "description": "Reference to another subresource.", + "description": "Reference to another childresource.", "x-ms-azure-resource": true }, "TagsObject": { From 9acf8790eb7516fb0745b4bfb40d44435e276fbd Mon Sep 17 00:00:00 2001 From: Nalin Gupta Date: Fri, 12 Jul 2019 18:02:48 -0700 Subject: [PATCH 14/15] Adding type in examples of put. --- .../stable/2019-06-01/examples/VpnConnectionPut.json | 2 ++ .../stable/2019-06-01/examples/VpnGatewayPut.json | 2 ++ .../stable/2019-06-01/examples/VpnSitePut.json | 1 + 3 files changed, 5 insertions(+) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionPut.json index 9287cbb12ab9..a791d4544be1 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionPut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionPut.json @@ -44,6 +44,7 @@ "name": "Connection-Link1", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1", "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections", "properties": { "provisioningState": "Succeeded", "vpnSiteLink": { @@ -69,6 +70,7 @@ "name": "vpnConnection1", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1", "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections", "properties": { "provisioningState": "Succeeded", "remoteVpnSite": { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayPut.json index 3aa6445ff78c..7e49b94a3fb3 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayPut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayPut.json @@ -73,6 +73,7 @@ "name": "Connection-Link1", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1", "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections", "properties": { "provisioningState": "Succeeded", "vpnSiteLink": { @@ -131,6 +132,7 @@ "name": "Connection-Link1", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1", "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections", "properties": { "provisioningState": "Succeeded", "vpnSiteLink": { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSitePut.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSitePut.json index adf569f4fcea..e4ac7a29309f 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSitePut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnSitePut.json @@ -68,6 +68,7 @@ "name": "vpnSiteLink1", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/vpnSiteLink1", "etag": "W/\"00000000-0000-0000-0000-000000000000\"", + "type": "Microsoft.Network/vpnSites/vpnSiteLinks", "properties": { "provisioningState": "Succeeded", "ipAddress": "50.50.50.56", From 43a15d6b084cfbee329b42b1ea0c5022231f8333 Mon Sep 17 00:00:00 2001 From: Nalin Gupta Date: Mon, 15 Jul 2019 09:00:46 -0700 Subject: [PATCH 15/15] Removing Child resource type. --- .../stable/2019-06-01/network.json | 15 --------------- .../stable/2019-06-01/virtualWan.json | 14 ++++++++++++-- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/network.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/network.json index ec9e37130922..320c22b7796f 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/network.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/network.json @@ -143,21 +143,6 @@ "description": "Reference to another subresource.", "x-ms-azure-resource": true }, - "ChildResource": { - "properties": { - "id": { - "type": "string", - "description": "Resource ID." - }, - "type": { - "readOnly": true, - "type": "string", - "description": "Resource type." - } - }, - "description": "Reference to another childresource.", - "x-ms-azure-resource": true - }, "TagsObject": { "properties": { "tags": { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/virtualWan.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/virtualWan.json index 361b024e36c9..ba509ca356a2 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/virtualWan.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/virtualWan.json @@ -2839,11 +2839,16 @@ "name": { "type": "string", "description": "The name of the resource that is unique within a resource group. This name can be used to access the resource." + }, + "type": { + "readOnly": true, + "type": "string", + "description": "Resource type." } }, "allOf": [ { - "$ref": "./network.json#/definitions/ChildResource" + "$ref": "./network.json#/definitions/SubResource" } ], "description": "VpnSiteLink Resource." @@ -3264,11 +3269,16 @@ "type": "string", "readOnly": true, "description": "Gets a unique read-only string that changes whenever the resource is updated." + }, + "type": { + "readOnly": true, + "type": "string", + "description": "Resource type." } }, "allOf": [ { - "$ref": "./network.json#/definitions/ChildResource" + "$ref": "./network.json#/definitions/SubResource" } ], "description": "VpnSiteLinkConnection Resource."