Fix InstallExtension for Set/New-AzureDeployment cmdlets

huangpf · huangpf · commit f7864d1fc2ea · 2015-06-04T15:02:10.000-07:00
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/ADDomain/SetAzureServiceADDomainExtension.cs b/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);
+            var extConfig = ExtensionManager.InstallExtension(context, Slot, Deployment.ExtensionConfiguration, PeerDeployment.ExtensionConfiguration);
             ChangeDeployment(extConfig);
         }
 
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/BaseAzureServiceExtensionCmdlet.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/BaseAzureServiceExtensionCmdlet.cs
@@ -50,6 +50,7 @@ public abstract class BaseAzureServiceExtensionCmdlet : ServiceManagementBaseCmd
         protected XDocument PublicConfigurationXml { get; set; }
         protected XDocument PrivateConfigurationXml { get; set; }
         protected DeploymentGetResponse Deployment { get; set; }
+        protected DeploymentGetResponse PeerDeployment { get; set; }
 
         public virtual string ServiceName { get; set; }
         public virtual string Slot { get; set; }
@@ -109,6 +110,8 @@ protected void ValidateDeployment()
                 }
                 Deployment.ExtensionConfiguration = Deployment.ExtensionConfiguration ?? new Microsoft.WindowsAzure.Management.Compute.Models.ExtensionConfiguration();
             }
+
+            PeerDeployment = GetPeerDeployment(Slot);
         }
 
         protected void ValidateRoles()
@@ -285,6 +288,15 @@ protected DeploymentGetResponse GetDeployment(string slot)
             return d;
         }
 
+        protected DeploymentGetResponse GetPeerDeployment(string currentSlot)
+        {
+            var currentSlotType = (DeploymentSlot)Enum.Parse(typeof(DeploymentSlot), currentSlot, true);
+            var peerSlot = currentSlotType == DeploymentSlot.Production ? DeploymentSlot.Staging : DeploymentSlot.Production;
+            var peerSlotStr = peerSlot.ToString();
+
+            return GetDeployment(peerSlotStr);
+        }
+
         protected SecureString GetSecurePassword(string password)
         {
             SecureString securePassword = new SecureString();
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/ExtensionManager.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/ExtensionManager.cs
@@ -147,7 +147,7 @@ private void GetThumbprintAndAlgorithm(IList<HostedServiceListExtensionsResponse
 
         public ExtensionConfiguration InstallExtension(ExtensionConfigurationInput context, string slot,
             Microsoft.WindowsAzure.Management.Compute.Models.ExtensionConfiguration extConfig, 
-            Microsoft.WindowsAzure.Management.Compute.Models.ExtensionConfiguration secondSlotExtConfig = null)
+            Microsoft.WindowsAzure.Management.Compute.Models.ExtensionConfiguration secondSlotExtConfig)
         {
             ExtensionConfigurationBuilder builder = GetBuilder(extConfig);
             ExtensionConfigurationBuilder secondSlotConfigBuilder = null;
@@ -253,7 +253,7 @@ public void Uninstall(string nameSpace, string type, Microsoft.WindowsAzure.Mana
             }
         }
 
-        public Microsoft.WindowsAzure.Management.Compute.Models.ExtensionConfiguration Set(DeploymentGetResponse currentDeployment, ExtensionConfigurationInput[] inputs, string slot)
+        public Microsoft.WindowsAzure.Management.Compute.Models.ExtensionConfiguration Set(DeploymentGetResponse currentDeployment, DeploymentGetResponse peerDeployment, ExtensionConfigurationInput[] inputs, string slot)
         {
             string errorConfigInput = null;
             if (!Validate(inputs, out errorConfigInput))
@@ -268,7 +268,7 @@ public Microsoft.WindowsAzure.Management.Compute.Models.ExtensionConfiguration S
             {
                 if (context != null)
                 {
-                    Microsoft.WindowsAzure.Management.Compute.Models.ExtensionConfiguration currentConfig = this.InstallExtension(context, slot, oldExtConfig);
+                    Microsoft.WindowsAzure.Management.Compute.Models.ExtensionConfiguration currentConfig = this.InstallExtension(context, slot, oldExtConfig, peerDeployment.ExtensionConfiguration);
                     foreach (var r in currentConfig.AllRoles)
                     {
                         if (currentDeployment == null || !this.GetBuilder(currentDeployment.ExtensionConfiguration).ExistAny(r.Id))
@@ -294,7 +294,7 @@ public Microsoft.WindowsAzure.Management.Compute.Models.ExtensionConfiguration S
             return extConfig;
         }
 
-        public Microsoft.WindowsAzure.Management.Compute.Models.ExtensionConfiguration Add(DeploymentGetResponse deployment, ExtensionConfigurationInput[] inputs, string slot)
+        public Microsoft.WindowsAzure.Management.Compute.Models.ExtensionConfiguration Add(DeploymentGetResponse deployment, DeploymentGetResponse peerDeployment, ExtensionConfigurationInput[] inputs, string slot)
         {
             string errorConfigInput = null;
             if (!Validate(inputs, out errorConfigInput))
@@ -309,7 +309,7 @@ public Microsoft.WindowsAzure.Management.Compute.Models.ExtensionConfiguration A
             {
                 if (context != null)
                 {
-                    Microsoft.WindowsAzure.Management.Compute.Models.ExtensionConfiguration currentConfig = this.InstallExtension(context, slot, oldExtConfig);
+                    Microsoft.WindowsAzure.Management.Compute.Models.ExtensionConfiguration currentConfig = this.InstallExtension(context, slot, oldExtConfig, peerDeployment.ExtensionConfiguration);
                     foreach (var r in currentConfig.AllRoles)
                     {
                         if (!this.GetBuilder(oldExtConfig).ExistAny(r.Id))
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/SetAzureServiceExtension.cs b/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);
+            var extConfig = ExtensionManager.InstallExtension(context, Slot, Deployment.ExtensionConfiguration, PeerDeployment.ExtensionConfiguration);
             ChangeDeployment(extConfig);
         }
 
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/MicrosoftAntimalware/RemoveAzureServiceAntimalwareExtension.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/MicrosoftAntimalware/RemoveAzureServiceAntimalwareExtension.cs
@@ -81,7 +81,7 @@ public void ExecuteCommand()
             // process any pending deployment changes
             if (extConfigInputs != null)
             {
-                ExtensionConfiguration newExtConfig = ExtensionManager.Add(Deployment, extConfigInputs, Slot);
+                ExtensionConfiguration newExtConfig = ExtensionManager.Add(Deployment, PeerDeployment, extConfigInputs, Slot);
                 ChangeDeployment(newExtConfig);
             }
         }
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/MicrosoftAntimalware/SetAzureServiceAntimalwareExtension.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/MicrosoftAntimalware/SetAzureServiceAntimalwareExtension.cs
@@ -444,7 +444,7 @@ public void ExecuteCommand()
             // process any pending deployment changes
             if (extConfigInputs != null)
             {
-                ExtensionConfiguration newExtConfig = ExtensionManager.Add(Deployment, extConfigInputs, Slot);
+                ExtensionConfiguration newExtConfig = ExtensionManager.Add(Deployment, PeerDeployment, extConfigInputs, Slot);
                 ChangeDeployment(newExtConfig);
             }
         }
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/RDP/SetAzureServiceRemoteDesktopExtension.cs b/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);
+            var extConfig = ExtensionManager.InstallExtension(context, Slot, Deployment.ExtensionConfiguration, PeerDeployment.ExtensionConfiguration);
             ChangeDeployment(extConfig);
         }
 
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/HostedServices/NewAzureDeployment.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/HostedServices/NewAzureDeployment.cs
@@ -159,14 +159,12 @@ public virtual void NewPaaSDeploymentProcess()
                     }
                 }
 
-
-                var slotType = (DeploymentSlot)Enum.Parse(typeof(DeploymentSlot), this.Slot, true);
-                DeploymentGetResponse d = null;
-                InvokeInOperationContext(() =>
+                Action<DeploymentSlot, DeploymentGetResponse> func = (t, d) =>
                 {
+                    d = null;
                     try
                     {
-                        d = this.ComputeClient.Deployments.GetBySlot(this.ServiceName, slotType);
+                        d = this.ComputeClient.Deployments.GetBySlot(this.ServiceName, t);
                     }
                     catch (CloudException ex)
                     {
@@ -175,10 +173,18 @@ public virtual void NewPaaSDeploymentProcess()
                             this.WriteExceptionDetails(ex);
                         }
                     }
-                });
+                };
+
+                var slotType = (DeploymentSlot)Enum.Parse(typeof(DeploymentSlot), this.Slot, true);
+                DeploymentGetResponse currentDeployment = null;
+                InvokeInOperationContext(() => func(slotType, currentDeployment));
+
+                var peerSlottype = slotType == DeploymentSlot.Production ? DeploymentSlot.Staging : DeploymentSlot.Production;
+                DeploymentGetResponse peerDeployment = null;
+                InvokeInOperationContext(() => func(slotType, peerDeployment));
 
                 ExtensionManager extensionMgr = new ExtensionManager(this, ServiceName);
-                extConfig = extensionMgr.Set(d, ExtensionConfiguration, this.Slot);
+                extConfig = extensionMgr.Set(currentDeployment, peerDeployment, ExtensionConfiguration, this.Slot);
             }
             
             var deploymentInput = new DeploymentCreateParameters
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/HostedServices/SetAzureDeployment.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/HostedServices/SetAzureDeployment.cs
@@ -164,13 +164,12 @@ public void ExecuteCommand()
                     }
                 }
 
-                var slotType = (DeploymentSlot)Enum.Parse(typeof(DeploymentSlot), this.Slot, true);
-                DeploymentGetResponse d = null;
-                InvokeInOperationContext(() =>
+                Action<DeploymentSlot, DeploymentGetResponse> func = (t, d) =>
                 {
+                    d = null;
                     try
                     {
-                        d = this.ComputeClient.Deployments.GetBySlot(this.ServiceName, slotType);
+                        d = this.ComputeClient.Deployments.GetBySlot(this.ServiceName, t);
                     }
                     catch (CloudException ex)
                     {
@@ -179,10 +178,18 @@ public void ExecuteCommand()
                             this.WriteExceptionDetails(ex);
                         }
                     }
-                });
+                };
+
+                var slotType = (DeploymentSlot)Enum.Parse(typeof(DeploymentSlot), this.Slot, true);
+                DeploymentGetResponse currentDeployment = null;
+                InvokeInOperationContext(() => func(slotType, currentDeployment));
+
+                var peerSlottype = slotType == DeploymentSlot.Production ? DeploymentSlot.Staging : DeploymentSlot.Production;
+                DeploymentGetResponse peerDeployment = null;
+                InvokeInOperationContext(() => func(slotType, peerDeployment));
 
                 ExtensionManager extensionMgr = new ExtensionManager(this, ServiceName);
-                extConfig = extensionMgr.Add(d, ExtensionConfiguration, this.Slot);
+                extConfig = extensionMgr.Add(currentDeployment, peerDeployment, ExtensionConfiguration, this.Slot);
             }
 
             // Upgrade Parameter Set

Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ public void ExecuteCommand()`
`238`	`238`	`Roles = new ExtensionRoleList(Role != null && Role.Any() ? Role.Select(r => new ExtensionRole(r)) : Enumerable.Repeat(new ExtensionRole(), 1))`
`239`	`239`	`};`
`240`	`240`
`241`		`- var extConfig = ExtensionManager.InstallExtension(context, Slot, Deployment.ExtensionConfiguration);`
	`241`	`+ var extConfig = ExtensionManager.InstallExtension(context, Slot, Deployment.ExtensionConfiguration, PeerDeployment.ExtensionConfiguration);`
`242`	`242`	`ChangeDeployment(extConfig);`
`243`	`243`	`}`
`244`	`244`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ public abstract class BaseAzureServiceExtensionCmdlet : ServiceManagementBaseCmd`
`50`	`50`	`protected XDocument PublicConfigurationXml { get; set; }`
`51`	`51`	`protected XDocument PrivateConfigurationXml { get; set; }`
`52`	`52`	`protected DeploymentGetResponse Deployment { get; set; }`
	`53`	`+ protected DeploymentGetResponse PeerDeployment { get; set; }`
`53`	`54`
`54`	`55`	`public virtual string ServiceName { get; set; }`
`55`	`56`	`public virtual string Slot { get; set; }`
`@@ -109,6 +110,8 @@ protected void ValidateDeployment()`
`109`	`110`	`}`
`110`	`111`	`Deployment.ExtensionConfiguration = Deployment.ExtensionConfiguration ?? new Microsoft.WindowsAzure.Management.Compute.Models.ExtensionConfiguration();`
`111`	`112`	`}`
	`113`	`+`
	`114`	`+ PeerDeployment = GetPeerDeployment(Slot);`
`112`	`115`	`}`
`113`	`116`
`114`	`117`	`protected void ValidateRoles()`
`@@ -285,6 +288,15 @@ protected DeploymentGetResponse GetDeployment(string slot)`
`285`	`288`	`return d;`
`286`	`289`	`}`
`287`	`290`
	`291`	`+ protected DeploymentGetResponse GetPeerDeployment(string currentSlot)`
	`292`	`+ {`
	`293`	`+ var currentSlotType = (DeploymentSlot)Enum.Parse(typeof(DeploymentSlot), currentSlot, true);`
	`294`	`+ var peerSlot = currentSlotType == DeploymentSlot.Production ? DeploymentSlot.Staging : DeploymentSlot.Production;`
	`295`	`+ var peerSlotStr = peerSlot.ToString();`
	`296`	`+`
	`297`	`+ return GetDeployment(peerSlotStr);`
	`298`	`+ }`
	`299`	`+`
`288`	`300`	`protected SecureString GetSecurePassword(string password)`
`289`	`301`	`{`
`290`	`302`	`SecureString securePassword = new SecureString();`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ private void GetThumbprintAndAlgorithm(IList<HostedServiceListExtensionsResponse`
`147`	`147`
`148`	`148`	`public ExtensionConfiguration InstallExtension(ExtensionConfigurationInput context, string slot,`
`149`	`149`	`Microsoft.WindowsAzure.Management.Compute.Models.ExtensionConfiguration extConfig,`
`150`		`- Microsoft.WindowsAzure.Management.Compute.Models.ExtensionConfiguration secondSlotExtConfig = null)`
	`150`	`+ Microsoft.WindowsAzure.Management.Compute.Models.ExtensionConfiguration secondSlotExtConfig)`
`151`	`151`	`{`
`152`	`152`	`ExtensionConfigurationBuilder builder = GetBuilder(extConfig);`
`153`	`153`	`ExtensionConfigurationBuilder secondSlotConfigBuilder = null;`
`@@ -253,7 +253,7 @@ public void Uninstall(string nameSpace, string type, Microsoft.WindowsAzure.Mana`
`253`	`253`	`}`
`254`	`254`	`}`
`255`	`255`
`256`		`- public Microsoft.WindowsAzure.Management.Compute.Models.ExtensionConfiguration Set(DeploymentGetResponse currentDeployment, ExtensionConfigurationInput[] inputs, string slot)`
	`256`	`+ public Microsoft.WindowsAzure.Management.Compute.Models.ExtensionConfiguration Set(DeploymentGetResponse currentDeployment, DeploymentGetResponse peerDeployment, ExtensionConfigurationInput[] inputs, string slot)`
`257`	`257`	`{`
`258`	`258`	`string errorConfigInput = null;`
`259`	`259`	`if (!Validate(inputs, out errorConfigInput))`
`@@ -268,7 +268,7 @@ public Microsoft.WindowsAzure.Management.Compute.Models.ExtensionConfiguration S`
`268`	`268`	`{`
`269`	`269`	`if (context != null)`
`270`	`270`	`{`
`271`		`- Microsoft.WindowsAzure.Management.Compute.Models.ExtensionConfiguration currentConfig = this.InstallExtension(context, slot, oldExtConfig);`
	`271`	`+ Microsoft.WindowsAzure.Management.Compute.Models.ExtensionConfiguration currentConfig = this.InstallExtension(context, slot, oldExtConfig, peerDeployment.ExtensionConfiguration);`
`272`	`272`	`foreach (var r in currentConfig.AllRoles)`
`273`	`273`	`{`
`274`	`274`	`if (currentDeployment == null \|\| !this.GetBuilder(currentDeployment.ExtensionConfiguration).ExistAny(r.Id))`
`@@ -294,7 +294,7 @@ public Microsoft.WindowsAzure.Management.Compute.Models.ExtensionConfiguration S`
`294`	`294`	`return extConfig;`
`295`	`295`	`}`
`296`	`296`
`297`		`- public Microsoft.WindowsAzure.Management.Compute.Models.ExtensionConfiguration Add(DeploymentGetResponse deployment, ExtensionConfigurationInput[] inputs, string slot)`
	`297`	`+ public Microsoft.WindowsAzure.Management.Compute.Models.ExtensionConfiguration Add(DeploymentGetResponse deployment, DeploymentGetResponse peerDeployment, ExtensionConfigurationInput[] inputs, string slot)`
`298`	`298`	`{`
`299`	`299`	`string errorConfigInput = null;`
`300`	`300`	`if (!Validate(inputs, out errorConfigInput))`
`@@ -309,7 +309,7 @@ public Microsoft.WindowsAzure.Management.Compute.Models.ExtensionConfiguration A`
`309`	`309`	`{`
`310`	`310`	`if (context != null)`
`311`	`311`	`{`
`312`		`- Microsoft.WindowsAzure.Management.Compute.Models.ExtensionConfiguration currentConfig = this.InstallExtension(context, slot, oldExtConfig);`
	`312`	`+ Microsoft.WindowsAzure.Management.Compute.Models.ExtensionConfiguration currentConfig = this.InstallExtension(context, slot, oldExtConfig, peerDeployment.ExtensionConfiguration);`
`313`	`313`	`foreach (var r in currentConfig.AllRoles)`
`314`	`314`	`{`
`315`	`315`	`if (!this.GetBuilder(oldExtConfig).ExistAny(r.Id))`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ public void ExecuteCommand()`
`149`	`149`	`Version = Version,`
`150`	`150`	`Roles = new ExtensionRoleList(Role != null && Role.Any() ? Role.Select(r => new ExtensionRole(r)) : Enumerable.Repeat(new ExtensionRole(), 1))`
`151`	`151`	`};`
`152`		`- var extConfig = ExtensionManager.InstallExtension(context, Slot, Deployment.ExtensionConfiguration);`
	`152`	`+ var extConfig = ExtensionManager.InstallExtension(context, Slot, Deployment.ExtensionConfiguration, PeerDeployment.ExtensionConfiguration);`
`153`	`153`	`ChangeDeployment(extConfig);`
`154`	`154`	`}`
`155`	`155`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public void ExecuteCommand()`
`81`	`81`	`// process any pending deployment changes`
`82`	`82`	`if (extConfigInputs != null)`
`83`	`83`	`{`
`84`		`- ExtensionConfiguration newExtConfig = ExtensionManager.Add(Deployment, extConfigInputs, Slot);`
	`84`	`+ ExtensionConfiguration newExtConfig = ExtensionManager.Add(Deployment, PeerDeployment, extConfigInputs, Slot);`
`85`	`85`	`ChangeDeployment(newExtConfig);`
`86`	`86`	`}`
`87`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -444,7 +444,7 @@ public void ExecuteCommand()`
`444`	`444`	`// process any pending deployment changes`
`445`	`445`	`if (extConfigInputs != null)`
`446`	`446`	`{`
`447`		`- ExtensionConfiguration newExtConfig = ExtensionManager.Add(Deployment, extConfigInputs, Slot);`
	`447`	`+ ExtensionConfiguration newExtConfig = ExtensionManager.Add(Deployment, PeerDeployment, extConfigInputs, Slot);`
`448`	`448`	`ChangeDeployment(newExtConfig);`
`449`	`449`	`}`
`450`	`450`	`}`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ public void ExecuteCommand()`
`132`	`132`	`Version = Version,`
`133`	`133`	`Roles = new ExtensionRoleList(Role != null && Role.Any() ? Role.Select(r => new ExtensionRole(r)) : Enumerable.Repeat(new ExtensionRole(), 1))`
`134`	`134`	`};`
`135`		`- var extConfig = ExtensionManager.InstallExtension(context, Slot, Deployment.ExtensionConfiguration);`
	`135`	`+ var extConfig = ExtensionManager.InstallExtension(context, Slot, Deployment.ExtensionConfiguration, PeerDeployment.ExtensionConfiguration);`
`136`	`136`	`ChangeDeployment(extConfig);`
`137`	`137`	`}`
`138`	`138`
Original file line number	Diff line number	Diff line change
`@@ -159,14 +159,12 @@ public virtual void NewPaaSDeploymentProcess()`
`159`	`159`	`}`
`160`	`160`	`}`
`161`	`161`
`162`		`-`
`163`		`- var slotType = (DeploymentSlot)Enum.Parse(typeof(DeploymentSlot), this.Slot, true);`
`164`		`- DeploymentGetResponse d = null;`
`165`		`- InvokeInOperationContext(() =>`
	`162`	`+ Action<DeploymentSlot, DeploymentGetResponse> func = (t, d) =>`
`166`	`163`	`{`
	`164`	`+ d = null;`
`167`	`165`	`try`
`168`	`166`	`{`
`169`		`- d = this.ComputeClient.Deployments.GetBySlot(this.ServiceName, slotType);`
	`167`	`+ d = this.ComputeClient.Deployments.GetBySlot(this.ServiceName, t);`
`170`	`168`	`}`
`171`	`169`	`catch (CloudException ex)`
`172`	`170`	`{`
`@@ -175,10 +173,18 @@ public virtual void NewPaaSDeploymentProcess()`
`175`	`173`	`this.WriteExceptionDetails(ex);`
`176`	`174`	`}`
`177`	`175`	`}`
`178`		`- });`
	`176`	`+ };`
	`177`	`+`
	`178`	`+ var slotType = (DeploymentSlot)Enum.Parse(typeof(DeploymentSlot), this.Slot, true);`
	`179`	`+ DeploymentGetResponse currentDeployment = null;`
	`180`	`+ InvokeInOperationContext(() => func(slotType, currentDeployment));`
	`181`	`+`
	`182`	`+ var peerSlottype = slotType == DeploymentSlot.Production ? DeploymentSlot.Staging : DeploymentSlot.Production;`
	`183`	`+ DeploymentGetResponse peerDeployment = null;`
	`184`	`+ InvokeInOperationContext(() => func(slotType, peerDeployment));`
`179`	`185`
`180`	`186`	`ExtensionManager extensionMgr = new ExtensionManager(this, ServiceName);`
`181`		`- extConfig = extensionMgr.Set(d, ExtensionConfiguration, this.Slot);`
	`187`	`+ extConfig = extensionMgr.Set(currentDeployment, peerDeployment, ExtensionConfiguration, this.Slot);`
`182`	`188`	`}`
`183`	`189`
`184`	`190`	`var deploymentInput = new DeploymentCreateParameters`
Original file line number	Diff line number	Diff line change
`@@ -164,13 +164,12 @@ public void ExecuteCommand()`
`164`	`164`	`}`
`165`	`165`	`}`
`166`	`166`
`167`		`- var slotType = (DeploymentSlot)Enum.Parse(typeof(DeploymentSlot), this.Slot, true);`
`168`		`- DeploymentGetResponse d = null;`
`169`		`- InvokeInOperationContext(() =>`
	`167`	`+ Action<DeploymentSlot, DeploymentGetResponse> func = (t, d) =>`
`170`	`168`	`{`
	`169`	`+ d = null;`
`171`	`170`	`try`
`172`	`171`	`{`
`173`		`- d = this.ComputeClient.Deployments.GetBySlot(this.ServiceName, slotType);`
	`172`	`+ d = this.ComputeClient.Deployments.GetBySlot(this.ServiceName, t);`
`174`	`173`	`}`
`175`	`174`	`catch (CloudException ex)`
`176`	`175`	`{`
`@@ -179,10 +178,18 @@ public void ExecuteCommand()`
`179`	`178`	`this.WriteExceptionDetails(ex);`
`180`	`179`	`}`
`181`	`180`	`}`
`182`		`- });`
	`181`	`+ };`
	`182`	`+`
	`183`	`+ var slotType = (DeploymentSlot)Enum.Parse(typeof(DeploymentSlot), this.Slot, true);`
	`184`	`+ DeploymentGetResponse currentDeployment = null;`
	`185`	`+ InvokeInOperationContext(() => func(slotType, currentDeployment));`
	`186`	`+`
	`187`	`+ var peerSlottype = slotType == DeploymentSlot.Production ? DeploymentSlot.Staging : DeploymentSlot.Production;`
	`188`	`+ DeploymentGetResponse peerDeployment = null;`
	`189`	`+ InvokeInOperationContext(() => func(slotType, peerDeployment));`
`183`	`190`
`184`	`191`	`ExtensionManager extensionMgr = new ExtensionManager(this, ServiceName);`
`185`		`- extConfig = extensionMgr.Add(d, ExtensionConfiguration, this.Slot);`
	`192`	`+ extConfig = extensionMgr.Add(currentDeployment, peerDeployment, ExtensionConfiguration, this.Slot);`
`186`	`193`	`}`
`187`	`194`
`188`	`195`	`// Upgrade Parameter Set`