Merge pull request #250 from MabOneSdk/mkheranidev1

updating powershell code for new service changes

Author: mkherani

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

@@ -48,7 +48,8 @@ public static List<AzureRmRecoveryServicesRecoveryPointBase> GetPSAzureRecoveryP
                     RecoveryPointType = recPoint.RecoveryPointType,
                     RecoveryPointId = rp.Id,
                     WorkloadType = item.WorkloadType,
-                    RecoveryPointAdditionalInfo = recPoint.RecoveryPointAdditionalInfo,                    
+                    RecoveryPointAdditionalInfo = recPoint.RecoveryPointAdditionalInfo,
+                    SourceVMStorageType = recPoint.SourceVMStorageType,
                 };
                 result.Add(rpBase);
             }

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/AzureVmModels/AzureRmRecoveryServicesAzureVmRecoveryPoint.cs

@@ -28,6 +28,8 @@ public class AzureRmRecoveryServicesIaasVmRecoveryPoint : AzureRmRecoveryService
         /// 
         public string RecoveryPointAdditionalInfo { get; set; }
 
+        public string SourceVMStorageType { get; set; }
+
         public AzureRmRecoveryServicesIaasVmRecoveryPoint()
         {
 

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

@@ -407,4 +407,7 @@ Please contact Microsoft for further assistant.</value>
   <data name="JobFromNotProvided" xml:space="preserve">
     <value>Please provide From filter along with To filter.</value>
   </data>
+  <data name="RestoreOperation" xml:space="preserve">
+    <value>Restore Azure Backup Item Operation</value>
+  </data>
 </root>

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

@@ -26,11 +26,11 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
     [Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesBackupRetentionPolicyObject"), OutputType(typeof(AzureRmRecoveryServicesBackupRetentionPolicyBase))]
     public class GetAzureRmRecoveryServicesBackupRetentionPolicyObject : RecoveryServicesBackupCmdletBase
     {
-        [Parameter(Mandatory = true, HelpMessage = "Temp Help message. Need to update it")]
+        [Parameter(Mandatory = true, HelpMessage = ParamHelpMsg.Common.WorkloadType)]
         [ValidateNotNullOrEmpty]
         public WorkloadType WorkloadType { get; set; }
 
-        [Parameter(Mandatory = false, HelpMessage = "Temp Help message. Need to update it")]
+        [Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Common.BackupManagementType)]
         [ValidateNotNullOrEmpty]
         public BackupManagementType? BackupManagementType { get; set; }
 

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/ProtectionPolicy/GetAzureRmRecoveryServicesBackupRetentionPolicyObject.cs

@@ -26,11 +26,11 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
     [Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesSchedulePolicyObject"), OutputType(typeof(AzureRmRecoveryServicesBackupSchedulePolicyBase))]
     public class GetAzureRmRecoveryServicesSchedulePolicyObject : RecoveryServicesBackupCmdletBase
     {
-        [Parameter(Mandatory = true, HelpMessage = "Temp Help message. Need to update it")]
+        [Parameter(Mandatory = true, HelpMessage = ParamHelpMsg.Common.WorkloadType)]
         [ValidateNotNullOrEmpty]
         public WorkloadType WorkloadType { get; set; }
 
-        [Parameter(Mandatory = false, HelpMessage = "Temp Help message. Need to update it")]
+        [Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Common.BackupManagementType)]
         [ValidateNotNullOrEmpty]
         public BackupManagementType? BackupManagementType { get; set; }
 

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/ProtectionPolicy/GetAzureRmRecoveryServicesSchedulePolicyObject.cs

@@ -77,12 +77,8 @@ public override void ExecuteCmdlet()
                 string storageAccountlocation = resource.Resource.Location;
                 string storageAccountType = resource.Resource.Type;
 
-                //GetStorageResource(StorageAccountName, out storageAccountId, out storageAccountlocation, out storageAccountType);
-
                 WriteDebug(String.Format("StorageId = {0}", storageAccountId));
 
-                storageAccountId = StorageAccountName; //TBD: once service will migrate to storageID we will remove this line;
-
                 PsBackupProviderManager providerManager = new PsBackupProviderManager(new Dictionary<System.Enum, object>()
                 {
                     {RestoreBackupItemParams.RecoveryPoint, RecoveryPoint},
@@ -95,22 +91,7 @@ public override void ExecuteCmdlet()
                 var jobResponse = psBackupProvider.TriggerRestore();
 
                 WriteDebug(String.Format("Restore submitted"));
-                var response = HydraAdapter.GetProtectedItemOperationStatusByURL(jobResponse.AzureAsyncOperation);
-                while (response.OperationStatus.Status == "InProgress")
-                {
-                    WriteDebug(String.Format("Restore inProgress"));
-                    response = HydraAdapter.GetProtectedItemOperationStatusByURL(jobResponse.AzureAsyncOperation);
-                    TestMockSupport.Delay(TimeSpan.FromSeconds(5));
-                }
-
-                if (response.OperationStatus.Status == "Completed")
-                {
-                    // TBD -- Hydra change to add jobId in OperationStatusExtendedInfo
-                    WriteDebug(String.Format("Restore Completed"));
-                    string jobId = ""; //response.OperationStatus.Properties.jobId;
-                    var job = HydraAdapter.GetJob(jobId);
-                    //WriteObject(ConversionHelpers.GetJobModel(job));
-                }
+                HandleCreatedJob(jobResponse, Resources.RestoreOperation);
             });
         }