diff --git a/preproduction-azure-pipelines.yml b/preproduction-azure-pipelines.yml index 657e2213f9bc..1850de2bbcf4 100644 --- a/preproduction-azure-pipelines.yml +++ b/preproduction-azure-pipelines.yml @@ -44,6 +44,6 @@ jobs: displayName: 'npm install' inputs: verbose: false - - script: 'npm install -D @azure/avocado@0.5.1' + - script: 'npm install -D @azure/avocado@0.6.0' - script: './node_modules/.bin/avocado' displayName: 'Avocado' diff --git a/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2015-12-01/acquisitions.json b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2015-12-01/acquisitions.json index ce3208514607..550b4395dffc 100644 --- a/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2015-12-01/acquisitions.json +++ b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2015-12-01/acquisitions.json @@ -49,7 +49,7 @@ "200": { "description": "OK -- The list of acquisitions has been returned.", "schema": { - "$ref": "acquisitions.json#/definitions/AcquisitionList" + "$ref": "#/definitions/AcquisitionList" } }, "404": { @@ -93,7 +93,7 @@ }, "status": { "description": "The status of the page BLOB acquisition.", - "$ref": "acquisitions.json#/definitions/AcquisitionStatus", + "$ref": "#/definitions/AcquisitionStatus", "readOnly": true }, "susbcriptionid": { @@ -130,7 +130,7 @@ "properties": { "description": "The properties of the page blob acquisition.", "x-ms-client-flatten": true, - "$ref": "acquisitions.json#/definitions/AcquisitionProperties", + "$ref": "#/definitions/AcquisitionProperties", "readOnly": true } }, @@ -144,7 +144,7 @@ "description": "The list of page BLOB acquisitions.", "type": "array", "items": { - "$ref": "acquisitions.json#/definitions/Acquisition" + "$ref": "#/definitions/Acquisition" } } }, diff --git a/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2015-12-01/blobServices.json b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2015-12-01/blobServices.json index d67de4a5ba00..519ef48fa783 100644 --- a/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2015-12-01/blobServices.json +++ b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2015-12-01/blobServices.json @@ -49,7 +49,7 @@ "200": { "description": "OK -- The BLOB service has been returned.", "schema": { - "$ref": "blobServices.json#/definitions/BlobService" + "$ref": "#/definitions/BlobService" } }, "404": { @@ -184,7 +184,7 @@ "type": "object", "allOf": [ { - "$ref": "blobServices.json#/definitions/BlobServiceWritableSettings" + "$ref": "#/definitions/BlobServiceWritableSettings" } ] }, @@ -194,7 +194,7 @@ "properties": { "settings": { "x-ms-client-flatten": true, - "$ref": "blobServices.json#/definitions/BlobServiceSettings", + "$ref": "#/definitions/BlobServiceSettings", "description": "Blob service settings.", "readOnly": true } @@ -212,7 +212,7 @@ "properties": { "description": "Blob service properties.", "x-ms-client-flatten": true, - "$ref": "blobServices.json#/definitions/BlobServiceProperties", + "$ref": "#/definitions/BlobServiceProperties", "readOnly": true } }, diff --git a/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2015-12-01/containers.json b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2015-12-01/containers.json index f22dc6856f83..2e39b9862f23 100644 --- a/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2015-12-01/containers.json +++ b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2015-12-01/containers.json @@ -49,13 +49,13 @@ "200": { "description": "OK -- Operation has been accepted and processed", "schema": { - "$ref": "containers.json#/definitions/MigrationResult" + "$ref": "#/definitions/MigrationResult" } }, "202": { "description": "ACCEPTED - Operation has been accepted will be processed asynchronously", "schema": { - "$ref": "containers.json#/definitions/MigrationResult" + "$ref": "#/definitions/MigrationResult" } } }, @@ -93,7 +93,7 @@ "200": { "description": "OK -- Operation has been accepted and processed", "schema": { - "$ref": "containers.json#/definitions/MigrationResult" + "$ref": "#/definitions/MigrationResult" } } } @@ -128,20 +128,20 @@ "$ref": "storage.json#/parameters/ApiVersionParameter" }, { - "$ref": "containers.json#/parameters/MigrationIntentParameter" + "$ref": "#/parameters/MigrationIntentParameter" }, { - "$ref": "containers.json#/parameters/MaxCountParameter" + "$ref": "#/parameters/MaxCountParameter" }, { - "$ref": "containers.json#/parameters/StartIndexParameter" + "$ref": "#/parameters/StartIndexParameter" } ], "responses": { "200": { "description": "OK -- The list of containers has been returned.", "schema": { - "$ref": "containers.json#/definitions/ContainerList" + "$ref": "#/definitions/ContainerList" } }, "404": { @@ -224,20 +224,20 @@ "$ref": "storage.json#/parameters/ApiVersionParameter" }, { - "$ref": "containers.json#/parameters/MigrationParameterParameter" + "$ref": "#/parameters/MigrationParameterParameter" } ], "responses": { "200": { "description": "OK -- Container has been migrated", "schema": { - "$ref": "containers.json#/definitions/MigrationResult" + "$ref": "#/definitions/MigrationResult" } }, "202": { "description": "ACCEPTED -- Operation accepted and will be performed asynchronously", "schema": { - "$ref": "containers.json#/definitions/MigrationResult" + "$ref": "#/definitions/MigrationResult" } } }, @@ -293,7 +293,7 @@ "description": "List of containers.", "type": "array", "items": { - "$ref": "containers.json#/definitions/Container" + "$ref": "#/definitions/Container" } }, "MigrationResult": { @@ -327,7 +327,7 @@ }, "migrationStatus": { "description": "The migration status.", - "$ref": "containers.json#/definitions/MigrationState", + "$ref": "#/definitions/MigrationState", "readOnly": true }, "subEntitiesCompleted": { @@ -423,7 +423,7 @@ "in": "body", "required": true, "schema": { - "$ref": "containers.json#/definitions/MigrationParameters" + "$ref": "#/definitions/MigrationParameters" }, "x-ms-parameter-location": "method" } diff --git a/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2015-12-01/farms.json b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2015-12-01/farms.json index e1f0db459024..587563b84a40 100644 --- a/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2015-12-01/farms.json +++ b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2015-12-01/farms.json @@ -47,7 +47,7 @@ "in": "body", "required": true, "schema": { - "$ref": "farms.json#/definitions/FarmCreationProperties" + "$ref": "#/definitions/FarmCreationProperties" } } ], @@ -55,7 +55,7 @@ "200": { "description": "OK -- The new storage farm has been created.", "schema": { - "$ref": "farms.json#/definitions/Farm" + "$ref": "#/definitions/Farm" } } } @@ -89,7 +89,7 @@ "200": { "description": "OK -- The farm has been returned.", "schema": { - "$ref": "farms.json#/definitions/Farm" + "$ref": "#/definitions/Farm" } }, "404": { @@ -127,7 +127,7 @@ "in": "body", "required": true, "schema": { - "$ref": "farms.json#/definitions/Farm" + "$ref": "#/definitions/Farm" } } ], @@ -135,7 +135,7 @@ "200": { "description": "OK -- The properties and settings of storage farm have been updated.", "schema": { - "$ref": "farms.json#/definitions/Farm" + "$ref": "#/definitions/Farm" } } } @@ -252,7 +252,7 @@ "200": { "description": "OK -- The list of storage farms has been returned.", "schema": { - "$ref": "farms.json#/definitions/FarmList" + "$ref": "#/definitions/FarmList" } } }, @@ -350,7 +350,7 @@ "description": "List of storage farms.", "type": "array", "items": { - "$ref": "farms.json#/definitions/Farm" + "$ref": "#/definitions/Farm" } }, "nextLink": { @@ -367,7 +367,7 @@ "properties": { "description": "Storage farm properties.", "x-ms-client-flatten": true, - "$ref": "farms.json#/definitions/SettingAccessString" + "$ref": "#/definitions/SettingAccessString" } }, "allOf": [ @@ -383,8 +383,7 @@ "properties": { "description": "Storage farm properties.", "x-ms-client-flatten": true, - "$ref": "farms.json#/definitions/FarmProperties", - "readOnly": true + "$ref": "#/definitions/FarmProperties" } }, "allOf": [ @@ -400,245 +399,204 @@ "settingsPollingIntervalInSecond": { "description": "The polling interval (in second).", "type": "integer", - "format": "int32", - "readOnly": true + "format": "int32" }, "retentionPeriodForDeletedStorageAccountsInDays": { "description": "The retention period (in days) for deleted storage account.", "type": "integer", - "format": "int32", - "readOnly": true + "format": "int32" }, "hostStyleHttpPort": { "description": "Host style HTTP port.", "type": "integer", - "format": "int32", - "readOnly": true + "format": "int32" }, "hostStyleHttpsPort": { "description": "Host style HTTPs port.", "type": "integer", - "format": "int32", - "readOnly": true + "format": "int32" }, "corsAllowedOriginsList": { "description": "The list of allowed origins.", - "type": "string", - "readOnly": true + "type": "string" }, "dataCenterUriHostSuffixes": { "description": "The suffixes of URI of hosts in data center.", - "type": "string", - "readOnly": true + "type": "string" }, "bandwidthThrottleIsEnabled": { "description": "Switch of bandwidth throttle enablement.", - "type": "boolean", - "readOnly": true + "type": "boolean" }, "usageCollectionIntervalInSeconds": { "description": "Interval (in seconds) of storage usage collection.", "type": "integer", - "format": "int32", - "readOnly": true + "format": "int32" }, "feedbackRefreshIntervalInSeconds": { "description": "Interval (in seconds) of feedback refresh.", "type": "integer", - "format": "int32", - "readOnly": true + "format": "int32" }, "numberOfAccountsToSync": { "description": "Number of accounts to sync.", "type": "integer", - "format": "int32", - "readOnly": true + "format": "int32" }, "defaultThrottleProbabilityDecayIntervalInSeconds": { "description": "Interval (in seconds) of default throttle probability decay.", "type": "integer", - "format": "int32", - "readOnly": true + "format": "int32" }, "gracePeriodForFullThrottlingInRefreshIntervals": { "description": "Grace period for full throttling in refresh intervals.", "type": "integer", - "format": "int32", - "readOnly": true + "format": "int32" }, "gracePeriodMaxThrottleProbability": { "description": "Maximum probability of throttle in grace period.", "type": "number", - "format": "float", - "readOnly": true + "format": "float" }, "overallRequestThresholdInTps": { "description": "Overall request threshold (in TPS).", "type": "number", - "format": "float", - "readOnly": true + "format": "float" }, "defaultRequestThresholdInTps": { "description": "Default request threshold (in TPS).", "type": "number", - "format": "float", - "readOnly": true + "format": "float" }, "minimumRequestThresholdInTps": { "description": "Minimum request threshold (in TPS).", "type": "number", - "format": "float", - "readOnly": true + "format": "float" }, "toleranceFactorForTps": { "description": "Tolerance factor for TPS.", "type": "number", - "format": "float", - "readOnly": true + "format": "float" }, "overallIngressThresholdInGbps": { "description": "Overall ingress threshold (in Gbps)", "type": "number", - "format": "float", - "readOnly": true + "format": "float" }, "defaultIngressThresholdInGbps": { "description": "Default ingress threshold (in Gbps).", "type": "number", - "format": "float", - "readOnly": true + "format": "float" }, "minimumIngressThresholdInGbps": { "description": "Minimum ingress threshold (in Gbps).", "type": "number", - "format": "float", - "readOnly": true + "format": "float" }, "toleranceFactorForIngress": { "description": "Tolerance factor for ingress.", "type": "number", - "format": "float", - "readOnly": true + "format": "float" }, "overallIntranetIngressThresholdInGbps": { "description": "Overall Intranet ingress threshold (in Gbps).", "type": "number", - "format": "float", - "readOnly": true + "format": "float" }, "defaultIntranetIngressThresholdInGbps": { "description": "Default Intranet ingress threshold (in Gbps).", "type": "number", - "format": "float", - "readOnly": true + "format": "float" }, "minimumIntranetIngressThresholdInGbps": { "description": "Minimum Intranet ingress threshold (in Gbps).", "type": "number", - "format": "float", - "readOnly": true + "format": "float" }, "toleranceFactorForIntranetIngress": { "description": "Tolerance factor for Intranet ingress.", "type": "number", - "format": "float", - "readOnly": true + "format": "float" }, "overallEgressThresholdInGbps": { "description": "Overall egress threshold (in Gbps).", "type": "number", - "format": "float", - "readOnly": true + "format": "float" }, "defaultEgressThresholdInGbps": { "description": "Default egress threshold (in Gbps).", "type": "number", - "format": "float", - "readOnly": true + "format": "float" }, "minimumEgressThresholdInGbps": { "description": "Minimum egress threshold (in Gbps).", "type": "number", - "format": "float", - "readOnly": true + "format": "float" }, "toleranceFactorForEgress": { "description": "Tolerance factor for egress.", "type": "number", - "format": "float", - "readOnly": true + "format": "float" }, "overallIntranetEgressThresholdInGbps": { "description": "Overall Intranet egress threshold (in Gbps).", "type": "number", - "format": "float", - "readOnly": true + "format": "float" }, "defaultIntranetEgressThresholdInGbps": { "description": "Default Intranet egress threshold (in Gbps).", "type": "number", - "format": "float", - "readOnly": true + "format": "float" }, "minimumIntranetEgressThresholdInGbps": { "description": "Minimum Intranet egress threshold (in Gbps).", "type": "number", - "format": "float", - "readOnly": true + "format": "float" }, "toleranceFactorForIntranetEgress": { "description": "Tolerance factor for Intranet egress.", "type": "number", - "format": "float", - "readOnly": true + "format": "float" }, "overallTotalIngressThresholdInGbps": { "description": "Overall total ingress threshold (in Gbps).", "type": "number", - "format": "float", - "readOnly": true + "format": "float" }, "defaultTotalIngressThresholdInGbps": { "description": "Default total ingress threshold (in Gbps).", "type": "number", - "format": "float", - "readOnly": true + "format": "float" }, "minimumTotalIngressThresholdInGbps": { "description": "Minimum total ingress threshold (in Gbps).", "type": "number", - "format": "float", - "readOnly": true + "format": "float" }, "toleranceFactorForTotalIngress": { "description": "Tolerance factor for total ingress.", "type": "number", - "format": "float", - "readOnly": true + "format": "float" }, "overallTotalEgressThresholdInGbps": { "description": "Overall total egress threshold (in Gbps).", "type": "number", - "format": "float", - "readOnly": true + "format": "float" }, "defaultTotalEgressThresholdInGbps": { "description": "Default total egress threshold (in Gbps).", "type": "number", - "format": "float", - "readOnly": true + "format": "float" }, "minimumTotalEgressThresholdInGbps": { "description": "Minimum total egress threshold (in Gbp", "type": "number", - "format": "float", - "readOnly": true + "format": "float" }, "toleranceFactorForTotalEgress": { "description": "Tolerance factor for total egress.", "type": "number", - "format": "float", - "readOnly": true + "format": "float" } } }, @@ -648,24 +606,20 @@ "properties": { "farmId": { "description": "Farm identifier.", - "type": "string", - "readOnly": true + "type": "string" }, "version": { "description": "Resource version.", - "type": "string", - "readOnly": true + "type": "string" }, "settingsStore": { "description": "The settings of storage farm.", - "type": "string", - "readOnly": true + "type": "string" }, "settings": { "description": "The properties of storage farm.", "x-ms-client-flatten": true, - "$ref": "farms.json#/definitions/FarmSettings", - "readOnly": true + "$ref": "#/definitions/FarmSettings" } } }, diff --git a/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2015-12-01/queueServices.json b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2015-12-01/queueServices.json index 3935ea3649f0..a8c68ca4c60f 100644 --- a/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2015-12-01/queueServices.json +++ b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2015-12-01/queueServices.json @@ -49,7 +49,7 @@ "200": { "description": "OK -- Queue service has been returned.", "schema": { - "$ref": "queueServices.json#/definitions/QueueService" + "$ref": "#/definitions/QueueService" } }, "404": { @@ -174,7 +174,7 @@ "properties": { "description": "Queue service properties.", "x-ms-client-flatten": true, - "$ref": "queueServices.json#/definitions/QueueServiceProperties", + "$ref": "#/definitions/QueueServiceProperties", "readOnly": true } }, diff --git a/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2015-12-01/quotas.json b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2015-12-01/quotas.json index 65c0aa61ba7e..f047fdcf2d4d 100644 --- a/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2015-12-01/quotas.json +++ b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2015-12-01/quotas.json @@ -39,17 +39,17 @@ "$ref": "storage.json#/parameters/ApiVersionParameter" }, { - "$ref": "quotas.json#/parameters/QuotaNameParameter" + "$ref": "#/parameters/QuotaNameParameter" }, { - "$ref": "quotas.json#/parameters/StorgeQuotaParameters" + "$ref": "#/parameters/StorgeQuotaParameters" } ], "responses": { "200": { "description": "OK -- The storage quota has been created or updated.", "schema": { - "$ref": "quotas.json#/definitions/StorageQuota" + "$ref": "#/definitions/StorageQuota" } }, "404": { @@ -79,7 +79,7 @@ "$ref": "storage.json#/parameters/LocationParameter" }, { - "$ref": "quotas.json#/parameters/QuotaNameParameter" + "$ref": "#/parameters/QuotaNameParameter" } ], "responses": { @@ -113,14 +113,14 @@ "$ref": "storage.json#/parameters/LocationParameter" }, { - "$ref": "quotas.json#/parameters/QuotaNameParameter" + "$ref": "#/parameters/QuotaNameParameter" } ], "responses": { "200": { "description": "OK -- The storage quota has been returned.", "schema": { - "$ref": "quotas.json#/definitions/StorageQuota" + "$ref": "#/definitions/StorageQuota" } }, "404": { @@ -156,7 +156,7 @@ "200": { "description": "OK -- The list of storage quotas has been returned.", "schema": { - "$ref": "quotas.json#/definitions/StorageQuotaList" + "$ref": "#/definitions/StorageQuotaList" } }, "404": { @@ -177,7 +177,7 @@ "properties": { "description": "Storage quota properties.", "x-ms-client-flatten": true, - "$ref": "quotas.json#/definitions/StorageQuotaProperties" + "$ref": "#/definitions/StorageQuotaProperties" } }, "allOf": [ @@ -212,7 +212,7 @@ "description": "List of storage quotas.", "type": "array", "items": { - "$ref": "quotas.json#/definitions/StorageQuota" + "$ref": "#/definitions/StorageQuota" } }, "nextLink": { @@ -237,7 +237,7 @@ "in": "body", "required": true, "schema": { - "$ref": "quotas.json#/definitions/StorageQuota" + "$ref": "#/definitions/StorageQuota" }, "x-ms-parameter-location": "method" } diff --git a/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2015-12-01/shares.json b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2015-12-01/shares.json index 3dc5fe6e34e3..4d978bc695cd 100644 --- a/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2015-12-01/shares.json +++ b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2015-12-01/shares.json @@ -46,7 +46,7 @@ "200": { "description": "OK -- The list of storage shares has been returned.", "schema": { - "$ref": "shares.json#/definitions/ShareList" + "$ref": "#/definitions/ShareList" } }, "404": { @@ -181,7 +181,7 @@ "200": { "description": "OK -- The storage share has been returned.", "schema": { - "$ref": "shares.json#/definitions/Share" + "$ref": "#/definitions/Share" } }, "404": { @@ -199,7 +199,7 @@ "properties": { "description": "Storage share properties.", "x-ms-client-flatten": true, - "$ref": "shares.json#/definitions/ShareProperties", + "$ref": "#/definitions/ShareProperties", "readOnly": true } }, @@ -213,7 +213,7 @@ "description": "List of storage shares.", "type": "array", "items": { - "$ref": "shares.json#/definitions/Share" + "$ref": "#/definitions/Share" } }, "ShareProperties": { diff --git a/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2015-12-01/storage.json b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2015-12-01/storage.json index 377f487a6066..087898639205 100644 --- a/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2015-12-01/storage.json +++ b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2015-12-01/storage.json @@ -30,14 +30,14 @@ "operationId": "Operations_List", "parameters": [ { - "$ref": "storage.json#/parameters/ApiVersionParameter" + "$ref": "#/parameters/ApiVersionParameter" } ], "responses": { "200": { "description": "OK -- The list of operations has been returned.", "schema": { - "$ref": "storage.json#/definitions/OperationList" + "$ref": "#/definitions/OperationList" } } }, @@ -137,7 +137,7 @@ }, "allOf": [ { - "$ref": "storage.json#/definitions/WritableSettings" + "$ref": "#/definitions/WritableSettings" } ] }, @@ -207,24 +207,24 @@ "properties": { "name": { "description": "Metric name.", - "$ref": "storage.json#/definitions/LocalizableString", + "$ref": "#/definitions/LocalizableString", "readOnly": true }, "unit": { "description": "Metric unit.", - "$ref": "storage.json#/definitions/MetricUnit", + "$ref": "#/definitions/MetricUnit", "readOnly": true }, "primaryAggregationType": { "description": "Aggregation type of metric.", - "$ref": "storage.json#/definitions/AggregateType", + "$ref": "#/definitions/AggregateType", "readOnly": true }, "metricAvailabilities": { "description": "Metric availabilities.", "type": "array", "items": { - "$ref": "storage.json#/definitions/MetricAvailability" + "$ref": "#/definitions/MetricAvailability" }, "readOnly": true } @@ -236,12 +236,12 @@ "properties": { "name": { "description": "Metric Name.", - "$ref": "storage.json#/definitions/LocalizableString", + "$ref": "#/definitions/LocalizableString", "readOnly": true }, "metricUnit": { "description": "Metric Unit.", - "$ref": "storage.json#/definitions/MetricUnit", + "$ref": "#/definitions/MetricUnit", "readOnly": true }, "timeGrain": { @@ -265,7 +265,7 @@ "description": "List of metric values.", "type": "array", "items": { - "$ref": "storage.json#/definitions/MetricValue" + "$ref": "#/definitions/MetricValue" }, "readOnly": true } @@ -279,7 +279,7 @@ "description": "List of metric definitions.", "type": "array", "items": { - "$ref": "storage.json#/definitions/MetricDefinition" + "$ref": "#/definitions/MetricDefinition" }, "readOnly": true }, @@ -298,7 +298,7 @@ "description": "List of metrics.", "type": "array", "items": { - "$ref": "storage.json#/definitions/Metric" + "$ref": "#/definitions/Metric" }, "readOnly": true }, @@ -376,31 +376,26 @@ "properties": { "id": { "description": "Resource ID.", - "type": "string", - "readOnly": true + "type": "string" }, "name": { "description": "Resource Name.", - "type": "string", - "readOnly": true + "type": "string" }, "type": { "description": "Resource type.", - "type": "string", - "readOnly": true + "type": "string" }, "location": { "description": "Resource location.", - "type": "string", - "readOnly": true + "type": "string" }, "tags": { "description": "Resource tags.", "type": "object", "additionalProperties": { "type": "string" - }, - "readOnly": true + } } }, "x-ms-azure-resource": true @@ -414,7 +409,7 @@ }, "healthStatus": { "description": "Health status of storage service.", - "$ref": "storage.json#/definitions/HealthStatus" + "$ref": "#/definitions/HealthStatus" } } }, @@ -428,7 +423,7 @@ }, "display": { "description": "Contains the localized display information for this particular operation / action.", - "$ref": "storage.json#/definitions/Display", + "$ref": "#/definitions/Display", "readOnly": true } } @@ -465,7 +460,7 @@ "description": "List of operations", "type": "array", "items": { - "$ref": "storage.json#/definitions/Operation" + "$ref": "#/definitions/Operation" } }, "nextLink": { diff --git a/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2015-12-01/storageaccounts.json b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2015-12-01/storageaccounts.json index e3d8477ad1e2..7563995ee609 100644 --- a/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2015-12-01/storageaccounts.json +++ b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2015-12-01/storageaccounts.json @@ -42,14 +42,14 @@ "$ref": "storage.json#/parameters/ApiVersionParameter" }, { - "$ref": "storageaccounts.json#/parameters/SummaryParameter" + "$ref": "#/parameters/SummaryParameter" } ], "responses": { "200": { "description": "OK -- The list of storage accounts has been returned.", "schema": { - "$ref": "storageaccounts.json#/definitions/StorageAccountList" + "$ref": "#/definitions/StorageAccountList" } }, "404": { @@ -84,7 +84,7 @@ "$ref": "storage.json#/parameters/FarmIdParameter" }, { - "$ref": "storageaccounts.json#/parameters/AccountIdParameter" + "$ref": "#/parameters/AccountIdParameter" }, { "$ref": "storage.json#/parameters/ApiVersionParameter" @@ -94,7 +94,7 @@ "200": { "description": "OK -- The storage account has been returned.", "schema": { - "$ref": "storageaccounts.json#/definitions/StorageAccount" + "$ref": "#/definitions/StorageAccount" } }, "404": { @@ -124,7 +124,7 @@ "$ref": "storage.json#/parameters/FarmIdParameter" }, { - "$ref": "storageaccounts.json#/parameters/AccountIdParameter" + "$ref": "#/parameters/AccountIdParameter" }, { "$ref": "storage.json#/parameters/ApiVersionParameter" @@ -255,12 +255,12 @@ }, "accountType": { "description": "Storage account type.", - "$ref": "storageaccounts.json#/definitions/StorageAccountType", + "$ref": "#/definitions/StorageAccountType", "readOnly": true }, "provisioningState": { "description": "The provisioning state of storage account.", - "$ref": "storageaccounts.json#/definitions/StorageAccountState", + "$ref": "#/definitions/StorageAccountState", "readOnly": true }, "primaryEndpoints": { @@ -287,7 +287,7 @@ }, "statusOfPrimary": { "description": "The status of primary location of storage account.", - "$ref": "storageaccounts.json#/definitions/LocationStatus", + "$ref": "#/definitions/LocationStatus", "readOnly": true }, "tenantSubscriptionId": { @@ -307,7 +307,7 @@ }, "currentOperation": { "description": "Current operation being performed on Storage Account", - "$ref": "storageaccounts.json#/definitions/StorageAccountOperation", + "$ref": "#/definitions/StorageAccountOperation", "readOnly": true }, "customDomain": { @@ -328,7 +328,7 @@ "readOnly": true }, "accountStatus": { - "$ref": "storageaccounts.json#/definitions/StorageAccountStatus", + "$ref": "#/definitions/StorageAccountStatus", "description": "The status of storage account." }, "recoveredTime": { @@ -345,7 +345,7 @@ }, "permissions": { "description": "The permissions on the storage account.", - "$ref": "storageaccounts.json#/definitions/WacAccountPermissions", + "$ref": "#/definitions/WacAccountPermissions", "readOnly": true }, "accountId": { @@ -355,7 +355,7 @@ }, "wacInternalState": { "description": "The internal state of storage account in WAC.", - "$ref": "storageaccounts.json#/definitions/WacAccountStates", + "$ref": "#/definitions/WacAccountStates", "readOnly": true }, "resourceAdminApiVersion": { @@ -372,7 +372,7 @@ "properties": { "description": "Properties of the storage account.", "x-ms-client-flatten": true, - "$ref": "storageaccounts.json#/definitions/StorageAccountProperties", + "$ref": "#/definitions/StorageAccountProperties", "readOnly": true } }, @@ -390,7 +390,7 @@ "description": "List of storage accounts.", "type": "array", "items": { - "$ref": "storageaccounts.json#/definitions/StorageAccount" + "$ref": "#/definitions/StorageAccount" }, "readOnly": true }, diff --git a/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2015-12-01/tableServices.json b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2015-12-01/tableServices.json index 7533fa942df5..044c0874eea1 100644 --- a/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2015-12-01/tableServices.json +++ b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2015-12-01/tableServices.json @@ -49,7 +49,7 @@ "200": { "description": "OK -- Table service has been returned.", "schema": { - "$ref": "tableServices.json#/definitions/TableService" + "$ref": "#/definitions/TableService" } }, "404": { @@ -157,7 +157,7 @@ "properties": { "description": "Table service properties.", "x-ms-client-flatten": true, - "$ref": "tableServices.json#/definitions/TableServiceProperties", + "$ref": "#/definitions/TableServiceProperties", "readOnly": true } }, diff --git a/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/acquisitions.json b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/acquisitions.json new file mode 100644 index 000000000000..0adabf8037e1 --- /dev/null +++ b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/acquisitions.json @@ -0,0 +1,162 @@ +{ + "swagger": "2.0", + "info": { + "version": "2019-08-08-preview", + "title": "StorageManagementClient", + "description": "The Admin Storage Management Client." + }, + "host": "adminmanagement.local.azurestack.external", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "paths": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Storage.Admin/locations/{location}/acquisitions": { + "get": { + "x-ms-examples": { + "Returns a list of page BLOB acquisitions.": { + "$ref": "./examples/Acquisitions/List.json" + } + }, + "tags": [ + "Acquisitions" + ], + "operationId": "Acquisitions_List", + "description": "Returns a list of BLOB acquisitions.", + "parameters": [ + { + "$ref": "storage.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "storage.json#/parameters/LocationParameter" + }, + { + "$ref": "storage.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK -- The list of acquisitions has been returned.", + "schema": { + "$ref": "#/definitions/AcquisitionList" + } + }, + "default": { + "description": "Error Response.", + "schema": { + "$ref": "storage.json#/definitions/ErrorResponse" + } + } + } + } + } + }, + "definitions": { + "AcquisitionStatus": { + "description": "The status of page BLOB acquisition.", + "type": "string", + "enum": [ + "Unknown", + "NotAcquired", + "Pending", + "Success", + "Failed" + ], + "x-ms-enum": { + "name": "AcquisitionStatus", + "modelAsString": true + } + }, + "Acquisition": { + "description": "The acquisition of the page BLOB.", + "type": "object", + "properties": { + "susbcriptionid": { + "description": "ID of the subscription associated with the page BLOB.", + "type": "string", + "readOnly": true + }, + "storageaccount": { + "description": "The storage account that holds the page BLOB.", + "type": "string", + "readOnly": true + }, + "container": { + "description": "The container associated with the page BLOB.", + "type": "string", + "readOnly": true + }, + "blob": { + "description": "The name of the page BLOB.", + "type": "string", + "readOnly": true + }, + "acquisitionid": { + "description": "The ID of page BLOB acquisition.", + "type": "string", + "readOnly": true + }, + "filePath": { + "description": "The file path of the page BLOB file on storage cluster.", + "type": "string", + "readOnly": true + }, + "filePathUnc": { + "description": "The file path unc of the page BLOB file on storage cluster.", + "type": "string", + "readOnly": true + }, + "maximumblobsize": { + "description": "The maximum size of the page BLOB.", + "type": "integer", + "format": "int64", + "readOnly": true + }, + "status": { + "description": "The status of the page BLOB acquisition.", + "$ref": "#/definitions/AcquisitionStatus", + "readOnly": true + } + }, + "x-ms-azure-resource": true + }, + "AcquisitionList": { + "description": "The list of page BLOB acquisitions.", + "type": "object", + "properties": { + "value": { + "description": "List of acquisitions.", + "type": "array", + "items": { + "$ref": "#/definitions/Acquisition" + }, + "readOnly": true + } + } + } + }, + "parameters": {}, + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Authorization uses an Azure Active Directory OAuth2 flow.", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ] +} diff --git a/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/examples/Acquisitions/List.json b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/examples/Acquisitions/List.json new file mode 100644 index 000000000000..9d721d044e28 --- /dev/null +++ b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/examples/Acquisitions/List.json @@ -0,0 +1,14 @@ +{ + "parameters": { + "subscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2", + "location": "local", + "api-version": "2019-08-08-preview" + }, + "responses": { + "200": { + "body": { + "value":[] + } + } + } +} diff --git a/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/examples/Operations/List.json b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/examples/Operations/List.json new file mode 100644 index 000000000000..05aede9aac06 --- /dev/null +++ b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/examples/Operations/List.json @@ -0,0 +1,12 @@ +{ + "parameters": { + "api-version": "2019-08-08-preview" + }, + "responses": { + "200": { + "body": { + "value": [] + } + } + } +} diff --git a/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/examples/Quotas/CreateOrUpdate.json b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/examples/Quotas/CreateOrUpdate.json new file mode 100644 index 000000000000..985e7cbec6f1 --- /dev/null +++ b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/examples/Quotas/CreateOrUpdate.json @@ -0,0 +1,28 @@ +{ + "parameters": { + "subscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2", + "location": "local", + "quotaName": "TestCreateQuota", + "api-version": "2019-08-08-preview", + "quotaObject": { + "properties": { + "numberOfStorageAccounts": 10000, + "capacityInGb": 1000 + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/providers/Microsoft.Storage.Admin/locations/local/quotas/TestCreateQuota", + "name": "local/TestCreateQuota", + "type": "Microsoft.Storage.Admin/locations/quotas", + "location": "local", + "properties": { + "numberOfStorageAccounts": 10000, + "capacityInGb": 1000 + } + } + } + } +} diff --git a/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/examples/Quotas/Delete.json b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/examples/Quotas/Delete.json new file mode 100644 index 000000000000..9fc783a03a41 --- /dev/null +++ b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/examples/Quotas/Delete.json @@ -0,0 +1,11 @@ +{ + "parameters": { + "subscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2", + "location": "local", + "quotaName": "TestCreateQuota", + "api-version": "2019-08-08-preview" + }, + "responses": { + "200": {} + } +} diff --git a/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/examples/Quotas/Get.json b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/examples/Quotas/Get.json new file mode 100644 index 000000000000..afdaa6c12646 --- /dev/null +++ b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/examples/Quotas/Get.json @@ -0,0 +1,22 @@ +{ + "parameters": { + "subscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2", + "location": "local", + "quotaName": "TestCreateQuota", + "api-version": "2019-08-08-preview" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/providers/Microsoft.Storage.Admin/locations/local/quotas/TestCreateQuota", + "name": "local/TestCreateQuota", + "type": "Microsoft.Storage.Admin/locations/quotas", + "location": "local", + "properties": { + "numberOfStorageAccounts": 20, + "capacityInGb": 2048 + } + } + } + } +} diff --git a/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/examples/Quotas/List.json b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/examples/Quotas/List.json new file mode 100644 index 000000000000..34af15800cc0 --- /dev/null +++ b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/examples/Quotas/List.json @@ -0,0 +1,25 @@ +{ + "parameters": { + "subscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2", + "location": "local", + "api-version": "2019-08-08-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/providers/Microsoft.Storage.Admin/locations/local/quotas/TestCreateQuota", + "name": "local/TestCreateQuota", + "type": "Microsoft.Storage.Admin/locations/quotas", + "location": "local", + "properties": { + "numberOfStorageAccounts": 20, + "capacityInGb": 2048 + } + } + ] + } + } + } +} diff --git a/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/examples/Settings/Get.json b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/examples/Settings/Get.json new file mode 100644 index 000000000000..7128a5c46bf8 --- /dev/null +++ b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/examples/Settings/Get.json @@ -0,0 +1,17 @@ +{ + "parameters": { + "subscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2", + "location": "local", + "api-version": "2019-08-08-preview" + }, + "responses": { + "200": { + "body": { + "properties": + { + "retentionPeriodForDeletedStorageAccountsInDays": 2 + } + } + } + } +} diff --git a/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/examples/Settings/Update.json b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/examples/Settings/Update.json new file mode 100644 index 000000000000..42d51727b2f9 --- /dev/null +++ b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/examples/Settings/Update.json @@ -0,0 +1,21 @@ +{ + "parameters": { + "subscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2", + "location": "local", + "api-version": "2019-08-08-preview", + "settingsObject": { + "properties": { + "retentionPeriodForDeletedStorageAccountsInDays": 2 + } + } + }, + "responses": { + "200": { + "body": { + "properties": { + "retentionPeriodForDeletedStorageAccountsInDays": 2 + } + } + } + } +} diff --git a/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/examples/StorageAccounts/Get.json b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/examples/StorageAccounts/Get.json new file mode 100644 index 000000000000..ddf05209bef8 --- /dev/null +++ b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/examples/StorageAccounts/Get.json @@ -0,0 +1,39 @@ +{ + "parameters": { + "subscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2", + "location": "local", + "accountId": "f93c9df9e7af487fbda484a9201d9c18", + "api-version": "2019-08-08-preview", + "summary": "false" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/resourcegroups/System.local/providers/Microsoft.Storage.Admin/storageaccounts/f93c9df9e7af487fbda484a9201d9c18", + "type": "Microsoft.Storage.Admin/storageaccounts", + "name": "f93c9df9e7af487fbda484a9201d9c18", + "location": "local", + "properties": { + "provisioningState": "Succeeded", + "primaryEndpoints": { + "blob": "https://authprod.blob.local.azurestack.external/", + "queue": "https://authprod.queue.local.azurestack.external/", + "table": "https://authprod.table.local.azurestack.external/" + }, + "primaryLocation": "local", + "statusOfPrimary": "Available", + "tenantViewId": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/resourcegroups/system.local/providers/Microsoft.Storage/storageaccounts/authprod", + "tenantSubscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2", + "tenantStorageAccountName": "authprod", + "tenantResourceGroupName": "system.local", + "accountStatus": "Active", + "permissions": "Full", + "accountId": "f93c9df9e7af487fbda484a9201d9c18", + "wacInternalState": "Active", + "accountType": "Standard_LRS", + "creationTime": "2018-01-17T01:56:30.983" + } + } + } + } +} diff --git a/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/examples/StorageAccounts/List.json b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/examples/StorageAccounts/List.json new file mode 100644 index 000000000000..ed522d0ea736 --- /dev/null +++ b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/examples/StorageAccounts/List.json @@ -0,0 +1,224 @@ +{ + "parameters": { + "subscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2", + "location": "local", + "api-version": "2019-08-08-preview", + "summary": false + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/resourcegroups/System.local/providers/Microsoft.Storage.Admin/storageaccounts/0180624c67694706a4066782d83057a5", + "type": "Microsoft.Storage.Admin/storageaccounts", + "name": "0180624c67694706a4066782d83057a5", + "location": "local", + "properties": { + "provisioningState": "Succeeded", + "primaryEndpoints": { + "blob": "https://adminkvlclproddata004.blob.local.azurestack.external/", + "queue": "https://adminkvlclproddata004.queue.local.azurestack.external/", + "table": "https://adminkvlclproddata004.table.local.azurestack.external/" + }, + "primaryLocation": "local", + "statusOfPrimary": "Available", + "tenantViewId": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/resourcegroups/system.local.adminkeyvault/providers/Microsoft.Storage/storageaccounts/adminkvlclproddata004", + "tenantSubscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2", + "tenantStorageAccountName": "adminkvlclproddata004", + "tenantResourceGroupName": "system.local.adminkeyvault", + "accountStatus": "Active", + "permissions": "Full", + "accountId": "0180624c67694706a4066782d83057a5", + "wacInternalState": "Active", + "accountType": "Standard_LRS", + "creationTime": "2018-01-17T02:10:27.41" + } + }, + { + "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/resourcegroups/System.local/providers/Microsoft.Storage.Admin/storageaccounts/04106a84393f4a12ab8efdbc0a69bb65", + "type": "Microsoft.Storage.Admin/storageaccounts", + "name": "04106a84393f4a12ab8efdbc0a69bb65", + "location": "local", + "properties": { + "provisioningState": "Succeeded", + "primaryEndpoints": { + "blob": "https://adminkvlclproddata005.blob.local.azurestack.external/", + "queue": "https://adminkvlclproddata005.queue.local.azurestack.external/", + "table": "https://adminkvlclproddata005.table.local.azurestack.external/" + }, + "primaryLocation": "local", + "statusOfPrimary": "Available", + "tenantViewId": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/resourcegroups/system.local.adminkeyvault/providers/Microsoft.Storage/storageaccounts/adminkvlclproddata005", + "tenantSubscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2", + "tenantStorageAccountName": "adminkvlclproddata005", + "tenantResourceGroupName": "system.local.adminkeyvault", + "accountStatus": "Active", + "permissions": "Full", + "accountId": "04106a84393f4a12ab8efdbc0a69bb65", + "wacInternalState": "Active", + "accountType": "Standard_LRS", + "creationTime": "2018-01-17T02:10:27.847" + } + }, + { + "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/resourcegroups/System.local/providers/Microsoft.Storage.Admin/storageaccounts/06e296e00b284f5cb5708dfabd6ad74c", + "type": "Microsoft.Storage.Admin/storageaccounts", + "name": "06e296e00b284f5cb5708dfabd6ad74c", + "location": "local", + "properties": { + "provisioningState": "Succeeded", + "primaryEndpoints": { + "blob": "https://wasphealthaccount.blob.local.azurestack.external/", + "queue": "https://wasphealthaccount.queue.local.azurestack.external/", + "table": "https://wasphealthaccount.table.local.azurestack.external/" + }, + "primaryLocation": "local", + "statusOfPrimary": "Available", + "tenantViewId": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/resourcegroups/system.local/providers/Microsoft.Storage/storageaccounts/wasphealthaccount", + "tenantSubscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2", + "tenantStorageAccountName": "wasphealthaccount", + "tenantResourceGroupName": "system.local", + "accountStatus": "Active", + "permissions": "Full", + "accountId": "06e296e00b284f5cb5708dfabd6ad74c", + "wacInternalState": "Active", + "accountType": "Standard_LRS", + "creationTime": "2018-01-17T02:10:12.47" + } + }, + { + "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/resourcegroups/System.local/providers/Microsoft.Storage.Admin/storageaccounts/0a6b4f6b1de14cc08aa1fefadcc481eb", + "type": "Microsoft.Storage.Admin/storageaccounts", + "name": "0a6b4f6b1de14cc08aa1fefadcc481eb", + "location": "local", + "properties": { + "provisioningState": "Succeeded", + "primaryEndpoints": { + "blob": "https://frphealthaccount.blob.local.azurestack.external/", + "queue": "https://frphealthaccount.queue.local.azurestack.external/", + "table": "https://frphealthaccount.table.local.azurestack.external/" + }, + "primaryLocation": "local", + "statusOfPrimary": "Available", + "tenantViewId": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/resourcegroups/system.local/providers/Microsoft.Storage/storageaccounts/frphealthaccount", + "tenantSubscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2", + "tenantStorageAccountName": "frphealthaccount", + "tenantResourceGroupName": "system.local", + "accountStatus": "Active", + "permissions": "Full", + "accountId": "0a6b4f6b1de14cc08aa1fefadcc481eb", + "wacInternalState": "Active", + "accountType": "Standard_LRS", + "creationTime": "2018-01-17T02:10:02.527" + } + }, + { + "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/resourcegroups/System.local/providers/Microsoft.Storage.Admin/storageaccounts/0d724e3f75004e48948c1bfa0b4a964a", + "type": "Microsoft.Storage.Admin/storageaccounts", + "name": "0d724e3f75004e48948c1bfa0b4a964a", + "location": "local", + "properties": { + "provisioningState": "Succeeded", + "primaryEndpoints": { + "blob": "https://systemgallery.blob.local.azurestack.external/", + "queue": "https://systemgallery.queue.local.azurestack.external/", + "table": "https://systemgallery.table.local.azurestack.external/" + }, + "primaryLocation": "local", + "statusOfPrimary": "Available", + "tenantViewId": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/resourcegroups/system.local/providers/Microsoft.Storage/storageaccounts/systemgallery", + "tenantSubscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2", + "tenantStorageAccountName": "systemgallery", + "tenantResourceGroupName": "system.local", + "accountStatus": "Active", + "permissions": "Full", + "accountId": "0d724e3f75004e48948c1bfa0b4a964a", + "wacInternalState": "Active", + "accountType": "Standard_LRS", + "creationTime": "2018-01-17T01:56:29.467" + } + }, + { + "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/resourcegroups/System.local/providers/Microsoft.Storage.Admin/storageaccounts/0dda0879146341178603ba151d7da010", + "type": "Microsoft.Storage.Admin/storageaccounts", + "name": "0dda0879146341178603ba151d7da010", + "location": "local", + "properties": { + "provisioningState": "Succeeded", + "primaryEndpoints": { + "blob": "https://nrpeventsaccount.blob.local.azurestack.external/", + "queue": "https://nrpeventsaccount.queue.local.azurestack.external/", + "table": "https://nrpeventsaccount.table.local.azurestack.external/" + }, + "primaryLocation": "local", + "statusOfPrimary": "Available", + "tenantViewId": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/resourcegroups/system.local/providers/Microsoft.Storage/storageaccounts/nrpeventsaccount", + "tenantSubscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2", + "tenantStorageAccountName": "nrpeventsaccount", + "tenantResourceGroupName": "system.local", + "accountStatus": "Active", + "permissions": "Full", + "accountId": "0dda0879146341178603ba151d7da010", + "wacInternalState": "Active", + "accountType": "Standard_LRS", + "creationTime": "2018-01-17T02:10:23.84" + } + }, + { + "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/resourcegroups/System.local/providers/Microsoft.Storage.Admin/storageaccounts/15612011f6094654abcb6031a4394ef5", + "type": "Microsoft.Storage.Admin/storageaccounts", + "name": "15612011f6094654abcb6031a4394ef5", + "location": "local", + "properties": { + "provisioningState": "Succeeded", + "primaryEndpoints": { + "blob": "https://kvrphealthaccount.blob.local.azurestack.external/", + "queue": "https://kvrphealthaccount.queue.local.azurestack.external/", + "table": "https://kvrphealthaccount.table.local.azurestack.external/" + }, + "primaryLocation": "local", + "statusOfPrimary": "Available", + "tenantViewId": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/resourcegroups/system.local/providers/Microsoft.Storage/storageaccounts/kvrphealthaccount", + "tenantSubscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2", + "tenantStorageAccountName": "kvrphealthaccount", + "tenantResourceGroupName": "system.local", + "accountStatus": "Active", + "permissions": "Full", + "accountId": "15612011f6094654abcb6031a4394ef5", + "wacInternalState": "Active", + "accountType": "Standard_LRS", + "creationTime": "2018-01-17T02:10:36.193" + } + }, + { + "id": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/resourcegroups/System.local/providers/Microsoft.Storage.Admin/storageaccounts/17829fa81c154239ad8a6fae05f44793", + "type": "Microsoft.Storage.Admin/storageaccounts", + "name": "17829fa81c154239ad8a6fae05f44793", + "location": "local", + "properties": { + "provisioningState": "Succeeded", + "primaryEndpoints": { + "blob": "https://srpusageaccount.blob.local.azurestack.external/", + "queue": "https://srpusageaccount.queue.local.azurestack.external/", + "table": "https://srpusageaccount.table.local.azurestack.external/" + }, + "primaryLocation": "local", + "statusOfPrimary": "Available", + "tenantViewId": "/subscriptions/9ad61516-995c-4873-a21f-7e44904f0ed2/resourcegroups/system.local/providers/Microsoft.Storage/storageaccounts/srpusageaccount", + "tenantSubscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2", + "tenantStorageAccountName": "srpusageaccount", + "tenantResourceGroupName": "system.local", + "accountStatus": "Active", + "permissions": "Full", + "accountId": "17829fa81c154239ad8a6fae05f44793", + "wacInternalState": "Active", + "accountType": "Standard_LRS", + "creationTime": "2018-01-17T02:10:15.38" + } + } + ] + } + } + } +} diff --git a/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/examples/StorageAccounts/ReclaimStorageCapacity.json b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/examples/StorageAccounts/ReclaimStorageCapacity.json new file mode 100644 index 000000000000..5cf745510f13 --- /dev/null +++ b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/examples/StorageAccounts/ReclaimStorageCapacity.json @@ -0,0 +1,11 @@ +{ + "parameters": { + "subscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2", + "location": "local", + "api-version": "2019-08-08-preview" + }, + "responses": { + "200": {}, + "202": {} + } +} diff --git a/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/examples/StorageAccounts/Undelete.json b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/examples/StorageAccounts/Undelete.json new file mode 100644 index 000000000000..c4a30491f691 --- /dev/null +++ b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/examples/StorageAccounts/Undelete.json @@ -0,0 +1,17 @@ +{ + "parameters": { + "subscriptionId": "9ad61516-995c-4873-a21f-7e44904f0ed2", + "location": "local", + "accountId": "f93c9df9e7af487fbda484a9201d9c18", + "api-version": "2019-08-08-preview", + "summary": "false" + }, + "responses": { + "200": { + "body": { + "accountId": "80d458ce4ecd47888b54aaa277800748" + } + }, + "202": {} + } +} diff --git a/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/quotas.json b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/quotas.json new file mode 100644 index 000000000000..7155df97cde7 --- /dev/null +++ b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/quotas.json @@ -0,0 +1,268 @@ +{ + "swagger": "2.0", + "info": { + "version": "2019-08-08-preview", + "title": "StorageManagementClient", + "description": "The Admin Storage Management Client." + }, + "host": "adminmanagement.local.azurestack.external", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "paths": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Storage.Admin/locations/{location}/quotas/{quotaName}": { + "put": { + "x-ms-examples": { + "Create or update an existing storage quota.": { + "$ref": "./examples/Quotas/CreateOrUpdate.json" + } + }, + "tags": [ + "StorageQuotas" + ], + "description": "Create or update an existing storage quota.", + "operationId": "StorageQuotas_CreateOrUpdate", + "parameters": [ + { + "$ref": "storage.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "storage.json#/parameters/LocationParameter" + }, + { + "$ref": "storage.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/QuotaNameParameter" + }, + { + "$ref": "#/parameters/StorageQuotaParameters" + } + ], + "responses": { + "200": { + "description": "OK -- The storage quota has been created or updated.", + "schema": { + "$ref": "#/definitions/StorageQuota" + } + }, + "default": { + "description": "Error Response.", + "schema": { + "$ref": "storage.json#/definitions/ErrorResponse" + } + } + } + }, + "delete": { + "x-ms-examples": { + "Delete an existing storage quota.": { + "$ref": "./examples/Quotas/Delete.json" + } + }, + "tags": [ + "StorageQuotas" + ], + "description": "Delete an existing quota", + "operationId": "StorageQuotas_Delete", + "parameters": [ + { + "$ref": "storage.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "storage.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "storage.json#/parameters/LocationParameter" + }, + { + "$ref": "#/parameters/QuotaNameParameter" + } + ], + "responses": { + "200": { + "description": "OK -- The storage quota has been deleted." + }, + "default": { + "description": "Error Response.", + "schema": { + "$ref": "storage.json#/definitions/ErrorResponse" + } + } + } + }, + "get": { + "x-ms-examples": { + "Returns the specified storage quota.": { + "$ref": "./examples/Quotas/Get.json" + } + }, + "tags": [ + "StorageQuotas" + ], + "description": "Returns the specified storage quota.", + "operationId": "StorageQuotas_Get", + "parameters": [ + { + "$ref": "storage.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "storage.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "storage.json#/parameters/LocationParameter" + }, + { + "$ref": "#/parameters/QuotaNameParameter" + } + ], + "responses": { + "200": { + "description": "OK -- The storage quota has been returned.", + "schema": { + "$ref": "#/definitions/StorageQuota" + } + }, + "default": { + "description": "Error Response.", + "schema": { + "$ref": "storage.json#/definitions/ErrorResponse" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Storage.Admin/locations/{location}/quotas": { + "get": { + "x-ms-examples": { + "Returns a list of storage quotas at the given location.": { + "$ref": "./examples/Quotas/List.json" + } + }, + "tags": [ + "StorageQuotas" + ], + "description": "Returns a list of storage quotas at the given location.", + "operationId": "StorageQuotas_List", + "parameters": [ + { + "$ref": "storage.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "storage.json#/parameters/LocationParameter" + }, + { + "$ref": "storage.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK -- The list of storage quotas has been returned.", + "schema": { + "$ref": "#/definitions/StorageQuotaList" + } + }, + "default": { + "description": "Error Response.", + "schema": { + "$ref": "storage.json#/definitions/ErrorResponse" + } + } + } + } + } + }, + "definitions": { + "StorageQuota": { + "description": "Storage quota.", + "type": "object", + "properties": { + "properties": { + "description": "Storage quota properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/StorageQuotaProperties" + } + }, + "allOf": [ + { + "$ref": "storage.json#/definitions/Resource" + } + ] + }, + "StorageQuotaProperties": { + "description": "Storage quota properties.", + "type": "object", + "properties": { + "numberOfStorageAccounts": { + "description": "Total number of storage accounts.", + "type": "integer", + "format": "int32", + "default": 20 + }, + "capacityInGb": { + "description": "Maximum capacity (GB).", + "type": "integer", + "format": "int32", + "default": 500 + } + } + }, + "StorageQuotaList": { + "description": "Pageable list of storage quotas.", + "type": "object", + "properties": { + "value": { + "description": "List of storage quotas.", + "type": "array", + "items": { + "$ref": "#/definitions/StorageQuota" + } + } + } + } + }, + "parameters": { + "QuotaNameParameter": { + "description": "The name of the storage quota.", + "name": "quotaName", + "in": "path", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + }, + "StorageQuotaParameters": { + "description": "The properties of quota being created or updated.", + "name": "quotaObject", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/StorageQuota" + }, + "x-ms-parameter-location": "method" + } + }, + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Authorization uses an Azure Active Directory OAuth2 flow.", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ] +} diff --git a/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/settings.json b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/settings.json new file mode 100644 index 000000000000..3f9431507cc3 --- /dev/null +++ b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/settings.json @@ -0,0 +1,154 @@ +{ + "swagger": "2.0", + "info": { + "version": "2019-08-08-preview", + "title": "StorageManagementClient", + "description": "The Admin Storage Management Client." + }, + "host": "adminmanagement.local.azurestack.external", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "paths": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Storage.Admin/locations/{location}/settings": { + "put": { + "x-ms-examples": { + "Update srp settings.": { + "$ref": "./examples/Settings/Update.json" + } + }, + "tags": [ + "Settings" + ], + "description": "Update storage resource provider settings.", + "operationId": "StorageSettings_Update", + "parameters": [ + { + "$ref": "storage.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "storage.json#/parameters/LocationParameter" + }, + { + "$ref": "storage.json#/parameters/ApiVersionParameter" + }, + { + "description": "Parameters used to update storage resource provider settings", + "name": "settingsObject", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/Settings" + } + } + ], + "responses": { + "200": { + "description": "OK -- The new storage resource provider setting is updated.", + "schema": { + "$ref": "#/definitions/Settings" + } + }, + "default": { + "description": "Error Response.", + "schema": { + "$ref": "storage.json#/definitions/ErrorResponse" + } + } + } + }, + "get": { + "x-ms-examples": { + "Returns the storage resource provider settings.": { + "$ref": "./examples/Settings/Get.json" + } + }, + "tags": [ + "Settings" + ], + "description": "Returns the storage resource provider settings.", + "operationId": "StorageSettings_Get", + "parameters": [ + { + "$ref": "storage.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "storage.json#/parameters/LocationParameter" + }, + { + "$ref": "storage.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK -- The settings has been returned.", + "schema": { + "$ref": "#/definitions/Settings" + } + }, + "default": { + "description": "Error Response.", + "schema": { + "$ref": "storage.json#/definitions/ErrorResponse" + } + } + } + } + } + }, + "definitions": { + "SettingProperties": { + "description": "Properties of storage setting.", + "type": "object", + "properties": { + "retentionPeriodForDeletedStorageAccountsInDays": { + "description": "The number of days a deleted storage account is kept before being permanently deleted.", + "type": "integer", + "format": "int32" + } + } + }, + "Settings": { + "description": "Storage resource provider settings", + "type": "object", + "properties": { + "properties": { + "description": "Properties of the storage account.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/SettingProperties", + "readOnly": true + } + }, + "allOf": [ + { + "$ref": "storage.json#/definitions/Resource" + } + ] + } + }, + "parameters": {}, + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Authorization uses an Azure Active Directory OAuth2 flow.", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ] +} diff --git a/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/storage.json b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/storage.json new file mode 100644 index 000000000000..18e6d0c4e45d --- /dev/null +++ b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/storage.json @@ -0,0 +1,205 @@ +{ + "swagger": "2.0", + "info": { + "version": "2019-08-08-preview", + "title": "StorageManagementClient", + "description": "The Admin Storage Management Client." + }, + "host": "adminmanagement.local.azurestack.external", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "paths": { + "/providers/Microsoft.Storage.Admin/operations": { + "get": { + "x-ms-examples": { + "Get the list of support rest operations.": { + "$ref": "./examples/Operations/List.json" + } + }, + "description": "Get the list of support rest operations.", + "tags": [ + "Commerce" + ], + "operationId": "Operations_List", + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK -- The list of operations has been returned.", + "schema": { + "$ref": "#/definitions/OperationList" + } + }, + "default": { + "description": "Error Response.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + } + }, + "definitions": { + "Operation": { + "description": "Describes the supported REST operation.", + "properties": { + "name": { + "description": "The name of the operation being performed on this particular object. It should match the action name that appears in RBAC / the event service.", + "type": "string", + "readOnly": true + }, + "display": { + "description": "Contains the localized display information for this particular operation / action.", + "$ref": "#/definitions/Display", + "readOnly": true + } + } + }, + "Display": { + "description": "Contains the localized display information for this particular operation / action.", + "properties": { + "provider": { + "description": "The localized friendly form of the resource provider name – it is expected to also include the publisher/company responsible. It should use Title Casing and begin with \"Microsoft\" for 1st party services. e.g. \"Microsoft Monitoring Insights\" or \"Microsoft Compute.\"", + "type": "string", + "readOnly": true + }, + "resource": { + "description": "The localized friendly form of the resource type related to this action/operation – it should match the public documentation for the resource provider.", + "type": "string", + "readOnly": true + }, + "operation": { + "description": "The localized friendly name for the operation, as it should be shown to the user.", + "type": "string", + "readOnly": true + }, + "description": { + "description": "The localized friendly description for the operation, as it should be shown to the user. It should be thorough, yet concise – it will be used in tool tips and detailed views.", + "type": "string", + "readOnly": true + } + } + }, + "OperationList": { + "description": "Pageable list of supported operations.", + "properties": { + "value": { + "description": "List of operations", + "type": "array", + "items": { + "$ref": "#/definitions/Operation" + } + } + } + }, + "ErrorResponse": { + "description": "The error response for request which failed.", + "type": "object", + "properties": { + "code": { + "description": "The error description code.", + "type": "string", + "readOnly": true + }, + "message": { + "description": "The error description message.", + "type": "string", + "readOnly": true + }, + "target": { + "description": "The error target description.", + "type": "string", + "readOnly": true + }, + "details": { + "description": "The error details information.", + "type": "array", + "items": { + "type": "string" + }, + "readOnly": true + } + } + }, + "Resource": { + "description": "Base resource object.", + "type": "object", + "properties": { + "id": { + "description": "Resource ID.", + "type": "string", + "readOnly": true + }, + "name": { + "description": "Resource Name.", + "type": "string", + "readOnly": true + }, + "type": { + "description": "Resource Type.", + "type": "string", + "readOnly": true + }, + "location": { + "description": "Resource Location.", + "type": "string", + "readOnly": true + } + }, + "x-ms-azure-resource": true + } + }, + "parameters": { + "ApiVersionParameter": { + "description": "REST Api Version.", + "name": "api-version", + "type": "string", + "in": "query", + "required": true + }, + "LocationParameter": { + "description": "Resource location.", + "name": "location", + "type": "string", + "in": "path", + "required": true, + "x-ms-parameter-location": "method" + }, + "SubscriptionIdParameter": { + "description": "Subscription Id.", + "name": "subscriptionId", + "type": "string", + "in": "path", + "required": true + } + }, + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Authorization uses an Azure Active Directory OAuth2 flow.", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ] +} diff --git a/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/storageaccounts.json b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/storageaccounts.json new file mode 100644 index 000000000000..ddebe4a38cbd --- /dev/null +++ b/specification/azsadmin/resource-manager/storage/Microsoft.Storage.Admin/preview/2019-08-08/storageaccounts.json @@ -0,0 +1,569 @@ +{ + "swagger": "2.0", + "info": { + "version": "2019-08-08-preview", + "title": "StorageManagementClient", + "description": "The Admin Storage Management Client." + }, + "host": "adminmanagement.local.azurestack.external", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "paths": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Storage.Admin/locations/{location}/storageaccounts": { + "get": { + "x-ms-examples": { + "Returns a list of storage accounts.": { + "$ref": "./examples/StorageAccounts/List.json" + } + }, + "tags": [ + "StorageAccounts" + ], + "operationId": "StorageAccounts_List", + "description": "Returns a list of storage accounts.", + "parameters": [ + { + "$ref": "storage.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "storage.json#/parameters/LocationParameter" + }, + { + "$ref": "storage.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/FilterParameter" + }, + { + "$ref": "#/parameters/SummaryParameter" + } + ], + "responses": { + "200": { + "description": "OK -- The list of storage accounts has been returned.", + "schema": { + "$ref": "#/definitions/StorageAccountList" + } + }, + "default": { + "description": "Error Response.", + "schema": { + "$ref": "storage.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "@odata.nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Storage.Admin/locations/{location}/storageaccounts/{accountId}": { + "get": { + "x-ms-examples": { + "Returns the requested storage account.": { + "$ref": "./examples/StorageAccounts/Get.json" + } + }, + "tags": [ + "StorageAccounts" + ], + "operationId": "StorageAccounts_Get", + "description": "Returns the requested storage account.", + "parameters": [ + { + "$ref": "storage.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "storage.json#/parameters/LocationParameter" + }, + { + "$ref": "#/parameters/AccountIdParameter" + }, + { + "$ref": "storage.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK -- The storage account has been returned.", + "schema": { + "$ref": "#/definitions/StorageAccount" + } + }, + "default": { + "description": "Error Response.", + "schema": { + "$ref": "storage.json#/definitions/ErrorResponse" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Storage.Admin/locations/{location}/storageaccounts/{accountId}/undelete": { + "post": { + "x-ms-examples": { + "Undelete a deleted storage account.": { + "$ref": "./examples/StorageAccounts/Undelete.json" + } + }, + "tags": [ + "StorageAccounts" + ], + "operationId": "StorageAccounts_Undelete", + "description": "Undelete a deleted storage account with new account name if the a new name is provided.", + "parameters": [ + { + "$ref": "storage.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "storage.json#/parameters/LocationParameter" + }, + { + "$ref": "#/parameters/AccountIdParameter" + }, + { + "$ref": "storage.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/NewAccountNameParameter" + } + ], + "responses": { + "200": { + "description": "OK -- Undelete either has been performed or account was not deleted.", + "schema": { + "$ref": "#/definitions/UndeleteStorageAccount" + } + }, + "202": { + "description": "Accepted -- undelete operation trigged; operation will complete asynchronously." + }, + "default": { + "description": "Error Response.", + "schema": { + "$ref": "storage.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "location" + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Storage.Admin/locations/{location}/reclaimStorageCapacity": { + "post": { + "x-ms-examples": { + "Start reclaim storage capacity on deleted storage objects.": { + "$ref": "./examples/StorageAccounts/ReclaimStorageCapacity.json" + } + }, + "tags": [ + "StorageAccounts" + ], + "operationId": "StorageAccounts_ReclaimStorageCapacity", + "description": "Start reclaim storage capacity on deleted storage objects.", + "parameters": [ + { + "$ref": "storage.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "storage.json#/parameters/LocationParameter" + }, + { + "$ref": "storage.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK -- Reclaim storage capacity has completed." + }, + "202": { + "description": "Accepted -- reclaim storage capacity operation triggered; operation will complete asynchronously." + }, + "default": { + "description": "Error Response.", + "schema": { + "$ref": "storage.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-long-running-operation": true + } + } + }, + "definitions": { + "StorageAccountState": { + "readOnly": true, + "description": "Storage account state.", + "type": "string", + "enum": [ + "Creating", + "Succeeded", + "Suspended" + ], + "x-ms-enum": { + "name": "StorageAccountState", + "modelAsString": true + } + }, + "StorageAccountType": { + "description": "Storage account type.", + "type": "string", + "enum": [ + "Standard_LRS", + "Standard_GRS", + "Standard_ZRS", + "Standard_RAGRS", + "Premium_LRS" + ], + "x-ms-enum": { + "name": "StorageAccountType", + "modelAsString": true + } + }, + "LocationStatus": { + "readOnly": true, + "type": "string", + "description": "Gets the status indicating whether the primary location of the storage account is available or unavailable.", + "enum": [ + "Available", + "Unavailable" + ], + "x-ms-enum": { + "name": "LocationStatus", + "modelAsString": true + } + }, + "StorageAccountStatus": { + "description": "The state of storage account in WAC.", + "type": "string", + "enum": [ + "Active", + "Deleted" + ], + "x-ms-enum": { + "name": "StorageAccountStatus", + "modelAsString": true + } + }, + "WacAccountPermissions": { + "description": "Current operation being performed on Storage Account", + "type": "string", + "enum": [ + "Empty", + "None", + "Read", + "Delete", + "Write", + "Full" + ], + "x-ms-enum": { + "name": "WacAccountPermissions", + "modelAsString": true + } + }, + "WacAccountStates": { + "description": "Current operation being performed on Storage Account", + "type": "string", + "enum": [ + "None", + "Active", + "Deleted", + "AboveQuota", + "Suspended", + "All", + "GcReadyState" + ], + "x-ms-enum": { + "name": "WacAccountStates", + "modelAsString": true + } + }, + "StorageEncryptionSetting": { + "description": "Storage Encryption setting", + "type": "object", + "properties": { + "enabled": { + "description": "Bool to indicate whether enabled or not.", + "type": "boolean", + "readOnly": true + }, + "lastEnabledTime": { + "description": "A rough estimate of the date/time when the encryption was last enabled by the user.", + "type": "string", + "readOnly": true + } + } + }, + "StorageEncryptionServices": { + "description": "Services for which encryption setting is mentioned.", + "type": "object", + "properties": { + "blob": { + "description": "Blob service.", + "$ref": "#/definitions/StorageEncryptionSetting", + "readOnly": true + }, + "table": { + "description": "Table service.", + "$ref": "#/definitions/StorageEncryptionSetting", + "readOnly": true + }, + "queue": { + "description": "Queue service", + "$ref": "#/definitions/StorageEncryptionSetting", + "readOnly": true + } + } + }, + "EncryptionKeySource": { + "description": "Encryption Key Source", + "type": "string", + "enum": [ + "Microsoft.Storage" + ], + "x-ms-enum": { + "name": "EncryptionKeySource", + "modelAsString": true + } + }, + "StorageEncryption": { + "description": "Storage encryption setting", + "type": "object", + "properties": { + "services": { + "description": "Services for which encryption setting is mentioned", + "$ref": "#/definitions/StorageEncryptionServices", + "readOnly": true + }, + "keySource": { + "description": "Encryption keySource", + "$ref": "#/definitions/EncryptionKeySource", + "readOnly": true + } + } + }, + "StorageAccountProperties": { + "description": "Properties of a storage account.", + "type": "object", + "properties": { + "tenantViewId": { + "description": "Resource URI of storage account from tenant view.", + "type": "string", + "readOnly": true + }, + "accountType": { + "description": "Storage account type.", + "$ref": "#/definitions/StorageAccountType", + "readOnly": true + }, + "provisioningState": { + "description": "The provisioning state of storage account.", + "$ref": "#/definitions/StorageAccountState", + "readOnly": true + }, + "primaryEndpoints": { + "description": "The URLs that are used to perform a retrieval of a public BLOB, queue, or table object.", + "additionalProperties": { + "type": "string" + }, + "readOnly": true + }, + "creationTime": { + "description": "The creation date and time of storage account in UTC.", + "type": "string", + "readOnly": true + }, + "alternateName": { + "description": "Alternative storage account name being used during undelete operation.", + "type": "string", + "readOnly": true + }, + "primaryLocation": { + "description": "The primary location for the storage account.", + "type": "string", + "readOnly": true + }, + "faultDomain": { + "description": "The fault domain for the storage account.", + "type": "string", + "readOnly": true + }, + "statusOfPrimary": { + "description": "The status of primary location of storage account.", + "$ref": "#/definitions/LocationStatus", + "readOnly": true + }, + "tenantSubscriptionId": { + "description": "Subscription ID of the subscription under which the storage account locates.", + "type": "string", + "readOnly": true + }, + "tenantStorageAccountName": { + "description": "Storage account name from tenant view.", + "type": "string", + "readOnly": true + }, + "tenantResourceGroupName": { + "description": "The name of resource group under which the storage account locates.", + "type": "string", + "readOnly": true + }, + "deletedTime": { + "description": "The date-time when the storage account was deleted.", + "type": "string", + "format": "date-time", + "readOnly": true + }, + "accountStatus": { + "$ref": "#/definitions/StorageAccountStatus", + "description": "The status of storage account." + }, + "permissions": { + "description": "The permissions on the storage account.", + "$ref": "#/definitions/WacAccountPermissions", + "readOnly": true + }, + "accountId": { + "description": "Internal storage account ID, which is not visible to tenant.", + "type": "string", + "readOnly": true + }, + "wacInternalState": { + "description": "The internal state of storage account in WAC.", + "$ref": "#/definitions/WacAccountStates", + "readOnly": true + }, + "encryption": { + "description": "The storage encryption setting", + "$ref": "#/definitions/StorageEncryption", + "readOnly": true + }, + "supportsHttpsTrafficOnly": { + "description": "Storage account supports https traffic only or not", + "type": "boolean", + "readOnly": true + } + } + }, + "StorageAccount": { + "description": "Properties of the storage account.", + "type": "object", + "properties": { + "properties": { + "description": "Properties of the storage account.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/StorageAccountProperties", + "readOnly": true + }, + "tags": { + "description": "Resource tags.", + "type": "object", + "additionalProperties": { + "type": "string" + }, + "readOnly": true + } + }, + "allOf": [ + { + "$ref": "storage.json#/definitions/Resource" + } + ] + }, + "StorageAccountList": { + "description": "Pageable list of storage accounts.", + "type": "object", + "properties": { + "value": { + "description": "List of storage accounts.", + "type": "array", + "items": { + "$ref": "#/definitions/StorageAccount" + }, + "readOnly": true + }, + "@odata.nextLink": { + "description": "URI to the next page.", + "type": "string", + "readOnly": true + } + } + }, + "UndeleteStorageAccount": { + "description": "Undelete storage account information.", + "type": "object", + "properties": { + "accountId": { + "description": "The internal wac id for storage account.", + "type": "string", + "readOnly": true + }, + "newAccountName": { + "description": "The new account name for the restored account if defined.", + "type": "string", + "readOnly": true + } + } + } + }, + "parameters": { + "AccountIdParameter": { + "description": "Internal storage account ID, which is not visible to tenant.", + "name": "accountId", + "in": "path", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + }, + "NewAccountNameParameter": { + "description": "New storage account name when doing undelete storage account operation.", + "name": "newAccountName", + "in": "query", + "required": false, + "type": "string", + "x-ms-parameter-location": "method" + }, + "SummaryParameter": { + "description": "Switch for whether summary or detailed information is returned.", + "name": "summary", + "in": "query", + "required": false, + "type": "boolean", + "x-ms-parameter-location": "method" + }, + "FilterParameter": { + "description": "Filter string", + "name": "$filter", + "type": "string", + "in": "query", + "x-ms-parameter-location": "method" + } + }, + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Authorization uses an Azure Active Directory OAuth2 flow.", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ] +} diff --git a/specification/azsadmin/resource-manager/storage/readme.md b/specification/azsadmin/resource-manager/storage/readme.md index 41e4e0d1831e..14d381d78530 100644 --- a/specification/azsadmin/resource-manager/storage/readme.md +++ b/specification/azsadmin/resource-manager/storage/readme.md @@ -24,24 +24,36 @@ These are the global settings for the Storage API. title: StorageAdminClient description: Storage Admin Client openapi-type: arm -tag: package-2015-12-01 +tag: package-2019-08-08 ``` +### Tag: package-2019-08-08 + +These settings apply only when `--tag=package-2019-08-08` is specified on the command line. + +``` yaml $(tag) == 'package-2019-08-08' +input-file: + - "Microsoft.Storage.Admin/preview/2019-08-08/storageaccounts.json" + - "Microsoft.Storage.Admin/preview/2019-08-08/quotas.json" + - "Microsoft.Storage.Admin/preview/2019-08-08/settings.json" + - "Microsoft.Storage.Admin/preview/2019-08-08/storage.json" + - "Microsoft.Storage.Admin/preview/2019-08-08/acquisitions.json" +``` ### Tag: package-2015-12-01 These settings apply only when `--tag=package-2015-12-01` is specified on the command line. ``` yaml $(tag) == 'package-2015-12-01' input-file: + - "Microsoft.Storage.Admin/preview/2015-12-01/storageaccounts.json" + - "Microsoft.Storage.Admin/preview/2015-12-01/quotas.json" - "Microsoft.Storage.Admin/preview/2015-12-01/storage.json" - "Microsoft.Storage.Admin/preview/2015-12-01/acquisitions.json" - "Microsoft.Storage.Admin/preview/2015-12-01/blobServices.json" - "Microsoft.Storage.Admin/preview/2015-12-01/containers.json" - "Microsoft.Storage.Admin/preview/2015-12-01/farms.json" - "Microsoft.Storage.Admin/preview/2015-12-01/queueServices.json" - - "Microsoft.Storage.Admin/preview/2015-12-01/quotas.json" - "Microsoft.Storage.Admin/preview/2015-12-01/shares.json" - - "Microsoft.Storage.Admin/preview/2015-12-01/storageaccounts.json" - "Microsoft.Storage.Admin/preview/2015-12-01/tableServices.json" ``` diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2019-10-01-preview/billing.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2019-10-01-preview/billing.json index 041933c43746..0eae91ba79c9 100644 --- a/specification/billing/resource-manager/Microsoft.Billing/preview/2019-10-01-preview/billing.json +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2019-10-01-preview/billing.json @@ -3142,6 +3142,48 @@ } } }, + "/providers/Microsoft.Billing/transfers/{transferName}/validateTransfer": { + "post": { + "tags": [ + "RecipientTransfers" + ], + "summary": "Validates if the products can be transferred in the context of the given transfer name.", + "operationId": "RecipientTransfers_Validate", + "x-ms-examples": { + "ValidateTransfer": { + "$ref": "./examples/ValidateTransfer.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/transferNameParameter" + }, + { + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/AcceptTransferRequest" + }, + "description": "Parameters supplied to validate the transfer." + } + ], + "responses": { + "200": { + "description": "Results of the transfer validation.", + "schema": { + "$ref": "#/definitions/ValidateTransferListResponse" + } + }, + "default": { + "description": "Unexpected error.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, "/providers/Microsoft.Billing/transfers/{transferName}/declineTransfer": { "post": { "tags": [ @@ -6766,6 +6808,73 @@ } } }, + "ValidateTransferListResponse": { + "description": "Result of transfer validation.", + "properties": { + "value": { + "description": "The list of transfer validation results.", + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/ValidateTransferResponse" + } + } + } + }, + "ValidateTransferResponse": { + "type": "object", + "description": "Transfer validation response.", + "properties": { + "properties": { + "description": "Transfer validation response properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/ValidateTransferResponseProperties" + } + } + }, + "ValidateTransferResponseProperties": { + "type": "object", + "description": "Properties of transfer validation response.", + "properties": { + "status": { + "description": "The status of validation", + "type": "string", + "readOnly": true + }, + "productId": { + "description": "The product id for which this result applies.", + "type": "string", + "readOnly": true + }, + "results": { + "description": "Array of validation results.", + "type": "array", + "items": { + "$ref": "#/definitions/ValidationResultProperties" + } + } + } + }, + "ValidationResultProperties": { + "description": "The properties of the validation result.", + "properties": { + "level": { + "description": "Result Level.", + "type": "string", + "readOnly": true + }, + "code": { + "description": "Result Code.", + "type": "string", + "readOnly": true + }, + "message": { + "description": "The validation message.", + "type": "string", + "readOnly": true + } + } + }, "Participants": { "description": "Details about the participant or signer.", "properties": { @@ -7010,4 +7119,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2019-10-01-preview/examples/ValidateTransfer.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2019-10-01-preview/examples/ValidateTransfer.json new file mode 100644 index 000000000000..71676be98274 --- /dev/null +++ b/specification/billing/resource-manager/Microsoft.Billing/preview/2019-10-01-preview/examples/ValidateTransfer.json @@ -0,0 +1,41 @@ +{ + "parameters": { + "api-version": "2019-10-01-preview", + "transferName": "transferName", + "parameters": { + "properties": { + "productDetails": [ + { + "productType": "AzureSubscription", + "productId": "subscriptionId" + }, + { + "productType": "AzureReservation", + "productId": "reservedInstanceId" + } + ] + } + } + }, + "responses": { + "200": { + "body": { + "value": [ + { + "properties": { + "productId": "subscriptionId", + "status": "Failed", + "results": [ + { + "level": "Error", + "code": "NotIntendedRecipient", + "message": "Intented recipient is different." + } + ] + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/compute/resource-manager/readme.md b/specification/compute/resource-manager/readme.md index efc79794cd48..77f0c0d7fc65 100644 --- a/specification/compute/resource-manager/readme.md +++ b/specification/compute/resource-manager/readme.md @@ -133,7 +133,7 @@ directive: - where: - $.definitions.DedicatedHostUpdate suppress: - - RequiredPropertiesMissingInResourceModel + - RequiredPropertiesMissingInResourceModel - where: - $.definitions.VirtualMachineScaleSetVM diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/IntegrationRuntime.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/IntegrationRuntime.json index ad3967204e8a..76d990e2fb31 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/IntegrationRuntime.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/IntegrationRuntime.json @@ -362,7 +362,10 @@ }, "additionalProperties": { "type": "object" - } + }, + "required": [ + "type" + ] }, "IntegrationRuntimeState": { "description": "The state of integration runtime.", @@ -1039,7 +1042,10 @@ "type": "string", "description": "Metadata description." } - } + }, + "required": [ + "type" + ] }, "SsisObjectMetadataType": { "description": "The type of SSIS object metadata.", diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json index b9c85eab0646..86582a37911e 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json @@ -530,6 +530,7 @@ }, "StoreWriteSettings": { "description": "Connector write settings.", + "discriminator": "type", "type": "object", "properties": { "type": { @@ -559,7 +560,13 @@ { "$ref": "#/definitions/StoreWriteSettings" } - ] + ], + "properties": { + "blockSizeInMB": { + "description": "Indicates the block size(MB) when writing data to blob. Type: integer (or Expression with resultType integer).", + "type": "object" + } + } }, "AzureBlobFSWriteSettings": { "description": "Azure blobFS write settings.", @@ -568,7 +575,13 @@ { "$ref": "#/definitions/StoreWriteSettings" } - ] + ], + "properties": { + "blockSizeInMB": { + "description": "Indicates the block size(MB) when writing data to blob. Type: integer (or Expression with resultType integer).", + "type": "object" + } + } }, "AzureDataLakeStoreWriteSettings": { "description": "Azure data lake store write settings.", @@ -2663,10 +2676,6 @@ "maxConcurrentConnections": { "type": "object", "description": "The maximum concurrent connection count for the sink data store. Type: integer (or Expression with resultType integer)." - }, - "tableOption": { - "type": "object", - "description": "The option to handle sink table, such as autoCreate. For now only 'autoCreate' value is supported. Type: string (or Expression with resultType string)." } }, "additionalProperties": { @@ -2890,6 +2899,10 @@ "storedProcedureTableTypeParameterName": { "type": "object", "description": "The stored procedure parameter name of the table type. Type: string (or Expression with resultType string)." + }, + "tableOption": { + "type": "object", + "description": "The option to handle sink table, such as autoCreate. For now only 'autoCreate' value is supported. Type: string (or Expression with resultType string)." } } }, @@ -2924,6 +2937,10 @@ "storedProcedureTableTypeParameterName": { "type": "object", "description": "The stored procedure parameter name of the table type. Type: string (or Expression with resultType string)." + }, + "tableOption": { + "type": "object", + "description": "The option to handle sink table, such as autoCreate. For now only 'autoCreate' value is supported. Type: string (or Expression with resultType string)." } } }, @@ -2958,6 +2975,10 @@ "storedProcedureTableTypeParameterName": { "type": "object", "description": "The stored procedure parameter name of the table type. Type: string (or Expression with resultType string)." + }, + "tableOption": { + "type": "object", + "description": "The option to handle sink table, such as autoCreate. For now only 'autoCreate' value is supported. Type: string (or Expression with resultType string)." } } }, @@ -2992,6 +3013,10 @@ "storedProcedureTableTypeParameterName": { "type": "object", "description": "The stored procedure parameter name of the table type. Type: string (or Expression with resultType string)." + }, + "tableOption": { + "type": "object", + "description": "The option to handle sink table, such as autoCreate. For now only 'autoCreate' value is supported. Type: string (or Expression with resultType string)." } } }, @@ -3015,6 +3040,10 @@ "polyBaseSettings": { "description": "Specifies PolyBase-related settings when allowPolyBase is true.", "$ref": "#/definitions/PolybaseSettings" + }, + "tableOption": { + "type": "object", + "description": "The option to handle sink table, such as autoCreate. For now only 'autoCreate' value is supported. Type: string (or Expression with resultType string)." } } }, diff --git a/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2017-11-15-preview/definitions/Tasks.json b/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2017-11-15-preview/definitions/Tasks.json index af7c2fe56d1d..a190d98f0bfa 100644 --- a/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2017-11-15-preview/definitions/Tasks.json +++ b/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2017-11-15-preview/definitions/Tasks.json @@ -20,7 +20,6 @@ "ProjectTaskProperties": { "type": "object", "description": "Base class for all types of DMS task properties. If task is not supported by current client, this object is returned.", - "x-ms-discriminator-value": "Unknown", "properties": { "taskType": { "description": "Task type.", diff --git a/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-03-15-preview/definitions/Tasks.json b/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-03-15-preview/definitions/Tasks.json index 13e3955198a7..0929346bb8ff 100644 --- a/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-03-15-preview/definitions/Tasks.json +++ b/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-03-15-preview/definitions/Tasks.json @@ -20,7 +20,6 @@ "ProjectTaskProperties": { "type": "object", "description": "Base class for all types of DMS task properties. If task is not supported by current client, this object is returned.", - "x-ms-discriminator-value": "Unknown", "properties": { "taskType": { "description": "Task type.", diff --git a/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-03-31-preview/definitions/Tasks.json b/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-03-31-preview/definitions/Tasks.json index 40350b3f721f..67281236879f 100644 --- a/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-03-31-preview/definitions/Tasks.json +++ b/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-03-31-preview/definitions/Tasks.json @@ -20,7 +20,6 @@ "ProjectTaskProperties": { "type": "object", "description": "Base class for all types of DMS task properties. If task is not supported by current client, this object is returned.", - "x-ms-discriminator-value": "Unknown", "properties": { "taskType": { "description": "Task type.", diff --git a/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-07-15-preview/definitions/Commands.json b/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-07-15-preview/definitions/Commands.json index defe9abbb3b6..92af6a9a11dd 100644 --- a/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-07-15-preview/definitions/Commands.json +++ b/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-07-15-preview/definitions/Commands.json @@ -20,7 +20,6 @@ "CommandProperties": { "type": "object", "description": "Base class for all types of DMS command properties. If command is not supported by current client, this object is returned.", - "x-ms-discriminator-value": "Unknown", "properties": { "commandType": { "description": "Command type.", diff --git a/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-07-15-preview/definitions/Files.json b/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-07-15-preview/definitions/Files.json index 3fb111285387..67d2a32d08a0 100644 --- a/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-07-15-preview/definitions/Files.json +++ b/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-07-15-preview/definitions/Files.json @@ -86,7 +86,6 @@ "FileStorageInfo": { "type": "object", "description": "File storage information.", - "x-ms-discriminator-value": "Unknown", "properties": { "uri": { "description": "A URI that can be used to access the file content.", diff --git a/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-07-15-preview/definitions/Tasks.json b/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-07-15-preview/definitions/Tasks.json index 739ff3f101bb..8c8798a0d89b 100644 --- a/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-07-15-preview/definitions/Tasks.json +++ b/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-07-15-preview/definitions/Tasks.json @@ -20,7 +20,6 @@ "ProjectTaskProperties": { "type": "object", "description": "Base class for all types of DMS task properties. If task is not supported by current client, this object is returned.", - "x-ms-discriminator-value": "Unknown", "properties": { "taskType": { "description": "Task type.", diff --git a/specification/datamigration/resource-manager/Microsoft.DataMigration/stable/2018-04-19/definitions/Commands.json b/specification/datamigration/resource-manager/Microsoft.DataMigration/stable/2018-04-19/definitions/Commands.json index d64ec7602b6f..8280bb0ca60f 100644 --- a/specification/datamigration/resource-manager/Microsoft.DataMigration/stable/2018-04-19/definitions/Commands.json +++ b/specification/datamigration/resource-manager/Microsoft.DataMigration/stable/2018-04-19/definitions/Commands.json @@ -20,7 +20,6 @@ "CommandProperties": { "type": "object", "description": "Base class for all types of DMS command properties. If command is not supported by current client, this object is returned.", - "x-ms-discriminator-value": "Unknown", "properties": { "commandType": { "description": "Command type.", diff --git a/specification/datamigration/resource-manager/Microsoft.DataMigration/stable/2018-04-19/definitions/Tasks.json b/specification/datamigration/resource-manager/Microsoft.DataMigration/stable/2018-04-19/definitions/Tasks.json index 8eeb0ef0b4a3..82b295eb649e 100644 --- a/specification/datamigration/resource-manager/Microsoft.DataMigration/stable/2018-04-19/definitions/Tasks.json +++ b/specification/datamigration/resource-manager/Microsoft.DataMigration/stable/2018-04-19/definitions/Tasks.json @@ -20,7 +20,6 @@ "ProjectTaskProperties": { "type": "object", "description": "Base class for all types of DMS task properties. If task is not supported by current client, this object is returned.", - "x-ms-discriminator-value": "Unknown", "properties": { "taskType": { "description": "Task type.", diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2017-11-03-preview/examples/SapMonitors_Get.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2017-11-03-preview/examples/SapMonitors_Get.json index 7b3044375559..25a8cbc41f9f 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2017-11-03-preview/examples/SapMonitors_Get.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2017-11-03-preview/examples/SapMonitors_Get.json @@ -23,9 +23,10 @@ "hanaDbUsername": "", "hanaDbPasswordKeyVaultUrl": "", "hanaDbCredentialsMsiId": "", - "provisioningState": "Succeeded", "managedResourceGroupName": "testManagedRg", - "logAnalyticsWorkspaceArmId": "" + "logAnalyticsWorkspaceArmId": "", + "keyVaultId": "", + "provisioningState": "Succeeded" } } } diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2017-11-03-preview/examples/SapMonitors_List.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2017-11-03-preview/examples/SapMonitors_List.json index 015168cde1cf..c24117fd378f 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2017-11-03-preview/examples/SapMonitors_List.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2017-11-03-preview/examples/SapMonitors_List.json @@ -23,9 +23,10 @@ "hanaDbUsername": "", "hanaDbPasswordKeyVaultUrl": "", "hanaDbCredentialsMsiId": "", - "provisioningState": "Succeeded", "managedResourceGroupName": "testManagedRg", - "logAnalyticsWorkspaceArmId": "" + "logAnalyticsWorkspaceArmId": "", + "keyVaultId": "", + "provisioningState": "Succeeded" } }, { @@ -44,9 +45,10 @@ "hanaDbUsername": "", "hanaDbPasswordKeyVaultUrl": "", "hanaDbCredentialsMsiId": "", - "provisioningState": "Succeeded", "managedResourceGroupName": "testManagedRg", - "logAnalyticsWorkspaceArmId": "" + "logAnalyticsWorkspaceArmId": "", + "keyVaultId": "", + "provisioningState": "Succeeded" } } ] diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2017-11-03-preview/examples/SapMonitors_PatchTags.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2017-11-03-preview/examples/SapMonitors_PatchTags.json index 58fd9e06b4c7..448423990c2c 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2017-11-03-preview/examples/SapMonitors_PatchTags.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2017-11-03-preview/examples/SapMonitors_PatchTags.json @@ -28,9 +28,10 @@ "hanaDbUsername": "", "hanaDbPasswordKeyVaultUrl": "", "hanaDbCredentialsMsiId": "", - "provisioningState": "Succeeded", "managedResourceGroupName": "testManagedRg", - "logAnalyticsWorkspaceArmId": "" + "logAnalyticsWorkspaceArmId": "", + "keyVaultId": "", + "provisioningState": "Succeeded" } } } diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2017-11-03-preview/examples/SapMonitors_PatchTags_Delete.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2017-11-03-preview/examples/SapMonitors_PatchTags_Delete.json index cec4922c8bb8..b30452d0cc35 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2017-11-03-preview/examples/SapMonitors_PatchTags_Delete.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2017-11-03-preview/examples/SapMonitors_PatchTags_Delete.json @@ -24,9 +24,10 @@ "hanaDbUsername": "", "hanaDbPasswordKeyVaultUrl": "", "hanaDbCredentialsMsiId": "", - "provisioningState": "Succeeded", "managedResourceGroupName": "testManagedRg", - "logAnalyticsWorkspaceArmId": "" + "logAnalyticsWorkspaceArmId": "", + "keyVaultId": "", + "provisioningState": "Succeeded" } } } diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2017-11-03-preview/hanaonazure.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2017-11-03-preview/hanaonazure.json index b9f1ae7b194c..262f7e50271a 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2017-11-03-preview/hanaonazure.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2017-11-03-preview/hanaonazure.json @@ -1174,6 +1174,10 @@ "type": "string", "description": "MSI ID passed by customer which has access to customer's KeyVault and to be assigned to the Collector VM." }, + "keyVaultId": { + "type": "string", + "description": "Key Vault ID containing customer's HANA credentials." + }, "provisioningState": { "readOnly": true, "type": "string", diff --git a/specification/imds/data-plane/Microsoft.InstanceMetadataService/stable/2019-08-15/examples/GetAttestedData.json b/specification/imds/data-plane/Microsoft.InstanceMetadataService/stable/2019-08-15/examples/GetAttestedData.json new file mode 100644 index 000000000000..3fc9a53805eb --- /dev/null +++ b/specification/imds/data-plane/Microsoft.InstanceMetadataService/stable/2019-08-15/examples/GetAttestedData.json @@ -0,0 +1,15 @@ +{ + "parameters": { + "api-version": "2019-08-15", + "nonce": "abcde12345", + "Metadata": "true" + }, + "responses": { + "200": { + "body": { + "encoding": "pkcs7", + "signature": "MIID2gYJKoZIhvcNAQcCoIIDyzCCA8cCAQExDzANBgkqhkiG9w0BAQsFADCBggYJKoZIhvcNAQcBoHUEc3sibm9uY2UiOiIxMTExMTExMTExIiwicGxhbiI6eyJuYW1lIjoiIiwicHJvZHVjdCI6IiIsInB1Ymxpc2hlciI6IiJ9LCJ2bUlkIjoiMDJhYWI4YTQtNzRlZi00NzZlLTgxODItZjZkMmJhNDE2NmE2In2gggI/MIICOzCCAaSgAwIBAgIQQWsFjXN35oBJKFXI3QrM3TANBgkqhkiG9w0BAQQFADArMSkwJwYDVQQDEyB0ZXN0c3ViZG9tYWluLm1ldGFkYXRhLmF6dXJlLmNvbTAeFw0xODExMDgxODUzMDRaFw0xODEyMDgxODUzMDNaMCsxKTAnBgNVBAMTIHRlc3RzdWJkb21haW4ubWV0YWRhdGEuYXp1cmUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDEi0FVslYnUX+MneC7ERMU4ZM88z4J80r7RPgvzxCPNhXUQlWm3cmVRZMD8kKMv7brkvEsATP7Ak60/I/XEtOga4LGCvMaQa8I/MW8IhSyp2Vj015glAiV8TeUI5DuOIOS96lQvM+G7bt23swkIwVjm1u1ViTZiKKytwpY/EGqzQIDAQABo2AwXjBcBgNVHQEEVTBTgBAt3MRgJmEoUMiPy7k06cLfoS0wKzEpMCcGA1UEAxMgdGVzdHN1YmRvbWFpbi5tZXRhZGF0YS5henVyZS5jb22CEEFrBY1zd+aASShVyN0KzN0wDQYJKoZIhvcNAQEEBQADgYEAd87qiZnRlGIFQ5IEcL/A7ru23WSQAOBsNPt70Fg1GtaEHcYshKUJFhGwXOgZ11cY5wRfrSvEKuzvhAeIZwkvzkBjC04g8sRrjN5leLY5CsKzQhjN52TUMsHhqTM58tfAnICeTddQwn6LOgfqtYH5WO+F/VbFCwPstYUqjmQEYAoxgegwgeUCAQEwPzArMSkwJwYDVQQDEyB0ZXN0c3ViZG9tYWluLm1ldGFkYXRhLmF6dXJlLmNvbQIQQWsFjXN35oBJKFXI3QrM3TANBgkqhkiG9w0BAQsFADANBgkqhkiG9w0BAQEFAASBgCbkRKmQ1MdWZPVOrX7ZBKHQUWPFrQQNdjk3KB67GkY0W0Taxut4K7D2PmiflVEwxB92pTbaZZr/dldu1k1ab1YamHcVYdgZgxIkoOWohGR0ym8oL9JHjFMEqHUbEPtDwE8X+djtDd8TVdb6LYe77IXmz/VaX4whuejlSvQXjaL" + } + } + } +} diff --git a/specification/imds/data-plane/Microsoft.InstanceMetadataService/stable/2019-08-15/examples/GetGalleryApplication.json b/specification/imds/data-plane/Microsoft.InstanceMetadataService/stable/2019-08-15/examples/GetGalleryApplication.json new file mode 100644 index 000000000000..59bd92b36f0f --- /dev/null +++ b/specification/imds/data-plane/Microsoft.InstanceMetadataService/stable/2019-08-15/examples/GetGalleryApplication.json @@ -0,0 +1,12 @@ +{ + "parameters": { + "api-version": "2019-08-15", + "Metadata": "true", + "incarnationId": "b845c18d-b249-4c7a-a4c3-ffdd51757ccd" + }, + "responses": { + "200": { + "body": "{application binary package}" + } + } +} diff --git a/specification/imds/data-plane/Microsoft.InstanceMetadataService/stable/2019-08-15/examples/GetIdentityInfo.json b/specification/imds/data-plane/Microsoft.InstanceMetadataService/stable/2019-08-15/examples/GetIdentityInfo.json new file mode 100644 index 000000000000..75e62200dae0 --- /dev/null +++ b/specification/imds/data-plane/Microsoft.InstanceMetadataService/stable/2019-08-15/examples/GetIdentityInfo.json @@ -0,0 +1,13 @@ +{ + "parameters": { + "api-version": "2019-08-15", + "Metadata": "true" + }, + "responses": { + "200": { + "body": { + "tenantId": "abd8daee-d393-4239-9377-883adda3d40f" + } + } + } +} diff --git a/specification/imds/data-plane/Microsoft.InstanceMetadataService/stable/2019-08-15/examples/GetIdentityToken.json b/specification/imds/data-plane/Microsoft.InstanceMetadataService/stable/2019-08-15/examples/GetIdentityToken.json new file mode 100644 index 000000000000..cc654126c6a6 --- /dev/null +++ b/specification/imds/data-plane/Microsoft.InstanceMetadataService/stable/2019-08-15/examples/GetIdentityToken.json @@ -0,0 +1,20 @@ +{ + "parameters": { + "api-version": "2019-08-15", + "Metadata": "true", + "resource": "https://vault.azure.net" + }, + "responses": { + "200": { + "body": { + "access_token": "dummytoken", + "client_id": "be5947ed-3560-4afe-9504-59967a63f810", + "expires_in": "3599", + "expires_on": "1541705014", + "ext_expires_in": "262800", + "not_before": "1508961830", + "resource": "https://va" + } + } + } +} diff --git a/specification/imds/data-plane/Microsoft.InstanceMetadataService/stable/2019-08-15/examples/GetInstanceMetadata.json b/specification/imds/data-plane/Microsoft.InstanceMetadataService/stable/2019-08-15/examples/GetInstanceMetadata.json new file mode 100644 index 000000000000..57c4cd273f4f --- /dev/null +++ b/specification/imds/data-plane/Microsoft.InstanceMetadataService/stable/2019-08-15/examples/GetInstanceMetadata.json @@ -0,0 +1,101 @@ +{ + "parameters": { + "api-version": "2019-08-15", + "Metadata": "true" + }, + "responses": { + "200": { + "body": { + "compute": { + "azEnvironment": "AZUREPUBLICCLOUD", + "location": "westus", + "name": "examplevmname", + "offer": "Windows", + "osType": "linux", + "placementGroupId": "f67c14ab-e92c-408c-ae2d-da15866ec79a", + "plan": { + "name": "planName", + "product": "planProduct", + "publisher": "planPublisher" + }, + "platformFaultDomain": "36", + "platformUpdateDomain": "42", + "publicKeys": [ + { + "keyData": "ssh-rsa 0", + "path": "/home/user/.ssh/authorized_keys0" + }, + { + "keyData": "ssh-rsa 1", + "path": "/home/user/.ssh/authorized_keys1" + } + ], + "publisher": "RDFE-Test-Microsoft-Windows-Server-Group", + "resourceGroupName": "macikgo-test-may-23", + "resourceId": "/subscriptions/8d10da13-8125-4ba9-a717-bf7490507b3d/resourceGroups/macikgo-test-may-23/providers/Microsoft.Compute/virtualMachines/examplevmname", + "sku": "Windows-Server-2012-R2-Datacenter", + "storageProfile": { + "dataDisks": [ + { + "caching": "None", + "createOption": "Empty", + "diskSizeGB": "1024", + "image": { + "uri": "" + }, + "lun": "0", + "managedDisk": { + "id": "/subscriptions/8d10da13-8125-4ba9-a717-bf7490507b3d/resourceGroups/macikgo-test-may-23/providers/Microsoft.Compute/disks/exampledatadiskname", + "storageAccountType": "Standard_LRS" + }, + "name": "exampledatadiskname", + "vhd": { + "uri": "" + }, + "writeAcceleratorEnabled": "false" + } + ], + "imageReference": { + "id": "", + "offer": "UbuntuServer", + "publisher": "Canonical", + "sku": "16.04.0-LTS", + "version": "latest" + }, + "osDisk": { + "caching": "ReadWrite", + "createOption": "FromImage", + "diskSizeGB": "30", + "diffDiskSettings": { + "option": "Local" + }, + "encryptionSettings": { + "enabled": "false" + }, + "image": { + "uri": "" + }, + "managedDisk": { + "id": "/subscriptions/8d10da13-8125-4ba9-a717-bf7490507b3d/resourceGroups/macikgo-test-may-23/providers/Microsoft.Compute/disks/exampleosdiskname", + "storageAccountType": "Standard_LRS" + }, + "name": "exampleosdiskname", + "osType": "Linux", + "vhd": { + "uri": "" + }, + "writeAcceleratorEnabled": "false" + } + }, + "subscriptionId": "8d10da13-8125-4ba9-a717-bf7490507b3d", + "tags": "baz:bash;foo:bar", + "version": "15.05.22", + "vmId": "02aab8a4-74ef-476e-8182-f6d2ba4166a6", + "vmScaleSetName": "crpteste9vflji9", + "vmSize": "Standard_A3", + "zone": "" + } + } + } + } +} diff --git a/specification/imds/data-plane/Microsoft.InstanceMetadataService/stable/2019-08-15/examples/ListGalleryApplications.json b/specification/imds/data-plane/Microsoft.InstanceMetadataService/stable/2019-08-15/examples/ListGalleryApplications.json new file mode 100644 index 000000000000..7b12a01de0e1 --- /dev/null +++ b/specification/imds/data-plane/Microsoft.InstanceMetadataService/stable/2019-08-15/examples/ListGalleryApplications.json @@ -0,0 +1,24 @@ +{ + "parameters": { + "api-version": "2019-08-15", + "Metadata": "true" + }, + "responses": { + "200": { + "body": { + "applications": [ + { + "tags": "0", + "enableHealthCheck": true, + "packageFile": { + "contentType": "zip", + "fileName": "myapp.zip", + "id": "/subscriptions/12345678-65F4-4A5A-839F-E7CFB49F1541/resourceGroups/rgName/providers/Microsoft.Compute/galleries/msit-certified/applications/application/versions/1.0", + "incarnationId": "b845c18d-b249-4c7a-a4c3-ffdd51757ccd" + } + } + ] + } + } + } +} diff --git a/specification/imds/data-plane/Microsoft.InstanceMetadataService/stable/2019-08-15/imds.json b/specification/imds/data-plane/Microsoft.InstanceMetadataService/stable/2019-08-15/imds.json new file mode 100644 index 000000000000..8df8b193f85d --- /dev/null +++ b/specification/imds/data-plane/Microsoft.InstanceMetadataService/stable/2019-08-15/imds.json @@ -0,0 +1,968 @@ +{ + "swagger": "2.0", + "info": { + "title": "InstanceMetadataClient", + "description": "The Azure Instance Metadata Client", + "version": "2019-08-15" + }, + "host": "169.254.169.254", + "basePath": "/metadata", + "schemes": [ + "http", + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "securityDefinitions": { + "basic_auth": { + "type": "basic", + "description": "A Basic authentication flow" + } + }, + "paths": { + "/applications": { + "get": { + "operationId": "GalleryApplications_List", + "description": "Get list of the gallery applications.", + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/MetadataParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/GalleryApplications" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "Get list of the gallery applications": { + "$ref": "./examples/ListGalleryApplications.json" + } + } + } + }, + "/applications/app": { + "get": { + "operationId": "GalleryApplication_Get", + "description": "Get application package.", + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/MetadataParameter" + }, + { + "name": "incarnationId", + "in": "query", + "required": true, + "type": "string", + "description": "Incarnation Id of the gallery application" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ApplicationResponse" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "Get gallery application package": { + "$ref": "./examples/GetGalleryApplication.json" + } + } + } + }, + "/instance": { + "get": { + "operationId": "Instances_GetMetadata", + "description": "Get Instance Metadata for the Virtual Machine.", + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/MetadataParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/Instance" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "Get Instance Metadata for the VM": { + "$ref": "./examples/GetInstanceMetadata.json" + } + } + } + }, + "/attested/document": { + "get": { + "operationId": "Attested_GetDocument", + "description": "Get Attested Data for the Virtual Machine.", + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "name": "nonce", + "in": "query", + "required": false, + "type": "string", + "description": "This is a string of up to 32 random alphanumeric characters." + }, + { + "$ref": "#/parameters/MetadataParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/AttestedData" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "Get Attested Data for the VM": { + "$ref": "./examples/GetAttestedData.json" + } + } + } + }, + "/identity/oauth2/token": { + "get": { + "tags": [ + "Get token" + ], + "description": "Get a Token from Azure AD", + "operationId": "Identity_GetToken", + "produces": [ + "application/json" + ], + "security": [ + {}, + { + "basic_auth": [] + } + ], + "parameters": [ + { + "$ref": "#/parameters/MetadataParameter" + }, + { + "name": "resource", + "in": "query", + "type": "string", + "description": "This is the urlencoded identifier URI of the sink resource for the requested Azure AD token. The resulting token contains the corresponding aud for this resource.", + "required": true + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "name": "client_id", + "in": "query", + "type": "string", + "description": "This identifies, by Azure AD client id, a specific explicit identity to use when authenticating to Azure AD. Mutually exclusive with object_id and msi_res_id.", + "required": false + }, + { + "name": "object_id", + "in": "query", + "type": "string", + "description": "This identifies, by Azure AD object id, a specific explicit identity to use when authenticating to Azure AD. Mutually exclusive with client_id and msi_res_id.", + "required": false + }, + { + "name": "msi_res_id", + "in": "query", + "type": "string", + "description": "This identifies, by urlencoded ARM resource id, a specific explicit identity to use when authenticating to Azure AD. Mutually exclusive with client_id and object_id.", + "required": false + }, + { + "name": "authority", + "in": "query", + "type": "string", + "description": "This indicates the authority to request AAD tokens from. Defaults to the known authority of the identity to be used.", + "required": false + }, + { + "name": "bypass_cache", + "in": "query", + "type": "string", + "enum": [ + "true" + ], + "description": "If provided, the value must be 'true'. This indicates to the server that the token must be retrieved from Azure AD and cannot be retrieved from an internal cache.", + "required": false, + "x-ms-enum": { + "name": "BypassCache", + "modelAsString": true + } + } + ], + "responses": { + "200": { + "description": "Successful operation", + "schema": { + "$ref": "#/definitions/IdentityTokenResponse" + } + }, + "default": { + "headers": { + "Www-Authenticate": { + "type": "string", + "description": "This is the response header containing a challenge for the Basic scheme with a realm value" + } + }, + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/IdentityErrorResponse" + } + } + }, + "x-ms-examples": { + "Get Identity Token for the VM": { + "$ref": "./examples/GetIdentityToken.json" + } + } + } + }, + "/identity/info": { + "get": { + "tags": [ + "Get metadata information" + ], + "description": "Get information about AAD Metadata", + "operationId": "Identity_GetInfo", + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "#/parameters/MetadataParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Successful operation", + "schema": { + "$ref": "#/definitions/IdentityInfoResponse" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/IdentityErrorResponse" + } + } + }, + "x-ms-examples": { + "Get Identity Info for the VM": { + "$ref": "./examples/GetIdentityInfo.json" + } + } + } + } + }, + "definitions": { + "Compute": { + "type": "object", + "properties": { + "azEnvironment": { + "type": "string", + "description": "This is the name of the environment in which the VM is running." + }, + "location": { + "type": "string", + "description": "This is the Azure Region in which the VM is running." + }, + "name": { + "type": "string", + "description": "This is the name of the VM." + }, + "offer": { + "type": "string", + "description": "This is the offer information for the VM image. This value is only present for images deployed from the Azure Image Gallery." + }, + "osType": { + "type": "string", + "description": "This value indicates the type of OS the VM is running, either Linux or Windows." + }, + "placementGroupId": { + "type": "string", + "description": "This is the placement group of your Virtual Machine Scale Set." + }, + "plan": { + "type": "object", + "description": "This contains the data about the plan.", + "$ref": "#/definitions/PlanProperties" + }, + "publicKeys": { + "type": "array", + "items": { + "$ref": "#/definitions/PublicKeysProperties" + }, + "description": "This is information about the SSH certificate" + }, + "platformFaultDomain": { + "type": "string", + "description": "This is the fault domain in which the VM." + }, + "platformUpdateDomain": { + "type": "string", + "description": "This is the update domain in which the VM." + }, + "provider": { + "type": "string", + "description": "This is the provider of the VM." + }, + "publisher": { + "type": "string", + "description": "This is the publisher of the VM image." + }, + "resourceGroupName": { + "type": "string", + "description": "This is the resource group for the VM." + }, + "resourceId": { + "type": "string", + "description": "This is the fully qualified ID for the VM." + }, + "sku": { + "type": "string", + "description": "This is the specific SKU for the VM image." + }, + "storageProfile": { + "type": "object", + "description": "This contains the data about the storage disks associated with the VM.", + "$ref": "#/definitions/StorageProfile" + }, + "subscriptionId": { + "type": "string", + "description": "This is the Azure subscription for the VM." + }, + "tags": { + "type": "string", + "description": "This is the list of tags for your VM." + }, + "version": { + "type": "string", + "description": "This is the version of the VM image." + }, + "vmId": { + "type": "string", + "description": "This is the unique identifier for the VM." + }, + "vmScaleSetName": { + "type": "string", + "description": "This is the resource name of the VMSS." + }, + "vmSize": { + "type": "string", + "description": "This is the size of the VM." + }, + "zone": { + "type": "string", + "description": "This is the availability zone of the VM." + } + }, + "description": "Compute Metadata" + }, + "Network": { + "type": "object", + "properties": { + "interface": { + "type": "array", + "description": "This contains data about the network interface.", + "items": { + "type": "object", + "$ref": "#/definitions/NetworkInterface" + } + } + }, + "description": "Network Metadata" + }, + "NetworkInterface": { + "type": "object", + "description": "This contains data about the network interface.", + "properties": { + "ipv4": { + "type": "object", + "description": "This contains the IPv4 address.", + "properties": { + "ipAddress": { + "type": "array", + "description": "This is the IP address", + "items": { + "type": "object", + "description": "This contains the IPv4 properties.", + "$ref": "#/definitions/Ipv4Properties" + } + }, + "subnet": { + "type": "array", + "description": "This is the subnet", + "items": { + "type": "object", + "description": "This contains the subnet properties.", + "$ref": "#/definitions/SubnetProperties" + } + } + } + }, + "ipv6": { + "type": "object", + "description": "This contains the IPv6 address.", + "properties": { + "ipAddress": { + "type": "array", + "description": "This is the IP address", + "items": { + "type": "object", + "description": "This contains the IPv6 properties.", + "$ref": "#/definitions/Ipv6Properties" + } + } + } + }, + "macAddress": { + "type": "string", + "description": "This is the MAC address of the interface." + } + } + }, + "PlanProperties": { + "type": "object", + "description": "This contains the data about the plan.", + "properties": { + "name": { + "type": "string", + "description": "This is the Plan ID." + }, + "publisher": { + "type": "string", + "description": "This is the publisher ID." + }, + "product": { + "type": "string", + "description": "This is the product of the image from the Marketplace." + } + } + }, + "PublicKeysProperties": { + "type": "object", + "description": "This contains the data about the public key.", + "properties": { + "path": { + "type": "string", + "description": "This specifies the full path on the VM where the SSH public key is stored." + }, + "keyData": { + "type": "string", + "description": "This is the SSH public key certificate used to authenticate with the VM." + } + } + }, + "Ipv4Properties": { + "type": "object", + "description": "This contains the IPv4 properties.", + "properties": { + "privateIpAddress": { + "type": "string", + "description": "This is the private IP address assigned to the interface." + }, + "publicIpAddress": { + "type": "string", + "description": "This is the public IP address assigned to the interface." + } + } + }, + "Ipv6Properties": { + "type": "object", + "description": "This contains the IPv6 properties.", + "properties": { + "privateIpAddress": { + "type": "string", + "description": "This is the private IPv6 address assigned to the interface." + } + } + }, + "SubnetProperties": { + "type": "object", + "description": "This contains the properties of the subnet.", + "properties": { + "address": { + "type": "string", + "description": "This is the address range of the subnet." + }, + "prefix": { + "type": "string", + "description": "This is the prefix of the subnet." + } + } + }, + "StorageProfile": { + "type": "object", + "description": "This contains the data about the storage disks associated with the VM.", + "properties": { + "imageReference": { + "type": "object", + "$ref": "#/definitions/ImageReference", + "description": "Image information" + }, + "osDisk": { + "type": "object", + "$ref": "#/definitions/OsDisk", + "description": "OS disk information" + }, + "dataDisks": { + "type": "array", + "description": "Data disk information", + "items": { + "type": "object", + "description": "This contains information about the data disk.", + "$ref": "#/definitions/DataDisk" + } + } + } + }, + "ImageReference": { + "type": "object", + "description": "This contains information about the OS image.", + "properties": { + "id": { + "type": "string", + "description": "This is the resource ID." + }, + "offer": { + "type": "string", + "description": "This is the offer of the platform or marketplace image." + }, + "publisher": { + "type": "string", + "description": "This is the image publisher." + }, + "sku": { + "type": "string", + "description": "This is the image SKU." + }, + "version": { + "type": "string", + "description": "This is the version of the platform or marketplace image." + } + } + }, + "OsDisk": { + "type": "object", + "description": "This contains information about the OS disk used by the VM.", + "properties": { + "caching": { + "type": "string", + "description": "This is the caching requirements." + }, + "createOption": { + "type": "string", + "description": "This is information about how the VM was created." + }, + "diffDiskSettings": { + "type": "object", + "description": "This is the ephemeral disk settings.", + "$ref": "#/definitions/DiffDiskSettings" + }, + "diskSizeGB": { + "type": "string", + "description": "This is the size of the disk in GB." + }, + "encryptionSettings": { + "type": "object", + "description": "This is the encryption settings for the disk.", + "$ref": "#/definitions/EncryptionSettings" + }, + "image": { + "type": "object", + "description": "This is the source user image virtual hard disk.", + "$ref": "#/definitions/DiskImage" + }, + "managedDisk": { + "type": "object", + "description": "This is managed disk parameters.", + "$ref": "#/definitions/ManagedDisk" + }, + "name": { + "type": "string", + "description": "This is the disk name." + }, + "osType": { + "type": "string", + "description": "This is the type of OS included in the disk." + }, + "vhd": { + "type": "object", + "description": "This is the virtual hard disk.", + "$ref": "#/definitions/VirtualHardDisk" + }, + "writeAcceleratorEnabled": { + "type": "string", + "description": "This specifies whether or not writeAccelerator is enabled on the disk." + } + } + }, + "DataDisk": { + "type": "object", + "description": "This contains information about the data disk.", + "properties": { + "caching": { + "type": "string", + "description": "This is the caching requirements." + }, + "createOption": { + "type": "string", + "description": "This is information about how the VM was created." + }, + "diskSizeGB": { + "type": "string", + "description": "This is the size of the disk in GB." + }, + "image": { + "type": "object", + "description": "This is the source user image virtual hard disk.", + "$ref": "#/definitions/DiskImage" + }, + "lun": { + "type": "string", + "description": "This is the logical unit number of the disk." + }, + "managedDisk": { + "type": "object", + "description": "This is managed disk parameters.", + "$ref": "#/definitions/ManagedDisk" + }, + "name": { + "type": "string", + "description": "This is the disk name." + }, + "vhd": { + "type": "object", + "description": "This is the virtual hard disk.", + "$ref": "#/definitions/VirtualHardDisk" + }, + "writeAcceleratorEnabled": { + "type": "string", + "description": "This specifies whether or not writeAccelerator is enabled on the disk." + } + } + }, + "EncryptionSettings": { + "type": "object", + "description": "This is the encryption settings for the disk.", + "properties": { + "enabled": { + "type": "string", + "description": "This specifies whether or not disk encryption is enabled on the VM." + } + } + }, + "DiffDiskSettings": { + "type": "object", + "description": "This is the ephemeral disk settings.", + "properties": { + "option": { + "type": "string", + "description": "This specifies the ephemeral disk settings." + } + } + }, + "DiskImage": { + "type": "object", + "description": "This is the source user image virtual hard disk.", + "properties": { + "uri": { + "type": "string", + "description": "This is the uri of the virtual hard disk." + } + } + }, + "ManagedDisk": { + "type": "object", + "description": "This is managed disk parameters.", + "properties": { + "id": { + "type": "string", + "description": "This is the resource ID." + }, + "storageAccountType": { + "type": "string", + "description": "This is the storage account type for the managed disk." + } + } + }, + "VirtualHardDisk": { + "type": "object", + "description": "This is the virtual hard disk.", + "properties": { + "uri": { + "type": "string", + "description": "This is the uri of the virtual hard disk." + } + } + }, + "ApplicationResponse": { + "type": "string", + "description": "This is a binary string containing the application." + }, + "GalleryApplications": { + "type": "object", + "description": "This is the response from the GalleryApplications_List operation.", + "properties": { + "applications": { + "type": "array", + "description": "List of gallery applications", + "items": { + "type": "object", + "description": "This contains information about the gallery application.", + "$ref": "#/definitions/GalleryApplication" + } + } + } + }, + "GalleryApplication": { + "type": "object", + "description": "This contains information about the gallery application.", + "properties": { + "tags": { + "type": "string", + "description": "Optional attribute to passthrough value for more generic context" + }, + "enableHealthCheck": { + "type": "boolean", + "description": "It indicates if this application reports health status" + }, + "packageFile": { + "$ref": "#/definitions/PackageFile", + "description": "Package properties of the gallery application" + } + } + }, + "PackageFile": { + "type": "object", + "description": "Package properties of the gallery application.", + "properties": { + "id": { + "type": "string", + "description": "Resource id of the gallery application" + }, + "incarnationId": { + "type": "string", + "description": "Unique identifier for this particular application instance" + }, + "fileName": { + "type": "string", + "description": "Application package file name" + }, + "contentType": { + "type": "string", + "description": "Application package type" + } + } + }, + "Instance": { + "type": "object", + "description": "This is the response from the Instance_GetMetadata operation.", + "properties": { + "compute": { + "$ref": "#/definitions/Compute", + "description": "Compute Metadata" + }, + "network": { + "$ref": "#/definitions/Network", + "description": "Network Metadata" + } + } + }, + "AttestedData": { + "type": "object", + "description": "This is the response from the Attested_GetDocument operation.", + "properties": { + "signature": { + "type": "string", + "description": "This is the encoded string containing the VM ID, plan information, public key, timestamp, and nonce value." + }, + "encoding": { + "type": "string", + "description": "This is the encoding scheme of the signature." + } + } + }, + "ErrorResponse": { + "description": "This is the response from an operation in the case an error occurs.", + "type": "object", + "properties": { + "error": { + "description": "Error message indicating why the operation failed.", + "type": "string" + } + } + }, + "IdentityErrorResponse": { + "type": "object", + "description": "This is the response from an Identity operation in the case an error occurs.", + "properties": { + "error": { + "type": "string", + "description": "Error code", + "enum": [ + "invalid_request", + "unauthorized_client", + "access_denied", + "unsupported_response_type", + "invalid_scope", + "server_error", + "service_unavailable", + "bad_request", + "forbidden", + "not_found", + "method_not_allowed", + "too_many_requests" + ], + "x-ms-enum": { + "name": "Error", + "modelAsString": true + } + }, + "error_description": { + "type": "string", + "description": "Error message indicating why the operation failed." + } + } + }, + "IdentityTokenResponse": { + "type": "object", + "description": "This is the response from the Identity_GetToken operation.", + "properties": { + "access_token": { + "type": "string", + "description": "This is the requested access token. The app can use this token to authenticate to the sink resource." + }, + "expires_in": { + "type": "string", + "description": "This is how long the access token is valid (in seconds)." + }, + "expires_on": { + "type": "string", + "description": "This is the time when the access token expires. The date is represented as the number of seconds from 1970-01-01T0:0:0Z UTC until the expiration time. This value is used to determine the lifetime of cached tokens." + }, + "ext_expires_in": { + "type": "string", + "description": "This indicates the extended lifetime of the token (in seconds)." + }, + "not_before": { + "type": "string", + "description": "This is the time when the access token becomes effective. The date is represented as the number of seconds from 1970-01-01T0:0:0Z UTC until the expiration time." + }, + "resource": { + "type": "string", + "description": "This is the app ID URI of the sink resource." + }, + "token_type": { + "type": "string", + "description": "This indicates the token type value." + }, + "client_id": { + "type": "string", + "description": "This is the client_id specified in the request, if any." + }, + "object_id": { + "type": "string", + "description": "This is the object_id specified in the request, if any." + }, + "msi_res_id": { + "type": "string", + "description": "This is the msi_res_id specified in the request, if any." + } + } + }, + "IdentityInfoResponse": { + "type": "object", + "description": "This is the response from the Identity_GetInfo operation.", + "properties": { + "tenantId": { + "type": "string", + "description": "This is the AAD tenantId of the identity of the system assigned managed identity." + } + } + } + }, + "parameters": { + "ApiVersionParameter": { + "name": "api-version", + "in": "query", + "type": "string", + "enum": [ + "2018-10-01" + ], + "description": "This is the API version to use.", + "required": true, + "x-ms-enum": { + "name": "ApiVersion", + "modelAsString": true + } + }, + "MetadataParameter": { + "name": "Metadata", + "in": "header", + "type": "string", + "enum": [ + "true" + ], + "description": "This must be set to 'true'.", + "required": true, + "x-ms-parameter-location": "method" + } + } +} diff --git a/specification/imds/data-plane/readme.md b/specification/imds/data-plane/readme.md index 39d1568c139b..47787236f557 100644 --- a/specification/imds/data-plane/readme.md +++ b/specification/imds/data-plane/readme.md @@ -80,7 +80,17 @@ input-file: - Microsoft.InstanceMetadataService/stable/2019-08-01/imds.json ``` +### Tag: package-2019-08-15 + +These settings apply only when `--tag=package-2019-08-15` is specified on the command line. + +```yaml $(tag) == 'package-2019-08-15' +input-file: +- Microsoft.InstanceMetadataService/stable/2019-08-15/imds.json +``` + ## Suppression + ``` yaml directive: - suppress: DefinitionsPropertiesNamesCamelCase @@ -166,6 +176,16 @@ input-file: - suppress: DefinitionsPropertiesNamesCamelCase reason: The following properties follow the Oath2 spec, which does not use camelCase. from: Microsoft.InstanceMetadataService/stable/2019-08-01/imds.json + + - suppress: HttpsSupportedScheme + reason: IMDS does not require HTTPS to query it + + - suppress: SecurityDefinitionsStructure + reason: IMDS does not support any authentication + + - suppress: DefinitionsPropertiesNamesCamelCase + reason: The following properties follow the Oath2 spec, which does not use camelCase. + from: Microsoft.InstanceMetadataService/stable/2019-08-15/imds.json where: - $.definitions.IdentityTokenResponse.properties.access_token - $.definitions.IdentityTokenResponse.properties.expires_in @@ -178,12 +198,6 @@ input-file: - $.definitions.IdentityTokenResponse.properties.object_id - $.definitions.IdentityTokenResponse.properties.msi_res_id - $.definitions.IdentityErrorResponse.properties.error_description - - - suppress: HttpsSupportedScheme - reason: IMDS does not require HTTPS to query it - - - suppress: SecurityDefinitionsStructure - reason: IMDS does not support any authentication ``` --- @@ -228,6 +242,7 @@ input-file: - $(this-folder)/Microsoft.InstanceMetadataService/stable/2019-04-30/imds.json - $(this-folder)/Microsoft.InstanceMetadataService/stable/2019-06-01/imds.json - $(this-folder)/Microsoft.InstanceMetadataService/stable/2019-08-01/imds.json + - $(this-folder)/Microsoft.InstanceMetadataService/stable/2019-08-15/imds.json ``` diff --git a/specification/machinelearning/resource-manager/Microsoft.MachineLearning/stable/2016-04-01/examples/CreateWorkspace.json b/specification/machinelearning/resource-manager/Microsoft.MachineLearning/stable/2016-04-01/examples/CreateWorkspace.json index 75b4eb2b34f4..e6db7d0843c4 100644 --- a/specification/machinelearning/resource-manager/Microsoft.MachineLearning/stable/2016-04-01/examples/CreateWorkspace.json +++ b/specification/machinelearning/resource-manager/Microsoft.MachineLearning/stable/2016-04-01/examples/CreateWorkspace.json @@ -10,7 +10,8 @@ }, "location": "West Europe", "properties": { - "userStorageAccountId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Storage/storageAccounts/teststorage" + "userStorageAccountId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Storage/storageAccounts/teststorage", + "ownerEmail": "abc@microsoft.com" } } }, diff --git a/specification/machinelearning/resource-manager/Microsoft.MachineLearning/stable/2016-04-01/workspaces.json b/specification/machinelearning/resource-manager/Microsoft.MachineLearning/stable/2016-04-01/workspaces.json index d6b488c17ac1..e629175a459d 100644 --- a/specification/machinelearning/resource-manager/Microsoft.MachineLearning/stable/2016-04-01/workspaces.json +++ b/specification/machinelearning/resource-manager/Microsoft.MachineLearning/stable/2016-04-01/workspaces.json @@ -446,7 +446,8 @@ "type": "object", "description": "The properties of a machine learning workspace.", "required": [ - "userStorageAccountId" + "userStorageAccountId", + "ownerEmail" ], "properties": { "userStorageAccountId": { diff --git a/specification/machinelearningservices/data-plane/readme.md b/specification/machinelearningservices/data-plane/readme.md index 764c05c2853e..3da680e4ba65 100644 --- a/specification/machinelearningservices/data-plane/readme.md +++ b/specification/machinelearningservices/data-plane/readme.md @@ -45,7 +45,7 @@ directive: reason: Not a Long Running Operation - from: hyperdrive.json suppress: DefinitionsPropertiesNamesCamelCase - reason: Existing service; would be a breaking change + reason: Existing service; would be a breaking change ``` ### Tag: package-2019-08-preview diff --git a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/bms.json b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/bms.json index 51c7725ca783..ca56fae3e833 100644 --- a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/bms.json +++ b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/bms.json @@ -2057,7 +2057,7 @@ }, "x-ms-examples": { "List Backup Protection Containers": { - "$ref": "./examples/AzureWorkload/ProtectionContainers_List.json" + "$ref": "./examples/AzureStorage/ProtectionContainers_List.json" } } } diff --git a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureIaasVm/BackupProtectableItems_List.json b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureIaasVm/BackupProtectableItems_List.json index 3083c1f00dd6..f957d314a41c 100644 --- a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureIaasVm/BackupProtectableItems_List.json +++ b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureIaasVm/BackupProtectableItems_List.json @@ -20,9 +20,7 @@ "protectionState": "NotProtected", "protectableItemType": "Microsoft.ClassicCompute/virtualMachines", "backupManagementType": "AzureIaasVM", - "workloadType": "VM", - "containerName": "iaasvmcontainer;iaasvm-rg;iaasvm-1", - "sourceResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/providers/Microsoft.ClassicCompute/virtualMachines/iaasvm-1" + "workloadType": "VM" } } ] diff --git a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureIaasVm/ConfigureProtection.json b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureIaasVm/ConfigureProtection.json index 3080ad45b658..1bf08b3f954a 100644 --- a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureIaasVm/ConfigureProtection.json +++ b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureIaasVm/ConfigureProtection.json @@ -22,6 +22,30 @@ "Azure-AsyncOperation": "https://management.azure.com/Subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/SwaggerTestRg/providers/Microsoft.RecoveryServices/vaults/NetSDKTestRsVault/backupFabrics/Azure/protectionContainers/IaasVMContainer;iaasvmcontainerv2;netsdktestrg;netvmtestv2vm1/protectedItems/VM;iaasvmcontainerv2;netsdktestrg;netvmtestv2vm1/operationsStatus/00000000-0000-0000-0000-000000000000?api-version=2016-12-01", "Retry-After": 60 } + }, + "200": { + "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/PythonSDKBackupTestRg/providers/Microsoft.RecoveryServices/vaults/PySDKBackupTestRsVault/backupFabrics/Azure/protectionContainers/IaasVMContainer;iaasvmcontainerv2;netsdktestrg;netvmtestv2vm1/protectedItems/VM;iaasvmcontainerv2;netsdktestrg;netvmtestv2vm1", + "name": "VM;iaasvmcontainerv2;netsdktestrg;netvmtestv2vm1", + "type": "Microsoft.RecoveryServices/vaults/backupFabrics/protectionContainers/protectedItems", + "properties": { + "friendlyName": "netvmtestv2vm1", + "virtualMachineId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/netsdktestrg/providers/Microsoft.Compute/virtualMachines/netvmtestv2vm1", + "protectionStatus": "Healthy", + "protectionState": "Protected", + "healthStatus": "Passed", + "lastBackupStatus": "Completed", + "lastBackupTime": "2018-01-22T12:25:32.048723Z", + "protectedItemDataId": "636482643132986882", + "protectedItemType": "Microsoft.Compute/virtualMachines", + "backupManagementType": "AzureIaasVM", + "workloadType": "VM", + "containerName": "iaasvmcontainerv2;netsdktestrg;netvmtestv2vm1", + "sourceResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/netsdktestrg/providers/Microsoft.Compute/virtualMachines/netvmtestv2vm1", + "policyId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/PythonSDKBackupTestRg/providers/Microsoft.RecoveryServices/vaults/PySDKBackupTestRsVault/backupPolicies/testPolicy1", + "lastRecoveryPoint": null + } + } } } } diff --git a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureIaasVm/ProtectedItemOperationResults.json b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureIaasVm/ProtectedItemOperationResults.json index 8e332b4c07cd..0c762abfe85c 100644 --- a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureIaasVm/ProtectedItemOperationResults.json +++ b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureIaasVm/ProtectedItemOperationResults.json @@ -16,6 +16,31 @@ "Azure-AsyncOperation": "https://management.azure.com/Subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/SwaggerTestRg/providers/Microsoft.RecoveryServices/vaults/NetSDKTestRsVault/backupFabrics/Azure/protectionContainers/IaasVMContainer;iaasvmcontainerv2;netsdktestrg;netvmtestv2vm1/protectedItems/VM;iaasvmcontainerv2;netsdktestrg;netvmtestv2vm1/operationsStatus/00000000-0000-0000-0000-000000000000?api-version=2016-12-01", "Retry-After": 60 } - } + }, + "200": { + "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/PythonSDKBackupTestRg/providers/Microsoft.RecoveryServices/vaults/PySDKBackupTestRsVault/backupFabrics/Azure/protectionContainers/IaasVMContainer;iaasvmcontainerv2;netsdktestrg;netvmtestv2vm1/protectedItems/VM;iaasvmcontainerv2;netsdktestrg;netvmtestv2vm1", + "name": "VM;iaasvmcontainerv2;netsdktestrg;netvmtestv2vm1", + "type": "Microsoft.RecoveryServices/vaults/backupFabrics/protectionContainers/protectedItems", + "properties": { + "friendlyName": "netvmtestv2vm1", + "virtualMachineId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/netsdktestrg/providers/Microsoft.Compute/virtualMachines/netvmtestv2vm1", + "protectionStatus": "Healthy", + "protectionState": "Protected", + "healthStatus": "Passed", + "lastBackupStatus": "Completed", + "lastBackupTime": "2018-01-22T12:25:32.048723Z", + "protectedItemDataId": "636482643132986882", + "protectedItemType": "Microsoft.Compute/virtualMachines", + "backupManagementType": "AzureIaasVM", + "workloadType": "VM", + "containerName": "iaasvmcontainerv2;netsdktestrg;netvmtestv2vm1", + "sourceResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/netsdktestrg/providers/Microsoft.Compute/virtualMachines/netvmtestv2vm1", + "policyId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/PythonSDKBackupTestRg/providers/Microsoft.RecoveryServices/vaults/PySDKBackupTestRsVault/backupPolicies/testPolicy1", + "lastRecoveryPoint": null + } + } + }, + "204": {} } } diff --git a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureIaasVm/ProtectionPolicies_Delete.json b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureIaasVm/ProtectionPolicies_Delete.json index 3c5761cd5de0..809778be7611 100644 --- a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureIaasVm/ProtectionPolicies_Delete.json +++ b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureIaasVm/ProtectionPolicies_Delete.json @@ -7,6 +7,7 @@ "api-version": "2016-06-01" }, "responses": { - "200": {} + "200": {}, + "204": {} } } diff --git a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureIaasVm/Provision_Ilr.json b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureIaasVm/Provision_Ilr.json index 77186dbdb320..f184b739339f 100644 --- a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureIaasVm/Provision_Ilr.json +++ b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureIaasVm/Provision_Ilr.json @@ -6,6 +6,7 @@ "fabricName": "Azure", "containerName": "iaasvmcontainer;iaasvmcontainerv2;pysdktestrg;pysdktestv2vm1", "protectedItemName": "vm;iaasvmcontainerv2;pysdktestrg;pysdktestv2vm1", + "recoveryPointId": "1", "api-version": "2016-12-01", "parameters": { "properties": { diff --git a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureIaasVm/RecoveryPoints_Get.json b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureIaasVm/RecoveryPoints_Get.json index 3775558d6cf8..ed014826ff8e 100644 --- a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureIaasVm/RecoveryPoints_Get.json +++ b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureIaasVm/RecoveryPoints_Get.json @@ -25,8 +25,8 @@ "isInstantIlrSessionActive": false, "recoveryPointTierDetails": [ { - "type": 2, - "status": 1 + "type": "HardenedRP", + "status": "Valid" } ], "isManagedVirtualMachine": true, diff --git a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureIaasVm/RecoveryPoints_List.json b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureIaasVm/RecoveryPoints_List.json index 578daecf2191..497d446ccfa0 100644 --- a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureIaasVm/RecoveryPoints_List.json +++ b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureIaasVm/RecoveryPoints_List.json @@ -10,62 +10,65 @@ }, "responses": { "200": { - "body": [ - { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rshhtestmdvmrg/providers/Microsoft.RecoveryServices/vaults/rshvault/backupFabrics/Azure/protectionContainers/IaasVMContainer;iaasvmcontainerv2;rshhtestmdvmrg;rshmdvmsmall/protectedItems/VM;iaasvmcontainerv2;rshhtestmdvmrg;rshmdvmsmall/recoveryPoints/22244821112382", - "name": "22244821112382", - "type": "Microsoft.RecoveryServices/vaults/backupFabrics/protectionContainers/protectedItems/recoveryPoints", - "properties": { - "objectType": "IaasVMRecoveryPoint", - "recoveryPointType": "CrashConsistent", - "recoveryPointTime": "2017-12-21T22:48:25.4353958Z", - "recoveryPointAdditionalInfo": "", - "sourceVMStorageType": "NormalStorage", - "isSourceVMEncrypted": false, - "isInstantIlrSessionActive": false, - "recoveryPointTierDetails": [ - { - "type": 1, - "status": 1 - }, - { - "type": 2, - "status": 1 - } - ], - "isManagedVirtualMachine": true, - "virtualMachineSize": "Standard_D1", - "originalStorageAccountOption": false + "body": { + "value": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rshhtestmdvmrg/providers/Microsoft.RecoveryServices/vaults/rshvault/backupFabrics/Azure/protectionContainers/IaasVMContainer;iaasvmcontainerv2;rshhtestmdvmrg;rshmdvmsmall/protectedItems/VM;iaasvmcontainerv2;rshhtestmdvmrg;rshmdvmsmall/recoveryPoints/22244821112382", + "name": "22244821112382", + "type": "Microsoft.RecoveryServices/vaults/backupFabrics/protectionContainers/protectedItems/recoveryPoints", + "properties": { + "objectType": "IaasVMRecoveryPoint", + "recoveryPointType": "CrashConsistent", + "recoveryPointTime": "2017-12-21T22:48:25.4353958Z", + "recoveryPointAdditionalInfo": "", + "sourceVMStorageType": "NormalStorage", + "isSourceVMEncrypted": false, + "isInstantIlrSessionActive": false, + "recoveryPointTierDetails": [ + { + "type": "InstantRP", + "status": "Valid" + }, + { + "type": "HardenedRP", + "status": "Valid" + } + ], + "isManagedVirtualMachine": true, + "virtualMachineSize": "Standard_D1", + "originalStorageAccountOption": false + } + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rshhtestmdvmrg/providers/Microsoft.RecoveryServices/vaults/rshvault/backupFabrics/Azure/protectionContainers/IaasVMContainer;iaasvmcontainerv2;rshhtestmdvmrg;rshmdvmsmall/protectedItems/VM;iaasvmcontainerv2;rshhtestmdvmrg;rshmdvmsmall/recoveryPoints/24977149827250", + "name": "24977149827250", + "type": "Microsoft.RecoveryServices/vaults/backupFabrics/protectionContainers/protectedItems/recoveryPoints", + "properties": { + "objectType": "IaasVMRecoveryPoint", + "recoveryPointType": "CrashConsistent", + "recoveryPointTime": "2017-12-20T22:49:44.3317945Z", + "recoveryPointAdditionalInfo": "", + "sourceVMStorageType": "NormalStorage", + "isSourceVMEncrypted": false, + "isInstantIlrSessionActive": false, + "recoveryPointTierDetails": [ + { + "type": "InstantRP", + "status": "Valid" + }, + { + "type": "HardenedRP", + "status": "Valid" + } + ], + "isManagedVirtualMachine": true, + "virtualMachineSize": "Standard_D1", + "originalStorageAccountOption": false + } } - }, - { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rshhtestmdvmrg/providers/Microsoft.RecoveryServices/vaults/rshvault/backupFabrics/Azure/protectionContainers/IaasVMContainer;iaasvmcontainerv2;rshhtestmdvmrg;rshmdvmsmall/protectedItems/VM;iaasvmcontainerv2;rshhtestmdvmrg;rshmdvmsmall/recoveryPoints/24977149827250", - "name": "24977149827250", - "type": "Microsoft.RecoveryServices/vaults/backupFabrics/protectionContainers/protectedItems/recoveryPoints", - "properties": { - "objectType": "IaasVMRecoveryPoint", - "recoveryPointType": "CrashConsistent", - "recoveryPointTime": "2017-12-20T22:49:44.3317945Z", - "recoveryPointAdditionalInfo": "", - "sourceVMStorageType": "NormalStorage", - "isSourceVMEncrypted": false, - "isInstantIlrSessionActive": false, - "recoveryPointTierDetails": [ - { - "type": 1, - "status": 1 - }, - { - "type": 2, - "status": 1 - } - ], - "isManagedVirtualMachine": true, - "virtualMachineSize": "Standard_D1", - "originalStorageAccountOption": false - } - } - ] + ], + "nextLink": null + } } } } diff --git a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureIaasVm/Revoke_Ilr.json b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureIaasVm/Revoke_Ilr.json index 4a44011f6fc2..361695d6835d 100644 --- a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureIaasVm/Revoke_Ilr.json +++ b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureIaasVm/Revoke_Ilr.json @@ -6,6 +6,7 @@ "fabricName": "Azure", "containerName": "iaasvmcontainer;iaasvmcontainerv2;pysdktestrg;pysdktestv2vm1", "protectedItemName": "vm;iaasvmcontainerv2;pysdktestrg;pysdktestv2vm1", + "recoveryPointId": "1", "api-version": "2016-12-01" }, "responses": { diff --git a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureIaasVm/StopProtection.json b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureIaasVm/StopProtection.json index 7b42d71eb349..0b7b463098e9 100644 --- a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureIaasVm/StopProtection.json +++ b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureIaasVm/StopProtection.json @@ -22,6 +22,30 @@ "Azure-AsyncOperation": "https://management.azure.com/Subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/SwaggerTestRg/providers/Microsoft.RecoveryServices/vaults/NetSDKTestRsVault/backupFabrics/Azure/protectionContainers/IaasVMContainer;iaasvmcontainerv2;netsdktestrg;netvmtestv2vm1/protectedItems/VM;iaasvmcontainerv2;netsdktestrg;netvmtestv2vm1/operationsStatus/00000000-0000-0000-0000-000000000000?api-version=2016-12-01", "Retry-After": 60 } + }, + "200": { + "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/PythonSDKBackupTestRg/providers/Microsoft.RecoveryServices/vaults/PySDKBackupTestRsVault/backupFabrics/Azure/protectionContainers/IaasVMContainer;iaasvmcontainerv2;netsdktestrg;netvmtestv2vm1/protectedItems/VM;iaasvmcontainerv2;netsdktestrg;netvmtestv2vm1", + "name": "VM;iaasvmcontainerv2;netsdktestrg;netvmtestv2vm1", + "type": "Microsoft.RecoveryServices/vaults/backupFabrics/protectionContainers/protectedItems", + "properties": { + "friendlyName": "netvmtestv2vm1", + "virtualMachineId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/netsdktestrg/providers/Microsoft.Compute/virtualMachines/netvmtestv2vm1", + "protectionStatus": "Healthy", + "protectionState": "ProtectionStopped", + "healthStatus": "Passed", + "lastBackupStatus": "Completed", + "lastBackupTime": "2018-01-22T12:25:32.048723Z", + "protectedItemDataId": "636482643132986882", + "protectedItemType": "Microsoft.Compute/virtualMachines", + "backupManagementType": "AzureIaasVM", + "workloadType": "VM", + "containerName": "iaasvmcontainerv2;netsdktestrg;netvmtestv2vm1", + "sourceResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/netsdktestrg/providers/Microsoft.Compute/virtualMachines/netvmtestv2vm1", + "policyId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/PythonSDKBackupTestRg/providers/Microsoft.RecoveryServices/vaults/PySDKBackupTestRsVault/backupPolicies/testPolicy1", + "lastRecoveryPoint": null + } + } } } } diff --git a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureStorage/ProtectableContainers_List.json b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureStorage/ProtectableContainers_List.json index 9e1f0b3dc5d2..e03c72c7ee72 100644 --- a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureStorage/ProtectableContainers_List.json +++ b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureStorage/ProtectableContainers_List.json @@ -1,6 +1,7 @@ { "parameters": { "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "testRg", "vaultName": "testvault", "fabricName": "Azure", "api-version": "2017-07-01", diff --git a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureStorage/ProtectionContainers_Inquire_Result.json b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureStorage/ProtectionContainers_Inquire_Result.json index 342c766e63f4..074c4bf1a5f1 100644 --- a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureStorage/ProtectionContainers_Inquire_Result.json +++ b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureStorage/ProtectionContainers_Inquire_Result.json @@ -4,11 +4,62 @@ "resourceGroupName": "test-rg", "vaultName": "testvault", "fabricName": "Azure", - "containerName": "storagecontainer;Storage;test-rg;teststorage", + "containerName": "VMAppContainer;Compute;testRG;testSQL", "operationId": "00000000-0000-0000-0000-000000000000", "api-version": "2017-07-01" }, "responses": { - "204": {} + "204": {}, + "202": { + "headers": { + "Location": "https://management.azure.com/Subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.RecoveryServices/vaults/testvault/backupFabrics/Azure/protectionContainers/VMAppContainer;Compute;testRG;testSQL/operationResults/00000000-0000-0000-0000-000000000000?api-version=2017-07-01", + "Azure-AsyncOperation": "https://management.azure.com/Subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.RecoveryServices/vaults/testvault/backupFabrics/Azure/protectionContainers/VMAppContainer;Compute;testRG;testSQL/operationsStatus/00000000-0000-0000-0000-000000000000?api-version=2017-07-01", + "Retry-After": 60 + } + }, + "200": { + "body": { + "name": "VMAppContainer;Compute;testRG;testSQL", + "id": "/Subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testRg/providers/Microsoft.RecoveryServices/vaults/testVault/backupFabrics/Azure/protectionContainers/VMAppContainer;Compute;testRG;testSQL", + "type": "Microsoft.RecoveryServices/vaults/backupFabrics/protectionContainers", + "properties": { + "extendedInfo": { + "hostServerName": "testsql", + "nodesList": [], + "inquiryInfo": { + "status": "Success", + "errorDetail": { + "code": "Success", + "message": "Not Available", + "recommendations": [ + "Not Available" + ] + }, + "inquiryDetails": [ + { + "type": "sql", + "itemCount": 14, + "inquiryValidation": { + "status": "Success", + "errorDetail": { + "code": "Success", + "message": "Not Available", + "recommendations": [ + "Not Available" + ] + } + } + } + ] + } + }, + "sourceResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testRG/providers/Microsoft.Compute/virtualMachines/testSQL", + "backupManagementType": "AzureWorkload", + "workloadType": null, + "containerType": "VMAppContainer", + "friendlyName": "testSQL" + } + } + } } } diff --git a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureStorage/ProtectionContainers_List.json b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureStorage/ProtectionContainers_List.json new file mode 100644 index 000000000000..adb110557936 --- /dev/null +++ b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureStorage/ProtectionContainers_List.json @@ -0,0 +1,32 @@ +{ + "parameters": { + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "testRg", + "vaultName": "testVault", + "api-version": "2016-12-01", + "fabricName": "Azure", + "$filter": "backupManagementType eq 'AzureWorkload'" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/172424a4-d65f-421e-a8de-197d98aabeba/resourcegroups/testrg/providers/microsoft.recoveryservices/vaults/suchandr-test-vault-wcus/backupFabrics/Azure/protectionContainers/StorageContainer;Storage;testrg;suchandrtestsa125", + "name": "StorageContainer;Storage;testrg;suchandrtestsa125", + "type": "Microsoft.RecoveryServices/vaults/backupFabrics/protectionContainers", + "properties": { + "sourceResourceId": "/subscriptions/172424a4-d65f-421e-a8de-197d98aabeba/resourceGroups/testrg/providers/Microsoft.Storage/storageAccounts/suchandrtestsa125", + "protectedItemCount": 2, + "friendlyName": "suchandrtestsa125", + "backupManagementType": "AzureStorage", + "registrationStatus": "Registered", + "healthStatus": "Healthy", + "containerType": "StorageContainer" + } + } + ] + } + } + } +} diff --git a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureStorage/ProtectionContainers_Register.json b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureStorage/ProtectionContainers_Register.json index 7506bc861dee..f56939720aff 100644 --- a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureStorage/ProtectionContainers_Register.json +++ b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureStorage/ProtectionContainers_Register.json @@ -4,24 +4,68 @@ "resourceGroupName": "test-rg", "vaultName": "testvault", "fabricName": "Azure", - "containerName": "storagecontainer;Storage;test-rg;teststorage", + "containerName": "VMAppContainer;Compute;testRG;testSQL", "api-version": "2017-07-01", "parameters": { "properties": { - "friendlyName": "teststorage", - "backupManagementType": "AzureStorage", - "sourceResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Storage/storageAccounts/teststorage", - "containerType": "StorageContainer" + "friendlyName": "testSQL", + "backupManagementType": "AzureWorkload", + "sourceResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testRG/providers/Microsoft.Compute/virtualMachines/testSQL", + "containerType": "VMAppContainer" } } }, "responses": { "202": { "headers": { - "Location": "https://management.azure.com/Subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.RecoveryServices/vaults/testvault/backupFabrics/Azure/protectionContainers/storagecontainer;Storage;test-rg;teststorage/operationResults/00000000-0000-0000-0000-000000000000?api-version=2017-07-01", - "Azure-AsyncOperation": "https://management.azure.com/Subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.RecoveryServices/vaults/testvault/backupFabrics/Azure/protectionContainers/storagecontainer;Storage;test-rg;teststorage/operationsStatus/00000000-0000-0000-0000-000000000000?api-version=2017-07-01", + "Location": "https://management.azure.com/Subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.RecoveryServices/vaults/testvault/backupFabrics/Azure/protectionContainers/VMAppContainer;Compute;testRG;testSQL/operationResults/00000000-0000-0000-0000-000000000000?api-version=2017-07-01", + "Azure-AsyncOperation": "https://management.azure.com/Subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.RecoveryServices/vaults/testvault/backupFabrics/Azure/protectionContainers/VMAppContainer;Compute;testRG;testSQL/operationsStatus/00000000-0000-0000-0000-000000000000?api-version=2017-07-01", "Retry-After": 60 } + }, + "200": { + "body": { + "name": "VMAppContainer;Compute;testRG;testSQL", + "id": "/Subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testRg/providers/Microsoft.RecoveryServices/vaults/testVault/backupFabrics/Azure/protectionContainers/VMAppContainer;Compute;testRG;testSQL", + "type": "Microsoft.RecoveryServices/vaults/backupFabrics/protectionContainers", + "properties": { + "extendedInfo": { + "hostServerName": "testsql", + "nodesList": [], + "inquiryInfo": { + "status": "Success", + "errorDetail": { + "code": "Success", + "message": "Not Available", + "recommendations": [ + "Not Available" + ] + }, + "inquiryDetails": [ + { + "type": "sql", + "itemCount": 14, + "inquiryValidation": { + "status": "Success", + "errorDetail": { + "code": "Success", + "message": "Not Available", + "recommendations": [ + "Not Available" + ] + } + } + } + ] + } + }, + "sourceResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testRG/providers/Microsoft.Compute/virtualMachines/testSQL", + "backupManagementType": "AzureWorkload", + "workloadType": null, + "containerType": "VMAppContainer", + "friendlyName": "testSQL" + } + } } } } diff --git a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureWorkload/BackupWorkloadItems_List.json b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureWorkload/BackupWorkloadItems_List.json index 21436acb8333..66f28ba90ac9 100644 --- a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureWorkload/BackupWorkloadItems_List.json +++ b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureWorkload/BackupWorkloadItems_List.json @@ -2,47 +2,42 @@ "parameters": { "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "testRg", - "vaultName": "testVault", + "vaultName": "suchandr-seacan-rsv", "api-version": "2016-12-01", "$filter": "backupManagementType eq 'AzureWorkload'", - "backupFabrics": "Azure", - "protectionContainers": "VMAppContainer;Compute;testRG;testSQL" + "fabricName": "Azure", + "containerName": "VMAppContainer;Compute;bvtdtestag;sqlserver-1" }, "responses": { "200": { "body": { "value": [ { - "backupManagementType": "AzureWorkload", - "dataDirectoryPaths": [ - { - "type": "Data", - "path": "F:\\Data\\", - "logicalName": null - }, - { - "type": "Log", - "path": "F:\\Log\\", - "logicalName": null - } - ], - "name": null, - "id": null, - "status": { - "name": null, - "displayName": null, - "infoText": null, - "severity": null, - "operationState": null - }, - "type": null, - "location": null, - "friendlyName": "MSSQLSERVER", - "resourceGroup": null, - "resourceName": null, - "subscriptionId": null, - "providerName": null, - "resourceType": null + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/testRg/providers/Microsoft.RecoveryServices/vaults/suchandr-seacan-rsv/backupFabrics/Azure/protectionContainers/VMAppContainer;Compute;bvtdtestag;sqlserver-1/protectableItems/SQLInstance;MSSQLSERVER", + "name": "SQLInstance;MSSQLSERVER", + "type": "Microsoft.RecoveryServices/vaults/backupFabrics/protectionContainers/items", + "properties": { + "dataDirectoryPaths": [ + { + "type": "Data", + "path": "F:\\DATA\\" + }, + { + "type": "Log", + "path": "F:\\LOG\\" + } + ], + "parentName": "MSSQLSERVER", + "serverName": "sqlserver-1.contoso.com", + "isAutoProtectable": true, + "subinquireditemcount": 0, + "subWorkloadItemCount": 3, + "backupManagementType": "AzureWorkload", + "workloadType": "SQL", + "workloadItemType": "SQLInstance", + "friendlyName": "MSSQLSERVER", + "protectionState": "NotProtected" + } } ], "nextLink": null diff --git a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureWorkload/ProtectionContainers_Get.json b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureWorkload/ProtectionContainers_Get.json index c04f0350024b..4c0b7aefd524 100644 --- a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureWorkload/ProtectionContainers_Get.json +++ b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureWorkload/ProtectionContainers_Get.json @@ -3,40 +3,39 @@ "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "testRg", "vaultName": "testVault", + "fabricName": "Azure", + "containerName": "VMAppContainer;Compute;testRG;testSQL", "api-version": "2016-12-01", - "protectionContainers": "VMAppContainer;Compute;testRG;testSQL", - "backupFabrics": "Azure", "$filter": "backupManagementType eq 'AzureWorkload'" }, "responses": { "200": { "body": { - "resultArray": [ - { + "name": "VMAppContainer;Compute;testRG;testSQL", + "id": "/Subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testRg/providers/Microsoft.RecoveryServices/vaults/testVault/backupFabrics/Azure/protectionContainers/VMAppContainer;Compute;testRG;testSQL", + "type": "Microsoft.RecoveryServices/vaults/backupFabrics/protectionContainers", + "properties": { + "extendedInfo": { "hostServerName": "testsql", - "backupReadiness": "Success", - "backupReadinessText": "Ready", - "registrationStatus": "Registered", - "details": "14 DB(s) Found", - "nodeList": [], + "nodesList": [], "inquiryInfo": { "status": "Success", - "errorDetails": { - "errorCode": "Success", - "errorString": "Not Available", + "errorDetail": { + "code": "Success", + "message": "Not Available", "recommendations": [ "Not Available" ] }, - "workloadInquiryDetails": [ + "inquiryDetails": [ { "type": "sql", "itemCount": 14, "inquiryValidation": { "status": "Success", - "errorDetails": { - "errorCode": "Success", - "errorString": "Not Available", + "errorDetail": { + "code": "Success", + "message": "Not Available", "recommendations": [ "Not Available" ] @@ -44,30 +43,14 @@ } } ] - }, - "inquiryErrorDetails": null, - "sourceResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testRG/providers/Microsoft.Compute/virtualMachines/testSQL", - "sourceResourceRG": "testRG", - "backupManagementType": "AzureWorkload", - "workloadType": null, - "containerType": "VMAppContainer", - "containerId": null, - "containerName": null, - "name": "VMAppContainer;Compute;testRG;testSQL", - "id": "/Subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testRg/providers/Microsoft.RecoveryServices/vaults/testVault/backupFabrics/Azure/protectionContainers/VMAppContainer;Compute;testRG;testSQL", - "status": null, - "type": "Microsoft.RecoveryServices/vaults/backupFabrics/protectionContainers", - "location": null, - "friendlyName": "testSQL", - "resourceGroup": "testRg", - "resourceName": "testVault", - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "providerName": "Microsoft.RecoveryServices", - "resourceType": "vaults" - } - ], - "totalCount": 0, - "continuationToken": null + } + }, + "sourceResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testRG/providers/Microsoft.Compute/virtualMachines/testSQL", + "backupManagementType": "AzureWorkload", + "workloadType": null, + "containerType": "VMAppContainer", + "friendlyName": "testSQL" + } } } } diff --git a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureWorkload/ProtectionContainers_List.json b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureWorkload/ProtectionContainers_List.json deleted file mode 100644 index 5358ddbc289f..000000000000 --- a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureWorkload/ProtectionContainers_List.json +++ /dev/null @@ -1,73 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "resourceGroupName": "testRg", - "vaultName": "testVault", - "api-version": "2016-12-01", - "backupFabrics": "Azure", - "$filter": "backupManagementType eq 'AzureWorkload'" - }, - "responses": { - "200": { - "body": { - "resultArray": [ - { - "hostServerName": "testsql", - "backupReadiness": "Success", - "backupReadinessText": "Ready", - "registrationStatus": "Registered", - "details": "14 DB(s) Found", - "nodeList": [], - "inquiryInfo": { - "status": "Success", - "errorDetails": { - "errorCode": "Success", - "errorString": "Not Available", - "recommendations": [ - "Not Available" - ] - }, - "workloadInquiryDetails": [ - { - "type": "sql", - "itemCount": 14, - "inquiryValidation": { - "status": "Success", - "errorDetails": { - "errorCode": "Success", - "errorString": "Not Available", - "recommendations": [ - "Not Available" - ] - } - } - } - ] - }, - "inquiryErrorDetails": null, - "sourceResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testRG/providers/Microsoft.Compute/virtualMachines/testSQL", - "sourceResourceRG": "testRG", - "backupManagementType": "AzureWorkload", - "workloadType": null, - "containerType": "VMAppContainer", - "containerId": null, - "containerName": null, - "name": "VMAppContainer;Compute;testRG;testSQL", - "id": "/Subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testRg/providers/Microsoft.RecoveryServices/vaults/testVault/backupFabrics/Azure/protectionContainers/VMAppContainer;Compute;testRG;testSQL", - "status": null, - "type": "Microsoft.RecoveryServices/vaults/backupFabrics/protectionContainers", - "location": null, - "friendlyName": "testSQL", - "resourceGroup": "testRg", - "resourceName": "testVault", - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "providerName": "Microsoft.RecoveryServices", - "resourceType": "vaults" - } - ], - "totalCount": 0, - "continuationToken": null - } - } - } -} diff --git a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureWorkload/ProtectionContainers_Unregister.json b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureWorkload/ProtectionContainers_Unregister.json index ef10c5172b3b..e32f407ea56e 100644 --- a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureWorkload/ProtectionContainers_Unregister.json +++ b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/AzureWorkload/ProtectionContainers_Unregister.json @@ -4,30 +4,17 @@ "resourceGroupName": "testRg", "vaultName": "testVault", "api-version": "2016-12-01", - "backupFabrics": "Azure", - "protectionContainers": "VMAppContainer;Compute;testRG;testSQL" + "fabricName": "Azure", + "containerName": "storagecontainer;Storage;test-rg;teststorage" }, "responses": { - "200": { - "body": { - "name": "testVault", - "id": "/Subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testRg/providers/Microsoft.RecoveryServices/vaults/testVault/backupOperationResults/00000000-0000-0000-0000-000000000000?api-version=2016-12-01", - "status": { - "name": null, - "displayName": null, - "infoText": null, - "severity": null, - "operationState": "InProgress" - }, - "type": null, - "location": null, - "friendlyName": "testVault", - "resourceGroup": "testRg", - "resourceName": "testVault", - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "providerName": "Microsoft.RecoveryServices", - "resourceType": "vaults" + "202": { + "headers": { + "Location": "https://management.azure.com/Subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.RecoveryServices/vaults/testvault/backupFabrics/Azure/protectionContainers/storagecontainer;Storage;test-rg;teststorage/operationResults/00000000-0000-0000-0000-000000000000?api-version=2017-07-01", + "Azure-AsyncOperation": "https://management.azure.com/Subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.RecoveryServices/vaults/testvault/backupFabrics/Azure/protectionContainers/storagecontainer;Storage;test-rg;teststorage/operationsStatus/00000000-0000-0000-0000-000000000000?api-version=2017-07-01", + "Retry-After": 60 } - } + }, + "204": {} } } diff --git a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/Common/BackupStorageConfig_Put.json b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/Common/BackupStorageConfig_Put.json index 57052c87328e..67f6df781093 100644 --- a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/Common/BackupStorageConfig_Put.json +++ b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/Common/BackupStorageConfig_Put.json @@ -21,8 +21,6 @@ "properties": { "storageModelType": "LocallyRedundant", "storageType": "LocallyRedundant", - "dedupState": "Disabled", - "xcoolState": "Disabled", "storageTypeState": "Unlocked" } } diff --git a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/Common/CancelJobOperationResult.json b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/Common/CancelJobOperationResult.json index e8680111dd10..2420e329a3b1 100644 --- a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/Common/CancelJobOperationResult.json +++ b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/Common/CancelJobOperationResult.json @@ -8,6 +8,13 @@ "api-version": "2017-07-01" }, "responses": { - "204": {} + "204": {}, + "200": {}, + "202": { + "headers": { + "Location": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/SwaggerTestRg/providers/Microsoft.RecoveryServices/vaults/NetSDKTestRsVault/backupJobs/00000000-0000-0000-0000-000000000000/operationResults/00000000-0000-0000-0000-000000000000?api-version=2017-07-01", + "Retry-After": 60 + } + } } } diff --git a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/Common/ProtectedItem_Delete.json b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/Common/ProtectedItem_Delete.json index 825f13e6585c..caf0847f389c 100644 --- a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/Common/ProtectedItem_Delete.json +++ b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/Common/ProtectedItem_Delete.json @@ -15,6 +15,7 @@ "Location": "https://management.azure.com/Subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/PythonSDKBackupTestRg/providers/Microsoft.RecoveryServices/vaults/PySDKBackupTestRsVault/backupOperationResults/00000000-0000-0000-0000-000000000000?api-version=2016-12-01", "Retry-After": 60 } - } + }, + "204": {} } } diff --git a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/Common/ProtectedItem_Delete_OperationResult.json b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/Common/ProtectedItem_Delete_OperationResult.json index 5922bae42817..abbe8bfacdc7 100644 --- a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/Common/ProtectedItem_Delete_OperationResult.json +++ b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/Common/ProtectedItem_Delete_OperationResult.json @@ -13,6 +13,8 @@ "Location": "https://management.azure.com/Subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/PythonSDKBackupTestRg/providers/Microsoft.RecoveryServices/vaults/PySDKBackupTestRsVault/backupOperationResults/00000000-0000-0000-0000-000000000000?api-version=2016-12-01", "Retry-After": 60 } - } + }, + "200": {}, + "204": {} } } diff --git a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/Common/ProtectedItem_Delete_OperationStatus.json b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/Common/ProtectedItem_Delete_OperationStatus.json index 6abc0b369163..4c4d58e3bba0 100644 --- a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/Common/ProtectedItem_Delete_OperationStatus.json +++ b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2016-12-01/examples/Common/ProtectedItem_Delete_OperationStatus.json @@ -14,7 +14,7 @@ "name": "00000000-0000-0000-0000-000000000000", "status": "InProgress", "startTime": "2017-08-03T06:52:53.886027Z", - "endTime": "0001-01-01T00:00:00" + "endTime": "0001-01-01T00:00:00.00000Z" } } } diff --git a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2017-07-01/examples/AzureIaasVm/ProtectionIntent_CreateOrUpdate.json b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2017-07-01/examples/AzureIaasVm/ProtectionIntent_CreateOrUpdate.json index b92e7b3da2ce..3ef776db4e1e 100644 --- a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2017-07-01/examples/AzureIaasVm/ProtectionIntent_CreateOrUpdate.json +++ b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2017-07-01/examples/AzureIaasVm/ProtectionIntent_CreateOrUpdate.json @@ -10,7 +10,6 @@ "properties": { "sourceResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/chamsrgtest/providers/Microsoft.Compute/virtualMachines/chamscandel", "protectionIntentItemType": "AzureResourceItem", - "friendlyName": "oneboxTestVmIntent", "policyId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myRG/providers/Microsoft.RecoveryServices/vaults/myVault/backupPolicies/myPolicy" } } @@ -22,7 +21,6 @@ "name": "vm;iaasvmcontainerv2;chamsrgtest;chamscandel", "type": "Microsoft.RecoveryServices/vaults/backupProtectionIntent", "properties": { - "friendlyName": "", "backupManagementType": "AzureIaasVM", "policyId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myRG/providers/Microsoft.RecoveryServices/vaults/myVault/backupPolicies/myPolicy", "protectionState": "Protected" diff --git a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2017-07-01/examples/AzureWorkload/BackupProtectionIntent_Get.json b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2017-07-01/examples/AzureWorkload/BackupProtectionIntent_Get.json index 6b9e73023d1c..20c39e0c4909 100644 --- a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2017-07-01/examples/AzureWorkload/BackupProtectionIntent_Get.json +++ b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2017-07-01/examples/AzureWorkload/BackupProtectionIntent_Get.json @@ -15,7 +15,6 @@ "name": "249D9B07-D2EF-4202-AA64-65F35418564E", "type": "Microsoft.RecoveryServices/vaults/backupProtectionIntent", "properties": { - "friendlyName": "249D9B07-D2EF-4202-AA64-65F35418564E", "backupManagementType": "AzureWorkload", "policyId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testRG/providers/Microsoft.RecoveryServices/vaults/myVault/backupPolicies/myPolicy", "itemId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testRG/providers/Microsoft.RecoveryServices/vaults/myVault/backupProtectionContainer/VMAppContainer;Compute;testVmName/backupProtectableItems/SQLInstance;MSSQLSERVER" diff --git a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2017-07-01/examples/AzureWorkload/BackupProtectionIntent_List.json b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2017-07-01/examples/AzureWorkload/BackupProtectionIntent_List.json index c1b3dce9d498..ca16c991a566 100644 --- a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2017-07-01/examples/AzureWorkload/BackupProtectionIntent_List.json +++ b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2017-07-01/examples/AzureWorkload/BackupProtectionIntent_List.json @@ -15,7 +15,6 @@ "name": "249D9B07-D2EF-4202-AA64-65F35418564E", "type": "Microsoft.RecoveryServices/vaults/backupProtectionIntent", "properties": { - "friendlyName": "249D9B07-D2EF-4202-AA64-65F35418564E", "backupManagementType": "AzureWorkload", "policyId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testRG/providers/Microsoft.RecoveryServices/vaults/myVault/backupPolicies/myPolicy", "itemId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testRG/providers/Microsoft.RecoveryServices/vaults/myVault/backupProtectionContainer/VMAppContainer;Compute;testVmName/backupProtectableItems/SQLInstance;MSSQLSERVER" diff --git a/specification/search/data-plane/Microsoft.Azure.Search.Service/stable/2019-05-06/examples/SearchServiceCreateOrUpdateSkillset.json b/specification/search/data-plane/Microsoft.Azure.Search.Service/stable/2019-05-06/examples/SearchServiceCreateOrUpdateSkillset.json index 03c281462208..85e95eb1e9cf 100644 --- a/specification/search/data-plane/Microsoft.Azure.Search.Service/stable/2019-05-06/examples/SearchServiceCreateOrUpdateSkillset.json +++ b/specification/search/data-plane/Microsoft.Azure.Search.Service/stable/2019-05-06/examples/SearchServiceCreateOrUpdateSkillset.json @@ -84,6 +84,31 @@ "targetName": "keyPhrases" } ] + }, + { + "@odata.type": "#Microsoft.Skills.Custom.WebApiSkill", + "name": "MyCustomWebApiSkill", + "uri": "https://contoso.example.org", + "httpMethod": "POST", + "timeout": "PT30S", + "batchSize": 1, + "inputs": [ + { + "name": "text", + "source": "/document/pages/*" + }, + { + "name": "languageCode", + "source": "/document/languageCode" + } + ], + "outputs": [ + { + "name": "customresult", + "targetName": "result" + } + ], + "httpHeaders": {} } ] } @@ -96,6 +121,7 @@ "skills": [ { "@odata.type": "#Microsoft.Skills.Text.EntityRecognitionSkill", + "name": "#1", "description": null, "context": null, "inputs": [ @@ -118,6 +144,7 @@ }, { "@odata.type": "#Microsoft.Skills.Text.LanguageDetectionSkill", + "name": "#2", "description": null, "context": null, "inputs": [ @@ -135,6 +162,7 @@ }, { "@odata.type": "#Microsoft.Skills.Text.SplitSkill", + "name": "#3", "description": null, "context": null, "inputs": [ @@ -159,6 +187,7 @@ }, { "@odata.type": "#Microsoft.Skills.Text.KeyPhraseExtractionSkill", + "name": "#4", "description": null, "context": "/document/pages/*", "inputs": [ @@ -179,6 +208,34 @@ ], "defaultLanguageCode": null, "maxKeyPhraseCount": null + }, + { + "@odata.type": "#Microsoft.Skills.Custom.WebApiSkill", + "name": "MyCustomWebApiSkill", + "description": null, + "context": "/document", + "uri": "https://contoso.example.org", + "httpMethod": "POST", + "timeout": "PT30S", + "batchSize": 1, + "degreeOfParallelism": null, + "inputs": [ + { + "name": "text", + "source": "/document/pages/*" + }, + { + "name": "languageCode", + "source": "/document/languageCode" + } + ], + "outputs": [ + { + "name": "customresult", + "targetName": "result" + } + ], + "httpHeaders": {} } ] } @@ -190,6 +247,7 @@ "skills": [ { "@odata.type": "#Microsoft.Skills.Text.EntityRecognitionSkill", + "name": "#1", "description": null, "context": null, "inputs": [ @@ -212,6 +270,7 @@ }, { "@odata.type": "#Microsoft.Skills.Text.LanguageDetectionSkill", + "name": "#2", "description": null, "context": null, "inputs": [ @@ -229,6 +288,7 @@ }, { "@odata.type": "#Microsoft.Skills.Text.SplitSkill", + "name": "#3", "description": null, "context": null, "inputs": [ @@ -253,6 +313,7 @@ }, { "@odata.type": "#Microsoft.Skills.Text.KeyPhraseExtractionSkill", + "name": "#4", "description": null, "context": "/document/pages/*", "inputs": [ @@ -273,6 +334,34 @@ ], "defaultLanguageCode": null, "maxKeyPhraseCount": null + }, + { + "@odata.type": "#Microsoft.Skills.Custom.WebApiSkill", + "name": "MyCustomWebApiSkill", + "description": null, + "context": "/document", + "uri": "https://contoso.example.org", + "httpMethod": "POST", + "timeout": "PT30S", + "batchSize": 1, + "degreeOfParallelism": null, + "inputs": [ + { + "name": "text", + "source": "/document/pages/*" + }, + { + "name": "languageCode", + "source": "/document/languageCode" + } + ], + "outputs": [ + { + "name": "customresult", + "targetName": "result" + } + ], + "httpHeaders": {} } ] } diff --git a/specification/search/data-plane/Microsoft.Azure.Search.Service/stable/2019-05-06/examples/SearchServiceCreateSkillset.json b/specification/search/data-plane/Microsoft.Azure.Search.Service/stable/2019-05-06/examples/SearchServiceCreateSkillset.json index a459519e32b9..e604929d9636 100644 --- a/specification/search/data-plane/Microsoft.Azure.Search.Service/stable/2019-05-06/examples/SearchServiceCreateSkillset.json +++ b/specification/search/data-plane/Microsoft.Azure.Search.Service/stable/2019-05-06/examples/SearchServiceCreateSkillset.json @@ -84,6 +84,31 @@ "targetName": "keyPhrases" } ] + }, + { + "@odata.type": "#Microsoft.Skills.Custom.WebApiSkill", + "name": "MyCustomWebApiSkill", + "uri": "https://contoso.example.org", + "httpMethod": "POST", + "timeout": "PT30S", + "batchSize": 1, + "inputs": [ + { + "name": "text", + "source": "/document/pages/*" + }, + { + "name": "languageCode", + "source": "/document/languageCode" + } + ], + "outputs": [ + { + "name": "customresult", + "targetName": "result" + } + ], + "httpHeaders": {} } ] } @@ -96,6 +121,7 @@ "skills": [ { "@odata.type": "#Microsoft.Skills.Text.EntityRecognitionSkill", + "name": "#1", "description": null, "context": null, "inputs": [ @@ -118,6 +144,7 @@ }, { "@odata.type": "#Microsoft.Skills.Text.LanguageDetectionSkill", + "name": "#2", "description": null, "context": null, "inputs": [ @@ -135,6 +162,7 @@ }, { "@odata.type": "#Microsoft.Skills.Text.SplitSkill", + "name": "#3", "description": null, "context": null, "inputs": [ @@ -159,6 +187,7 @@ }, { "@odata.type": "#Microsoft.Skills.Text.KeyPhraseExtractionSkill", + "name": "#4", "description": null, "context": "/document/pages/*", "inputs": [ @@ -179,6 +208,34 @@ ], "defaultLanguageCode": null, "maxKeyPhraseCount": null + }, + { + "@odata.type": "#Microsoft.Skills.Custom.WebApiSkill", + "name": "MyCustomWebApiSkill", + "description": null, + "context": "/document", + "uri": "https://contoso.example.org", + "httpMethod": "POST", + "timeout": "PT30S", + "batchSize": 1, + "degreeOfParallelism": null, + "inputs": [ + { + "name": "text", + "source": "/document/pages/*" + }, + { + "name": "languageCode", + "source": "/document/languageCode" + } + ], + "outputs": [ + { + "name": "customresult", + "targetName": "result" + } + ], + "httpHeaders": {} } ] } diff --git a/specification/search/data-plane/Microsoft.Azure.Search.Service/stable/2019-05-06/examples/SearchServiceGetIndexerStatus.json b/specification/search/data-plane/Microsoft.Azure.Search.Service/stable/2019-05-06/examples/SearchServiceGetIndexerStatus.json index 83e9dce778af..b4363864d2a3 100644 --- a/specification/search/data-plane/Microsoft.Azure.Search.Service/stable/2019-05-06/examples/SearchServiceGetIndexerStatus.json +++ b/specification/search/data-plane/Microsoft.Azure.Search.Service/stable/2019-05-06/examples/SearchServiceGetIndexerStatus.json @@ -43,17 +43,38 @@ { "key": "", "errorMessage": "Document key cannot be missing or empty.", - "statusCode": 400 + "statusCode": 400, + "name": null, + "details": null, + "documentationLink": null + }, + { + "key": "document id 1", + "errorMessage": "Could not read the value of column 'foo' at index '0'.", + "statusCode": 400, + "name": "DocumentExtraction.AzureBlob.MyDataSource", + "details": "The file could not be parsed.", + "documentationLink": "https://go.microsoft.com/fwlink/?linkid=2049388" } ], "warnings": [ { "key": "document id", - "message": "A warning doesn't stop indexing, and is intended to inform you of certain interesting situations, like when a blob indexer truncates the amount of text extracted from a blob." + "message": "A warning doesn't stop indexing, and is intended to inform you of certain interesting situations, like when a blob indexer truncates the amount of text extracted from a blob.", + "name": null, + "details": null, + "documentationLink": null + }, + { + "key": "document id 2", + "message": "Document was truncated to 50000 characters.", + "name": "Enrichment.LanguageDetectionSkill.#4", + "details": "The skill did something that didn't break anything, nonetheless something we didn't expect happened, so it might be worth double checking.", + "documentationLink": "https://go.microsoft.com/fwlink/?linkid=2099692" } ], "itemsProcessed": 1, - "itemsFailed": 1, + "itemsFailed": 2, "initialTrackingState": null, "finalTrackingState": null } diff --git a/specification/search/data-plane/Microsoft.Azure.Search.Service/stable/2019-05-06/examples/SearchServiceGetSkillset.json b/specification/search/data-plane/Microsoft.Azure.Search.Service/stable/2019-05-06/examples/SearchServiceGetSkillset.json index e552e1a0b9a3..f384a69c7ece 100644 --- a/specification/search/data-plane/Microsoft.Azure.Search.Service/stable/2019-05-06/examples/SearchServiceGetSkillset.json +++ b/specification/search/data-plane/Microsoft.Azure.Search.Service/stable/2019-05-06/examples/SearchServiceGetSkillset.json @@ -13,6 +13,7 @@ "skills": [ { "@odata.type": "#Microsoft.Skills.Text.EntityRecognitionSkill", + "name": "#1", "description": null, "context": null, "inputs": [ @@ -35,6 +36,7 @@ }, { "@odata.type": "#Microsoft.Skills.Text.LanguageDetectionSkill", + "name": "#2", "description": null, "context": null, "inputs": [ @@ -52,6 +54,7 @@ }, { "@odata.type": "#Microsoft.Skills.Text.SplitSkill", + "name": "#3", "description": null, "context": null, "inputs": [ @@ -76,6 +79,7 @@ }, { "@odata.type": "#Microsoft.Skills.Text.KeyPhraseExtractionSkill", + "name": "#4", "description": null, "context": "/document/pages/*", "inputs": [ @@ -96,6 +100,34 @@ ], "defaultLanguageCode": null, "maxKeyPhraseCount": null + }, + { + "@odata.type": "#Microsoft.Skills.Custom.WebApiSkill", + "name": "MyCustomWebApiSkill", + "description": null, + "context": "/document", + "uri": "https://contoso.example.org", + "httpMethod": "POST", + "timeout": "PT30S", + "batchSize": 1, + "degreeOfParallelism": null, + "inputs": [ + { + "name": "text", + "source": "/document/pages/*" + }, + { + "name": "languageCode", + "source": "/document/languageCode" + } + ], + "outputs": [ + { + "name": "customresult", + "targetName": "result" + } + ], + "httpHeaders": {} } ] } diff --git a/specification/search/data-plane/Microsoft.Azure.Search.Service/stable/2019-05-06/examples/SearchServiceListSkillsets.json b/specification/search/data-plane/Microsoft.Azure.Search.Service/stable/2019-05-06/examples/SearchServiceListSkillsets.json index 03705fc89a51..c0ae4f91a9ee 100644 --- a/specification/search/data-plane/Microsoft.Azure.Search.Service/stable/2019-05-06/examples/SearchServiceListSkillsets.json +++ b/specification/search/data-plane/Microsoft.Azure.Search.Service/stable/2019-05-06/examples/SearchServiceListSkillsets.json @@ -14,6 +14,7 @@ "skills": [ { "@odata.type": "#Microsoft.Skills.Text.EntityRecognitionSkill", + "name": "#1", "description": null, "context": null, "inputs": [ @@ -36,6 +37,7 @@ }, { "@odata.type": "#Microsoft.Skills.Text.LanguageDetectionSkill", + "name": "#2", "description": null, "context": null, "inputs": [ @@ -53,6 +55,7 @@ }, { "@odata.type": "#Microsoft.Skills.Text.SplitSkill", + "name": "#3", "description": null, "context": null, "inputs": [ @@ -77,6 +80,7 @@ }, { "@odata.type": "#Microsoft.Skills.Text.KeyPhraseExtractionSkill", + "name": "#4", "description": null, "context": "/document/pages/*", "inputs": [ @@ -97,6 +101,34 @@ ], "defaultLanguageCode": null, "maxKeyPhraseCount": null + }, + { + "@odata.type": "#Microsoft.Skills.Custom.WebApiSkill", + "name": "MyCustomWebApiSkill", + "description": null, + "context": "/document", + "uri": "https://contoso.example.org", + "httpMethod": "POST", + "timeout": "PT30S", + "batchSize": 1, + "degreeOfParallelism": null, + "inputs": [ + { + "name": "text", + "source": "/document/pages/*" + }, + { + "name": "languageCode", + "source": "/document/languageCode" + } + ], + "outputs": [ + { + "name": "customresult", + "targetName": "result" + } + ], + "httpHeaders": {} } ] } diff --git a/specification/search/data-plane/Microsoft.Azure.Search.Service/stable/2019-05-06/searchservice.json b/specification/search/data-plane/Microsoft.Azure.Search.Service/stable/2019-05-06/searchservice.json index 1cdd1dda3546..37a5f4f87bbc 100644 --- a/specification/search/data-plane/Microsoft.Azure.Search.Service/stable/2019-05-06/searchservice.json +++ b/specification/search/data-plane/Microsoft.Azure.Search.Service/stable/2019-05-06/searchservice.json @@ -3768,6 +3768,21 @@ "x-nullable": false, "readOnly": true, "description": "The status code indicating why the indexing operation failed. Possible values include: 400 for a malformed input document, 404 for document not found, 409 for a version conflict, 422 when the index is temporarily unavailable, or 503 for when the service is too busy." + }, + "name": { + "type": "string", + "readOnly": true, + "description": "The name of the source at which the error originated. For example, this could refer to a particular skill in the attached skillset. This may not be always available." + }, + "details": { + "type": "string", + "readOnly": true, + "description": "Additional, verbose details about the error to assist in debugging the indexer. This may not be always available." + }, + "documentationLink": { + "type": "string", + "readOnly": true, + "description": "A link to a troubleshooting guide for these classes of errors. This may not be always available." } }, "description": "Represents an item- or document-level indexing error." @@ -3783,6 +3798,21 @@ "type": "string", "readOnly": true, "description": "The message describing the warning that occurred while processing the item." + }, + "name": { + "type": "string", + "readOnly": true, + "description": "The name of the source at which the warning originated. For example, this could refer to a particular skill in the attached skillset. This may not be always available." + }, + "details": { + "type": "string", + "readOnly": true, + "description": "Additional, verbose details about the warning to assist in debugging the indexer. This may not be always available." + }, + "documentationLink": { + "type": "string", + "readOnly": true, + "description": "A link to a troubleshooting guide for these classes of warnings. This may not be always available." } }, "description": "Represents an item-level warning." @@ -4546,6 +4576,10 @@ "@odata.type": { "type": "string" }, + "name": { + "type": "string", + "description": "The name of the skill which uniquely identifies it within the skillset. A skill with no name defined will be given a default name of its 1-based index in the skills array, prefixed with the character '#'." + }, "description": { "type": "string", "description": "The description of the skill which describes the inputs, outputs, and usage of the skill." @@ -4947,6 +4981,12 @@ "format": "int32", "x-nullable": true, "description": "The desired batch size which indicates number of documents." + }, + "degreeOfParallelism": { + "type": "integer", + "format": "int32", + "x-nullable": true, + "description": "If set, the number of parallel calls that can be made to the Web API." } }, "required": [