From eca6fef4661b334cc5bdb083816e5c1b9a719230 Mon Sep 17 00:00:00 2001 From: Samuel Anudeep Date: Fri, 31 Mar 2017 06:40:20 +0530 Subject: [PATCH 1/4] Bug fixes and a few missing APIs --- .../2016-06-01/swagger/backup.json | 375 ++++++++++++++++++ .../swagger/registeredidentities.json | 4 +- .../2016-06-01/swagger/replicationusages.json | 20 + .../2016-06-01/swagger/vaults.json | 75 +++- .../compositeRecoveryServicesClient.json | 1 + 5 files changed, 471 insertions(+), 4 deletions(-) create mode 100644 arm-recoveryservices/2016-06-01/swagger/backup.json diff --git a/arm-recoveryservices/2016-06-01/swagger/backup.json b/arm-recoveryservices/2016-06-01/swagger/backup.json new file mode 100644 index 000000000000..e7de425cca08 --- /dev/null +++ b/arm-recoveryservices/2016-06-01/swagger/backup.json @@ -0,0 +1,375 @@ +{ + "swagger": "2.0", + "info": { + "version": "2016-12-01", + "title": "RecoveryServicesBackupClient", + "x-ms-code-generation-settings": { + "internalConstructors": false + } + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "paths": { + "/Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/operations": { + "get": { + "tags": [ + "Operations" + ], + "description": "Returns the list of available operations.", + "operationId": "Operations_List", + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "#/parameters/SubscriptionId" + }, + { + "$ref": "#/parameters/ApiVersion" + }, + { + "$ref": "#/parameters/ResourceGroupName" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "./vaults.json#/definitions/ClientDiscoveryResponse" + } + } + }, + "deprecated": false, + "x-ms-pageable": { + "nextLinkName": "NextLink" + } + } + }, + "/Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{vaultName}/backupconfig/vaultconfig": { + "get": { + "tags": [ + "BackupResourceVaultConfigs" + ], + "description": "Fetches resource vault config.", + "operationId": "BackupResourceVaultConfigs_Get", + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "#/parameters/SubscriptionId" + }, + { + "$ref": "#/parameters/ApiVersion" + }, + { + "$ref": "#/parameters/ResourceGroupName" + }, + { + "$ref": "#/parameters/VaultName" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/BackupResourceVaultConfigResource" + } + } + }, + "deprecated": false + }, + "patch": { + "tags": [ + "BackupResourceVaultConfigs" + ], + "description": "Updates vault config model type.", + "operationId": "BackupResourceVaultConfigs_Update", + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "#/parameters/SubscriptionId" + }, + { + "$ref": "#/parameters/ApiVersion" + }, + { + "$ref": "#/parameters/ResourceGroupName" + }, + { + "$ref": "#/parameters/VaultName" + }, + { + "name": "resourceBackupResourceVaultConfig", + "in": "body", + "description": "resourceBackupResourceVaultConfig", + "required": true, + "schema": { + "$ref": "#/definitions/BackupResourceVaultConfigResource" + } + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/BackupResourceVaultConfigResource" + } + } + }, + "deprecated": false + } + }, + "/Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{vaultName}/backupstorageconfig/vaultstorageconfig": { + "get": { + "tags": [ + "BackupResourceStorageConfigs" + ], + "description": "Fetches resource storage config.", + "operationId": "BackupResourceStorageConfigs_Get", + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "#/parameters/SubscriptionId" + }, + { + "$ref": "#/parameters/ApiVersion" + }, + { + "$ref": "#/parameters/ResourceGroupName" + }, + { + "$ref": "#/parameters/VaultName" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/BackupResourceConfigResource" + } + } + }, + "deprecated": false + }, + "patch": { + "tags": [ + "BackupResourceStorageConfigs" + ], + "description": "Updates vault storage model type.", + "operationId": "BackupResourceStorageConfigs_Update", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionId" + }, + { + "$ref": "#/parameters/ApiVersion" + }, + { + "$ref": "#/parameters/ResourceGroupName" + }, + { + "$ref": "#/parameters/VaultName" + }, + { + "name": "resourceBackupResourceConfig", + "in": "body", + "description": "resourceBackupResourceConfig", + "required": true, + "schema": { + "$ref": "#/definitions/BackupResourceConfigResource" + } + } + ], + "responses": { + "204": { + "description": "NoContent" + } + }, + "deprecated": false + } + } + }, + "definitions": { + "BackupResourceConfig": { + "description": "The resource storage details.", + "type": "object", + "properties": { + "storageModelType": { + "description": "Storage model type.", + "enum": [ + "Invalid", + "GeoRedundant", + "LocallyRedundant" + ], + "type": "string", + "x-ms-enum": { + "name": "StorageModelType", + "modelAsString": true + } + }, + "storageType": { + "description": "Storage type.", + "enum": [ + "Invalid", + "GeoRedundant", + "LocallyRedundant" + ], + "type": "string", + "x-ms-enum": { + "name": "StorageType", + "modelAsString": true + } + }, + "storageTypeState": { + "description": "Locked or Unlocked. Once a machine is registered against a resource, the storageTypeState is always Locked.", + "enum": [ + "Invalid", + "Locked", + "Unlocked" + ], + "type": "string", + "x-ms-enum": { + "name": "StorageTypeState", + "modelAsString": true + } + } + } + }, + "BackupResourceConfigResource": { + "description": "The resource storage details.", + "allOf": [ + { + "$ref": "./vaults.json#/definitions/Resource" + } + ], + "properties": { + "properties": { + "$ref": "#/definitions/BackupResourceConfig", + "x-ms-client-flatten": true + } + } + }, + "BackupResourceVaultConfig": { + "description": "Backup resource vault config details.", + "type": "object", + "properties": { + "storageType": { + "description": "Storage type.", + "enum": [ + "Invalid", + "GeoRedundant", + "LocallyRedundant" + ], + "type": "string", + "x-ms-enum": { + "name": "StorageType", + "modelAsString": true + } + }, + "storageTypeState": { + "description": "Locked or Unlocked. Once a machine is registered against a resource, the storageTypeState is always Locked.", + "enum": [ + "Invalid", + "Locked", + "Unlocked" + ], + "type": "string", + "x-ms-enum": { + "name": "StorageTypeState", + "modelAsString": true + } + }, + "enhancedSecurityState": { + "description": "Enabled or Disabled.", + "enum": [ + "Invalid", + "Enabled", + "Disabled" + ], + "type": "string", + "x-ms-enum": { + "name": "EnhancedSecurityState", + "modelAsString": true + } + } + } + }, + "BackupResourceVaultConfigResource": { + "description": "Backup resource vault config details.", + "allOf": [ + { + "$ref": "./vaults.json#/definitions/Resource" + } + ], + "properties": { + "properties": { + "$ref": "#/definitions/BackupResourceVaultConfig", + "x-ms-client-flatten": true + } + } + } +}, + "parameters": { + "SubscriptionId": { + "name": "subscriptionId", + "in": "path", + "description": "The subscription Id.", + "required": true, + "type": "string" + }, + "ResourceGroupName": { + "name": "resourceGroupName", + "in": "path", + "description": "The name of the resource group where the recovery services vault is present.", + "required": true, + "x-ms-parameter-location": "method", + "type": "string" + }, + "VaultName": { + "name": "vaultName", + "in": "path", + "description": "The name of the recovery services vault.", + "required": true, + "x-ms-parameter-location": "method", + "type": "string" + }, + "ApiVersion": { + "name": "api-version", + "in": "query", + "description": "Client Api Version.", + "required": true, + "type": "string" + } + }, + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "description": "Azure Active Directory OAuth2 Flow", + "flow": "implicit", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "scopes": { + "user_impersonation": "impersonate your user account." + } + } + }, + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ] +} \ No newline at end of file diff --git a/arm-recoveryservices/2016-06-01/swagger/registeredidentities.json b/arm-recoveryservices/2016-06-01/swagger/registeredidentities.json index 22629878c4e9..62b6f3246e31 100644 --- a/arm-recoveryservices/2016-06-01/swagger/registeredidentities.json +++ b/arm-recoveryservices/2016-06-01/swagger/registeredidentities.json @@ -180,7 +180,7 @@ } } }, - "ResourceCertificateAndAADDetails": { + "ResourceCertificateAndAadDetails": { "description": "Certificate details representing the Vault credentials for AAD.", "required": [ "certificate", @@ -227,7 +227,7 @@ }, "x-ms-discriminator-value": "AzureActiveDirectory" }, - "ResourceCertificateAndACSDetails": { + "ResourceCertificateAndAcsDetails": { "description": "Certificate details representing the Vault credentials for ACS.", "required": [ "certificate", diff --git a/arm-recoveryservices/2016-06-01/swagger/replicationusages.json b/arm-recoveryservices/2016-06-01/swagger/replicationusages.json index 6ffa7b6a0f48..5a3b216e2462 100644 --- a/arm-recoveryservices/2016-06-01/swagger/replicationusages.json +++ b/arm-recoveryservices/2016-06-01/swagger/replicationusages.json @@ -126,6 +126,18 @@ "eventsCount": { "description": "Count of all critical warnings.", "type": "integer" + }, + "deprecatedProviderCount": { + "description": "Count of all deprecated recovery service providers.", + "type": "integer" + }, + "supportedProviderCount": { + "description": "Count of all the supported recovery service providers.", + "type": "integer" + }, + "unsupportedProviderCount": { + "description": "Count of all the unsupported recovery service providers.", + "type": "integer" } } }, @@ -148,6 +160,14 @@ "recoveryPlanCount": { "description": "Number of replication recovery plans for this vault.", "type": "integer" + }, + "registeredServersCount": { + "description": "Number of servers registered to this vault.", + "type": "integer" + }, + "recoveryServicesProviderAuthType": { + "description": "The authentication type of recovery service providers in the vault.", + "type": "integer" } } }, diff --git a/arm-recoveryservices/2016-06-01/swagger/vaults.json b/arm-recoveryservices/2016-06-01/swagger/vaults.json index b2387a8e2572..122cd3cd1df0 100644 --- a/arm-recoveryservices/2016-06-01/swagger/vaults.json +++ b/arm-recoveryservices/2016-06-01/swagger/vaults.json @@ -605,6 +605,75 @@ } } }, + "UpgradeDetails": { + "description": "Details for upgrading vault.", + "type": "object", + "properties": { + "operationId": { + "description": "ID of the vault upgrade operation.", + "type": "string", + "readOnly": true + }, + "startTimeUtc": { + "description": "UTC time at which the upgrade operation has started.", + "type": "string", + "readOnly": true + }, + "lastUpdatedTimeUtc": { + "description": "UTC time at which the upgrade operation status was last updated.", + "type": "string", + "readOnly": true + }, + "endTimeUtc": { + "description": "UTC time at which the upgrade operation has ended.", + "type": "string", + "readOnly": true + }, + "status": { + "description": "Status of the vault upgrade operation.", + "enum": [ + "Unknown", + "InProgress", + "Upgraded", + "Failed" + ], + "type": "string", + "readOnly": true, + "x-ms-enum": { + "name": "VaultUpgradeState", + "modelAsString": true + } + }, + "message": { + "description": "Message to the user containing information about the upgrade operation.", + "type": "string", + "readOnly": true + }, + "triggerType": { + "description": "The way the vault upgradation was triggered.", + "enum": [ + "UserTriggered", + "ForcedUpgrade" + ], + "type": "string", + "readOnly": true, + "x-ms-enum": { + "name": "TriggerType", + "modelAsString": true + } + }, + "upgradedResourceId": { + "description": "Resource ID of the upgraded vault.", + "type": "string", + "readOnly": true + }, + "previousResourceId": { + "description": "Resource ID of the vault before the upgrade.", + "type": "string", + "readOnly": true + } + } + }, "Vault": { "description": "Resource information, as returned by the resource provider.", "type": "object", @@ -615,8 +684,7 @@ ], "properties": { "properties": { - "$ref": "#/definitions/VaultProperties", - "x-ms-client-flatten": true + "$ref": "#/definitions/VaultProperties" }, "sku": { "$ref": "#/definitions/Sku" @@ -684,6 +752,9 @@ "description": "Provisioning State.", "type": "string", "readOnly": true + }, + "upgradeDetails": { + "$ref": "#/definitions/UpgradeDetails" } } } diff --git a/arm-recoveryservices/compositeRecoveryServicesClient.json b/arm-recoveryservices/compositeRecoveryServicesClient.json index bfa3c308f55e..eb55da0ce75f 100644 --- a/arm-recoveryservices/compositeRecoveryServicesClient.json +++ b/arm-recoveryservices/compositeRecoveryServicesClient.json @@ -4,6 +4,7 @@ "description": "Composite Swagger for Recovery Services Client" }, "documents": [ + "./2016-06-01/swagger/backup.json", "./2016-06-01/swagger/registeredidentities.json", "./2016-06-01/swagger/replicationusages.json", "./2016-06-01/swagger/vaults.json", From da3d9ef20405b635f0cdc900ba1534af0af6bb34 Mon Sep 17 00:00:00 2001 From: Samuel Anudeep Date: Tue, 4 Apr 2017 06:19:40 +0530 Subject: [PATCH 2/4] Backup Vault Config and Backup Storage Config APIs - renamings. --- .../2016-06-01/swagger/backup.json | 56 +++++++++---------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/arm-recoveryservices/2016-06-01/swagger/backup.json b/arm-recoveryservices/2016-06-01/swagger/backup.json index e7de425cca08..45ce80f0a749 100644 --- a/arm-recoveryservices/2016-06-01/swagger/backup.json +++ b/arm-recoveryservices/2016-06-01/swagger/backup.json @@ -56,10 +56,10 @@ "/Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{vaultName}/backupconfig/vaultconfig": { "get": { "tags": [ - "BackupResourceVaultConfigs" + "BackupVaultConfigs" ], - "description": "Fetches resource vault config.", - "operationId": "BackupResourceVaultConfigs_Get", + "description": "Fetches vault config.", + "operationId": "BackupVaultConfigs_Get", "produces": [ "application/json" ], @@ -81,7 +81,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/BackupResourceVaultConfigResource" + "$ref": "#/definitions/BackupVaultConfigResource" } } }, @@ -89,10 +89,10 @@ }, "patch": { "tags": [ - "BackupResourceVaultConfigs" + "BackupVaultConfigs" ], "description": "Updates vault config model type.", - "operationId": "BackupResourceVaultConfigs_Update", + "operationId": "BackupVaultConfigs_Update", "produces": [ "application/json" ], @@ -110,12 +110,12 @@ "$ref": "#/parameters/VaultName" }, { - "name": "resourceBackupResourceVaultConfig", + "name": "backupVaultConfigResource", "in": "body", - "description": "resourceBackupResourceVaultConfig", + "description": "Backup vault config resource.", "required": true, "schema": { - "$ref": "#/definitions/BackupResourceVaultConfigResource" + "$ref": "#/definitions/BackupVaultConfigResource" } } ], @@ -123,7 +123,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/BackupResourceVaultConfigResource" + "$ref": "#/definitions/BackupVaultConfigResource" } } }, @@ -133,10 +133,10 @@ "/Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{vaultName}/backupstorageconfig/vaultstorageconfig": { "get": { "tags": [ - "BackupResourceStorageConfigs" + "BackupStorageConfigs" ], "description": "Fetches resource storage config.", - "operationId": "BackupResourceStorageConfigs_Get", + "operationId": "BackupStorageConfigs_Get", "produces": [ "application/json" ], @@ -158,7 +158,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/BackupResourceConfigResource" + "$ref": "#/definitions/BackupStorageConfigResource" } } }, @@ -166,10 +166,10 @@ }, "patch": { "tags": [ - "BackupResourceStorageConfigs" + "BackupStorageConfigs" ], "description": "Updates vault storage model type.", - "operationId": "BackupResourceStorageConfigs_Update", + "operationId": "BackupStorageConfigs_Update", "parameters": [ { "$ref": "#/parameters/SubscriptionId" @@ -184,12 +184,12 @@ "$ref": "#/parameters/VaultName" }, { - "name": "resourceBackupResourceConfig", + "name": "backupStorageConfigResource", "in": "body", - "description": "resourceBackupResourceConfig", + "description": "Backup storage config resource.", "required": true, "schema": { - "$ref": "#/definitions/BackupResourceConfigResource" + "$ref": "#/definitions/BackupStorageConfigResource" } } ], @@ -203,8 +203,8 @@ } }, "definitions": { - "BackupResourceConfig": { - "description": "The resource storage details.", + "BackupStorageConfig": { + "description": "The backup storage config.", "type": "object", "properties": { "storageModelType": { @@ -248,8 +248,8 @@ } } }, - "BackupResourceConfigResource": { - "description": "The resource storage details.", + "BackupStorageConfigResource": { + "description": "The backup storage config.", "allOf": [ { "$ref": "./vaults.json#/definitions/Resource" @@ -257,13 +257,13 @@ ], "properties": { "properties": { - "$ref": "#/definitions/BackupResourceConfig", + "$ref": "#/definitions/BackupStorageConfig", "x-ms-client-flatten": true } } }, - "BackupResourceVaultConfig": { - "description": "Backup resource vault config details.", + "BackupVaultConfig": { + "description": "Backup vault config details.", "type": "object", "properties": { "storageType": { @@ -307,8 +307,8 @@ } } }, - "BackupResourceVaultConfigResource": { - "description": "Backup resource vault config details.", + "BackupVaultConfigResource": { + "description": "Backup vault config details.", "allOf": [ { "$ref": "./vaults.json#/definitions/Resource" @@ -316,7 +316,7 @@ ], "properties": { "properties": { - "$ref": "#/definitions/BackupResourceVaultConfig", + "$ref": "#/definitions/BackupVaultConfig", "x-ms-client-flatten": true } } From 4c51ebb4b9a2dcd59182f1b6e6422d1332be2637 Mon Sep 17 00:00:00 2001 From: Samuel Anudeep Date: Tue, 4 Apr 2017 11:43:23 +0530 Subject: [PATCH 3/4] Backup Config API model renames --- .../2016-06-01/swagger/backup.json | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/arm-recoveryservices/2016-06-01/swagger/backup.json b/arm-recoveryservices/2016-06-01/swagger/backup.json index 45ce80f0a749..d53b807dcc54 100644 --- a/arm-recoveryservices/2016-06-01/swagger/backup.json +++ b/arm-recoveryservices/2016-06-01/swagger/backup.json @@ -81,7 +81,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/BackupVaultConfigResource" + "$ref": "#/definitions/BackupVaultConfig" } } }, @@ -110,12 +110,12 @@ "$ref": "#/parameters/VaultName" }, { - "name": "backupVaultConfigResource", + "name": "backupVaultConfig", "in": "body", - "description": "Backup vault config resource.", + "description": "Backup vault config.", "required": true, "schema": { - "$ref": "#/definitions/BackupVaultConfigResource" + "$ref": "#/definitions/BackupVaultConfig" } } ], @@ -123,7 +123,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/BackupVaultConfigResource" + "$ref": "#/definitions/BackupVaultConfig" } } }, @@ -158,7 +158,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/BackupStorageConfigResource" + "$ref": "#/definitions/BackupStorageConfig" } } }, @@ -184,12 +184,12 @@ "$ref": "#/parameters/VaultName" }, { - "name": "backupStorageConfigResource", + "name": "backupStorageConfig", "in": "body", - "description": "Backup storage config resource.", + "description": "Backup storage config.", "required": true, "schema": { - "$ref": "#/definitions/BackupStorageConfigResource" + "$ref": "#/definitions/BackupStorageConfig" } } ], @@ -203,7 +203,7 @@ } }, "definitions": { - "BackupStorageConfig": { + "BackupStorageConfigProperties": { "description": "The backup storage config.", "type": "object", "properties": { @@ -248,7 +248,7 @@ } } }, - "BackupStorageConfigResource": { + "BackupStorageConfig": { "description": "The backup storage config.", "allOf": [ { @@ -257,12 +257,12 @@ ], "properties": { "properties": { - "$ref": "#/definitions/BackupStorageConfig", + "$ref": "#/definitions/BackupStorageConfigProperties", "x-ms-client-flatten": true } } }, - "BackupVaultConfig": { + "BackupVaultConfigProperties": { "description": "Backup vault config details.", "type": "object", "properties": { @@ -307,7 +307,7 @@ } } }, - "BackupVaultConfigResource": { + "BackupVaultConfig": { "description": "Backup vault config details.", "allOf": [ { @@ -316,7 +316,7 @@ ], "properties": { "properties": { - "$ref": "#/definitions/BackupVaultConfig", + "$ref": "#/definitions/BackupVaultConfigProperties", "x-ms-client-flatten": true } } From d185152ee116a5e44f41f9194a38fe70c61e6493 Mon Sep 17 00:00:00 2001 From: Samuel Anudeep Date: Wed, 5 Apr 2017 00:27:34 +0530 Subject: [PATCH 4/4] Marking date time format --- arm-recoveryservices/2016-06-01/swagger/vaults.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/arm-recoveryservices/2016-06-01/swagger/vaults.json b/arm-recoveryservices/2016-06-01/swagger/vaults.json index 122cd3cd1df0..767b4998e067 100644 --- a/arm-recoveryservices/2016-06-01/swagger/vaults.json +++ b/arm-recoveryservices/2016-06-01/swagger/vaults.json @@ -617,17 +617,20 @@ "startTimeUtc": { "description": "UTC time at which the upgrade operation has started.", "type": "string", - "readOnly": true + "readOnly": true, + "format": "date-time" }, "lastUpdatedTimeUtc": { "description": "UTC time at which the upgrade operation status was last updated.", "type": "string", - "readOnly": true + "readOnly": true, + "format": "date-time" }, "endTimeUtc": { "description": "UTC time at which the upgrade operation has ended.", "type": "string", - "readOnly": true + "readOnly": true, + "format": "date-time" }, "status": { "description": "Status of the vault upgrade operation.",