From d65925a2807708df1c7d2fac022f95f11608d89f Mon Sep 17 00:00:00 2001 From: Daivapu Goutham Date: Mon, 22 Jun 2020 18:01:19 +0530 Subject: [PATCH 01/16] expressRouteProviderPort changes --- .../expressRouteProviderPortList.json | 48 ++++ .../expressRouteProviderPortLocationList.json | 32 +++ .../expressRouteCrossConnection.json | 4 +- .../2020-06-01/expressRouteProviderPort.json | 206 ++++++++++++++++++ .../network/resource-manager/readme.md | 1 + 5 files changed, 289 insertions(+), 2 deletions(-) create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortList.json create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortLocationList.json create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortList.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortList.json new file mode 100644 index 000000000000..fa9de0f32f46 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortList.json @@ -0,0 +1,48 @@ +{ + "parameters": { + "api-version": "2020-06-01", + "subscriptionId": "subid" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "portPairDescriptor": "bvtazureixpportpair1", + "id": "/subscriptions/subid/providers/Microsoft.Network/ExpressRoutePortsLocations/SiliconValley/bvtazureixpportpair1", + "type": "Microsoft.Network/expressRouteProviderPort", + "location": "uswest", + "etag": "W/\"c0e6477e-8150-4d4f-9bf6-bb10e6acb63a\"", + "properties": { + "portPairDescriptor": "bvtazureixpportpair", + "primaryAzurePort": "bvtazureixp01", + "secondaryAzurePort": "bvtazureixp01", + "peeringLocation": "SiliconValley", + "overprovisionFactor": 4, + "portBandwidthInMbps": 4000, + "usedBandwidthInMbps": 2500, + "remainingBandwidthInMbps": 1500 + } + }, + { + "portPairDescriptor": "bvtazureixpportpair2", + "id": "/subscriptions/subid/providers/Microsoft.Network/ExpressRoutePortsLocations/SiliconValley/bvtazureixpportpair2", + "type": "Microsoft.Network/expressRouteProviderPort", + "location": "uswest", + "etag": "W/\"c0e6477e-8150-4d4f-9bf6-bb10e6acb63a\"", + "properties": { + "portPairDescriptor": "bvtazureixpportpair2", + "primaryAzurePort": "bvtazureixp02", + "secondaryAzurePort": "bvtazureixp02", + "peeringLocation": "seattle", + "overprovisionFactor": 4, + "portBandwidthInMbps": 4000, + "usedBandwidthInMbps": 1200, + "remainingBandwidthInMbps": 1800 + } + } + ] + } + } + } + } \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortLocationList.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortLocationList.json new file mode 100644 index 000000000000..d2622bf805ce --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortLocationList.json @@ -0,0 +1,32 @@ +{ + "parameters": { + "api-version": "2020-06-01", + "locationName": "SiliconValley", + "subscriptionId": "subid" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "portPairDescriptor": "bvtazureixpportpair1", + "id": "/subscriptions/subid/providers/Microsoft.Network/ExpressRoutePortsLocations/SiliconValley/bvtazureixpportpair1", + "type": "Microsoft.Network/expressRouteProviderPort", + "location": "uswest", + "etag": "W/\"c0e6477e-8150-4d4f-9bf6-bb10e6acb63a\"", + "properties": { + "portPairDescriptor": "bvtazureixpportpair", + "primaryAzurePort": "bvtazureixp01", + "secondaryAzurePort": "bvtazureixp01", + "peeringLocation": "SiliconValley", + "overprovisionFactor": 4, + "portBandwidthInMbps": 4000, + "usedBandwidthInMbps": 2500, + "remainingBandwidthInMbps": 1500 + } + } + ] + } + } + } + } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteCrossConnection.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteCrossConnection.json index 8d141bcd3893..e9061c118257 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteCrossConnection.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteCrossConnection.json @@ -799,12 +799,10 @@ "ExpressRouteCrossConnectionProperties": { "properties": { "primaryAzurePort": { - "readOnly": true, "type": "string", "description": "The name of the primary port." }, "secondaryAzurePort": { - "readOnly": true, "type": "string", "description": "The name of the secondary port." }, @@ -814,10 +812,12 @@ "description": "The identifier of the circuit traffic." }, "peeringLocation": { + "readOnly": true, "type": "string", "description": "The peering location of the ExpressRoute circuit." }, "bandwidthInMbps": { + "readOnly": true, "type": "integer", "format": "int32", "description": "The circuit bandwidth In Mbps." diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json new file mode 100644 index 000000000000..75b8749cb3d0 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json @@ -0,0 +1,206 @@ +{ + "swagger": "2.0", + "info": { + "title": "NetworkManagementClient", + "description": "The Microsoft Azure Network management API provides a RESTful set of web services that interact with Microsoft Azure Networks service to manage your network resources. The API has entities that capture the relationship between an end user and the Microsoft Azure Networks service.", + "version": "2020-06-01" + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ], + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Azure Active Directory OAuth2 Flow.", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "paths": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Network/expressRouteProviderPorts": { + "get": { + "tags": [ + "ExpressRouteProviderPorts" + ], + "operationId": "ExpressRouteProviderPorts_List", + "description": "Retrieves all the ExpressRouteProviderPorts in a subscription.", + "parameters": [ + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "200": { + "description": "Request successful. The operation returns a list of ExpressRouteProviderPort resources. If there are no ports for the provider, an empty list is returned.", + "schema": { + "$ref": "#/definitions/ExpressRouteProviderPortListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./network.json#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "ExpressRouteProviderPortList": { + "$ref": "./examples/ExpressRouteProviderPortList.json" + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Network/expressRouteProviderPorts/{locationName}": { + "get": { + "tags": [ + "ExpressRouteProviderPorts" + ], + "operationId": "ExpressRouteProviderPortsLocation_List", + "description": "Retrieves all the ExpressRouteProviderPorts in a subscription.", + "parameters": [ + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + }, + { + "name": "locationName", + "in": "path", + "required": true, + "type": "string", + "description": "Name of the requested ExpressRoutePort peering location." + } + ], + "responses": { + "200": { + "description": "Request successful. The operation returns a list of ExpressRouteProviderPort resources at a location. If there are no ports for the provider, an empty list is returned.", + "schema": { + "$ref": "#/definitions/ExpressRouteProviderPortListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./network.json#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "ExpressRouteProviderPortList": { + "$ref": "./examples/ExpressRouteProviderPortLocationList.json" + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + } + }, + "definitions": { + "ExpressRouteProviderPortProperties": { + "properties": { + "portPairDescriptor": { + "readOnly": true, + "type": "string", + "description": "The name of the port pair." + }, + "primaryAzurePort": { + "readOnly": true, + "type": "string", + "description": "The name of the primary port." + }, + "secondaryAzurePort": { + "readOnly": true, + "type": "string", + "description": "The name of the secondary port." + }, + "peeringLocation": { + "type": "string", + "description": "The peering location of the port pair." + }, + "overprovisionFactor": { + "type": "integer", + "format": "int32", + "description": "Overprovisioning factor for the port pair." + }, + "portBandwidthInMbps": { + "type": "integer", + "format": "int32", + "description": "Bandwidth of the port in Mbps" + }, + "usedBandwidthInMbps": { + "type": "integer", + "format": "int32", + "description": "Used Bandwidth of the port in Mbps" + }, + "remainingBandwidthInMbps": { + "type": "integer", + "format": "int32", + "description": "Remaining Bandwidth of the port in Mbps" + } + }, + "description": "Properties of ExpressRouteProviderPort." + }, + "ExpressRouteProviderPort": { + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/ExpressRouteProviderPortProperties", + "description": "Properties of the express route Service Provider Port." + }, + "etag": { + "readOnly": true, + "type": "string", + "description": "A unique read-only string that changes whenever the resource is updated." + } + }, + "allOf": [ + { + "$ref": "./network.json#/definitions/Resource" + } + ], + "description": "ExpressRouteProviderPort resource." + }, + "ExpressRouteProviderPortListResult": { + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/ExpressRouteProviderPort" + }, + "description": "A list of ExpressRouteProviderPort resources." + }, + "nextLink": { + "readOnly": true, + "type": "string", + "description": "The URL to get the next set of results." + } + }, + "description": "Response for ListExpressRouteProviderPort API service call." + } + } +} \ No newline at end of file diff --git a/specification/network/resource-manager/readme.md b/specification/network/resource-manager/readme.md index d02540084402..ea008af868c7 100644 --- a/specification/network/resource-manager/readme.md +++ b/specification/network/resource-manager/readme.md @@ -83,6 +83,7 @@ input-file: - Microsoft.Network/stable/2020-06-01/vmssNetworkInterface.json - Microsoft.Network/stable/2020-06-01/vmssPublicIpAddress.json - Microsoft.Network/stable/2020-06-01/webapplicationfirewall.json + - Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json ``` ### Tag: package-2020-05 From 26beb62b4c27a3a2405faa9973d003d03ad37beb Mon Sep 17 00:00:00 2001 From: Daivapu Goutham Date: Tue, 23 Jun 2020 00:26:53 +0530 Subject: [PATCH 02/16] fix ref error --- .../stable/2020-06-01/expressRouteProviderPort.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json index 75b8749cb3d0..d8065d015daa 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json @@ -65,7 +65,7 @@ }, "x-ms-examples": { "ExpressRouteProviderPortList": { - "$ref": "./examples/ExpressRouteProviderPortList.json" + "$ref": "./examples/expressRouteProviderPortList.json" } }, "x-ms-pageable": { @@ -111,7 +111,7 @@ }, "x-ms-examples": { "ExpressRouteProviderPortList": { - "$ref": "./examples/ExpressRouteProviderPortLocationList.json" + "$ref": "./examples/expressRouteProviderPortLocationList.json" } }, "x-ms-pageable": { From 6aca0f578503ced8b7772555fa80a947ec971cc3 Mon Sep 17 00:00:00 2001 From: Daivapu Goutham Date: Tue, 23 Jun 2020 12:07:12 +0530 Subject: [PATCH 03/16] suppressing name id type error --- specification/network/resource-manager/readme.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/specification/network/resource-manager/readme.md b/specification/network/resource-manager/readme.md index ea008af868c7..45f7f7cf5352 100644 --- a/specification/network/resource-manager/readme.md +++ b/specification/network/resource-manager/readme.md @@ -1442,6 +1442,9 @@ directive: - suppress: RequiredPropertiesMissingInResourceModel from: expressRoutePort.json reason: name, id and type properties are inherited from the upper level + - suppress: RequiredPropertiesMissingInResourceModel + from: expressRouteProviderPort.json + reason: name, id and type properties are inherited from the upper level - suppress: RequiredPropertiesMissingInResourceModel from: firewallPolicy.json reason: name, id and type properties are inherited from the upper level From 057fbc49b308ca564662a1f432251fb996d8cf87 Mon Sep 17 00:00:00 2001 From: Daivapu Goutham Date: Tue, 23 Jun 2020 16:52:26 +0530 Subject: [PATCH 04/16] prettier fix --- .../expressRouteProviderPortList.json | 90 ++++++------- .../expressRouteProviderPortLocationList.json | 56 ++++---- .../2020-06-01/expressRouteProviderPort.json | 120 +++++++++--------- 3 files changed, 133 insertions(+), 133 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortList.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortList.json index fa9de0f32f46..bae8625eba65 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortList.json @@ -1,48 +1,48 @@ { - "parameters": { - "api-version": "2020-06-01", - "subscriptionId": "subid" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "portPairDescriptor": "bvtazureixpportpair1", - "id": "/subscriptions/subid/providers/Microsoft.Network/ExpressRoutePortsLocations/SiliconValley/bvtazureixpportpair1", - "type": "Microsoft.Network/expressRouteProviderPort", - "location": "uswest", - "etag": "W/\"c0e6477e-8150-4d4f-9bf6-bb10e6acb63a\"", - "properties": { - "portPairDescriptor": "bvtazureixpportpair", - "primaryAzurePort": "bvtazureixp01", - "secondaryAzurePort": "bvtazureixp01", - "peeringLocation": "SiliconValley", - "overprovisionFactor": 4, - "portBandwidthInMbps": 4000, - "usedBandwidthInMbps": 2500, - "remainingBandwidthInMbps": 1500 - } - }, - { - "portPairDescriptor": "bvtazureixpportpair2", - "id": "/subscriptions/subid/providers/Microsoft.Network/ExpressRoutePortsLocations/SiliconValley/bvtazureixpportpair2", - "type": "Microsoft.Network/expressRouteProviderPort", - "location": "uswest", - "etag": "W/\"c0e6477e-8150-4d4f-9bf6-bb10e6acb63a\"", - "properties": { - "portPairDescriptor": "bvtazureixpportpair2", - "primaryAzurePort": "bvtazureixp02", - "secondaryAzurePort": "bvtazureixp02", - "peeringLocation": "seattle", - "overprovisionFactor": 4, - "portBandwidthInMbps": 4000, - "usedBandwidthInMbps": 1200, - "remainingBandwidthInMbps": 1800 - } - } - ] + "parameters": { + "api-version": "2020-06-01", + "subscriptionId": "subid" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "portPairDescriptor": "bvtazureixpportpair1", + "id": "/subscriptions/subid/providers/Microsoft.Network/ExpressRoutePortsLocations/SiliconValley/bvtazureixpportpair1", + "type": "Microsoft.Network/expressRouteProviderPort", + "location": "uswest", + "etag": "W/\"c0e6477e-8150-4d4f-9bf6-bb10e6acb63a\"", + "properties": { + "portPairDescriptor": "bvtazureixpportpair", + "primaryAzurePort": "bvtazureixp01", + "secondaryAzurePort": "bvtazureixp01", + "peeringLocation": "SiliconValley", + "overprovisionFactor": 4, + "portBandwidthInMbps": 4000, + "usedBandwidthInMbps": 2500, + "remainingBandwidthInMbps": 1500 + } + }, + { + "portPairDescriptor": "bvtazureixpportpair2", + "id": "/subscriptions/subid/providers/Microsoft.Network/ExpressRoutePortsLocations/SiliconValley/bvtazureixpportpair2", + "type": "Microsoft.Network/expressRouteProviderPort", + "location": "uswest", + "etag": "W/\"c0e6477e-8150-4d4f-9bf6-bb10e6acb63a\"", + "properties": { + "portPairDescriptor": "bvtazureixpportpair2", + "primaryAzurePort": "bvtazureixp02", + "secondaryAzurePort": "bvtazureixp02", + "peeringLocation": "seattle", + "overprovisionFactor": 4, + "portBandwidthInMbps": 4000, + "usedBandwidthInMbps": 1200, + "remainingBandwidthInMbps": 1800 + } } - } + ] } - } \ No newline at end of file + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortLocationList.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortLocationList.json index d2622bf805ce..b21e82d08c9e 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortLocationList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortLocationList.json @@ -1,32 +1,32 @@ { - "parameters": { - "api-version": "2020-06-01", - "locationName": "SiliconValley", - "subscriptionId": "subid" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "portPairDescriptor": "bvtazureixpportpair1", - "id": "/subscriptions/subid/providers/Microsoft.Network/ExpressRoutePortsLocations/SiliconValley/bvtazureixpportpair1", - "type": "Microsoft.Network/expressRouteProviderPort", - "location": "uswest", - "etag": "W/\"c0e6477e-8150-4d4f-9bf6-bb10e6acb63a\"", - "properties": { - "portPairDescriptor": "bvtazureixpportpair", - "primaryAzurePort": "bvtazureixp01", - "secondaryAzurePort": "bvtazureixp01", - "peeringLocation": "SiliconValley", - "overprovisionFactor": 4, - "portBandwidthInMbps": 4000, - "usedBandwidthInMbps": 2500, - "remainingBandwidthInMbps": 1500 - } - } - ] + "parameters": { + "api-version": "2020-06-01", + "locationName": "SiliconValley", + "subscriptionId": "subid" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "portPairDescriptor": "bvtazureixpportpair1", + "id": "/subscriptions/subid/providers/Microsoft.Network/ExpressRoutePortsLocations/SiliconValley/bvtazureixpportpair1", + "type": "Microsoft.Network/expressRouteProviderPort", + "location": "uswest", + "etag": "W/\"c0e6477e-8150-4d4f-9bf6-bb10e6acb63a\"", + "properties": { + "portPairDescriptor": "bvtazureixpportpair", + "primaryAzurePort": "bvtazureixp01", + "secondaryAzurePort": "bvtazureixp01", + "peeringLocation": "SiliconValley", + "overprovisionFactor": 4, + "portBandwidthInMbps": 4000, + "usedBandwidthInMbps": 2500, + "remainingBandwidthInMbps": 1500 + } } - } + ] + } } } +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json index d8065d015daa..1557b8a1fda6 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json @@ -1,38 +1,38 @@ { - "swagger": "2.0", - "info": { - "title": "NetworkManagementClient", - "description": "The Microsoft Azure Network management API provides a RESTful set of web services that interact with Microsoft Azure Networks service to manage your network resources. The API has entities that capture the relationship between an end user and the Microsoft Azure Networks service.", - "version": "2020-06-01" - }, - "host": "management.azure.com", - "schemes": [ - "https" - ], - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "security": [ - { - "azure_auth": [ - "user_impersonation" - ] - } - ], - "securityDefinitions": { + "swagger": "2.0", + "info": { + "title": "NetworkManagementClient", + "description": "The Microsoft Azure Network management API provides a RESTful set of web services that interact with Microsoft Azure Networks service to manage your network resources. The API has entities that capture the relationship between an end user and the Microsoft Azure Networks service.", + "version": "2020-06-01" + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ], + "securityDefinitions": { "azure_auth": { - "type": "oauth2", - "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", - "flow": "implicit", - "description": "Azure Active Directory OAuth2 Flow.", - "scopes": { - "user_impersonation": "impersonate your user account" - } - } - }, + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Azure Active Directory OAuth2 Flow.", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, "paths": { "/subscriptions/{subscriptionId}/providers/Microsoft.Network/expressRouteProviderPorts": { "get": { @@ -56,7 +56,7 @@ "$ref": "#/definitions/ExpressRouteProviderPortListResult" } }, - "default": { + "default": { "description": "Error response describing why the operation failed.", "schema": { "$ref": "./network.json#/definitions/CloudError" @@ -102,7 +102,7 @@ "$ref": "#/definitions/ExpressRouteProviderPortListResult" } }, - "default": { + "default": { "description": "Error response describing why the operation failed.", "schema": { "$ref": "./network.json#/definitions/CloudError" @@ -118,9 +118,9 @@ "nextLinkName": "nextLink" } } - } + } }, - "definitions": { + "definitions": { "ExpressRouteProviderPortProperties": { "properties": { "portPairDescriptor": { @@ -165,26 +165,26 @@ }, "description": "Properties of ExpressRouteProviderPort." }, - "ExpressRouteProviderPort": { - "properties": { - "properties": { - "x-ms-client-flatten": true, - "$ref": "#/definitions/ExpressRouteProviderPortProperties", - "description": "Properties of the express route Service Provider Port." - }, - "etag": { - "readOnly": true, - "type": "string", - "description": "A unique read-only string that changes whenever the resource is updated." - } - }, - "allOf": [ - { - "$ref": "./network.json#/definitions/Resource" - } - ], - "description": "ExpressRouteProviderPort resource." - }, + "ExpressRouteProviderPort": { + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/ExpressRouteProviderPortProperties", + "description": "Properties of the express route Service Provider Port." + }, + "etag": { + "readOnly": true, + "type": "string", + "description": "A unique read-only string that changes whenever the resource is updated." + } + }, + "allOf": [ + { + "$ref": "./network.json#/definitions/Resource" + } + ], + "description": "ExpressRouteProviderPort resource." + }, "ExpressRouteProviderPortListResult": { "properties": { "value": { @@ -201,6 +201,6 @@ } }, "description": "Response for ListExpressRouteProviderPort API service call." - } - } -} \ No newline at end of file + } + } +} From 243f209668b5cef5a0d62d6bc4d844fd9c299122 Mon Sep 17 00:00:00 2001 From: Daivapu Goutham Date: Wed, 24 Jun 2020 20:10:22 +0530 Subject: [PATCH 05/16] locationlist -> listbylocation --- ...ist.json => expressRouteProviderPortListByLocation.json} | 0 .../stable/2020-06-01/expressRouteProviderPort.json | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) rename specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/{expressRouteProviderPortLocationList.json => expressRouteProviderPortListByLocation.json} (100%) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortLocationList.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortListByLocation.json similarity index 100% rename from specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortLocationList.json rename to specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortListByLocation.json diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json index 1557b8a1fda6..4c5bb664270c 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json @@ -78,8 +78,8 @@ "tags": [ "ExpressRouteProviderPorts" ], - "operationId": "ExpressRouteProviderPortsLocation_List", - "description": "Retrieves all the ExpressRouteProviderPorts in a subscription.", + "operationId": "ExpressRouteProviderPorts_ListByLocation", + "description": "Retrieves all the ExpressRouteProviderPorts in a subscription at a given location.", "parameters": [ { "$ref": "./network.json#/parameters/ApiVersionParameter" @@ -111,7 +111,7 @@ }, "x-ms-examples": { "ExpressRouteProviderPortList": { - "$ref": "./examples/expressRouteProviderPortLocationList.json" + "$ref": "./examples/expressRouteProviderPortListByLocation.json" } }, "x-ms-pageable": { From cfb9cb666da1ce2f0cbb11ae43479a66ccbfce19 Mon Sep 17 00:00:00 2001 From: Daivapu Goutham Date: Tue, 30 Jun 2020 16:52:07 +0530 Subject: [PATCH 06/16] adding filter on location --- ...xpressRouteProviderPortListByLocation.json | 4 +- .../2020-06-01/expressRouteProviderPort.json | 53 +++---------------- 2 files changed, 9 insertions(+), 48 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortListByLocation.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortListByLocation.json index b21e82d08c9e..15f961ced8da 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortListByLocation.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortListByLocation.json @@ -1,8 +1,8 @@ { "parameters": { "api-version": "2020-06-01", - "locationName": "SiliconValley", - "subscriptionId": "subid" + "subscriptionId": "subid", + "$filter": "peeringLocation eq 'SiliconValley'" }, "responses": { "200": { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json index 4c5bb664270c..790cd4668fed 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json @@ -43,61 +43,22 @@ "description": "Retrieves all the ExpressRouteProviderPorts in a subscription.", "parameters": [ { - "$ref": "./network.json#/parameters/ApiVersionParameter" - }, - { - "$ref": "./network.json#/parameters/SubscriptionIdParameter" - } - ], - "responses": { - "200": { - "description": "Request successful. The operation returns a list of ExpressRouteProviderPort resources. If there are no ports for the provider, an empty list is returned.", - "schema": { - "$ref": "#/definitions/ExpressRouteProviderPortListResult" - } + "name": "$filter", + "in": "query", + "required": false, + "type": "string", + "description": "can be used to filter on peering location. Suppoprts only eq" }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "./network.json#/definitions/CloudError" - } - } - }, - "x-ms-examples": { - "ExpressRouteProviderPortList": { - "$ref": "./examples/expressRouteProviderPortList.json" - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - } - } - }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Network/expressRouteProviderPorts/{locationName}": { - "get": { - "tags": [ - "ExpressRouteProviderPorts" - ], - "operationId": "ExpressRouteProviderPorts_ListByLocation", - "description": "Retrieves all the ExpressRouteProviderPorts in a subscription at a given location.", - "parameters": [ { "$ref": "./network.json#/parameters/ApiVersionParameter" }, { "$ref": "./network.json#/parameters/SubscriptionIdParameter" - }, - { - "name": "locationName", - "in": "path", - "required": true, - "type": "string", - "description": "Name of the requested ExpressRoutePort peering location." } ], "responses": { "200": { - "description": "Request successful. The operation returns a list of ExpressRouteProviderPort resources at a location. If there are no ports for the provider, an empty list is returned.", + "description": "Request successful. The operation returns a list of ExpressRouteProviderPort resources. If there are no ports for the provider, an empty list is returned.", "schema": { "$ref": "#/definitions/ExpressRouteProviderPortListResult" } @@ -111,7 +72,7 @@ }, "x-ms-examples": { "ExpressRouteProviderPortList": { - "$ref": "./examples/expressRouteProviderPortListByLocation.json" + "$ref": "./examples/expressRouteProviderPortList.json" } }, "x-ms-pageable": { From 11886e8ad2b7b2d1e89b74fc57c92875e1c7ff94 Mon Sep 17 00:00:00 2001 From: Daivapu Goutham Date: Tue, 30 Jun 2020 17:19:08 +0530 Subject: [PATCH 07/16] ref listbylocation --- .../stable/2020-06-01/expressRouteProviderPort.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json index 790cd4668fed..e57e75a319b3 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json @@ -73,6 +73,9 @@ "x-ms-examples": { "ExpressRouteProviderPortList": { "$ref": "./examples/expressRouteProviderPortList.json" + }, + "ExpressRouteProviderPortListByLocation": { + "$ref": "./examples/expressRouteProviderPortListByLocation.json" } }, "x-ms-pageable": { From 4f8053d0f43d092ba569835e05dfe149f15f1188 Mon Sep 17 00:00:00 2001 From: Daivapu Goutham Date: Wed, 1 Jul 2020 13:48:27 +0530 Subject: [PATCH 08/16] fixing id and name --- .../2020-06-01/examples/expressRouteProviderPortList.json | 8 ++++---- .../examples/expressRouteProviderPortListByLocation.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortList.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortList.json index bae8625eba65..0e2bf4801106 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortList.json @@ -8,8 +8,8 @@ "body": { "value": [ { - "portPairDescriptor": "bvtazureixpportpair1", - "id": "/subscriptions/subid/providers/Microsoft.Network/ExpressRoutePortsLocations/SiliconValley/bvtazureixpportpair1", + "name": "bvtazureixpportpair1", + "id": "/subscriptions/subid/providers/Microsoft.Network/expressRouteProviderPorts/bvtazureixpportpair1", "type": "Microsoft.Network/expressRouteProviderPort", "location": "uswest", "etag": "W/\"c0e6477e-8150-4d4f-9bf6-bb10e6acb63a\"", @@ -25,8 +25,8 @@ } }, { - "portPairDescriptor": "bvtazureixpportpair2", - "id": "/subscriptions/subid/providers/Microsoft.Network/ExpressRoutePortsLocations/SiliconValley/bvtazureixpportpair2", + "name": "bvtazureixpportpair2", + "id": "/subscriptions/subid/providers/Microsoft.Network/expressRouteProviderPorts/bvtazureixpportpair2", "type": "Microsoft.Network/expressRouteProviderPort", "location": "uswest", "etag": "W/\"c0e6477e-8150-4d4f-9bf6-bb10e6acb63a\"", diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortListByLocation.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortListByLocation.json index 15f961ced8da..8bd2a9100c8c 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortListByLocation.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortListByLocation.json @@ -9,8 +9,8 @@ "body": { "value": [ { - "portPairDescriptor": "bvtazureixpportpair1", - "id": "/subscriptions/subid/providers/Microsoft.Network/ExpressRoutePortsLocations/SiliconValley/bvtazureixpportpair1", + "name": "bvtazureixpportpair1", + "id": "/subscriptions/subid/providers/Microsoft.Network/expressRoutePortsLocations/bvtazureixpportpair1", "type": "Microsoft.Network/expressRouteProviderPort", "location": "uswest", "etag": "W/\"c0e6477e-8150-4d4f-9bf6-bb10e6acb63a\"", From 8bbf594abb51b0630c5cfaedbaf53239db8fe245 Mon Sep 17 00:00:00 2001 From: Daivapu Goutham Date: Thu, 2 Jul 2020 04:48:34 +0530 Subject: [PATCH 09/16] adding get and bug fixes --- .../examples/expressRouteProviderPortGet.json | 33 +++++++++++++ .../expressRouteProviderPortList.json | 4 +- ...xpressRouteProviderPortListByLocation.json | 2 +- .../2020-06-01/expressRouteProviderPort.json | 47 +++++++++++++++++-- 4 files changed, 78 insertions(+), 8 deletions(-) create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortGet.json diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortGet.json new file mode 100644 index 000000000000..c1732927187f --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortGet.json @@ -0,0 +1,33 @@ +{ + "parameters": { + "api-version": "2020-06-01", + "subscriptionId": "subid", + "expressRouteProviderPortName": "bvtazureixpportpair1" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "bvtazureixpportpair1", + "id": "/subscriptions/subid/providers/Microsoft.Network/expressRoutePortsLocations/bvtazureixpportpair1", + "type": "Microsoft.Network/expressRouteProviderPorts", + "location": "uswest", + "etag": "W/\"c0e6477e-8150-4d4f-9bf6-bb10e6acb63a\"", + "properties": { + "portPairDescriptor": "bvtazureixpportpair", + "primaryAzurePort": "bvtazureixp01", + "secondaryAzurePort": "bvtazureixp01", + "peeringLocation": "SiliconValley", + "overprovisionFactor": 4, + "portBandwidthInMbps": 4000, + "usedBandwidthInMbps": 2500, + "remainingBandwidthInMbps": 1500 + } + } + ] + } + } + } + } + \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortList.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortList.json index 0e2bf4801106..7670e99546ca 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortList.json @@ -10,7 +10,7 @@ { "name": "bvtazureixpportpair1", "id": "/subscriptions/subid/providers/Microsoft.Network/expressRouteProviderPorts/bvtazureixpportpair1", - "type": "Microsoft.Network/expressRouteProviderPort", + "type": "Microsoft.Network/expressRouteProviderPorts", "location": "uswest", "etag": "W/\"c0e6477e-8150-4d4f-9bf6-bb10e6acb63a\"", "properties": { @@ -27,7 +27,7 @@ { "name": "bvtazureixpportpair2", "id": "/subscriptions/subid/providers/Microsoft.Network/expressRouteProviderPorts/bvtazureixpportpair2", - "type": "Microsoft.Network/expressRouteProviderPort", + "type": "Microsoft.Network/expressRouteProviderPorts", "location": "uswest", "etag": "W/\"c0e6477e-8150-4d4f-9bf6-bb10e6acb63a\"", "properties": { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortListByLocation.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortListByLocation.json index 8bd2a9100c8c..9638e3185abe 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortListByLocation.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortListByLocation.json @@ -11,7 +11,7 @@ { "name": "bvtazureixpportpair1", "id": "/subscriptions/subid/providers/Microsoft.Network/expressRoutePortsLocations/bvtazureixpportpair1", - "type": "Microsoft.Network/expressRouteProviderPort", + "type": "Microsoft.Network/expressRouteProviderPorts", "location": "uswest", "etag": "W/\"c0e6477e-8150-4d4f-9bf6-bb10e6acb63a\"", "properties": { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json index e57e75a319b3..7def4497c5ce 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json @@ -82,6 +82,48 @@ "nextLinkName": "nextLink" } } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Network/expressRouteProviderPorts/{expressRouteProviderPortName}": { + "get": { + "tags": [ + "ExpressRouteProviderPorts" + ], + "operationId": "ExpressRouteProviderPorts_Get", + "description": "Retrieves the requested ExpressRouteProviderPort resource.", + "parameters": [ + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + }, + { + "name": "expressRouteProviderPortName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of ExpressRouteProviderPort." + } + ], + "responses": { + "200": { + "description": "Request successful. The operation returns the requested ExpressRouteProviderPort resource.", + "schema": { + "$ref": "#/definitions/ExpressRouteProviderPort" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./network.json#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "ExpressRouteProviderPortGet": { + "$ref": "./examples/ExpressRouteProviderPortGet.json" + } + } } }, "definitions": { @@ -142,11 +184,6 @@ "description": "A unique read-only string that changes whenever the resource is updated." } }, - "allOf": [ - { - "$ref": "./network.json#/definitions/Resource" - } - ], "description": "ExpressRouteProviderPort resource." }, "ExpressRouteProviderPortListResult": { From afe86ba290c437b9f151af9cbb711fcea68a5eab Mon Sep 17 00:00:00 2001 From: Daivapu Goutham Date: Thu, 2 Jul 2020 05:08:06 +0530 Subject: [PATCH 10/16] bug fix --- .../stable/2020-06-01/expressRouteProviderPort.json | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json index 7def4497c5ce..5ba5b530ea39 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json @@ -124,6 +124,7 @@ "$ref": "./examples/ExpressRouteProviderPortGet.json" } } + } } }, "definitions": { From f551b00026cfe16c4a180672561cc96bf198f647 Mon Sep 17 00:00:00 2001 From: Daivapu Goutham Date: Thu, 2 Jul 2020 05:20:33 +0530 Subject: [PATCH 11/16] bug fix --- .../stable/2020-06-01/expressRouteProviderPort.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json index 5ba5b530ea39..2f5a56683f8a 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json @@ -121,7 +121,7 @@ }, "x-ms-examples": { "ExpressRouteProviderPortGet": { - "$ref": "./examples/ExpressRouteProviderPortGet.json" + "$ref": "./examples/expressRouteProviderPortGet.json" } } } From cc7c9cd582a4615206ae6538f4fed0ba2d986eb3 Mon Sep 17 00:00:00 2001 From: Daivapu Goutham Date: Mon, 6 Jul 2020 23:56:33 +0530 Subject: [PATCH 12/16] adding proxy resource ref --- .../examples/expressRouteProviderPortGet.json | 2 -- .../examples/expressRouteProviderPortList.json | 4 ---- .../expressRouteProviderPortListByLocation.json | 2 -- .../stable/2020-06-01/expressRouteProviderPort.json | 10 +++++----- 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortGet.json index c1732927187f..6fe793f1bcf2 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortGet.json @@ -12,8 +12,6 @@ "name": "bvtazureixpportpair1", "id": "/subscriptions/subid/providers/Microsoft.Network/expressRoutePortsLocations/bvtazureixpportpair1", "type": "Microsoft.Network/expressRouteProviderPorts", - "location": "uswest", - "etag": "W/\"c0e6477e-8150-4d4f-9bf6-bb10e6acb63a\"", "properties": { "portPairDescriptor": "bvtazureixpportpair", "primaryAzurePort": "bvtazureixp01", diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortList.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortList.json index 7670e99546ca..bf582b22d900 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortList.json @@ -11,8 +11,6 @@ "name": "bvtazureixpportpair1", "id": "/subscriptions/subid/providers/Microsoft.Network/expressRouteProviderPorts/bvtazureixpportpair1", "type": "Microsoft.Network/expressRouteProviderPorts", - "location": "uswest", - "etag": "W/\"c0e6477e-8150-4d4f-9bf6-bb10e6acb63a\"", "properties": { "portPairDescriptor": "bvtazureixpportpair", "primaryAzurePort": "bvtazureixp01", @@ -28,8 +26,6 @@ "name": "bvtazureixpportpair2", "id": "/subscriptions/subid/providers/Microsoft.Network/expressRouteProviderPorts/bvtazureixpportpair2", "type": "Microsoft.Network/expressRouteProviderPorts", - "location": "uswest", - "etag": "W/\"c0e6477e-8150-4d4f-9bf6-bb10e6acb63a\"", "properties": { "portPairDescriptor": "bvtazureixpportpair2", "primaryAzurePort": "bvtazureixp02", diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortListByLocation.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortListByLocation.json index 9638e3185abe..ec6431b22861 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortListByLocation.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortListByLocation.json @@ -12,8 +12,6 @@ "name": "bvtazureixpportpair1", "id": "/subscriptions/subid/providers/Microsoft.Network/expressRoutePortsLocations/bvtazureixpportpair1", "type": "Microsoft.Network/expressRouteProviderPorts", - "location": "uswest", - "etag": "W/\"c0e6477e-8150-4d4f-9bf6-bb10e6acb63a\"", "properties": { "portPairDescriptor": "bvtazureixpportpair", "primaryAzurePort": "bvtazureixp01", diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json index 2f5a56683f8a..db76ab6d8708 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json @@ -178,13 +178,13 @@ "x-ms-client-flatten": true, "$ref": "#/definitions/ExpressRouteProviderPortProperties", "description": "Properties of the express route Service Provider Port." - }, - "etag": { - "readOnly": true, - "type": "string", - "description": "A unique read-only string that changes whenever the resource is updated." } }, + "allOf": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource" + } + ], "description": "ExpressRouteProviderPort resource." }, "ExpressRouteProviderPortListResult": { From 40e26a4665e23538176840a9a026a29c2684f45e Mon Sep 17 00:00:00 2001 From: Daivapu Goutham Date: Tue, 7 Jul 2020 10:06:25 +0530 Subject: [PATCH 13/16] fixes for auto checks --- .../examples/expressRouteProviderPortGet.json | 47 +++++++++---------- .../2020-06-01/expressRouteProviderPort.json | 8 ++-- 2 files changed, 25 insertions(+), 30 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortGet.json index 6fe793f1bcf2..b5a795dfff22 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/expressRouteProviderPortGet.json @@ -1,31 +1,26 @@ { - "parameters": { - "api-version": "2020-06-01", - "subscriptionId": "subid", - "expressRouteProviderPortName": "bvtazureixpportpair1" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "name": "bvtazureixpportpair1", - "id": "/subscriptions/subid/providers/Microsoft.Network/expressRoutePortsLocations/bvtazureixpportpair1", - "type": "Microsoft.Network/expressRouteProviderPorts", - "properties": { - "portPairDescriptor": "bvtazureixpportpair", - "primaryAzurePort": "bvtazureixp01", - "secondaryAzurePort": "bvtazureixp01", - "peeringLocation": "SiliconValley", - "overprovisionFactor": 4, - "portBandwidthInMbps": 4000, - "usedBandwidthInMbps": 2500, - "remainingBandwidthInMbps": 1500 - } - } - ] + "parameters": { + "api-version": "2020-06-01", + "subscriptionId": "subid", + "expressRouteProviderPortName": "bvtazureixpportpair1" + }, + "responses": { + "200": { + "body": { + "name": "bvtazureixpportpair1", + "id": "/subscriptions/subid/providers/Microsoft.Network/expressRoutePortsLocations/bvtazureixpportpair1", + "type": "Microsoft.Network/expressRouteProviderPorts", + "properties": { + "portPairDescriptor": "bvtazureixpportpair", + "primaryAzurePort": "bvtazureixp01", + "secondaryAzurePort": "bvtazureixp01", + "peeringLocation": "SiliconValley", + "overprovisionFactor": 4, + "portBandwidthInMbps": 4000, + "usedBandwidthInMbps": 2500, + "remainingBandwidthInMbps": 1500 } } } } - \ No newline at end of file +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json index db76ab6d8708..768fcdcedcaa 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json @@ -47,7 +47,7 @@ "in": "query", "required": false, "type": "string", - "description": "can be used to filter on peering location. Suppoprts only eq" + "description": "can be used to filter on peering location. Supports only eq" }, { "$ref": "./network.json#/parameters/ApiVersionParameter" @@ -157,17 +157,17 @@ "portBandwidthInMbps": { "type": "integer", "format": "int32", - "description": "Bandwidth of the port in Mbps" + "description": "Bandwidth of the port in Mbps." }, "usedBandwidthInMbps": { "type": "integer", "format": "int32", - "description": "Used Bandwidth of the port in Mbps" + "description": "Used Bandwidth of the port in Mbps." }, "remainingBandwidthInMbps": { "type": "integer", "format": "int32", - "description": "Remaining Bandwidth of the port in Mbps" + "description": "Remaining Bandwidth of the port in Mbps." } }, "description": "Properties of ExpressRouteProviderPort." From 70c0bf6948cdf715d187cb2d0ef0d924e1ad94e5 Mon Sep 17 00:00:00 2001 From: Daivapu Goutham Date: Tue, 7 Jul 2020 12:32:18 +0530 Subject: [PATCH 14/16] adding proxyresource type to network.json --- .../2020-06-01/expressRouteProviderPort.json | 2 +- .../stable/2020-06-01/network.json | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json index 768fcdcedcaa..f07379a8cb5d 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json @@ -182,7 +182,7 @@ }, "allOf": [ { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource" + "$ref": "./network.json#/definitions/ProxyResource" } ], "description": "ExpressRouteProviderPort resource." diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/network.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/network.json index 04d5812fcf07..846528513331 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/network.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/network.json @@ -178,6 +178,26 @@ "description": "Reference to another subresource.", "x-ms-azure-resource": true }, + "ProxyResource": { + "properties": { + "id": { + "readOnly": true, + "type": "string", + "description": "Fully qualified resource Id for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}" + }, + "name": { + "readOnly": true, + "type": "string", + "description": "The name of the resource" + }, + "type": { + "readOnly": true, + "type": "string", + "description": "The type of the resource. Ex- Microsoft.Compute/virtualMachines or Microsoft.Storage/storageAccounts." + } + }, + "x-ms-azure-resource": true + }, "TagsObject": { "properties": { "tags": { From 02966b506e4ceb0b4d3818ad3abff6d244bfe965 Mon Sep 17 00:00:00 2001 From: Daivapu Goutham Date: Tue, 7 Jul 2020 15:27:45 +0530 Subject: [PATCH 15/16] fixing description --- .../stable/2020-06-01/expressRouteProviderPort.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json index f07379a8cb5d..6cbc689be01a 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/expressRouteProviderPort.json @@ -47,7 +47,7 @@ "in": "query", "required": false, "type": "string", - "description": "can be used to filter on peering location. Supports only eq" + "description": "Can be used to filter on peering location. Supports only eq." }, { "$ref": "./network.json#/parameters/ApiVersionParameter" From a0ece878327aa87b6f11ebc8e9b7419cfaeb1481 Mon Sep 17 00:00:00 2001 From: Daivapu Goutham Date: Tue, 7 Jul 2020 16:10:28 +0530 Subject: [PATCH 16/16] fixing description for proxy resource --- .../Microsoft.Network/stable/2020-06-01/network.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/network.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/network.json index 846528513331..bc962fea389e 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/network.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/network.json @@ -183,12 +183,12 @@ "id": { "readOnly": true, "type": "string", - "description": "Fully qualified resource Id for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}" + "description": "Fully qualified resource Id for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}." }, "name": { "readOnly": true, "type": "string", - "description": "The name of the resource" + "description": "The name of the resource." }, "type": { "readOnly": true, @@ -196,6 +196,7 @@ "description": "The type of the resource. Ex- Microsoft.Compute/virtualMachines or Microsoft.Storage/storageAccounts." } }, + "description": "The resource model definition for a ARM proxy resource. It will have everything other than required location and tags.", "x-ms-azure-resource": true }, "TagsObject": {