diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/networkWatcher.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/networkWatcher.json index ee456bebb492..42eafe935f3b 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/networkWatcher.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/networkWatcher.json @@ -3461,10 +3461,10 @@ }, "context": { "readOnly": true, - "type": "array", - "description": "Provides additional context on the issue.", - "items": { - "$ref": "#/definitions/IssueContext" + "type": "object", + "description": "Provides additional context on links.", + "additionalProperties": { + "type": "string" } }, "resourceId": { @@ -3480,19 +3480,16 @@ "roundTripTimeMin": { "description": "Minimum roundtrip time in milliseconds.", "readOnly": true, - "format": "int32", "type": "integer" }, "roundTripTimeAvg": { "description": "Average roundtrip time in milliseconds.", "readOnly": true, - "format": "int32", "type": "integer" }, "roundTripTimeMax": { "description": "Maximum roundtrip time in milliseconds.", "readOnly": true, - "format": "int32", "type": "integer" } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/ExpressRouteCircuitCreateOnExpressRoutePort.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/ExpressRouteCircuitCreateOnExpressRoutePort.json index 98f7fcdb1f06..14a8a4cf9655 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/ExpressRouteCircuitCreateOnExpressRoutePort.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/ExpressRouteCircuitCreateOnExpressRoutePort.json @@ -16,6 +16,7 @@ "expressRoutePort": { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRoutePorts/portName" }, + "authorizationKey": "b0be57f5-1fba-463b-adec-ffe767354cdd", "bandwidthInGbps": 10 } } @@ -34,6 +35,7 @@ "expressRoutePort": { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRoutePorts/portName" }, + "authorizationKey": "b0be57f5-1fba-463b-adec-ffe767354cdd", "bandwidthInGbps": 10, "circuitProvisioningState": "Enabled", "allowClassicOperations": false, @@ -61,6 +63,7 @@ "expressRoutePort": { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRoutePorts/portName" }, + "authorizationKey": "b0be57f5-1fba-463b-adec-ffe767354cdd", "bandwidthInGbps": 10, "circuitProvisioningState": "Enabled", "allowClassicOperations": false, diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/ExpressRoutePortAuthorizationCreate.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/ExpressRoutePortAuthorizationCreate.json new file mode 100644 index 000000000000..278177bf660c --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/ExpressRoutePortAuthorizationCreate.json @@ -0,0 +1,40 @@ +{ + "parameters": { + "expressRoutePortName": "expressRoutePortName", + "resourceGroupName": "rg1", + "authorizationName": "authorizatinName", + "api-version": "2020-07-01", + "subscriptionId": "subid", + "authorizationParameters": { + "properties": {} + } + }, + "responses": { + "201": { + "body": { + "name": "authorizationName", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/ExpressRoutePorts/expressRoutePortName/authorizations/authorizationName", + "etag": "W/\"e22dd4b2-4c24-44cf-b702-70a472b62914\"", + "properties": { + "provisioningState": "Updating", + "authorizationUseStatus": "Available", + "circuit": "" + }, + "type": "Microsoft.Network/expressRoutePorts/authorizations" + } + }, + "200": { + "body": { + "name": "authorizationName", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/ExpressRoutePorts/expressRoutePortName/authorizations/authorizationName", + "etag": "W/\"e22dd4b2-4c24-44cf-b702-70a472b62914\"", + "properties": { + "provisioningState": "Updating", + "authorizationUseStatus": "Available", + "circuit": "" + }, + "type": "Microsoft.Network/expressRoutePorts/authorizations" + } + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/ExpressRoutePortAuthorizationDelete.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/ExpressRoutePortAuthorizationDelete.json new file mode 100644 index 000000000000..69a513459531 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/ExpressRoutePortAuthorizationDelete.json @@ -0,0 +1,14 @@ +{ + "parameters": { + "expressRoutePortName": "expressRoutePortName", + "resourceGroupName": "rg1", + "api-version": "2020-07-01", + "subscriptionId": "subid", + "authorizationName": "authorizationName" + }, + "responses": { + "200": {}, + "202": {}, + "204": {} + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/ExpressRoutePortAuthorizationGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/ExpressRoutePortAuthorizationGet.json new file mode 100644 index 000000000000..7eff28231fc3 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/ExpressRoutePortAuthorizationGet.json @@ -0,0 +1,25 @@ +{ + "parameters": { + "expressRoutePortName": "expressRoutePortName", + "resourceGroupName": "rg1", + "api-version": "2020-07-01", + "subscriptionId": "subid", + "authorizationName": "authorizationName" + }, + "responses": { + "200": { + "body": { + "name": "authorizationName", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/ExpressRoutePorts/expressRoutePortName/authorizations/authorizationName", + "etag": "W/\"e33c875f-48df-4a91-b7d3-eb95b5ddbb89\"", + "properties": { + "provisioningState": "Succeeded", + "authorizationKey": "authKey", + "authorizationUseStatus": "Available", + "circuit": "" + }, + "type": "Microsoft.Network/expressRoutePorts/authorizations" + } + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/ExpressRoutePortAuthorizationList.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/ExpressRoutePortAuthorizationList.json new file mode 100644 index 000000000000..396c45a52c3e --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/ExpressRoutePortAuthorizationList.json @@ -0,0 +1,28 @@ +{ + "parameters": { + "expressRoutePortName": "expressRoutePortName", + "resourceGroupName": "rg1", + "api-version": "2020-07-01", + "subscriptionId": "subid" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "authorizationName", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/ExpressRoutePorts/expressRoutePortName/authorizations/authorizationName", + "etag": "W/\"e33c875f-48df-4a91-b7d3-eb95b5ddbb89\"", + "properties": { + "provisioningState": "Succeeded", + "authorizationKey": "authKey", + "authorizationUseStatus": "Available", + "circuit": "" + }, + "type": "Microsoft.Network/expressRoutePorts/authorizations" + } + ] + } + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/LoadBalancerCreateGlobalTier.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/LoadBalancerCreateGlobalTier.json new file mode 100644 index 000000000000..69705afc4efc --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/LoadBalancerCreateGlobalTier.json @@ -0,0 +1,314 @@ +{ + "parameters": { + "api-version": "2020-07-01", + "subscriptionId": "subid", + "resourceGroupName": "rg1", + "loadBalancerName": "lb", + "parameters": { + "location": "eastus", + "sku": { + "name": "Standard", + "tier": "Global" + }, + "properties": { + "frontendIPConfigurations": [ + { + "name": "fe-lb", + "properties": { + "subnet": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnetlb/subnets/subnetlb" + } + } + } + ], + "backendAddressPools": [ + { + "name": "be-lb", + "properties": { + "loadBalancerBackendAddresses": [ + { + "name": "regional-lb1-address", + "properties": { + "loadBalancerFrontendIPConfiguration": { + "id": "/subscriptions/subid/resourceGroups/regional-lb-rg1/providers/Microsoft.Network/loadBalancers/regional-lb/frontendIPConfigurations/fe-rlb" + } + } + } + ] + } + } + ], + "loadBalancingRules": [ + { + "name": "rulelb", + "properties": { + "frontendIPConfiguration": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/frontendIPConfigurations/fe-lb" + }, + "frontendPort": 80, + "backendPort": 80, + "enableFloatingIP": false, + "idleTimeoutInMinutes": 15, + "protocol": "Tcp", + "loadDistribution": "Default", + "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", + "properties": { + "protocol": "Http", + "port": 80, + "requestPath": "healthcheck.aspx", + "intervalInSeconds": 15, + "numberOfProbes": 2 + } + } + ] + } + } + }, + "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", + "tier": "Global" + }, + "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", + "privateIPAllocationMethod": "Dynamic", + "subnet": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnetlb/subnets/subnetlb" + }, + "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" + } + ] + } + } + ], + "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", + "loadBalancerBackendAddresses": [ + { + "name": "regional-lb1-address", + "properties": { + "loadBalancerFrontendIPConfiguration": { + "id": "/subscriptions/subid/resourceGroups/regional-lb-rg1/providers/Microsoft.Network/loadBalancers/regional-lb/frontendIPConfigurations/fe-rlb" + } + } + } + ], + "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": false, + "idleTimeoutInMinutes": 15, + "protocol": "Tcp", + "loadDistribution": "Default", + "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" + }, + "disableOutboundSnat": false + } + } + ], + "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" + } + ] + } + } + ] + } + } + }, + "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", + "tier": "Global" + }, + "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", + "privateIPAllocationMethod": "Dynamic", + "subnet": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnetlb/subnets/subnetlb" + }, + "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" + } + ] + } + } + ], + "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", + "loadBalancerBackendAddresses": [ + { + "name": "regional-lb1-address", + "properties": { + "loadBalancerFrontendIPConfiguration": { + "id": "/subscriptions/subid/resourceGroups/regional-lb-rg1/providers/Microsoft.Network/loadBalancers/regional-lb/frontendIPConfigurations/fe-rlb" + } + } + } + ], + "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": false, + "idleTimeoutInMinutes": 15, + "protocol": "Tcp", + "loadDistribution": "Default", + "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" + }, + "disableOutboundSnat": false + } + } + ], + "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" + } + ] + } + } + ] + } + } + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/NetworkWatcherConnectionMonitorCreate.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/NetworkWatcherConnectionMonitorCreate.json index a1adc90ebe99..41e4126c061c 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/NetworkWatcherConnectionMonitorCreate.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/NetworkWatcherConnectionMonitorCreate.json @@ -5,17 +5,43 @@ "resourceGroupName": "rg1", "networkWatcherName": "nw1", "connectionMonitorName": "cm1", - "location": "centraluseuap", "parameters": { + "location": "eastus", "properties": { - "source": { - "resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Compute/virtualMachines/vm1" - }, - "destination": { - "address": "bing.com", - "port": 80 - }, - "monitoringIntervalInSeconds": 60 + "endpoints": [ + { + "name": "source", + "resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Compute/virtualMachines/ct1" + }, + { + "name": "destination", + "address": "bing.com" + } + ], + "testConfigurations": [ + { + "name": "tcp", + "testFrequencySec": 60, + "protocol": "Tcp", + "tcpConfiguration": { + "port": 80 + } + } + ], + "testGroups": [ + { + "name": "tg", + "testConfigurations": [ + "tcp" + ], + "sources": [ + "source" + ], + "destinations": [ + "destination" + ] + } + ] } } }, @@ -27,19 +53,42 @@ "etag": "W/\"e7497f26-5f09-4559-900b-fe98f3dedb6f\"", "properties": { "provisioningState": "Updating", - "source": { - "resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Compute/virtualMachines/vm1", - "port": 0 - }, - "destination": { - "address": "bing.com", - "port": 80 - }, - "monitoringIntervalInSeconds": 60, - "autoStart": true, - "monitoringStatus": "NotStarted" + "endpoints": [ + { + "name": "source", + "resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Compute/virtualMachines/ct1" + }, + { + "name": "destination", + "address": "bing.com" + } + ], + "testConfigurations": [ + { + "name": "tcp", + "testFrequencySec": 60, + "protocol": "Tcp", + "tcpConfiguration": { + "port": 80 + } + } + ], + "testGroups": [ + { + "name": "tg", + "testConfigurations": [ + "tcp" + ], + "sources": [ + "source" + ], + "destinations": [ + "destination" + ] + } + ] }, - "location": "centraluseuap", + "location": "eastus", "type": "Microsoft.Network/networkWatchers/connectionMonitors" } }, @@ -49,20 +98,43 @@ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkWatchers/nw1/connectionMonitors/cm1", "etag": "W/\"e7497f26-5f09-4559-900b-fe98f3dedb6f\"", "properties": { - "provisioningState": "Updating", - "source": { - "resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Compute/virtualMachines/vm1", - "port": 0 - }, - "destination": { - "address": "bing.com", - "port": 80 - }, - "monitoringIntervalInSeconds": 60, - "autoStart": true, - "monitoringStatus": "NotStarted" + "provisioningState": "Succeeded", + "endpoints": [ + { + "name": "source", + "resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Compute/virtualMachines/ct1" + }, + { + "name": "destination", + "address": "bing.com" + } + ], + "testConfigurations": [ + { + "name": "tcp", + "testFrequencySec": 60, + "protocol": "Tcp", + "tcpConfiguration": { + "port": 80 + } + } + ], + "testGroups": [ + { + "name": "tg", + "testConfigurations": [ + "tcp" + ], + "sources": [ + "source" + ], + "destinations": [ + "destination" + ] + } + ] }, - "location": "centraluseuap", + "location": "eastus", "type": "Microsoft.Network/networkWatchers/connectionMonitors" } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/NetworkWatcherConnectionMonitorGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/NetworkWatcherConnectionMonitorGet.json index ae469303de6e..06c3cedb4159 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/NetworkWatcherConnectionMonitorGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/NetworkWatcherConnectionMonitorGet.json @@ -14,20 +14,42 @@ "etag": "W/\"00000000-0000-0000-0000-000000000000\"", "properties": { "provisioningState": "Succeeded", - "source": { - "resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Compute/virtualMachines/vm1", - "port": 0 - }, - "destination": { - "address": "bing.com", - "port": 80 - }, - "monitoringIntervalInSeconds": 60, - "autoStart": true, - "startTime": "2018-01-08T03:42:33.3387305Z", - "monitoringStatus": "Running" + "endpoints": [ + { + "name": "source", + "resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Compute/virtualMachines/ct1" + }, + { + "name": "destination", + "address": "bing.com" + } + ], + "testConfigurations": [ + { + "name": "tcp", + "testFrequencySec": 60, + "protocol": "Tcp", + "tcpConfiguration": { + "port": 80 + } + } + ], + "testGroups": [ + { + "name": "tg", + "testConfigurations": [ + "tcp" + ], + "sources": [ + "source" + ], + "destinations": [ + "destination" + ] + } + ] }, - "location": "centraluseuap", + "location": "eastus", "type": "Microsoft.Network/networkWatchers/connectionMonitors" } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/NetworkWatcherConnectionMonitorList.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/NetworkWatcherConnectionMonitorList.json index c55a840b12d8..569590e66a36 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/NetworkWatcherConnectionMonitorList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/NetworkWatcherConnectionMonitorList.json @@ -15,20 +15,42 @@ "etag": "W/\"00000000-0000-0000-0000-000000000000\"", "properties": { "provisioningState": "Succeeded", - "source": { - "resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Compute/virtualMachines/vm1", - "port": 0 - }, - "destination": { - "address": "bing.com", - "port": 80 - }, - "monitoringIntervalInSeconds": 60, - "autoStart": true, - "startTime": "2018-01-08T03:42:33.3387305Z", - "monitoringStatus": "Running" + "endpoints": [ + { + "name": "source", + "resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Compute/virtualMachines/ct1" + }, + { + "name": "destination", + "address": "bing.com" + } + ], + "testConfigurations": [ + { + "name": "tcp", + "testFrequencySec": 60, + "protocol": "Tcp", + "tcpConfiguration": { + "port": 80 + } + } + ], + "testGroups": [ + { + "name": "tg", + "testConfigurations": [ + "tcp" + ], + "sources": [ + "source" + ], + "destinations": [ + "destination" + ] + } + ] }, - "location": "centraluseuap", + "location": "eastus", "type": "Microsoft.Network/networkWatchers/connectionMonitors" }, { @@ -37,20 +59,42 @@ "etag": "W/\"00000000-0000-0000-0000-000000000000\"", "properties": { "provisioningState": "Succeeded", - "source": { - "resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Compute/virtualMachines/vm2", - "port": 0 - }, - "destination": { - "address": "google.com", - "port": 80 - }, - "monitoringIntervalInSeconds": 30, - "autoStart": true, - "startTime": "2018-01-08T05:42:33.3387305Z", - "monitoringStatus": "Running" + "endpoints": [ + { + "name": "source", + "resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Compute/virtualMachines/ct2" + }, + { + "name": "destination", + "address": "google.com" + } + ], + "testConfigurations": [ + { + "name": "tcp", + "testFrequencySec": 60, + "protocol": "Tcp", + "tcpConfiguration": { + "port": 80 + } + } + ], + "testGroups": [ + { + "name": "tg", + "testConfigurations": [ + "tcp" + ], + "sources": [ + "source" + ], + "destinations": [ + "destination" + ] + } + ] }, - "location": "centraluseuap", + "location": "eastus", "type": "Microsoft.Network/networkWatchers/connectionMonitors" } ] diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/PublicIpAddressCreateCustomizedValues.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/PublicIpAddressCreateCustomizedValues.json index 63307d15990b..d623bcc83e04 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/PublicIpAddressCreateCustomizedValues.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/PublicIpAddressCreateCustomizedValues.json @@ -14,7 +14,8 @@ "publicIPAddressVersion": "IPv4" }, "sku": { - "name": "Standard" + "name": "Standard", + "tier": "Global" }, "location": "eastus" } @@ -38,7 +39,8 @@ } }, "sku": { - "name": "Standard" + "name": "Standard", + "tier": "Global" }, "type": "Microsoft.Network/publicIPAddresses" } @@ -61,7 +63,8 @@ } }, "sku": { - "name": "Standard" + "name": "Standard", + "tier": "Global" }, "type": "Microsoft.Network/publicIPAddresses" } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/expressRouteCircuit.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/expressRouteCircuit.json index 506133276e79..9bcf12506078 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/expressRouteCircuit.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/expressRouteCircuit.json @@ -2239,6 +2239,10 @@ "globalReachEnabled": { "type": "boolean", "description": "Flag denoting global reach status." + }, + "authorizationKey": { + "type": "string", + "description": "The authorizationKey." } }, "description": "Properties of ExpressRouteCircuit." diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/expressRoutePort.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/expressRoutePort.json index 79b7772f7b78..49014dccbf5e 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/expressRoutePort.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/expressRoutePort.json @@ -601,6 +601,252 @@ } } } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRoutePorts/{expressRoutePortName}/authorizations/{authorizationName}": { + "delete": { + "tags": [ + "ExpressRoutePortAuthorizations" + ], + "operationId": "ExpressRoutePortAuthorizations_Delete", + "description": "Deletes the specified authorization from the specified express route port.", + "parameters": [ + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group." + }, + { + "name": "expressRoutePortName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the express route port." + }, + { + "name": "authorizationName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the authorization." + }, + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "200": { + "description": "Delete successful." + }, + "202": { + "description": "Accepted and the operation will complete asynchronously." + }, + "204": { + "description": "Request successful. Resource does not exist." + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./network.json#/definitions/CloudError" + } + } + }, + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "location" + }, + "x-ms-examples": { + "Delete ExpressRoutePort Authorization": { + "$ref": "./examples/ExpressRoutePortAuthorizationDelete.json" + } + } + }, + "get": { + "tags": [ + "ExpressRoutePortAuthorizations" + ], + "operationId": "ExpressRoutePortAuthorizations_Get", + "description": "Gets the specified authorization from the specified express route port.", + "parameters": [ + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group." + }, + { + "name": "expressRoutePortName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the express route port." + }, + { + "name": "authorizationName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the authorization." + }, + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "200": { + "description": "Request successful. The operation returns the ExpressRoutePortAuthorization resource.", + "schema": { + "$ref": "#/definitions/ExpressRoutePortAuthorization" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./network.json#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "Get ExpressRoutePort Authorization": { + "$ref": "./examples/ExpressRoutePortAuthorizationGet.json" + } + } + }, + "put": { + "tags": [ + "ExpressRoutePortAuthorizations" + ], + "operationId": "ExpressRoutePortAuthorizations_CreateOrUpdate", + "description": "Creates or updates an authorization in the specified express route port.", + "parameters": [ + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group." + }, + { + "name": "expressRoutePortName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the express route port." + }, + { + "name": "authorizationName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the authorization." + }, + { + "name": "authorizationParameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/ExpressRoutePortAuthorization" + }, + "description": "Parameters supplied to the create or update express route port authorization operation." + }, + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "201": { + "description": "Create successful. The operation returns the resulting ExpressRoutePortAuthorization resource.", + "schema": { + "$ref": "#/definitions/ExpressRoutePortAuthorization" + } + }, + "200": { + "description": "Update successful. The operation returns the resulting ExpressRoutePortAuthorization resource.", + "schema": { + "$ref": "#/definitions/ExpressRoutePortAuthorization" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./network.json#/definitions/CloudError" + } + } + }, + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "azure-async-operation" + }, + "x-ms-examples": { + "Create ExpressRoutePort Authorization": { + "$ref": "./examples/ExpressRoutePortAuthorizationCreate.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRoutePorts/{expressRoutePortName}/authorizations": { + "get": { + "tags": [ + "ExpressRoutePortAuthorizations" + ], + "operationId": "ExpressRoutePortAuthorizations_List", + "description": "Gets all authorizations in an express route port.", + "parameters": [ + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group." + }, + { + "name": "expressRoutePortName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the express route port." + }, + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "200": { + "description": "Request successful. The operation returns a list of ExpressRoutePortAuthorization resources.", + "schema": { + "$ref": "#/definitions/ExpressRoutePortAuthorizationListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./network.json#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "List ExpressRoutePort Authorization": { + "$ref": "./examples/ExpressRoutePortAuthorizationList.json" + } + } + } } }, "definitions": { @@ -958,6 +1204,87 @@ "description": "The content as a base64 encoded string." } } + }, + "ExpressRoutePortAuthorizationPropertiesFormat": { + "title": "ExpressRoute Port Authorization Properties", + "description": "Properties of ExpressRoutePort Authorization.", + "properties": { + "authorizationKey": { + "readOnly": true, + "type": "string", + "description": "The authorization key." + }, + "authorizationUseStatus": { + "readOnly": true, + "type": "string", + "description": "The authorization use status.", + "enum": [ + "Available", + "InUse" + ], + "x-ms-enum": { + "name": "ExpressRoutePortAuthorizationUseStatus", + "modelAsString": true + } + }, + "circuit": { + "readOnly": true, + "$ref": "./network.json#/definitions/SubResource", + "description": "The reference to the ExpressRoute circuit resource using the authorization." + }, + "provisioningState": { + "readOnly": true, + "$ref": "./network.json#/definitions/ProvisioningState", + "description": "The provisioning state of the authorization resource." + } + } + }, + "ExpressRoutePortAuthorization": { + "title": "ExpressRoute Port Authorization", + "description": "ExpressRoutePort Authorization resource definition.", + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/ExpressRoutePortAuthorizationPropertiesFormat", + "description": "ExpressRoutePort properties." + }, + "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": { + "readOnly": true, + "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": [ + { + "$ref": "./network.json#/definitions/SubResource" + } + ] + }, + "ExpressRoutePortAuthorizationListResult": { + "title": "ExpressRoute Port Authorization List Result", + "description": "Response for ListExpressRoutePortAuthorizations API service call.", + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/ExpressRoutePortAuthorization" + }, + "description": "The authorizations in an ExpressRoute Port." + }, + "nextLink": { + "type": "string", + "description": "The URL to get the next set of results." + } + } } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/loadBalancer.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/loadBalancer.json index 3c2b1ce8e056..3ec143a7ed3c 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/loadBalancer.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/loadBalancer.json @@ -209,6 +209,9 @@ "Create load balancer with Standard SKU": { "$ref": "./examples/LoadBalancerCreateStandardSku.json" }, + "Create load balancer with Global Tier and one regional load balancer in its backend pool": { + "$ref": "./examples/LoadBalancerCreateGlobalTier.json" + }, "Create load balancer with Frontend IP in Zone 1": { "$ref": "./examples/LoadBalancerCreateWithZones.json" }, @@ -1383,6 +1386,18 @@ "name": "LoadBalancerSkuName", "modelAsString": true } + }, + "tier": { + "type": "string", + "description": "Tier of a load balancer SKU.", + "enum": [ + "Regional", + "Global" + ], + "x-ms-enum": { + "name": "LoadBalancerSkuTier", + "modelAsString": true + } } }, "description": "SKU of a load balancer." @@ -1504,6 +1519,11 @@ "readOnly": true, "$ref": "./network.json#/definitions/SubResource", "description": "Reference to IP address defined in network interfaces." + }, + "loadBalancerFrontendIPConfiguration": { + "readOnly": false, + "$ref": "./network.json#/definitions/SubResource", + "description": "Reference to the frontend ip address configuration defined in regional loadbalancer." } }, "description": "Properties of the load balancer backend addresses." @@ -1524,20 +1544,20 @@ }, "BackendAddressPoolPropertiesFormat": { "properties": { - "backendIPConfigurations": { - "readOnly": true, + "loadBalancerBackendAddresses": { "type": "array", "items": { - "$ref": "./networkInterface.json#/definitions/NetworkInterfaceIPConfiguration" + "$ref": "#/definitions/LoadBalancerBackendAddress" }, - "description": "An array of references to IP addresses defined in network interfaces." + "description": "An array of backend addresses." }, - "loadBalancerBackendAddresses": { + "backendIPConfigurations": { + "readOnly": true, "type": "array", "items": { - "$ref": "#/definitions/LoadBalancerBackendAddress" + "$ref": "./networkInterface.json#/definitions/NetworkInterfaceIPConfiguration" }, - "description": "An array of backend addresses." + "description": "An array of references to IP addresses defined in network interfaces." }, "loadBalancingRules": { "readOnly": true, diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/networkWatcher.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/networkWatcher.json index efd51deeed5a..c110b40ca979 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/networkWatcher.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/networkWatcher.json @@ -3461,10 +3461,10 @@ }, "context": { "readOnly": true, - "type": "array", - "description": "Provides additional context on the issue.", - "items": { - "$ref": "#/definitions/IssueContext" + "type": "object", + "description": "Provides additional context on links.", + "additionalProperties": { + "type": "string" } }, "resourceId": { @@ -3480,19 +3480,16 @@ "roundTripTimeMin": { "description": "Minimum roundtrip time in milliseconds.", "readOnly": true, - "format": "int32", "type": "integer" }, "roundTripTimeAvg": { "description": "Average roundtrip time in milliseconds.", "readOnly": true, - "format": "int32", "type": "integer" }, "roundTripTimeMax": { "description": "Maximum roundtrip time in milliseconds.", "readOnly": true, - "format": "int32", "type": "integer" } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/publicIpAddress.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/publicIpAddress.json index f8dfa18cf895..badf7a17636a 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/publicIpAddress.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/publicIpAddress.json @@ -54,7 +54,7 @@ "in": "path", "required": true, "type": "string", - "description": "The name of the subnet." + "description": "The name of the public IP address." }, { "$ref": "./network.json#/parameters/ApiVersionParameter" @@ -109,7 +109,7 @@ "in": "path", "required": true, "type": "string", - "description": "The name of the subnet." + "description": "The name of the public IP address." }, { "$ref": "./network.json#/parameters/ApiVersionParameter" @@ -376,6 +376,18 @@ "name": "PublicIPAddressSkuName", "modelAsString": true } + }, + "tier": { + "type": "string", + "description": "Tier of a public IP address SKU.", + "enum": [ + "Regional", + "Global" + ], + "x-ms-enum": { + "name": "PublicIPAddressSkuTier", + "modelAsString": true + } } }, "description": "SKU of a public IP address." diff --git a/specification/network/resource-manager/readme.python.md b/specification/network/resource-manager/readme.python.md index 454c5a571d86..84a7d2e2d5c6 100644 --- a/specification/network/resource-manager/readme.python.md +++ b/specification/network/resource-manager/readme.python.md @@ -27,6 +27,7 @@ Generate all API versions currently shipped for this package ```yaml $(multiapi) && !$(track2) batch: + - tag: package-2020-07 - tag: package-2020-05 - tag: package-2020-04 - tag: package-2020-03 @@ -61,6 +62,7 @@ batch: ```yaml $(multiapi) && $(track2) clear-output-folder: true batch: + - tag: package-2020-07 - tag: package-2020-05 - tag: package-2020-04 - tag: package-2020-03 @@ -99,6 +101,19 @@ clear-output-folder: false perform-load: false ``` +### Tag: package-2020-07 and python + +These settings apply only when `--tag=package-2020-07 --python` is specified on the command line. +Please also specify `--python-sdks-folder=`. + +``` yaml $(tag) == 'package-2020-07' +namespace: azure.mgmt.network.v2020_07_01 +output-folder: $(python-sdks-folder)/network/azure-mgmt-network/azure/mgmt/network/v2020_07_01 +python: + namespace: azure.mgmt.network.v2020_07_01 + output-folder: $(python-sdks-folder)/network/azure-mgmt-network/azure/mgmt/network/v2020_07_01 +``` + ### Tag: package-2020-05 and python These settings apply only when `--tag=package-2020-05 --python` is specified on the command line.