[AzureRT] December release

src/ResourceManager/Compute/AzureRM.Compute.psd1

@@ -100,7 +100,7 @@ CmdletsToExport = 'Remove-AzureRmAvailabilitySet', 'Get-AzureRmAvailabilitySet',
                'Get-AzureRmRemoteDesktopFile', 'Get-AzureRmVMUsage', 
                'Get-AzureRmVMSize', 'Save-AzureRmVMImage', 'Set-AzureRmVM', 
                'Add-AzureRmVMAdditionalUnattendContent', 
-               'Add-AzureRmVMSshPublicKey', 'Add-AzureRmVMSecret', 
+               'Add-AzureRmVMSshPublicKey', 'Add-AzureRmVMSecret', 'Remove-AzureRmVMSecret', 
                'Remove-AzureRmVMNetworkInterface', 'Remove-AzureRmVMDataDisk', 
                'Set-AzureRmVMBootDiagnostics', 'Set-AzureRmVMDataDisk', 
                'Set-AzureRmVMPlan', 'Set-AzureRmVMSourceImage', 

src/ResourceManager/Compute/ChangeLog.md

@@ -19,6 +19,12 @@
 -->
 ## Current Release
 
+* Add Remove-AzureRmVMSecret cmdlet.
+
+* Add DisplayHint property to VM object to enable Compact and Expand display modes.
+
+* Add DisplayHint parameter to Get-AzureRmVM to choose display mode of VM object.
+
 * Updated Set-AzureRmVMChefExtension cmdlet to add following new options :
     - JsonAttribute : A JSON string to be added to the first run of chef-client. e.g. -JsonAttribute '{"container_service": {"chef-init-test": {"command": "C:\\opscode\\chef\\bin"}}}'
 

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

@@ -70,7 +70,8 @@ function Test-ContainerService
         $output = $cslist | Out-String;
         Assert-False { $output.Contains("AgentPoolProfiles") };
 
-        $st = Remove-AzureRmContainerService -ResourceGroupName $rgname -Name $csName;
+        #$st = Remove-AzureRmContainerService -ResourceGroupName $rgname -Name $csName -Force;
+		$st = Remove-AzureRmContainerService -ResourceGroupName $rgname -Name $csName;
     }
     finally
     {
@@ -144,7 +145,8 @@ function Test-ContainerServiceUpdate
             -Count 2 `
         | Update-AzureRmContainerService;
 
-        $st = Get-AzureRmContainerService -ResourceGroupName $rgname -Name $csName | Remove-AzureRmContainerService;
+        #$st = Get-AzureRmContainerService -ResourceGroupName $rgname -Name $csName | Remove-AzureRmContainerService -Force;
+		$st = Get-AzureRmContainerService -ResourceGroupName $rgname -Name $csName | Remove-AzureRmContainerService;
     }
     finally
     {

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

@@ -130,6 +130,30 @@ function Test-VirtualMachineProfile
     $certUrl2 =  "https://testvault123.vault.azure.net/secrets/Test1/514ceb769c984379a7e0230bddaaaaaa";
     $p = Add-AzureRmVMSecret -VM $p -SourceVaultId $referenceUri -CertificateStore $certStore2 -CertificateUrl $certUrl2;
 
+    Assert-AreEqual 2 $p.OSProfile.Secrets.Count;
+    Assert-AreEqual $p.OSProfile.Secrets[0].SourceVault.Id $referenceUri;
+    Assert-AreEqual $p.OSProfile.Secrets[0].VaultCertificates[0].CertificateStore $certStore;
+    Assert-AreEqual $p.OSProfile.Secrets[0].VaultCertificates[0].CertificateUrl $certUrl;
+    Assert-AreEqual $p.OSProfile.Secrets[0].SourceVault.Id $referenceUri;
+    Assert-AreEqual $p.OSProfile.Secrets[0].VaultCertificates[1].CertificateStore $certStore2;
+    Assert-AreEqual $p.OSProfile.Secrets[0].VaultCertificates[1].CertificateUrl $certUrl2;
+    Assert-AreEqual $p.OSProfile.Secrets[1].SourceVault.Id $referenceUri2;
+    Assert-AreEqual $p.OSProfile.Secrets[1].VaultCertificates[0].CertificateStore $certStore;
+    Assert-AreEqual $p.OSProfile.Secrets[1].VaultCertificates[0].CertificateUrl $certUrl;
+
+    $p = Remove-AzureRmVMSecret -VM $p -SourceVaultId $referenceUri;
+    Assert-AreEqual 1 $p.OSProfile.Secrets.Count;
+    Assert-AreEqual $p.OSProfile.Secrets[0].SourceVault.Id $referenceUri2;
+    Assert-AreEqual $p.OSProfile.Secrets[0].VaultCertificates[0].CertificateStore $certStore;
+    Assert-AreEqual $p.OSProfile.Secrets[0].VaultCertificates[0].CertificateUrl $certUrl;
+
+    $p = Remove-AzureRmVMSecret -VM $p;
+    Assert-AreEqual 0 $p.OSProfile.Secrets.Count;
+
+    $p = Add-AzureRmVMSecret -VM $p -SourceVaultId $referenceUri -CertificateStore $certStore -CertificateUrl $certUrl;
+    $p = Add-AzureRmVMSecret -VM $p -SourceVaultId $referenceUri2 -CertificateStore $certStore -CertificateUrl $certUrl;
+    $p = Add-AzureRmVMSecret -VM $p -SourceVaultId $referenceUri -CertificateStore $certStore2 -CertificateUrl $certUrl2;
+
     $aucSetting = "AutoLogon";
     $aucContent = "<UserAccounts><AdministratorPassword><Value>" + $password + "</Value><PlainText>true</PlainText></AdministratorPassword></UserAccounts>";
     $p = Add-AzureRmVMAdditionalUnattendContent -VM $p -Content $aucContent -SettingName $aucSetting;

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

@@ -100,8 +100,15 @@ function Test-VirtualMachineScaleSet
             | Add-AzureRmVmssExtension -Name $extname -Publisher $publisher -Type $exttype -TypeHandlerVersion $extver -AutoUpgradeMinorVersion $true `
             | Remove-AzureRmVmssExtension -Name $extname `
             | Add-AzureRmVmssNetworkInterfaceConfiguration -Name 'test2' -IPConfiguration $ipCfg `
-            | Remove-AzureRmVmssNetworkInterfaceConfiguration -Name 'test2' `
-            | New-AzureRmVmss -ResourceGroupName $rgname -Name $vmssName;
+            | Remove-AzureRmVmssNetworkInterfaceConfiguration -Name 'test2'
+
+        # Validate Remove Network profile
+        Assert-AreEqual 'test' $vmss.VirtualMachineProfile.NetworkProfile.NetworkInterfaceConfigurations[0].Name;
+        Assert-AreEqual $true $vmss.VirtualMachineProfile.NetworkProfile.NetworkInterfaceConfigurations[0].Primary;
+        Assert-AreEqual $subnetId `
+            $vmss.VirtualMachineProfile.NetworkProfile.NetworkInterfaceConfigurations[0].IpConfigurations[0].Subnet.Id;
+
+        $vmss = New-AzureRmVmss -ResourceGroupName $rgname -Name $vmssName -VirtualMachineScaleSet $vmss;
 
         Assert-AreEqual $loc $vmss.Location;
         Assert-AreEqual 2 $vmss.Sku.Capacity;
@@ -206,6 +213,8 @@ function Test-VirtualMachineScaleSet
         $st = $vmssResult | Restart-AzureRmVmss -InstanceId $instanceListParam;
 
         # Remove
+        #$st = Remove-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName -InstanceId 1 -Force;
+        #$st = $vmssResult | Remove-AzureRmVmss -Force;
         $st = Remove-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName -InstanceId 1;
         $st = $vmssResult | Remove-AzureRmVmss;
     }
@@ -332,6 +341,8 @@ function Test-VirtualMachineScaleSetReimageUpdate
             "Conflict";
 
         # Remove
+        #$st = Remove-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName -InstanceId 1 -Force;
+        #$st = Remove-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName -Force;
         $st = Remove-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName -InstanceId 1;
         $st = Remove-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName;
     }
@@ -431,13 +442,14 @@ function Test-VirtualMachineScaleSetLB
         Assert-AreEqual $expectedLb.BackendAddressPools[0].Id $ipCfg.LoadBalancerBackendAddressPools[0].Id;
         Assert-AreEqual $subnetId $ipCfg.Subnet.Id;
 
+        $settingString = ‘{ “AntimalwareEnabled”: true}’;
         $vmss = New-AzureRmVmssConfig -Location $loc -SkuCapacity 2 -SkuName 'Standard_A0' -UpgradePolicyMode 'automatic' -NetworkInterfaceConfiguration $netCfg `
             | Add-AzureRmVmssNetworkInterfaceConfiguration -Name 'test' -Primary $true -IPConfiguration $ipCfg `
             | Set-AzureRmVmssOSProfile -ComputerNamePrefix 'test' -AdminUsername $adminUsername -AdminPassword $adminPassword `
             | Set-AzureRmVmssStorageProfile -Name 'test' -OsDiskCreateOption 'FromImage' -OsDiskCaching 'None' `
             -ImageReferenceOffer $imgRef.Offer -ImageReferenceSku $imgRef.Skus -ImageReferenceVersion $imgRef.Version `
             -ImageReferencePublisher $imgRef.PublisherName -VhdContainer $vhdContainer `
-            | Add-AzureRmVmssExtension -Name $extname -Publisher $publisher -Type $exttype -TypeHandlerVersion $extver -AutoUpgradeMinorVersion $true `
+            | Add-AzureRmVmssExtension -Name $extname -Publisher $publisher -Type $exttype -TypeHandlerVersion $extver -AutoUpgradeMinorVersion $true -Setting $settingString `
             | Remove-AzureRmVmssExtension -Name $extname `
             | Add-AzureRmVmssNetworkInterfaceConfiguration -Name 'test2' -IPConfiguration $ipCfg `
             | Remove-AzureRmVmssNetworkInterfaceConfiguration -Name 'test2' `
@@ -528,6 +540,7 @@ function Test-VirtualMachineScaleSetLB
             Assert-True { $output.Contains("PlatformUpdateDomain") };
         }
 
+        #$st = Remove-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName -Force;
         $st = Remove-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName;
     }
     finally

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

@@ -119,14 +119,25 @@ function Test-VirtualMachine
         New-AzureRmVM -ResourceGroupName $rgname -Location $loc -VM $p;
 
         # Get VM
-        $vm1 = Get-AzureRmVM -Name $vmname -ResourceGroupName $rgname;
+        $vm1 = Get-AzureRmVM -Name $vmname -ResourceGroupName $rgname -DisplayHint Expand;
+
+        # VM Expand output
         $a = $vm1 | Out-String;
         Write-Verbose("Get-AzureRmVM output:");
         Write-Verbose($a);
+        Assert-True {$a.Contains("Sku");}
+
+        # VM Compact output
+        $vm1.DisplayHint = "Compact";
+        $a = $vm1 | Out-String;
+        Assert-False {$a.Contains("Sku");}
+
+        # Table format output
         $a = $vm1 | Format-Table | Out-String;
         Write-Verbose("Get-AzureRmVM | Format-Table output:");
         Write-Verbose($a);
 
+        Assert-NotNull $vm1.VmId;
         Assert-AreEqual $vm1.Name $vmname;
         Assert-AreEqual $vm1.NetworkProfile.NetworkInterfaces.Count 1;
         Assert-AreEqual $vm1.NetworkProfile.NetworkInterfaces[0].Id $nicId;
@@ -179,6 +190,15 @@ function Test-VirtualMachine
         Assert-True{$a.Contains("NIC");}
         Assert-AreNotEqual $vms $null;
 
+        # VM Compact output
+        $a = $vms[0] | Format-Custom | Out-String;
+        Assert-False {$a.Contains("Sku");}
+
+        # VM Expand output
+        $vms[0].DisplayHint = "Expand";
+        $a = $vms[0] | Format-Custom | Out-String;
+        Assert-True {$a.Contains("Sku");}
+
         # Remove All VMs
         Get-AzureRmVM -ResourceGroupName $rgname | Remove-AzureRmVM -ResourceGroupName $rgname -Force;
         $vms = Get-AzureRmVM -ResourceGroupName $rgname;
@@ -1644,12 +1664,32 @@ function Test-VirtualMachineTags
         Write-Verbose("Get-AzureRmVM output:");
         Write-Verbose($a);
 
-        #Assert-NotNull $vm.RequestId;
+        Assert-NotNull $vm.RequestId;
         Assert-NotNull $vm.StatusCode;
 
         # Assert
         Assert-AreEqual "testval1" $vm.Tags["test1"];
         Assert-AreEqual "testval2" $vm.Tags["test2"];
+
+        # Update VM
+        $vm = $vm | Update-AzureRmVM;
+        $vm = Get-AzureRmVM -ResourceGroupName $rgname -Name $vmname;
+
+        Assert-NotNull $vm.RequestId;
+        Assert-NotNull $vm.StatusCode;
+        Assert-AreEqual "testval1" $vm.Tags["test1"];
+        Assert-AreEqual "testval2" $vm.Tags["test2"];
+
+        # Update VM with new Tags
+        $new_tags = @{test1 = "testval3"; test2 = "testval4" };
+        $st = $vm | Update-AzureRmVM -Tags $new_tags;
+        $vm = Get-AzureRmVM -ResourceGroupName $rgname -Name $vmname;
+
+        Assert-NotNull $vm.RequestId;
+        Assert-NotNull $vm.StatusCode;
+        Assert-AreEqual "testval3" $vm.Tags["test1"];
+        Assert-AreEqual "testval4" $vm.Tags["test2"];
+
     }
     finally
     {
@@ -2779,6 +2819,15 @@ function Test-VirtualMachineGetStatus
         Write-Verbose($a);
         Assert-True {$a.Contains("PowerState");}
 
+        # VM Compact output
+        $a = $vms[0] | Format-Custom | Out-String;
+        Assert-False{$a.Contains("Sku");};
+
+        # VM Expand output
+        $vms[0].DisplayHint = "Expand"
+        $a = $vms[0] | Format-Custom | Out-String;
+        Assert-True{$a.Contains("Sku");};
+
         # Remove
         Remove-AzureRmVM -Name $vmname -ResourceGroupName $rgname -Force;
     }