Merge pull request AzureRT#35 from Azure/dev

PR from parent
hyonholee · Aug 28, 2015 · ea5e7d8 · ea5e7d8
2 parents d55f852 + 7da0852
commit ea5e7d8
Show file tree

Hide file tree

Showing 9 changed files with 4,244 additions and 604 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,5 +1,7 @@
 ## 2015.09.03 version 0.9.8
-
+* Azure Compute (ARM) Cmdlets
+	* Add -Launch parameter for Get-AzureRemoteDesktopFile cmdlet
+
 ## 2015.08.17 version 0.9.7
 * Azure Profile cmdlets
   * New-AzureProfile

diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupCmdletHelpMessage.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupCmdletHelpMessage.cs
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupDSCmdletBase.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupDSCmdletBase.cs
@@ -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; }
 

diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Jobs/AzureBackupJobHelper.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Jobs/AzureBackupJobHelper.cs
@@ -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
@@ -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;

diff --git 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("IaasVM")]
+        [ValidateSet("AzureVM")]
         public string Type { get; set; }
 
         [Parameter(Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.JobFilterOperationHelpMessage, ParameterSetName = "FiltersSet")]
@@ -79,6 +79,11 @@ public override void ExecuteCmdlet()
                     JobId = Job.InstanceId;
                 }
 
+                if (Type != null)
+                {
+                    Type = AzureBackupJobHelper.GetTypeForService(Type);
+                }
+
                 // validations
                 if (!From.HasValue)
                 {

diff --git a/...sourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Jobs/GetAzureRMBackupJobDetails.cs b/...sourceManager/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);