Merge branch 'release-2018-11-06' of github.com:/azure/azure-powershell into release-2018-11-06

Author: markcowl

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

@@ -25,7 +25,7 @@
 
   <ItemGroup Condition="'$(TargetFramework)' != 'net472'">
     <PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
-    <PackageReference Include="Microsoft.Azure.Management.Compute" Version="23.0.1" />
+    <PackageReference Include="Microsoft.Azure.Management.Compute" Version="23.2.0" />
     <PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="2.4.2" />
     <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.5.1-preview" />
  	<PackageReference Include="Microsoft.Azure.Management.Storage" Version="8.1.0-preview" />

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

@@ -44,7 +44,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Azure.Management.Compute">
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.23.0.1\lib\net452\Microsoft.Azure.Management.Compute.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.23.2.0\lib\net452\Microsoft.Azure.Management.Compute.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.Management.Network, Version=19.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.5.1-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>

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

@@ -1011,6 +1011,7 @@ function Test-VirtualMachineScaleSetIdentity
         Assert-AreEqual "SystemAssigned" $result.Identity.Type;
         Assert-NotNull $result.Identity.PrincipalId;
         Assert-NotNull $result.Identity.TenantId;
+        Assert-Null $result.Identity.UserAssignedIdentities;
 
         # Validate Network Profile
         Assert-AreEqual 'test' $result.VirtualMachineProfile.NetworkProfile.NetworkInterfaceConfigurations[0].Name;
@@ -1046,6 +1047,7 @@ function Test-VirtualMachineScaleSetIdentity
         Assert-AreEqual "SystemAssigned" $vmssResult.Identity.Type;
         Assert-NotNull $vmssResult.Identity.PrincipalId;
         Assert-NotNull $vmssResult.Identity.TenantId;
+        Assert-Null $result.Identity.UserAssignedIdentities;
 
         $vmssInstanceViewResult = Get-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName -InstanceView;
         Assert-AreEqual "ProvisioningState/succeeded" $vmssInstanceViewResult.VirtualMachine.StatusesSummary[0].Code;
@@ -1828,8 +1830,18 @@ function Test-VirtualMachineScaleSetVMUpdate
         | New-AzureRmDisk -ResourceGroupName $rgname -DiskName $diskname0;
         $disk0 = Get-AzureRmDisk -ResourceGroupName $rgname -DiskName $diskname0;
 
+        $vmssVM = Add-AzureRmVmssVMDataDisk -VirtualMachineScaleSetVM $vmssVMs[0] -Caching 'ReadOnly' -DiskSizeInGB 10 -Lun 1 -CreateOption Attach -StorageAccountType Standard_LRS -ManagedDiskId $disk0.Id;
+        $vmssVM = Add-AzureRmVmssVMDataDisk -VirtualMachineScaleSetVM $vmssVM -Caching 'ReadOnly' -DiskSizeInGB 100 -Lun 0 -CreateOption Attach -StorageAccountType Standard_LRS -ManagedDiskId $disk0.Id;
+        Assert-AreEqual 2 $vmssVM.StorageProfile.DataDisks.Count;
+
+        $vmssVM = Remove-AzureRmVmssVMDataDisk -VirtualMachineScaleSetVM $vmssVM -Lun 1;
+        Assert-AreEqual 1 $vmssVM.StorageProfile.DataDisks.Count;
+
+        $vmssVM = Remove-AzureRmVmssVMDataDisk -VirtualMachineScaleSetVM $vmssVM -Lun 0;
+        Assert-Null $vmssVM.StorageProfile.DataDisks;
+
         $result = $vmssVMs[0] `
-                  | Add-AzureRmVmDataDisk -Caching 'ReadOnly' -DiskSizeInGB 10 -Lun 1 -CreateOption Attach -StorageAccountType Standard_LRS -ManagedDiskId $disk0.Id `
+                  | Add-AzureRmVmssVMDataDisk -Caching 'ReadOnly' -DiskSizeInGB 10 -Lun 1 -CreateOption Attach -StorageAccountType Standard_LRS -ManagedDiskId $disk0.Id `
                   | Update-AzureRmVmssVM;
 
         $vmss = Get-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName;

src/ResourceManager/Compute/Commands.Compute.Test/packages.config

@@ -6,7 +6,7 @@
   <package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Graph.RBAC" version="3.4.0-preview" targetFramework="net452" />
   <package id="Microsoft.Azure.Management.Authorization" version="2.0.0" targetFramework="net45" />
-  <package id="Microsoft.Azure.Management.Compute" version="23.0.1" targetFramework="net452" />
+  <package id="Microsoft.Azure.Management.Compute" version="23.2.0" targetFramework="net452" />
   <package id="Microsoft.Azure.Management.Network" version="19.5.1-preview" targetFramework="net452" />
   <package id="Microsoft.Azure.Management.KeyVault" version="2.4.2" targetFramework="net452" />
   <package id="Microsoft.Azure.Management.Storage" version="7.1.0-preview" targetFramework="net452" />

src/ResourceManager/Compute/Commands.Compute/Az.Compute.psd1

@@ -181,7 +181,8 @@ CmdletsToExport = 'Remove-AzAvailabilitySet', 'Get-AzAvailabilitySet',
     'New-AzGalleryImageDefinition', 'Update-AzGalleryImageDefinition',
     'Get-AzGalleryImageDefinition', 'Remove-AzGalleryImageDefinition',
     'New-AzGalleryImageVersion', 'Update-AzGalleryImageVersion',
-    'Get-AzGalleryImageVersion', 'Remove-AzGalleryImageVersion'
+    'Get-AzGalleryImageVersion', 'Remove-AzGalleryImageVersion',
+    'Add-AzVmssVMDataDisk', 'Remove-AzVmssVMDataDisk'
 
 # Variables to export from this module
 # VariablesToExport = @()

src/ResourceManager/Compute/Commands.Compute/AzureRM.Compute.psd1

@@ -181,7 +181,8 @@ CmdletsToExport = 'Remove-AzureRmAvailabilitySet', 'Get-AzureRmAvailabilitySet',
                'New-AzureRmGalleryImageDefinition', 'Update-AzureRmGalleryImageDefinition',
                'Get-AzureRmGalleryImageDefinition', 'Remove-AzureRmGalleryImageDefinition',
                'New-AzureRmGalleryImageVersion', 'Update-AzureRmGalleryImageVersion',
-               'Get-AzureRmGalleryImageVersion', 'Remove-AzureRmGalleryImageVersion'
+               'Get-AzureRmGalleryImageVersion', 'Remove-AzureRmGalleryImageVersion',
+               'Add-AzureRmVmssVMDataDisk', 'Remove-AzureRmVmssVMDataDisk'
 
 # Variables to export from this module
 # VariablesToExport = @()

src/ResourceManager/Compute/Commands.Compute/ChangeLog.md

@@ -19,6 +19,9 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Add Add-AzureRmVmssVMDataDisk and Remove-AzureRmVmssVMDataDisk cmdlets
+* Get-AzureRmVMImage shows AutomaticOSUpgradeProperties
+* Fixed SetAzureRmVMChefExtension -BootstrapOptions and -JsonAttribute option values are not setting in json format.
 
 ## Version 5.7.2
 * Add EnableUltraSSD switch parameter to New-AzureRmVMConfiig and New-AzureRmVmssConfig.

src/ResourceManager/Compute/Commands.Compute/Commands.Compute.Netcore.csproj

@@ -33,7 +33,7 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="6.2.2" />
-    <PackageReference Include="Microsoft.Azure.Management.Compute" Version="23.0.1" />
+    <PackageReference Include="Microsoft.Azure.Management.Compute" Version="23.2.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/ResourceManager/Compute/Commands.Compute/Commands.Compute.csproj

@@ -54,7 +54,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Azure.Management.Compute">
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.23.0.1\lib\net452\Microsoft.Azure.Management.Compute.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.23.2.0\lib\net452\Microsoft.Azure.Management.Compute.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Data.Edm, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

src/ResourceManager/Compute/Commands.Compute/Common/ComputeAutoMapperProfile.cs

@@ -171,7 +171,7 @@ private static void Initialize()
 
                 // Usage => PSUsage
                 cfg.CreateMap<FROM.Usage, TO.PSUsage>()
-                    .ForMember(c => c.Unit, o => o.MapFrom(r => Microsoft.Azure.Management.Compute.Models.Usage.Unit));
+                    .ForMember(c => c.Unit, o => o.MapFrom(r => FROM.Usage.Unit));
 
                 cfg.CreateMap<AzureOperationResponse<FROM.Usage>, TO.PSUsage>()
                     .ForMember(c => c.StatusCode, o => o.MapFrom(r => r.Response.StatusCode));

src/ResourceManager/Compute/Commands.Compute/Common/ConstantStringTypes.cs

@@ -46,6 +46,13 @@ public static class HelpMessages
         public const string VMManagedDiskId = "The virtual machine managed disk's Id.";
         public const string VMManagedDiskAccountType = "The virtual machine managed disk's account type.";
 
+        public const string VmssVMDataDiskCaching = "The virtual machine scale set VM data disk's caching.";
+        public const string VmssVMDataDiskSizeInGB = "The virtual machine scale set VM data disk's size in GB.";
+        public const string VmssVMDataDiskLun = "The virtual machine scale set VM data disk's Lun.";
+        public const string VmssVMDataDiskCreateOption = "The virtual machine scale set VM data disk's create option.";
+        public const string VmssVMManagedDiskId = "The virtual machine scale set VM managed disk's Id.";
+        public const string VmssVMManagedDiskAccountType = "The virtual scale set VM machine managed disk's account type.";
+
         public const string VMNetworkInterfaceName = "The virtual machine network interface's name.";
         public const string VMNetworkInterfaceID = "The virtual machine network interface's ID.";
         public const string VMPublicIPAddressName = "The virtual machine public IP address's name.";

src/ResourceManager/Compute/Commands.Compute/Extension/Chef/SetAzureVMChefExtension.cs

@@ -22,6 +22,7 @@
 using System.IO;
 using System.Linq;
 using System.Management.Automation;
+using Newtonsoft.Json.Linq;
 
 namespace Microsoft.Azure.Commands.Compute.Extension.Chef
 {
@@ -257,6 +258,7 @@ private Hashtable PublicConfiguration
                     bool IsBootstrapOptionsEmpty = string.IsNullOrEmpty(this.BootstrapOptions);
                     bool IsJsonAttributeEmpty = string.IsNullOrEmpty(this.JsonAttribute);
                     bool IsChefDaemonIntervalEmpty = string.IsNullOrEmpty(this.ChefDaemonInterval);
+                    bool IsBootstrapVersionEmpty = string.IsNullOrEmpty(this.BootstrapVersion);
                     string BootstrapVersion = string.IsNullOrEmpty(this.BootstrapVersion) ? "" : this.BootstrapVersion;
                     bool IsDaemonEmpty = string.IsNullOrEmpty(this.Daemon);
 
@@ -308,7 +310,10 @@ private Hashtable PublicConfiguration
                     }
 
                     var hashTable = new Hashtable();
-                    hashTable.Add(BootstrapVersionTemplate, BootstrapVersion);
+                    if (!IsBootstrapVersionEmpty)
+                    {
+                        hashTable.Add(BootstrapVersionTemplate, BootstrapVersion);
+                    }
                     hashTable.Add(ClientRbTemplate, ClientConfig);
 
                     if (!IsRunListEmpty)
@@ -318,12 +323,14 @@ private Hashtable PublicConfiguration
 
                     if (!IsBootstrapOptionsEmpty)
                     {
-                        hashTable.Add(BootStrapOptionsTemplate, this.BootstrapOptions);
+                        JObject bootstrap_option_json = JObject.Parse(this.BootstrapOptions);
+                        hashTable.Add(BootStrapOptionsTemplate, bootstrap_option_json);
                     }
 
                     if (!IsJsonAttributeEmpty)
                     {
-                        hashTable.Add(JsonAttributeTemplate, JsonAttribute);
+                        JObject json_attribute_json = JObject.Parse(this.JsonAttribute);
+                        hashTable.Add(JsonAttributeTemplate, json_attribute_json);
                     }
 
                     if (!IsChefDaemonIntervalEmpty)
@@ -336,6 +343,7 @@ private Hashtable PublicConfiguration
                         hashTable.Add(DaemonTemplate, this.Daemon);
                     }
 
+
                     this.publicConfiguration = hashTable;
                 }
 

src/ResourceManager/Compute/Commands.Compute/Extension/Diagnostics/AddAzureRmVmssDiagnosticsExtension.cs

@@ -120,19 +120,19 @@ protected override void ProcessRecord()
                 // VirtualMachineProfile
                 if (this.VirtualMachineScaleSet.VirtualMachineProfile == null)
                 {
-                    this.VirtualMachineScaleSet.VirtualMachineProfile = new Microsoft.Azure.Management.Compute.Models.VirtualMachineScaleSetVMProfile();
+                    this.VirtualMachineScaleSet.VirtualMachineProfile = new VirtualMachineScaleSetVMProfile();
                 }
 
                 // ExtensionProfile
                 if (this.VirtualMachineScaleSet.VirtualMachineProfile.ExtensionProfile == null)
                 {
-                    this.VirtualMachineScaleSet.VirtualMachineProfile.ExtensionProfile = new Microsoft.Azure.Management.Compute.Models.VirtualMachineScaleSetExtensionProfile();
+                    this.VirtualMachineScaleSet.VirtualMachineProfile.ExtensionProfile = new VirtualMachineScaleSetExtensionProfile();
                 }
 
                 // Extensions
                 if (this.VirtualMachineScaleSet.VirtualMachineProfile.ExtensionProfile.Extensions == null)
                 {
-                    this.VirtualMachineScaleSet.VirtualMachineProfile.ExtensionProfile.Extensions = new List<Microsoft.Azure.Management.Compute.Models.VirtualMachineScaleSetExtension>();
+                    this.VirtualMachineScaleSet.VirtualMachineProfile.ExtensionProfile.Extensions = new List<VirtualMachineScaleSetExtension>();
                 }
 
                 bool shouldContinue = true;
@@ -162,7 +162,7 @@ protected override void ProcessRecord()
                     // Parse configs, and auto fill incomplete parts
                     Tuple<Hashtable, Hashtable> settings = DiagnosticsHelper.GetConfigurationsFromFiles(this.SettingFilePath, this.ProtectedSettingFilePath, this.VirtualMachineScaleSet.Id, this, storageClient);
 
-                    var newDiagnosticsExtension = new Microsoft.Azure.Management.Compute.Models.VirtualMachineScaleSetExtension();
+                    var newDiagnosticsExtension = new VirtualMachineScaleSetExtension();
 
                     newDiagnosticsExtension.Name = this.Name;
                     newDiagnosticsExtension.Publisher = DiagnosticsExtensionConstants.ExtensionPublisher;

src/ResourceManager/Compute/Commands.Compute/Generated/ContainerService/Config/AddAzureRmContainerServiceAgentPoolProfileCommand.cs

@@ -77,10 +77,10 @@ private void Run()
             // AgentPoolProfiles
             if (this.ContainerService.AgentPoolProfiles == null)
             {
-                this.ContainerService.AgentPoolProfiles = new List<Microsoft.Azure.Management.Compute.Models.ContainerServiceAgentPoolProfile>();
+                this.ContainerService.AgentPoolProfiles = new List<ContainerServiceAgentPoolProfile>();
             }
 
-            var vAgentPoolProfiles = new Microsoft.Azure.Management.Compute.Models.ContainerServiceAgentPoolProfile();
+            var vAgentPoolProfiles = new ContainerServiceAgentPoolProfile();
 
             vAgentPoolProfiles.Name = this.MyInvocation.BoundParameters.ContainsKey("Name") ? this.Name : null;
             vAgentPoolProfiles.Count = this.Count;