New-AzureServiceExtension cmdlet update:

hyonholee · hyonholee · commit edfc6b4deaf6 · 2016-01-27T21:56:35.000-08:00
it takes ExtensionState to update the state of the extension.
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/AzureServiceExtensionTests.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/AzureServiceExtensionTests.cs
@@ -18,6 +18,7 @@
 using System.IO;
 using System.Reflection;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.WindowsAzure.Commands.Common;
 using Microsoft.WindowsAzure.Commands.ServiceManagement.Extensions;
 using Microsoft.WindowsAzure.Commands.ServiceManagement.Model;
 
@@ -146,6 +147,7 @@ public void AzureServiceExtensionConfigScenarioTest()
                 DeploymentInfoContext result = vmPowershellCmdlets.GetAzureDeployment(_serviceName, DeploymentSlotType.Production);
                 pass = Utilities.PrintAndCompareDeployment(result, _serviceName, DeploymentName, DeploymentLabel, DeploymentSlotType.Production, null, 2);
                 Console.WriteLine("successfully deployed the package");
+                var extId = result.ExtensionConfiguration.AllRoles[0].Id;
 
                 ExtensionContext resultExtensionContext = vmPowershellCmdlets.GetAzureServiceExtension(_serviceName)[0];
 
@@ -159,6 +161,27 @@ public void AzureServiceExtensionConfigScenarioTest()
 
                 VerifyRDP(_serviceName, rdpPath);
 
+                ExtensionConfigurationInput extConfig = vmPowershellCmdlets.NewAzureServiceExtensionConfig(extId, "Uninstall");
+
+                try
+                {
+                    vmPowershellCmdlets.SetAzureDeploymentConfig(_serviceName, DeploymentSlotType.Production,
+                    _configPath.FullName, extConfig);
+                    Assert.Fail("Succeeded, but extected to fail!");
+                }
+                catch (Exception e)
+                {
+                    if (e.ToString().Contains("BadRequest")
+                        || ((e.InnerException != null) && (e.InnerException.ToString().Contains("BadRequest"))))
+                    {
+                        Console.WriteLine(e.ToString());
+                    }
+                    else
+                    {
+                        throw;
+                    }
+                }
+
                 vmPowershellCmdlets.RemoveAzureServiceExtension(
                     serviceName: _serviceName,
                     extensionName: _extensionName,
@@ -178,8 +201,6 @@ public void AzureServiceExtensionConfigScenarioTest()
                     Console.WriteLine("Failed to get RDP file as expected");
                 }
 
-
-
                 vmPowershellCmdlets.RemoveAzureDeployment(_serviceName, DeploymentSlotType.Production, true);
 
                 pass &= Utilities.CheckRemove(vmPowershellCmdlets.GetAzureDeployment, _serviceName, DeploymentSlotType.Production);
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/PaasCmdletInfo/NewAzureServiceExtensionConfigCmdletInfo.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/PaasCmdletInfo/NewAzureServiceExtensionConfigCmdletInfo.cs
@@ -55,5 +55,16 @@ public NewAzureServiceExtensionConfigCmdletInfo(string thumbprint, string algori
                 this.cmdletParams.Add(new CmdletParam("ThumbprintAlgorithm", algorithm));
             }
         }
+
+        public NewAzureServiceExtensionConfigCmdletInfo(string extensionId, string extensionStatus, string[] roles)
+        {
+            this.cmdletName = Utilities.NewAzureServiceExtensionConfigCmdletName;
+            this.cmdletParams.Add(new CmdletParam("ExtensionId", extensionId));
+            this.cmdletParams.Add(new CmdletParam("ExtensionState", extensionStatus));
+            if (roles != null)
+            {
+                this.cmdletParams.Add(new CmdletParam("Role", roles));
+            }
+        }
     }
 }
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementCmdletTestHelper.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementCmdletTestHelper.cs
@@ -1319,6 +1319,14 @@ public ExtensionConfigurationInput NewAzureServiceExtensionConfig(string extensi
                         providerNamespace, publicConfig, privateConfig, version));
         }
 
+        public ExtensionConfigurationInput NewAzureServiceExtensionConfig(string extensionId, string extensionStatus,
+            string [] roles = null)
+        {
+            return
+                RunPSCmdletAndReturnFirst<ExtensionConfigurationInput>(
+                    new NewAzureServiceExtensionConfigCmdletInfo(extensionId, extensionStatus, roles));
+        }
+
         // Set-AzureServiceExtension
         public ManagementOperationContext SetAzureServiceExtension(string serviceName, string extensionName,
             string providerNamespace, string publicConfig, string privateConfig, string[] roles = null, string slot = null, string version = null)
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/BaseAzureServiceExtensionCmdlet.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/BaseAzureServiceExtensionCmdlet.cs
@@ -39,6 +39,7 @@ public abstract class BaseAzureServiceExtensionCmdlet : ServiceManagementBaseCmd
 
         protected const string NewExtensionParameterSetName = "NewExtension";
         protected const string NewExtensionUsingThumbprintParameterSetName = "NewExtensionUsingThumbprint";
+        protected const string UpdateExtensionStatusParameterSetName = "UpdateExtensionStatusParameterSetName";
         protected const string SetExtensionParameterSetName = "SetExtension";
         protected const string SetExtensionUsingThumbprintParameterSetName = "SetExtensionUsingThumbprint";
         protected const string SetExtensionUsingDiagnosticsConfigurationParameterSetName = "SetExtensionUsingDiagnosticsConfiguration";
@@ -66,6 +67,7 @@ public abstract class BaseAzureServiceExtensionCmdlet : ServiceManagementBaseCmd
         public virtual string ExtensionName { get; set; }
         public virtual string Version { get; set; }
         public virtual string ExtensionId { get; set; }
+        public virtual string ExtensionState { get; set; }
 
         public BaseAzureServiceExtensionCmdlet()
             : base()
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/ExtensionConfigurationInput.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/ExtensionConfigurationInput.cs
@@ -28,5 +28,6 @@ public class ExtensionConfigurationInput
         public string PrivateConfiguration { get; set; }
         public ExtensionRoleList Roles { get; set; }
         public X509Certificate2 X509Certificate { get; set; }
+        public string State { get; set; }
     }
 }
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/ExtensionManager.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/ExtensionManager.cs
@@ -344,6 +344,40 @@ public ExtensionConfiguration Add(DeploymentGetResponse deployment, DeploymentGe
             return extConfig;
         }
 
+        public ExtensionConfiguration UpdateExtensionState(ExtensionConfigurationInput input)
+        {
+            var extConfig = new ExtensionConfiguration();
+            if (input.Roles == null || input.Roles.Count == 1 && input.Roles[0].RoleType == ExtensionRoleType.AllRoles)
+            {
+
+                extConfig.AllRoles = new List<ExtensionConfiguration.Extension>();
+                extConfig.AllRoles.Add(new ExtensionConfiguration.Extension
+                {
+                    Id = input.Id,
+                    State = input.State
+                });
+            }
+            else
+            {
+                extConfig.NamedRoles = new List<ExtensionConfiguration.NamedRole>();
+                foreach (var role in input.Roles)
+                {
+                    var ext = new List<ExtensionConfiguration.Extension>();
+                    ext.Add(new ExtensionConfiguration.Extension
+                    {
+                        Id = input.Id,
+                        State = input.State
+                    });
+                    extConfig.NamedRoles.Add(new ExtensionConfiguration.NamedRole
+                    {
+                        RoleName = role.RoleName,
+                        Extensions = ext
+                    });
+                }
+            }
+            return extConfig;
+        }
+
         public static bool Validate(ExtensionConfigurationInput[] inputs, out string errorConfigInput)
         {
             var roleList = (from c in inputs
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/NewAzureServiceExtensionConfig.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/NewAzureServiceExtensionConfig.cs
@@ -26,9 +26,11 @@ public class NewAzureServiceExtensionConfigCommand : BaseAzureServiceExtensionCm
     {
         private const string NetExtensionParameterSetName = NewExtensionParameterSetName;
         private const string NetExtensionUsingThumbprintParameterSetName = NewExtensionUsingThumbprintParameterSetName;
+        private const string NetUpdateExtensionStatusParameterSetName = UpdateExtensionStatusParameterSetName;
 
         [Parameter(Position = 0, ValueFromPipelineByPropertyName = true, ParameterSetName = NetExtensionParameterSetName, HelpMessage = ExtensionParameterPropertyHelper.RoleHelpMessage)]
         [Parameter(Position = 0, ValueFromPipelineByPropertyName = true, ParameterSetName = NetExtensionUsingThumbprintParameterSetName, HelpMessage = ExtensionParameterPropertyHelper.RoleHelpMessage)]
+        [Parameter(Position = 0, ValueFromPipelineByPropertyName = true, ParameterSetName = NetUpdateExtensionStatusParameterSetName, HelpMessage = ExtensionParameterPropertyHelper.ExtensionIdHelpMessage)]
         [ValidateNotNullOrEmpty]
         public override string[] Role
         {
@@ -109,13 +111,22 @@ public override string Version
 
         [Parameter(Position = 8, Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = NetExtensionParameterSetName, HelpMessage = ExtensionParameterPropertyHelper.ExtensionIdHelpMessage)]
         [Parameter(Position = 8, Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = NetExtensionUsingThumbprintParameterSetName, HelpMessage = ExtensionParameterPropertyHelper.ExtensionIdHelpMessage)]
+        [Parameter(Position = 1, Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = NetUpdateExtensionStatusParameterSetName, HelpMessage = ExtensionParameterPropertyHelper.ExtensionIdHelpMessage)]
         [ValidateNotNullOrEmpty]
         public override string ExtensionId
         {
             get;
             set;
         }
 
+        [Parameter(Position = 2, Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = NetUpdateExtensionStatusParameterSetName, HelpMessage = ExtensionParameterPropertyHelper.ExtensionIdHelpMessage)]
+        [ValidateSet("Enable", "Disable", "Uninstall", IgnoreCase = true)]
+        public override string ExtensionState
+        {
+            get;
+            set;
+        }
+
         protected override void ValidateParameters()
         {
             base.ValidateParameters();
@@ -129,6 +140,7 @@ public void ExecuteCommand()
             WriteObject(new ExtensionConfigurationInput
             {
                 Id = ExtensionId,
+                State = ExtensionState,
                 CertificateThumbprint = CertificateThumbprint,
                 ThumbprintAlgorithm = ThumbprintAlgorithm,
                 ProviderNameSpace = ProviderNamespace,
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/HostedServices/SetAzureDeployment.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/HostedServices/SetAzureDeployment.cs
@@ -192,7 +192,13 @@ public void ExecuteCommand()
                 InvokeInOperationContext(() => peerDeployment = func(peerSlottype));
 
                 ExtensionManager extensionMgr = new ExtensionManager(this, ServiceName);
-                extConfig = extensionMgr.Add(currentDeployment, peerDeployment, ExtensionConfiguration, this.Slot);
+
+                foreach (var config in ExtensionConfiguration)
+                {
+                    extConfig = (config.State == null)
+                        ? extensionMgr.Add(currentDeployment, peerDeployment, ExtensionConfiguration, this.Slot)
+                        : extensionMgr.UpdateExtensionState(config);
+                }
             }
 
             // Upgrade Parameter Set
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/Model/DeploymentInfoContext.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/Model/DeploymentInfoContext.cs
@@ -180,6 +180,12 @@ public PVM.LoadBalancerList LoadBalancers
             protected set;
         }
 
+        public PVM.ExtensionConfiguration ExtensionConfiguration
+        {
+            get;
+            protected set;
+        }
+
         public DeploymentInfoContext(DeploymentGetResponse deployment)
         {
             this.Slot             = deployment.DeploymentSlot.ToString();
@@ -287,6 +293,35 @@ from b in deployment.LoadBalancers
                 this.InternalLoadBalancerName = this.LoadBalancers == null || !this.LoadBalancers.Any() ? null
                                               : this.LoadBalancers.First().Name;
             }
+
+            // ExtensionConfiguration
+            if (deployment.ExtensionConfiguration != null)
+            {
+                this.ExtensionConfiguration = new PVM.ExtensionConfiguration();
+                if (deployment.ExtensionConfiguration.AllRoles != null)
+                {
+                    this.ExtensionConfiguration.AllRoles = new PVM.AllRoles(
+                        from all in deployment.ExtensionConfiguration.AllRoles
+                        select new PVM.Extension(all.Id, 0, all.State));
+                }
+
+                if (deployment.ExtensionConfiguration.NamedRoles != null)
+                {
+                    this.ExtensionConfiguration.NamedRoles = new PVM.NamedRoles();
+                    foreach (var role in deployment.ExtensionConfiguration.NamedRoles)
+                    {
+                        var extList = new PVM.ExtensionList(
+                            from ext in role.Extensions
+                            select new PVM.Extension(ext.Id, 0, ext.State));
+
+                        this.ExtensionConfiguration.NamedRoles.Add(new PVM.RoleExtensions
+                        {
+                            RoleName = role.RoleName,
+                            Extensions = extList
+                        });
+                    }
+                }
+            }
         }
 
         public XDocument SerializeRolesConfiguration()

Original file line number	Diff line number	Diff line change
`@@ -55,5 +55,16 @@ public NewAzureServiceExtensionConfigCmdletInfo(string thumbprint, string algori`
`55`	`55`	`this.cmdletParams.Add(new CmdletParam("ThumbprintAlgorithm", algorithm));`
`56`	`56`	`}`
`57`	`57`	`}`
	`58`	`+`
	`59`	`+ public NewAzureServiceExtensionConfigCmdletInfo(string extensionId, string extensionStatus, string[] roles)`
	`60`	`+ {`
	`61`	`+ this.cmdletName = Utilities.NewAzureServiceExtensionConfigCmdletName;`
	`62`	`+ this.cmdletParams.Add(new CmdletParam("ExtensionId", extensionId));`
	`63`	`+ this.cmdletParams.Add(new CmdletParam("ExtensionState", extensionStatus));`
	`64`	`+ if (roles != null)`
	`65`	`+ {`
	`66`	`+ this.cmdletParams.Add(new CmdletParam("Role", roles));`
	`67`	`+ }`
	`68`	`+ }`
`58`	`69`	`}`
`59`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,5 +28,6 @@ public class ExtensionConfigurationInput`
`28`	`28`	`public string PrivateConfiguration { get; set; }`
`29`	`29`	`public ExtensionRoleList Roles { get; set; }`
`30`	`30`	`public X509Certificate2 X509Certificate { get; set; }`
	`31`	`+ public string State { get; set; }`
`31`	`32`	`}`
`32`	`33`	`}`