From 5a2e43b4e8efed49c875e05d24972221756d4423 Mon Sep 17 00:00:00 2001 From: Dhruv Sawhney Date: Tue, 9 Jun 2020 11:53:43 -0700 Subject: [PATCH 1/5] updates to 04-01/loadBalancer.json --- .../Microsoft.Network/stable/2020-04-01/loadBalancer.json | 8 +++----- 1 file changed, 3 insertions(+), 5 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..6cc968ff6c91 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." } }, From b654af591ecf9fc190d68eb8f67f6a6f51e1b9d7 Mon Sep 17 00:00:00 2001 From: Dhruv Sawhney Date: Tue, 9 Jun 2020 11:57:11 -0700 Subject: [PATCH 2/5] updates to 05-01/loadBalancer.json --- .../Microsoft.Network/stable/2020-05-01/loadBalancer.json | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) 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..4243ea10db4a 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." } }, From d9c36729800b36c82e166226a3acd721fa045368 Mon Sep 17 00:00:00 2001 From: Dhruv Sawhney Date: Tue, 9 Jun 2020 11:59:04 -0700 Subject: [PATCH 3/5] updates to remove LBBackendAddressPoolWithBackendAddressesPutWithNICIPConfiguration.json --- ...endAddressesPutWithNICIPConfiguration.json | 91 ------------------- 1 file changed, 91 deletions(-) delete mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/LBBackendAddressPoolWithBackendAddressesPutWithNICIPConfiguration.json diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/LBBackendAddressPoolWithBackendAddressesPutWithNICIPConfiguration.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/LBBackendAddressPoolWithBackendAddressesPutWithNICIPConfiguration.json deleted file mode 100644 index a4adbda522a1..000000000000 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/LBBackendAddressPoolWithBackendAddressesPutWithNICIPConfiguration.json +++ /dev/null @@ -1,91 +0,0 @@ -{ - "parameters": { - "subscriptionId": "subid", - "resourceGroupName": "rg1", - "loadBalancerName": "lb", - "backendAddressPoolName": "backend", - "api-version": "2020-04-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 2fee80091635341cb4f4bf0befbc3d6befc5230f Mon Sep 17 00:00:00 2001 From: Dhruv Sawhney Date: Tue, 9 Jun 2020 12:22:15 -0700 Subject: [PATCH 4/5] Fix PrettierCheck --- .../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 6cc968ff6c91..01905101e2e3 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 @@ -1502,7 +1502,7 @@ }, "networkInterfaceIPConfiguration": { "readOnly": true, - "$ref": "./network.json#/definitions/SubResource", + "$ref": "./network.json#/definitions/SubResource", "description": "Reference to IP address defined in network interfaces." } }, 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 4243ea10db4a..956b50a92d18 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 @@ -1501,7 +1501,7 @@ "x-ms-azure-resource": false }, "networkInterfaceIPConfiguration": { - "readOnly": true, + "readOnly": true, "$ref": "./network.json#/definitions/SubResource", "description": "Reference to IP address defined in network interfaces." } From 36873eae2d911daec487b6f3c63684209243ddca Mon Sep 17 00:00:00 2001 From: Dhruv Sawhney Date: Tue, 9 Jun 2020 12:48:22 -0700 Subject: [PATCH 5/5] 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" - } - } - } - ] - } - } - } - } -}