Fix Extension Deployment Issue

Author: huangpf

src/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj

@@ -241,6 +241,9 @@
     <None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.ServiceManagementTests\RunNewAzureComputeParameterObjectTests.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.ServiceManagementTests\RunServiceDeploymentExtensionCmdletTests.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.ServiceManagementTests\RunServiceExtensionSetCmdletTests.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -579,4 +582,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

src/Common/Commands.ScenarioTest/Resources/ServiceManagement/ServiceManagementTests.ps1

@@ -510,4 +510,61 @@ function Run-ServiceExtensionSetCmdletTests
         # Cleanup
         Cleanup-CloudService $svcName;
     }
+}
+
+
+# Run Service Deployment Extension Cmdlet Tests
+function Run-ServiceDeploymentExtensionCmdletTests
+{
+    # Setup
+    $location = Get-DefaultLocation;
+    $imgName = Get-DefaultImage $location;
+
+    $storageName = 'pstest' + (getAssetName);
+    New-AzureStorageAccount -StorageAccountName $storageName -Location $location;
+
+    # Associate the new storage account with the current subscription
+    Set-CurrentStorageAccountName $storageName;
+
+    $svcName = 'pstest' + (Get-CloudServiceName);
+    $userName = "pstestuser";
+    $password = "p@ssw0rd";
+    $sPassword = ConvertTo-SecureString $password -AsPlainText -Force;
+    $credential = New-Object System.Management.Automation.PSCredential ($userName, $sPassword);
+
+    # Test
+    New-AzureService -ServiceName $svcName -Location $location;
+
+    try
+    {
+        # New-AzureDeployment (in Azure.psd1)
+        $cspkg = '.\Resources\ServiceManagement\Files\OneWebOneWorker.cspkg';
+        $cscfg = '.\Resources\ServiceManagement\Files\OneWebOneWorker.cscfg';
+
+        $rdpCfg1 = New-AzureServiceRemoteDesktopExtensionConfig -Credential $credential -Role WebRole1
+        $rdpCfg2 = New-AzureServiceRemoteDesktopExtensionConfig -Credential $credential -Role WorkerRole1;
+        $adCfg1 = New-AzureServiceADDomainExtensionConfig -Role WebRole1 -WorkgroupName 'test1';
+        $adCfg2 = New-AzureServiceADDomainExtensionConfig -Role WorkerRole1 -WorkgroupName 'test2';
+
+        $st = New-AzureDeployment -ServiceName $svcName -Package $cspkg -Configuration $cscfg -Label $svcName -Slot Production -ExtensionConfiguration $rdpCfg1,$adCfg1;
+        $exts = Get-AzureServiceExtension -ServiceName $svcName -Slot Production;
+        Assert-True { $exts.Count -eq 2 };
+
+        $st = New-AzureDeployment -ServiceName $svcName -Package $cspkg -Configuration $cscfg -Label $svcName -Slot Staging -ExtensionConfiguration $rdpCfg2,$adCfg2;
+        $exts = Get-AzureServiceExtension -ServiceName $svcName -Slot Staging;
+        Assert-True { $exts.Count -eq 2 };
+
+        $st = Set-AzureDeployment -Config -ServiceName $svcName -Configuration $cscfg -Slot Production -ExtensionConfiguration $rdpCfg2;
+        $exts = Get-AzureServiceExtension -ServiceName $svcName -Slot Production;
+        Assert-True { $exts.Count -eq 1 };
+
+        $st = Set-AzureDeployment -Config -ServiceName $svcName -Configuration $cscfg -Slot Staging -ExtensionConfiguration $rdpCfg1,$adCfg1;
+        $exts = Get-AzureServiceExtension -ServiceName $svcName -Slot Staging;
+        Assert-True { $exts.Count -eq 2 };
+    }
+    finally
+    {
+        # Cleanup
+        Cleanup-CloudService $svcName;
+    }
 }

src/Common/Commands.ScenarioTest/ServiceManagement/ScenarioTests.cs

@@ -116,5 +116,14 @@ public void RunServiceExtensionSetCmdletTests()
         {
             this.RunPowerShellTest("Run-ServiceExtensionSetCmdletTests");
         }
+
+        [Fact]
+        [Trait(Category.Service, Category.ServiceManagement)]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.AcceptanceType, Category.BVT)]
+        public void RunServiceDeploymentExtensionCmdletTests()
+        {
+            this.RunPowerShellTest("Run-ServiceDeploymentExtensionCmdletTests");
+        }
     }
 }

src/Common/Commands.ScenarioTest/SessionRecords/Microsoft.WindowsAzure.Commands.ScenarioTest.ServiceManagementTests/RunServiceDeploymentExtensionCmdletTests.json

@@ -306,7 +306,6 @@ public ExtensionConfiguration Add(DeploymentGetResponse deployment, DeploymentGe
             }
 
             var oldExtConfig = deployment.ExtensionConfiguration;
-            var oldPeerExtConfig = peerDeployment.ExtensionConfiguration;
 
             ExtensionConfigurationBuilder configBuilder = this.GetBuilder();
             foreach (ExtensionConfigurationInput context in inputs)