From 36873eae2d911daec487b6f3c63684209243ddca Mon Sep 17 00:00:00 2001 From: Dhruv Sawhney Date: Tue, 9 Jun 2020 12:48:22 -0700 Subject: [PATCH 1/3] remove LBBackendAddressPoolWithBackendAddressesPutWithNICIPConfiguration.json from both dirs --- ...endAddressesPutWithNICIPConfiguration.json | 91 ------------------- 1 file changed, 91 deletions(-) delete mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/LBBackendAddressPoolWithBackendAddressesPutWithNICIPConfiguration.json diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/LBBackendAddressPoolWithBackendAddressesPutWithNICIPConfiguration.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/LBBackendAddressPoolWithBackendAddressesPutWithNICIPConfiguration.json deleted file mode 100644 index eadf70581c3e..000000000000 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/LBBackendAddressPoolWithBackendAddressesPutWithNICIPConfiguration.json +++ /dev/null @@ -1,91 +0,0 @@ -{ - "parameters": { - "subscriptionId": "subid", - "resourceGroupName": "rg1", - "loadBalancerName": "lb", - "backendAddressPoolName": "backend", - "api-version": "2020-05-01", - "parameters": { - "properties": { - "loadBalancerBackendAddresses": [ - { - "name": "address1", - "properties": { - "networkInterfaceIPConfiguration": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkInterfaces/vnetlb/ipConfigurations/ipconfig1" - } - } - }, - { - "name": "address2", - "properties": { - "networkInterfaceIPConfiguration": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkInterfaces/vnetlb/ipConfigurations/ipconfig2" - } - } - } - ] - } - } - }, - "responses": { - "200": { - "body": { - "name": "backend", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/backendAddressPools/backend", - "etag": "W/\"00000000-0000-0000-0000-000000000000\"", - "type": "Microsoft.Network/loadBalancers/backendAddressPools", - "properties": { - "provisioningState": "Succeeded", - "loadBalancerBackendAddresses": [ - { - "name": "address1", - "properties": { - "networkInterfaceIPConfiguration": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkInterfaces/vnetlb/ipConfigurations/ipconfig1" - } - } - }, - { - "name": "address2", - "properties": { - "networkInterfaceIPConfiguration": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkInterfaces/vnetlb/ipConfigurations/ipconfig2" - } - } - } - ] - } - } - }, - "201": { - "body": { - "name": "backend", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/backendAddressPools/backend", - "etag": "W/\"00000000-0000-0000-0000-000000000000\"", - "type": "Microsoft.Network/loadBalancers/backendAddressPools", - "properties": { - "provisioningState": "Succeeded", - "loadBalancerBackendAddresses": [ - { - "name": "address1", - "properties": { - "networkInterfaceIPConfiguration": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkInterfaces/vnetlb/ipConfigurations/ipconfig1" - } - } - }, - { - "name": "address2", - "properties": { - "networkInterfaceIPConfiguration": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkInterfaces/vnetlb/ipConfigurations/ipconfig2" - } - } - } - ] - } - } - } - } -} From 7e3c79105e823d8d5ec13bd5ad4e923526f37914 Mon Sep 17 00:00:00 2001 From: Dhruv Sawhney Date: Tue, 14 Jul 2020 10:22:40 -0700 Subject: [PATCH 2/3] updates --- .../stable/2020-04-01/loadBalancer.json | 22 +++++++++---------- .../stable/2020-05-01/loadBalancer.json | 22 +++++++++---------- 2 files changed, 20 insertions(+), 24 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/loadBalancer.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/loadBalancer.json index 1fc7d526fa52..8573e309f41d 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/loadBalancer.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/loadBalancer.json @@ -549,9 +549,6 @@ "x-ms-examples": { "Update load balancer backend pool with backend addresses containing virtual network and IP address.": { "$ref": "./examples/LBBackendAddressPoolWithBackendAddressesPut.json" - }, - "Update load balancer backend pool with backend addresses containing virtual network and IP address defined in network interfaces.": { - "$ref": "./examples/LBBackendAddressPoolWithBackendAddressesPutWithNICIPConfiguration.json" } }, "x-ms-long-running-operation": true, @@ -1495,7 +1492,7 @@ "LoadBalancerBackendAddressPropertiesFormat": { "properties": { "virtualNetwork": { - "$ref": "./virtualNetwork.json#/definitions/VirtualNetwork", + "$ref": "./network.json#/definitions/SubResource", "description": "Reference to an existing virtual network." }, "ipAddress": { @@ -1504,7 +1501,8 @@ "x-ms-azure-resource": false }, "networkInterfaceIPConfiguration": { - "$ref": "./networkInterface.json#/definitions/NetworkInterfaceIPConfiguration", + "readOnly": true, + "$ref": "./network.json#/definitions/SubResource", "description": "Reference to IP address defined in network interfaces." } }, @@ -1526,20 +1524,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-05-01/loadBalancer.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/loadBalancer.json index 20ae268b140c..fdcd85bc694e 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/loadBalancer.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/loadBalancer.json @@ -549,9 +549,6 @@ "x-ms-examples": { "Update load balancer backend pool with backend addresses containing virtual network and IP address.": { "$ref": "./examples/LBBackendAddressPoolWithBackendAddressesPut.json" - }, - "Update load balancer backend pool with backend addresses containing virtual network and IP address defined in network interfaces.": { - "$ref": "./examples/LBBackendAddressPoolWithBackendAddressesPutWithNICIPConfiguration.json" } }, "x-ms-long-running-operation": true, @@ -1495,7 +1492,7 @@ "LoadBalancerBackendAddressPropertiesFormat": { "properties": { "virtualNetwork": { - "$ref": "./virtualNetwork.json#/definitions/VirtualNetwork", + "$ref": "./network.json#/definitions/SubResource", "description": "Reference to an existing virtual network." }, "ipAddress": { @@ -1504,7 +1501,8 @@ "x-ms-azure-resource": false }, "networkInterfaceIPConfiguration": { - "$ref": "./networkInterface.json#/definitions/NetworkInterfaceIPConfiguration", + "readOnly": true, + "$ref": "./network.json#/definitions/SubResource", "description": "Reference to IP address defined in network interfaces." } }, @@ -1526,20 +1524,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, From e99bdddd9ed99ad6f49221378061a4eb836780c2 Mon Sep 17 00:00:00 2001 From: Dhruv Sawhney Date: Tue, 14 Jul 2020 10:42:21 -0700 Subject: [PATCH 3/3] updates --- .../Microsoft.Network/stable/2020-04-01/loadBalancer.json | 2 +- .../Microsoft.Network/stable/2020-05-01/loadBalancer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/loadBalancer.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/loadBalancer.json index 8573e309f41d..34d350384587 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/loadBalancer.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/loadBalancer.json @@ -1524,7 +1524,7 @@ }, "BackendAddressPoolPropertiesFormat": { "properties": { - "loadBalancerBackendAddresses": { + "loadBalancerBackendAddresses": { "type": "array", "items": { "$ref": "#/definitions/LoadBalancerBackendAddress" diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/loadBalancer.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/loadBalancer.json index fdcd85bc694e..3cd051c520ef 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/loadBalancer.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/loadBalancer.json @@ -1524,7 +1524,7 @@ }, "BackendAddressPoolPropertiesFormat": { "properties": { - "loadBalancerBackendAddresses": { + "loadBalancerBackendAddresses": { "type": "array", "items": { "$ref": "#/definitions/LoadBalancerBackendAddress"