Skip to content

Commit cb8599c

Browse files
author
dragonfly91
committed
Fixing breaking changes in PS due to latest hydra
1 parent fc6522b commit cb8599c

File tree

6 files changed

+45
-46
lines changed

6 files changed

+45
-46
lines changed

src/ResourceManager/RecoveryServices.Backup/Cmdlets/Container/GetAzureRmRecoveryServicesContainer.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
1616
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ProviderModel;
1717
using Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers;
18-
using Microsoft.Azure.Management.RecoveryServices.Backup.Models;
1918
using System;
2019
using System.Collections.Generic;
2120
using System.Linq;

src/ResourceManager/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/GetAzureRmRecoveryServicesPolicy.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
using System.Management.Automation;
2121
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
2222
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ProviderModel;
23-
using Microsoft.Azure.Management.RecoveryServices.Backup.Models;
23+
using HydraModel = Microsoft.Azure.Management.RecoveryServices.Backup.Models;
2424
using Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers;
2525

2626
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
@@ -64,7 +64,7 @@ public override void ExecuteCmdlet()
6464
PolicyCmdletHelpers.ValidateProtectionPolicyName(Name);
6565

6666
// query service
67-
ProtectionPolicyResponse policy = PolicyCmdletHelpers.GetProtectionPolicyByName(
67+
HydraModel.ProtectionPolicyResponse policy = PolicyCmdletHelpers.GetProtectionPolicyByName(
6868
Name,
6969
HydraAdapter,
7070
rgName,

src/ResourceManager/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/NewAzureRmRecoveryServicesPolicy.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
using System.Collections.Generic;
2020
using System.Management.Automation;
2121
using Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers;
22-
using Microsoft.Azure.Management.RecoveryServices.Backup.Models;
22+
using HydraModel = Microsoft.Azure.Management.RecoveryServices.Backup.Models;
2323
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
2424
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ProviderModel;
2525

@@ -79,7 +79,7 @@ public override void ExecuteCmdlet()
7979
psBackupProvider.CreatePolicy();
8080

8181
// now get the created policy and return
82-
ProtectionPolicyResponse policy = PolicyCmdletHelpers.GetProtectionPolicyByName(
82+
HydraModel.ProtectionPolicyResponse policy = PolicyCmdletHelpers.GetProtectionPolicyByName(
8383
Name,
8484
HydraAdapter,
8585
rgName,

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15-
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
15+
using CmdletModel = Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
1616
using Microsoft.Azure.Management.RecoveryServices.Backup.Models;
1717
using System;
1818
using System.Collections.Generic;
@@ -25,25 +25,25 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers
2525
public class ConversionHelpers
2626
{
2727
#region containers
28-
public static AzureRmRecoveryServicesContainerBase GetContainerModel(ProtectionContainerResource protectionContainer)
28+
public static CmdletModel.AzureRmRecoveryServicesContainerBase GetContainerModel(ProtectionContainerResource protectionContainer)
2929
{
30-
AzureRmRecoveryServicesContainerBase containerModel = null;
30+
CmdletModel.AzureRmRecoveryServicesContainerBase containerModel = null;
3131

3232
if (protectionContainer != null &&
3333
protectionContainer.Properties != null)
3434
{
3535
if (protectionContainer.Properties.GetType().IsSubclassOf(typeof(AzureIaaSVMProtectionContainer)))
3636
{
37-
containerModel = new AzureRmRecoveryServicesIaasVmContainer(protectionContainer);
37+
containerModel = new CmdletModel.AzureRmRecoveryServicesIaasVmContainer(protectionContainer);
3838
}
3939
}
4040

4141
return containerModel;
4242
}
4343

44-
public static List<AzureRmRecoveryServicesContainerBase> GetContainerModelList(IEnumerable<ProtectionContainerResource> protectionContainers)
44+
public static List<CmdletModel.AzureRmRecoveryServicesContainerBase> GetContainerModelList(IEnumerable<ProtectionContainerResource> protectionContainers)
4545
{
46-
List<AzureRmRecoveryServicesContainerBase> containerModels = new List<AzureRmRecoveryServicesContainerBase>();
46+
List<CmdletModel.AzureRmRecoveryServicesContainerBase> containerModels = new List<CmdletModel.AzureRmRecoveryServicesContainerBase>();
4747

4848
foreach (var protectionContainer in protectionContainers)
4949
{
@@ -56,9 +56,9 @@ public static List<AzureRmRecoveryServicesContainerBase> GetContainerModelList(I
5656
#endregion
5757

5858
#region policy
59-
public static AzureRmRecoveryServicesPolicyBase GetPolicyModel(ProtectionPolicyResource hydraResponse)
59+
public static CmdletModel.AzureRmRecoveryServicesPolicyBase GetPolicyModel(ProtectionPolicyResource hydraResponse)
6060
{
61-
AzureRmRecoveryServicesPolicyBase policyModel = null;
61+
CmdletModel.AzureRmRecoveryServicesPolicyBase policyModel = null;
6262

6363
if(hydraResponse == null || hydraResponse.Properties == null)
6464
{
@@ -81,10 +81,10 @@ public static AzureRmRecoveryServicesPolicyBase GetPolicyModel(ProtectionPolicyR
8181
return null;
8282
}
8383

84-
policyModel = new AzureRmRecoveryServicesIaasVmPolicy();
85-
AzureRmRecoveryServicesIaasVmPolicy iaasPolicyModel = policyModel as AzureRmRecoveryServicesIaasVmPolicy;
86-
iaasPolicyModel.WorkloadType = WorkloadType.AzureVM;
87-
iaasPolicyModel.BackupManagementType = BackupManagementType.AzureVM;
84+
policyModel = new CmdletModel.AzureRmRecoveryServicesIaasVmPolicy();
85+
CmdletModel.AzureRmRecoveryServicesIaasVmPolicy iaasPolicyModel = policyModel as CmdletModel.AzureRmRecoveryServicesIaasVmPolicy;
86+
iaasPolicyModel.WorkloadType = CmdletModel.WorkloadType.AzureVM;
87+
iaasPolicyModel.BackupManagementType = CmdletModel.BackupManagementType.AzureVM;
8888
iaasPolicyModel.RetentionPolicy = PolicyHelpers.GetPSLongTermRetentionPolicy((LongTermRetentionPolicy)
8989
((AzureIaaSVMProtectionPolicy)hydraResponse.Properties).RetentionPolicy);
9090
iaasPolicyModel.SchedulePolicy = PolicyHelpers.GetPSSimpleSchedulePolicyPolicy((SimpleSchedulePolicy)
@@ -103,16 +103,16 @@ public static AzureRmRecoveryServicesPolicyBase GetPolicyModel(ProtectionPolicyR
103103
return policyModel;
104104
}
105105

106-
public static List<AzureRmRecoveryServicesPolicyBase> GetPolicyModelList(ProtectionPolicyListResponse hydraListResponse)
106+
public static List<CmdletModel.AzureRmRecoveryServicesPolicyBase> GetPolicyModelList(ProtectionPolicyListResponse hydraListResponse)
107107
{
108108
if(hydraListResponse == null || hydraListResponse.ItemList == null ||
109109
hydraListResponse.ItemList.Value == null || hydraListResponse.ItemList.Value.Count == 0)
110110
{
111111
return null;
112112
}
113113

114-
List<AzureRmRecoveryServicesPolicyBase> policyModels = new List<AzureRmRecoveryServicesPolicyBase>();
115-
AzureRmRecoveryServicesPolicyBase policyModel = null;
114+
List<CmdletModel.AzureRmRecoveryServicesPolicyBase> policyModels = new List<CmdletModel.AzureRmRecoveryServicesPolicyBase>();
115+
CmdletModel.AzureRmRecoveryServicesPolicyBase policyModel = null;
116116

117117
foreach(ProtectionPolicyResource resource in hydraListResponse.ItemList.Value)
118118
{

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/HydraHelpers.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
using System;
1616
using System.Collections.Specialized;
1717
using System.Web;
18-
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
19-
using Microsoft.Azure.Management.RecoveryServices.Backup.Models;
18+
using CmdletModel = Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
19+
using HydraModel = Microsoft.Azure.Management.RecoveryServices.Backup.Models;
2020

2121
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers
2222
{
@@ -27,14 +27,14 @@ public class HydraConstants
2727

2828
public class HydraHelpers
2929
{
30-
public static string GetHydraProviderType(ContainerType containerType)
30+
public static string GetHydraProviderType(CmdletModel.ContainerType containerType)
3131
{
3232
string providerType = string.Empty;
3333

3434
switch (containerType)
3535
{
36-
case ContainerType.AzureVM:
37-
providerType = ProviderType.AzureIaasVM.ToString();
36+
case CmdletModel.ContainerType.AzureVM:
37+
providerType = HydraModel.ProviderType.AzureIaasVM.ToString();
3838
break;
3939
default:
4040
break;
@@ -43,14 +43,14 @@ public static string GetHydraProviderType(ContainerType containerType)
4343
return providerType;
4444
}
4545

46-
public static string GetHydraProviderType(WorkloadType workloadType)
46+
public static string GetHydraProviderType(CmdletModel.WorkloadType workloadType)
4747
{
4848
string providerType = string.Empty;
4949

5050
switch (workloadType)
5151
{
52-
case WorkloadType.AzureVM:
53-
providerType = ProviderType.AzureIaasVM.ToString();
52+
case CmdletModel.WorkloadType.AzureVM:
53+
providerType = HydraModel.ProviderType.AzureIaasVM.ToString();
5454
break;
5555
default:
5656
break;

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
using System.Linq;
1818
using System.Text;
1919
using System.Threading.Tasks;
20-
using Microsoft.Azure.Management.RecoveryServices.Backup.Models;
20+
using HydraModel = Microsoft.Azure.Management.RecoveryServices.Backup.Models;
2121
using Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers;
2222
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
2323

@@ -34,37 +34,37 @@ public void Initialize(ProviderData providerData, HydraAdapter.HydraAdapter hydr
3434
this.HydraAdapter = hydraAdapter;
3535
}
3636

37-
public BaseRecoveryServicesJobResponse EnableProtection()
37+
public HydraModel.BaseRecoveryServicesJobResponse EnableProtection()
3838
{
3939
throw new NotImplementedException();
4040
}
4141

42-
public BaseRecoveryServicesJobResponse DisableProtection()
42+
public HydraModel.BaseRecoveryServicesJobResponse DisableProtection()
4343
{
4444
throw new NotImplementedException();
4545
}
4646

47-
public BaseRecoveryServicesJobResponse TriggerBackup()
47+
public HydraModel.BaseRecoveryServicesJobResponse TriggerBackup()
4848
{
4949
throw new NotImplementedException();
5050
}
5151

52-
public BaseRecoveryServicesJobResponse TriggerRestore()
52+
public HydraModel.BaseRecoveryServicesJobResponse TriggerRestore()
5353
{
5454
throw new NotImplementedException();
5555
}
5656

57-
public ProtectedItemResponse GetProtectedItem()
57+
public HydraModel.ProtectedItemResponse GetProtectedItem()
5858
{
5959
throw new NotImplementedException();
6060
}
6161

62-
public RecoveryPointResponse GetRecoveryPoint()
62+
public HydraModel.RecoveryPointResponse GetRecoveryPoint()
6363
{
6464
throw new NotImplementedException();
6565
}
6666

67-
public ProtectionPolicyResponse CreatePolicy()
67+
public HydraModel.ProtectionPolicyResponse CreatePolicy()
6868
{
6969
string policyName = (string)ProviderData.ProviderParameters[PolicyParams.PolicyName];
7070
WorkloadType workloadType = (WorkloadType)ProviderData.ProviderParameters[PolicyParams.WorkloadType];
@@ -86,11 +86,11 @@ public ProtectionPolicyResponse CreatePolicy()
8686
ValidateAzureVMSchedulePolicy(schedulePolicy);
8787

8888
// construct Hydra policy request
89-
ProtectionPolicyRequest hydraRequest = new ProtectionPolicyRequest()
89+
HydraModel.ProtectionPolicyRequest hydraRequest = new HydraModel.ProtectionPolicyRequest()
9090
{
91-
Item = new ProtectionPolicyResource()
91+
Item = new HydraModel.ProtectionPolicyResource()
9292
{
93-
Properties = new AzureIaaSVMProtectionPolicy()
93+
Properties = new HydraModel.AzureIaaSVMProtectionPolicy()
9494
{
9595
RetentionPolicy = PolicyHelpers.GetHydraLongTermRetentionPolicy(
9696
(AzureRmRecoveryServicesLongTermRetentionPolicy)retentionPolicy),
@@ -145,11 +145,11 @@ public List<AzureRmRecoveryServicesJobBase> ModifyPolicy()
145145
(AzureRmRecoveryServicesSimpleSchedulePolicy)((AzureRmRecoveryServicesIaasVmPolicy)policy).SchedulePolicy);
146146

147147
// construct Hydra policy request
148-
ProtectionPolicyRequest hydraRequest = new ProtectionPolicyRequest()
148+
HydraModel.ProtectionPolicyRequest hydraRequest = new HydraModel.ProtectionPolicyRequest()
149149
{
150-
Item = new ProtectionPolicyResource()
150+
Item = new HydraModel.ProtectionPolicyResource()
151151
{
152-
Properties = new AzureIaaSVMProtectionPolicy()
152+
Properties = new HydraModel.AzureIaaSVMProtectionPolicy()
153153
{
154154
RetentionPolicy = PolicyHelpers.GetHydraLongTermRetentionPolicy(
155155
(AzureRmRecoveryServicesLongTermRetentionPolicy)((AzureRmRecoveryServicesIaasVmPolicy)policy).RetentionPolicy),
@@ -159,7 +159,7 @@ public List<AzureRmRecoveryServicesJobBase> ModifyPolicy()
159159
}
160160
};
161161

162-
ProtectionPolicyResponse response = HydraAdapter.CreateOrUpdateProtectionPolicy(
162+
HydraModel.ProtectionPolicyResponse response = HydraAdapter.CreateOrUpdateProtectionPolicy(
163163
resourceGroupName,
164164
resourceName,
165165
policy.Name,
@@ -188,13 +188,13 @@ public List<AzureRmRecoveryServicesContainerBase> ListProtectionContainers()
188188
ARSVault vault = (ARSVault)this.ProviderData.ProviderParameters[ContainerParams.Vault];
189189
string resourceGroupName = (string)this.ProviderData.ProviderParameters[ContainerParams.ResourceGroupName];
190190

191-
ProtectionContainerListQueryParams queryParams = new ProtectionContainerListQueryParams();
191+
HydraModel.ProtectionContainerListQueryParams queryParams = new HydraModel.ProtectionContainerListQueryParams();
192192

193193
// 1. Filter by Name
194194
queryParams.FriendlyName = name;
195195

196196
// 2. Filter by ContainerType
197-
queryParams.ProviderType = ProviderType.AzureIaasVM.ToString();
197+
queryParams.ProviderType = HydraModel.ProviderType.AzureIaasVM.ToString();
198198

199199
// 3. Filter by Status
200200
queryParams.RegistrationStatus = status.ToString();
@@ -213,7 +213,7 @@ public List<AzureRmRecoveryServicesContainerBase> ListProtectionContainers()
213213
return containerModels;
214214
}
215215

216-
public ProtectionPolicyResponse GetPolicy()
216+
public HydraModel.ProtectionPolicyResponse GetPolicy()
217217
{
218218
throw new NotImplementedException();
219219
}

0 commit comments

Comments
 (0)