Merge pull request #104 from AzureRT/vmss

Vmss

Author: huangpf

src/ResourceManager/Compute/AzureRM.Compute.psd1

@@ -61,7 +61,8 @@ TypesToProcess = @(
 # Format files (.ps1xml) to be loaded when importing this module  
 FormatsToProcess = @(
 	'.\Microsoft.Azure.Commands.Compute.format.ps1xml',  
-    '.\Microsoft.Azure.Commands.Compute.format.generated.ps1xml'
+	'.\Microsoft.Azure.Commands.Compute.format.generated.ps1xml',
+	'.\Microsoft.Azure.Commands.Compute.Automation.format.generated.ps1xml',
 )  
 
 # Modules to import as nested modules of the module specified in ModuleToProcess  

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

@@ -120,34 +120,66 @@ function Test-VirtualMachineScaleSet
         $vmss.VirtualMachineProfile.StorageProfile.OSDisk.VirtualHardDiskContainers.Add($vhdContainer);
 
         $st = New-AzureVirtualMachineScaleSet -ResourceGroupName $rgname -VirtualMachineScaleSetCreateOrUpdateParameters $vmss;
+
+        Write-Verbose ('Running Command : ' + 'Get-AzureVirtualMachineScaleSet');
         $vmssResult = Get-AzureVirtualMachineScaleSet -ResourceGroupName $rgname -VMScaleSetName $vmss.Name;
         Assert-True { $vmss.Name -eq $vmssResult.VirtualMachineScaleSet.Name };
+        $output = $vmssResult | Out-String;
+        Assert-True { $output.Contains("VirtualMachineScaleSet") };
+        Write-Verbose ($output);
 
         # List All
+        Write-Verbose ('Running Command : ' + 'Get-AzureVirtualMachineScaleSetAllList');
         $vmssList = Get-AzureVirtualMachineScaleSetAllList -VirtualMachineScaleSetListAllParameters $null;
         Assert-True { ($vmssList.VirtualMachineScaleSets | select -ExpandProperty Name) -contains $vmss.Name };
+        $output = $vmssList | Out-String;
+        Assert-True { $output.Contains("VirtualMachineScaleSets") };
+        Write-Verbose ($output);
 
         # List from RG
+        Write-Verbose ('Running Command : ' + 'Get-AzureVirtualMachineScaleSetList');
         $vmssList = Get-AzureVirtualMachineScaleSetList -ResourceGroupName $rgname;
         Assert-True { ($vmssList.VirtualMachineScaleSets | select -ExpandProperty Name) -contains $vmss.Name };
+        $output = $vmssList | Out-String;
+        Assert-True { $output.Contains("VirtualMachineScaleSets") };
+        Write-Verbose ($output);
 
         # List Skus
+        Write-Verbose ('Running Command : ' + 'Get-AzureVirtualMachineScaleSetSkusList');
         $skuList = Get-AzureVirtualMachineScaleSetSkusList -ResourceGroupName $rgname  -VMScaleSetName $vmss.Name;
+        $output = $skuList | Out-String;
+        Assert-True { $output.Contains("VirtualMachineScaleSetSku") };
+        Write-Verbose ($output);
 
         # List All VMs
         $vmListParams = New-AzureComputeParameterObject -FriendlyName VirtualMachineScaleSetVMListParameters;
         $vmListParams.ResourceGroupName = $rgname;
         $vmListParams.VirtualMachineScaleSetName = $vmss.Name;
+
+        Write-Verbose ('Running Command : ' + 'Get-AzureVirtualMachineScaleSetVMList');
         $vmListResult = Get-AzureVirtualMachineScaleSetVMList -VirtualMachineScaleSetVMListParameters $vmListParams;
+        $output = $vmListResult | Out-String;
+        Assert-True { $output.Contains("VirtualMachineScaleSetVM") };
+        Write-Verbose ($output);
+
         $vmList = $vmListResult.VirtualMachineScaleSetVMs;
 
         # List each VM
         for ($i = 0; $i -lt $vmList.Count; $i++)
         {
+            Write-Verbose ('Running Command : ' + 'Get-AzureVirtualMachineScaleSetVM');
             $vm = Get-AzureVirtualMachineScaleSetVM -ResourceGroupName $rgname  -VMScaleSetName $vmss.Name -InstanceId $i;
             Assert-NotNull $vm.VirtualMachineScaleSetVM;
+            $output = $vm | Out-String;
+            Assert-True { $output.Contains("VirtualMachineScaleSetVM") };
+            Write-Verbose ($output);
+
+            Write-Verbose ('Running Command : ' + 'Get-AzureVirtualMachineScaleSetVMInstanceView');
             $vmInstance = Get-AzureVirtualMachineScaleSetVMInstanceView  -ResourceGroupName $rgname  -VMScaleSetName $vmss.Name -InstanceId $i;
             Assert-NotNull $vmInstance.VirtualMachineScaleSetVMInstanceView;
+            $output = $vmInstance | Out-String;
+            Assert-True { $output.Contains("VirtualMachineScaleSetVMInstanceView") };
+            Write-Verbose($output);
         }
 
         # List Next (negative test)

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

@@ -293,12 +293,15 @@
     <Compile Include="Models\PSVirtualMachineSize.cs" />
     <Compile Include="Common\LocationStringExtensions.cs" />
     <Compile Include="Models\UploadParameters.cs" />
+    <Compile Include="Models\VhdDownloadContext.cs" />
+    <Compile Include="Models\VhdDownloaderModel.cs" />
     <Compile Include="Models\VhdUploadContext.cs" />
     <Compile Include="Models\VhdUploaderModel.cs" />
     <Compile Include="RemoteDesktop\VirtualMachineRemoteDesktopBaseCmdlet.cs" />
     <Compile Include="RemoteDesktop\GetAzureRemoteDesktopFileCommand.cs" />
     <Compile Include="StorageServices\AddAzureVhdCommand.cs" />
     <Compile Include="StorageServices\CloudPageBlobObjectFactory.cs" />
+    <Compile Include="StorageServices\SaveAzureVhdCommand.cs" />
     <Compile Include="StorageServices\StorageCredentialsFactory.cs" />
     <Compile Include="Usage\GetAzureVMUsageCommand.cs" />
     <Compile Include="Usage\VirtualMachineUsageBaseCmdlet.cs" />
@@ -376,6 +379,9 @@
       <Link>AzureRM.Compute.psd1</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="Microsoft.Azure.Commands.Compute.Automation.format.generated.ps1xml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="Microsoft.Azure.Commands.Compute.dll-Help.psd1">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

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

@@ -47,6 +47,7 @@ public static class ValidateSetValues
     {
         public const string ReadOnly = "ReadOnly";
         public const string ReadWrite = "ReadWrite";
+        public const string None = "None";
     }
 
     public static class ProfileNouns