Merge pull request #62 from huangpf/dev

Dev

Author: AzureRT

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

@@ -356,6 +356,9 @@
     <None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests\TestVirtualMachineWithDifferentStorageResource.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests\TestVirtualMachineWithEmptyAuc.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests\TestVirtualMachineWithVMAgentAutoUpdate.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

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

@@ -400,26 +400,22 @@ function Get-ResourceProviderLocation
 {
     param ([string] $provider)
 
-	if ([Microsoft.Azure.Test.HttpRecorder.HttpMockServer]::Mode -ne [Microsoft.Azure.Test.HttpRecorder.HttpRecorderMode]::Playback)
-	{
-        $namespace = $provider.Split("/")[0];
-        if($provider.Contains("/"))
-        {
-            $type = $provider.Substring($namespace.Length + 1);
-            $location = Get-AzureRmResourceProvider -ProviderNamespace $namespace | where {$_.ResourceTypes[0].ResourceTypeName -eq $type};
+    $namespace = $provider.Split("/")[0];
+    if($provider.Contains("/"))
+    {
+        $type = $provider.Substring($namespace.Length + 1);
+        $location = Get-AzureRmResourceProvider -ProviderNamespace $namespace | where {$_.ResourceTypes[0].ResourceTypeName -eq $type};
 
-            if ($location -eq $null)
-            {
-                return "westus";
-            }
-            else
-            {
-                return $location.Locations[0];
-            }
+        if ($location -eq $null)
+        {
+            return "westus";
         }
-        return "westus";
-	}
-	return "westus";
+        else
+        {
+            return $location.Locations[0];
+        }
+    }
+    return "westus";
 }
 
 function Get-ComputeVMLocation

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

@@ -139,6 +139,7 @@ function Test-VirtualMachineExtension
         Assert-AreEqual $ext.ResourceGroupName $rgname;
         Assert-NotNull $ext.ProvisioningState;
         Assert-NotNull $ext.Statuses;
+        Assert-NotNull $ext.SubStatuses;
 
         # Remove Extension
         Remove-AzureRmVMExtension -ResourceGroupName $rgname -VMName $vmname -Name $extname -Force;
@@ -295,13 +296,13 @@ function Test-VirtualMachineExtensionUsingHashTable
         Assert-AreEqual $vm1.HardwareProfile.VirtualMachineSize $vmsize;
 
         # Check Extensions in VM
-        Assert-AreEqual $vm1.Extensions.Count 1;
-        Assert-AreEqual $vm1.Extensions[0].Name $extname;
-        Assert-AreEqual $vm1.Extensions[0].Type 'Microsoft.Compute/virtualMachines/extensions';
-        Assert-AreEqual $vm1.Extensions[0].Publisher $publisher;
-        Assert-AreEqual $vm1.Extensions[0].ExtensionType $exttype;
-        Assert-AreEqual $vm1.Extensions[0].TypeHandlerVersion $extver;
-        Assert-NotNull $vm1.Extensions[0].Settings;
+        Assert-AreEqual $vm1.Extensions.Count 2;
+        Assert-AreEqual $vm1.Extensions[1].Name $extname;
+        Assert-AreEqual $vm1.Extensions[1].Type 'Microsoft.Compute/virtualMachines/extensions';
+        Assert-AreEqual $vm1.Extensions[1].Publisher $publisher;
+        Assert-AreEqual $vm1.Extensions[1].ExtensionType $exttype;
+        Assert-AreEqual $vm1.Extensions[1].TypeHandlerVersion $extver;
+        Assert-NotNull $vm1.Extensions[1].Settings;
 
         # Remove Extension
         Remove-AzureRmVMExtension -ResourceGroupName $rgname -VMName $vmname -Name $extname -Force;
@@ -464,13 +465,13 @@ function Test-VirtualMachineCustomScriptExtension
         Assert-AreEqual $vm1.HardwareProfile.VirtualMachineSize $vmsize;
 
         # Check Extensions in VM
-        Assert-AreEqual $vm1.Extensions.Count 1;
-        Assert-AreEqual $vm1.Extensions[0].Name $extname;
-        Assert-AreEqual $vm1.Extensions[0].Type 'Microsoft.Compute/virtualMachines/extensions';
-        Assert-AreEqual $vm1.Extensions[0].Publisher $publisher;
-        Assert-AreEqual $vm1.Extensions[0].ExtensionType $exttype;
-        Assert-AreEqual $vm1.Extensions[0].TypeHandlerVersion $extver;
-        Assert-NotNull $vm1.Extensions[0].Settings;
+        Assert-AreEqual $vm1.Extensions.Count 2;
+        Assert-AreEqual $vm1.Extensions[1].Name $extname;
+        Assert-AreEqual $vm1.Extensions[1].Type 'Microsoft.Compute/virtualMachines/extensions';
+        Assert-AreEqual $vm1.Extensions[1].Publisher $publisher;
+        Assert-AreEqual $vm1.Extensions[1].ExtensionType $exttype;
+        Assert-AreEqual $vm1.Extensions[1].TypeHandlerVersion $extver;
+        Assert-NotNull $vm1.Extensions[1].Settings;
 
         # *** TODO: The removal call did not return. 12/12/2014
     }
@@ -625,13 +626,13 @@ function Test-VirtualMachineCustomScriptExtensionFileUri
         Assert-AreEqual $vm1.HardwareProfile.VirtualMachineSize $vmsize;
 
         # Check Extensions in VM
-        Assert-AreEqual $vm1.Extensions.Count 1;
-        Assert-AreEqual $vm1.Extensions[0].Name $extname;
-        Assert-AreEqual $vm1.Extensions[0].Type 'Microsoft.Compute/virtualMachines/extensions';
-        Assert-AreEqual $vm1.Extensions[0].Publisher $publisher;
-        Assert-AreEqual $vm1.Extensions[0].ExtensionType $exttype;
-        Assert-AreEqual $vm1.Extensions[0].TypeHandlerVersion $extver;
-        Assert-NotNull $vm1.Extensions[0].Settings;
+        Assert-AreEqual $vm1.Extensions.Count 2;
+        Assert-AreEqual $vm1.Extensions[1].Name $extname;
+        Assert-AreEqual $vm1.Extensions[1].Type 'Microsoft.Compute/virtualMachines/extensions';
+        Assert-AreEqual $vm1.Extensions[1].Publisher $publisher;
+        Assert-AreEqual $vm1.Extensions[1].ExtensionType $exttype;
+        Assert-AreEqual $vm1.Extensions[1].TypeHandlerVersion $extver;
+        Assert-NotNull $vm1.Extensions[1].Settings;
     }
     finally
     {
@@ -774,13 +775,13 @@ function Test-VirtualMachineAccessExtension
         Assert-AreEqual $vm1.HardwareProfile.VirtualMachineSize $vmsize;
 
         # Check Extensions in VM
-        Assert-AreEqual $vm1.Extensions.Count 1;
-        Assert-AreEqual $vm1.Extensions[0].Name $extname;
-        Assert-AreEqual $vm1.Extensions[0].Type 'Microsoft.Compute/virtualMachines/extensions';
-        Assert-AreEqual $vm1.Extensions[0].Publisher $publisher;
-        Assert-AreEqual $vm1.Extensions[0].ExtensionType $exttype;
-        Assert-AreEqual $vm1.Extensions[0].TypeHandlerVersion $extver;
-        Assert-NotNull $vm1.Extensions[0].Settings;
+        Assert-AreEqual $vm1.Extensions.Count 2;
+        Assert-AreEqual $vm1.Extensions[1].Name $extname;
+        Assert-AreEqual $vm1.Extensions[1].Type 'Microsoft.Compute/virtualMachines/extensions';
+        Assert-AreEqual $vm1.Extensions[1].Publisher $publisher;
+        Assert-AreEqual $vm1.Extensions[1].ExtensionType $exttype;
+        Assert-AreEqual $vm1.Extensions[1].TypeHandlerVersion $extver;
+        Assert-NotNull $vm1.Extensions[1].Settings;
 
         # *** TODO: The removal call did not return. 12/12/2014
     }

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

@@ -144,5 +144,13 @@ public void TestVirtualMachineWithDifferentStorageResource()
         {
             ComputeTestController.NewInstance.RunPsTest("Test-VirtualMachineWithDifferentStorageResource");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestVirtualMachineWithEmptyAuc()
+        {
+            ComputeTestController.NewInstance.RunPsTest("Test-VirtualMachineWithEmptyAuc");
+        }
+
     }
 }