From 48efc4b3b769e542cd3998f8a91bda819f609fb3 Mon Sep 17 00:00:00 2001 From: Anton Evseev Date: Mon, 24 Jun 2019 18:58:45 +0300 Subject: [PATCH 1/4] Removed read-only props from VPNGW example --- .../examples/VirtualNetworkGatewayConnectionCreate.json | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VirtualNetworkGatewayConnectionCreate.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VirtualNetworkGatewayConnectionCreate.json index a89af2da7147..9345d369fc68 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VirtualNetworkGatewayConnectionCreate.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VirtualNetworkGatewayConnectionCreate.json @@ -20,7 +20,6 @@ } }, "name": "gwipconfig1", - "etag": "W/\"00000000-0000-0000-0000-000000000000\"", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworkGateways/vpngw/ipConfigurations/gwipconfig1" } ], @@ -37,10 +36,8 @@ "asn": 65514, "bgpPeeringAddress": "10.0.1.30", "peerWeight": 0 - }, - "resourceGuid": "00000000-0000-0000-0000-000000000000" + } }, - "etag": "W/\"00000000-0000-0000-0000-000000000000\"", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworkGateways/vpngw", "location": "centralus", "tags": {} @@ -52,10 +49,8 @@ "10.1.0.0/16" ] }, - "gatewayIpAddress": "x.x.x.x", - "resourceGuid": "00000000-0000-0000-0000-000000000000" + "gatewayIpAddress": "x.x.x.x" }, - "etag": "W/\"00000000-0000-0000-0000-000000000000\"", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/localNetworkGateways/localgw", "location": "centralus", "tags": {} From c432e707224742eaae76fdc5a96a6130140d6bc1 Mon Sep 17 00:00:00 2001 From: Anton Evseev Date: Wed, 26 Jun 2019 15:22:46 +0300 Subject: [PATCH 2/4] Fixed LoadBalancer examples: * "outboundRules" array isn't returned for "Basic" SKU load balancer * added example for external LB with outboundRules * added missing read-only properties --- .../LoadBalancerBackendAddressPoolGet.json | 3 +- .../LoadBalancerBackendAddressPoolList.json | 3 +- .../examples/LoadBalancerCreate.json | 29 +- .../LoadBalancerCreateStandardSku.json | 24 + .../LoadBalancerCreateWithInboundNatPool.json | 16 +- .../LoadBalancerCreateWithOutboundRules.json | 423 ++++++++++++++++++ .../examples/LoadBalancerCreateWithZones.json | 24 + ...oadBalancerFrontendIPConfigurationGet.json | 3 +- ...adBalancerFrontendIPConfigurationList.json | 3 +- .../2019-06-01/examples/LoadBalancerGet.json | 13 +- .../2019-06-01/examples/LoadBalancerList.json | 22 +- .../examples/LoadBalancerListAll.json | 22 +- .../LoadBalancerLoadBalancingRuleGet.json | 3 +- .../LoadBalancerLoadBalancingRuleList.json | 3 +- .../examples/LoadBalancerOutboundRuleGet.json | 3 +- .../LoadBalancerOutboundRuleList.json | 3 +- .../examples/LoadBalancerProbeGet.json | 3 +- .../examples/LoadBalancerProbeList.json | 3 +- .../stable/2019-06-01/loadBalancer.json | 46 ++ 19 files changed, 628 insertions(+), 21 deletions(-) create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerCreateWithOutboundRules.json diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerBackendAddressPoolGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerBackendAddressPoolGet.json index c77c5959a70a..ea8e107c75c0 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerBackendAddressPoolGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerBackendAddressPoolGet.json @@ -11,7 +11,8 @@ "body": { "name": "backend", "id": "/subscriptions/subid/resourceGroups/testrg/providers/Microsoft.Network/loadBalancers/lb/backendAddressPools/backend", - "etag": "W/\\\"00000000-0000-0000-0000-000000000000\\\"", + "etag": "W/\"00000000-0000-0000-0000-000000000000\"", + "type": "Microsoft.Network/loadBalancers/backendAddressPools", "properties": { "provisioningState": "Succeeded", "backendIPConfigurations": [ diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerBackendAddressPoolList.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerBackendAddressPoolList.json index da136ae5447c..6ce58f376d6e 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerBackendAddressPoolList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerBackendAddressPoolList.json @@ -12,7 +12,8 @@ { "name": "backend", "id": "/subscriptions/subid/resourceGroups/testrg/providers/Microsoft.Network/loadBalancers/lb/backendAddressPools/backend", - "etag": "W/\\\"00000000-0000-0000-0000-000000000000\\\"", + "etag": "W/\"00000000-0000-0000-0000-000000000000\"", + "type": "Microsoft.Network/loadBalancers/backendAddressPools", "properties": { "provisioningState": "Succeeded", "backendIPConfigurations": [ diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerCreate.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerCreate.json index e6c8973d6617..186e2d491a0b 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerCreate.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerCreate.json @@ -74,8 +74,7 @@ } } ], - "inboundNatPools": [], - "outboundRules": [] + "inboundNatPools": [] } } }, @@ -85,16 +84,20 @@ "name": "lb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb", "type": "Microsoft.Network/loadBalancers", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "location": "eastus", "sku": { "name": "Basic" }, "properties": { "provisioningState": "Succeeded", + "resourceGuid": "00000000-0000-0000-0000-00000000", "frontendIPConfigurations": [ { "name": "fe-lb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/frontendIPConfigurations/fe-lb", + "type": "Microsoft.Network/loadBalancers/frontendIPConfigurations", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "properties": { "provisioningState": "Succeeded", "privateIPAddress": "10.0.1.4", @@ -119,6 +122,8 @@ { "name": "be-lb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/backendAddressPools/be-lb", + "type": "Microsoft.Network/loadBalancers/backendAddressPools", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "properties": { "provisioningState": "Succeeded", "loadBalancingRules": [ @@ -133,6 +138,8 @@ { "name": "rulelb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/loadBalancingRules/rulelb", + "type": "Microsoft.Network/loadBalancers/loadBalancingRules", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "properties": { "provisioningState": "Succeeded", "frontendIPConfiguration": { @@ -159,6 +166,8 @@ { "name": "probe-lb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/probes/probe-lb", + "type": "Microsoft.Network/loadBalancers/probes", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "properties": { "provisioningState": "Succeeded", "protocol": "Http", @@ -178,6 +187,8 @@ { "name": "in-nat-rule", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/inboundNatRules/in-nat-rule", + "type": "Microsoft.Network/loadBalancers/inboundNatRules", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "properties": { "provisioningState": "Succeeded", "frontendIPConfiguration": { @@ -192,7 +203,6 @@ } } ], - "outboundRules": [], "inboundNatPools": [] } } @@ -202,16 +212,20 @@ "name": "lb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb", "type": "Microsoft.Network/loadBalancers", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "location": "eastus", "sku": { "name": "Basic" }, "properties": { "provisioningState": "Succeeded", + "resourceGuid": "00000000-0000-0000-0000-00000000", "frontendIPConfigurations": [ { "name": "fe-lb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/frontendIPConfigurations/fe-lb", + "type": "Microsoft.Network/loadBalancers/frontendIPConfigurations", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "properties": { "provisioningState": "Succeeded", "privateIPAddress": "10.0.1.4", @@ -236,6 +250,8 @@ { "name": "be-lb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/backendAddressPools/be-lb", + "type": "Microsoft.Network/loadBalancers/backendAddressPools", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "properties": { "provisioningState": "Succeeded", "loadBalancingRules": [ @@ -250,6 +266,8 @@ { "name": "rulelb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/loadBalancingRules/rulelb", + "type": "Microsoft.Network/loadBalancers/loadBalancingRules", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "properties": { "provisioningState": "Succeeded", "frontendIPConfiguration": { @@ -276,6 +294,8 @@ { "name": "probe-lb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/probes/probe-lb", + "type": "Microsoft.Network/loadBalancers/probes", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "properties": { "provisioningState": "Succeeded", "protocol": "Http", @@ -295,6 +315,8 @@ { "name": "in-nat-rule", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/inboundNatRules/in-nat-rule", + "type": "Microsoft.Network/loadBalancers/inboundNatRules", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "properties": { "provisioningState": "Succeeded", "frontendIPConfiguration": { @@ -309,7 +331,6 @@ } } ], - "outboundRules": [], "inboundNatPools": [] } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerCreateStandardSku.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerCreateStandardSku.json index 9dee17aa41a0..bd1ded7c66f1 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerCreateStandardSku.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerCreateStandardSku.json @@ -86,16 +86,20 @@ "name": "lb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb", "type": "Microsoft.Network/loadBalancers", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "location": "eastus", "sku": { "name": "Standard" }, "properties": { "provisioningState": "Succeeded", + "resourceGuid": "00000000-0000-0000-0000-00000000", "frontendIPConfigurations": [ { "name": "fe-lb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/frontendIPConfigurations/fe-lb", + "type": "Microsoft.Network/loadBalancers/frontendIPConfigurations", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "properties": { "provisioningState": "Succeeded", "privateIPAddress": "10.0.1.4", @@ -120,6 +124,8 @@ { "name": "be-lb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/backendAddressPools/be-lb", + "type": "Microsoft.Network/loadBalancers/backendAddressPools", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "properties": { "provisioningState": "Succeeded", "loadBalancingRules": [ @@ -134,6 +140,8 @@ { "name": "rulelb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/loadBalancingRules/rulelb", + "type": "Microsoft.Network/loadBalancers/loadBalancingRules", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "properties": { "provisioningState": "Succeeded", "frontendIPConfiguration": { @@ -159,6 +167,8 @@ { "name": "probe-lb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/probes/probe-lb", + "type": "Microsoft.Network/loadBalancers/probes", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "properties": { "provisioningState": "Succeeded", "protocol": "Http", @@ -178,6 +188,8 @@ { "name": "in-nat-rule", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/inboundNatRules/in-nat-rule", + "type": "Microsoft.Network/loadBalancers/inboundNatRules", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "properties": { "provisioningState": "Succeeded", "frontendIPConfiguration": { @@ -201,16 +213,20 @@ "name": "lb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb", "type": "Microsoft.Network/loadBalancers", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "location": "eastus", "sku": { "name": "Standard" }, "properties": { "provisioningState": "Succeeded", + "resourceGuid": "00000000-0000-0000-0000-00000000", "frontendIPConfigurations": [ { "name": "fe-lb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/frontendIPConfigurations/fe-lb", + "type": "Microsoft.Network/loadBalancers/frontendIPConfigurations", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "properties": { "provisioningState": "Succeeded", "privateIPAddress": "10.0.1.4", @@ -235,6 +251,8 @@ { "name": "be-lb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/backendAddressPools/be-lb", + "type": "Microsoft.Network/loadBalancers/backendAddressPools", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "properties": { "provisioningState": "Succeeded", "loadBalancingRules": [ @@ -249,6 +267,8 @@ { "name": "rulelb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/loadBalancingRules/rulelb", + "type": "Microsoft.Network/loadBalancers/loadBalancingRules", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "properties": { "provisioningState": "Succeeded", "frontendIPConfiguration": { @@ -274,6 +294,8 @@ { "name": "probe-lb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/probes/probe-lb", + "type": "Microsoft.Network/loadBalancers/probes", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "properties": { "provisioningState": "Succeeded", "protocol": "Http", @@ -293,6 +315,8 @@ { "name": "in-nat-rule", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/inboundNatRules/in-nat-rule", + "type": "Microsoft.Network/loadBalancers/inboundNatRules", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "properties": { "provisioningState": "Succeeded", "frontendIPConfiguration": { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerCreateWithInboundNatPool.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerCreateWithInboundNatPool.json index 218171311c72..07175aab2657 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerCreateWithInboundNatPool.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerCreateWithInboundNatPool.json @@ -31,6 +31,7 @@ "loadBalancingRules": [], "probes": [], "inboundNatRules": [], + "outboundRules": [], "inboundNatPools": [ { "properties": { @@ -48,8 +49,7 @@ "name": "test", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/inboundNatPools/test" } - ], - "outboundRules": [] + ] } } }, @@ -59,16 +59,20 @@ "name": "lb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb", "type": "Microsoft.Network/loadBalancers", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "location": "eastus", "sku": { "name": "Standard" }, "properties": { "provisioningState": "Succeeded", + "resourceGuid": "00000000-0000-0000-0000-00000000", "frontendIPConfigurations": [ { "name": "test", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/frontendIPConfigurations/test", + "type": "Microsoft.Network/loadBalancers/frontendIPConfigurations", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "properties": { "provisioningState": "Succeeded", "privateIPAddress": "10.0.1.4", @@ -93,6 +97,8 @@ { "name": "test", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/inboundNatPools/test", + "type": "Microsoft.Network/loadBalancers/inboundNatPools", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "properties": { "provisioningState": "Succeeded", "frontendPortRangeStart": 8080, @@ -116,16 +122,20 @@ "name": "lb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb", "type": "Microsoft.Network/loadBalancers", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "location": "eastus", "sku": { "name": "Standard" }, "properties": { "provisioningState": "Succeeded", + "resourceGuid": "00000000-0000-0000-0000-00000000", "frontendIPConfigurations": [ { "name": "test", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/frontendIPConfigurations/test", + "type": "Microsoft.Network/loadBalancers/frontendIPConfigurations", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "properties": { "provisioningState": "Succeeded", "privateIPAddress": "10.0.1.4", @@ -150,6 +160,8 @@ { "name": "test", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/inboundNatPools/test", + "type": "Microsoft.Network/loadBalancers/inboundNatPools", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "properties": { "provisioningState": "Succeeded", "frontendPortRangeStart": 8080, diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerCreateWithOutboundRules.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerCreateWithOutboundRules.json new file mode 100644 index 000000000000..df754b27e339 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerCreateWithOutboundRules.json @@ -0,0 +1,423 @@ +{ + "parameters": { + "api-version": "2019-06-01", + "subscriptionId": "subid", + "resourceGroupName": "rg1", + "loadBalancerName": "lb", + "parameters": { + "location": "eastus", + "sku": { + "name": "Standard" + }, + "properties": { + "frontendIPConfigurations": [ + { + "name": "fe-lb", + "properties": { + "publicIPAddress": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/publicIPAddresses/pip" + } + } + } + ], + "backendAddressPools": [ + { + "name": "be-lb", + "properties": {} + } + ], + "loadBalancingRules": [ + { + "name": "rulelb", + "properties": { + "frontendIPConfiguration": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/frontendIPConfigurations/fe-lb" + }, + "backendAddressPool": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/backendAddressPools/be-lb" + }, + "probe": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/probes/probe-lb" + }, + "protocol": "Tcp", + "loadDistribution": "Default", + "frontendPort": 80, + "backendPort": 80, + "idleTimeoutInMinutes": 15, + "enableFloatingIP": true, + "disableOutboundSnat": true + } + } + ], + "probes": [ + { + "name": "probe-lb", + "properties": { + "protocol": "Http", + "port": 80, + "requestPath": "healthcheck.aspx", + "intervalInSeconds": 15, + "numberOfProbes": 2 + } + } + ], + "inboundNatRules": [ + { + "name": "in-nat-rule", + "properties": { + "frontendIPConfiguration": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/frontendIPConfigurations/fe-lb" + }, + "frontendPort": 3389, + "backendPort": 3389, + "enableFloatingIP": true, + "idleTimeoutInMinutes": 15, + "protocol": "Tcp" + } + } + ], + "inboundNatPools": [], + "outboundRules": [ + { + "name": "rule1", + "properties": { + "backendAddressPool": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/backendAddressPools/be-lb" + }, + "frontendIPConfigurations": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/frontendIPConfigurations/fe-lb" + } + ], + "protocol": "All" + } + } + ] + } + } + }, + "responses": { + "200": { + "body": { + "name": "lb", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb", + "type": "Microsoft.Network/loadBalancers", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", + "location": "eastus", + "sku": { + "name": "Standard" + }, + "properties": { + "provisioningState": "Succeeded", + "resourceGuid": "00000000-0000-0000-0000-00000000", + "frontendIPConfigurations": [ + { + "name": "fe-lb", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/frontendIPConfigurations/fe-lb", + "type": "Microsoft.Network/loadBalancers/frontendIPConfigurations", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", + "properties": { + "provisioningState": "Succeeded", + "privateIPAllocationMethod": "Dynamic", + "publicIPAddress": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/publicIPAddresses/pip" + }, + "loadBalancingRules": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/loadBalancingRules/rulelb" + } + ], + "inboundNatRules": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/inboundNatRules/in-nat-rule" + } + ], + "outboundRules": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/outboundRules/rule1" + } + ], + "privateIPAddressVersion": "IPv4" + } + } + ], + "backendAddressPools": [ + { + "name": "be-lb", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/backendAddressPools/be-lb", + "type": "Microsoft.Network/loadBalancers/backendAddressPools", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", + "properties": { + "provisioningState": "Succeeded", + "outboundRules": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/outboundRules/rule1" + } + ], + "loadBalancingRules": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/loadBalancingRules/rulelb" + } + ] + } + } + ], + "loadBalancingRules": [ + { + "name": "rulelb", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/loadBalancingRules/rulelb", + "type": "Microsoft.Network/loadBalancers/loadBalancingRules", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", + "properties": { + "provisioningState": "Succeeded", + "frontendIPConfiguration": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/frontendIPConfigurations/fe-lb" + }, + "frontendPort": 80, + "backendPort": 80, + "enableFloatingIP": true, + "idleTimeoutInMinutes": 15, + "protocol": "Tcp", + "enableTcpReset": false, + "loadDistribution": "Default", + "disableOutboundSnat": true, + "backendAddressPool": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/backendAddressPools/be-lb" + }, + "probe": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/probes/probe-lb" + } + } + } + ], + "probes": [ + { + "name": "probe-lb", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/probes/probe-lb", + "type": "Microsoft.Network/loadBalancers/probes", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", + "properties": { + "provisioningState": "Succeeded", + "protocol": "Http", + "port": 80, + "requestPath": "healthcheck.aspx", + "intervalInSeconds": 15, + "numberOfProbes": 2, + "loadBalancingRules": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/loadBalancingRules/rulelb" + } + ] + } + } + ], + "inboundNatRules": [ + { + "name": "in-nat-rule", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/inboundNatRules/in-nat-rule", + "type": "Microsoft.Network/loadBalancers/inboundNatRules", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", + "properties": { + "provisioningState": "Succeeded", + "frontendIPConfiguration": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/frontendIPConfigurations/fe-lb" + }, + "frontendPort": 3389, + "backendPort": 3389, + "enableFloatingIP": true, + "idleTimeoutInMinutes": 15, + "protocol": "Tcp", + "enableTcpReset": false + } + } + ], + "outboundRules": [ + { + "name": "rule1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/outboundRules/rule1", + "type": "Microsoft.Network/loadBalancers/outboundRules", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", + "properties": { + "provisioningState": "Succeeded", + "allocatedOutboundPorts": 1024, + "protocol": "All", + "enableTcpReset": false, + "idleTimeoutInMinutes": 4, + "backendAddressPool": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/backendAddressPools/be-lb" + }, + "frontendIPConfigurations": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/frontendIPConfigurations/fe-lb" + } + ] + } + } + ], + "inboundNatPools": [] + } + } + }, + "201": { + "body": { + "name": "lb", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb", + "type": "Microsoft.Network/loadBalancers", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", + "location": "eastus", + "sku": { + "name": "Standard" + }, + "properties": { + "provisioningState": "Succeeded", + "resourceGuid": "00000000-0000-0000-0000-00000000", + "frontendIPConfigurations": [ + { + "name": "fe-lb", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/frontendIPConfigurations/fe-lb", + "type": "Microsoft.Network/loadBalancers/frontendIPConfigurations", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", + "properties": { + "provisioningState": "Succeeded", + "privateIPAllocationMethod": "Dynamic", + "publicIPAddress": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/publicIPAddresses/pip" + }, + "loadBalancingRules": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/loadBalancingRules/rulelb" + } + ], + "inboundNatRules": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/inboundNatRules/in-nat-rule" + } + ], + "outboundRules": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/outboundRules/rule1" + } + ], + "privateIPAddressVersion": "IPv4" + } + } + ], + "backendAddressPools": [ + { + "name": "be-lb", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/backendAddressPools/be-lb", + "type": "Microsoft.Network/loadBalancers/backendAddressPools", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", + "properties": { + "provisioningState": "Succeeded", + "outboundRules": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/outboundRules/rule1" + } + ], + "loadBalancingRules": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/loadBalancingRules/rulelb" + } + ] + } + } + ], + "loadBalancingRules": [ + { + "name": "rulelb", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/loadBalancingRules/rulelb", + "type": "Microsoft.Network/loadBalancers/loadBalancingRules", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", + "properties": { + "provisioningState": "Succeeded", + "frontendIPConfiguration": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/frontendIPConfigurations/fe-lb" + }, + "frontendPort": 80, + "backendPort": 80, + "enableFloatingIP": true, + "idleTimeoutInMinutes": 15, + "protocol": "Tcp", + "enableTcpReset": false, + "loadDistribution": "Default", + "disableOutboundSnat": true, + "backendAddressPool": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/backendAddressPools/be-lb" + }, + "probe": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/probes/probe-lb" + } + } + } + ], + "probes": [ + { + "name": "probe-lb", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/probes/probe-lb", + "type": "Microsoft.Network/loadBalancers/probes", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", + "properties": { + "provisioningState": "Succeeded", + "protocol": "Http", + "port": 80, + "requestPath": "healthcheck.aspx", + "intervalInSeconds": 15, + "numberOfProbes": 2, + "loadBalancingRules": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/loadBalancingRules/rulelb" + } + ] + } + } + ], + "inboundNatRules": [ + { + "name": "in-nat-rule", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/inboundNatRules/in-nat-rule", + "type": "Microsoft.Network/loadBalancers/inboundNatRules", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", + "properties": { + "provisioningState": "Succeeded", + "frontendIPConfiguration": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/frontendIPConfigurations/fe-lb" + }, + "frontendPort": 3389, + "backendPort": 3389, + "enableFloatingIP": true, + "idleTimeoutInMinutes": 15, + "protocol": "Tcp", + "enableTcpReset": false + } + } + ], + "outboundRules": [ + { + "name": "rule1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/outboundRules/rule1", + "type": "Microsoft.Network/loadBalancers/outboundRules", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", + "properties": { + "provisioningState": "Succeeded", + "allocatedOutboundPorts": 1024, + "protocol": "All", + "enableTcpReset": false, + "idleTimeoutInMinutes": 4, + "backendAddressPool": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/backendAddressPools/be-lb" + }, + "frontendIPConfigurations": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/frontendIPConfigurations/fe-lb" + } + ] + } + } + ], + "inboundNatPools": [] + } + } + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerCreateWithZones.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerCreateWithZones.json index cb5ae04fe5d4..e31f1ba1ba8d 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerCreateWithZones.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerCreateWithZones.json @@ -89,16 +89,20 @@ "name": "lb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb", "type": "Microsoft.Network/loadBalancers", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "location": "eastus", "sku": { "name": "Standard" }, "properties": { "provisioningState": "Succeeded", + "resourceGuid": "00000000-0000-0000-0000-00000000", "frontendIPConfigurations": [ { "name": "fe-lb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/frontendIPConfigurations/fe-lb", + "type": "Microsoft.Network/loadBalancers/frontendIPConfigurations", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "zones": [ "1" ], @@ -126,6 +130,8 @@ { "name": "be-lb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/backendAddressPools/be-lb", + "type": "Microsoft.Network/loadBalancers/backendAddressPools", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "properties": { "provisioningState": "Succeeded", "loadBalancingRules": [ @@ -140,6 +146,8 @@ { "name": "rulelb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/loadBalancingRules/rulelb", + "type": "Microsoft.Network/loadBalancers/loadBalancingRules", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "properties": { "provisioningState": "Succeeded", "frontendIPConfiguration": { @@ -165,6 +173,8 @@ { "name": "probe-lb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/probes/probe-lb", + "type": "Microsoft.Network/loadBalancers/probes", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "properties": { "provisioningState": "Succeeded", "protocol": "Http", @@ -184,6 +194,8 @@ { "name": "in-nat-rule", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/inboundNatRules/in-nat-rule", + "type": "Microsoft.Network/loadBalancers/inboundNatRules", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "properties": { "provisioningState": "Succeeded", "frontendIPConfiguration": { @@ -207,16 +219,20 @@ "name": "lb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb", "type": "Microsoft.Network/loadBalancers", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "location": "eastus", "sku": { "name": "Standard" }, "properties": { "provisioningState": "Succeeded", + "resourceGuid": "00000000-0000-0000-0000-00000000", "frontendIPConfigurations": [ { "name": "fe-lb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/frontendIPConfigurations/fe-lb", + "type": "Microsoft.Network/loadBalancers/frontendIPConfigurations", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "zones": [ "1" ], @@ -244,6 +260,8 @@ { "name": "be-lb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/backendAddressPools/be-lb", + "type": "Microsoft.Network/loadBalancers/backendAddressPools", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "properties": { "provisioningState": "Succeeded", "loadBalancingRules": [ @@ -258,6 +276,8 @@ { "name": "rulelb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/loadBalancingRules/rulelb", + "type": "Microsoft.Network/loadBalancers/loadBalancingRules", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "properties": { "provisioningState": "Succeeded", "frontendIPConfiguration": { @@ -283,6 +303,8 @@ { "name": "probe-lb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/probes/probe-lb", + "type": "Microsoft.Network/loadBalancers/probes", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "properties": { "provisioningState": "Succeeded", "protocol": "Http", @@ -302,6 +324,8 @@ { "name": "in-nat-rule", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/inboundNatRules/in-nat-rule", + "type": "Microsoft.Network/loadBalancers/inboundNatRules", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "properties": { "provisioningState": "Succeeded", "frontendIPConfiguration": { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerFrontendIPConfigurationGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerFrontendIPConfigurationGet.json index 6ae8b0890ee8..5487fe648611 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerFrontendIPConfigurationGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerFrontendIPConfigurationGet.json @@ -11,7 +11,8 @@ "body": { "name": "frontend", "id": "/subscriptions/subid/resourceGroups/testrg/providers/Microsoft.Network/loadBalancers/lb/frontendIPConfigurations/frontend", - "etag": "W/\\\"00000000-0000-0000-0000-000000000000\\\"", + "etag": "W/\"00000000-0000-0000-0000-000000000000\"", + "type": "Microsoft.Network/loadBalancers/frontendIPConfigurations", "properties": { "provisioningState": "Succeeded", "privateIPAddress": "10.0.1.4", diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerFrontendIPConfigurationList.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerFrontendIPConfigurationList.json index 595a5f40412c..dc194f07f680 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerFrontendIPConfigurationList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerFrontendIPConfigurationList.json @@ -12,7 +12,8 @@ { "name": "frontend", "id": "/subscriptions/subid/resourceGroups/testrg/providers/Microsoft.Network/loadBalancers/lb/frontendIPConfigurations/frontend", - "etag": "W/\\\"00000000-0000-0000-0000-000000000000\\\"", + "etag": "W/\"00000000-0000-0000-0000-000000000000\"", + "type": "Microsoft.Network/loadBalancers/frontendIPConfigurations", "properties": { "provisioningState": "Succeeded", "privateIPAddress": "10.0.1.4", diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerGet.json index 439791c6bf87..71178dad1fb7 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerGet.json @@ -10,6 +10,7 @@ "body": { "name": "lb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "type": "Microsoft.Network/loadBalancers", "location": "westus", "sku": { @@ -17,10 +18,13 @@ }, "properties": { "provisioningState": "Succeeded", + "resourceGuid": "00000000-0000-0000-0000-00000000", "frontendIPConfigurations": [ { "name": "fe-lb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/frontendIPConfigurations/fe-lb", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", + "type": "Microsoft.Network/loadBalancers/frontendIPConfigurations", "properties": { "provisioningState": "Succeeded", "privateIPAddress": "10.0.1.4", @@ -46,6 +50,8 @@ { "name": "be-lb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/backendAddressPools/be-lb", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", + "type": "Microsoft.Network/loadBalancers/backendAddressPools", "properties": { "provisioningState": "Succeeded", "loadBalancingRules": [ @@ -60,6 +66,8 @@ { "name": "rulelb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/loadBalancingRules/rulelb", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", + "type": "Microsoft.Network/loadBalancers/loadBalancingRules", "properties": { "provisioningState": "Succeeded", "frontendIPConfiguration": { @@ -86,6 +94,8 @@ { "name": "probe-lb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/probes/probe-lb", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", + "type": "Microsoft.Network/loadBalancers/probes", "properties": { "provisioningState": "Succeeded", "protocol": "Http", @@ -105,6 +115,8 @@ { "name": "in-nat-rule", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/inboundNatRules/in-nat-rule", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", + "type": "Microsoft.Network/loadBalancers/inboundNatRules", "properties": { "provisioningState": "Succeeded", "frontendIPConfiguration": { @@ -119,7 +131,6 @@ } } ], - "outboundRules": [], "inboundNatPools": [] } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerList.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerList.json index e59d29ea035a..56210059a6c7 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerList.json @@ -11,14 +11,21 @@ { "name": "lb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "type": "Microsoft.Network/loadBalancers", "location": "westus", + "sku": { + "name": "Basic" + }, "properties": { "provisioningState": "Succeeded", + "resourceGuid": "00000000-0000-0000-0000-00000000", "frontendIPConfigurations": [ { "name": "felb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/frontendIPConfigurations/felb", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", + "type": "Microsoft.Network/loadBalancers/frontendIPConfigurations", "properties": { "provisioningState": "Succeeded", "privateIPAddress": "10.0.1.4", @@ -44,6 +51,8 @@ { "name": "belb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/backendAddressPools/belb", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", + "type": "Microsoft.Network/loadBalancers/backendAddressPools", "properties": { "provisioningState": "Succeeded", "loadBalancingRules": [ @@ -58,6 +67,8 @@ { "name": "rulelb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/loadBalancingRules/rulelb", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", + "type": "Microsoft.Network/loadBalancers/loadBalancingRules", "properties": { "provisioningState": "Succeeded", "frontendIPConfiguration": { @@ -83,6 +94,8 @@ { "name": "prlb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/probes/prlb", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", + "type": "Microsoft.Network/loadBalancers/probes", "properties": { "provisioningState": "Succeeded", "protocol": "Http", @@ -102,6 +115,8 @@ { "name": "inrlb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/inboundNatRules/inrlb", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", + "type": "Microsoft.Network/loadBalancers/inboundNatRules", "properties": { "provisioningState": "Succeeded", "frontendIPConfiguration": { @@ -116,23 +131,26 @@ } } ], - "outboundRules": [], "inboundNatPools": [] } }, { "name": "lb2", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb2", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "type": "Microsoft.Network/loadBalancers", "location": "westus", + "sku": { + "name": "Basic" + }, "properties": { "provisioningState": "Succeeded", + "resourceGuid": "00000000-0000-0000-0000-00000000", "frontendIPConfigurations": [], "backendAddressPools": [], "loadBalancingRules": [], "probes": [], "inboundNatRules": [], - "outboundRules": [], "inboundNatPools": [] } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerListAll.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerListAll.json index 0aa2e29fbaa0..9d04121de085 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerListAll.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerListAll.json @@ -10,14 +10,21 @@ { "name": "lb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "type": "Microsoft.Network/loadBalancers", "location": "westus", + "sku": { + "name": "Basic" + }, "properties": { "provisioningState": "Succeeded", + "resourceGuid": "00000000-0000-0000-0000-00000000", "frontendIPConfigurations": [ { "name": "felb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/frontendIPConfigurations/felb", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", + "type": "Microsoft.Network/loadBalancers/frontendIPConfigurations", "properties": { "provisioningState": "Succeeded", "privateIPAddress": "10.0.1.4", @@ -43,6 +50,8 @@ { "name": "belb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/backendAddressPools/belb", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", + "type": "Microsoft.Network/loadBalancers/backendAddressPools", "properties": { "provisioningState": "Succeeded", "loadBalancingRules": [ @@ -57,6 +66,8 @@ { "name": "rulelb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/loadBalancingRules/rulelb", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", + "type": "Microsoft.Network/loadBalancers/loadBalancingRules", "properties": { "provisioningState": "Succeeded", "frontendIPConfiguration": { @@ -82,6 +93,8 @@ { "name": "prlb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/probes/prlb", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", + "type": "Microsoft.Network/loadBalancers/probes", "properties": { "provisioningState": "Succeeded", "protocol": "Http", @@ -101,6 +114,8 @@ { "name": "inrlb", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/inboundNatRules/inrlb", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", + "type": "Microsoft.Network/loadBalancers/inboundNatRules", "properties": { "provisioningState": "Succeeded", "frontendIPConfiguration": { @@ -115,23 +130,26 @@ } } ], - "outboundRules": [], "inboundNatPools": [] } }, { "name": "lb3", "id": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/loadBalancers/lb3", + "etag": "W/\"00000000-0000-0000-0000-00000000\"", "type": "Microsoft.Network/loadBalancers", "location": "westus", + "sku": { + "name": "Basic" + }, "properties": { "provisioningState": "Succeeded", + "resourceGuid": "00000000-0000-0000-0000-00000000", "frontendIPConfigurations": [], "backendAddressPools": [], "loadBalancingRules": [], "probes": [], "inboundNatRules": [], - "outboundRules": [], "inboundNatPools": [] } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerLoadBalancingRuleGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerLoadBalancingRuleGet.json index bcee7556cfb2..0e3e46804cc0 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerLoadBalancingRuleGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerLoadBalancingRuleGet.json @@ -11,7 +11,8 @@ "body": { "name": "rule1", "id": "/subscriptions/subid/resourceGroups/testrg/providers/Microsoft.Network/loadBalancers/lb1/loadBalancingRules/rule1", - "etag": "W/\\\"00000000-0000-0000-0000-000000000000\\\"", + "etag": "W/\"00000000-0000-0000-0000-000000000000\"", + "type": "Microsoft.Network/loadBalancers/loadBalancingRules", "properties": { "provisioningState": "Succeeded", "frontendIPConfiguration": { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerLoadBalancingRuleList.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerLoadBalancingRuleList.json index a1d3bc405ebe..f6e67e513381 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerLoadBalancingRuleList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerLoadBalancingRuleList.json @@ -12,7 +12,8 @@ { "name": "rule1", "id": "/subscriptions/subid/resourceGroups/testrg/providers/Microsoft.Network/loadBalancers/lb1/loadBalancingRules/rule1", - "etag": "W/\\\"00000000-0000-0000-0000-000000000000\\\"", + "etag": "W/\"00000000-0000-0000-0000-000000000000\"", + "type": "Microsoft.Network/loadBalancers/loadBalancingRules", "properties": { "provisioningState": "Succeeded", "frontendIPConfiguration": { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerOutboundRuleGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerOutboundRuleGet.json index 0b85f826bbf9..14a5a8a8e2e3 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerOutboundRuleGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerOutboundRuleGet.json @@ -11,7 +11,8 @@ "body": { "name": "rule1", "id": "/subscriptions/subid/resourceGroups/testrg/providers/Microsoft.Network/loadBalancers/lb1/outboundRules/rule1", - "etag": "W/\\\"00000000-0000-0000-0000-000000000000\\\"", + "type": "Microsoft.Network/loadBalancers/outboundRules", + "etag": "W/\"00000000-0000-0000-0000-000000000000\"", "properties": { "provisioningState": "Succeeded", "frontendIPConfigurations": [ diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerOutboundRuleList.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerOutboundRuleList.json index 60d745715ecc..e3e97ad2c919 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerOutboundRuleList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerOutboundRuleList.json @@ -12,7 +12,8 @@ { "name": "rule1", "id": "/subscriptions/subid/resourceGroups/testrg/providers/Microsoft.Network/loadBalancers/lb1/outboundRules/rule1", - "etag": "W/\\\"00000000-0000-0000-0000-000000000000\\\"", + "type": "Microsoft.Network/loadBalancers/outboundRules", + "etag": "W/\"00000000-0000-0000-0000-000000000000\"", "properties": { "provisioningState": "Succeeded", "frontendIPConfigurations": [ diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerProbeGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerProbeGet.json index 80f3290442ec..db0bd4a1c781 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerProbeGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerProbeGet.json @@ -11,7 +11,8 @@ "body": { "name": "probe1", "id": "/subscriptions/subid/resourceGroups/testrg/providers/Microsoft.Network/loadBalancers/lb/probes/probe1", - "etag": "W/\\\"00000000-0000-0000-0000-000000000000\\\"", + "etag": "W/\"00000000-0000-0000-0000-000000000000\"", + "type": "Microsoft.Network/loadBalancers/probes", "properties": { "provisioningState": "Succeeded", "protocol": "Http", diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerProbeList.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerProbeList.json index 716e5d2df028..50e3f045efae 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerProbeList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/LoadBalancerProbeList.json @@ -12,7 +12,8 @@ { "name": "prlb", "id": "/subscriptions/subid/resourceGroups/testrg/providers/Microsoft.Network/loadBalancers/lb/probes/prlb", - "etag": "W/\\\"00000000-0000-0000-0000-000000000000\\\"", + "etag": "W/\"00000000-0000-0000-0000-000000000000\"", + "type": "Microsoft.Network/loadBalancers/probes", "properties": { "provisioningState": "Succeeded", "protocol": "Http", diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/loadBalancer.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/loadBalancer.json index e85c5c148b37..bca8548fea57 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/loadBalancer.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/loadBalancer.json @@ -196,6 +196,9 @@ }, "Create load balancer with inbound nat pool": { "$ref": "./examples/LoadBalancerCreateWithInboundNatPool.json" + }, + "Create load balancer with outbound rules": { + "$ref": "./examples/LoadBalancerCreateWithOutboundRules.json" } }, "x-ms-long-running-operation": true, @@ -1197,6 +1200,11 @@ "type": "string", "description": "A unique read-only string that changes whenever the resource is updated." }, + "type": { + "readOnly": true, + "type": "string", + "description": "Type of the resource." + }, "zones": { "type": "array", "items": { @@ -1235,6 +1243,14 @@ "$ref": "./network.json#/definitions/SubResource", "description": "Gets outbound rules that use this backend address pool." }, + "outboundRules": { + "readOnly": true, + "type": "array", + "items": { + "$ref": "./network.json#/definitions/SubResource" + }, + "description": "Gets outbound rules that use this backend address pool." + }, "provisioningState": { "type": "string", "description": "Get provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'." @@ -1256,6 +1272,11 @@ "etag": { "type": "string", "description": "A unique read-only string that changes whenever the resource is updated." + }, + "type": { + "readOnly": true, + "type": "string", + "description": "Type of the resource." } }, "allOf": [ @@ -1348,6 +1369,11 @@ "etag": { "type": "string", "description": "A unique read-only string that changes whenever the resource is updated." + }, + "type": { + "readOnly": true, + "type": "string", + "description": "Type of the resource." } }, "allOf": [ @@ -1424,6 +1450,11 @@ "etag": { "type": "string", "description": "A unique read-only string that changes whenever the resource is updated." + }, + "type": { + "readOnly": true, + "type": "string", + "description": "Type of the resource." } }, "allOf": [ @@ -1492,6 +1523,11 @@ "etag": { "type": "string", "description": "A unique read-only string that changes whenever the resource is updated." + }, + "type": { + "readOnly": true, + "type": "string", + "description": "Type of the resource." } }, "allOf": [ @@ -1566,6 +1602,11 @@ "etag": { "type": "string", "description": "A unique read-only string that changes whenever the resource is updated." + }, + "type": { + "readOnly": true, + "type": "string", + "description": "Type of the resource." } }, "allOf": [ @@ -1640,6 +1681,11 @@ "etag": { "type": "string", "description": "A unique read-only string that changes whenever the resource is updated." + }, + "type": { + "readOnly": true, + "type": "string", + "description": "Type of the resource." } }, "allOf": [ From 9efdcfba3302ca2888420967c719d66313502a7d Mon Sep 17 00:00:00 2001 From: Anton Evseev Date: Mon, 1 Jul 2019 14:59:48 +0300 Subject: [PATCH 3/4] Replace "regionName" in examples with real location --- .../examples/AvailableDelegationsResourceGroupGet.json | 2 +- .../examples/AvailableDelegationsSubscriptionGet.json | 2 +- .../stable/2019-06-01/examples/ServiceTagsList.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/AvailableDelegationsResourceGroupGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/AvailableDelegationsResourceGroupGet.json index 56eac861f506..d62bd1479581 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/AvailableDelegationsResourceGroupGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/AvailableDelegationsResourceGroupGet.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2019-06-01", - "location": "regionName", + "location": "westcentralus", "subscriptionId": "subId", "resourceGroupName": "rg1" }, diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/AvailableDelegationsSubscriptionGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/AvailableDelegationsSubscriptionGet.json index 93183906aa40..adc2c5ca785b 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/AvailableDelegationsSubscriptionGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/AvailableDelegationsSubscriptionGet.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2019-06-01", - "location": "regionName", + "location": "westcentralus", "subscriptionId": "subId" }, "responses": { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/ServiceTagsList.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/ServiceTagsList.json index 7b1ab938cf57..e25d9fe67741 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/ServiceTagsList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/ServiceTagsList.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2019-06-01", - "location": "regionName", + "location": "westcentralus", "subscriptionId": "subId" }, "responses": { From ebdd2ffb19edcfa439581a6a999c3cbafa0c630c Mon Sep 17 00:00:00 2001 From: Anton Evseev Date: Mon, 1 Jul 2019 15:13:36 +0300 Subject: [PATCH 4/4] Fixed incorrect descriptions in LoadBalancer: child resource doesn't have to have a unique name within resource group, but within a set of similar resource on parent load balancer --- .../stable/2019-06-01/loadBalancer.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/loadBalancer.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/loadBalancer.json index bca8548fea57..68a7a0415d7c 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/loadBalancer.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-06-01/loadBalancer.json @@ -1194,7 +1194,7 @@ }, "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." + "description": "The name of the resource that is unique within the set of frontend IP configurations used by the load balancer. This name can be used to access the resource." }, "etag": { "type": "string", @@ -1267,7 +1267,7 @@ }, "name": { "type": "string", - "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource." + "description": "Gets name of the resource that is unique within the set of backend address pools used by the load balancer. This name can be used to access the resource." }, "etag": { "type": "string", @@ -1364,7 +1364,7 @@ }, "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." + "description": "The name of the resource that is unique within the set of load balancing rules used by the load balancer. This name can be used to access the resource." }, "etag": { "type": "string", @@ -1445,7 +1445,7 @@ }, "name": { "type": "string", - "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource." + "description": "Gets name of the resource that is unique within the set of probes used by the load balancer. This name can be used to access the resource." }, "etag": { "type": "string", @@ -1518,7 +1518,7 @@ }, "name": { "type": "string", - "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource." + "description": "Gets name of the resource that is unique within the set of inbound NAT rules used by the load balancer. This name can be used to access the resource." }, "etag": { "type": "string", @@ -1597,7 +1597,7 @@ }, "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." + "description": "The name of the resource that is unique within the set of inbound NAT pools used by the load balancer. This name can be used to access the resource." }, "etag": { "type": "string", @@ -1665,7 +1665,7 @@ "frontendIPConfigurations", "protocol" ], - "description": "Outbound pool of the load balancer." + "description": "Outbound rule of the load balancer." }, "OutboundRule": { "properties": { @@ -1676,7 +1676,7 @@ }, "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." + "description": "The name of the resource that is unique within the set of outbound rules used by the load balancer. This name can be used to access the resource." }, "etag": { "type": "string", @@ -1693,7 +1693,7 @@ "$ref": "./network.json#/definitions/SubResource" } ], - "description": "Outbound pool of the load balancer." + "description": "Outbound rule of the load balancer." }, "LoadBalancerPropertiesFormat": { "properties": {