From 723f2bf962b5afbd93692d7711faf14b6c87aa1f Mon Sep 17 00:00:00 2001 From: "Jeffrey A. Robinson" Date: Mon, 23 Apr 2018 13:34:04 -0700 Subject: [PATCH] Removed extraneous properties on Quota --- .../preview/2015-06-15/LoadBalancers.json | 5 ++++- .../preview/2015-06-15/Network.json | 12 +++++++++--- .../preview/2015-06-15/PublicIpAddresses.json | 5 ++++- .../preview/2015-06-15/Quotas.json | 2 +- .../preview/2015-06-15/VirtualNetworks.json | 5 ++++- 5 files changed, 22 insertions(+), 7 deletions(-) diff --git a/specification/azsadmin/resource-manager/network/Microsoft.Network.Admin/preview/2015-06-15/LoadBalancers.json b/specification/azsadmin/resource-manager/network/Microsoft.Network.Admin/preview/2015-06-15/LoadBalancers.json index 446f376bcda9..bc945db7dd54 100644 --- a/specification/azsadmin/resource-manager/network/Microsoft.Network.Admin/preview/2015-06-15/LoadBalancers.json +++ b/specification/azsadmin/resource-manager/network/Microsoft.Network.Admin/preview/2015-06-15/LoadBalancers.json @@ -97,7 +97,10 @@ }, "allOf": [ { - "$ref": "Network.json#/definitions/ResourceTenant" + "$ref": "Network.json#/definitions/ProvisionedResource" + }, + { + "$ref": "Network.json#/definitions/TenantResource" } ] }, diff --git a/specification/azsadmin/resource-manager/network/Microsoft.Network.Admin/preview/2015-06-15/Network.json b/specification/azsadmin/resource-manager/network/Microsoft.Network.Admin/preview/2015-06-15/Network.json index c37f237ad354..947ed78922cf 100644 --- a/specification/azsadmin/resource-manager/network/Microsoft.Network.Admin/preview/2015-06-15/Network.json +++ b/specification/azsadmin/resource-manager/network/Microsoft.Network.Admin/preview/2015-06-15/Network.json @@ -82,15 +82,21 @@ }, "x-ms-azure-resource": true }, - "ResourceTenant": { - "description": "Base Resource Tenant Object", + "ProvisionedResource": { + "description": "Objects which have a provisioning state.", "type": "object", "properties": { "provisioningState": { "description": "The provisioning state.", "type": "string", "readOnly": true - }, + } + } + }, + "TenantResource": { + "description": "These resources are utilized by a single tenant.", + "type": "object", + "properties": { "subscriptionId": { "description": "The subscription ID.", "type": "string", diff --git a/specification/azsadmin/resource-manager/network/Microsoft.Network.Admin/preview/2015-06-15/PublicIpAddresses.json b/specification/azsadmin/resource-manager/network/Microsoft.Network.Admin/preview/2015-06-15/PublicIpAddresses.json index 87466d25e6f6..47e2d1001174 100644 --- a/specification/azsadmin/resource-manager/network/Microsoft.Network.Admin/preview/2015-06-15/PublicIpAddresses.json +++ b/specification/azsadmin/resource-manager/network/Microsoft.Network.Admin/preview/2015-06-15/PublicIpAddresses.json @@ -110,7 +110,10 @@ }, "allOf": [ { - "$ref": "Network.json#/definitions/ResourceTenant" + "$ref": "Network.json#/definitions/ProvisionedResource" + }, + { + "$ref": "Network.json#/definitions/TenantResource" } ] }, diff --git a/specification/azsadmin/resource-manager/network/Microsoft.Network.Admin/preview/2015-06-15/Quotas.json b/specification/azsadmin/resource-manager/network/Microsoft.Network.Admin/preview/2015-06-15/Quotas.json index c2381b422aa8..05f26771d709 100644 --- a/specification/azsadmin/resource-manager/network/Microsoft.Network.Admin/preview/2015-06-15/Quotas.json +++ b/specification/azsadmin/resource-manager/network/Microsoft.Network.Admin/preview/2015-06-15/Quotas.json @@ -242,7 +242,7 @@ }, "allOf": [ { - "$ref": "Network.json#/definitions/ResourceTenant" + "$ref": "Network.json#/definitions/ProvisionedResource" } ] }, diff --git a/specification/azsadmin/resource-manager/network/Microsoft.Network.Admin/preview/2015-06-15/VirtualNetworks.json b/specification/azsadmin/resource-manager/network/Microsoft.Network.Admin/preview/2015-06-15/VirtualNetworks.json index 527c596d0110..93a4e2cfdd4c 100644 --- a/specification/azsadmin/resource-manager/network/Microsoft.Network.Admin/preview/2015-06-15/VirtualNetworks.json +++ b/specification/azsadmin/resource-manager/network/Microsoft.Network.Admin/preview/2015-06-15/VirtualNetworks.json @@ -94,7 +94,10 @@ }, "allOf": [ { - "$ref": "Network.json#/definitions/ResourceTenant" + "$ref": "Network.json#/definitions/ProvisionedResource" + }, + { + "$ref": "Network.json#/definitions/TenantResource" } ] },