Merge pull request Azure#9713 from cormacpayne/july

[Compute] Fix Remove-AzVmssVMDataDisk cmdlet and update VM instance view object

Author: markcowl

src/Compute/Compute.Test/Compute.Test.csproj

@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
-    <PackageReference Include="Microsoft.Azure.Management.Compute" Version="27.0.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Compute" Version="27.1.0" />
     <PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="2.4.2" />
     <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.13.0-preview" />
   </ItemGroup>

src/Compute/Compute.Test/ScenarioTests/VirtualMachineScaleSetTests.ps1

@@ -1972,7 +1972,8 @@ function Test-VirtualMachineScaleSetVMUpdate
         Assert-AreEqual 1 $vmssVM.StorageProfile.DataDisks.Count;
 
         $vmssVM = Remove-AzVmssVMDataDisk -VirtualMachineScaleSetVM $vmssVM -Lun 0;
-        Assert-Null $vmssVM.StorageProfile.DataDisks;
+        Assert-NotNull $vmssVM.StorageProfile.DataDisks;
+        Assert-AreEqual 0 $vmssVM.StorageProfile.DataDisks.Count;
 
         $result = $vmssVMs[0] `
                   | Add-AzVmssVMDataDisk -Caching 'ReadOnly' -DiskSizeInGB 10 -Lun 1 -CreateOption Attach -StorageAccountType Standard_LRS -ManagedDiskId $disk0.Id `

src/Compute/Compute/ChangeLog.md

@@ -19,6 +19,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Add missing properties (ComputerName, OsName, OsVersion and HyperVGeneration) of VM instance view object.
 
 ## Version 2.4.0
 * Add HyperVGeneration parameter to New-AzImageConfig

src/Compute/Compute/Compute.csproj

@@ -13,7 +13,7 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="6.2.2" />
-    <PackageReference Include="Microsoft.Azure.Management.Compute" Version="27.0.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Compute" Version="27.1.0" />
     <PackageReference Include="System.Security.Permissions" Version="4.5.0" />
     <PackageReference Include="System.ServiceModel.Primitives" Version="4.4.1" />
     <PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />

src/Compute/Compute/Manual/RemoveAzureRmVmssVMDataDiskCommand.cs

@@ -48,14 +48,7 @@ public override void ExecuteCmdlet()
                 var disks = storageProfile.DataDisks.ToList();
                 disks.RemoveAll(d => d.Lun == this.Lun);
 
-                if (disks.Count == 0)
-                {
-                    storageProfile.DataDisks = null;
-                }
-                else
-                {
-                    storageProfile.DataDisks = disks;
-                }
+                storageProfile.DataDisks = disks;
             }
 
             this.VirtualMachineScaleSetVM.StorageProfile = storageProfile;

src/Compute/Compute/Models/PSVirtualMachineInstanceView.cs

@@ -22,6 +22,10 @@ public class PSVirtualMachineInstanceView
         public string ResourceGroupName { get; set; }
 
         public string Name { get; set; }
+        public string ComputerName { get; set; }
+        public string OsName { get; set; }
+        public string OsVersion { get; set; }
+        public string HyperVGeneration { get; set; }
 
         public BootDiagnosticsInstanceView BootDiagnostics { get; set; }
 
@@ -61,7 +65,11 @@ public static PSVirtualMachineInstanceView ToPSVirtualMachineInstanceView(
                 PlatformUpdateDomain = virtualMachineInstanceView.PlatformUpdateDomain,
                 RemoteDesktopThumbprint = virtualMachineInstanceView.RdpThumbPrint,
                 VMAgent = virtualMachineInstanceView.VmAgent,
-                MaintenanceRedeployStatus = virtualMachineInstanceView.MaintenanceRedeployStatus
+                MaintenanceRedeployStatus = virtualMachineInstanceView.MaintenanceRedeployStatus,
+                ComputerName = virtualMachineInstanceView.ComputerName,
+                OsName = virtualMachineInstanceView.OsName,
+                OsVersion = virtualMachineInstanceView.OsVersion,
+                HyperVGeneration = virtualMachineInstanceView.HyperVGeneration
             };
 
             return result;

src/Network/Network.Test/Network.Test.csproj

@@ -16,7 +16,7 @@
     <PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
     <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.13.0-preview" />
     <PackageReference Include="Microsoft.Azure.Insights" Version="0.16.0-preview" />
-    <PackageReference Include="Microsoft.Azure.Management.Compute" Version="27.0.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Compute" Version="27.1.0" />
     <PackageReference Include="Microsoft.Azure.Management.ContainerInstance" Version="2.0.0" />
     <PackageReference Include="Microsoft.Azure.Management.Redis" Version="4.4.1" />
     <PackageReference Include="Microsoft.Azure.Management.OperationalInsights" Version="0.19.0-preview" />

src/RecoveryServices/RecoveryServices.Backup.Test/RecoveryServices.Backup.Test.csproj

@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.Compute" Version="27.0.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Compute" Version="27.1.0" />
     <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.13.0-preview" />
     <PackageReference Include="Microsoft.Azure.Management.RecoveryServices" Version="4.2.1-preview" />
     <PackageReference Include="Microsoft.Azure.Management.RecoveryServices.Backup" Version="3.1.1-preview" />