RI from dev1 into dev1-anudeeb

ChangeLog.md

@@ -1,3 +1,5 @@
+## 2015.09.03 version 0.9.8
+
 ## 2015.08.17 version 0.9.7
 * Azure Profile cmdlets
   * New-AzureProfile

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;

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)
                 {

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);

src/ResourceManager/AzureBackup/Commands.AzureBackup/Helpers/VaultHelpers.cs

@@ -54,38 +54,40 @@ public static string GetResourceGroup(string vaultId)
             return tokens[3];
         }
 
+        // NOTE: Commenting code which will be used in a later sprint, but not right now.
+
         /// <summary>
         /// Extension to convert enumerable Hashtable into a dictionary
         /// </summary>
         /// <param name="tags"></param>
         /// <returns></returns>
-        public static Dictionary<string, string> ConvertToDictionary(this Hashtable[] tags)
-        {
-            return tags == null
-                ? null
-                : tags
-                    .CoalesceEnumerable()
-                    .Select(hashTable => hashTable.OfType<DictionaryEntry>()
-                        .ToDictionary(kvp => kvp.Key.ToString(), kvp => kvp.Value))
-                    .Where(tagDictionary => tagDictionary.ContainsKey("Name"))
-                    .Select(tagDictionary => Tuple
-                        .Create(
-                            tagDictionary["Name"].ToString(),
-                            tagDictionary.ContainsKey("Value") ? tagDictionary["Value"].ToString() : string.Empty))
-                    .Distinct(kvp => kvp.Item1)
-                    .ToDictionary(kvp => kvp.Item1, kvp => kvp.Item2);
-        }
+        // public static Dictionary<string, string> ConvertToDictionary(this Hashtable[] tags)
+        // {
+        //     return tags == null
+        //         ? null
+        //         : tags
+        //             .CoalesceEnumerable()
+        //             .Select(hashTable => hashTable.OfType<DictionaryEntry>()
+        //                 .ToDictionary(kvp => kvp.Key.ToString(), kvp => kvp.Value))
+        //             .Where(tagDictionary => tagDictionary.ContainsKey("Name"))
+        //             .Select(tagDictionary => Tuple
+        //                 .Create(
+        //                     tagDictionary["Name"].ToString(),
+        //                     tagDictionary.ContainsKey("Value") ? tagDictionary["Value"].ToString() : string.Empty))
+        //             .Distinct(kvp => kvp.Item1)
+        //             .ToDictionary(kvp => kvp.Item1, kvp => kvp.Item2);
+        // }
 
         /// <summary>
         /// Extension to coalesce enumerable
         /// </summary>
         /// <typeparam name="TSource">Enumerable type</typeparam>
         /// <param name="source">Enumerable</param>
         /// <returns></returns>
-        public static IEnumerable<TSource> CoalesceEnumerable<TSource>(this IEnumerable<TSource> source)
-        {
-            return source ?? Enumerable.Empty<TSource>();
-        }
+        // public static IEnumerable<TSource> CoalesceEnumerable<TSource>(this IEnumerable<TSource> source)
+        // {
+        //     return source ?? Enumerable.Empty<TSource>();
+        // }
 
         /// <summary>
         /// Extension to remove duplicates from enumerable based on a provided key selector
@@ -95,34 +97,34 @@ public static IEnumerable<TSource> CoalesceEnumerable<TSource>(this IEnumerable<
         /// <param name="source">Input enumerable to remove duplicates from</param>
         /// <param name="keySelector">Lambda to select key</param>
         /// <returns></returns>
-        public static IEnumerable<TSource> Distinct<TSource, TKeyType>(this IEnumerable<TSource> source, Func<TSource, TKeyType> keySelector)
-        {
-            var set = new Dictionary<TKeyType, TSource>(EqualityComparer<TKeyType>.Default);
-            foreach (TSource element in source)
-            {
-                TSource value;
-                var key = keySelector(element);
-                if (!set.TryGetValue(key, out value))
-                {
-                    yield return element;
-                }
-                else
-                {
-                    set[key] = value;
-                }
-            }
-        }
+        // public static IEnumerable<TSource> Distinct<TSource, TKeyType>(this IEnumerable<TSource> source, Func<TSource, TKeyType> keySelector)
+        // {
+        //     var set = new Dictionary<TKeyType, TSource>(EqualityComparer<TKeyType>.Default);
+        //     foreach (TSource element in source)
+        //     {
+        //         TSource value;
+        //         var key = keySelector(element);
+        //         if (!set.TryGetValue(key, out value))
+        //         {
+        //             yield return element;
+        //         }
+        //         else
+        //         {
+        //             set[key] = value;
+        //         }
+        //     }
+        // }
 
         /// <summary>
         /// Extension to convert dictionary to hashtable enumerable
         /// </summary>
         /// <param name="tags"></param>
         /// <returns></returns>
-        public static Hashtable[] GetTagsHashtables(this IDictionary<string, string> tags)
-        {
-            return tags == null
-                ? null
-                : tags.Select(kvp => new Hashtable { { "Name", kvp.Key }, { "Value", kvp.Value } }).ToArray();
-        }
+        // public static Hashtable[] GetTagsHashtables(this IDictionary<string, string> tags)
+        // {
+        //     return tags == null
+        //         ? null
+        //         : tags.Select(kvp => new Hashtable { { "Name", kvp.Key }, { "Value", kvp.Value } }).ToArray();
+        // }
     }
 }

src/ResourceManager/AzureBackup/Commands.AzureBackup/Models/JobObjects.cs

@@ -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
 {
@@ -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;

src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj

@@ -290,6 +290,9 @@
     <None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests\TestVirtualMachineDataDisk.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests\TestVirtualMachineDataDiskNegative.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests\TestVirtualMachineImageList.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/AvailabilitySetTests.ps1

@@ -24,7 +24,7 @@ function Test-AvailabilitySet
     try
     {
         # Common
-        $loc = 'West US';
+        $loc = Get-ComputeVMLocation;
         New-AzureResourceGroup -Name $rgname -Location $loc -Force;
 
         $asetName = 'avs' + $rgname;

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/ComputeCloudExceptionTests.ps1

@@ -20,7 +20,7 @@ function Run-ComputeCloudExceptionTests
     try
     {
         # Common
-        $loc = 'West US';
+        $loc = Get-ComputeVMLocation;
         New-AzureResourceGroup -Name $rgname -Location $loc -Force;
 
         $compare = "Resource*NotFound*OperationID : `'*`'";

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/ComputeTestCommon.ps1

@@ -394,3 +394,75 @@ function Get-SasUri
 
 	return $uri;
 }
+
+# Get a Location according to resource provider.
+function Get-ResourceProviderLocation
+{
+    param ([string] $name, [string] $default = "westus", [bool] $canonical = $true)
+
+	$loc = Get-AzureLocation | where { $_.Name.Equals($name) };
+
+	if ($loc -eq $null)
+	{
+	    throw 'There is no available locations with given parameters';
+	}
+
+	if ($loc.LocationsString.ToLowerInvariant().Replace(" ", "").Contains($default.ToLowerInvariant().Replace(" ","")))
+	{
+	    return $default;
+	}
+
+	if ($canonical)
+	{
+	    return $loc.Locations[0].ToLowerInvariant().Replace(" ", "");
+	}
+	else
+	{
+	    return $loc.Locations[0];
+    }
+}
+
+function Get-ComputeVMLocation
+{
+     Get-ResourceProviderLocation "Microsoft.Compute/virtualMachines";
+}
+
+function Get-ComputeAvailabilitySetLocation
+{
+     Get-ResourceProviderLocation "Microsoft.Compute/availabilitySets";
+}
+
+function Get-ComputeVMExtensionLocation
+{
+     Get-ResourceProviderLocation "Microsoft.Compute/virtualMachines/extensions";
+}
+
+function Get-ComputeVMDiagnosticSettingLocation
+{
+     Get-ResourceProviderLocation "Microsoft.Compute/virtualMachines/diagnosticSettings";
+}
+
+function Get-ComputeVMMetricDefinitionLocation
+{
+     Get-ResourceProviderLocation "Microsoft.Compute/virtualMachines/metricDefinitions";
+}
+
+function Get-ComputeOperationLocation
+{
+     Get-ResourceProviderLocation "Microsoft.Compute/locations/operations";
+}
+
+function Get-ComputeVMSizeLocation
+{
+     Get-ResourceProviderLocation "Microsoft.Compute/locations/vmSizes";
+}
+
+function Get-ComputeUsageLocation
+{
+     Get-ResourceProviderLocation "Microsoft.Compute/locations/usages";
+}
+
+function Get-ComputePublisherLocation
+{
+     Get-ResourceProviderLocation "Microsoft.Compute/locations/publishers";
+}

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineExtensionTests.ps1

@@ -24,7 +24,7 @@ function Test-VirtualMachineExtension
     try
     {
         # Common
-        $loc = 'westus';
+        $loc = Get-ComputeVMLocation;
         New-AzureResourceGroup -Name $rgname -Location $loc -Force;
 
         # VM Profile & Hardware
@@ -163,7 +163,7 @@ function Test-VirtualMachineExtensionUsingHashTable
     try
     {
         # Common
-        $loc = 'westus';
+        $loc = Get-ComputeVMLocation;
         New-AzureResourceGroup -Name $rgname -Location $loc -Force;
 
         # VM Profile & Hardware
@@ -325,7 +325,7 @@ function Test-VirtualMachineCustomScriptExtension
     try
     {
         # Common
-        $loc = 'westus';
+        $loc = Get-ComputeVMLocation;
         New-AzureResourceGroup -Name $rgname -Location $loc -Force;
 
         # VM Profile & Hardware
@@ -494,7 +494,7 @@ function Test-VirtualMachineCustomScriptExtensionFileUri
     try
     {
         # Common
-        $loc = 'westus';
+        $loc = Get-ComputeVMLocation;
         New-AzureResourceGroup -Name $rgname -Location $loc -Force;
 
         # VM Profile & Hardware
@@ -652,7 +652,7 @@ function Test-VirtualMachineAccessExtension
     try
     {
         # Common
-        $loc = 'westus';
+        $loc = Get-ComputeVMLocation;
         New-AzureResourceGroup -Name $rgname -Location $loc -Force;
 
         # VM Profile & Hardware