Merge pull request #252 from MabOneSdk/pikumar-dev1

Changing cmdletName and updating hydra dll.

Author: pikumarmsft16

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/Resources/Microsoft.Azure.Management.RecoveryServicesBackupManagement.dll

@@ -54,11 +54,11 @@ public AzureRmRecoveryServicesContainerContext(ContainerType containerType, stri
 
     public class AzureRmRecoveryServicesBackupEngineContext : AzureRmRecoveryServicesBackupManagementContext
     {
-        public BackupEngineType BackupEngineType { get; set; }
+        public string BackupEngineType { get; set; }
 
         public AzureRmRecoveryServicesBackupEngineContext() { }
 
-        public AzureRmRecoveryServicesBackupEngineContext(BackupEngineType backupEngineType, string backupManagementType)
+        public AzureRmRecoveryServicesBackupEngineContext(string backupEngineType, string backupManagementType)
             : base(backupManagementType)
         {
             BackupEngineType = backupEngineType;
@@ -88,7 +88,7 @@ public class AzureRmRecoveryServicesBackupEngineBase : AzureRmRecoveryServicesBa
         public string Name { get; set; }
 
         public AzureRmRecoveryServicesBackupEngineBase(BackupEngineResource backupEngine)
-            : base(ConversionUtils.GetPsBackupEngineType(((BackupEngineBase)backupEngine.Properties).BackupEngineType),
+            : base(((BackupEngineBase)backupEngine.Properties).BackupEngineType,
                    ((BackupEngineBase)backupEngine.Properties).BackupManagementType)
         {
             Name = backupEngine.Name;

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/BaseObjects.cs

@@ -27,22 +27,19 @@ public enum ContainerType
         Windows
     }
 
-    public enum BackupEngineType
-    {
-        Invalid = 0,
-
-        DpmEngine,
-
-        DpmVenusEngine
-    }
-
     public enum BackupManagementType
     {
         AzureVM = 1,
         MARS,
         SCDPM
     }
 
+    public enum BackupEngineType
+    {
+        DpmBackupEngine = 1,
+        AzureBackupServerEngine
+    }
+
     public enum WorkloadType
     {
         AzureVM = 1,

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/CommonModels/Enums.cs

@@ -150,13 +150,6 @@ public static ContainerType GetPsContainerType(string containerType)
             }
         }
 
-        public static BackupEngineType GetPsBackupEngineType(string backupEngineType)
-        {
-            BackupEngineType type = 0;
-            Enum.TryParse(backupEngineType, out type);
-            return type;
-        }
-
         public static WorkloadType GetPsWorkloadType(string workloadType)
         {
             if (workloadType == Microsoft.Azure.Management.RecoveryServices.Backup.Models.WorkloadType.VM)

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/CommonModels/Utils.cs

@@ -28,7 +28,7 @@ function Test-PolicyScenario
 	$schedulePolicy = Get-AzureRmRecoveryServicesSchedulePolicyObject -WorkloadType "AzureVM"
 	$retPolicy = Get-AzureRmRecoveryServicesBackupRetentionPolicyObject -WorkloadType "AzureVM"
 
-    $temp = Get-AzureRmRecoveryServicesProtectionPolicy -Name "pwtest1"	
+    $temp = Get-AzureRmRecoveryServicesBackupProtectionPolicy -Name "pwtest1"	
 	Set-AzureRmRecoveryServicesBackupProtectionPolicy -RetentionPolicy $retPolicy -SchedulePolicy $schedulePolicy -Policy $temp
 
 	#cleanup 

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/ScenarioTests/IaasVm/PolicyTests.ps1

@@ -27,8 +27,8 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
     /// <summary>
     /// Get list of containers
     /// </summary>
-    [Cmdlet(VerbsCommon.Get, "AzureRmBackupManagementServer"), OutputType(typeof(AzureRmRecoveryServicesContainerBase))]
-    public class GetAzureRmBackupManagementServer : RecoveryServicesBackupCmdletBase
+    [Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesBackupManagementServer"), OutputType(typeof(AzureRmRecoveryServicesContainerBase))]
+    public class GetAzureRmRecoveryServicesBackupManagementServer : RecoveryServicesBackupCmdletBase
     {
         [Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Container.Name)]
         [ValidateNotNullOrEmpty]

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Container/GetAzureRmBackupManagementServer.cs renamed to src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Container/GetAzureRmRecoveryServicesBackupManagementServer.cs

@@ -38,7 +38,7 @@ public override void ExecuteCmdlet()
             {
                 base.ExecuteCmdlet();
 
-                if ((AzureRmBackupManagementServer.BackupEngineType != BackupEngineType.DpmEngine && AzureRmBackupManagementServer.BackupEngineType != BackupEngineType.DpmVenusEngine)||
+                if ((AzureRmBackupManagementServer.BackupEngineType != BackupEngineType.DpmBackupEngine.ToString() && AzureRmBackupManagementServer.BackupEngineType != BackupEngineType.AzureBackupServerEngine.ToString())||
                     AzureRmBackupManagementServer.BackupManagementType != BackupManagementType.SCDPM)
                 {
                     throw new ArgumentException(String.Format(Resources.UnsupportedAzureRmBackupManagementServerException, AzureRmBackupManagementServer.BackupEngineType, AzureRmBackupManagementServer.BackupManagementType));