Merge pull request Azure#9910 from MabOneSdk/users/sarath/policy-fixes

RecoveryServices : Adding new attribute to policy object

Author: cormacpayne

src/RecoveryServices/RecoveryServices.Backup.Helpers/Conversions/ConversionHelpers.cs

@@ -162,6 +162,8 @@ public static PolicyBase GetPolicyModelForAzureIaaSVM(ServiceClientModel.Protect
             iaasPolicyModel.BackupManagementType = BackupManagementType.AzureVM;
             iaasPolicyModel.SnapshotRetentionInDays = ((ServiceClientModel.AzureIaaSVMProtectionPolicy)serviceClientResponse.
                 Properties).InstantRpRetentionRangeInDays;
+            iaasPolicyModel.ProtectedItemsCount = ((ServiceClientModel.AzureIaaSVMProtectionPolicy)serviceClientResponse.
+                Properties).ProtectedItemsCount;
             iaasPolicyModel.RetentionPolicy = PolicyHelpers.GetPSLongTermRetentionPolicy((ServiceClientModel.LongTermRetentionPolicy)
                                               ((ServiceClientModel.AzureIaaSVMProtectionPolicy)serviceClientResponse.Properties).RetentionPolicy,
                                               ((ServiceClientModel.AzureIaaSVMProtectionPolicy)serviceClientResponse.Properties).TimeZone);

src/RecoveryServices/RecoveryServices.Backup.Models/AzureVmModels/AzureVmItem.cs

@@ -23,7 +23,9 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models
     public class AzureVmItem : AzureItem
     {
         public string VirtualMachineId { get; set; }
-        
+
+        public string HealthStatus { get; set; }
+
         /// <summary>
         /// Constructor. Takes the service client object representing the protected item 
         /// and converts it in to the PS protected item model
@@ -43,6 +45,7 @@ public AzureVmItem(ProtectedItemResource protectedItemResource,
                 EnumUtils.GetEnum<ItemProtectionState>(protectedItem.ProtectionState.ToString());
             ProtectionStatus = EnumUtils.GetEnum<ItemProtectionStatus>(protectedItem.ProtectionStatus);
             VirtualMachineId = protectedItem.VirtualMachineId;
+            HealthStatus = protectedItem.HealthStatus;
         }
     }
 

src/RecoveryServices/RecoveryServices.Backup.Models/AzureVmModels/AzureVmPolicy.cs

@@ -23,6 +23,11 @@ public class AzureVmPolicy : AzurePolicy
         /// Object defining the retention days for a snapshot
         /// </summary>
         public int? SnapshotRetentionInDays { get; set; }
+
+        /// <summary>
+        /// Object defining the number of associated items for the policy
+        /// </summary>
+        public int? ProtectedItemsCount { get; set; }
     }
 
 }

src/RecoveryServices/RecoveryServices.Backup.Models/Properties/Resources.Designer.cs

@@ -571,4 +571,7 @@ Please contact Microsoft for further assistance.</value>
   <data name="RetentionDurationCountInDaysInvalidException" xml:space="preserve">
     <value>RetentionDuration in Days should be from 7 - 9999</value>
   </data>
+  <data name="ProtectedItemsCountExceededException" xml:space="preserve">
+    <value>Cannot configure backup for more than 100 VMs per policy</value>
+  </data>
 </root>

src/RecoveryServices/RecoveryServices.Backup.Models/Properties/Resources.resx

@@ -87,6 +87,9 @@ public RestAzureNS.AzureOperationResponse<ProtectedItemResource> EnableProtectio
             bool isComputeAzureVM = false;
             string sourceResourceId = null;
 
+            AzureVmPolicy azureVmPolicy = (AzureVmPolicy)ProviderData[ItemParams.Policy];
+            ValidateProtectedItemCount(azureVmPolicy);
+
             if (itemBase == null)
             {
                 isComputeAzureVM = string.IsNullOrEmpty(azureVMCloudServiceName) ? true : false;
@@ -835,6 +838,15 @@ public void RegisterContainer()
 
         #region private
 
+
+        private void ValidateProtectedItemCount(AzureVmPolicy azureVmPolicy)
+        {
+            if (azureVmPolicy.ProtectedItemsCount > 100)
+            {
+                throw new ArgumentException(Resources.ProtectedItemsCountExceededException);
+            }
+        }
+
         private void ValidateAzureVMWorkloadType(CmdletModel.WorkloadType type)
         {
             if (type != CmdletModel.WorkloadType.AzureVM)
@@ -888,7 +900,6 @@ private void ValidateAzureVMProtectionPolicy(PolicyBase policy)
             }
 
             ValidateAzureVMWorkloadType(policy.WorkloadType);
-
             // call validation
             policy.Validate();
         }

src/RecoveryServices/RecoveryServices.Backup.Providers/Providers/IaasVmPsBackupProvider.cs

@@ -90,7 +90,6 @@
 			-Name $name `
 			-Location $location `
 			-Type "Standard_LRS"
-		$job | Wait-Job
 		$sa = Get-AzStorageAccount -ResourceGroupName $resourceGroupName -Name $name
 	}
  	return $name

src/RecoveryServices/RecoveryServices.Backup.Test/ScenarioTests/Common.ps1

@@ -70,6 +70,80 @@ function Create-VM(
 	return $vm
 }
 
+
+function Create-UnmanagedVM(
+	[string] $resourceGroupName,
+	[string] $location,
+	[string] $saname,
+	[int] $nick = 0)
+{
+	$suffix = $(Get-RandomSuffix 5) + $nick
+	$vmName = "PSTestVM" + $suffix
+
+	$vm = Get-AzVM -ResourceGroupName $resourceGroupName -Name $vmName -ErrorAction Ignore
+
+	if ($vm -eq $null)
+	{
+		$subnetConfigName = "PSTestSNC" + $suffix
+		$subnetConfig = New-AzVirtualNetworkSubnetConfig -Name $subnetConfigName -AddressPrefix 192.168.1.0/24
+
+
+		$vnetName = "PSTestVNET" + $suffix
+		$vnet = New-AzVirtualNetwork -ResourceGroupName $resourceGroupName -Location $location `
+			-Name $vnetName -AddressPrefix 192.168.0.0/16 -Subnet $subnetConfig -Force
+
+		$pipName = "pstestpublicdns" + $suffix
+		$pip = New-AzPublicIpAddress -ResourceGroupName $resourceGroupName -Location $location `
+			-AllocationMethod Static -IdleTimeoutInMinutes 4 -Name $pipName -Force
+
+
+		$nsgRuleRDPName = "PSTestNSGRuleRDP" + $suffix
+		$nsgRuleRDP = New-AzNetworkSecurityRuleConfig -Name $nsgRuleRDPName  -Protocol Tcp `
+			-Direction Inbound -Priority 1000 -SourceAddressPrefix * -SourcePortRange * -DestinationAddressPrefix * `
+			-DestinationPortRange 3389 -Access Allow
+
+		$nsgRuleWebName = "PSTestNSGRuleWeb" + $suffix
+		$nsgRuleWeb = New-AzNetworkSecurityRuleConfig -Name $nsgRuleWebName  -Protocol Tcp `
+			-Direction Inbound -Priority 1001 -SourceAddressPrefix * -SourcePortRange * -DestinationAddressPrefix * `
+			-DestinationPortRange 80 -Access Allow
+
+		$nsgName = "PSTestNSG" + $suffix
+		$nsg = New-AzNetworkSecurityGroup -ResourceGroupName $resourceGroupName -Location $location `
+			-Name $nsgName -SecurityRules $nsgRuleRDP,$nsgRuleWeb -Force
+
+
+		$nicName = "PSTestNIC" + $suffix
+		$nic = New-AzNetworkInterface -Name $nicName -ResourceGroupName $resourceGroupName -Location $location `
+			-SubnetId $vnet.Subnets[0].Id -PublicIpAddressId $pip.Id -NetworkSecurityGroupId $nsg.Id -Force
+
+		$UserName='demouser'
+		$PasswordString = $(Get-RandomSuffix 12)
+		$Password=$PasswordString| ConvertTo-SecureString -Force -AsPlainText
+		$Credential=New-Object PSCredential($UserName,$Password)
+
+
+		$vmsize = "Standard_D1"
+		$vm = New-AzVMConfig -VMName $vmName -VMSize $vmSize
+		$pubName = "MicrosoftWindowsServer"
+		$offerName = "WindowsServer"
+		$skuName = "2016-Datacenter"
+		$vm = Set-AzVMOperatingSystem -VM $vm -Windows -ComputerName $vmName -Credential $Credential
+		$vm = Set-AzVMSourceImage -VM $vm -PublisherName $pubName -Offer $offerName -Skus $skuName -Version "latest" 
+		$vm = Add-AzVMNetworkInterface -VM $vm -Id $NIC.Id 
+
+
+		$sa = Get-AzStorageAccount -ResourceGroupName $resourceGroupName -Name $saname
+		$diskName = "mydisk"
+		$OSDiskUri = $sa.PrimaryEndpoints.Blob.ToString() + "vhds/" + $diskName? + ".vhd"
+
+		$vm = Set-AzVMOSDisk -VM $vm -Name $diskName -VhdUri $OSDiskUri -CreateOption fromImage
+
+		New-AzVM -ResourceGroupName $resourceGroupName -Location $location -VM $vm | Out-Null
+	}
+
+	return $vm
+}
+
 function Create-GalleryVM(
 	[string] $resourceGroupName, 
 	[string] $location, 
@@ -164,7 +238,8 @@ function Start-TestSleep($milliseconds)
 
 function Enable-Protection(
 	$vault, 
-	$vm)
+	$vm,
+	[string] $resourceGroupName = "")
 {
     # Sleep to give the service time to add the default policy to the vault
     Start-TestSleep 5000
@@ -173,6 +248,11 @@ function Enable-Protection(
 		-ContainerType AzureVM `
 		-FriendlyName $vm.Name;
 
+	if($resourceGroupName -eq "")
+	{
+		$resourceGroupName = $vm.ResourceGroupName
+	}
+
 	if ($container -eq $null)
 	{
 		$policy = Get-AzRecoveryServicesBackupProtectionPolicy `
@@ -183,7 +263,7 @@ function Enable-Protection(
 			-VaultId $vault.ID `
 			-Policy $policy `
 			-Name $vm.Name `
-			-ResourceGroupName $vm.ResourceGroupName | Out-Null
+			-ResourceGroupName $resourceGroupName | Out-Null
 
 		$container = Get-AzRecoveryServicesBackupContainer `
 			-VaultId $vault.ID `

src/RecoveryServices/RecoveryServices.Backup.Test/ScenarioTests/IaasVm/Common.ps1

@@ -62,11 +62,8 @@ public void TestAzureVMGetRPs()
         }
 
 
-#if NETSTANDARD
-        [Fact(Skip = "Needs investigation, TestManagementClientHelper class wasn't initialized with the ResourceManagementClient client.")]
-#else
+
         [Fact]
-#endif
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         [Trait(TestConstants.Workload, TestConstants.AzureVM)]
         public void TestAzureVMFullRestore()
@@ -75,6 +72,15 @@ public void TestAzureVMFullRestore()
                 _logger, PsBackupProviderTypes.IaasVm, "Test-AzureVMFullRestore");
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(TestConstants.Workload, TestConstants.AzureVM)]
+        public void TestAzureUnmanagedVMFullRestore()
+        {
+            TestController.NewInstance.RunPsTest(
+                _logger, PsBackupProviderTypes.IaasVm, "Test-AzureUnmanagedVMFullRestore");
+        }
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         [Trait(TestConstants.Workload, TestConstants.AzureVM)]

src/RecoveryServices/RecoveryServices.Backup.Test/ScenarioTests/IaasVm/ItemTests.cs

@@ -145,6 +145,12 @@ function Test-AzureVMProtection
 			-Name $vm.Name `
 			-ResourceGroupName $vm.ResourceGroupName;
 
+		$policy = Get-AzRecoveryServicesBackupProtectionPolicy `
+			-VaultId $vault.ID `
+			-Name "DefaultPolicy";
+
+		Assert-True {$policy.ProtectedItemsCount -eq 1};
+
 		$container = Get-AzRecoveryServicesBackupContainer `
 			-VaultId $vault.ID `
 			-ContainerType AzureVM `
@@ -161,6 +167,13 @@ function Test-AzureVMProtection
 			-Item $item `
 			-RemoveRecoveryPoints `
 			-Force;
+		
+		$policy = Get-AzRecoveryServicesBackupProtectionPolicy `
+			-VaultId $vault.ID `
+			-Name "DefaultPolicy";
+
+		Assert-True {$policy.ProtectedItemsCount -eq 0};
+
 	}
 	finally
 	{
@@ -288,6 +301,36 @@ function Test-AzureVMFullRestore
 	}
 }
 
+function Test-AzureUnmanagedVMFullRestore
+{
+	$location = Get-ResourceGroupLocation
+	$resourceGroupName = Create-ResourceGroup $location
+	
+	try
+	{
+		$saName = Create-SA $resourceGroupName $location
+		$vm = Create-UnmanagedVM $resourceGroupName $location $saName
+		$vault = Create-RecoveryServicesVault $resourceGroupName $location
+		$item = Enable-Protection $vault $vm $resourceGroupName
+		$backupJob = Backup-Item $vault $item
+		$rp = Get-RecoveryPoint $vault $item $backupJob
+
+		$restoreJob = Restore-AzRecoveryServicesBackupItem `
+			-VaultId $vault.ID `
+			-VaultLocation $vault.Location `
+			-RecoveryPoint $rp `
+			-StorageAccountName $saName `
+			-StorageAccountResourceGroupName $resourceGroupName `
+			-UseOriginalStorageAccount | Wait-AzRecoveryServicesBackupJob -VaultId $vault.ID
+		
+		Assert-True { $restoreJob.Status -eq "Completed" }
+	}
+	finally
+	{
+		Cleanup-ResourceGroup $resourceGroupName
+	}
+}
+
 function Test-AzureVMRPMountScript
 {
 	$location = Get-ResourceGroupLocation