Merge branch 'crp2' of https://github.com/huangpf/azure-powershell-pr into crp2

Author: huangpf

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

@@ -166,6 +166,7 @@ function Test-VirtualMachine
         $vm2 = Get-AzureVM -Name $vmname2 -ResourceGroupName $rgname;
         Assert-NotNull $vm2;
         Assert-AreEqual $vm2.AvailabilitySetId $asetId;
+        Assert-True { $vm2.ResourceGroupName -eq $rgname }
 
         # Remove
         Remove-AzureVM -Name $vmname2 -ResourceGroupName $rgname -Force;
@@ -191,6 +192,11 @@ function Test-VirtualMachineList
         $s1 = Get-AzureVM -All;
         $s2 = Get-AzureVM;
 
+        if ($s2 -ne $null)
+        {
+            Assert-True { $s2[0].ResourceGroupName -ne $null; }
+        }
+
         Assert-ThrowsContains { $s3 = Get-AzureVM -NextLink "http://www.test.com/test"; } "Unexpected character"
 
         $passed = $true;
@@ -627,6 +633,8 @@ function Test-VirtualMachinePIRv2
         $p.StorageProfile.SourceImage = $null;
         $imgRef = Get-DefaultCRPImage;
         $p = Set-AzureVMSourceImage -VM $p -ImageReference $imgRef;
+        Assert-True { $p.ImageReference -ne $null };
+        Assert-True { $p.SourceImageId -eq $null };
 
         # TODO: Remove Data Disks for now
         $p.StorageProfile.DataDisks = $null;

src/ResourceManager/Compute/Commands.Compute/Microsoft.Azure.Commands.Compute.Types.ps1xml

@@ -18,6 +18,7 @@
               <Name>ProvisioningState</Name>
               <Name>OSConfiguration</Name>
               <Name>SourceImageId</Name>
+              <Name>ImageReference</Name>
               <Name>DestinationVHDsContainer</Name>
               <Name>OSDisk</Name>
               <Name>DataDisks</Name>

src/ResourceManager/Compute/Commands.Compute/Models/PSVirtualMachine.cs

@@ -13,9 +13,9 @@
 // ----------------------------------------------------------------------------------
 
 using Microsoft.Azure.Management.Compute.Models;
-using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.RegularExpressions;
 
 namespace Microsoft.Azure.Commands.Compute.Models
 {
@@ -41,7 +41,9 @@ public string VMSize
         }
 
         public IDictionary<string, string> Tags { get; set; }
+
         public string AvailabilitySetId { get; set; }
+
         public string ProvisioningState { get; set; }
 
         public string OSConfiguration
@@ -70,16 +72,29 @@ public string SourceImageId
             }
         }
 
-        public string OSDisk
+        public ImageReference ImageReference
         {
             get
             {
-                if (this.StorageProfile != null && this.StorageProfile.OSDisk != null)
+                if (this.StorageProfile != null)
+                {
+                    return this.StorageProfile.ImageReference;
+                }
+
+                return null;
+            }
+        }
+
+        public OSDisk OSDisk
+        {
+            get
+            {
+                if (this.StorageProfile != null)
                 {
-                    return this.StorageProfile.OSDisk.Name;
+                    return this.StorageProfile.OSDisk;
                 }
 
-                return string.Empty;
+                return null;
             }
         }
 
@@ -111,15 +126,19 @@ public IList<string> NetworkInterfaces
 
         public IList<VirtualMachineExtension> Extensions { get; set; }
 
-        public VirtualMachineInstanceView Status { get; set; }
-
         public HardwareProfile HardwareProfile { get; set; }
 
         public NetworkProfile NetworkProfile { get; set; }
 
         public OSProfile OSProfile { get; set; }
 
         public StorageProfile StorageProfile { get; set; }
+
+        public VirtualMachineInstanceView InstanceView { get; set; }
+
+        public Plan Plan { get; set; }
+
+        public string Id { get; set; }
     }
 
     public static class PSVirtualMachineConversions
@@ -136,28 +155,33 @@ public static PSVirtualMachine ToPSVirtualMachine(this VirtualMachineGetResponse
 
         public static PSVirtualMachine ToPSVirtualMachine(this VirtualMachine virtualMachine, string rgName = null)
         {
+            if (string.IsNullOrEmpty(rgName))
+            {
+                bool parsed = TryParseResourceGroupName(virtualMachine.Id, out rgName);
+            }
+
             PSVirtualMachine result = new PSVirtualMachine
             {
                 ResourceGroupName = rgName,
-                Name = virtualMachine == null ? null : virtualMachine.Name,
-                Location = virtualMachine == null ? null : virtualMachine.Location,
+                Id                = virtualMachine.Id,
+                Name              = virtualMachine.Name,
+                Location          = virtualMachine.Location,
                 ProvisioningState = virtualMachine.ProvisioningState,
-                Tags = virtualMachine.Tags,
-                Extensions = virtualMachine.Extensions,
-                Status = null, // TODO: VM response does not return Status info yet
+                Tags              = virtualMachine.Tags,
+                Extensions        = virtualMachine.Extensions,
+                InstanceView      = virtualMachine.InstanceView,
+                Plan              = virtualMachine.Plan,
+                OSProfile         = virtualMachine.OSProfile,
+                HardwareProfile   = virtualMachine.HardwareProfile,
+                StorageProfile    = virtualMachine.StorageProfile,
+                NetworkProfile    = virtualMachine.NetworkProfile,
             };
 
-            var asetRef = virtualMachine.AvailabilitySetReference;
-            if (asetRef != null)
+            if (virtualMachine.AvailabilitySetReference != null)
             {
                 result.AvailabilitySetId = virtualMachine.AvailabilitySetReference.ReferenceUri;
             }
 
-            result.OSProfile = virtualMachine.OSProfile;
-            result.HardwareProfile = virtualMachine.HardwareProfile;
-            result.StorageProfile = virtualMachine.StorageProfile;
-            result.NetworkProfile = virtualMachine.NetworkProfile;
-
             return result;
         }
 
@@ -176,5 +200,25 @@ public static List<PSVirtualMachine> ToPSVirtualMachineList(this VirtualMachineL
 
             return results;
         }
+
+        private static bool TryParseResourceGroupName(string virtualMachineId, out string rgName)
+        {
+            const string group = "rgname";
+            const string pattern = @"(.*?)/resourcegroups/(?<" + group + @">\S+)/providers/Microsoft.Compute/virtualMachines/(.*?)";
+
+            Regex r = new Regex(pattern, RegexOptions.IgnoreCase);
+            Match m = r.Match(virtualMachineId);
+
+            if (m.Success)
+            {
+                rgName = m.Groups[group].Value;
+                return true;
+            }
+            else
+            {
+                rgName = null;
+                return false;
+            }
+        }
     }
 }

src/ResourceManager/Compute/Commands.Compute/Models/PSVirtualMachineInstanceView.cs

@@ -30,6 +30,7 @@ public class PSVirtualMachineInstanceView
         public IList<VirtualMachineExtensionInstanceView> Extensions { get; set; }
 
         public int? PlatformFaultDomain { get; set; }
+
         public int? PlatformUpdateDomain { get; set; }
 
         public string RemoteDesktopThumbprint { get; set; }

src/ResourceManager/Compute/Commands.Compute/VirtualMachine/Config/SetAzureVMOSDiskCommand.cs

@@ -117,9 +117,9 @@ public override void ExecuteCmdlet()
                 },
                 SourceImage = string.IsNullOrEmpty(this.SourceImageUri) ? null : new VirtualHardDisk
                 {
-                    Uri = SourceImageUri
+                    Uri = this.SourceImageUri
                 },
-                CreateOption = CreateOption
+                CreateOption = this.CreateOption
             };
 
             WriteObject(this.VM);