Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Express Route Cross Connection Swagger changes as per PM requirements #2644

Merged
merged 8 commits into from
Mar 19, 2018
Merged

Express Route Cross Connection Swagger changes as per PM requirements #2644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d9beb30
Express Route Cross Connection Swagger changes as per PM requirements
vinayada1 Mar 13, 2018
701894b
Add changes to cross connection peering
vinayada1 Mar 14, 2018
0ba2484
Merge branch 'master' of https://github.com/Azure/azure-rest-api-spec…
vinayada1 Mar 14, 2018
5839334
Fix references to expressRouteCircuit file
vinayada1 Mar 15, 2018
5f04a60
Merge branch 'Network-2018-02-01' of https://github.com/Azure/azure-r…
vinayada1 Mar 15, 2018
a299629
Merge branch 'Network-2018-02-01' of https://github.com/Azure/azure-r…
vinayada1 Mar 15, 2018
049b7f2
Fix review comments
vinayada1 Mar 16, 2018
ddc3f75
Address review comments
gimotwanMSFT Mar 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...osoft.Network/stable/2018-02-01/examples/ExpressRouteCrossConnectionBgpPeeringCreate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parameters": {
"peeringName": "AzurePrivatePeering",
"crossConnectionName": "CrossConnection-6e918437-5077-4ffe-b45f-0b7c0672da4b",
"crossConnectionName": "<circuitServiceKey>",
"resourceGroupName": "CrossConnection-SiliconValley",
"api-version": "2018-02-01",
"subscriptionId": "subid",
Expand All @@ -19,7 +19,7 @@
"201": {
"body": {
"name": "AzurePrivatePeering",
"id": "/subscriptions/99c33776-9f4e-4e58-abe8-9263db1b9c6e/resourceGroups/CrossConnection-SiliconValley/providers/Microsoft.Network/expressRouteCrossConnections/CrossConnection-6e918437-5077-4ffe-b45f-0b7c0672da4b/peerings/AzurePrivatePeering",
"id": "/subscriptions/subid/resourceGroups/CrossConnection-SiliconValley/providers/Microsoft.Network/expressRouteCrossConnections/<circuitServiceKey>/peerings/AzurePrivatePeering",
"etag": "W/\"72090554-7e3b-43f2-80ad-99a9020dcb11\"",
"properties": {
"provisioningState": "Succeeded",
Expand All @@ -40,7 +40,7 @@
"200": {
"body": {
"name": "AzurePrivatePeering",
"id": "/subscriptions/99c33776-9f4e-4e58-abe8-9263db1b9c6e/resourceGroups/CrossConnection-Boydton1DC/providers/Microsoft.Network/expressRouteCrossConnections/CrossConnection-9547feab-3c14-4e8b-8d0e-b5e74cd5ed7a/peerings/AzurePrivatePeering",
"id": "/subscriptions/subid/resourceGroups/CrossConnection-Boydton1DC/providers/Microsoft.Network/expressRouteCrossConnections/<circuitServiceKey>/peerings/AzurePrivatePeering",
"etag": "W/\"72090554-7e3b-43f2-80ad-99a9020dcb11\"",
"properties": {
"provisioningState": "Succeeded",
Expand Down
2 changes: 1 addition & 1 deletion ...osoft.Network/stable/2018-02-01/examples/ExpressRouteCrossConnectionBgpPeeringDelete.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parameters": {
"peeringName": "AzurePrivatePeering",
"crossConnectionName": "CrossConnection-6e918437-5077-4ffe-b45f-0b7c0672da4b",
"crossConnectionName": "<circuitServiceKey>",
"resourceGroupName": "CrossConnection-SiliconValley",
"api-version": "2018-02-01",
"subscriptionId": "subid"
Expand Down
4 changes: 2 additions & 2 deletions ...icrosoft.Network/stable/2018-02-01/examples/ExpressRouteCrossConnectionBgpPeeringGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parameters": {
"peeringName": "AzurePrivatePeering",
"crossConnectionName": "CrossConnection-6e918437-5077-4ffe-b45f-0b7c0672da4b",
"crossConnectionName": "<circuitServiceKey>",
"resourceGroupName": "CrossConnection-SiliconValley",
"api-version": "2018-02-01",
"subscriptionId": "subid"
Expand All @@ -10,7 +10,7 @@
"200": {
"body": {
"name": "AzurePrivatePeering",
"id": "/subscriptions/99c33776-9f4e-4e58-abe8-9263db1b9c6e/resourceGroups/CrossConnection-Boydton1DC/providers/Microsoft.Network/expressRouteCrossConnections/CrossConnection-9547feab-3c14-4e8b-8d0e-b5e74cd5ed7a/peerings/AzurePrivatePeering",
"id": "/subscriptions/subid/resourceGroups/CrossConnection-Boydton1DC/providers/Microsoft.Network/expressRouteCrossConnections/<circuitServiceKey>/peerings/AzurePrivatePeering",
"etag": "W/\"72090554-7e3b-43f2-80ad-99a9020dcb11\"",
"properties": {
"provisioningState": "Succeeded",
Expand Down
4 changes: 2 additions & 2 deletions ...crosoft.Network/stable/2018-02-01/examples/ExpressRouteCrossConnectionBgpPeeringList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parameters": {
"crossConnectionName": "CrossConnection-6e918437-5077-4ffe-b45f-0b7c0672da4b",
"crossConnectionName": "<circuitServiceKey>",
"resourceGroupName": "CrossConnection-SiliconValley",
"api-version": "2018-02-01",
"subscriptionId": "subid"
Expand All @@ -11,7 +11,7 @@
"value": [
{
"name": "AzurePrivatePeering",
"id": "/subscriptions/subid/resourceGroups/CrossConnection-SiliconValley/providers/Microsoft.Network/expressRouteCrossConnections/CrossConnection-6e918437-5077-4ffe-b45f-0b7c0672da4b/peerings/AzurePrivatePeering",
"id": "/subscriptions/subid/resourceGroups/CrossConnection-SiliconValley/providers/Microsoft.Network/expressRouteCrossConnections/<circuitServiceKey>/peerings/AzurePrivatePeering",
"etag": "W/\"72090554-7e3b-43f2-80ad-99a9020dcb11\"",
"properties": {
"provisioningState": "Succeeded",
Expand Down
13 changes: 5 additions & 8 deletions ...-manager/Microsoft.Network/stable/2018-02-01/examples/ExpressRouteCrossConnectionGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"api-version" : "2018-02-01",
"subscriptionId" : "subid",
"resourceGroupName" : "CrossConnection-SiliconValley",
"crossConnectionName" : "CrossConnection-6e918437-5077-4ffe-b45f-0b7c0672da4b"
"crossConnectionName" : "<circuitServiceKey>"
},
"responses" : {
"200" : {
"body" : {
"name": "CrossConnection-6e918437-5077-4ffe-b45f-0b7c0672da4b",
"id": "/subscriptions/subid/resourceGroups/CrossConnection-SiliconValley/providers/Microsoft.Network/expressRouteCrossConnections/CrossConnection-6e918437-5077-4ffe-b45f-0b7c0672da4b",
"name": "<circuitServiceKey>",
"id": "/subscriptions/subid/resourceGroups/CrossConnection-SiliconValley/providers/Microsoft.Network/expressRouteCrossConnections/<circuitServiceKey>",
"type": "Microsoft.Network/expressRouteCrossConnections",
"location": "brazilsouth",
"etag": "W/\"c0e6477e-8150-4d4f-9bf6-bb10e6acb63a\"",
Expand All @@ -19,11 +19,8 @@
"id": "/subscriptions/subid/resourceGroups/ertest/providers/Microsoft.Network/expressRouteCircuits/er1"
},
"peerings": [],
"serviceProviderProperties": {
"serviceProviderName": "Equinix",
"peeringLocation": "SiliconValley",
"bandwidthInMbps": 1000
},
"peeringLocation": "SiliconValley",
"bandwidthInMbps": 1000,
"primaryAzurePort": "bvtazureixp01",
"secondaryAzurePort": "bvtazureixp01",
"sTag": 2,
Expand Down
11 changes: 4 additions & 7 deletions ...manager/Microsoft.Network/stable/2018-02-01/examples/ExpressRouteCrossConnectionList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"body": {
"value": [
{
"name": "CrossConnection-6e918437-5077-4ffe-b45f-0b7c0672da4b",
"id": "/subscriptions/subid/resourceGroups/CrossConnectionSiliconValley/providers/Microsoft.Network/expressRouteCrossConnections/CrossConnection-6e918437-5077-4ffe-b45f-0b7c0672da4b",
"name": "<circuitServiceKey>",
"id": "/subscriptions/subid/resourceGroups/CrossConnectionSiliconValley/providers/Microsoft.Network/expressRouteCrossConnections/<circuitServiceKey>",
"type": "Microsoft.Network/expressRouteCrossConnections",
"location": "brazilsouth",
"properties": {
Expand All @@ -18,11 +18,8 @@
"id": "/subscriptions/subid/resourceGroups/ertest/providers/Microsoft.Network/expressRouteCircuits/er1"
},
"peerings": [],
"serviceProviderProperties": {
"serviceProviderName": "Equinix",
"peeringLocation": "SiliconValley",
"bandwidthInMbps": 1000
},
"peeringLocation": "SiliconValley",
"bandwidthInMbps": 1000,
"primaryAzurePort": "bvtazureixp01",
"secondaryAzurePort": "bvtazureixp01",
"sTag": 2,
Expand Down
11 changes: 4 additions & 7 deletions ...ft.Network/stable/2018-02-01/examples/ExpressRouteCrossConnectionListByResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"body": {
"value": [
{
"name": "CrossConnection-6e918437-5077-4ffe-b45f-0b7c0672da4b",
"id": "/subscriptions/subid/resourceGroups/CrossConnectionSilicon-Valley/providers/Microsoft.Network/expressRouteCrossConnections/CrossConnection-6e918437-5077-4ffe-b45f-0b7c0672da4b",
"name": "<circuitServiceKey>",
"id": "/subscriptions/subid/resourceGroups/CrossConnectionSilicon-Valley/providers/Microsoft.Network/expressRouteCrossConnections/<circuitServiceKey>",
"type": "Microsoft.Network/expressRouteCrossConnections",
"location": "brazilsouth",
"properties": {
Expand All @@ -19,11 +19,8 @@
"id": "/subscriptions/subid/resourceGroups/ertest/providers/Microsoft.Network/expressRouteCircuits/er1"
},
"peerings": [],
"serviceProviderProperties": {
"serviceProviderName": "Equinix",
"peeringLocation": "SiliconValley",
"bandwidthInMbps": 1000
},
"peeringLocation": "SiliconValley",
"bandwidthInMbps": 1000,
"primaryAzurePort": "bvtazureixp01",
"secondaryAzurePort": "bvtazureixp01",
"sTag": 2,
Expand Down
13 changes: 5 additions & 8 deletions ...nager/Microsoft.Network/stable/2018-02-01/examples/ExpressRouteCrossConnectionUpdate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"api-version" : "2018-02-01",
"subscriptionId" : "subid",
"resourceGroupName" : "CrossConnection-SiliconValley",
"crossConnectionName" : "CrossConnection-6e918437-5077-4ffe-b45f-0b7c0672da4b",
"crossConnectionName" : "<circuitServiceKey>",
"parameters": {
"properties": {
"serviceProviderProvisioningState": "NotProvisioned"
Expand All @@ -13,8 +13,8 @@
"responses" : {
"200" : {
"body" : {
"name": "CrossConnection-6e918437-5077-4ffe-b45f-0b7c0672da4b",
"id": "/subscriptions/subid/resourceGroups/CrossConnectionSiliconValley/providers/Microsoft.Network/expressRouteCrossConnections/CrossConnection-6e918437-5077-4ffe-b45f-0b7c0672da4b",
"name": "<circuitServiceKey>",
"id": "/subscriptions/subid/resourceGroups/CrossConnectionSiliconValley/providers/Microsoft.Network/expressRouteCrossConnections/<circuitServiceKey>",
"type": "Microsoft.Network/expressRouteCrossConnections",
"location": "brazilsouth",
"properties": {
Expand All @@ -23,11 +23,8 @@
"id": "/subscriptions/subid/resourceGroups/ertest/providers/Microsoft.Network/expressRouteCircuits/er1"
},
"peerings": [],
"serviceProviderProperties": {
"serviceProviderName": "Equinix",
"peeringLocation": "SiliconValley",
"bandwidthInMbps": 1000
},
"peeringLocation": "SiliconValley",
"bandwidthInMbps": 1000,
"primaryAzurePort": "bvtazureixp01",
"secondaryAzurePort": "bvtazureixp01",
"sTag": 2,
Expand Down
11 changes: 4 additions & 7 deletions ...r/Microsoft.Network/stable/2018-02-01/examples/ExpressRouteCrossConnectionUpdateTags.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"api-version" : "2018-02-01",
"subscriptionId" : "subid",
"resourceGroupName" : "CrossConnection-SiliconValley",
"crossConnectionName" : "CrossConnection-6e918437-5077-4ffe-b45f-0b7c0672da4b",
"crossConnectionName" : "<circuitServiceKey>",
"crossConnectionParameters": {
"tags": {
"tag1": "value1",
Expand All @@ -15,7 +15,7 @@
"200" : {
"body" : {
"name": "er1",
"id": "/subscriptions/subid/resourceGroups/CrossConnectionSiliconValley/providers/Microsoft.Network/expressRouteCrossConnections/CrossConnection-6e918437-5077-4ffe-b45f-0b7c0672da4b",
"id": "/subscriptions/subid/resourceGroups/CrossConnectionSiliconValley/providers/Microsoft.Network/expressRouteCrossConnections/<circuitServiceKey>",
"type": "Microsoft.Network/expressRouteCrossConnections",
"location": "brazilsouth",
"tags": {
Expand All @@ -28,11 +28,8 @@
"id": "/subscriptions/subid/resourceGroups/ertest/providers/Microsoft.Network/expressRouteCircuits/er1"
},
"peerings": [],
"serviceProviderProperties": {
"serviceProviderName": "Equinix",
"peeringLocation": "SiliconValley",
"bandwidthInMbps": 1000
},
"peeringLocation": "SiliconValley",
"bandwidthInMbps": 1000,
"primaryAzurePort": "bvtazureixp01",
"secondaryAzurePort": "bvtazureixp01",
"sTag": 2,
Expand Down
2 changes: 1 addition & 1 deletion ...er/Microsoft.Network/stable/2018-02-01/examples/ExpressRouteCrossConnectionsArpTable.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parameters": {
"peeringName": "AzurePrivatePeering",
"crossConnectionName": "CrossConnection-6e918437-5077-4ffe-b45f-0b7c0672da4b",
"crossConnectionName": "<circuitServiceKey>",
"resourceGroupName": "CrossConnection-SiliconValley",
"devicePath": "primary",
"api-version": "2018-02-01",
Expand Down
2 changes: 1 addition & 1 deletion .../Microsoft.Network/stable/2018-02-01/examples/ExpressRouteCrossConnectionsRouteTable.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parameters": {
"peeringName": "AzurePrivatePeering",
"crossConnectionName": "CrossConnection-6e918437-5077-4ffe-b45f-0b7c0672da4b",
"crossConnectionName": "<circuitServiceKey>",
"resourceGroupName": "CrossConnection-SiliconValley",
"devicePath": "primary",
"api-version": "2018-02-01",
Expand Down
2 changes: 1 addition & 1 deletion ...oft.Network/stable/2018-02-01/examples/ExpressRouteCrossConnectionsRouteTableSummary.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parameters": {
"peeringName": "AzurePrivatePeering",
"crossConnectionName": "CrossConnection-6e918437-5077-4ffe-b45f-0b7c0672da4b",
"crossConnectionName": "<circuitServiceKey>",
"resourceGroupName": "CrossConnection-SiliconValley",
"devicePath": "primary",
"api-version": "2018-02-01",
Expand Down
50 changes: 29 additions & 21 deletions ...ion/network/resource-manager/Microsoft.Network/stable/2018-02-01/expressRouteCircuit.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1323,29 +1323,12 @@
"ExpressRouteCircuitPeeringPropertiesFormat": {
"properties": {
"peeringType": {
"type": "string",
"description": "The PeeringType. Possible values are: 'AzurePublicPeering', 'AzurePrivatePeering', and 'MicrosoftPeering'.",
"enum": [
"AzurePublicPeering",
"AzurePrivatePeering",
"MicrosoftPeering"
],
"x-ms-enum": {
"name": "ExpressRouteCircuitPeeringType",
"modelAsString": true
}
"$ref": "#/definitions/ExpressRoutePeeringType",
"description": "The peering type."
},
"state": {
"type": "string",
"description": "The state of peering. Possible values are: 'Disabled' and 'Enabled'",
"enum": [
"Disabled",
"Enabled"
],
"x-ms-enum": {
"name": "ExpressRouteCircuitPeeringState",
"modelAsString": true
}
"$ref": "#/definitions/ExpressRoutePeeringState",
"description": "The peering state."
},
"azureASN": {
"type": "integer",
Expand Down Expand Up @@ -1460,6 +1443,31 @@
},
"description": "Response for ListPeering API service call retrieves all peerings that belong to an ExpressRouteCircuit."
},
"ExpressRoutePeeringType": {
"type": "string",
"description": "The PeeringType. Possible values are: 'AzurePublicPeering', 'AzurePrivatePeering', and 'MicrosoftPeering'.",
"enum": [
"AzurePublicPeering",
"AzurePrivatePeering",
"MicrosoftPeering"
],
"x-ms-enum": {
"name": "ExpressRoutePeeringType",
"modelAsString": true
}
},
"ExpressRoutePeeringState": {
"type": "string",
"description": "The state of peering. Possible values are: 'Disabled' and 'Enabled'",
"enum": [
"Disabled",
"Enabled"
],
"x-ms-enum": {
"name": "ExpressRoutePeeringState",
"modelAsString": true
}
},
"ExpressRouteCircuitConnectionPropertiesFormat": {
"properties": {
"expressRouteCircuitPeering": {
Expand Down
Loading