Additional TieringPolicy and ProtectedItemExtendedInfo details for Mi…

…crosoft.RecoveryServices version 2021-12-01 (#17517) * Additional TieringPolicy and ProtectedItemExtendedInfo details for version 2021-12-01 * Prettier Fix * Fixing ModelValidation * Fixing LintDiff * Added more details in description as per review comments * Updated description for oldestRecoveryPoint * Fixing Prettier * Test Fix for SDK generation * SemanticValidation Fixes
Azure · Mar 11, 2022 · d4881f6 · d4881f6
1 parent 08210cd
commit d4881f6
Show file tree

Hide file tree

Showing 5 changed files with 120 additions and 6 deletions.
diff --git a/...veryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-12-01/bms.json b/...veryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2021-12-01/bms.json
@@ -5451,7 +5451,22 @@
       "properties": {
         "oldestRecoveryPoint": {
           "format": "date-time",
-          "description": "The oldest backup copy available for this backup item.",
+          "description": "The oldest backup copy available for this backup item across all tiers.",
+          "type": "string"
+        },
+        "oldestRecoveryPointInVault": {
+          "format": "date-time",
+          "description": "The oldest backup copy available for this backup item in vault tier",
+          "type": "string"
+        },
+        "oldestRecoveryPointInArchive": {
+          "format": "date-time",
+          "description": "The oldest backup copy available for this backup item in archive tier",
+          "type": "string"
+        },
+        "newestRecoveryPointInArchive": {
+          "format": "date-time",
+          "description": "The latest backup copy available for this backup item in archive tier",
           "type": "string"
         },
         "recoveryPointCount": {
@@ -5485,6 +5500,13 @@
           "$ref": "#/definitions/RetentionPolicy",
           "description": "Retention policy with the details on backup copy retention ranges."
         },
+        "tieringPolicy": {
+          "description": "Tiering policy to automatically move RPs to another tier\r\nKey is Target Tier, defined in RecoveryPointTierType enum.\r\nTiering policy specifies the criteria to move RP to the target tier.",
+          "type": "object",
+          "additionalProperties": {
+            "$ref": "#/definitions/TieringPolicy"
+          }
+        },
         "instantRpRetentionRangeInDays": {
           "format": "int32",
           "description": "Instant RP retention policy range in days",
@@ -5804,7 +5826,22 @@
       "properties": {
         "oldestRecoveryPoint": {
           "format": "date-time",
-          "description": "The oldest backup copy available for this backup item.",
+          "description": "The oldest backup copy available for this backup item across all tiers.",
+          "type": "string"
+        },
+        "oldestRecoveryPointInVault": {
+          "format": "date-time",
+          "description": "The oldest backup copy available for this backup item in vault tier",
+          "type": "string"
+        },
+        "oldestRecoveryPointInArchive": {
+          "format": "date-time",
+          "description": "The oldest backup copy available for this backup item in archive tier",
+          "type": "string"
+        },
+        "newestRecoveryPointInArchive": {
+          "format": "date-time",
+          "description": "The latest backup copy available for this backup item in archive tier",
           "type": "string"
         },
         "recoveryPointCount": {
@@ -9001,6 +9038,13 @@
         "retentionPolicy": {
           "$ref": "#/definitions/RetentionPolicy",
           "description": "Retention policy with the details on backup copy retention ranges."
+        },
+        "tieringPolicy": {
+          "description": "Tiering policy to automatically move RPs to another tier.\r\nKey is Target Tier, defined in RecoveryPointTierType enum.\r\nTiering policy specifies the criteria to move RP to the target tier.",
+          "type": "object",
+          "additionalProperties": {
+            "$ref": "#/definitions/TieringPolicy"
+          }
         }
       }
     },
@@ -11346,7 +11390,7 @@
           "type": "string"
         }
       },
-      "x-ms-discriminator-value": "IaaSVMContainer"
+      "x-ms-discriminator-value": "IaasVMContainer"
     },
     "IaasVMILRRegistrationRequest": {
       "description": "Restore files/folders from a backup copy of IaaS VM.",
@@ -11936,7 +11980,10 @@
             "VMAppContainer",
             "SQLAGWorkLoadContainer",
             "StorageContainer",
-            "GenericContainer"
+            "GenericContainer",
+            "AzureWorkloadContainer",
+            "Microsoft.ClassicCompute/virtualMachines",
+            "Microsoft.Compute/virtualMachines"
           ],
           "type": "string",
           "x-ms-enum": {
@@ -12434,6 +12481,46 @@
           }
         }
       }
+    },
+    "TieringPolicy": {
+      "description": "Tiering Policy for a target tier.\r\nIf the policy is not specified for a given target tier, service retains the existing configured tiering policy for that tier",
+      "type": "object",
+      "properties": {
+        "tieringMode": {
+          "description": "Tiering Mode to control automatic tiering of recovery points. Supported values are:\r\n1. TierRecommended: Tier all recovery points recommended to be tiered\r\n2. TierAfter: Tier all recovery points after a fixed period, as specified in duration + durationType below.\r\n3. DoNotTier: Do not tier any recovery points",
+          "enum": [
+            "Invalid",
+            "TierRecommended",
+            "TierAfter",
+            "DoNotTier"
+          ],
+          "type": "string",
+          "x-ms-enum": {
+            "name": "TieringMode",
+            "modelAsString": true
+          }
+        },
+        "duration": {
+          "format": "int32",
+          "description": "Number of days/weeks/months/years to retain backups in current tier before tiering.\r\nUsed only if TieringMode is set to TierAfter",
+          "type": "integer"
+        },
+        "durationType": {
+          "description": "Retention duration type: days/weeks/months/years\r\nUsed only if TieringMode is set to TierAfter",
+          "enum": [
+            "Invalid",
+            "Days",
+            "Weeks",
+            "Months",
+            "Years"
+          ],
+          "type": "string",
+          "x-ms-enum": {
+            "name": "RetentionDurationType",
+            "modelAsString": true
+          }
+        }
+      }
     }
   },
   "parameters": {

diff --git a/...icrosoft.RecoveryServices/stable/2021-12-01/examples/AzureIaasVm/BackupPolicies_List.json b/...icrosoft.RecoveryServices/stable/2021-12-01/examples/AzureIaasVm/BackupPolicies_List.json
@@ -36,6 +36,11 @@
                   }
                 }
               },
+              "tieringPolicy": {
+                "ArchivedRP": {
+                  "tieringMode": "TierRecommended"
+                }
+              },
               "protectedItemsCount": 0
             }
           },
@@ -65,6 +70,13 @@
                   }
                 }
               },
+              "tieringPolicy": {
+                "ArchivedRP": {
+                  "tieringMode": "TierAfter",
+                  "duration": 12,
+                  "durationType": "Months"
+                }
+              },
               "timeZone": "Pacific Standard Time",
               "protectedItemsCount": 0
             }

diff --git a/...ft.RecoveryServices/stable/2021-12-01/examples/AzureIaasVm/BackupProtectedItems_List.json b/...ft.RecoveryServices/stable/2021-12-01/examples/AzureIaasVm/BackupProtectedItems_List.json
@@ -29,7 +29,15 @@
               "containerName": "iaasvmcontainer;iaasvm-rg;iaasvm-1",
               "sourceResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/providers/Microsoft.ClassicCompute/virtualMachines/iaasvm-1",
               "policyId": "/Subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/SwaggerTestRg/providers/Microsoft.RecoveryServices/vaults/NetSDKTestRsVault/backupPolicies/testPolicy1",
-              "lastRecoveryPoint": "2017-11-22T12:25:32.048723Z"
+              "lastRecoveryPoint": "2017-11-22T12:25:32.048723Z",
+              "extendedInfo": {
+                "oldestRecoveryPoint": "2021-01-30T00:09:30.8639311Z",
+                "oldestRecoveryPointInVault": "2021-01-30T00:09:30.8639311Z",
+                "oldestRecoveryPointInArchive": "2021-01-30T00:09:30.8639311Z",
+                "newestRecoveryPointInArchive": "2021-01-30T00:09:30.8639311Z",
+                "recoveryPointCount": 14,
+                "policyInconsistent": false
+              }
             }
           }
         ]

diff --git a/...rosoft.RecoveryServices/stable/2021-12-01/examples/AzureWorkload/BackupPolicies_List.json b/...rosoft.RecoveryServices/stable/2021-12-01/examples/AzureWorkload/BackupPolicies_List.json
@@ -43,6 +43,13 @@
                         "durationType": "Days"
                       }
                     }
+                  },
+                  "tieringPolicy": {
+                    "ArchivedRP": {
+                      "tieringMode": "TierAfter",
+                      "duration": 60,
+                      "durationType": "Days"
+                    }
                   }
                 },
                 {

diff --git a/specification/recoveryservicesbackup/resource-manager/readme.md b/specification/recoveryservicesbackup/resource-manager/readme.md
@@ -315,7 +315,7 @@ csharp:
   payload-flattening-threshold: 1
   license-header: MICROSOFT_MIT_NO_VERSION
   namespace: Microsoft.Azure.Management.RecoveryServices.Backup
-  output-folder: $(csharp-sdks-folder)/recoveryservices-backup/Microsoft.Azure.Management.RecoveryServices.Backup/src/Generated
+  output-folder: $(csharp-sdks-folder)/recoveryservices-backup/Microsoft.Azure.Management.RecoveryServices.Backup/src/recoveryservicesbackup/Generated
   clear-output-folder: true
 ```