[Release 1.6.0] [AzureRT] Sprint 61

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

@@ -64,7 +64,7 @@
       <HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.Management.Compute">
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.13.0.1-prerelease\lib\net45\Microsoft.Azure.Management.Compute.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.13.0.4-prerelease\lib\net45\Microsoft.Azure.Management.Compute.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Azure.Management.Network, Version=5.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -353,6 +353,12 @@
     <None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineExtensionTests\TestVirtualMachineAccessExtension.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineExtensionTests\TestVirtualMachineADDomainExtension.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineExtensionTests\TestVirtualMachineADDomainExtensionDomainJoin.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineExtensionTests\TestVirtualMachineBginfoExtension.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

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

@@ -12,6 +12,8 @@
 # limitations under the License.
 # ----------------------------------------------------------------------------------
 
+$PLACEHOLDER = "PLACEHOLDER"
+
 <#
 .SYNOPSIS
 Gets valid resource name for compute test
@@ -113,7 +115,7 @@ function Create-VirtualMachine($rgname, $vmname, $loc)
     $rgname = if ([string]::IsNullOrEmpty($rgname)) { Get-ComputeTestResourceName } else { $rgname }
     $vmname = if ([string]::IsNullOrEmpty($vmname)) { 'vm' + $rgname } else { $vmname }
     $loc = if ([string]::IsNullOrEmpty($loc)) { Get-ComputeVMLocation } else { $loc }
-	Write-Host $vmname
+    Write-Host $vmname
 
     # Common
     $g = New-AzureRmResourceGroup -Name $rgname -Location $loc -Force;
@@ -479,17 +481,17 @@ function Get-SasUri
 {
     param ([string] $storageAccount, [string] $storageKey, [string] $container, [string] $file, [TimeSpan] $duration, [Microsoft.WindowsAzure.Storage.Blob.SharedAccessBlobPermissions] $type)
 
-	$uri = [string]::Format("https://{0}.blob.core.windows.net/{1}/{2}", $storageAccount, $container, $file);
+    $uri = [string]::Format("https://{0}.blob.core.windows.net/{1}/{2}", $storageAccount, $container, $file);
 
-	$destUri = New-Object -TypeName System.Uri($uri);
-	$cred = New-Object -TypeName Microsoft.WindowsAzure.Storage.Auth.StorageCredentials($storageAccount, $storageKey);
-	$destBlob = New-Object -TypeName Microsoft.WindowsAzure.Storage.Blob.CloudPageBlob($destUri, $cred);
-	$policy = New-Object Microsoft.WindowsAzure.Storage.Blob.SharedAccessBlobPolicy;
-	$policy.Permissions = $type;
-	$policy.SharedAccessExpiryTime = [DateTime]::UtcNow.Add($duration);
-	$uri += $destBlob.GetSharedAccessSignature($policy);
+    $destUri = New-Object -TypeName System.Uri($uri);
+    $cred = New-Object -TypeName Microsoft.WindowsAzure.Storage.Auth.StorageCredentials($storageAccount, $storageKey);
+    $destBlob = New-Object -TypeName Microsoft.WindowsAzure.Storage.Blob.CloudPageBlob($destUri, $cred);
+    $policy = New-Object Microsoft.WindowsAzure.Storage.Blob.SharedAccessBlobPolicy;
+    $policy.Permissions = $type;
+    $policy.SharedAccessExpiryTime = [DateTime]::UtcNow.Add($duration);
+    $uri += $destBlob.GetSharedAccessSignature($policy);
 
-	return $uri;
+    return $uri;
 }
 
 # Get a Location according to resource provider.
@@ -564,13 +566,13 @@ function Get-SubscriptionIdFromResourceGroup
 {
       param ([string] $rgname)
 
-	  $rg = Get-AzureRmResourceGroup -ResourceGroupName $rgname;
+      $rg = Get-AzureRmResourceGroup -ResourceGroupName $rgname;
 
-	  $rgid = $rg.ResourceId;
+      $rgid = $rg.ResourceId;
 
-	  # ResouceId is a form of "/subscriptions/<subId>/resourceGroups/<resourgGroupName>"
-	  # So return the second part to get subscription Id
-	  $first = $rgid.IndexOf('/', 1);
-	  $last = $rgid.IndexOf('/', $first + 1);
-	  return $rgid.Substring($first + 1, $last - $first - 1);
+      # ResouceId is a form of "/subscriptions/<subId>/resourceGroups/<resourgGroupName>"
+      # So return the second part to get subscription Id
+      $first = $rgid.IndexOf('/', 1);
+      $last = $rgid.IndexOf('/', $first + 1);
+      return $rgid.Substring($first + 1, $last - $first - 1);
 }

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

@@ -86,5 +86,19 @@ public void TestVirtualMachineExtensionWithSwitch()
         {
             ComputeTestController.NewInstance.RunPsTest("Test-VirtualMachineExtensionWithSwitch");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestVirtualMachineADDomainExtension()
+        {
+            ComputeTestController.NewInstance.RunPsTest("Test-VirtualMachineADDomainExtension");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestVirtualMachineADDomainExtensionDomainJoin()
+        {
+            ComputeTestController.NewInstance.RunPsTest("Test-VirtualMachineADDomainExtensionDomainJoin");
+        }
     }
 }