Skip to content

Commit

Permalink
Add HubRouteTables specs to virtualWan.json (#9206)
Browse files Browse the repository at this point in the history
* add HubRouteTables specs to virtualWan.json

* updated RoutingConfiguration as a connection property

* added examples for hubRouteTable

* updated examples for routingConfiguration

* fix1

* some more fixes

* fixes2

* prettier check done

* validate spec done

* fix3

* fixed model validation errors

* model validations again

* few more fxes:

* remove type from examples

* fix staging errors

* add required field where needed

* updated after review

* onemore fix

* added type

* added type
  • Loading branch information
nagula-ritvika authored May 5, 2020
1 parent be39b38 commit 76ae8b6
Show file tree
Hide file tree
Showing 23 changed files with 1,469 additions and 29 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,33 @@
"id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/expressRouteCircuits/circuitName/peerings/AzurePrivatePeering"
},
"authorizationKey": "authorizationKey",
"routingWeight": 2
"routingWeight": 2,
"enableInternetSecurity": false,
"routingConfiguration": {
"associatedRouteTable": {
"id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable1"
},
"propagatedRouteTables": {
"labels": [
"label1",
"label2"
],
"ids": [
{
"id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable1"
},
{
"id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable2"
},
{
"id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable3"
}
]
},
"vnetRoutes": {
"staticRoutes": []
}
}
}
}
},
Expand All @@ -42,7 +68,33 @@
"id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/expressRouteCircuits/circuitName/peerings/AzurePrivatePeering"
},
"authorizationKey": "authorizationKey",
"routingWeight": 2
"routingWeight": 2,
"enableInternetSecurity": false,
"routingConfiguration": {
"associatedRouteTable": {
"id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable1"
},
"propagatedRouteTables": {
"labels": [
"label1",
"label2"
],
"ids": [
{
"id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable1"
},
{
"id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable2"
},
{
"id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable3"
}
]
},
"vnetRoutes": {
"staticRoutes": []
}
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,33 @@
"id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/expressRouteCircuits/circuitName/peerings/AzurePrivatePeering"
},
"authorizationKey": "authorizationKey",
"routingWeight": 1
"routingWeight": 1,
"enableInternetSecurity": false,
"routingConfiguration": {
"associatedRouteTable": {
"id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable1"
},
"propagatedRouteTables": {
"labels": [
"label1",
"label2"
],
"ids": [
{
"id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable1"
},
{
"id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable2"
},
{
"id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable3"
}
]
},
"vnetRoutes": {
"staticRoutes": []
}
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,33 @@
"id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/expressRouteCircuits/circuitName/peerings/AzurePrivatePeering"
},
"authorizationKey": "authorizationKey",
"routingWeight": 1
"routingWeight": 1,
"enableInternetSecurity": false,
"routingConfiguration": {
"associatedRouteTable": {
"id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable1"
},
"propagatedRouteTables": {
"labels": [
"label1",
"label2"
],
"ids": [
{
"id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable1"
},
{
"id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable2"
},
{
"id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable3"
}
]
},
"vnetRoutes": {
"staticRoutes": []
}
}
}
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,32 @@
},
"authorizationKey": "f28e9c99-78d8-4248-a855-c54cf6beb99d",
"routingWeight": 1,
"enableInternetSecurity": false
"enableInternetSecurity": false,
"routingConfiguration": {
"associatedRouteTable": {
"id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/virtualHubName/hubRouteTables/hubRouteTable1"
},
"propagatedRouteTables": {
"labels": [
"label1",
"label2"
],
"ids": [
{
"id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/virtualHubName/hubRouteTables/hubRouteTable1"
},
{
"id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/virtualHubName/hubRouteTables/hubRouteTable2"
},
{
"id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/hvirtualHubNameub1/hubRouteTables/hubRouteTable3"
}
]
},
"vnetRoutes": {
"staticRoutes": []
}
}
}
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,32 @@
},
"authorizationKey": "f28e9c99-78d8-4248-a855-c54cf6beb99d",
"routingWeight": 1,
"enableInternetSecurity": false
"enableInternetSecurity": false,
"routingConfiguration": {
"associatedRouteTable": {
"id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/virtualHubName/hubRouteTables/hubRouteTable1"
},
"propagatedRouteTables": {
"labels": [
"label1",
"label2"
],
"ids": [
{
"id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/virtualHubName/hubRouteTables/hubRouteTable1"
},
{
"id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/virtualHubName/hubRouteTables/hubRouteTable2"
},
{
"id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/hvirtualHubNameub1/hubRouteTables/hubRouteTable3"
}
]
},
"vnetRoutes": {
"staticRoutes": []
}
}
}
}
]
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"parameters": {
"routeTableName": "hubRouteTable1",
"resourceGroupName": "rg1",
"api-version": "2020-04-01",
"subscriptionId": "subid",
"virtualHubName": "virtualHub1"
},
"responses": {
"200": {},
"202": {},
"204": {}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
{
"parameters": {
"routeTableName": "hubRouteTable1",
"resourceGroupName": "rg1",
"api-version": "2020-04-01",
"subscriptionId": "subid",
"virtualHubName": "virtualHub1"
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable1",
"etag": "w/\\00000000-0000-0000-0000-000000000000\\",
"name": "hubRouteTable1",
"properties": {
"provisioningState": "Succeeded",
"routes": [
{
"name": "route1",
"destinationType": "CIDR",
"destinations": [
"10.0.0.0/8",
"20.0.0.0/8",
"30.0.0.0/8"
],
"nextHopType": "ResourceId",
"nextHop": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/azureFirewalls/azureFirewall1"
}
],
"labels": [
"label1",
"label2"
],
"associatedConnections": [
"/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubVirtualNetworkConnections/vnetConnn1",
"/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubVirtualNetworkConnections/vnetConnn2"
],
"propagatingConnections": [
"/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/erg1/expressRouteConnections/erConn1",
"/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw1/vpnConnections/vpnConn2"
]
},
"type": "Microsoft.Network/virtualHubs/hubRouteTables"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
{
"parameters": {
"virtualHubName": "virtualHub1",
"resourceGroupName": "rg1",
"api-version": "2020-04-01",
"subscriptionId": "subid"
},
"responses": {
"200": {
"body": [
{
"name": "hubRouteTable1",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable1",
"etag": "w/\\00000000-0000-0000-0000-000000000000\\",
"properties": {
"provisioningState": "Succeeded",
"routes": [
{
"name": "route1a",
"destinationType": "CIDR",
"destinations": [
"10.0.0.0/8",
"20.0.0.0/8",
"30.0.0.0/8"
],
"nextHopType": "ResourceId",
"nextHop": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/azureFirewalls/azureFirewall1"
}
],
"labels": [
"label1",
"label2"
],
"associatedConnections": [
"/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubVirtualNetworkConnections/vnetConnn1",
"/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubVirtualNetworkConnections/vnetConnn2"
],
"propagatingConnections": [
"/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/erg1/expressRouteConnections/erConn1",
"/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw1/vpnConnections/vpnConn2"
]
},
"type": "Microsoft.Network/virtualHubs/hubRouteTables"
},
{
"name": "hubRouteTable2",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable2",
"etag": "w/\\00000000-0000-0000-0000-000000000000\\",
"properties": {
"provisioningState": "Succeeded",
"routes": [
{
"name": "route2a",
"destinationType": "CIDR",
"destinations": [
"40.0.0.0/8",
"50.0.0.0/8",
"60.0.0.0/8"
],
"nextHopType": "ResourceId",
"nextHop": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/hub1/hubVirtualNetworkConnections/vn1"
}
],
"labels": [
"label3"
],
"associatedConnections": [
"/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubVirtualNetworkConnections/vnetConnn3",
"/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubVirtualNetworkConnections/vnetConnn4"
],
"propagatingConnections": [
"/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/erg1/expressRouteConnections/erConn2",
"/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw1/vpnConnections/vpnConn1"
]
},
"type": "Microsoft.Network/virtualHubs/hubRouteTables"
}
]
}
}
}
Loading

0 comments on commit 76ae8b6

Please sign in to comment.