Merge pull request #202 from MabOneSdk/anudeeb-dev1

Samuel Anudeep · Samuel Anudeep · commit eb8a7e914a99 · 2016-03-18T18:58:04.000+05:30
Build break fixes because of latest hydra dll
diff --git a/src/ResourceManager/RecoveryServices.Backup/Cmdlets/Container/GetAzureRmRecoveryServicesContainer.cs b/src/ResourceManager/RecoveryServices.Backup/Cmdlets/Container/GetAzureRmRecoveryServicesContainer.cs
@@ -15,7 +15,6 @@
 using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
 using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ProviderModel;
 using Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers;
-using Microsoft.Azure.Management.RecoveryServices.Backup.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/ResourceManager/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/GetAzureRmRecoveryServicesPolicy.cs b/src/ResourceManager/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/GetAzureRmRecoveryServicesPolicy.cs
@@ -20,7 +20,7 @@
 using System.Management.Automation;
 using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
 using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ProviderModel;
-using Microsoft.Azure.Management.RecoveryServices.Backup.Models;
+using HydraModel = Microsoft.Azure.Management.RecoveryServices.Backup.Models;
 using Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers;
 using Microsoft.Azure.Commands.RecoveryServices.Backup.Properties;
 
@@ -64,7 +64,7 @@ public override void ExecuteCmdlet()
                    PolicyCmdletHelpers.ValidateProtectionPolicyName(Name);
 
                    // query service
-                   ProtectionPolicyResponse policy = PolicyCmdletHelpers.GetProtectionPolicyByName(
+                   HydraModel.ProtectionPolicyResponse policy = PolicyCmdletHelpers.GetProtectionPolicyByName(
                                                      Name,
                                                      HydraAdapter);
                    if (policy == null)
@@ -113,16 +113,15 @@ public override void ExecuteCmdlet()
                            break;
                    }
 
-                   ProtectionPolicyQueryParameters queryParams = new ProtectionPolicyQueryParameters()
+                   HydraModel.ProtectionPolicyQueryParameters queryParams = new HydraModel.ProtectionPolicyQueryParameters()
                    {
-                       DataSourceType = hydraDataSourceType,
-                       ProviderType = hydraProviderType
+                       BackupManagementType = hydraProviderType
                    };
-                   ProtectionPolicyListResponse respList = HydraAdapter.ListProtectionPolicy(queryParams);
+                   HydraModel.ProtectionPolicyListResponse respList = HydraAdapter.ListProtectionPolicy(queryParams);
                    if (respList != null && respList.ItemList != null &&
                        respList.ItemList.Value != null && respList.ItemList.Value.Count != 0)
                    {
-                       foreach (ProtectionPolicyResource policy in respList.ItemList.Value)
+                       foreach (HydraModel.ProtectionPolicyResource policy in respList.ItemList.Value)
                        {
                            AzureRmRecoveryServicesPolicyBase psModel = ConversionHelpers.GetPolicyModel(policy);
                            if (psModel != null)
diff --git a/src/ResourceManager/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/NewAzureRmRecoveryServicesPolicy.cs b/src/ResourceManager/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/NewAzureRmRecoveryServicesPolicy.cs
@@ -19,7 +19,7 @@
 using System.Collections.Generic;
 using System.Management.Automation;
 using Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers;
-using Microsoft.Azure.Management.RecoveryServices.Backup.Models;
+using HydraModel = Microsoft.Azure.Management.RecoveryServices.Backup.Models;
 using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
 using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ProviderModel;
 using Microsoft.Azure.Commands.RecoveryServices.Backup.Properties;
@@ -80,7 +80,7 @@ public override void ExecuteCmdlet()
                psBackupProvider.CreatePolicy();
 
                // now get the created policy and return
-               ProtectionPolicyResponse policy = PolicyCmdletHelpers.GetProtectionPolicyByName(
+               HydraModel.ProtectionPolicyResponse policy = PolicyCmdletHelpers.GetProtectionPolicyByName(
                                                          Name,
                                                          HydraAdapter);
                // now convert hydraPolicy to PSObject
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/ConversionHelpers.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/ConversionHelpers.cs
@@ -84,7 +84,7 @@ public static AzureRmRecoveryServicesPolicyBase GetPolicyModel(ProtectionPolicyR
 
                 policyModel = new AzureRmRecoveryServicesIaasVmPolicy();
                 AzureRmRecoveryServicesIaasVmPolicy iaasPolicyModel = policyModel as AzureRmRecoveryServicesIaasVmPolicy;
-                iaasPolicyModel.WorkloadType = WorkloadType.AzureVM;
+                iaasPolicyModel.WorkloadType = Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.WorkloadType.AzureVM;
                 iaasPolicyModel.BackupManagementType = BackupManagementType.AzureVM;
                 iaasPolicyModel.RetentionPolicy = PolicyHelpers.GetPSLongTermRetentionPolicy((LongTermRetentionPolicy)
                                                   ((AzureIaaSVMProtectionPolicy)hydraResponse.Properties).RetentionPolicy);
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/HydraHelpers.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/HydraHelpers.cs
@@ -15,7 +15,7 @@
 using System;
 using System.Collections.Specialized;
 using System.Web;
-using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
+using CmdletModel = Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
 using Microsoft.Azure.Management.RecoveryServices.Backup.Models;
 
 namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers
@@ -27,13 +27,13 @@ public class HydraConstants
 
     public class HydraHelpers
     {
-        public static string GetHydraProviderType(ContainerType containerType)
+        public static string GetHydraProviderType(CmdletModel.ContainerType containerType)
         {
             string providerType = string.Empty;
 
             switch (containerType)
             {
-                case ContainerType.AzureVM:
+                case CmdletModel.ContainerType.AzureVM:
                     providerType = ProviderType.AzureIaasVM.ToString();
                     break;
                 default:
@@ -43,13 +43,13 @@ public static string GetHydraProviderType(ContainerType containerType)
             return providerType;
         }
 
-        public static string GetHydraProviderType(WorkloadType workloadType)
+        public static string GetHydraProviderType(CmdletModel.WorkloadType workloadType)
         {
             string providerType = string.Empty;
 
             switch (workloadType)
             {
-                case WorkloadType.AzureVM:
+                case CmdletModel.WorkloadType.AzureVM:
                     providerType = ProviderType.AzureIaasVM.ToString();
                     break;
                 default:
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/Resources/Microsoft.Azure.Management.RecoveryServicesBackupManagement.dll b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/Resources/Microsoft.Azure.Management.RecoveryServicesBackupManagement.dll
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/IaasVmPsBackupProvider.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/IaasVmPsBackupProvider.cs
@@ -68,7 +68,8 @@ public RecoveryPointResponse GetRecoveryPoint()
         public ProtectionPolicyResponse CreatePolicy()
         {
             string policyName = (string)ProviderData.ProviderParameters[PolicyParams.PolicyName];
-            WorkloadType workloadType = (WorkloadType)ProviderData.ProviderParameters[PolicyParams.WorkloadType];
+            Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.WorkloadType workloadType = 
+                (Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.WorkloadType)ProviderData.ProviderParameters[PolicyParams.WorkloadType];
             BackupManagementType backupManagementType = (BackupManagementType)ProviderData.ProviderParameters[
                                                                               PolicyParams.BackupManagementType];
             AzureRmRecoveryServicesRetentionPolicyBase retentionPolicy = (AzureRmRecoveryServicesRetentionPolicyBase)
@@ -221,12 +222,12 @@ public void DeletePolicy()
         }
 
         #region private
-        private void ValidateAzureVMWorkloadType(WorkloadType type)
+        private void ValidateAzureVMWorkloadType(Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.WorkloadType type)
         {
-            if (type != WorkloadType.AzureVM)
+            if (type != Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.WorkloadType.AzureVM)
             {
                 throw new ArgumentException(string.Format(Resources.UnExpectedWorkLoadTypeException,
-                                            WorkloadType.AzureVM.ToString(),
+                                            Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.WorkloadType.AzureVM.ToString(),
                                             type.ToString()));
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`using System;`
`16`	`16`	`using System.Collections.Specialized;`
`17`	`17`	`using System.Web;`
`18`		`-using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;`
	`18`	`+using CmdletModel = Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;`
`19`	`19`	`using Microsoft.Azure.Management.RecoveryServices.Backup.Models;`
`20`	`20`
`21`	`21`	`namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers`
`@@ -27,13 +27,13 @@ public class HydraConstants`
`27`	`27`
`28`	`28`	`public class HydraHelpers`
`29`	`29`	`{`
`30`		`- public static string GetHydraProviderType(ContainerType containerType)`
	`30`	`+ public static string GetHydraProviderType(CmdletModel.ContainerType containerType)`
`31`	`31`	`{`
`32`	`32`	`string providerType = string.Empty;`
`33`	`33`
`34`	`34`	`switch (containerType)`
`35`	`35`	`{`
`36`		`- case ContainerType.AzureVM:`
	`36`	`+ case CmdletModel.ContainerType.AzureVM:`
`37`	`37`	`providerType = ProviderType.AzureIaasVM.ToString();`
`38`	`38`	`break;`
`39`	`39`	`default:`
`@@ -43,13 +43,13 @@ public static string GetHydraProviderType(ContainerType containerType)`
`43`	`43`	`return providerType;`
`44`	`44`	`}`
`45`	`45`
`46`		`- public static string GetHydraProviderType(WorkloadType workloadType)`
	`46`	`+ public static string GetHydraProviderType(CmdletModel.WorkloadType workloadType)`
`47`	`47`	`{`
`48`	`48`	`string providerType = string.Empty;`
`49`	`49`
`50`	`50`	`switch (workloadType)`
`51`	`51`	`{`
`52`		`- case WorkloadType.AzureVM:`
	`52`	`+ case CmdletModel.WorkloadType.AzureVM:`
`53`	`53`	`providerType = ProviderType.AzureIaasVM.ToString();`
`54`	`54`	`break;`
`55`	`55`	`default:`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,8 @@ public RecoveryPointResponse GetRecoveryPoint()`
`68`	`68`	`public ProtectionPolicyResponse CreatePolicy()`
`69`	`69`	`{`
`70`	`70`	`string policyName = (string)ProviderData.ProviderParameters[PolicyParams.PolicyName];`
`71`		`- WorkloadType workloadType = (WorkloadType)ProviderData.ProviderParameters[PolicyParams.WorkloadType];`
	`71`	`+ Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.WorkloadType workloadType =`
	`72`	`+ (Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.WorkloadType)ProviderData.ProviderParameters[PolicyParams.WorkloadType];`
`72`	`73`	`BackupManagementType backupManagementType = (BackupManagementType)ProviderData.ProviderParameters[`
`73`	`74`	`PolicyParams.BackupManagementType];`
`74`	`75`	`AzureRmRecoveryServicesRetentionPolicyBase retentionPolicy = (AzureRmRecoveryServicesRetentionPolicyBase)`
`@@ -221,12 +222,12 @@ public void DeletePolicy()`
`221`	`222`	`}`
`222`	`223`
`223`	`224`	`#region private`
`224`		`- private void ValidateAzureVMWorkloadType(WorkloadType type)`
	`225`	`+ private void ValidateAzureVMWorkloadType(Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.WorkloadType type)`
`225`	`226`	`{`
`226`		`- if (type != WorkloadType.AzureVM)`
	`227`	`+ if (type != Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.WorkloadType.AzureVM)`
`227`	`228`	`{`
`228`	`229`	`throw new ArgumentException(string.Format(Resources.UnExpectedWorkLoadTypeException,`
`229`		`- WorkloadType.AzureVM.ToString(),`
	`230`	`+ Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.WorkloadType.AzureVM.ToString(),`
`230`	`231`	`type.ToString()));`
`231`	`232`	`}`
`232`	`233`	`}`