Fix Ext Cmdlets

Author: huangpf

src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/ADDomain/SetAzureServiceADDomainExtension.cs

@@ -238,7 +238,7 @@ public void ExecuteCommand()
                 Roles = new ExtensionRoleList(Role != null && Role.Any() ? Role.Select(r => new ExtensionRole(r)) : Enumerable.Repeat(new ExtensionRole(), 1))
             };
 
-            var extConfig = ExtensionManager.InstallExtension(context, Slot, Deployment.ExtensionConfiguration, PeerDeployment.ExtensionConfiguration);
+            var extConfig = ExtensionManager.InstallExtension(context, Slot, Deployment, PeerDeployment);
             ChangeDeployment(extConfig);
         }
 

src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/ExtensionManager.cs

@@ -144,11 +144,15 @@ private void GetThumbprintAndAlgorithm(IList<HostedServiceListExtensionsResponse
                 thumbprintAlgorithm = string.Empty;
             }
         }
-
+        
         public ExtensionConfiguration InstallExtension(ExtensionConfigurationInput context, string slot,
-            Microsoft.WindowsAzure.Management.Compute.Models.ExtensionConfiguration extConfig, 
-            Microsoft.WindowsAzure.Management.Compute.Models.ExtensionConfiguration secondSlotExtConfig)
+            DeploymentGetResponse deployment, DeploymentGetResponse peerDeployment)
         {
+            Func<DeploymentGetResponse, ExtensionConfiguration> func = (d) => d == null ? null : d.ExtensionConfiguration;
+
+            ExtensionConfiguration extConfig = func(deployment);
+            ExtensionConfiguration secondSlotExtConfig = func(peerDeployment);
+
             ExtensionConfigurationBuilder builder = GetBuilder(extConfig);
             ExtensionConfigurationBuilder secondSlotConfigBuilder = null;
             if (secondSlotExtConfig != null)
@@ -253,23 +257,21 @@ public void Uninstall(string nameSpace, string type, Microsoft.WindowsAzure.Mana
             }
         }
 
-        public Microsoft.WindowsAzure.Management.Compute.Models.ExtensionConfiguration Set(DeploymentGetResponse currentDeployment, DeploymentGetResponse peerDeployment, ExtensionConfigurationInput[] inputs, string slot)
+        public ExtensionConfiguration Set(DeploymentGetResponse currentDeployment, DeploymentGetResponse peerDeployment, ExtensionConfigurationInput[] inputs, string slot)
         {
             string errorConfigInput = null;
             if (!Validate(inputs, out errorConfigInput))
             {
                 throw new Exception(string.Format(Resources.ServiceExtensionCannotApplyExtensionsInSameType, errorConfigInput));
             }
 
-            var oldExtConfig = currentDeployment != null ? currentDeployment.ExtensionConfiguration : new ExtensionConfiguration();
-            var oldPeerExtConfig = peerDeployment != null ? peerDeployment.ExtensionConfiguration : new ExtensionConfiguration();
-
             ExtensionConfigurationBuilder configBuilder = this.GetBuilder();
             foreach (ExtensionConfigurationInput context in inputs)
             {
                 if (context != null)
                 {
-                    Microsoft.WindowsAzure.Management.Compute.Models.ExtensionConfiguration currentConfig = this.InstallExtension(context, slot, oldExtConfig, oldPeerExtConfig);
+                    ExtensionConfiguration currentConfig = this.InstallExtension(context, slot, currentDeployment, peerDeployment);
+
                     foreach (var r in currentConfig.AllRoles)
                     {
                         if (currentDeployment == null || !this.GetBuilder(currentDeployment.ExtensionConfiguration).ExistAny(r.Id))
@@ -295,7 +297,7 @@ public Microsoft.WindowsAzure.Management.Compute.Models.ExtensionConfiguration S
             return extConfig;
         }
 
-        public Microsoft.WindowsAzure.Management.Compute.Models.ExtensionConfiguration Add(DeploymentGetResponse deployment, DeploymentGetResponse peerDeployment, ExtensionConfigurationInput[] inputs, string slot)
+        public ExtensionConfiguration Add(DeploymentGetResponse deployment, DeploymentGetResponse peerDeployment, ExtensionConfigurationInput[] inputs, string slot)
         {
             string errorConfigInput = null;
             if (!Validate(inputs, out errorConfigInput))
@@ -311,7 +313,8 @@ public Microsoft.WindowsAzure.Management.Compute.Models.ExtensionConfiguration A
             {
                 if (context != null)
                 {
-                    Microsoft.WindowsAzure.Management.Compute.Models.ExtensionConfiguration currentConfig = this.InstallExtension(context, slot, oldExtConfig, oldPeerExtConfig);
+                    ExtensionConfiguration currentConfig = this.InstallExtension(context, slot, deployment, peerDeployment);
+
                     foreach (var r in currentConfig.AllRoles)
                     {
                         if (!this.GetBuilder(oldExtConfig).ExistAny(r.Id))

src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/SetAzureServiceExtension.cs

@@ -149,7 +149,7 @@ public void ExecuteCommand()
                 Version = Version,
                 Roles = new ExtensionRoleList(Role != null && Role.Any() ? Role.Select(r => new ExtensionRole(r)) : Enumerable.Repeat(new ExtensionRole(), 1))
             };
-            var extConfig = ExtensionManager.InstallExtension(context, Slot, Deployment.ExtensionConfiguration, PeerDeployment.ExtensionConfiguration);
+            var extConfig = ExtensionManager.InstallExtension(context, Slot, Deployment, PeerDeployment);
             ChangeDeployment(extConfig);
         }
 

src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Diagnostics/SetAzureServiceDiagnosticsExtension.cs

@@ -132,10 +132,8 @@ public void ExecuteCommand()
             };
 
             var secondSlotDeployment = GetDeployment(this.Slot == DeploymentSlotType.Production ? DeploymentSlotType.Staging : DeploymentSlotType.Production);
-            Microsoft.WindowsAzure.Management.Compute.Models.ExtensionConfiguration secondSlotExtensionConfiguration = 
-                secondSlotDeployment != null ? secondSlotDeployment.ExtensionConfiguration : null;
 
-            var extConfig = ExtensionManager.InstallExtension(context, Slot, Deployment.ExtensionConfiguration, secondSlotExtensionConfiguration);
+            var extConfig = ExtensionManager.InstallExtension(context, Slot, Deployment, secondSlotDeployment);
             ChangeDeployment(extConfig);
         }
 

src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/RDP/SetAzureServiceRemoteDesktopExtension.cs

@@ -132,7 +132,7 @@ public void ExecuteCommand()
                 Version = Version,
                 Roles = new ExtensionRoleList(Role != null && Role.Any() ? Role.Select(r => new ExtensionRole(r)) : Enumerable.Repeat(new ExtensionRole(), 1))
             };
-            var extConfig = ExtensionManager.InstallExtension(context, Slot, Deployment.ExtensionConfiguration, PeerDeployment.ExtensionConfiguration);
+            var extConfig = ExtensionManager.InstallExtension(context, Slot, Deployment, PeerDeployment);
             ChangeDeployment(extConfig);
         }