Skip to content

Commit

Permalink
Merge Express Route Circuit Connection to Networking2018-02-01 (#2370)
Browse files Browse the repository at this point in the history 
* copy all files from 2018-01-01 to 2018-02-01

* update api version to 2018 in all files

* add express route circuit connection as child of express route bgp peering

* update readme.md

* add examples

* fix travis build error

* fix travis build error

* fix indentation errors

* update reference to circuit connections in peering

* fix indentation

* fix indentation

* fix indentation'

* get latest file

* Fix indentation

* fix key

* fix indentation and example

* fix indentation

* fix indentation

* make circuit con singular
  • Loading branch information
@dedhar
dedhar authored Jan 30, 2018
1 parent 814bcbf commit 0f85d45
Show file tree
Hide file tree
Showing 4 changed files with 73 additions and 64 deletions.
57 changes: 29 additions & 28 deletions ...ger/Microsoft.Network/stable/2018-02-01/examples/ExpressRouteCircuitConnectionCreate.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
"resourceGroupName": "rg1",
"api-version": "2018-02-01",
"subscriptionId": "99c33776-9f4e-4e58-abe8-9263db1b9c6e",
"circuitName": "ExpressRouteARMCircuitA",
"peeringName": "AzurePrivatePeering",
"type": "Microsoft.Network/expressRouteCircuits/peerings/connections",
"circuitName": "ExpressRouteARMCircuitA",
"peeringName": "AzurePrivatePeering",
"type": "Microsoft.Network/expressRouteCircuits/peerings/connections",
"expressRouteCircuitConnectionsPropertiesFormat": {
"location": "West US",
"properties": {
"expressroutecircuitpeering": {
"id":"/subscriptions/99c33776-9f4e-4e58-abe8-9263db1b9c6e/resourceGroups/dedharcktinit/providers/Microsoft.Network/expressRouteCircuits/dedharcktlocal/peerings/AzurePrivatePeering"
},
"peerexpressroutecircuitpeering": {
"id":"/subscriptions/8c992d64-fce9-426d-b278-85642dfeab03/resourceGroups/dedharcktpeer/providers/Microsoft.Network/expressRouteCircuits/dedharcktremote/peerings/AzurePrivatePeering"
},
"authorizationKeys": "946a1918-b7a2-4917-b43c-8c4cdaee006a",
"expressroutecircuitpeering": {
"id": "/subscriptions/99c33776-9f4e-4e58-abe8-9263db1b9c6e/resourceGroups/dedharcktinit/providers/Microsoft.Network/expressRouteCircuits/dedharcktlocal/peerings/AzurePrivatePeering"
},
"peerexpressroutecircuitpeering": {
"id": "/subscriptions/8c992d64-fce9-426d-b278-85642dfeab03/resourceGroups/dedharcktpeer/providers/Microsoft.Network/expressRouteCircuits/dedharcktremote/peerings/AzurePrivatePeering"
},
"authorizationKey": "946a1918-b7a2-4917-b43c-8c4cdaee006a",
"addressPrefix": "10.0.0.0/29"
}
}
Expand All @@ -28,15 +28,16 @@
"etag": "w/\\00000000-0000-0000-0000-000000000000\\",
"name": "circuitConnectionUSAUS",
"properties": {
"expressroutecircuitpeering": {
"id":"/subscriptions/99c33776-9f4e-4e58-abe8-9263db1b9c6e/resourceGroups/dedharcktinit/providers/Microsoft.Network/expressRouteCircuits/dedharcktlocal/peerings/AzurePrivatePeering"
},
"peerexpressroutecircuitpeering": {
"id":"/subscriptions/8c992d64-fce9-426d-b278-85642dfeab03/resourceGroups/dedharcktpeer/providers/Microsoft.Network/expressRouteCircuits/dedharcktremote/peerings/AzurePrivatePeering"
},
"authorizationKey": "946a1918-b7a2-4917-b43c-8c4cdaee006a",
"addressPrefix": "10.0.0.0/24",
"circuitConnectionStatus": "Connected"
"expressroutecircuitpeering": {
"id": "/subscriptions/99c33776-9f4e-4e58-abe8-9263db1b9c6e/resourceGroups/dedharcktinit/providers/Microsoft.Network/expressRouteCircuits/dedharcktlocal/peerings/AzurePrivatePeering"
},
"peerexpressroutecircuitpeering": {
"id": "/subscriptions/8c992d64-fce9-426d-b278-85642dfeab03/resourceGroups/dedharcktpeer/providers/Microsoft.Network/expressRouteCircuits/dedharcktremote/peerings/AzurePrivatePeering"
},
"authorizationKey": "946a1918-b7a2-4917-b43c-8c4cdaee006a",
"addressPrefix": "10.0.0.0/24",
"circuitConnectionStatus": "Disconnected",
"provisioningState": "Updating"
}
}
},
Expand All @@ -46,15 +47,15 @@
"etag": "w/\\00000000-0000-0000-0000-000000000000\\",
"name": "circuitConnectionUSAUS",
"properties": {
"expressroutecircuitpeering": {
"id":"/subscriptions/99c33776-9f4e-4e58-abe8-9263db1b9c6e/resourceGroups/dedharcktinit/providers/Microsoft.Network/expressRouteCircuits/dedharcktlocal/peerings/AzurePrivatePeering"
},
"peerexpressroutecircuitpeering": {
"id":"/subscriptions/8c992d64-fce9-426d-b278-85642dfeab03/resourceGroups/dedharcktpeer/providers/Microsoft.Network/expressRouteCircuits/dedharcktremote/peerings/AzurePrivatePeering"
},
"authorizationKey": "946a1918-b7a2-4917-b43c-8c4cdaee006a",
"addressPrefix": "10.0.0.0/24",
"circuitConnectionStatus": "Connected"
"expressroutecircuitpeering": {
"id": "/subscriptions/99c33776-9f4e-4e58-abe8-9263db1b9c6e/resourceGroups/dedharcktinit/providers/Microsoft.Network/expressRouteCircuits/dedharcktlocal/peerings/AzurePrivatePeering"
},
"peerexpressroutecircuitpeering": {
"id": "/subscriptions/8c992d64-fce9-426d-b278-85642dfeab03/resourceGroups/dedharcktpeer/providers/Microsoft.Network/expressRouteCircuits/dedharcktremote/peerings/AzurePrivatePeering"
},
"authorizationKey": "946a1918-b7a2-4917-b43c-8c4cdaee006a",
"addressPrefix": "10.0.0.0/24",
"circuitConnectionStatus": "Connected"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...ger/Microsoft.Network/stable/2018-02-01/examples/ExpressRouteCircuitConnectionDelete.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parameters": {
"circuitName": "ExpressRouteARMCircuitA",
"peeringName": "AzurePrivatePeering",
"peeringName": "AzurePrivatePeering",
"connectionName": "circuitConnectionUSAUS",
"resourceGroupName": "rg1",
"api-version": "2018-02-01",
Expand Down
22 changes: 11 additions & 11 deletions ...anager/Microsoft.Network/stable/2018-02-01/examples/ExpressRouteCircuitConnectionGet.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"resourceGroupName": "rg1",
"api-version": "2018-02-01",
"subscriptionId": "subid",
"circuitName": "ExpressRouteARMCircuitA",
"peeringName": "AzurePrivatePeering"
"circuitName": "ExpressRouteARMCircuitA",
"peeringName": "AzurePrivatePeering"
},
"responses": {
"200": {
Expand All @@ -14,15 +14,15 @@
"etag": "w/\\00000000-0000-0000-0000-000000000000\\",
"name": "circuitConnectionUSAUS",
"properties": {
"expressroutecircuitpeering": {
"id":"/subscriptions/99c33776-9f4e-4e58-abe8-9263db1b9c6e/resourceGroups/dedharcktinit/providers/Microsoft.Network/expressRouteCircuits/dedharcktlocal/peerings/AzurePrivatePeering"
},
"peerexpressroutecircuitpeering": {
"id":"/subscriptions/8c992d64-fce9-426d-b278-85642dfeab03/resourceGroups/dedharcktpeer/providers/Microsoft.Network/expressRouteCircuits/dedharcktremote/peerings/AzurePrivatePeering"
},
"authorizationKey": "946a1918-b7a2-4917-b43c-8c4cdaee006a",
"addressPrefix": "10.0.0.0/24",
"circuitConnectionStatus": "Connected"
"expressroutecircuitpeering": {
"id": "/subscriptions/99c33776-9f4e-4e58-abe8-9263db1b9c6e/resourceGroups/dedharcktinit/providers/Microsoft.Network/expressRouteCircuits/dedharcktlocal/peerings/AzurePrivatePeering"
},
"peerexpressroutecircuitpeering": {
"id": "/subscriptions/8c992d64-fce9-426d-b278-85642dfeab03/resourceGroups/dedharcktpeer/providers/Microsoft.Network/expressRouteCircuits/dedharcktremote/peerings/AzurePrivatePeering"
},
"authorizationKey": "946a1918-b7a2-4917-b43c-8c4cdaee006a",
"addressPrefix": "10.0.0.0/24",
"circuitConnectionStatus": "Connected"
}
}
}
Expand Down
56 changes: 32 additions & 24 deletions ...ion/network/resource-manager/Microsoft.Network/stable/2018-02-01/expressRouteCircuit.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}/peerings/{peeringName}/connections/{connectionName}": {
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}/peerings/{peeringName}/connections/{connectionName}": {
"delete": {
"tags": [
"ExpressRouteCircuitConnections"
Expand Down Expand Up @@ -457,7 +457,7 @@
"type": "string",
"description": "The name of the peering."
},
{
{
"name": "connectionName",
"in": "path",
"required": true,
Expand All @@ -482,8 +482,10 @@
"description": "Delete successful."
}
},
"x-ms-examples": {
"ExpressRouteCircuitConnectionDelete": { "$ref": "./examples/ExpressRouteCircuitConnectionDelete.json" }
"x-ms-examples": {
"ExpressRouteCircuitConnectionDelete": {
"$ref": "./examples/ExpressRouteCircuitConnectionDelete.json"
}
},
"x-ms-long-running-operation": true
},
Expand Down Expand Up @@ -515,7 +517,7 @@
"type": "string",
"description": "The name of the peering."
},
{
{
"name": "connectionName",
"in": "path",
"required": true,
Expand All @@ -533,12 +535,14 @@
"200": {
"description": "Request successful. The operation returns the resulting Express Route Circuit Connection resource.",
"schema": {
"$ref": "#/definitions/ExpressRouteCircuitConnections"
"$ref": "#/definitions/ExpressRouteCircuitConnection"
}
}
},
"x-ms-examples": {
"ExpressRouteCircuitConnectionGet": { "$ref": "./examples/ExpressRouteCircuitConnectionGet.json" }
"x-ms-examples": {
"ExpressRouteCircuitConnectionGet": {
"$ref": "./examples/ExpressRouteCircuitConnectionGet.json"
}
}
},
"put": {
Expand Down Expand Up @@ -569,7 +573,7 @@
"type": "string",
"description": "The name of the peering."
},
{
{
"name": "connectionName",
"in": "path",
"required": true,
Expand All @@ -581,7 +585,7 @@
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/ExpressRouteCircuitConnections"
"$ref": "#/definitions/ExpressRouteCircuitConnection"
},
"description": "Parameters supplied to the create or update express route circuit circuit connection operation."
},
Expand All @@ -596,18 +600,20 @@
"200": {
"description": "Update successful. The operation returns the resulting ExpressRouteCircuitPeering resource.",
"schema": {
"$ref": "#/definitions/ExpressRouteCircuitConnections"
"$ref": "#/definitions/ExpressRouteCircuitConnection"
}
},
"201": {
"description": "Create successful. The operation returns the resulting ExpressRouteCircuitPeering resource.",
"schema": {
"$ref": "#/definitions/ExpressRouteCircuitConnections"
"$ref": "#/definitions/ExpressRouteCircuitConnection"
}
}
},
"x-ms-examples": {
"ExpressRouteCircuitConnectionCreate": { "$ref": "./examples/ExpressRouteCircuitConnectionCreate.json" }
"x-ms-examples": {
"ExpressRouteCircuitConnectionCreate": {
"$ref": "./examples/ExpressRouteCircuitConnectionCreate.json"
}
},
"x-ms-long-running-operation": true
}
Expand Down Expand Up @@ -790,7 +796,9 @@
}
},
"x-ms-examples": {
"Update Express Route Circuit Tags": { "$ref": "./examples/ExpressRouteCircuitUpdateTags.json" }
"Update Express Route Circuit Tags": {
"$ref": "./examples/ExpressRouteCircuitUpdateTags.json"
}
},
"x-ms-long-running-operation": true
}
Expand Down Expand Up @@ -1393,8 +1401,8 @@
"description": "The GatewayManager Etag."
},
"lastModifiedBy": {
"type": "string",
"description": "Gets whether the provider or the customer last modified the peering."
"type": "string",
"description": "Gets whether the provider or the customer last modified the peering."
},
"routeFilter": {
"$ref": "./routeFilter.json#/definitions/RouteFilter",
Expand All @@ -1404,10 +1412,10 @@
"$ref": "#/definitions/Ipv6ExpressRouteCircuitPeeringConfig",
"description": "The IPv6 peering configuration."
},
"connections": {
"connections": {
"type": "array",
"items": {
"$ref": "#/definitions/ExpressRouteCircuitConnections"
"$ref": "#/definitions/ExpressRouteCircuitConnection"
},
"description": "The list of circuit connections associated with Azure Private Peering for this circuit."
}
Expand Down Expand Up @@ -1452,7 +1460,7 @@
},
"description": "Response for ListPeering API service call retrieves all peerings that belong to an ExpressRouteCircuit."
},
"ExpressRouteCircuitConnectionsPropertiesFormat": {
"ExpressRouteCircuitConnectionPropertiesFormat": {
"properties": {
"expressroutecircuitpeering": {
"$ref": "#/definitions/ExpressRouteCircuitPeering",
Expand All @@ -1462,7 +1470,7 @@
"$ref": "#/definitions/ExpressRouteCircuitPeering",
"description": "Reference to Express Route Circuit Private Peering Resource of the peered circuit."
},
"addressPrefix": {
"addressPrefix": {
"type": "string",
"description": "/29 IP address space to carve out Customer addresses for tunnels."
},
Expand All @@ -1477,19 +1485,19 @@
"Connected",
"Disconnected"
],
"readOnly": true,
"readOnly": true,
"x-ms-enum": {
"name": "ConnectionStatus",
"modelAsString": true
}
}
}
},
"ExpressRouteCircuitConnections": {
"ExpressRouteCircuitConnection": {
"properties": {
"properties": {
"x-ms-client-flatten": true,
"$ref": "#/definitions/ExpressRouteCircuitConnectionsPropertiesFormat"
"$ref": "#/definitions/ExpressRouteCircuitConnectionPropertiesFormat"
},
"name": {
"type": "string",
Expand Down

2 comments on commit 0f85d45

@AutorestCI
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit was treated and no generation was made for Azure/azure-sdk-for-go

@AutorestCI
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit was treated and no generation was made for Azure/azure-sdk-for-python

Please sign in to comment.