Skip to content

Commit b55356c

Browse files
mkheranimkherani
committed
Merge branch 'dev1' into mkheranidev1
2 parents 0f32396 + 1aa55bd commit b55356c

File tree

11 files changed

+42
-73
lines changed

11 files changed

+42
-73
lines changed

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

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@
1414

1515
using System;
1616
using System.Collections.Generic;
17-
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
17+
using Microsoft.Azure.Commands.RecoveryServices.Backup.Properties;
1818
using Microsoft.Azure.Management.RecoveryServices.Backup.Models;
19+
using CmdletModel = Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
1920

2021
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers
2122
{
@@ -31,19 +32,19 @@ public class JobConversions
3132
/// </summary>
3233
/// <param name="hydraJob"></param>
3334
/// <returns></returns>
34-
public static AzureRmRecoveryServicesBackupJobBase GetPSJob(JobResponse hydraJob)
35+
public static CmdletModel.AzureRmRecoveryServicesBackupJobBase GetPSJob(JobResponse hydraJob)
3536
{
3637
return GetPSJob(hydraJob.Item);
3738
}
3839

39-
public static AzureRmRecoveryServicesBackupJobBase GetPSJob(JobResource hydraJob)
40+
public static CmdletModel.AzureRmRecoveryServicesBackupJobBase GetPSJob(JobResource hydraJob)
4041
{
41-
AzureRmRecoveryServicesBackupJobBase response = null;
42+
CmdletModel.AzureRmRecoveryServicesBackupJobBase response = null;
4243

4344
// hydra doesn't initialize Properties if the type of job is not known to current version of hydra.
4445
if (hydraJob.Properties == null)
4546
{
46-
// unsupported job type.
47+
Logger.Instance.WriteWarning(Resources.UnsupportedJobWarning);
4748
}
4849
else if (hydraJob.Properties.GetType() == typeof(AzureIaaSVMJob))
4950
{
@@ -53,13 +54,13 @@ public static AzureRmRecoveryServicesBackupJobBase GetPSJob(JobResource hydraJob
5354
return response;
5455
}
5556

56-
public static void AddHydraJobsToPSList(JobListResponse hydraJobs, List<AzureRmRecoveryServicesBackupJobBase> psJobs, ref int jobsCount)
57+
public static void AddHydraJobsToPSList(JobListResponse hydraJobs, List<CmdletModel.AzureRmRecoveryServicesBackupJobBase> psJobs, ref int jobsCount)
5758
{
5859
if (hydraJobs.ItemList != null && hydraJobs.ItemList.Value != null)
5960
{
6061
foreach (var job in hydraJobs.ItemList.Value)
6162
{
62-
AzureRmRecoveryServicesBackupJobBase convertedJob = GetPSJob(job);
63+
CmdletModel.AzureRmRecoveryServicesBackupJobBase convertedJob = GetPSJob(job);
6364
if (convertedJob != null)
6465
{
6566
jobsCount++;
@@ -71,19 +72,19 @@ public static void AddHydraJobsToPSList(JobListResponse hydraJobs, List<AzureRmR
7172

7273
#region AzureVm job private helpers
7374

74-
private static AzureRmRecoveryServicesBackupAzureVmJob GetPSAzureVmJob(JobResource hydraJob)
75+
private static CmdletModel.AzureRmRecoveryServicesBackupAzureVmJob GetPSAzureVmJob(JobResource hydraJob)
7576
{
76-
AzureRmRecoveryServicesBackupAzureVmJob response;
77+
CmdletModel.AzureRmRecoveryServicesBackupAzureVmJob response;
7778

7879
AzureIaaSVMJob vmJob = hydraJob.Properties as AzureIaaSVMJob;
7980

8081
if (vmJob.ExtendedInfo != null)
8182
{
82-
response = new AzureRmRecoveryServicesBackupAzureVmJobDetails();
83+
response = new CmdletModel.AzureRmRecoveryServicesBackupAzureVmJobDetails();
8384
}
8485
else
8586
{
86-
response = new AzureRmRecoveryServicesBackupAzureVmJob();
87+
response = new CmdletModel.AzureRmRecoveryServicesBackupAzureVmJob();
8788
}
8889

8990
response.JobId = GetLastIdFromFullId(hydraJob.Id);
@@ -94,12 +95,12 @@ private static AzureRmRecoveryServicesBackupAzureVmJob GetPSAzureVmJob(JobResour
9495
response.VmVersion = vmJob.VirtualMachineVersion;
9596
response.WorkloadName = vmJob.EntityFriendlyName;
9697
response.ActivityId = vmJob.ActivityId;
97-
response.BackupManagementType = EnumUtils.GetEnum<Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.BackupManagementType>(GetPSBackupManagementType(vmJob.BackupManagementType));
98+
response.BackupManagementType = CmdletModel.EnumUtils.GetEnum<Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.BackupManagementType>(GetPSBackupManagementType(vmJob.BackupManagementType));
9899
response.Operation = vmJob.Operation;
99100

100101
if (vmJob.ErrorDetails != null)
101102
{
102-
response.ErrorDetails = new List<AzureRmRecoveryServicesBackupAzureVmJobErrorInfo>();
103+
response.ErrorDetails = new List<CmdletModel.AzureRmRecoveryServicesBackupAzureVmJobErrorInfo>();
103104
foreach (var vmError in vmJob.ErrorDetails)
104105
{
105106
response.ErrorDetails.Add(GetPSAzureVmErrorInfo(vmError));
@@ -109,8 +110,8 @@ private static AzureRmRecoveryServicesBackupAzureVmJob GetPSAzureVmJob(JobResour
109110
// fill extended info if present
110111
if (vmJob.ExtendedInfo != null)
111112
{
112-
AzureRmRecoveryServicesBackupAzureVmJobDetails detailedResponse =
113-
response as AzureRmRecoveryServicesBackupAzureVmJobDetails;
113+
CmdletModel.AzureRmRecoveryServicesBackupAzureVmJobDetails detailedResponse =
114+
response as CmdletModel.AzureRmRecoveryServicesBackupAzureVmJobDetails;
114115

115116
detailedResponse.DynamicErrorMessage = vmJob.ExtendedInfo.DynamicErrorMessage;
116117
if (vmJob.ExtendedInfo.PropertyBag != null)
@@ -124,10 +125,10 @@ private static AzureRmRecoveryServicesBackupAzureVmJob GetPSAzureVmJob(JobResour
124125

125126
if (vmJob.ExtendedInfo.TasksList != null)
126127
{
127-
detailedResponse.SubTasks = new List<AzureRmRecoveryServicesBackupAzureVmJobSubTask>();
128+
detailedResponse.SubTasks = new List<CmdletModel.AzureRmRecoveryServicesBackupAzureVmJobSubTask>();
128129
foreach (var vmJobTask in vmJob.ExtendedInfo.TasksList)
129130
{
130-
detailedResponse.SubTasks.Add(new AzureRmRecoveryServicesBackupAzureVmJobSubTask()
131+
detailedResponse.SubTasks.Add(new CmdletModel.AzureRmRecoveryServicesBackupAzureVmJobSubTask()
131132
{
132133
Name = vmJobTask.TaskId,
133134
Status = vmJobTask.Status
@@ -139,9 +140,9 @@ private static AzureRmRecoveryServicesBackupAzureVmJob GetPSAzureVmJob(JobResour
139140
return response;
140141
}
141142

142-
private static AzureRmRecoveryServicesBackupAzureVmJobErrorInfo GetPSAzureVmErrorInfo(AzureIaaSVMErrorInfo hydraError)
143+
private static CmdletModel.AzureRmRecoveryServicesBackupAzureVmJobErrorInfo GetPSAzureVmErrorInfo(AzureIaaSVMErrorInfo hydraError)
143144
{
144-
AzureRmRecoveryServicesBackupAzureVmJobErrorInfo psErrorInfo = new AzureRmRecoveryServicesBackupAzureVmJobErrorInfo();
145+
CmdletModel.AzureRmRecoveryServicesBackupAzureVmJobErrorInfo psErrorInfo = new CmdletModel.AzureRmRecoveryServicesBackupAzureVmJobErrorInfo();
145146
psErrorInfo.ErrorCode = hydraError.ErrorCode;
146147
psErrorInfo.ErrorMessage = hydraError.ErrorString;
147148
if (hydraError.Recommendations != null)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ public override void Validate()
271271
}
272272

273273
/// <summary>
274-
/// This class is does not represent first class resource. So, we are not inheriting from the base class.
274+
/// This class contains job error message details.
275275
/// </summary>
276276
public class AzureRmRecoveryServicesBackupJobErrorInfoBase
277277
{
@@ -281,7 +281,7 @@ public class AzureRmRecoveryServicesBackupJobErrorInfoBase
281281
}
282282

283283
/// <summary>
284-
/// This class is does not represent a first class resource. So, we are not inheriting from the common base class.
284+
/// This class contains job sub tasks detail.
285285
/// </summary>
286286
public class AzureRmRecoveryServicesBackupJobSubTaskBase
287287
{

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models
2323
public enum ContainerType
2424
{
2525
AzureVM = 1,
26-
//AzureSqlContainer,
2726
Windows
2827
}
2928

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

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -437,4 +437,7 @@ Please contact Microsoft for further assistant.</value>
437437
<data name="BackupManagementTypeIncorrectForContainerType" xml:space="preserve">
438438
<value>BackupManagementType provider for ContainerType {0} is incorrect.</value>
439439
</data>
440+
<data name="UnsupportedJobWarning" xml:space="preserve">
441+
<value>Got some unsupported jobs</value>
442+
</data>
440443
</root>

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Container/GetAzureRmRecoveryServicesBackupContainer.cs

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
2727
/// <summary>
2828
/// Get list of containers
2929
/// </summary>
30-
[Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesBackupContainer"), OutputType(typeof(AzureRmRecoveryServicesBackupContainerBase), typeof(List<AzureRmRecoveryServicesBackupContainerBase>))]
30+
[Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesBackupContainer"), OutputType(typeof(AzureRmRecoveryServicesBackupContainerBase))]
3131
public class GetAzureRmRecoveryServicesBackupContainer : RecoveryServicesBackupCmdletBase
3232
{
3333
[Parameter(Mandatory = true, Position = 1, HelpMessage = ParamHelpMsg.Container.ContainerType)]
@@ -76,15 +76,7 @@ public override void ExecuteCmdlet()
7676

7777
IPsBackupProvider psBackupProvider = providerManager.GetProviderInstance(ContainerType, backupManagementTypeNullable);
7878
var containerModels = psBackupProvider.ListProtectionContainers();
79-
80-
if (containerModels.Count == 1)
81-
{
82-
WriteObject(containerModels.First());
83-
}
84-
else
85-
{
86-
WriteObject(containerModels, enumerateCollection: true);
87-
}
79+
WriteObject(containerModels, enumerateCollection: true);
8880
});
8981
}
9082
}

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Container/GetAzureRmRecoveryServicesBackupManagementServer.cs

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
2727
/// <summary>
2828
/// Get list of containers
2929
/// </summary>
30-
[Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesBackupManagementServer"), OutputType(typeof(AzureRmRecoveryServicesBackupEngineBase), typeof(List<AzureRmRecoveryServicesBackupEngineBase>))]
30+
[Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesBackupManagementServer"), OutputType(typeof(AzureRmRecoveryServicesBackupEngineBase))]
3131
public class GetAzureRmRecoveryServicesBackupManagementServer : RecoveryServicesBackupCmdletBase
3232
{
3333
[Parameter(Mandatory = false, Position = 1, HelpMessage = ParamHelpMsg.Container.Name)]
@@ -56,14 +56,7 @@ public override void ExecuteCmdlet()
5656
backupServerModels = backupServerModels.Where(x => x.Name == this.Name).ToList();
5757
}
5858
}
59-
if (backupServerModels.Count == 1)
60-
{
61-
WriteObject(backupServerModels.First());
62-
}
63-
else
64-
{
65-
WriteObject(backupServerModels, enumerateCollection: true);
66-
}
59+
WriteObject(backupServerModels, enumerateCollection: true);
6760
});
6861
}
6962
}

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Item/GetAzureRmRecoveryServicesItem.cs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,7 @@ public override void ExecuteCmdlet()
8686

8787
var itemModels = psBackupProvider.ListProtectedItems();
8888

89-
if (itemModels.Count == 1)
90-
{
91-
WriteObject(itemModels.First());
92-
}
93-
else
94-
{
95-
WriteObject(itemModels, enumerateCollection: true);
96-
}
89+
WriteObject(itemModels, enumerateCollection: true);
9790
});
9891
}
9992
}

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Jobs/GetAzureRmRecoveryServicesJob.cs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -157,14 +157,7 @@ public override void ExecuteCmdlet()
157157
}
158158

159159
WriteDebug("Number of jobs fetched: " + result.Count);
160-
if (resultCount != 1)
161-
{
162-
WriteObject(result, enumerateCollection: true);
163-
}
164-
else
165-
{
166-
WriteObject(result[0]);
167-
}
160+
WriteObject(result, enumerateCollection: true);
168161
});
169162
}
170163
}

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Jobs/WaitAzureRmRecoveryServicesJob.cs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -123,14 +123,7 @@ public override void ExecuteCmdlet()
123123
TestMockSupport.Delay(30 * 1000);
124124
}
125125

126-
if (finalJobs.Count == 1)
127-
{
128-
WriteObject(finalJobs[0]);
129-
}
130-
else
131-
{
132-
WriteObject(finalJobs, enumerateCollection: true);
133-
}
126+
WriteObject(finalJobs, enumerateCollection: true);
134127
});
135128
}
136129

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/RecoveryPoint/GetAzureRMRecoveryServicesRecoveryPoint.cs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,7 @@ public override void ExecuteCmdlet()
8080
var rpList = psBackupProvider.ListRecoveryPoints();
8181

8282
WriteDebug(String.Format("RPCount in Response = {0}", rpList.Count));
83-
if (rpList.Count == 1)
84-
{
85-
WriteObject(rpList[0]);
86-
}
87-
else
88-
{
89-
WriteObject(rpList, enumerateCollection: true);
90-
}
83+
WriteObject(rpList, enumerateCollection: true);
9184
}
9285
else if (this.ParameterSetName == RecoveryPointIdParameterSet)
9386
{

0 commit comments

Comments
 (0)