diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/ExpressRouteGatewayListByResourceGroup.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/ExpressRouteGatewayListByResourceGroup.json index c11a3379e39c..bc1bf2084be6 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/ExpressRouteGatewayListByResourceGroup.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/ExpressRouteGatewayListByResourceGroup.json @@ -34,7 +34,8 @@ "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/expressRouteCircuits/circuitName/peerings/AzurePrivatePeering" }, "authorizationKey": "f28e9c99-78d8-4248-a855-c54cf6beb99d", - "routingWeight": 1 + "routingWeight": 1, + "enableInternetSecurity": false } } ] diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/ExpressRouteGatewayListBySubscription.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/ExpressRouteGatewayListBySubscription.json index 6b0192bb7a64..a6cd946dbe2e 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/ExpressRouteGatewayListBySubscription.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/ExpressRouteGatewayListBySubscription.json @@ -33,7 +33,8 @@ "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/expressRouteCircuits/circuitName/peerings/AzurePrivatePeering" }, "authorizationKey": "f28e9c99-78d8-4248-a855-c54cf6beb99d", - "routingWeight": 1 + "routingWeight": 1, + "enableInternetSecurity": false } } ] diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualHubGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualHubGet.json index e45152ccc315..77325c83512b 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualHubGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualHubGet.json @@ -19,7 +19,9 @@ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualWans/virtualWan1" }, "virtualNetworkConnections": [], - "addressPrefix": "10.10.1.0/24" + "virtualHubRouteTableV2s": [], + "addressPrefix": "10.10.1.0/24", + "sku": "Basic" } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualHubList.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualHubList.json index 197754e5f3fe..e556dd268330 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualHubList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualHubList.json @@ -33,7 +33,44 @@ } } ], - "addressPrefix": "10.10.1.0/24" + "virtualHubRouteTableV2s": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2/routeTables/virtualHubRouteTable2", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "name": "rt2a", + "properties": { + "provisioningState": "Succeeded", + "routes": [ + { + "destinationType": "CIDR", + "destinations": [ + "20.10.0.0/16", + "20.20.0.0/16" + ], + "nextHopType": "IPAddress", + "nextHops": [ + "10.0.0.68" + ] + }, + { + "destinationType": "CIDR", + "destinations": [ + "0.0.0.0/0" + ], + "nextHopType": "IPAddress", + "nextHops": [ + "10.0.0.68" + ] + } + ], + "attachedConnections": [ + "All_Vnets" + ] + } + } + ], + "addressPrefix": "10.10.1.0/24", + "sku": "Basic" } }, { @@ -62,7 +99,44 @@ } } ], - "addressPrefix": "210.10.1.0/24" + "virtualHubRouteTableV2s": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2/routeTables/virtualHubRouteTable2", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "name": "rt2a", + "properties": { + "provisioningState": "Succeeded", + "routes": [ + { + "destinationType": "CIDR", + "destinations": [ + "20.10.0.0/16", + "20.20.0.0/16" + ], + "nextHopType": "IPAddress", + "nextHops": [ + "10.0.0.68" + ] + }, + { + "destinationType": "CIDR", + "destinations": [ + "0.0.0.0/0" + ], + "nextHopType": "IPAddress", + "nextHops": [ + "10.0.0.68" + ] + } + ], + "attachedConnections": [ + "All_Vnets" + ] + } + } + ], + "addressPrefix": "210.10.1.0/24", + "sku": "Basic" } } ] diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualHubListByResourceGroup.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualHubListByResourceGroup.json index a08bbaef4532..4d9f1e6638da 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualHubListByResourceGroup.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualHubListByResourceGroup.json @@ -34,7 +34,44 @@ } } ], - "addressPrefix": "10.10.1.0/24" + "virtualHubRouteTableV2s": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2/routeTables/virtualHubRouteTable2", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "name": "rt2a", + "properties": { + "provisioningState": "Succeeded", + "routes": [ + { + "destinationType": "CIDR", + "destinations": [ + "20.10.0.0/16", + "20.20.0.0/16" + ], + "nextHopType": "IPAddress", + "nextHops": [ + "10.0.0.68" + ] + }, + { + "destinationType": "CIDR", + "destinations": [ + "0.0.0.0/0" + ], + "nextHopType": "IPAddress", + "nextHops": [ + "10.0.0.68" + ] + } + ], + "attachedConnections": [ + "All_Vnets" + ] + } + } + ], + "addressPrefix": "10.10.1.0/24", + "sku": "Basic" } }, { @@ -63,7 +100,44 @@ } } ], - "addressPrefix": "210.10.1.0/24" + "virtualHubRouteTableV2s": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2/routeTables/virtualHubRouteTable2", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "name": "rt2a", + "properties": { + "provisioningState": "Succeeded", + "routes": [ + { + "destinationType": "CIDR", + "destinations": [ + "20.10.0.0/16", + "20.20.0.0/16" + ], + "nextHopType": "IPAddress", + "nextHops": [ + "10.0.0.68" + ] + }, + { + "destinationType": "CIDR", + "destinations": [ + "0.0.0.0/0" + ], + "nextHopType": "IPAddress", + "nextHops": [ + "10.0.0.68" + ] + } + ], + "attachedConnections": [ + "All_Vnets" + ] + } + } + ], + "addressPrefix": "210.10.1.0/24", + "sku": "Basic" } } ] diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualHubPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualHubPut.json index 89fc7d835b75..b1fc29784013 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualHubPut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualHubPut.json @@ -13,7 +13,8 @@ "virtualWan": { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualWans/virtualWan1" }, - "addressPrefix": "10.168.0.0/24" + "addressPrefix": "10.168.0.0/24", + "sku": "Basic" } } }, @@ -31,7 +32,9 @@ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualWans/virtualWan1" }, "virtualNetworkConnections": [], - "addressPrefix": "10.168.0.0/24" + "virtualHubRouteTableV2s": [], + "addressPrefix": "10.168.0.0/24", + "sku": "Basic" } } }, @@ -48,7 +51,9 @@ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualWans/virtualWan1" }, "virtualNetworkConnections": [], - "addressPrefix": "10.168.0.0/24" + "virtualHubRouteTableV2s": [], + "addressPrefix": "10.168.0.0/24", + "sku": "Basic" } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualHubRouteTableV2Delete.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualHubRouteTableV2Delete.json new file mode 100644 index 000000000000..09e11ee31df2 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualHubRouteTableV2Delete.json @@ -0,0 +1,14 @@ +{ + "parameters": { + "routeTableName": "virtualHubRouteTable1a", + "resourceGroupName": "rg1", + "api-version": "2019-09-01", + "subscriptionId": "subid", + "virtualHubName": "virtualHub1" + }, + "responses": { + "200": {}, + "202": {}, + "204": {} + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualHubRouteTableV2Get.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualHubRouteTableV2Get.json new file mode 100644 index 000000000000..17bf08b6be53 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualHubRouteTableV2Get.json @@ -0,0 +1,47 @@ +{ + "parameters": { + "routeTableName": "virtualHubRouteTable1a", + "resourceGroupName": "rg1", + "api-version": "2019-09-01", + "subscriptionId": "subid", + "virtualHubName": "virtualHub1" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/routeTables/virtualHubRouteTable1a", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "name": "virtualHubRouteTable1a", + "properties": { + "provisioningState": "Succeeded", + "routes": [ + { + "destinationType": "CIDR", + "destinations": [ + "20.10.0.0/16", + "20.20.0.0/16" + ], + "nextHopType": "IPAddress", + "nextHops": [ + "10.0.0.68" + ] + }, + { + "destinationType": "CIDR", + "destinations": [ + "0.0.0.0/0" + ], + "nextHopType": "IPAddress", + "nextHops": [ + "10.0.0.68" + ] + } + ], + "attachedConnections": [ + "All_Vnets" + ] + } + } + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualHubRouteTableV2List.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualHubRouteTableV2List.json new file mode 100644 index 000000000000..b735523b8756 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualHubRouteTableV2List.json @@ -0,0 +1,72 @@ +{ + "parameters": { + "virtualHubName": "virtualHub1", + "resourceGroupName": "rg1", + "api-version": "2019-09-01", + "subscriptionId": "subid" + }, + "responses": { + "200": { + "body": [ + { + "name": "virtualHubRouteTable1a", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/routeTables/virtualHubRouteTable1a", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "routes": [ + { + "destinationType": "CIDR", + "destinations": [ + "20.10.0.0/16", + "20.20.0.0/16" + ], + "nextHopType": "IPAddress", + "nextHops": [ + "10.0.0.68" + ] + }, + { + "destinationType": "CIDR", + "destinations": [ + "0.0.0.0/0" + ], + "nextHopType": "IPAddress", + "nextHops": [ + "10.0.0.68" + ] + } + ], + "attachedConnections": [ + "All_Vnets" + ] + } + }, + { + "name": "virtualHubRouteTable1b", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/routeTables/virtualHubRouteTable1b", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "routes": [ + { + "destinationType": "CIDR", + "destinations": [ + "20.30.0.0/16", + "20.40.0.0/16" + ], + "nextHopType": "IPAddress", + "nextHops": [ + "10.0.0.68" + ] + } + ], + "attachedConnections": [ + "All_Branches" + ] + } + } + ] + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualHubRouteTableV2Put.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualHubRouteTableV2Put.json new file mode 100644 index 000000000000..92ea32e12e24 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualHubRouteTableV2Put.json @@ -0,0 +1,113 @@ +{ + "parameters": { + "routeTableName": "virtualHubRouteTable1a", + "resourceGroupName": "rg1", + "api-version": "2019-09-01", + "subscriptionId": "subid", + "virtualHubName": "virtualHub1", + "virtualHubRouteTableV2Parameters": { + "properties": { + "routes": [ + { + "destinationType": "CIDR", + "destinations": [ + "20.10.0.0/16", + "20.20.0.0/16" + ], + "nextHopType": "IPAddress", + "nextHops": [ + "10.0.0.68" + ] + }, + { + "destinationType": "CIDR", + "destinations": [ + "0.0.0.0/0" + ], + "nextHopType": "IPAddress", + "nextHops": [ + "10.0.0.68" + ] + } + ], + "attachedConnections": [ + "All_Vnets" + ] + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/routeTables/virtualHubRouteTable1a", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "name": "virtualHubRouteTable1a", + "properties": { + "provisioningState": "Succeeded", + "routes": [ + { + "destinationType": "CIDR", + "destinations": [ + "20.10.0.0/16", + "20.20.0.0/16" + ], + "nextHopType": "IPAddress", + "nextHops": [ + "10.0.0.68" + ] + }, + { + "destinationType": "CIDR", + "destinations": [ + "0.0.0.0/0" + ], + "nextHopType": "IPAddress", + "nextHops": [ + "10.0.0.68" + ] + } + ], + "attachedConnections": [ + "All_Vnets" + ] + } + } + }, + "201": { + "body": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/routeTables/virtualHubRouteTable1a", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "name": "virtualHubRouteTable1a", + "properties": { + "provisioningState": "Succeeded", + "routes": [ + { + "destinationType": "CIDR", + "destinations": [ + "20.10.0.0/16", + "20.20.0.0/16" + ], + "nextHopType": "IPAddress", + "nextHops": [ + "10.0.0.68" + ] + }, + { + "destinationType": "CIDR", + "destinations": [ + "0.0.0.0/0" + ], + "nextHopType": "IPAddress", + "nextHops": [ + "10.0.0.68" + ] + } + ], + "attachedConnections": [ + "All_Vnets" + ] + } + } + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualHubUpdateTags.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualHubUpdateTags.json index fa7506af0d15..92cb17507b68 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualHubUpdateTags.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualHubUpdateTags.json @@ -29,7 +29,9 @@ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualWans/virtualWan1" }, "virtualNetworkConnections": [], - "addressPrefix": "10.168.0.0/24" + "virtualHubRouteTableV2s": [], + "addressPrefix": "10.168.0.0/24", + "sku": "Basic" } } }, @@ -50,7 +52,9 @@ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualWans/virtualWan1" }, "virtualNetworkConnections": [], - "addressPrefix": "10.168.0.0/24" + "virtualHubRouteTableV2s": [], + "addressPrefix": "10.168.0.0/24", + "sku": "Basic" } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualWANGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualWANGet.json index 9b9b421c3019..1adc988979c2 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualWANGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualWANGet.json @@ -26,7 +26,8 @@ "vpnSites": [ "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1", "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite2" - ] + ], + "type": "Basic" } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualWANList.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualWANList.json index 75a52eecd293..a7781780eb31 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualWANList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualWANList.json @@ -26,7 +26,8 @@ "vpnSites": [ "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1", "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite2" - ] + ], + "type": "Basic" } }, { @@ -48,7 +49,8 @@ "vpnSites": [ "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/vpnSites/vpnSite1", "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/vpnSites/vpnSite2" - ] + ], + "type": "Basic" } } ] diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualWANListByResourceGroup.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualWANListByResourceGroup.json index 7dcb103c5e00..1d920660c18f 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualWANListByResourceGroup.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualWANListByResourceGroup.json @@ -27,7 +27,8 @@ "vpnSites": [ "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1", "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite2" - ] + ], + "type": "Basic" } }, { @@ -49,7 +50,8 @@ "vpnSites": [ "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite3", "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite4" - ] + ], + "type": "Basic" } } ] diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualWANPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualWANPut.json index 118f570938a1..6a928e47b7fc 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualWANPut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualWANPut.json @@ -10,7 +10,8 @@ "key1": "value1" }, "properties": { - "disableVpnEncryption": false + "disableVpnEncryption": false, + "type": "Basic" } } }, @@ -35,7 +36,8 @@ "vpnSites": [ "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1", "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite2" - ] + ], + "type": "Basic" } } }, @@ -59,7 +61,8 @@ "vpnSites": [ "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1", "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite2" - ] + ], + "type": "Basic" } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualWANUpdateTags.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualWANUpdateTags.json index 6e52ef5672bc..5f71eac5e854 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualWANUpdateTags.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/examples/VirtualWANUpdateTags.json @@ -33,7 +33,8 @@ "vpnSites": [ "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1", "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite2" - ] + ], + "type": "Basic" } } }, @@ -58,7 +59,8 @@ "vpnSites": [ "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1", "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite2" - ] + ], + "type": "Basic" } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/expressRouteGateway.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/expressRouteGateway.json index 83156a23980c..9e0de7d9e6e5 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/expressRouteGateway.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/expressRouteGateway.json @@ -598,6 +598,10 @@ "routingWeight": { "type": "integer", "description": "The routing weight associated to the connection." + }, + "enableInternetSecurity": { + "type": "boolean", + "description": "Enable internet security." } }, "description": "Properties of the ExpressRouteConnection subresource." diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/virtualWan.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/virtualWan.json index 29266c4d62d4..137ce26016b8 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/virtualWan.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/virtualWan.json @@ -1032,7 +1032,7 @@ "x-ms-long-running-operation": true, "x-ms-long-running-operation-options": { "final-state-via": "azure-async-operation" - } + } }, "delete": { "operationId": "VpnServerConfigurations_Delete", @@ -1166,7 +1166,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{virtualHubName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{virtualHubName}": { "get": { "operationId": "VirtualHubs_Get", "x-ms-examples": { @@ -1847,7 +1847,7 @@ "schema": { "$ref": "./ddosCustomPolicy.json#/definitions/CloudError" } - } + } }, "x-ms-examples": { "ResetVpnGateway": { @@ -2650,7 +2650,7 @@ "schema": { "$ref": "./ddosCustomPolicy.json#/definitions/CloudError" } - } + } }, "x-ms-examples": { "GenerateP2SVpnGatewayVPNProfile": { @@ -2730,7 +2730,7 @@ "parameters": [ { "$ref": "./network.json#/parameters/SubscriptionIdParameter" - }, + }, { "name": "resourceGroupName", "in": "path", @@ -2753,7 +2753,7 @@ "$ref": "#/definitions/P2SVpnConnectionHealthRequest" }, "description": "Request parameters supplied to get p2s vpn connections detailed health." - }, + }, { "$ref": "./network.json#/parameters/ApiVersionParameter" } @@ -2823,7 +2823,7 @@ "schema": { "$ref": "#/definitions/VpnServerConfigurationsResponse" } - }, + }, "202": { "description": "Accepted and the operation will complete asynchronously. Follow the location header for list of associated VpnServerConfigurations list." }, @@ -2875,7 +2875,7 @@ "$ref": "#/definitions/VirtualWanVpnProfileParameters" }, "description": "Parameters supplied to the generate VirtualWan VPN profile generation operation." - }, + }, { "$ref": "./network.json#/parameters/ApiVersionParameter" } @@ -2886,7 +2886,7 @@ "schema": { "$ref": "#/definitions/VpnProfileResponse" } - }, + }, "202": { "description": "Accepted and the operation will complete asynchronously." }, @@ -2902,7 +2902,241 @@ "final-state-via": "location" } } - } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{virtualHubName}/routeTables/{routeTableName}": { + "get": { + "operationId": "VirtualHubRouteTableV2s_Get", + "x-ms-examples": { + "VirtualHubVirtualHubRouteTableV2Get": { + "$ref": "./examples/VirtualHubRouteTableV2Get.json" + } + }, + "description": "Retrieves the details of a VirtualHubRouteTableV2.", + "parameters": [ + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + }, + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The resource group name of the VirtualHubRouteTableV2." + }, + { + "name": "virtualHubName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the VirtualHub." + }, + { + "name": "routeTableName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the VirtualHubRouteTableV2." + }, + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Request successful. Returns the details of the VirtualHubRouteTableV2 retrieved.", + "schema": { + "$ref": "#/definitions/VirtualHubRouteTableV2" + } + }, + "default": { + "description": "Error.", + "schema": { + "$ref": "./network.json#/definitions/Error" + } + } + } + }, + "put": { + "operationId": "VirtualHubRouteTableV2s_CreateOrUpdate", + "x-ms-examples": { + "VirtualHubRouteTableV2Put": { + "$ref": "./examples/VirtualHubRouteTableV2Put.json" + } + }, + "description": "Creates a VirtualHubRouteTableV2 resource if it doesn't exist else updates the existing VirtualHubRouteTableV2.", + "parameters": [ + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + }, + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The resource group name of the VirtualHub." + }, + { + "name": "virtualHubName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the VirtualHub." + }, + { + "name": "routeTableName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the VirtualHubRouteTableV2." + }, + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + }, + { + "name": "virtualHubRouteTableV2Parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/VirtualHubRouteTableV2" + }, + "description": "Parameters supplied to create or update VirtualHubRouteTableV2." + } + ], + "responses": { + "200": { + "description": "Request successful. Returns the details of the VirtualHubRouteTableV2 created or updated.", + "schema": { + "$ref": "#/definitions/VirtualHubRouteTableV2" + } + }, + "201": { + "description": "Request received successfully. Returns the details of the VirtualHubRouteTableV2 created or updated.", + "schema": { + "$ref": "#/definitions/VirtualHubRouteTableV2" + } + }, + "default": { + "description": "Error.", + "schema": { + "$ref": "./network.json#/definitions/Error" + } + } + }, + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "azure-async-operation" + } + }, + "delete": { + "operationId": "VirtualHubRouteTableV2s_Delete", + "x-ms-examples": { + "VirtualHubRouteTableV2Delete": { + "$ref": "./examples/VirtualHubRouteTableV2Delete.json" + } + }, + "description": "Deletes a VirtualHubRouteTableV2.", + "parameters": [ + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + }, + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The resource group name of the VirtualHubRouteTableV2." + }, + { + "name": "virtualHubName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the VirtualHub." + }, + { + "name": "routeTableName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the VirtualHubRouteTableV2." + }, + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Request successful. VirtualHubRouteTableV2 deleted." + }, + "202": { + "description": "Request received successfully. VirtualHubRouteTableV2 deletion is in progress; follow the Location header to poll for final outcome." + }, + "204": { + "description": "No VirtualHubRouteTableV2s exist by the name provided." + }, + "default": { + "description": "Error.", + "schema": { + "$ref": "./network.json#/definitions/Error" + } + } + }, + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "location" + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{virtualHubName}/routeTables": { + "get": { + "operationId": "VirtualHubRouteTableV2s_List", + "x-ms-examples": { + "VirtualHubRouteTableV2List": { + "$ref": "./examples/VirtualHubRouteTableV2List.json" + } + }, + "description": "Retrieves the details of all VirtualHubRouteTableV2s.", + "parameters": [ + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + }, + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The resource group name of the VirtualHub." + }, + { + "name": "virtualHubName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the VirtualHub." + }, + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Request successful. Returns the details of all the VirtualHubRouteTableV2s for the VirtualHub.", + "schema": { + "$ref": "#/definitions/ListHubVirtualNetworkConnectionsResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./ddosCustomPolicy.json#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + } }, "definitions": { "VirtualWanProperties": { @@ -2942,6 +3176,10 @@ "provisioningState": { "$ref": "./network.json#/definitions/ProvisioningState", "description": "The provisioning state of the virtual WAN resource." + }, + "type": { + "type": "string", + "description": "The type of the VirtualWAN." } }, "description": "Parameters for VirtualWAN." @@ -3197,6 +3435,17 @@ "securityProviderName": { "type": "string", "description": "The Security Provider name." + }, + "virtualHubRouteTableV2s": { + "type": "array", + "description": "List of all virtual hub route table v2s associated with this VirtualHub.", + "items": { + "$ref": "#/definitions/VirtualHubRouteTableV2" + } + }, + "sku": { + "type": "string", + "description": "The sku of this VirtualHub." } }, "description": "Parameters for VirtualHub." @@ -3738,7 +3987,7 @@ "name": "HubVirtualNetworkConnectionStatus", "modelAsString": true } - }, + }, "OfficeTrafficCategory": { "type": "string", "description": "The office traffic category.", @@ -3766,13 +4015,13 @@ "name": "VirtualWanSecurityProviderType", "modelAsString": true } - }, - "VpnServerConfigVpnClientRootCertificate": { + }, + "VpnServerConfigVpnClientRootCertificate": { "properties": { "name": { "type": "string", "description": "The certificate name." - }, + }, "publicCertData": { "type": "string", "description": "The certificate public data." @@ -3785,7 +4034,7 @@ "name": { "type": "string", "description": "The certificate name." - }, + }, "publicCertData": { "type": "string", "description": "The certificate public data." @@ -3798,7 +4047,7 @@ "name": { "type": "string", "description": "The certificate name." - }, + }, "thumbprint": { "type": "string", "description": "The revoked VPN client certificate thumbprint." @@ -3811,7 +4060,7 @@ "name": { "type": "string", "description": "The certificate name." - }, + }, "thumbprint": { "type": "string", "description": "The Radius client root certificate thumbprint." @@ -3866,7 +4115,7 @@ "enum": [ "Certificate", "Radius", - "AAD" + "AAD" ], "x-ms-enum": { "name": "VpnAuthenticationType", @@ -3931,7 +4180,7 @@ "type": "array", "readOnly": true, "items": { - "$ref": "#/definitions/P2SVpnGateway" + "$ref": "#/definitions/P2SVpnGateway" }, "description": "List of references to P2SVpnGateways." }, @@ -4023,7 +4272,7 @@ "items": { "$ref": "#/definitions/P2SConnectionConfiguration" } - }, + }, "provisioningState": { "$ref": "./network.json#/definitions/ProvisioningState", "description": "The provisioning state of the P2S VPN gateway resource." @@ -4034,7 +4283,7 @@ "description": "The scale unit for this p2s vpn gateway." }, "vpnServerConfiguration": { - "$ref": "#/definitions/VpnServerConfiguration", + "$ref": "#/definitions/VpnServerConfiguration", "description": "The VpnServerConfiguration to which the p2sVpnGateway is attached to." }, "vpnClientConnectionHealth": { @@ -4136,7 +4385,7 @@ "type": "array", "items": { "type": "string", - "description": "VpnServerConfiguration partial resource uri." + "description": "VpnServerConfiguration partial resource uri." }, "description": "List of VpnServerConfigurations associated with VirtualWan." } @@ -4152,7 +4401,7 @@ "authenticationMethod": { "$ref": "./network.json#/definitions/AuthenticationMethod", "description": "VPN client authentication method." - } + } }, "description": "Virtual Wan Vpn profile parameters Vpn profile generation." }, @@ -4162,14 +4411,14 @@ "type": "array", "items": { "type": "string", - "description": "P2S vpn user name." + "description": "P2S vpn user name." }, "description": "The list of p2s vpn user names whose p2s vpn connection detailed health to retrieve for." }, "outputBlobSasUrl": { "type": "string", "description": "The sas-url to download the P2S Vpn connection health detail." - } + } }, "description": "List of P2S Vpn connection health request." }, @@ -4218,6 +4467,81 @@ } ], "description": "P2SConnectionConfiguration Resource." + }, + "VirtualHubRouteTableV2Properties": { + "properties": { + "routes": { + "type": "array", + "description": "List of all routes.", + "items": { + "$ref": "#/definitions/VirtualHubRouteV2" + } + }, + "attachedConnections": { + "type": "array", + "description": "List of all connections attached to this route table v2.", + "items": { + "type": "string" + } + }, + "provisioningState": { + "$ref": "./network.json#/definitions/ProvisioningState", + "readOnly": true, + "description": "The provisioning state of the virtual hub route table v2 resource." + } + }, + "description": "Parameters for VirtualHubRouteTableV2." + }, + "VirtualHubRouteTableV2": { + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/VirtualHubRouteTableV2Properties", + "description": "Properties of the virtual hub route table v2." + }, + "name": { + "type": "string", + "description": "The name of the resource that is unique within a resource group. This name can be used to access the resource." + }, + "etag": { + "type": "string", + "readOnly": true, + "description": "A unique read-only string that changes whenever the resource is updated." + } + }, + "allOf": [ + { + "$ref": "./network.json#/definitions/SubResource" + } + ], + "description": "VirtualHubRouteTableV2 Resource." + }, + "VirtualHubRouteV2": { + "properties": { + "destinationType": { + "type": "string", + "description": "The type of destinations" + }, + "destinations": { + "type": "array", + "description": "List of all destinations.", + "items": { + "type": "string" + } + }, + "nextHopType": { + "type": "string", + "description": "The type of next hops" + }, + "nextHops": { + "type": "array", + "description": "NextHops ip address.", + "items": { + "type": "string" + } + } + }, + "description": "VirtualHubRouteTableV2 route." } } }