Fix indent and disassociate gateway

Author: taiwu

src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Commands/NewAzureRmAnalysisServicesServer.cs

@@ -82,19 +82,19 @@ public class NewAnalysisServicesServer : AnalysisServicesCmdletBase
             HelpMessage = "Firewall configuration")]
         public PsAzureAnalysisServicesFirewallConfig FirewallConfig { get; set; }
 
-		[Parameter(ValueFromPipelineByPropertyName = true, Mandatory = false,
-			HelpMessage = "Gateway resource name")]
-		public string GatewayName { get; set; }
+        [Parameter(ValueFromPipelineByPropertyName = true, Mandatory = false,
+            HelpMessage = "Gateway resource name")]
+        public string GatewayName { get; set; }
 
-		[Parameter(ValueFromPipelineByPropertyName = true, Mandatory = false,
-			HelpMessage = "Gateway resource group name")]
-		public string GatewayResourceGroupName { get; set; }
+        [Parameter(ValueFromPipelineByPropertyName = true, Mandatory = false,
+            HelpMessage = "Gateway resource group name")]
+          public string GatewayResourceGroupName { get; set; }
 
-		[Parameter(ValueFromPipelineByPropertyName = true, Mandatory = false,
-			HelpMessage = "Gateway subscription Id")]
-		public string GatewaySubscriptionId { get; set; }
+        [Parameter(ValueFromPipelineByPropertyName = true, Mandatory = false,
+            HelpMessage = "Gateway subscription Id")]
+        public string GatewaySubscriptionId { get; set; }
 
-		public override void ExecuteCmdlet()
+        public override void ExecuteCmdlet()
         {
             if (ShouldProcess(Name, Resources.CreateNewAnalysisServicesServer))
             {
@@ -156,14 +156,14 @@ public override void ExecuteCmdlet()
                     ReadonlyReplicaCount = 0;
                 }
 
-				if (string.IsNullOrEmpty(GatewayResourceGroupName))
-				{
-					GatewayResourceGroupName = ResourceGroupName;
-				}
+                if (string.IsNullOrEmpty(GatewayResourceGroupName))
+                {
+                   GatewayResourceGroupName = ResourceGroupName;
+                }
 
-				string gatewayId = AnalysisServicesClient.GetGatewayResourceId(GatewayName, GatewayResourceGroupName, GatewaySubscriptionId);
+                string gatewayId = AnalysisServicesClient.GetGatewayResourceId(GatewayName, GatewayResourceGroupName, GatewaySubscriptionId);
 
-				var createdServer = AnalysisServicesClient.CreateOrUpdateServer(ResourceGroupName, Name, Location, Sku, Tag, Administrator, null, BackupBlobContainerUri, ReadonlyReplicaCount, DefaultConnectionMode, setting, gatewayId);
+                var createdServer = AnalysisServicesClient.CreateOrUpdateServer(ResourceGroupName, Name, Location, Sku, Tag, Administrator, null, BackupBlobContainerUri, ReadonlyReplicaCount, DefaultConnectionMode, setting, gatewayId);
                 WriteObject(AzureAnalysisServicesServer.FromAnalysisServicesServer(createdServer));
             }
         }

src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Commands/SetAzureRmAnalysisServicesServer.cs

@@ -163,22 +163,22 @@ public override void ExecuteCmdlet()
                     ReadonlyReplicaCount = -1;
                 }
 
-				if (string.IsNullOrEmpty(GatewayResourceGroupName))
-				{
-					GatewayResourceGroupName = ResourceGroupName;
-				}
-
-				string gatewayResourceId = null;
-				if (DisassociateGateway.IsPresent)
-				{
-					gatewayResourceId = "-";
-				}
-				else
-				{
-					gatewayResourceId = AnalysisServicesClient.GetGatewayResourceId(GatewayName, GatewayResourceGroupName, GatewaySubscriptionId);
-				}
-
-				AnalysisServicesServer updatedServer = AnalysisServicesClient.CreateOrUpdateServer(ResourceGroupName, Name, location, Sku, Tag, Administrator, currentServer, BackupBlobContainerUri, ReadonlyReplicaCount, DefaultConnectionMode, setting, gatewayResourceId);
+                if (string.IsNullOrEmpty(GatewayResourceGroupName))
+                {
+	                GatewayResourceGroupName = ResourceGroupName;
+                }
+
+                string gatewayResourceId = null;
+                if (DisassociateGateway.IsPresent)
+                {
+	                gatewayResourceId = "-";
+                }
+                else
+                {
+	                gatewayResourceId = AnalysisServicesClient.GetGatewayResourceId(GatewayName, GatewayResourceGroupName, GatewaySubscriptionId);
+                }
+
+                AnalysisServicesServer updatedServer = AnalysisServicesClient.CreateOrUpdateServer(ResourceGroupName, Name, location, Sku, Tag, Administrator, currentServer, BackupBlobContainerUri, ReadonlyReplicaCount, DefaultConnectionMode, setting, gatewayResourceId);
 
                 if(PassThru.IsPresent)
                 {

src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Models/AnalysisServicesClient.cs

@@ -67,7 +67,7 @@ public AnalysisServicesServer CreateOrUpdateServer(
             int ReadonlyReplicaCount = 0,
             string DefaultConnectionMode = null,
             IPv4FirewallSettings setting = null,
-			string gatewayId = null)
+            string gatewayId = null)
         {
             if (string.IsNullOrEmpty(resourceGroupName))
             {
@@ -89,17 +89,17 @@ public AnalysisServicesServer CreateOrUpdateServer(
                 }
             }
 
-			GatewayDetails gatewayDetails = null;
-			if (gatewayId == "-")
-			{
-				gatewayDetails = new GatewayDetails("", "", "");
-			}
-			else
-			{
-				gatewayDetails = new GatewayDetails(gatewayId);
-			}
-
-			AnalysisServicesServer newOrUpdatedServer = null;
+            GatewayDetails gatewayDetails = null;
+            if (gatewayId == "-")
+            {
+                gatewayDetails = new GatewayDetails();
+            }
+            else
+            {
+                gatewayDetails = new GatewayDetails(gatewayId);
+            }
+
+            AnalysisServicesServer newOrUpdatedServer = null;
             if (existingServer != null)
             {
                 var updateParameters = new AnalysisServicesServerUpdateParameters()
@@ -133,7 +133,7 @@ public AnalysisServicesServer CreateOrUpdateServer(
                     updateParameters.IpV4FirewallSettings = setting;
                 }
 
-                if (gatewayId != null && gatewayId != "-")
+                if (gatewayId != null)
                 {
                     updateParameters.GatewayDetails = gatewayDetails;
                 }
@@ -160,8 +160,8 @@ public AnalysisServicesServer CreateOrUpdateServer(
                         Tags = tags,
                         QuerypoolConnectionMode = connectionMode,
                         IpV4FirewallSettings = setting,
-						GatewayDetails = gatewayDetails
-					});
+                        GatewayDetails = gatewayDetails
+                    });
             }            
 
             return newOrUpdatedServer;
@@ -281,22 +281,22 @@ public void ResumeServer(string resourceGroupName, string serverName)
             _client.Servers.Resume(resourceGroupName, serverName);
         }
 
-		public string GetGatewayResourceId(string gatewayName, string resourceGroupName, string subscriptionId)
-		{
-			string resourcdId = null;
-			if (!string.IsNullOrEmpty(gatewayName))
-			{
-				if (string.IsNullOrEmpty(subscriptionId))
-				{
-					subscriptionId = _client.SubscriptionId;
-				}
+        public string GetGatewayResourceId(string gatewayName, string resourceGroupName, string subscriptionId)
+        {
+            string resourcdId = null;
+            if (!string.IsNullOrEmpty(gatewayName))
+            {
+                if (string.IsNullOrEmpty(subscriptionId))
+                {
+                    subscriptionId = _client.SubscriptionId;
+                }
 
-				resourcdId = string.Format(gatewayResourceIdFormat, subscriptionId, resourceGroupName, gatewayName);
-			}
+                resourcdId = string.Format(gatewayResourceIdFormat, subscriptionId, resourceGroupName, gatewayName);
+            }
 
-			return resourcdId;
-		}
+            return resourcdId;
+        }
 
-		#endregion
-	}
+        #endregion
+        }
 }

src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Models/ServerGateway.cs

@@ -15,14 +15,14 @@ public class ServerGateway
 
         public string DmtsClusterUri { get; set; }
 
-		internal static ServerGateway FromResourceGateway(GatewayDetails resourceGateway)
-		{
-			return new ServerGateway()
-			{
-				GatewayResourceId = resourceGateway.GatewayResourceId,
-				GatewayObjectId = resourceGateway.GatewayObjectId != null ? resourceGateway.GatewayObjectId : null,
-				DmtsClusterUri = resourceGateway.DmtsClusterUri != null ? resourceGateway.DmtsClusterUri : null
-			};
+        internal static ServerGateway FromResourceGateway(GatewayDetails resourceGateway)
+        {
+            return new ServerGateway()
+            {
+               GatewayResourceId = resourceGateway.GatewayResourceId,
+                GatewayObjectId = resourceGateway.GatewayObjectId != null ? resourceGateway.GatewayObjectId : null,
+               DmtsClusterUri = resourceGateway.DmtsClusterUri != null ? resourceGateway.DmtsClusterUri : null
+            };
         }
     }
 }