Merge pull request #4834 from MabOneSdk/ilr

Added cmdlets instant file recovery and enhanced tests

Author: cormacpayne

src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/AzureRM.Storage.ps1

@@ -22,12 +22,12 @@ function Get-AzureRmStorageAccount
     }
     $sa = $getTask.Result
 
-	if($sa -ne $null)
-	{
-		$id = "/subscriptions/" + $context.Subscription.Id + "/resourceGroups/"+ $ResourceGroupName + "/providers/Microsoft.Storage/storageAccounts/" + $Name	  
-		$account = Get-StorageAccount $ResourceGroupName $Name $id
-		Write-Output $account 
-	}
+    if($sa -ne $null)
+    {
+        $id = "/subscriptions/" + $context.Subscription.Id + "/resourceGroups/"+ $ResourceGroupName + "/providers/Microsoft.Storage/storageAccounts/" + $Name	  
+        $account = Get-StorageAccount $ResourceGroupName $Name $id
+        Write-Output $account
+    }
   }
   END {}
 

src/ResourceManager/RecoveryServices.Backup/AzureRM.RecoveryServices.Backup.psd1

@@ -93,7 +93,9 @@ CmdletsToExport = 'Backup-AzureRmRecoveryServicesBackupItem',
                'Set-AzureRmRecoveryServicesBackupProtectionPolicy', 
                'Get-AzureRmRecoveryServicesBackupRecoveryPoint', 
                'Restore-AzureRmRecoveryServicesBackupItem', 
-               'Unregister-AzureRmRecoveryServicesBackupManagementServer'
+               'Unregister-AzureRmRecoveryServicesBackupManagementServer',
+               'Get-AzureRmRecoveryServicesBackupRPMountScript',
+               'Disable-AzureRmRecoveryServicesBackupRPMountScript'
 
 # Variables to export from this module
 # VariablesToExport = @()

src/ResourceManager/RecoveryServices.Backup/ChangeLog.md

@@ -18,6 +18,10 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Added cmdlets to perform instant file recovery.
+* Updated RecoveryServices.Backup SDK version to the latest
+* Updated tests for the Azure VM workload so that, all setups needed for test runs are done by the tests themselves.
+* Fixes https://github.com/Azure/azure-powershell/issues/3164
 
 ## Version 3.4.1
 

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Commands.RecoveryServices.Backup.Helpers.csproj

@@ -40,9 +40,9 @@
     <Reference Include="Microsoft.Azure.Common">
       <HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Azure.Management.RecoveryServices.Backup, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Azure.Management.RecoveryServices.Backup, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.Backup.1.1.2-preview\lib\net45\Microsoft.Azure.Management.RecoveryServices.Backup.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.Backup.2.1.0-preview\lib\net452\Microsoft.Azure.Management.RecoveryServices.Backup.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.3.10\lib\net452\Microsoft.Rest.ClientRuntime.dll</HintPath>

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

@@ -160,9 +160,11 @@ public static PolicyBase GetPolicyModel(ServiceClientModel.ProtectionPolicyResou
                 iaasPolicyModel.WorkloadType = WorkloadType.AzureVM;
                 iaasPolicyModel.BackupManagementType = BackupManagementType.AzureVM;
                 iaasPolicyModel.RetentionPolicy = PolicyHelpers.GetPSLongTermRetentionPolicy((ServiceClientModel.LongTermRetentionPolicy)
-                                                  ((ServiceClientModel.AzureIaaSVMProtectionPolicy)serviceClientResponse.Properties).RetentionPolicy);
+                                                  ((ServiceClientModel.AzureIaaSVMProtectionPolicy)serviceClientResponse.Properties).RetentionPolicy,
+                                                  ((ServiceClientModel.AzureIaaSVMProtectionPolicy)serviceClientResponse.Properties).TimeZone);
                 iaasPolicyModel.SchedulePolicy = PolicyHelpers.GetPSSimpleSchedulePolicy((ServiceClientModel.SimpleSchedulePolicy)
-                                                 ((ServiceClientModel.AzureIaaSVMProtectionPolicy)serviceClientResponse.Properties).SchedulePolicy);
+                                                 ((ServiceClientModel.AzureIaaSVMProtectionPolicy)serviceClientResponse.Properties).SchedulePolicy,
+                                                 ((ServiceClientModel.AzureIaaSVMProtectionPolicy)serviceClientResponse.Properties).TimeZone);
             }
             else if (serviceClientResponse.Properties.GetType() ==
                 typeof(ServiceClientModel.AzureSqlProtectionPolicy))
@@ -187,7 +189,7 @@ public static PolicyBase GetPolicyModel(ServiceClientModel.ProtectionPolicyResou
                 ServiceClientModel.SimpleRetentionPolicy azureSqlRetentionPolicy =
                     (ServiceClientModel.SimpleRetentionPolicy)azureSqlPolicy.RetentionPolicy;
                 sqlPolicyModel.RetentionPolicy =
-                    PolicyHelpers.GetPSSimpleRetentionPolicy(azureSqlRetentionPolicy);
+                    PolicyHelpers.GetPSSimpleRetentionPolicy(azureSqlRetentionPolicy, null);
             }
             else
             {

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/JobConversions.cs

@@ -193,13 +193,13 @@ public static string GetLastIdFromFullId(string fullId)
         /// <summary>
         /// Helper function to get job type from ps backup management type.
         /// </summary>
-        public static BackupManagementType GetJobTypeForService(
+        public static string GetJobTypeForService(
             CmdletModel.BackupManagementType mgmtType)
         {
             switch (mgmtType)
             {
                 case CmdletModel.BackupManagementType.AzureVM:
-                    return BackupManagementType.AzureIaasVM;
+                    return BackupManagementType.AzureIaasVM.ToString();
                 default:
                     throw new Exception("Invalid BackupManagementType provided: " + mgmtType);
             }

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/RetentionPolicyConversions.cs

@@ -16,6 +16,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
+using Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers;
 using Microsoft.Azure.Commands.RecoveryServices.Backup.Properties;
 using ServiceClientModel = Microsoft.Azure.Management.RecoveryServices.Backup.Models;
 
@@ -34,7 +35,7 @@ public partial class PolicyHelpers
         /// Helper function to convert ps long term retention policy from service response.
         /// </summary>
         public static LongTermRetentionPolicy GetPSLongTermRetentionPolicy(
-            ServiceClientModel.LongTermRetentionPolicy serviceClientRetPolicy)
+            ServiceClientModel.LongTermRetentionPolicy serviceClientRetPolicy, string timeZone)
         {
             if (serviceClientRetPolicy == null)
             {
@@ -46,25 +47,25 @@ public static LongTermRetentionPolicy GetPSLongTermRetentionPolicy(
             if (serviceClientRetPolicy.DailySchedule != null)
             {
                 ltrPolicy.IsDailyScheduleEnabled = true;
-                ltrPolicy.DailySchedule = GetPSLTRDailySchedule(serviceClientRetPolicy.DailySchedule);
+                ltrPolicy.DailySchedule = GetPSLTRDailySchedule(serviceClientRetPolicy.DailySchedule, timeZone);
             }
 
             if (serviceClientRetPolicy.WeeklySchedule != null)
             {
                 ltrPolicy.IsWeeklyScheduleEnabled = true;
-                ltrPolicy.WeeklySchedule = GetPSLTRWeeklySchedule(serviceClientRetPolicy.WeeklySchedule);
+                ltrPolicy.WeeklySchedule = GetPSLTRWeeklySchedule(serviceClientRetPolicy.WeeklySchedule, timeZone);
             }
 
             if (serviceClientRetPolicy.MonthlySchedule != null)
             {
                 ltrPolicy.IsMonthlyScheduleEnabled = true;
-                ltrPolicy.MonthlySchedule = GetPSLTRMonthlySchedule(serviceClientRetPolicy.MonthlySchedule);
+                ltrPolicy.MonthlySchedule = GetPSLTRMonthlySchedule(serviceClientRetPolicy.MonthlySchedule, timeZone);
             }
 
             if (serviceClientRetPolicy.YearlySchedule != null)
             {
                 ltrPolicy.IsYearlyScheduleEnabled = true;
-                ltrPolicy.YearlySchedule = GetPSLTRYearlySchedule(serviceClientRetPolicy.YearlySchedule);
+                ltrPolicy.YearlySchedule = GetPSLTRYearlySchedule(serviceClientRetPolicy.YearlySchedule, timeZone);
             }
 
             // safe side validate
@@ -74,7 +75,7 @@ public static LongTermRetentionPolicy GetPSLongTermRetentionPolicy(
         }
 
         public static SimpleRetentionPolicy GetPSSimpleRetentionPolicy(
-           ServiceClientModel.SimpleRetentionPolicy hydraRetPolicy)
+           ServiceClientModel.SimpleRetentionPolicy hydraRetPolicy, string timeZone)
         {
             if (hydraRetPolicy == null)
             {
@@ -231,7 +232,8 @@ private static int GetRetentionDurationInYears(ServiceClientModel.RetentionDurat
             return yearsCount;
         }
 
-        private static DailyRetentionSchedule GetPSLTRDailySchedule(ServiceClientModel.DailyRetentionSchedule serviceClientDaily)
+        private static DailyRetentionSchedule GetPSLTRDailySchedule(ServiceClientModel.DailyRetentionSchedule serviceClientDaily,
+            string timeZone)
         {
             if (serviceClientDaily == null)
             {
@@ -241,12 +243,13 @@ private static DailyRetentionSchedule GetPSLTRDailySchedule(ServiceClientModel.D
             DailyRetentionSchedule psDaily = new DailyRetentionSchedule();
 
             psDaily.DurationCountInDays = GetRetentionDurationInDays(serviceClientDaily.RetentionDuration);
-            psDaily.RetentionTimes = ParseDateTimesToUTC(serviceClientDaily.RetentionTimes);
+            psDaily.RetentionTimes = ParseDateTimesToUTC(serviceClientDaily.RetentionTimes, timeZone);
 
             return psDaily;
         }
 
-        private static WeeklyRetentionSchedule GetPSLTRWeeklySchedule(ServiceClientModel.WeeklyRetentionSchedule serviceClientWeekly)
+        private static WeeklyRetentionSchedule GetPSLTRWeeklySchedule(ServiceClientModel.WeeklyRetentionSchedule serviceClientWeekly,
+            string timeZone)
         {
             if (serviceClientWeekly == null)
             {
@@ -256,15 +259,16 @@ private static WeeklyRetentionSchedule GetPSLTRWeeklySchedule(ServiceClientModel
             WeeklyRetentionSchedule psWeekly = new WeeklyRetentionSchedule();
 
             psWeekly.DurationCountInWeeks = GetRetentionDurationInWeeks(serviceClientWeekly.RetentionDuration);
-            psWeekly.RetentionTimes = ParseDateTimesToUTC(serviceClientWeekly.RetentionTimes);
+            psWeekly.RetentionTimes = ParseDateTimesToUTC(serviceClientWeekly.RetentionTimes, timeZone);
             psWeekly.DaysOfTheWeek =
                 HelperUtils.EnumListConverter<ServiceClientModel.DayOfWeek?, DayOfWeek>(
                     serviceClientWeekly.DaysOfTheWeek);
 
             return psWeekly;
         }
 
-        private static MonthlyRetentionSchedule GetPSLTRMonthlySchedule(ServiceClientModel.MonthlyRetentionSchedule serviceClientMonthly)
+        private static MonthlyRetentionSchedule GetPSLTRMonthlySchedule(ServiceClientModel.MonthlyRetentionSchedule serviceClientMonthly,
+            string timeZone)
         {
             if (serviceClientMonthly == null)
             {
@@ -274,7 +278,7 @@ private static MonthlyRetentionSchedule GetPSLTRMonthlySchedule(ServiceClientMod
             MonthlyRetentionSchedule psMonthly = new MonthlyRetentionSchedule();
 
             psMonthly.DurationCountInMonths = GetRetentionDurationInMonths(serviceClientMonthly.RetentionDuration);
-            psMonthly.RetentionTimes = ParseDateTimesToUTC(serviceClientMonthly.RetentionTimes);
+            psMonthly.RetentionTimes = ParseDateTimesToUTC(serviceClientMonthly.RetentionTimes, timeZone);
             psMonthly.RetentionScheduleFormatType =
                 serviceClientMonthly.RetentionScheduleFormatType.ToEnum<RetentionScheduleFormat>();
             psMonthly.RetentionScheduleDaily = GetPSLTRDailyRetentionFormat(serviceClientMonthly.RetentionScheduleDaily);
@@ -283,7 +287,8 @@ private static MonthlyRetentionSchedule GetPSLTRMonthlySchedule(ServiceClientMod
             return psMonthly;
         }
 
-        private static YearlyRetentionSchedule GetPSLTRYearlySchedule(ServiceClientModel.YearlyRetentionSchedule serviceClientYearly)
+        private static YearlyRetentionSchedule GetPSLTRYearlySchedule(ServiceClientModel.YearlyRetentionSchedule serviceClientYearly,
+            string timeZone)
         {
             if (serviceClientYearly == null)
             {
@@ -293,7 +298,7 @@ private static YearlyRetentionSchedule GetPSLTRYearlySchedule(ServiceClientModel
             YearlyRetentionSchedule psYearly = new YearlyRetentionSchedule();
 
             psYearly.DurationCountInYears = GetRetentionDurationInYears(serviceClientYearly.RetentionDuration);
-            psYearly.RetentionTimes = ParseDateTimesToUTC(serviceClientYearly.RetentionTimes);
+            psYearly.RetentionTimes = ParseDateTimesToUTC(serviceClientYearly.RetentionTimes, timeZone);
             psYearly.RetentionScheduleFormatType =
                 serviceClientYearly.RetentionScheduleFormatType.ToEnum<RetentionScheduleFormat>();
             psYearly.RetentionScheduleDaily = GetPSLTRDailyRetentionFormat(serviceClientYearly.RetentionScheduleDaily);
@@ -378,10 +383,9 @@ public static ServiceClientModel.SimpleRetentionPolicy
                 ServiceClientModel.SimpleRetentionPolicy simpleRetPolicy =
                     new ServiceClientModel.SimpleRetentionPolicy();
 
-                string durationType = psRetPolicy.RetentionDurationType.ToString();
                 simpleRetPolicy.RetentionDuration = new ServiceClientModel.RetentionDuration();
                 simpleRetPolicy.RetentionDuration.DurationType =
-                    durationType.ToEnum<ServiceClientModel.RetentionDurationType>();
+                    ServiceClientHelpers.GetServiceClientRetentionDurationType(psRetPolicy.RetentionDurationType);
                 simpleRetPolicy.RetentionDuration.Count = psRetPolicy.RetentionCount;
 
                 return simpleRetPolicy;
@@ -496,8 +500,8 @@ private static ServiceClientModel.MonthlyRetentionSchedule GetServiceClientLTRMo
                                                   psMonthly.RetentionTimes);
 
             serviceClientMonthly.RetentionScheduleFormatType =
-                psMonthly.RetentionScheduleFormatType
-                    .ToEnum<ServiceClientModel.RetentionScheduleFormat>();
+                ServiceClientHelpers.GetServiceClientRetentionScheduleFormat(
+                    psMonthly.RetentionScheduleFormatType);
 
             if (psMonthly.RetentionScheduleFormatType == RetentionScheduleFormat.Daily)
             {
@@ -529,8 +533,8 @@ private static ServiceClientModel.YearlyRetentionSchedule GetServiceClientLTRYea
                                                  psYearly.RetentionTimes);
 
             serviceClientYearly.RetentionScheduleFormatType =
-                    psYearly.RetentionScheduleFormatType
-                        .ToEnum<ServiceClientModel.RetentionScheduleFormat>();
+                    ServiceClientHelpers.GetServiceClientRetentionScheduleFormat(
+                    psYearly.RetentionScheduleFormatType);
 
             if (psYearly.RetentionScheduleFormatType == RetentionScheduleFormat.Daily)
             {

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/SchedulePolicyConversions.cs

@@ -31,7 +31,7 @@ public partial class PolicyHelpers
         /// Helper function to convert ps simple schedule policy from service response.
         /// </summary>
         public static SimpleSchedulePolicy GetPSSimpleSchedulePolicy(
-            ServiceClientModel.SimpleSchedulePolicy serviceClientPolicy)
+            ServiceClientModel.SimpleSchedulePolicy serviceClientPolicy, string timeZone)
         {
             if (serviceClientPolicy == null)
             {
@@ -46,7 +46,7 @@ public static SimpleSchedulePolicy GetPSSimpleSchedulePolicy(
             psPolicy.ScheduleRunFrequency =
                 (ScheduleRunType)Enum.Parse(
                     typeof(ScheduleRunType), serviceClientPolicy.ScheduleRunFrequency.ToString());
-            psPolicy.ScheduleRunTimes = ParseDateTimesToUTC(serviceClientPolicy.ScheduleRunTimes);
+            psPolicy.ScheduleRunTimes = ParseDateTimesToUTC(serviceClientPolicy.ScheduleRunTimes, timeZone);
 
             // safe side validation
             psPolicy.Validate();
@@ -61,7 +61,7 @@ public static SimpleSchedulePolicy GetPSSimpleSchedulePolicy(
         // <summary>
         /// Helper function to parse utc time from local time.
         /// </summary>
-        public static List<DateTime> ParseDateTimesToUTC(IList<DateTime?> localTimes)
+        public static List<DateTime> ParseDateTimesToUTC(IList<DateTime?> localTimes, string timeZone)
         {
             if (localTimes == null || localTimes.Count == 0)
             {
@@ -78,9 +78,11 @@ public static List<DateTime> ParseDateTimesToUTC(IList<DateTime?> localTimes)
                     throw new ArgumentNullException("Policy date time object is null");
                 }
                 temp = localTime;
-                if (localTime.Kind != DateTimeKind.Utc)
+                if (!string.IsNullOrEmpty(timeZone))
                 {
-                    temp = localTime.ToUniversalTime();
+                    TimeZoneInfo timeZoneInfo = TimeZoneInfo.FindSystemTimeZoneById(timeZone);
+                    temp = DateTime.SpecifyKind(temp, DateTimeKind.Unspecified);
+                    temp = TimeZoneInfo.ConvertTimeToUtc(temp, timeZoneInfo);
                 }
                 utcTimes.Add(temp);
             }
@@ -101,7 +103,8 @@ public static ServiceClientModel.SimpleSchedulePolicy GetServiceClientSimpleSche
 
             ServiceClientModel.SimpleSchedulePolicy serviceClientPolicy = new ServiceClientModel.SimpleSchedulePolicy();
             serviceClientPolicy.ScheduleRunFrequency =
-                psPolicy.ScheduleRunFrequency.ToEnum<ServiceClientModel.ScheduleRunType>();
+                ServiceClientHelpers.GetServiceClientScheduleRunType(
+                    psPolicy.ScheduleRunFrequency);
 
             if (psPolicy.ScheduleRunFrequency == ScheduleRunType.Weekly)
             {