From a84db0d7e91968e229f0b0baf5b990834b8328c5 Mon Sep 17 00:00:00 2001 From: Pratima Upadhyay Date: Tue, 29 Jun 2021 18:02:14 +0530 Subject: [PATCH 1/6] Fixing swagger correctness and completeness issues for RecoveryServicesBackup --- .../stable/2018-12-20/bms.json | 12 +- .../stable/2021-04-01/bms.json | 234 ++++++++++++++++++ .../AzureIaasVm/RecoveryPoints_List.json | 8 +- .../ProtectedItem_Delete_OperationStatus.json | 2 +- 4 files changed, 245 insertions(+), 11 deletions(-) diff --git a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2018-12-20/bms.json b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2018-12-20/bms.json index 708f9d32f3bd..2bc765d0a2a1 100644 --- a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2018-12-20/bms.json +++ b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2018-12-20/bms.json @@ -491,10 +491,10 @@ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{vaultName}/backupstorageconfig/vaultstorageconfig": { "get": { "tags": [ - "BackupResourceStorageConfigs" + "BackupResourceStorageConfigsCRR" ], "description": "Fetches resource storage config.", - "operationId": "BackupResourceStorageConfigs_Get", + "operationId": "BackupResourceStorageConfigsCRR_Get", "produces": [ "application/json" ], @@ -534,10 +534,10 @@ }, "put": { "tags": [ - "BackupResourceStorageConfigs" + "BackupResourceStorageConfigsCRR" ], "description": "Updates vault storage model type.", - "operationId": "BackupResourceStorageConfigs_Update", + "operationId": "BackupResourceStorageConfigsCRR_Update", "produces": [ "application/json" ], @@ -586,10 +586,10 @@ }, "patch": { "tags": [ - "BackupResourceStorageConfigs" + "BackupResourceStorageConfigsCRR" ], "description": "Updates vault storage model type.", - "operationId": "BackupResourceStorageConfigs_patch", + "operationId": "BackupResourceStorageConfigsCRR_patch", "parameters": [ { "$ref": "#/parameters/ApiVersion" diff --git a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-04-01/bms.json b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-04-01/bms.json index bb35d0d9bbf9..1b0375ecdc44 100644 --- a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-04-01/bms.json +++ b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-04-01/bms.json @@ -18,6 +18,149 @@ "application/json" ], "paths": { + "/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/ApiVersion" + }, + { + "$ref": "#/parameters/VaultName" + }, + { + "$ref": "#/parameters/ResourceGroupName" + }, + { + "$ref": "#/parameters/SubscriptionId" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/BackupResourceConfigResource" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/NewErrorResponse" + } + } + }, + "x-ms-examples": { + "Get Vault Storage Configuration": { + "$ref": "./examples/Common/BackupStorageConfig_Get.json" + } + } + }, + "put": { + "tags": [ + "BackupResourceStorageConfigs" + ], + "description": "Updates vault storage model type.", + "operationId": "BackupResourceStorageConfigs_Update", + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "#/parameters/ApiVersion" + }, + { + "$ref": "#/parameters/VaultName" + }, + { + "$ref": "#/parameters/ResourceGroupName" + }, + { + "$ref": "#/parameters/SubscriptionId" + }, + { + "name": "parameters", + "in": "body", + "description": "Vault storage config request", + "required": true, + "schema": { + "$ref": "#/definitions/BackupResourceConfigResource" + } + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/BackupResourceConfigResource" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/NewErrorResponse" + } + } + }, + "x-ms-examples": { + "Update Vault Storage Configuration": { + "$ref": "./examples/Common/BackupStorageConfig_Put.json" + } + } + }, + "patch": { + "tags": [ + "BackupResourceStorageConfigs" + ], + "description": "Updates vault storage model type.", + "operationId": "BackupResourceStorageConfigs_patch", + "parameters": [ + { + "$ref": "#/parameters/ApiVersion" + }, + { + "$ref": "#/parameters/VaultName" + }, + { + "$ref": "#/parameters/ResourceGroupName" + }, + { + "$ref": "#/parameters/SubscriptionId" + }, + { + "name": "parameters", + "in": "body", + "description": "Vault storage config request", + "required": true, + "schema": { + "$ref": "#/definitions/BackupResourceConfigResource" + } + } + ], + "responses": { + "204": { + "description": "NoContent" + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/NewErrorResponse" + } + } + }, + "x-ms-examples": { + "Update Vault Storage Configuration": { + "$ref": "./examples/Common/BackupStorageConfig_Patch.json" + } + } + } + }, "/Subscriptions/{subscriptionId}/providers/Microsoft.RecoveryServices/locations/{azureRegion}/backupPreValidateProtection": { "post": { "tags": [ @@ -3919,6 +4062,73 @@ } }, "definitions": { + "BackupResourceConfigResource": { + "description": "The resource storage details.", + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ], + "properties": { + "properties": { + "$ref": "#/definitions/BackupResourceConfig", + "description": "BackupResourceConfigResource properties" + } + } + }, + "BackupResourceConfig": { + "description": "The resource storage details.", + "type": "object", + "properties": { + "storageModelType": { + "description": "Storage type", + "enum": [ + "Invalid", + "GeoRedundant", + "LocallyRedundant", + "ZoneRedundant", + "ReadAccessGeoZoneRedundant" + ], + "type": "string", + "x-ms-enum": { + "name": "StorageType", + "modelAsString": true + } + }, + "storageType": { + "description": "Storage type.", + "enum": [ + "Invalid", + "GeoRedundant", + "LocallyRedundant", + "ZoneRedundant", + "ReadAccessGeoZoneRedundant" + ], + "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 + } + }, + "crossRegionRestoreFlag": { + "description": "Opt in details of Cross Region Restore feature.", + "type": "boolean" + } + } + }, "BackupResourceEncryptionConfig": { "type": "object", "properties": { @@ -7403,6 +7613,14 @@ "isRehydrate": { "description": "Flag to identify that deferred deleted DS is to be moved into Pause state", "type": "boolean" + }, + "policyName": { + "description": "Name of the policy used for protection.", + "type": "string" + }, + "isArchiveEnabled": { + "description": "Flag to identify whether datasource is protected in archive", + "type": "boolean" } }, "discriminator": "protectedItemType" @@ -8352,6 +8570,10 @@ "name": "SoftDeleteFeatureState", "modelAsString": true } + }, + "isSoftDeleteFeatureStateEditable": { + "description": "whether softDeleteFeatureState can be updated or not", + "type": "boolean" } } }, @@ -9225,6 +9447,10 @@ "registrationStatus": { "description": "Container registration status", "type": "string" + }, + "protectedItemsCount": { + "description": "Number of protected items", + "type": "integer" } } }, @@ -10358,6 +10584,10 @@ "virtualMachineId": { "description": "Fully qualified ARM ID of the virtual machine.", "type": "string" + }, + "virtualMachineVersion": { + "description": "Version of the virtual machine", + "type": "string" } }, "x-ms-discriminator-value": "IaaSVMProtectableItem" @@ -10886,6 +11116,10 @@ "name": "ContainerType", "modelAsString": true } + }, + "protectableObjectType": { + "description": "Type of the protectable object associated with this container.", + "type": "string" } }, "discriminator": "containerType" diff --git a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-04-01/examples/AzureIaasVm/RecoveryPoints_List.json b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-04-01/examples/AzureIaasVm/RecoveryPoints_List.json index 979951e5f8d1..96146884d502 100644 --- a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-04-01/examples/AzureIaasVm/RecoveryPoints_List.json +++ b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-04-01/examples/AzureIaasVm/RecoveryPoints_List.json @@ -26,12 +26,12 @@ "isInstantIlrSessionActive": false, "recoveryPointTierDetails": [ { - "type": "InstantRP", - "status": "Deleted" + "type": 1, + "status": 3 }, { - "type": "HardenedRP", - "status": "Valid" + "type": 2, + "status": 1 } ], "recoveryPointMoveReadinessInfo": { diff --git a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-04-01/examples/Common/ProtectedItem_Delete_OperationStatus.json b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-04-01/examples/Common/ProtectedItem_Delete_OperationStatus.json index 63e5d3412e3d..493f0919fdf3 100644 --- a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-04-01/examples/Common/ProtectedItem_Delete_OperationStatus.json +++ b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-04-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.00000Z" + "endTime": "2017-09-03T06:52:53.886027Z" } } } From 33d34888f417500251836a87ec98e32300deb578 Mon Sep 17 00:00:00 2001 From: Pratima Upadhyay Date: Wed, 30 Jun 2021 16:17:57 +0530 Subject: [PATCH 2/6] Adding examples --- .../Common/BackupStorageConfig_Get.json | 23 +++++++++++++++ .../Common/BackupStorageConfig_Patch.json | 17 +++++++++++ .../Common/BackupStorageConfig_Put.json | 29 +++++++++++++++++++ 3 files changed, 69 insertions(+) create mode 100644 specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-04-01/examples/Common/BackupStorageConfig_Get.json create mode 100644 specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-04-01/examples/Common/BackupStorageConfig_Patch.json create mode 100644 specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-04-01/examples/Common/BackupStorageConfig_Put.json diff --git a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-04-01/examples/Common/BackupStorageConfig_Get.json b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-04-01/examples/Common/BackupStorageConfig_Get.json new file mode 100644 index 000000000000..a22ef9d6df43 --- /dev/null +++ b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-04-01/examples/Common/BackupStorageConfig_Get.json @@ -0,0 +1,23 @@ +{ + "parameters": { + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "PythonSDKBackupTestRg", + "vaultName": "PySDKBackupTestRsVault", + "api-version": "2016-12-01" + }, + "responses": { + "200": { + "headers": {}, + "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/PythonSDKBackupTestRg/providers/Microsoft.RecoveryServices/vaults/PySDKBackupTestRsVault/backupstorageconfig/vaultstorageconfig", + "name": "vaultstorageconfig", + "type": "Microsoft.RecoveryServices/vaults/backupstorageconfig", + "properties": { + "storageModelType": "GeoRedundant", + "storageType": "GeoRedundant", + "storageTypeState": "Locked" + } + } + } + } +} diff --git a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-04-01/examples/Common/BackupStorageConfig_Patch.json b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-04-01/examples/Common/BackupStorageConfig_Patch.json new file mode 100644 index 000000000000..34f7e0fea52d --- /dev/null +++ b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-04-01/examples/Common/BackupStorageConfig_Patch.json @@ -0,0 +1,17 @@ +{ + "parameters": { + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "PythonSDKBackupTestRg", + "vaultName": "PySDKBackupTestRsVault", + "api-version": "2016-12-01", + "parameters": { + "properties": { + "storageType": "LocallyRedundant", + "storageTypeState": "Unlocked" + } + } + }, + "responses": { + "204": {} + } +} diff --git a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-04-01/examples/Common/BackupStorageConfig_Put.json b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-04-01/examples/Common/BackupStorageConfig_Put.json new file mode 100644 index 000000000000..67f6df781093 --- /dev/null +++ b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-04-01/examples/Common/BackupStorageConfig_Put.json @@ -0,0 +1,29 @@ +{ + "parameters": { + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "PythonSDKBackupTestRg", + "vaultName": "PySDKBackupTestRsVault", + "api-version": "2016-12-01", + "parameters": { + "properties": { + "storageType": "LocallyRedundant", + "storageTypeState": "Unlocked" + } + } + }, + "responses": { + "200": { + "headers": {}, + "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/PythonSDKBackupTestRg/providers/Microsoft.RecoveryServices/vaults/PySDKBackupTestRsVault/backupstorageconfig/vaultstorageconfig", + "name": "vaultstorageconfig", + "type": "Microsoft.RecoveryServices/vaults/backupstorageconfig", + "properties": { + "storageModelType": "LocallyRedundant", + "storageType": "LocallyRedundant", + "storageTypeState": "Unlocked" + } + } + } + } +} From 84173e8166a79b1360dcdd7ad2053b4757d12f8c Mon Sep 17 00:00:00 2001 From: Pratima Upadhyay Date: Fri, 2 Jul 2021 13:16:22 +0530 Subject: [PATCH 3/6] Fixing swagger completness --- .../stable/2018-12-20/bms.json | 12 +- .../stable/2021-04-01/bms.json | 170 ++++++++---------- .../AzureIaasVm/RecoveryPoints_List.json | 32 +--- 3 files changed, 86 insertions(+), 128 deletions(-) diff --git a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2018-12-20/bms.json b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2018-12-20/bms.json index 2bc765d0a2a1..708f9d32f3bd 100644 --- a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2018-12-20/bms.json +++ b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2018-12-20/bms.json @@ -491,10 +491,10 @@ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{vaultName}/backupstorageconfig/vaultstorageconfig": { "get": { "tags": [ - "BackupResourceStorageConfigsCRR" + "BackupResourceStorageConfigs" ], "description": "Fetches resource storage config.", - "operationId": "BackupResourceStorageConfigsCRR_Get", + "operationId": "BackupResourceStorageConfigs_Get", "produces": [ "application/json" ], @@ -534,10 +534,10 @@ }, "put": { "tags": [ - "BackupResourceStorageConfigsCRR" + "BackupResourceStorageConfigs" ], "description": "Updates vault storage model type.", - "operationId": "BackupResourceStorageConfigsCRR_Update", + "operationId": "BackupResourceStorageConfigs_Update", "produces": [ "application/json" ], @@ -586,10 +586,10 @@ }, "patch": { "tags": [ - "BackupResourceStorageConfigsCRR" + "BackupResourceStorageConfigs" ], "description": "Updates vault storage model type.", - "operationId": "BackupResourceStorageConfigsCRR_patch", + "operationId": "BackupResourceStorageConfigs_patch", "parameters": [ { "$ref": "#/parameters/ApiVersion" diff --git a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-04-01/bms.json b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-04-01/bms.json index 1b0375ecdc44..e9bd7a9d2bdc 100644 --- a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-04-01/bms.json +++ b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-04-01/bms.json @@ -21,10 +21,10 @@ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{vaultName}/backupstorageconfig/vaultstorageconfig": { "get": { "tags": [ - "BackupResourceStorageConfigs" + "BackupResourceStorageConfigsNonCRR" ], "description": "Fetches resource storage config.", - "operationId": "BackupResourceStorageConfigs_Get", + "operationId": "BackupResourceStorageConfigsNonCRR_Get", "produces": [ "application/json" ], @@ -64,10 +64,10 @@ }, "put": { "tags": [ - "BackupResourceStorageConfigs" + "BackupResourceStorageConfigsNonCRR" ], "description": "Updates vault storage model type.", - "operationId": "BackupResourceStorageConfigs_Update", + "operationId": "BackupResourceStorageConfigsNonCRR_Update", "produces": [ "application/json" ], @@ -116,10 +116,10 @@ }, "patch": { "tags": [ - "BackupResourceStorageConfigs" + "BackupResourceStorageConfigsNonCRR" ], "description": "Updates vault storage model type.", - "operationId": "BackupResourceStorageConfigs_patch", + "operationId": "BackupResourceStorageConfigsNonCRR_patch", "parameters": [ { "$ref": "#/parameters/ApiVersion" @@ -4062,73 +4062,6 @@ } }, "definitions": { - "BackupResourceConfigResource": { - "description": "The resource storage details.", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "properties": { - "properties": { - "$ref": "#/definitions/BackupResourceConfig", - "description": "BackupResourceConfigResource properties" - } - } - }, - "BackupResourceConfig": { - "description": "The resource storage details.", - "type": "object", - "properties": { - "storageModelType": { - "description": "Storage type", - "enum": [ - "Invalid", - "GeoRedundant", - "LocallyRedundant", - "ZoneRedundant", - "ReadAccessGeoZoneRedundant" - ], - "type": "string", - "x-ms-enum": { - "name": "StorageType", - "modelAsString": true - } - }, - "storageType": { - "description": "Storage type.", - "enum": [ - "Invalid", - "GeoRedundant", - "LocallyRedundant", - "ZoneRedundant", - "ReadAccessGeoZoneRedundant" - ], - "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 - } - }, - "crossRegionRestoreFlag": { - "description": "Opt in details of Cross Region Restore feature.", - "type": "boolean" - } - } - }, "BackupResourceEncryptionConfig": { "type": "object", "properties": { @@ -6095,6 +6028,73 @@ }, "x-ms-discriminator-value": "DpmJob" }, + "BackupResourceConfigResource": { + "description": "The resource storage details.", + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ], + "properties": { + "properties": { + "$ref": "#/definitions/BackupResourceConfig", + "description": "BackupResourceConfigResource properties" + } + } + }, + "BackupResourceConfig": { + "description": "The resource storage details.", + "type": "object", + "properties": { + "storageModelType": { + "description": "Storage type", + "enum": [ + "Invalid", + "GeoRedundant", + "LocallyRedundant", + "ZoneRedundant", + "ReadAccessGeoZoneRedundant" + ], + "type": "string", + "x-ms-enum": { + "name": "StorageType", + "modelAsString": true + } + }, + "storageType": { + "description": "Storage type.", + "enum": [ + "Invalid", + "GeoRedundant", + "LocallyRedundant", + "ZoneRedundant", + "ReadAccessGeoZoneRedundant" + ], + "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 + } + }, + "crossRegionRestoreFlag": { + "description": "Opt in details of Cross Region Restore feature.", + "type": "boolean" + } + } + }, "DpmJobExtendedInfo": { "description": "Additional information on the DPM workload-specific job.", "type": "object", @@ -7613,14 +7613,6 @@ "isRehydrate": { "description": "Flag to identify that deferred deleted DS is to be moved into Pause state", "type": "boolean" - }, - "policyName": { - "description": "Name of the policy used for protection.", - "type": "string" - }, - "isArchiveEnabled": { - "description": "Flag to identify whether datasource is protected in archive", - "type": "boolean" } }, "discriminator": "protectedItemType" @@ -8570,10 +8562,6 @@ "name": "SoftDeleteFeatureState", "modelAsString": true } - }, - "isSoftDeleteFeatureStateEditable": { - "description": "whether softDeleteFeatureState can be updated or not", - "type": "boolean" } } }, @@ -9447,10 +9435,6 @@ "registrationStatus": { "description": "Container registration status", "type": "string" - }, - "protectedItemsCount": { - "description": "Number of protected items", - "type": "integer" } } }, @@ -10584,10 +10568,6 @@ "virtualMachineId": { "description": "Fully qualified ARM ID of the virtual machine.", "type": "string" - }, - "virtualMachineVersion": { - "description": "Version of the virtual machine", - "type": "string" } }, "x-ms-discriminator-value": "IaaSVMProtectableItem" @@ -11116,10 +11096,6 @@ "name": "ContainerType", "modelAsString": true } - }, - "protectableObjectType": { - "description": "Type of the protectable object associated with this container.", - "type": "string" } }, "discriminator": "containerType" diff --git a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-04-01/examples/AzureIaasVm/RecoveryPoints_List.json b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-04-01/examples/AzureIaasVm/RecoveryPoints_List.json index 96146884d502..207d7279b695 100644 --- a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-04-01/examples/AzureIaasVm/RecoveryPoints_List.json +++ b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-04-01/examples/AzureIaasVm/RecoveryPoints_List.json @@ -6,7 +6,7 @@ "fabricName": "Azure", "containerName": "IaasVMContainer;iaasvmcontainerv2;rshhtestmdvmrg;rshmdvmsmall", "protectedItemName": "VM;iaasvmcontainerv2;rshhtestmdvmrg;rshmdvmsmall", - "api-version": "2021-01-01" + "api-version": "2019-05-13" }, "responses": { "200": { @@ -26,19 +26,14 @@ "isInstantIlrSessionActive": false, "recoveryPointTierDetails": [ { - "type": 1, - "status": 3 + "type": "InstantRP", + "status": "Valid" }, { - "type": 2, - "status": 1 + "type": "HardenedRP", + "status": "Valid" } ], - "recoveryPointMoveReadinessInfo": { - "Archive": { - "isReadyForMove": true - } - }, "isManagedVirtualMachine": true, "virtualMachineSize": "Standard_D1", "originalStorageAccountOption": false @@ -59,26 +54,13 @@ "recoveryPointTierDetails": [ { "type": "InstantRP", - "status": "Deleted" + "status": "Valid" }, { "type": "HardenedRP", - "status": "Deleted" - }, - { - "type": "ArchivedRP", - "status": "Rehydrated", - "extendedInfo": { - "RehydratedRPExpiryTime": "2020-12-21T22:48:25.4353958Z" - } + "status": "Valid" } ], - "recoveryPointMoveReadinessInfo": { - "ArchivedRP": { - "isReadyForMove": false, - "additionalInfo": "Recovery point cannot be moved to archive tier since it has already been moved." - } - }, "isManagedVirtualMachine": true, "virtualMachineSize": "Standard_D1", "originalStorageAccountOption": false, From 0f92ba57d046dace0ee51cca013131b70fe26318 Mon Sep 17 00:00:00 2001 From: Pratima Upadhyay Date: Wed, 7 Jul 2021 12:23:20 +0530 Subject: [PATCH 4/6] Updating tag in 2021-04-01 --- .../Microsoft.RecoveryServices/stable/2021-04-01/bms.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-04-01/bms.json b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-04-01/bms.json index e9bd7a9d2bdc..4994d4cf2cf8 100644 --- a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-04-01/bms.json +++ b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-04-01/bms.json @@ -21,7 +21,7 @@ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{vaultName}/backupstorageconfig/vaultstorageconfig": { "get": { "tags": [ - "BackupResourceStorageConfigsNonCRR" + "BackupResourceStorageConfigs" ], "description": "Fetches resource storage config.", "operationId": "BackupResourceStorageConfigsNonCRR_Get", @@ -64,7 +64,7 @@ }, "put": { "tags": [ - "BackupResourceStorageConfigsNonCRR" + "BackupResourceStorageConfigs" ], "description": "Updates vault storage model type.", "operationId": "BackupResourceStorageConfigsNonCRR_Update", @@ -116,7 +116,7 @@ }, "patch": { "tags": [ - "BackupResourceStorageConfigsNonCRR" + "BackupResourceStorageConfigs" ], "description": "Updates vault storage model type.", "operationId": "BackupResourceStorageConfigsNonCRR_patch", From 209126b33e9ea5749b983e52301b45b7626fd921 Mon Sep 17 00:00:00 2001 From: Pratima Upadhyay Date: Wed, 7 Jul 2021 12:34:06 +0530 Subject: [PATCH 5/6] Update --- .../Microsoft.RecoveryServices/stable/2021-04-01/bms.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-04-01/bms.json b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-04-01/bms.json index 4994d4cf2cf8..cdfd781fd9c3 100644 --- a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-04-01/bms.json +++ b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-04-01/bms.json @@ -18,7 +18,7 @@ "application/json" ], "paths": { - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{vaultName}/backupstorageconfig/vaultstorageconfig": { + "/Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{vaultName}/backupstorageconfig/vaultstorageconfig": { "get": { "tags": [ "BackupResourceStorageConfigs" From bae936788e621147ca5a18ed326f8a573f450fbd Mon Sep 17 00:00:00 2001 From: Pratima Upadhyay Date: Wed, 7 Jul 2021 14:14:26 +0530 Subject: [PATCH 6/6] Update --- .../Microsoft.RecoveryServices/stable/2021-04-01/bms.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-04-01/bms.json b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-04-01/bms.json index cdfd781fd9c3..6be5e3ba24ae 100644 --- a/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-04-01/bms.json +++ b/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-04-01/bms.json @@ -21,7 +21,7 @@ "/Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{vaultName}/backupstorageconfig/vaultstorageconfig": { "get": { "tags": [ - "BackupResourceStorageConfigs" + "BackupResourceStorageConfigsNonCRR" ], "description": "Fetches resource storage config.", "operationId": "BackupResourceStorageConfigsNonCRR_Get", @@ -64,7 +64,7 @@ }, "put": { "tags": [ - "BackupResourceStorageConfigs" + "BackupResourceStorageConfigsNonCRR" ], "description": "Updates vault storage model type.", "operationId": "BackupResourceStorageConfigsNonCRR_Update", @@ -116,7 +116,7 @@ }, "patch": { "tags": [ - "BackupResourceStorageConfigs" + "BackupResourceStorageConfigsNonCRR" ], "description": "Updates vault storage model type.", "operationId": "BackupResourceStorageConfigsNonCRR_patch",