Merge branch 'preview' into common-stack

Author: MiYanni

.github/ISSUE_TEMPLATE.md

@@ -28,10 +28,10 @@ If this issue is not a bug report, please remove the below template
 
 ### Module Version
 
-<!-- Please run (Get-Module -Name AzureRM -ListAvailable) to get the version(s) of AzureRM installed on your machine -->
+<!-- Please run (Get-Module -ListAvailable) to get the version(s) of all modules, including Azure installed on your machine -->
 
 ```powershell
-Get-Module -Name AzureRM -ListAvailable
+Get-Module -ListAvailable
 ```
 
 ### Environment Data
@@ -44,7 +44,7 @@ $PSVersionTable
 
 ### Debug Output
 
-<!-- Please run the above script with $DebugPreference = "Continue" and paste the resulting debug stream in the below code block -->
+<!-- Please run the above script with $DebugPreference='Continue' and paste the resulting debug stream in the below code block -->
 
 ```
 

.travis.yml

@@ -1,7 +1,7 @@
 sudo: required
 language: csharp
 mono: none
-dotnet: 2.1.302
+dotnet: 2.1.400
 dist: trusty
 
 env:
@@ -19,7 +19,6 @@ before_install:
  - sudo dpkg -i packages-microsoft-prod.deb
  - sudo apt-get install apt-transport-https
  - sudo apt-get update
- - sudo apt-get install dotnet-sdk-2.1
  - sudo apt-get install -y powershell
  - sudo pwsh -NonInteractive -NoLogo -NoProfile -Command "Install-Module platyPS -Force -Confirm:\$false -Scope CurrentUser"
 

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

@@ -133,7 +133,7 @@ function Test-VirtualMachineProfile
     Assert-AreEqual $p.StorageProfile.OSDisk.Name $osDiskName;
     Assert-AreEqual $p.StorageProfile.OSDisk.Vhd.Uri $osDiskVhdUri;
     Assert-AreEqual $managedOsDiskId_1 $p.StorageProfile.OSDisk.ManagedDisk.Id;
-    Assert-AreEqual "Standard_LRS" $p.StorageProfile.OSDisk.ManagedDisk.StorageAccountType;
+    Assert-Null $p.StorageProfile.OSDisk.ManagedDisk.StorageAccountType;
     Assert-AreEqual $false $p.StorageProfile.OSDisk.WriteAcceleratorEnabled;
 
     # Windows OS

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

@@ -384,5 +384,17 @@ public void TestVirtualMachineWriteAcceleratorUpdate()
         {
             ComputeTestController.NewInstance.RunPsTest(_logger, "Test-VirtualMachineWriteAcceleratorUpdate");
         }
+
+#if NETSTANDARD
+        [Fact(Skip = "Updated Storage, needs re-recorded")]
+        [Trait(Category.RunType, Category.DesktopOnly)]
+#else
+        [Fact]
+#endif
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestVirtualMachineManagedDisk()
+        {
+            ComputeTestController.NewInstance.RunPsTest(_logger, "Test-VirtualMachineManagedDisk");
+        }
     }
 }

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

@@ -3308,11 +3308,142 @@ function Test-VirtualMachineWriteAcceleratorUpdate
             $st = $vm1 | Update-AzureRmVM -OsDiskWriteAccelerator $true; } `
              "not supported on disks with Write Accelerator enabled";
 
+        $output = $error | Out-String;
+        Assert-True {$output.Contains("Target");}
+
         $st = $vm1 | Update-AzureRmVM -OsDiskWriteAccelerator $false;
     }
     finally
     {
         # Cleanup
         Clean-ResourceGroup $rgname
     }
+}
+
+function Test-VirtualMachineManagedDisk
+{
+    # Setup
+    $rgname = Get-ComputeTestResourceName
+
+    try
+    {
+        $loc = Get-ComputeVMLocation;
+        New-AzureRmResourceGroup -Name $rgname -Location $loc -Force;
+
+        # VM Profile & Hardware
+        $vmsize = 'Standard_DS1';
+        $vmname = 'vm' + $rgname;
+
+        $p = New-AzureRmVMConfig -VMName $vmname -VMSize $vmsize;
+
+        # NRP
+        $subnet = New-AzureRmVirtualNetworkSubnetConfig -Name ('subnet' + $rgname) -AddressPrefix "10.0.0.0/24";
+        $vnet = New-AzureRmVirtualNetwork -Force -Name ('vnet' + $rgname) -ResourceGroupName $rgname -Location $loc -AddressPrefix "10.0.0.0/16" -Subnet $subnet;
+        $vnet = Get-AzureRmVirtualNetwork -Name ('vnet' + $rgname) -ResourceGroupName $rgname;
+        $subnetId = $vnet.Subnets[0].Id;
+        $pubip = New-AzureRmPublicIpAddress -Force -Name ('pubip' + $rgname) -ResourceGroupName $rgname -Location $loc -AllocationMethod Dynamic -DomainNameLabel ('pubip' + $rgname);
+        $pubip = Get-AzureRmPublicIpAddress -Name ('pubip' + $rgname) -ResourceGroupName $rgname;
+        $pubipId = $pubip.Id;
+        $nic = New-AzureRmNetworkInterface -Force -Name ('nic' + $rgname) -ResourceGroupName $rgname -Location $loc -SubnetId $subnetId -PublicIpAddressId $pubip.Id;
+        $nic = Get-AzureRmNetworkInterface -Name ('nic' + $rgname) -ResourceGroupName $rgname;
+        $nicId = $nic.Id;
+
+        $p = Add-AzureRmVMNetworkInterface -VM $p -Id $nicId;
+
+        # OS & Image
+        $user = "Foo2";
+        $password = $PLACEHOLDER;
+        $securePassword = ConvertTo-SecureString $password -AsPlainText -Force;
+        $cred = New-Object System.Management.Automation.PSCredential ($user, $securePassword);
+        $computerName = 'test';
+
+        $p = Set-AzureRmVMOperatingSystem -VM $p -Windows -ComputerName $computerName -Credential $cred;
+
+        $imgRef = Get-DefaultCRPImage -loc $loc;
+        $p = ($imgRef | Set-AzureRmVMSourceImage -VM $p);
+
+        # Virtual Machine
+        New-AzureRmVM -ResourceGroupName $rgname -Location $loc -VM $p;
+
+        # Get VM
+        $vm = Get-AzureRmVM -Name $vmname -ResourceGroupName $rgname;
+
+        Assert-NotNull $vm.StorageProfile.OsDisk.ManagedDisk.Id;
+        Assert-AreEqual 'Premium_LRS' $vm.StorageProfile.OsDisk.ManagedDisk.StorageAccountType;
+
+        # Create OS snapshot from the VM
+        $snapshotConfig = New-AzureRmSnapshotConfig -SourceUri $vm.Storageprofile.OsDisk.ManagedDisk.Id -Location $loc -CreateOption Copy;
+        $snapshotname = "ossnapshot";
+        New-AzureRmSnapshot -Snapshot $snapshotConfig -SnapshotName $snapshotname -ResourceGroupName $rgname;
+        $snapshot = Get-AzureRmSnapshot -SnapshotName $snapshotname -ResourceGroupName $rgname;
+
+        Assert-NotNull $snapshot.Id;
+        Assert-AreEqual $snapshotname $snapshot.Name;
+        Assert-AreEqual 'Standard_LRS' $snapshot.Sku.Name;
+
+        # Create an OS disk from the snapshot
+        $osdiskConfig = New-AzureRmDiskConfig -Location $loc -CreateOption Copy -SourceUri $snapshot.Id;
+        $osdiskname = "osdisk";
+        New-AzureRmDisk -ResourceGroupName $rgname -DiskName $osdiskname -Disk $osdiskConfig;
+        $osdisk = Get-AzureRmDisk -ResourceGroupName $rgname -DiskName $osdiskname;
+
+        Assert-NotNull $osdisk.Id;
+        Assert-AreEqual $osdiskname $osdisk.Name;
+        Assert-AreEqual 'Standard_LRS' $osdisk.Sku.Name;
+
+        # Stop the VM
+        Stop-AzureRmVM -ResourceGroupName $rgname -Name $vmname -Force;
+
+        # Change the OS disk of the VM
+        $vm = Set-AzureRmVMOSDisk -VM $vm -Name $osdiskname -ManagedDiskId $osdisk.Id;
+
+        # Create an empty disk
+        $datadiskconfig = New-AzureRmDiskConfig -Location $loc -CreateOption Empty -AccountType 'Standard_LRS' -DiskSizeGB 10;
+        $datadiskname = "datadisk";
+        New-AzureRmDisk -ResourceGroupName $rgname -DiskName $datadiskname -Disk $datadiskconfig;
+        $datadisk = Get-AzureRmDisk -ResourceGroupName $rgname -DiskName $datadiskname;
+
+        Assert-NotNull $datadisk.Id;
+        Assert-AreEqual $datadiskname $datadisk.Name;
+        Assert-AreEqual 'Standard_LRS' $datadisk.Sku.Name;
+
+        # Add the disk to the VM
+        $vm = Add-AzureRmVMDataDisk -VM $vm -Name $datadiskname -ManagedDiskId $dataDisk.Id -Lun 2 -CreateOption Attach -Caching 'ReadWrite';
+
+        # Update and start the VM
+        Update-AzureRmVM -ResourceGroupName $rgname -VM $vm;
+        Start-AzureRmVM -ResourceGroupName $rgname -Name $vmname;
+
+        # Get the updated VM
+        $vm = Get-AzureRmVM -ResourceGroupName $rgname -Name $vmname;
+
+        Assert-NotNull $vm.VmId;
+        Assert-AreEqual $vmname $vm.Name ;
+        Assert-AreEqual 1 $vm.NetworkProfile.NetworkInterfaces.Count;
+        Assert-AreEqual $nicId $vm.NetworkProfile.NetworkInterfaces[0].Id;
+
+        Assert-AreEqual $imgRef.Offer $vm.StorageProfile.ImageReference.Offer;
+        Assert-AreEqual $imgRef.PublisherName $vm.StorageProfile.ImageReference.Publisher;
+        Assert-AreEqual $imgRef.Skus $vm.StorageProfile.ImageReference.Sku;
+        Assert-AreEqual $imgRef.Version $vm.StorageProfile.ImageReference.Version;
+
+        Assert-AreEqual $user $vm.OSProfile.AdminUsername;
+        Assert-AreEqual $computerName $vm.OSProfile.ComputerName;
+        Assert-AreEqual $vmsize $vm.HardwareProfile.VmSize;
+
+        Assert-True {$vm.DiagnosticsProfile.BootDiagnostics.Enabled;};
+
+        Assert-AreEqual "BGInfo" $vm.Extensions[0].VirtualMachineExtensionType;
+        Assert-AreEqual "Microsoft.Compute" $vm.Extensions[0].Publisher;
+
+        Assert-AreEqual $osdisk.Id $vm.StorageProfile.OsDisk.ManagedDisk.Id;
+        Assert-AreEqual 'Standard_LRS' $vm.StorageProfile.OsDisk.ManagedDisk.StorageAccountType;
+        Assert-AreEqual $datadisk.Id $vm.StorageProfile.DataDisks[0].ManagedDisk.Id;
+        Assert-AreEqual 'Standard_LRS' $vm.StorageProfile.DataDisks[0].ManagedDisk.StorageAccountType;
+    }
+    finally
+    {
+        # Cleanup
+        Clean-ResourceGroup $rgname
+    }
 }

src/ResourceManager/Compute/Commands.Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests/TestVirtualMachineManagedDisk.json

@@ -19,7 +19,10 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fixed the issue that target is missing in error output.
+* Fixed issue with storage account type for VM with managed disk
 * Fixed issue with default resource groups not being set.
+* Fix AEM Extension cmdlets for other environments, for example Azure China
 
 ## Version 5.5.0
 * Updated to the latest version of the Azure ClientRuntime.

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

@@ -18,6 +18,7 @@
 using System.Text.RegularExpressions;
 using Microsoft.Azure.Commands.Compute.Common;
 using Microsoft.Azure.Commands.ResourceManager.Common;
+using Microsoft.Azure.Management.Compute.Models;
 
 namespace Microsoft.Azure.Commands.Compute
 {
@@ -96,6 +97,28 @@ public static string GetOperationIdFromUrlString(string Url)
             Match m = r.Match(Url);
             return m.Success ? m.Groups["id"].Value : null;
         }
+
+        public static ManagedDiskParameters SetManagedDisk(string managedDiskId, string storageAccountType, ManagedDiskParameters managedDisk = null)
+        {
+            if (string.IsNullOrWhiteSpace(managedDiskId) && string.IsNullOrWhiteSpace(storageAccountType))
+            {
+                return managedDisk;
+            }
+
+            managedDisk = new ManagedDiskParameters();
+
+            if (!string.IsNullOrWhiteSpace(managedDiskId))
+            {
+                managedDisk.Id = managedDiskId;
+            }
+
+            if (!string.IsNullOrWhiteSpace(storageAccountType))
+            {
+                managedDisk.StorageAccountType = storageAccountType;
+            }
+
+            return managedDisk;
+        }
     }
 }
 

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

@@ -57,6 +57,7 @@ protected static string GetErrorMessageWithRequestIdInfo(Rest.Azure.CloudExcepti
                 {
                     sb.AppendLine().AppendFormat("ErrorCode: {0}", errorReturned.Error.Code);
                     sb.AppendLine().AppendFormat("ErrorMessage: {0}", errorReturned.Error.Message);
+                    sb.AppendLine().AppendFormat("ErrorTarget: {0}", errorReturned.Error.Target);
                 }
 
                 if (errorReturned.StartTime != null)

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

@@ -46,16 +46,18 @@ internal class AEMHelper
         private Dictionary<string, string> _StorageKeyCache = new Dictionary<string, string>(StringComparer.InvariantCultureIgnoreCase);
         private StorageManagementClient _StorageClient;
         private IAzureSubscription _Subscription;
+        private string _StorageEndpoint;
 
         public AEMHelper(Action<ErrorRecord> errorAction, Action<string> verboseAction, Action<string> warningAction,
-            PSHostUserInterface ui, StorageManagementClient storageClient, IAzureSubscription subscription)
+            PSHostUserInterface ui, StorageManagementClient storageClient, IAzureSubscription subscription, String storageEndpoint)
         {
             this._ErrorAction = errorAction;
             this._VerboseAction = verboseAction;
             this._WarningAction = warningAction;
             this._UI = ui;
             this._StorageClient = storageClient;
             this._Subscription = subscription;
+            this._StorageEndpoint = storageEndpoint;
         }
 
         internal string GetStorageAccountFromUri(string uri)
@@ -140,7 +142,7 @@ internal bool IsPremiumStorageAccount(string accountName)
                     StorageCredentialsFactory storageCredentialsFactory = new StorageCredentialsFactory(resGroupName,
                         this._StorageClient, this._Subscription);
                     StorageCredentials sc = storageCredentialsFactory.Create(blobUri);
-                    CloudStorageAccount cloudStorageAccount = new CloudStorageAccount(sc, true);
+                    CloudStorageAccount cloudStorageAccount = new CloudStorageAccount(sc,  this._StorageEndpoint, true);
                     CloudBlobClient blobClient = cloudStorageAccount.CreateCloudBlobClient();
                     CloudBlobContainer blobContainer = blobClient.GetContainerReference(blobUri.BlobContainerName);
                     var cloudBlob = blobContainer.GetPageBlobReference(blobUri.BlobName);
@@ -729,7 +731,7 @@ internal ServiceProperties GetStorageAnalytics(string storageAccountName)
         {
             var key = this.GetAzureStorageKeyFromCache(storageAccountName);
             var credentials = new StorageCredentials(storageAccountName, key);
-            var cloudStorageAccount = new CloudStorageAccount(credentials, true);
+            var cloudStorageAccount = new CloudStorageAccount(credentials, this._StorageEndpoint, true);
             return cloudStorageAccount.CreateCloudBlobClient().GetServicePropertiesAsync().ConfigureAwait(false).GetAwaiter().GetResult();
         }
 

src/ResourceManager/Compute/Commands.Compute/Extension/AEM/AEMHelper.cs

@@ -74,7 +74,8 @@ public override void ExecuteCmdlet()
             this._Helper = new AEMHelper((err) => this.WriteError(err), (msg) => this.WriteVerbose(msg), (msg) => this.WriteWarning(msg),
                 this.CommandRuntime.Host.UI,
                 AzureSession.Instance.ClientFactory.CreateArmClient<StorageManagementClient>(DefaultProfile.DefaultContext, AzureEnvironment.Endpoint.ResourceManager),
-                this.DefaultContext.Subscription);
+                this.DefaultContext.Subscription, 
+                this.DefaultContext.Environment.GetEndpoint(AzureEnvironment.Endpoint.StorageEndpointSuffix));
 
             base.ExecuteCmdlet();
 

src/ResourceManager/Compute/Commands.Compute/Extension/AEM/RemoveAzureRmVMAEMExtension.cs

@@ -38,6 +38,7 @@ namespace Microsoft.Azure.Commands.Compute
     [OutputType(typeof(PSAzureOperationResponse))]
     public class SetAzureRmVMAEMExtension : VirtualMachineExtensionBaseCmdlet
     {
+        private string _StorageEndpoint;
         private AEMHelper _Helper = null;
 
         [Parameter(
@@ -91,8 +92,13 @@ public SetAzureRmVMAEMExtension()
 
         public override void ExecuteCmdlet()
         {
+            this._StorageEndpoint = this.DefaultContext.Environment.GetEndpoint(AzureEnvironment.Endpoint.StorageEndpointSuffix);
             this._Helper = new AEMHelper((err) => this.WriteError(err), (msg) => this.WriteVerbose(msg), (msg) => this.WriteWarning(msg),
-                this.CommandRuntime.Host.UI, AzureSession.Instance.ClientFactory.CreateArmClient<StorageManagementClient>(DefaultProfile.DefaultContext, AzureEnvironment.Endpoint.ResourceManager), this.DefaultContext.Subscription);
+                this.CommandRuntime.Host.UI, 
+                AzureSession.Instance.ClientFactory.CreateArmClient<StorageManagementClient>(
+                    DefaultProfile.DefaultContext, AzureEnvironment.Endpoint.ResourceManager), 
+                this.DefaultContext.Subscription,
+                this._StorageEndpoint);
 
             base.ExecuteCmdlet();
 
@@ -521,7 +527,7 @@ private void SetStorageAnalytics(string storageAccountName)
 
             var key = this._Helper.GetAzureStorageKeyFromCache(storageAccountName);
             var credentials = new StorageCredentials(storageAccountName, key);
-            var cloudStorageAccount = new CloudStorageAccount(credentials, true);
+            var cloudStorageAccount = new CloudStorageAccount(credentials,  this._StorageEndpoint, true);
 
             cloudStorageAccount.CreateCloudBlobClient().SetServicePropertiesAsync(props)
                                                        .ConfigureAwait(false).GetAwaiter().GetResult();

src/ResourceManager/Compute/Commands.Compute/Extension/AEM/SetAzureRmVMAEMExtension.cs

@@ -89,7 +89,8 @@ public override void ExecuteCmdlet()
             this._Helper = new AEMHelper((err) => this.WriteError(err), (msg) => this.WriteVerbose(msg), (msg) => this.WriteWarning(msg),
                 this.CommandRuntime.Host.UI,
                 AzureSession.Instance.ClientFactory.CreateArmClient<StorageManagementClient>(DefaultProfile.DefaultContext, AzureEnvironment.Endpoint.ResourceManager),
-                this.DefaultContext.Subscription);
+                this.DefaultContext.Subscription, 
+                this.DefaultContext.Environment.GetEndpoint(AzureEnvironment.Endpoint.StorageEndpointSuffix));
 
             this._Helper.WriteVerbose("Starting TestAzureRmVMAEMExtension");
 

src/ResourceManager/Compute/Commands.Compute/Extension/AEM/TestAzureRmVMAEMExtension.cs

@@ -110,7 +110,10 @@ private void Run()
             vDataDisks.BlobUri = this.MyInvocation.BoundParameters.ContainsKey("BlobUri") ? this.BlobUri : null;
             vDataDisks.Caching = this.MyInvocation.BoundParameters.ContainsKey("Caching") ? this.Caching : (CachingTypes?) null;
             vDataDisks.DiskSizeGB = this.MyInvocation.BoundParameters.ContainsKey("DiskSizeGB") ? this.DiskSizeGB : (int?) null;
-            vDataDisks.StorageAccountType = this.MyInvocation.BoundParameters.ContainsKey("StorageAccountType") ? (StorageAccountTypes ?) this.StorageAccountType : null;
+            if (this.MyInvocation.BoundParameters.ContainsKey("StorageAccountType"))
+            {
+                vDataDisks.StorageAccountType = (StorageAccountTypes?) this.StorageAccountType;
+            }
             if (this.MyInvocation.BoundParameters.ContainsKey("SnapshotId"))
             {
                 // Snapshot

src/ResourceManager/Compute/Commands.Compute/Generated/Image/Config/AddAzureRmImageDataDiskCommand.cs

@@ -224,13 +224,7 @@ public override void ExecuteCmdlet()
                     DiskSizeGB = this.DiskSizeInGB,
                     Lun = this.Lun.GetValueOrDefault(),
                     CreateOption = this.CreateOption,
-                    ManagedDisk = (this.ManagedDiskId == null && this.StorageAccountType == null)
-                                  ? null
-                                  : new ManagedDiskParameters
-                                  {
-                                      Id = this.ManagedDiskId,
-                                      StorageAccountType = this.StorageAccountType
-                                  },
+                    ManagedDisk = SetManagedDisk(this.ManagedDiskId, this.StorageAccountType),
                     WriteAcceleratorEnabled = this.WriteAccelerator.IsPresent
                 });
 
@@ -258,11 +252,7 @@ public override void ExecuteCmdlet()
                     DiskSizeGB = this.DiskSizeInGB,
                     Lun = this.Lun.GetValueOrDefault(),
                     CreateOption = this.CreateOption,
-                    ManagedDisk = new ManagedDiskParameters
-                                  {
-                                      Id = this.ManagedDiskId,
-                                      StorageAccountType = this.StorageAccountType
-                                  },
+                    ManagedDisk = SetManagedDisk(this.ManagedDiskId, this.StorageAccountType),
                     WriteAcceleratorEnabled = this.WriteAccelerator.IsPresent
                 });