Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ namespace Microsoft.Azure.Commands.AzureBackup.Cmdlets
{
public abstract class AzureRMBackupDSCmdletBase : AzureBackupCmdletBase
{
[Parameter(Position = 0, Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.AzureBackUpItem, ValueFromPipeline = true)]
[Parameter(Position = 0, Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.AzureBackupItem, ValueFromPipeline = true)]
[ValidateNotNullOrEmpty]
public AzureRMBackupItem Item { get; set; }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
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
Expand Down Expand Up @@ -62,6 +63,30 @@ 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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public class GetAzureRMBackupJob : AzureBackupCmdletBase
public string Status { get; set; }

[Parameter(Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.JobFilterTypeHelpMessage, ParameterSetName = "FiltersSet")]
[ValidateSet("IaasVM")]
[ValidateSet("AzureVM")]
public string Type { get; set; }

[Parameter(Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.JobFilterOperationHelpMessage, ParameterSetName = "FiltersSet")]
Expand All @@ -79,6 +79,11 @@ public override void ExecuteCmdlet()
JobId = Job.InstanceId;
}

if (Type != null)
{
Type = AzureBackupJobHelper.GetTypeForService(Type);
}

// validations
if (!From.HasValue)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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);
Expand Down
Loading