From f9ad7abb085cdda27e619e0f4f407714dfe20578 Mon Sep 17 00:00:00 2001 From: stankovski Date: Mon, 27 Jul 2015 17:03:23 -0700 Subject: [PATCH] Updated ARM resources specs --- .../2015-01-01/swagger/authorization.json | 69 ++++++------ .../2014-08-01-preview/swagger/features.json | 2 +- .../2014-04-01-preview/swagger/resources.json | 100 +++++++----------- .../swagger/subscriptions.json | 2 +- 4 files changed, 79 insertions(+), 94 deletions(-) diff --git a/arm-authorization/2015-01-01/swagger/authorization.json b/arm-authorization/2015-01-01/swagger/authorization.json index 8950191d7a29..20433e198d35 100644 --- a/arm-authorization/2015-01-01/swagger/authorization.json +++ b/arm-authorization/2015-01-01/swagger/authorization.json @@ -44,7 +44,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/ManagementLockProperties" + "$ref": "#/definitions/ManagementLock" }, "description": "The management lock parameters." }, @@ -56,16 +56,16 @@ } ], "responses": { - "201": { + "200": { "description": "", "schema": { - "$ref": "#/definitions/ManagementLockObject" + "$ref": "#/definitions/ManagementLock" } }, - "200": { + "201": { "description": "", "schema": { - "$ref": "#/definitions/ManagementLockObject" + "$ref": "#/definitions/ManagementLock" } } } @@ -128,7 +128,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/ManagementLockProperties" + "$ref": "#/definitions/ManagementLock" }, "description": "Create or update management lock parameters." }, @@ -143,13 +143,13 @@ "200": { "description": "", "schema": { - "$ref": "#/definitions/ManagementLockObject" + "$ref": "#/definitions/ManagementLock" } }, "201": { "description": "", "schema": { - "$ref": "#/definitions/ManagementLockObject" + "$ref": "#/definitions/ManagementLock" } } } @@ -213,13 +213,13 @@ } ], "responses": { - "202": { + "204": { "description": "" }, "200": { "description": "" }, - "204": { + "202": { "description": "" } } @@ -245,7 +245,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/ManagementLockProperties" + "$ref": "#/definitions/ManagementLock" }, "description": "The management lock parameters." }, @@ -257,16 +257,16 @@ } ], "responses": { - "200": { + "201": { "description": "", "schema": { - "$ref": "#/definitions/ManagementLockObject" + "$ref": "#/definitions/ManagementLock" } }, - "201": { + "200": { "description": "", "schema": { - "$ref": "#/definitions/ManagementLockObject" + "$ref": "#/definitions/ManagementLock" } } } @@ -296,10 +296,10 @@ "204": { "description": "" }, - "202": { + "200": { "description": "" }, - "200": { + "202": { "description": "" } } @@ -326,16 +326,16 @@ } ], "responses": { - "204": { + "200": { "description": "", "schema": { - "$ref": "#/definitions/ManagementLockObject" + "$ref": "#/definitions/ManagementLock" } }, - "200": { + "204": { "description": "", "schema": { - "$ref": "#/definitions/ManagementLockObject" + "$ref": "#/definitions/ManagementLock" } } } @@ -371,13 +371,13 @@ } ], "responses": { - "200": { + "204": { "description": "" }, - "202": { + "200": { "description": "" }, - "204": { + "202": { "description": "" } } @@ -421,7 +421,7 @@ } }, "x-ms-pageable": true, - "x-ms-odata": "#/definitions/ManagementLockObject" + "x-ms-odata": "#/definitions/ManagementLock" } }, "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{parentResourcePath}/{resourceType}/{resourceName}/providers/Microsoft.Authorization/locks": { @@ -492,7 +492,7 @@ } }, "x-ms-pageable": true, - "x-ms-odata": "#/definitions/ManagementLockObject" + "x-ms-odata": "#/definitions/ManagementLock" } }, "/{nextLink}": { @@ -557,7 +557,7 @@ } }, "x-ms-pageable": true, - "x-ms-odata": "#/definitions/ManagementLockObject" + "x-ms-odata": "#/definitions/ManagementLock" } } }, @@ -588,7 +588,7 @@ }, "description": "Resource filter." }, - "ResourceGroupExtendedFilter": { + "ResourceGroupFilter": { "properties": { "tagName": { "type": "string", @@ -620,23 +620,26 @@ }, "description": "The management lock properties." }, - "ManagementLockObject": { + "ManagementLock": { "properties": { "properties": { "$ref": "#/definitions/ManagementLockProperties", "description": "Gets or sets the properties of the lock." }, "id": { + "readOnly": true, "type": "string", - "description": "Gets or sets the Id of the lock." + "description": "Gets the Id of the lock." }, "type": { + "readOnly": true, "type": "string", - "description": "Gets or sets the type of the lock." + "description": "Gets the type of the lock." }, "name": { + "readOnly": true, "type": "string", - "description": "Gets or sets the name of the lock." + "description": "Gets the name of the lock." } }, "description": "Management lock information." @@ -646,7 +649,7 @@ "value": { "type": "array", "items": { - "$ref": "#/definitions/ManagementLockObject" + "$ref": "#/definitions/ManagementLock" }, "description": "Gets or sets the list of locks." }, diff --git a/arm-features/2014-08-01-preview/swagger/features.json b/arm-features/2014-08-01-preview/swagger/features.json index a04299a8bff8..1b52764561e2 100644 --- a/arm-features/2014-08-01-preview/swagger/features.json +++ b/arm-features/2014-08-01-preview/swagger/features.json @@ -182,7 +182,7 @@ }, "description": "Resource filter." }, - "ResourceGroupExtendedFilter": { + "ResourceGroupFilter": { "properties": { "tagName": { "type": "string", diff --git a/arm-resources/2014-04-01-preview/swagger/resources.json b/arm-resources/2014-04-01-preview/swagger/resources.json index 55d830458133..4608a37609fb 100644 --- a/arm-resources/2014-04-01-preview/swagger/resources.json +++ b/arm-resources/2014-04-01-preview/swagger/resources.json @@ -219,10 +219,10 @@ } ], "responses": { - "404": { + "204": { "description": "" }, - "204": { + "404": { "description": "" } } @@ -261,16 +261,20 @@ "201": { "description": "", "schema": { - "$ref": "#/definitions/ResourceGroupExtended" + "$ref": "#/definitions/ResourceGroup" } }, "200": { "description": "", "schema": { - "$ref": "#/definitions/ResourceGroupExtended" + "$ref": "#/definitions/ResourceGroup" } + }, + "202": { + "description": "" } - } + }, + "x-ms-long-running-operation": true }, "delete": { "tags": [ @@ -328,7 +332,7 @@ "200": { "description": "", "schema": { - "$ref": "#/definitions/ResourceGroupExtended" + "$ref": "#/definitions/ResourceGroup" } } } @@ -367,7 +371,7 @@ "200": { "description": "", "schema": { - "$ref": "#/definitions/ResourceGroupExtended" + "$ref": "#/definitions/ResourceGroup" } } } @@ -412,7 +416,7 @@ } }, "x-ms-pageable": true, - "x-ms-odata": "#/definitions/ResourceGroupExtendedFilter" + "x-ms-odata": "#/definitions/ResourceGroupFilter" } }, "/subscriptions/{subscriptionId}/resourceGroups/{sourceResourceGroupName}/moveResources": { @@ -614,13 +618,13 @@ } ], "responses": { - "204": { + "200": { "description": "" }, - "202": { + "204": { "description": "" }, - "200": { + "202": { "description": "" } } @@ -695,13 +699,17 @@ "$ref": "#/definitions/GenericResource" } }, + "202": { + "description": "" + }, "200": { "description": "", "schema": { "$ref": "#/definitions/GenericResource" } } - } + }, + "x-ms-long-running-operation": true }, "get": { "tags": [ @@ -758,13 +766,13 @@ } ], "responses": { - "204": { + "200": { "description": "", "schema": { "$ref": "#/definitions/GenericResource" } }, - "200": { + "204": { "description": "", "schema": { "$ref": "#/definitions/GenericResource" @@ -803,10 +811,10 @@ } ], "responses": { - "204": { + "200": { "description": "" }, - "200": { + "204": { "description": "" } } @@ -840,13 +848,13 @@ } ], "responses": { - "201": { + "200": { "description": "", "schema": { "$ref": "#/definitions/TagValue" } }, - "200": { + "201": { "description": "", "schema": { "$ref": "#/definitions/TagValue" @@ -878,13 +886,13 @@ } ], "responses": { - "201": { + "200": { "description": "", "schema": { "$ref": "#/definitions/TagDetails" } }, - "200": { + "201": { "description": "", "schema": { "$ref": "#/definitions/TagDetails" @@ -914,10 +922,10 @@ } ], "responses": { - "204": { + "200": { "description": "" }, - "200": { + "204": { "description": "" } } @@ -1069,13 +1077,13 @@ } ], "responses": { - "204": { + "200": { "description": "", "schema": { "$ref": "#/definitions/ResourceProviderOperationDetailListResult" } }, - "200": { + "204": { "description": "", "schema": { "$ref": "#/definitions/ResourceProviderOperationDetailListResult" @@ -1342,7 +1350,7 @@ }, "description": "Resource filter." }, - "ResourceGroupExtendedFilter": { + "ResourceGroupFilter": { "properties": { "tagName": { "type": "string", @@ -1480,51 +1488,29 @@ }, "description": "List of resource groups." }, - "ResourceGroup": { - "properties": { - "location": { - "type": "string", - "description": "Gets or sets the location of the resource group. It cannot be changed after the resource group has been created. Has to be one of the supported Azure Locations, such as West US, East US, West Europe, East Asia, etc." - }, - "properties": { - "type": "object", - "description": "Gets or sets the resource group properties." - }, - "tags": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "Gets or sets the tags attached to the resource group." - }, - "provisioningState": { - "type": "string", - "description": "Gets or sets resource group provisioning state." - } - }, - "description": "Resource group information." - }, - "ResourceGroupFormatResourceProperties": { + "ResourceGroupProperties": { "properties": { "provisioningState": { + "readOnly": true, "type": "string", - "description": "Gets or sets resource group provisioning state." + "description": "Gets resource group provisioning state." } }, "description": "The resource group properties." }, - "ResourceGroupExtended": { + "ResourceGroup": { "properties": { "id": { + "readOnly": true, "type": "string", - "description": "Gets or sets the ID of the resource group." + "description": "Gets the ID of the resource group." }, "name": { "type": "string", "description": "Gets or sets the Name of the resource group." }, "properties": { - "$ref": "#/definitions/ResourceGroupFormatResourceProperties" + "$ref": "#/definitions/ResourceGroupProperties" }, "location": { "type": "string", @@ -1536,10 +1522,6 @@ "type": "string" }, "description": "Gets or sets the tags attached to the resource group." - }, - "provisioningState": { - "type": "string", - "description": "Gets or sets resource group provisioning state." } }, "description": "Resource group information." @@ -1549,7 +1531,7 @@ "value": { "type": "array", "items": { - "$ref": "#/definitions/ResourceGroupExtended" + "$ref": "#/definitions/ResourceGroup" }, "description": "Gets or sets the list of resource groups." }, diff --git a/arm-subscriptions/2014-04-01-preview/swagger/subscriptions.json b/arm-subscriptions/2014-04-01-preview/swagger/subscriptions.json index 7db4ae2816e1..b8ef2159628f 100644 --- a/arm-subscriptions/2014-04-01-preview/swagger/subscriptions.json +++ b/arm-subscriptions/2014-04-01-preview/swagger/subscriptions.json @@ -126,7 +126,7 @@ }, "description": "Resource filter." }, - "ResourceGroupExtendedFilter": { + "ResourceGroupFilter": { "properties": { "tagName": { "type": "string",