Fixing swagger correctness and completeness issues for RecoveryServic…

…esBackup (Azure#15024) * Fixing swagger correctness and completeness issues for RecoveryServicesBackup * Adding examples * Fixing swagger completness * Updating tag in 2021-04-01 * Update * Update
toddm · Jul 8, 2021 · 2cbe9bd · 2cbe9bd
1 parent 55558c4
commit 2cbe9bd
Show file tree

Hide file tree

Showing 6 changed files with 284 additions and 23 deletions.
diff --git a/...veryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-04-01/bms.json b/...veryservicesbackup/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": [
+          "BackupResourceStorageConfigsNonCRR"
+        ],
+        "description": "Fetches resource storage config.",
+        "operationId": "BackupResourceStorageConfigsNonCRR_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": [
+          "BackupResourceStorageConfigsNonCRR"
+        ],
+        "description": "Updates vault storage model type.",
+        "operationId": "BackupResourceStorageConfigsNonCRR_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": [
+          "BackupResourceStorageConfigsNonCRR"
+        ],
+        "description": "Updates vault storage model type.",
+        "operationId": "BackupResourceStorageConfigsNonCRR_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": [
@@ -5885,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",

diff --git a/...icrosoft.RecoveryServices/stable/2021-04-01/examples/AzureIaasVm/RecoveryPoints_List.json b/...icrosoft.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": {
@@ -27,18 +27,13 @@
               "recoveryPointTierDetails": [
                 {
                   "type": "InstantRP",
-                  "status": "Deleted"
+                  "status": "Valid"
                 },
                 {
                   "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,

diff --git a/...Microsoft.RecoveryServices/stable/2021-04-01/examples/Common/BackupStorageConfig_Get.json b/...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/...crosoft.RecoveryServices/stable/2021-04-01/examples/Common/BackupStorageConfig_Patch.json b/...crosoft.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/...Microsoft.RecoveryServices/stable/2021-04-01/examples/Common/BackupStorageConfig_Put.json b/...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"
+        }
+      }
+    }
+  }
+}
diff --git a/...overyServices/stable/2021-04-01/examples/Common/ProtectedItem_Delete_OperationStatus.json b/...overyServices/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"
       }
     }
   }