Update gateway association using resource id

Author: taiwu

src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Test/ScenarioTests/AsTests.ps1

@@ -621,16 +621,21 @@ function Test-AnalysisServicesServerGateway
 {
     try
     {
+        # Creating server
+		$location = Get-Location
+		$resourceGroupName = Get-ResourceGroupName
+		$serverName = Get-AnalysisServicesServerName
+        $gatewayName = $env:GATEWAY_NAME
+        $gateway = Get-AzureRmResource -ResourceName $gatewayName -ResourceGroupName $resourceGroupName
+        $serverCreated = New-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName -Location $location -Sku S0 -GatewayResourceId $gateway.ResourceId -PassThru
 
-        # Updating server
-        $tagsToUpdate = @{"TestTag" = "TestUpdate"}
-        #$serverUpdated = Set-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName -Tag $tagsToUpdate -GatewayName 'azsdktest' -GatewayResourceGroupName 'TestRG' -GatewaySubscriptionId 'ba59a556-5034-4bbb-80b4-4c37cf1083e9' -PassThru
-        $serverUpdated = Set-AzureRmAnalysisServicesServer -ResourceGroupName 'TestRG' -Name 'azsdktest0309' -Tag $tagsToUpdate -DisassociateGateway -PassThru
-        Assert-NotNull $serverUpdated.Tag "Tag do not exists"
-        Assert-NotNull $serverUpdated.Tag["TestTag"] "The updated tag 'TestTag' does not exist"
-        Assert-AreEqual $serverUpdated.AsAdministrators.Count 2
-        Assert-AreEqual 1 $serverUpdated.Sku.Capacity
+        Assert-True {$serverCreated.ProvisioningState -like "Succeeded"}
+        Assert-True {$serverCreated.State -like "Succeeded"}
+        Assert-AreEqual $gateway.ResourceId $serverCreated.GatewayDetails.GatewayResourceId
 
+        # Dissociate gateway from server
+        $serverUpdated = Set-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName -DisassociateGateway -PassThru
+        Assert-True {[string]::IsNullOrEmpty($serverUpdated.GatewayDetails.GatewayResourceId)}
     }
     finally
     {

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

@@ -83,16 +83,8 @@ public class NewAnalysisServicesServer : AnalysisServicesCmdletBase
         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 group name")]
-          public string GatewayResourceGroupName { get; set; }
-
-        [Parameter(ValueFromPipelineByPropertyName = true, Mandatory = false,
-            HelpMessage = "Gateway subscription Id")]
-        public string GatewaySubscriptionId { get; set; }
+            HelpMessage = "Gateway resource ID")]
+        public string GatewayResourceId { get; set; }
 
         public override void ExecuteCmdlet()
         {
@@ -156,14 +148,7 @@ public override void ExecuteCmdlet()
                     ReadonlyReplicaCount = 0;
                 }
 
-                if (string.IsNullOrEmpty(GatewayResourceGroupName))
-                {
-                   GatewayResourceGroupName = ResourceGroupName;
-                }
-
-                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, GatewayResourceId);
                 WriteObject(AzureAnalysisServicesServer.FromAnalysisServicesServer(createdServer));
             }
         }

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

@@ -89,16 +89,8 @@ public int ReadonlyReplicaCount
         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 group name")]
-        public string GatewayResourceGroupName { get; set; }
-
-        [Parameter(ValueFromPipelineByPropertyName = true, Mandatory = false,
-            HelpMessage = "Gateway subscription Id")]
-        public string GatewaySubscriptionId { get; set; }
+            HelpMessage = "Gateway resource ID")]
+        public string GatewayResourceId { get; set; }
 
         [Parameter(ValueFromPipelineByPropertyName = true, Mandatory = false,
             HelpMessage = "Disassociate current gateway")]
@@ -163,22 +155,12 @@ 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);
+                    GatewayResourceId = "-";
                 }
 
-                AnalysisServicesServer updatedServer = AnalysisServicesClient.CreateOrUpdateServer(ResourceGroupName, Name, location, Sku, Tag, Administrator, currentServer, BackupBlobContainerUri, ReadonlyReplicaCount, DefaultConnectionMode, setting, gatewayResourceId);
+                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

@@ -33,7 +33,6 @@ public class AnalysisServicesClient
         private readonly AnalysisServicesManagementClient _client;
         private readonly Guid _subscriptionId;
         private readonly string _currentUser;
-		public const string gatewayResourceIdFormat = "/subscriptions/{0}/resourceGroups/{1}/providers/Microsoft.Web/connectionGateways/{2}";
 
         public AnalysisServicesClient(IAzureContext context)
         {
@@ -67,7 +66,7 @@ public AnalysisServicesServer CreateOrUpdateServer(
             int ReadonlyReplicaCount = 0,
             string DefaultConnectionMode = null,
             IPv4FirewallSettings setting = null,
-            string gatewayId = null)
+            string gatewayResourceId = null)
         {
             if (string.IsNullOrEmpty(resourceGroupName))
             {
@@ -90,13 +89,13 @@ public AnalysisServicesServer CreateOrUpdateServer(
             }
 
             GatewayDetails gatewayDetails = null;
-            if (gatewayId == "-")
+            if (gatewayResourceId == "-")
             {
                 gatewayDetails = new GatewayDetails();
             }
-            else
+            else if (gatewayResourceId != null)
             {
-                gatewayDetails = new GatewayDetails(gatewayId);
+                gatewayDetails = new GatewayDetails(gatewayResourceId);
             }
 
             AnalysisServicesServer newOrUpdatedServer = null;
@@ -133,7 +132,7 @@ public AnalysisServicesServer CreateOrUpdateServer(
                     updateParameters.IpV4FirewallSettings = setting;
                 }
 
-                if (gatewayId != null)
+                if (gatewayDetails != null)
                 {
                     updateParameters.GatewayDetails = gatewayDetails;
                 }
@@ -148,6 +147,11 @@ public AnalysisServicesServer CreateOrUpdateServer(
                     connectionMode = (ConnectionMode)Enum.Parse(typeof(ConnectionMode), DefaultConnectionMode, true); 
                 }
 
+                if (adminList.Count == 0)
+                {
+                    adminList.Add(_currentUser);
+                }
+
                 newOrUpdatedServer = _client.Servers.Create(
                     resourceGroupName, 
                     serverName, 
@@ -281,22 +285,6 @@ 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;
-                }
-
-                resourcdId = string.Format(gatewayResourceIdFormat, subscriptionId, resourceGroupName, gatewayName);
-            }
-
-            return resourcdId;
-        }
-
         #endregion
         }
 }