Azure · wyunchi-ms · Sep 28, 2022 · Sep 2, 2022 · Sep 25, 2022 · Sep 26, 2022
diff --git a/src/RecoveryServices/RecoveryServices.Backup.Helpers/Conversions/JobConversions.cs b/src/RecoveryServices/RecoveryServices.Backup.Helpers/Conversions/JobConversions.cs
@@ -810,7 +810,8 @@ private static CmdletModel.AzureVmJob GetPSAzureVmJob(JobResource serviceClientJ
                         detailedResponse.SubTasks.Add(new CmdletModel.AzureVmJobSubTask()
                         {
                             Name = vmJobTask.TaskId,
-                            Status = vmJobTask.Status
+                            Status = vmJobTask.Status, 
+                            Duration = (vmJobTask.StartTime != null && vmJobTask.EndTime != null) ? vmJobTask.Duration : null
                         });
                     }
                 }

diff --git a/src/RecoveryServices/RecoveryServices.Backup.Helpers/Validations/PolicyValidations.cs b/src/RecoveryServices/RecoveryServices.Backup.Helpers/Validations/PolicyValidations.cs
@@ -25,7 +25,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers
     public partial class PolicyHelpers
     {
 
-        public static void ValidateLongTermRetentionPolicyWithTieringPolicy(LongTermRetentionPolicy ltrPolicy, TieringPolicy tieringPolicy, bool isPreviousTieringPolicy = false) // check resx messages 
+        public static void ValidateLongTermRetentionPolicyWithTieringPolicy(LongTermRetentionPolicy ltrPolicy, TieringPolicy tieringPolicy, bool isPreviousTieringPolicy = false) 
         {
             // To enable Archive(either TierRecommended or TierAfter), Monthly or Yearly retention needs to be set
             if(tieringPolicy != null && tieringPolicy.TieringMode != TieringMode.DoNotTier )

diff --git a/src/RecoveryServices/RecoveryServices.Backup.Models/AzureVmModels/AzureVmJob.cs b/src/RecoveryServices/RecoveryServices.Backup.Models/AzureVmModels/AzureVmJob.cs
@@ -12,6 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using System;
 using System.Collections.Generic;
 
 namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models
@@ -57,5 +58,11 @@ public class AzureVmJobErrorInfo : AzureJobErrorInfo { }
     /// <summary>
     /// Azure VM specific job sub-task class.
     /// </summary>
-    public class AzureVmJobSubTask : AzureJobSubTask { }
+    public class AzureVmJobSubTask : AzureJobSubTask {
+
+        /// <summary>
+        /// sub task duration
+        /// </summary>
+        public TimeSpan? Duration { get; set; }
+    }
 }
diff --git a/src/RecoveryServices/RecoveryServices.Backup.Models/CommonModels/Enums.cs b/src/RecoveryServices/RecoveryServices.Backup.Models/CommonModels/Enums.cs
@@ -199,6 +199,7 @@ public enum ContainerRegistrationStatus
         /// Represents the registered state of the container with the recovery services vault.
         /// </summary>
         Registered = 1,
+        NotRegistered = 2,
     }
 
     /// <summary>

diff --git a/src/RecoveryServices/RecoveryServices.Backup.Providers/AzureWorkloadProviderHelper.cs b/src/RecoveryServices/RecoveryServices.Backup.Providers/AzureWorkloadProviderHelper.cs
@@ -340,28 +340,13 @@ public List<ProtectedItemResource> ListProtectedItemsByContainer(
         {
             string vaultName = (string)providerData[CmdletModel.VaultParams.VaultName];
             string vaultResourceGroupName = (string)providerData[CmdletModel.VaultParams.ResourceGroupName];
-            string friendlyName = (string)providerData[CmdletModel.ContainerParams.FriendlyName];
-            CmdletModel.ContainerRegistrationStatus status =
-                (CmdletModel.ContainerRegistrationStatus)providerData[CmdletModel.ContainerParams.Status];
+            string friendlyName = (string)providerData[CmdletModel.ContainerParams.FriendlyName];            
 
             string nameQueryFilter = friendlyName;
-
-            ODataQuery<ServiceClientModel.BMSContainerQueryObject> queryParams = null;
-            if (status == 0)
-            {
-                queryParams = new ODataQuery<ServiceClientModel.BMSContainerQueryObject>(
+            ODataQuery<ServiceClientModel.BMSContainerQueryObject> queryParams = new ODataQuery<ServiceClientModel.BMSContainerQueryObject>(
                 q => q.FriendlyName == nameQueryFilter &&
                 q.BackupManagementType == backupManagementType);
-            }
-            else
-            {
-                var statusString = status.ToString();
-                queryParams = new ODataQuery<ServiceClientModel.BMSContainerQueryObject>(
-                q => q.FriendlyName == nameQueryFilter &&
-                q.BackupManagementType == backupManagementType &&
-                q.Status == statusString);
-            }
-
+
             var listResponse = ServiceClientAdapter.ListContainers(
                 queryParams,
                 vaultName: vaultName,

diff --git a/...RecoveryServices/RecoveryServices.Backup.Test/ScenarioTests/AzureFiles/ContainerTests.ps1 b/...RecoveryServices/RecoveryServices.Backup.Test/ScenarioTests/AzureFiles/ContainerTests.ps1
@@ -54,31 +54,27 @@ function Test-AzureFSContainer
 		# VARIATION-1: Get All Containers with only mandatory parameters
 		$containers = Get-AzRecoveryServicesBackupContainer `
 			-VaultId $vault.ID `
-			-ContainerType AzureStorage `
-			-Status Registered;
+			-ContainerType AzureStorage;
 		Assert-True { $containers.FriendlyName -contains $saName }
 
 		# VARIATION-2: Get Containers with friendly name filter
 		$containers = Get-AzRecoveryServicesBackupContainer `
 			-VaultId $vault.ID `
 			-ContainerType AzureStorage `
-			-Status Registered `
 			-FriendlyName $saName;
 		Assert-True { $containers.FriendlyName -contains $saName }
 
 		# VARIATION-3: Get Containers with resource group filter
 		$containers = Get-AzRecoveryServicesBackupContainer `
 			-VaultId $vault.ID `
 			-ContainerType AzureStorage `
-			-Status Registered `
 			-ResourceGroupName $resourceGroupName;
 		Assert-True { $containers.FriendlyName -contains $saName }
 
 		# VARIATION-4: Get Containers with friendly name and resource group filters
 		$containers = Get-AzRecoveryServicesBackupContainer `
 			-VaultId $vault.ID `
 			-ContainerType AzureStorage `
-			-Status Registered `
 			-FriendlyName $saName `
 			-ResourceGroupName $resourceGroupName;
 		Assert-True { $containers.FriendlyName -contains $saName }
@@ -97,7 +93,6 @@ function Test-AzureFSUnregisterContainer
 	$container = Get-AzRecoveryServicesBackupContainer `
 		-VaultId $vault.ID `
 		-ContainerType AzureStorage `
-		-Status Registered `
 		-FriendlyName $saName
 
 	# Disable Protection
@@ -114,7 +109,6 @@ function Test-AzureFSUnregisterContainer
 	$container = Get-AzRecoveryServicesBackupContainer `
 		-VaultId $vault.ID `
 		-ContainerType AzureStorage `
-		-Status Registered `
 		-FriendlyName $saName
 	Assert-Null $container	
 }
diff --git a/src/RecoveryServices/RecoveryServices.Backup.Test/ScenarioTests/AzureFiles/ItemTests.ps1 b/src/RecoveryServices/RecoveryServices.Backup.Test/ScenarioTests/AzureFiles/ItemTests.ps1
@@ -66,7 +66,6 @@ function Test-AzureFSItem
 		$container = Get-AzRecoveryServicesBackupContainer `
 			-VaultId $vault.ID `
 			-ContainerType AzureStorage `
-			-Status Registered `
 			-FriendlyName $saName
 
 		# VARIATION-1: Get all items for container
@@ -150,7 +149,6 @@ function Test-AzureFSBackup
 		$container = Get-AzRecoveryServicesBackupContainer `
 			-VaultId $vault.ID `
 			-ContainerType AzureStorage `
-			-Status Registered `
 			-FriendlyName $saName
 
 		# Trigger backup and wait for completion
@@ -185,7 +183,6 @@ function Test-AzureFSProtection
 		$container = Get-AzRecoveryServicesBackupContainer `
 			-VaultId $vault.ID `
 			-ContainerType AzureStorage `
-			-Status Registered `
 			-FriendlyName $saName
 
 		$item = Get-AzRecoveryServicesBackupItem `
@@ -231,7 +228,6 @@ function Test-AzureFSGetRPs
 		$container = Get-AzRecoveryServicesBackupContainer `
 			-VaultId $vault.ID `
 			-ContainerType AzureStorage `
-			-Status Registered `
 			-FriendlyName $saName
 		$backupJob = Backup-Item $vault $item
 
@@ -270,7 +266,6 @@ function Test-AzureFSFullRestore
 		$container = Get-AzRecoveryServicesBackupContainer `
 			-VaultId $vault.ID `
 			-ContainerType AzureStorage `
-			-Status Registered `
 			-FriendlyName $saName
 		$backupJob = Backup-Item $vault $item
 

diff --git a/src/RecoveryServices/RecoveryServices.Backup.Test/ScenarioTests/AzureFiles/JobTests.ps1 b/src/RecoveryServices/RecoveryServices.Backup.Test/ScenarioTests/AzureFiles/JobTests.ps1
@@ -68,7 +68,6 @@ function Test-AzureFSGetJob
 		$container = Get-AzRecoveryServicesBackupContainer `
 			-VaultId $vault.ID `
 			-ContainerType AzureStorage `
-			-Status Registered `
 			-FriendlyName $saName
 	}
 	finally
@@ -98,7 +97,6 @@ function Test-AzureFSWaitJob
 		$container = Get-AzRecoveryServicesBackupContainer `
 			-VaultId $vault.ID `
 			-ContainerType AzureStorage `
-			-Status Registered `
 			-FriendlyName $saName
 	}
 	finally
@@ -124,7 +122,6 @@ function Test-AzureFSCancelJob
 		$container = Get-AzRecoveryServicesBackupContainer `
 			-VaultId $vault.ID `
 			-ContainerType AzureStorage `
-			-Status Registered `
 			-FriendlyName $saName
 	}
 	finally

diff --git a/...ryServices/RecoveryServices.Backup.Test/ScenarioTests/AzureFiles/ProtectionCheckTests.ps1 b/...ryServices/RecoveryServices.Backup.Test/ScenarioTests/AzureFiles/ProtectionCheckTests.ps1
@@ -71,7 +71,6 @@ function Test-AzureFSProtectionCheck
 		$container = Get-AzRecoveryServicesBackupContainer `
 			-VaultId $vault.ID `
 			-ContainerType AzureStorage `
-			-Status Registered `
 			-FriendlyName $saName
 	}
 	finally

diff --git a/...overyServices/RecoveryServices.Backup.Test/ScenarioTests/AzureWorkload/ContainerTests.ps1 b/...overyServices/RecoveryServices.Backup.Test/ScenarioTests/AzureWorkload/ContainerTests.ps1
@@ -43,31 +43,27 @@ function Get-AzureVmWorkloadContainer
       # VARIATION-1: Get All Containers with only mandatory parameters
       $containers = Get-AzRecoveryServicesBackupContainer `
          -VaultId $vault.ID `
-         -ContainerType AzureVMAppContainer `
-         -Status Registered;
+         -ContainerType AzureVMAppContainer;
       Assert-True { $containers[0].FriendlyName -contains $containerName }
 
       # VARIATION-2: Get Containers with friendly name filter
       $containers = Get-AzRecoveryServicesBackupContainer `
          -VaultId $vault.ID `
          -ContainerType AzureVMAppContainer `
-         -Status Registered `
          -FriendlyName $containerName;
       Assert-True { $containers.FriendlyName -contains $containerName }
 
       # VARIATION-3: Get Containers with resource group filter
       $containers = Get-AzRecoveryServicesBackupContainer `
          -VaultId $vault.ID `
          -ContainerType AzureVMAppContainer `
-         -Status Registered `
          -ResourceGroupName $resourceGroupName;
       Assert-True { $containers[0].FriendlyName -contains $containerName }
 
       # VARIATION-4: Get Containers with friendly name and resource group filters
       $containers = Get-AzRecoveryServicesBackupContainer `
          -VaultId $vault.ID `
          -ContainerType AzureVMAppContainer `
-         -Status Registered `
          -FriendlyName $containerName `
          -ResourceGroupName $resourceGroupName;
       Assert-True { $containers.FriendlyName -contains $containerName }
@@ -98,13 +94,11 @@ function Unregister-AzureWorkloadContainer
       Get-AzRecoveryServicesBackupContainer `
          -VaultId $vault.ID `
          -ContainerType AzureVMAppContainer `
-         -Status Registered `
          -FriendlyName $containerName | Unregister-AzRecoveryServicesBackupContainer -VaultId $vault.ID
 
 	  $container = Get-AzRecoveryServicesBackupContainer `
          -VaultId $vault.ID `
          -ContainerType AzureVMAppContainer `
-         -Status Registered `
          -FriendlyName $containerName
       Assert-Null $container
 }
diff --git a/src/RecoveryServices/RecoveryServices.Backup.Test/ScenarioTests/AzureWorkload/PolicyTests.cs b/src/RecoveryServices/RecoveryServices.Backup.Test/ScenarioTests/AzureWorkload/PolicyTests.cs
@@ -35,5 +35,17 @@ public void TestAzureVmWorkloadPolicy()
                 "Test-AzureVmWorkloadPolicy"
             );
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(TestConstants.Workload, TestConstants.AzureVmWorkload)]
+        public void TestAzureVmWorkloadSmartTieringPolicy()
+        {
+            TestRunner.RunTestScript(
+                $"Import-Module {_AzureWorkloadcommonModule.AsAbsoluteLocation()}",
+                $"Import-Module {_AzureWorkloadtestModule.AsAbsoluteLocation()}",
+                "Test-AzureVmWorkloadSmartTieringPolicy"
+            );
+        }
     }
 }
diff --git a/...RecoveryServices/RecoveryServices.Backup.Test/ScenarioTests/AzureWorkload/PolicyTests.ps1 b/...RecoveryServices/RecoveryServices.Backup.Test/ScenarioTests/AzureWorkload/PolicyTests.ps1
@@ -21,6 +21,57 @@ $location = "centraluseuap"
 $resourceGroupName = "iaasvm-pstest-rg"
 $vaultName = "iaasvm-pstest-vault"
 
+function Test-AzureVmWorkloadSmartTieringPolicy
+{
+	$location = "centraluseuap"
+	$resourceGroupName = "hiagarg"
+	$vaultName = "hiagaVault"
+	$tierRecommendedPolicy =  "hiagaSQLArchiveTierRecommended"
+	$tierAfterPolicy = "hiagaSQLArchiveTierAfter"	
+	$archiveDisabledPolicy = "hiagaSQLArchiveDisabled"
+
+	try
+	{
+		$vault = Get-AzRecoveryServicesVault -ResourceGroupName $resourceGroupName -Name $vaultName
+
+		$schPol = Get-AzRecoveryServicesBackupSchedulePolicyObject -WorkloadType MSSQL -BackupManagementType AzureWorkload
+		$retPol = Get-AzRecoveryServicesBackupRetentionPolicyObject -WorkloadType MSSQL -BackupManagementType AzureWorkload
+
+		# error scenario - tier recommended not supported 
+		Assert-ThrowsContains { $pol = New-AzRecoveryServicesBackupProtectionPolicy -Name $tierRecommendedPolicy -WorkloadType MSSQL  -BackupManagementType AzureWorkload -RetentionPolicy $retPol -SchedulePolicy $schPol -VaultId $vault.ID  -MoveToArchiveTier $true -TieringMode TierRecommended } `
+		"Tiering mode TierRecommended is not supported for BackupManagementType AzureWorkload";
+
+
+		# error scenario for tier after policy
+		Assert-ThrowsContains { $pol = New-AzRecoveryServicesBackupProtectionPolicy -Name $tierAfterPolicy -WorkloadType MSSQL -BackupManagementType AzureWorkload -RetentionPolicy $retPol -SchedulePolicy $schPol -VaultId $vault.ID -MoveToArchiveTier $true -TieringMode TierAllEligible -TierAfterDuration 40 -TierAfterDurationType Days } `
+		"TierAfterDuration needs to be >= 45 Days, at least one retention policy for full backup (daily / weekly / monthly / yearly) should be >= (TierAfter + 180) days";
+
+		# create tier after policy 
+		$pol = New-AzRecoveryServicesBackupProtectionPolicy -Name $tierAfterPolicy  -WorkloadType MSSQL  -BackupManagementType AzureWorkload -RetentionPolicy $retPol -SchedulePolicy $schPol -VaultId $vault.ID  -MoveToArchiveTier $true -TieringMode TierAllEligible -TierAfterDuration 45 -TierAfterDurationType Days
+
+		Assert-True { $pol.Name -eq $tierAfterPolicy }	
+
+		# modify policy
+		$pol = Get-AzRecoveryServicesBackupProtectionPolicy  -VaultId $vault.ID | Where { $_.Name -match $tierAfterPolicy }
+		Set-AzRecoveryServicesBackupProtectionPolicy -VaultId $vault.ID -Policy $pol[0] -MoveToArchiveTier $false
+		Set-AzRecoveryServicesBackupProtectionPolicy -VaultId $vault.ID -Policy $pol[0] -MoveToArchiveTier $true -TieringMode TierAllEligible -TierAfterDuration 45 -TierAfterDurationType Days
+
+		# create archive disabled policy 
+		$pol = New-AzRecoveryServicesBackupProtectionPolicy -Name $archiveDisabledPolicy -WorkloadType MSSQL -BackupManagementType AzureWorkload -RetentionPolicy $retPol -SchedulePolicy $schPol -VaultId $vault.ID -MoveToArchiveTier $false
+		Assert-True { $pol.Name -eq $archiveDisabledPolicy }	
+	}
+	finally
+	{
+		# Cleanup		
+		# Delete policy
+		$pol = Get-AzRecoveryServicesBackupProtectionPolicy  -VaultId $vault.ID | Where { $_.Name -match "Archive" }
+
+		foreach ($policy in $pol){
+		   Remove-AzRecoveryServicesBackupProtectionPolicy -VaultId $vault.ID -Policy $policy -Force
+		}
+	}
+}
+
 function Test-AzureVmWorkloadPolicy
 {
 	$vault = Get-AzRecoveryServicesVault -ResourceGroupName $resourceGroupName -Name $vaultName

diff --git a/src/RecoveryServices/RecoveryServices.Backup.Test/ScenarioTests/IaasVm/Common.ps1 b/src/RecoveryServices/RecoveryServices.Backup.Test/ScenarioTests/IaasVm/Common.ps1
@@ -258,7 +258,7 @@ function Enable-Protection(
 		$resourceGroupName = $vm.ResourceGroupName
 	}
 
-	if ($container -eq $null)
+	if ($container -eq $null -or $container.Status -ne "Registered")
 	{
 		$policy = Get-AzRecoveryServicesBackupProtectionPolicy `
 			-VaultId $vault.ID `
@@ -282,5 +282,24 @@ function Enable-Protection(
 		-WorkloadType AzureVM `
 		-Name $vm.Name
 
+	if ($item -eq $null)
+	{
+		$policy = Get-AzRecoveryServicesBackupProtectionPolicy `
+			-VaultId $vault.ID `
+			-Name "DefaultPolicy";
+
+		Enable-AzRecoveryServicesBackupProtection `
+			-VaultId $vault.ID `
+			-Policy $policy `
+			-Name $vm.Name `
+			-ResourceGroupName $resourceGroupName | Out-Null
+
+		$item = Get-AzRecoveryServicesBackupItem `
+		-VaultId $vault.ID `
+		-Container $container `
+		-WorkloadType AzureVM `
+		-Name $vm.Name
+	}
+
 	return $item
 }
diff --git a/src/RecoveryServices/RecoveryServices.Backup.Test/ScenarioTests/IaasVm/ContainerTests.ps1 b/src/RecoveryServices/RecoveryServices.Backup.Test/ScenarioTests/IaasVm/ContainerTests.ps1
@@ -35,23 +35,20 @@ function Test-AzureVMGetContainers
 		# VARIATION-1: Get All Containers with only mandatory parameters
 		$containers = Get-AzRecoveryServicesBackupContainer `
 			-VaultId $vault.ID `
-			-ContainerType AzureVM `
-			-Status Registered;
+			-ContainerType AzureVM;
 		Assert-True { $containers.FriendlyName -contains $vm.Name }
 
 		# VARIATION-2: Get Containers with friendly name filter
 		$containers = Get-AzRecoveryServicesBackupContainer `
 			-VaultId $vault.ID `
 			-ContainerType AzureVM `
-			-Status Registered `
 			-FriendlyName $vm.Name;
 		Assert-True { $containers.FriendlyName -contains $vm.Name }
 
 		# VARIATION-3: Get Containers with friendly name and resource group filters
 		$containers = Get-AzRecoveryServicesBackupContainer `
 			-VaultId $vault.ID `
 			-ContainerType AzureVM `
-			-Status Registered `
 			-FriendlyName $vm.Name `
 			-ResourceGroupName $vm.ResourceGroupName;
 		Assert-True { $containers.FriendlyName -contains $vm.Name }
@@ -60,7 +57,6 @@ function Test-AzureVMGetContainers
 		$containers = Get-AzRecoveryServicesBackupContainer `
 			-VaultId $vault.ID `
 			-ContainerType AzureVM `
-			-Status Registered `
 			-ResourceGroupName $vm.ResourceGroupName;
 		Assert-True { $containers.FriendlyName -contains $vm.Name }
 	}