Skip to content

FI from dev1 into release #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 19, 2015
Merged

FI from dev1 into release #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b20cb20
Fixing enum value of Type.
AditTulasi Aug 19, 2015
385ff3a
Merge branch 'release' into dev1
Aug 19, 2015
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
25 changes: 25 additions & 0 deletions src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Jobs/AzureBackupJobHelper.cs
View file
Open in desktop
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
7 changes: 6 additions & 1 deletion src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Jobs/GetAzureRMBackupJob.cs
View file
Open in desktop
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
8 changes: 4 additions & 4 deletions ...sourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Jobs/GetAzureRMBackupJobDetails.cs
View file
Open in desktop
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
3 changes: 2 additions & 1 deletion src/ResourceManager/AzureBackup/Commands.AzureBackup/Models/JobObjects.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
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
{
Expand Down Expand Up @@ -52,7 +53,7 @@ public AzureRMBackupJob(AzureRMBackupVault vault, Mgmt.CSMJobProperties serviceJ
: base(vault)
{
this.InstanceId = jobName;
this.WorkloadType = serviceJob.WorkloadType;
this.WorkloadType = AzureBackupJobHelper.GetTypeForPS(serviceJob.WorkloadType);
this.WorkloadName = serviceJob.EntityFriendlyName;
this.Operation = serviceJob.Operation;
this.Status = serviceJob.Status;
Expand Down