Skip to content

Commit 58c371c

Browse files
mkheranimkherani
committed
Fixing merge issues
1 parent 7161ff3 commit 58c371c

File tree

4 files changed

+27
-32
lines changed

4 files changed

+27
-32
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public static RecoveryPointBase GetPSAzureRecoveryPoints(ServiceClientModel.Reco
7777
@"MM/dd/yyyy HH:mm:ss",
7878
CultureInfo.InvariantCulture);
7979

80-
AzureRmRecoveryServicesBackupIaasVmRecoveryPoint result = new AzureRmRecoveryServicesBackupIaasVmRecoveryPoint()
80+
AzureVmRecoveryPoint result = new AzureVmRecoveryPoint()
8181
{
8282
RecoveryPointId = rpResponse.RecPoint.Name,
8383
BackupManagementType = item.BackupManagementType,

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/ServiceClientHelpers.cs

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

2121
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers
2222
{
@@ -34,7 +34,7 @@ public static string GetServiceClientProviderType(CmdletModel.ContainerType cont
3434
switch (containerType)
3535
{
3636
case CmdletModel.ContainerType.AzureVM:
37-
providerType = HydraModel.BackupManagementType.AzureIaasVM.ToString();
37+
providerType = ServiceClientModel.BackupManagementType.AzureIaasVM.ToString();
3838
break;
3939
default:
4040
break;
@@ -50,7 +50,7 @@ public static string GetServiceClientProviderType(CmdletModel.WorkloadType workl
5050
switch (workloadType)
5151
{
5252
case CmdletModel.WorkloadType.AzureVM:
53-
providerType = HydraModel.BackupManagementType.AzureIaasVM.ToString();
53+
providerType = ServiceClientModel.BackupManagementType.AzureIaasVM.ToString();
5454
break;
5555
default:
5656
break;
@@ -105,7 +105,7 @@ public static string GetServiceClientContainerType(CmdletModel.ContainerType con
105105
switch (containerType)
106106
{
107107
case CmdletModel.ContainerType.AzureVM:
108-
serviceClientContainerType = ContainerType.IaasVMContainer.ToString();
108+
serviceClientContainerType = ServiceClientModel.ContainerType.IaasVMContainer.ToString();
109109
break;
110110
default:
111111
break;
@@ -121,7 +121,7 @@ public static string GetServiceClientWorkloadType(CmdletModel.WorkloadType workl
121121
switch (workloadType)
122122
{
123123
case CmdletModel.WorkloadType.AzureVM:
124-
serviceClientWorkloadType = WorkloadType.VM.ToString();
124+
serviceClientWorkloadType = ServiceClientModel.WorkloadType.VM.ToString();
125125
break;
126126
default:
127127
break;

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

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

15+
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
16+
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ServiceClientAdapterNS;
17+
using Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers;
18+
using Microsoft.Azure.Commands.RecoveryServices.Backup.Properties;
19+
using Microsoft.Azure.Management.RecoveryServices.Backup.Models;
20+
using Microsoft.WindowsAzure.Commands.Utilities.Common;
1521
using System;
1622
using System.Collections.Generic;
1723
using System.Linq;
1824
using System.Management.Automation;
1925
using System.Net;
20-
using System.Text;
21-
using System.Threading;
22-
using System.Threading.Tasks;
23-
using ServiceClientModel = Microsoft.Azure.Management.RecoveryServices.Backup.Models;
24-
using Microsoft.Azure.Management.RecoveryServices.Backup.Models;
25-
using HydraModel = Microsoft.Azure.Management.RecoveryServices.Backup.Models;
26-
using Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers;
2726
using CmdletModel = Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
28-
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
29-
using CmdletsModel = Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
30-
using Microsoft.Azure.Commands.RecoveryServices.Backup.Properties;
31-
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ServiceClientAdapterNS;
32-
using Microsoft.WindowsAzure.Commands.Utilities.Common;
27+
using ServiceClientModel = Microsoft.Azure.Management.RecoveryServices.Backup.Models;
3328

3429
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ProviderModel
3530
{
@@ -408,7 +403,7 @@ public List<ContainerBase> ListProtectionContainers()
408403

409404
// 2. Filter by ContainerType
410405
queryParams.BackupManagementType =
411-
HydraModel.BackupManagementType.AzureIaasVM.ToString();
406+
ServiceClientModel.BackupManagementType.AzureIaasVM.ToString();
412407

413408
// 3. Filter by Status
414409
if (status != 0)
@@ -448,8 +443,8 @@ public List<ItemBase> ListProtectedItems()
448443
(Models.WorkloadType)this.ProviderData[ItemParams.WorkloadType];
449444

450445
ProtectedItemListQueryParam queryParams = new ProtectedItemListQueryParam();
451-
queryParams.DatasourceType = HydraModel.WorkloadType.VM;
452-
queryParams.BackupManagementType = HydraModel.BackupManagementType.AzureIaasVM.ToString();
446+
queryParams.DatasourceType = ServiceClientModel.WorkloadType.VM;
447+
queryParams.BackupManagementType = ServiceClientModel.BackupManagementType.AzureIaasVM.ToString();
453448

454449
List<ProtectedItemResource> protectedItems = new List<ProtectedItemResource>();
455450
string skipToken = null;
@@ -661,35 +656,35 @@ private static DateTime GenerateRandomTime()
661656

662657

663658
#region private
664-
private void ValidateAzureVMWorkloadType(CmdletsModel.WorkloadType type)
659+
private void ValidateAzureVMWorkloadType(CmdletModel.WorkloadType type)
665660
{
666-
if (type != CmdletsModel.WorkloadType.AzureVM)
661+
if (type != CmdletModel.WorkloadType.AzureVM)
667662
{
668663
throw new ArgumentException(string.Format(Resources.UnExpectedWorkLoadTypeException,
669-
CmdletsModel.WorkloadType.AzureVM.ToString(),
664+
CmdletModel.WorkloadType.AzureVM.ToString(),
670665
type.ToString()));
671666
}
672667
}
673668

674-
private void ValidateAzureVMWorkloadType(CmdletsModel.WorkloadType itemWorkloadType,
675-
CmdletsModel.WorkloadType policyWorkloadType)
669+
private void ValidateAzureVMWorkloadType(CmdletModel.WorkloadType itemWorkloadType,
670+
CmdletModel.WorkloadType policyWorkloadType)
676671
{
677672
ValidateAzureVMWorkloadType(itemWorkloadType);
678673
ValidateAzureVMWorkloadType(policyWorkloadType);
679674
if (itemWorkloadType != policyWorkloadType)
680675
{
681676
throw new ArgumentException(string.Format(Resources.UnExpectedWorkLoadTypeException,
682-
CmdletsModel.WorkloadType.AzureVM.ToString(),
677+
CmdletModel.WorkloadType.AzureVM.ToString(),
683678
itemWorkloadType.ToString()));
684679
}
685680
}
686681

687-
private void ValidateAzureVMContainerType(CmdletsModel.ContainerType type)
682+
private void ValidateAzureVMContainerType(CmdletModel.ContainerType type)
688683
{
689-
if (type != CmdletsModel.ContainerType.AzureVM)
684+
if (type != CmdletModel.ContainerType.AzureVM)
690685
{
691686
throw new ArgumentException(string.Format(Resources.UnExpectedContainerTypeException,
692-
CmdletsModel.ContainerType.AzureVM.ToString(),
687+
CmdletModel.ContainerType.AzureVM.ToString(),
693688
type.ToString()));
694689
}
695690
}

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/MabPsBackupProvider.cs

Lines changed: 2 additions & 2 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 HydraModel = Microsoft.Azure.Management.RecoveryServices.Backup.Models;
20+
using ServiceClientModel = Microsoft.Azure.Management.RecoveryServices.Backup.Models;
2121
using Microsoft.Azure.Management.RecoveryServices.Backup.Models;
2222
using Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers;
2323
using CmdletModel = Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
@@ -92,7 +92,7 @@ public ProtectionPolicyResponse ModifyPolicy()
9292
queryParams.FriendlyName = name;
9393

9494
// 2. Filter by ContainerType
95-
queryParams.BackupManagementType = HydraModel.BackupManagementType.MAB.ToString();
95+
queryParams.BackupManagementType = ServiceClientModel.BackupManagementType.MAB.ToString();
9696

9797
var listResponse = ServiceClientAdapter.ListContainers(queryParams);
9898

0 commit comments

Comments
 (0)