diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Jobs/AzureBackupJobHelper.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Jobs/AzureBackupJobHelper.cs
index 56bbbe4a0beb..fca51c85086b 100644
--- a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Jobs/AzureBackupJobHelper.cs
+++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Jobs/AzureBackupJobHelper.cs
@@ -18,7 +18,6 @@
using System.Xml;
using System.Linq;
using Mgmt = Microsoft.Azure.Management.BackupServices.Models;
-using Microsoft.Azure.Commands.AzureBackup.Models;
namespace Microsoft.Azure.Commands.AzureBackup.Cmdlets
@@ -63,30 +62,6 @@ public static class AzureBackupJobHelper
{
public static DateTime MinimumAllowedDate = new DateTime(DateTime.MinValue.Year, DateTime.MinValue.Month, DateTime.MinValue.Day, DateTime.MinValue.Hour, DateTime.MinValue.Minute, DateTime.MinValue.Second, DateTimeKind.Utc);
- public static string GetTypeForPS(string itemType)
- {
- AzureBackupItemType managedContainerType = (AzureBackupItemType)Enum.Parse(typeof(AzureBackupItemType), itemType, true);
-
- string returnType = string.Empty;
-
- switch (managedContainerType)
- {
- case AzureBackupItemType.IaasVM:
- returnType = "AzureVM";
- break;
- }
-
- return returnType;
- }
-
- public static string GetTypeForService(string itemType)
- {
- if (itemType.CompareTo("AzureVM") == 0)
- return AzureBackupItemType.IaasVM.ToString();
- throw new ArgumentException("Invalid value", "itemType");
- }
-
-
public static bool IsValidStatus(string inputStatus)
{
JobStatus status;
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Jobs/GetAzureRMBackupJob.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Jobs/GetAzureRMBackupJob.cs
index 02114a59ae7c..0c8a35f7cd73 100644
--- a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Jobs/GetAzureRMBackupJob.cs
+++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Jobs/GetAzureRMBackupJob.cs
@@ -56,7 +56,7 @@ public class GetAzureRMBackupJob : AzureBackupCmdletBase
public string Status { get; set; }
[Parameter(Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.JobFilterTypeHelpMessage, ParameterSetName = "FiltersSet")]
- [ValidateSet("AzureVM")]
+ [ValidateSet("IaasVM")]
public string Type { get; set; }
[Parameter(Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.JobFilterOperationHelpMessage, ParameterSetName = "FiltersSet")]
@@ -79,11 +79,6 @@ public override void ExecuteCmdlet()
JobId = Job.InstanceId;
}
- if (Type != null)
- {
- Type = AzureBackupJobHelper.GetTypeForService(Type);
- }
-
// validations
if (!From.HasValue)
{
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Jobs/GetAzureRMBackupJobDetails.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Jobs/GetAzureRMBackupJobDetails.cs
index ae2607c89726..742b85ae59f5 100644
--- a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Jobs/GetAzureRMBackupJobDetails.cs
+++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Jobs/GetAzureRMBackupJobDetails.cs
@@ -35,7 +35,7 @@ public class GetAzureRMBackupJobDetils : AzureBackupCmdletBase
[Parameter(Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.JobDetailsFilterJobIdHelpMessage, ParameterSetName = "IdFiltersSet")]
[ValidateNotNullOrEmpty]
- public string JobId { get; set; }
+ public string JobID { get; set; }
[Parameter(Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.JobDetailsFilterJobHelpMessage, ParameterSetName = "JobsFiltersSet", ValueFromPipeline = true)]
[ValidateNotNull]
@@ -53,12 +53,12 @@ public override void ExecuteCmdlet()
{
if (Job != null)
{
- JobId = Job.InstanceId;
+ JobID = Job.InstanceId;
}
- WriteDebug(String.Format(Resources.JobIdFilter, JobId));
+ WriteDebug(String.Format(Resources.JobIdFilter, JobID));
- Mgmt.CSMJobDetailsResponse serviceJobProperties = AzureBackupClient.GetJobDetails(Vault.ResourceGroupName, Vault.Name, JobId);
+ Mgmt.CSMJobDetailsResponse serviceJobProperties = AzureBackupClient.GetJobDetails(Vault.ResourceGroupName, Vault.Name, JobID);
AzureRMBackupJobDetails jobDetails = new AzureRMBackupJobDetails(Vault, serviceJobProperties.JobDetailedProperties, serviceJobProperties.Name);
WriteDebug(Resources.JobResponse);
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Microsoft.Azure.Commands.AzureBackup.format.ps1xml b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Microsoft.Azure.Commands.AzureBackup.format.ps1xml
index 2e9d28348932..d61c12629259 100644
--- a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Microsoft.Azure.Commands.AzureBackup.format.ps1xml
+++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Microsoft.Azure.Commands.AzureBackup.format.ps1xml
@@ -12,6 +12,10 @@
18
+
+
+ 18
+
18
@@ -27,6 +31,9 @@
Name
+
+ ResourceGroupName
+
Region
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Models/JobObjects.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Models/JobObjects.cs
index a4b05997e325..89cdff0b87ba 100644
--- a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Models/JobObjects.cs
+++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Models/JobObjects.cs
@@ -21,7 +21,6 @@
using Microsoft.Azure.Management.BackupServices;
using Microsoft.Azure.Management.BackupServices;
using Mgmt = Microsoft.Azure.Management.BackupServices.Models;
-using Microsoft.Azure.Commands.AzureBackup.Cmdlets;
namespace Microsoft.Azure.Commands.AzureBackup.Models
{
@@ -53,7 +52,7 @@ public AzureRMBackupJob(AzureRMBackupVault vault, Mgmt.CSMJobProperties serviceJ
: base(vault)
{
this.InstanceId = jobName;
- this.WorkloadType = AzureBackupJobHelper.GetTypeForPS(serviceJob.WorkloadType);
+ this.WorkloadType = serviceJob.WorkloadType;
this.WorkloadName = serviceJob.EntityFriendlyName;
this.Operation = serviceJob.Operation;
this.Status = serviceJob.Status;