Merge branch 'dev' into athipp-dev2

Author: athipp

src/ResourceManager/AnalysisServices/AzureRM.AnalysisServices.psd1

@@ -9,7 +9,7 @@
 @{  
 
 # Version number of this module.  
-ModuleVersion = '0.0.1'
+ModuleVersion = '0.0.2'
 
 # ID used to uniquely identify this module  
 GUID = 'acace26c-1775-4100-85c0-20c4d71eaa21'  

src/ResourceManager/AnalysisServices/ChangeLog.md

@@ -0,0 +1,26 @@
+<!--
+    Please leave this section at the top of the change log.
+
+    Changes for the current release should go under the section titled "Current Release", and should adhere to the following format:
+
+    ## Current Release
+    * Overview of change #1
+        - Additional information about change #1
+    * Overview of change #2
+        - Additional information about change #2
+        - Additional information about change #2
+    * Overview of change #3
+    * Overview of change #4
+        - Additional information about change #4
+
+    ## YYYY.MM.DD - Version X.Y.Z (Previous Release)
+    * Overview of change #1
+        - Additional information about change #1
+-->
+## Current Release
+
+## Version 0.0.2
+* Fixed bug in Get-AzureRMAnalysisServicesServer
+    - When this command was run against some resources, it would fail with a null reference exception.
+* Added two new dataplane APIs in a separate module AzureRM.AnalysisServices.ServiceManagement.psd1
+    - This introduces two new APIs that enable customers to login to Azure Analysis Services servers and issue a restart command.

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

@@ -22,6 +22,7 @@ function Test-AnalysisServicesServer
 		Assert-AreEqual $location $serverCreated.Location
 		Assert-AreEqual "Microsoft.AnalysisServices/servers" $serverCreated.Type
 		Assert-True {$serverCreated.Id -like "*$resourceGroupName*"}
+		Assert-True {$serverCreated.ServerFullName -ne $null -and $serverCreated.ServerFullName.Contains("*$serverName*")}
 
 		[array]$serverGet = Get-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName
 		$serverGetItem = $serverGet[0]

src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Test/SessionRecords/Microsoft.Azure.Commands.AnalysisServices.Test.ScenarioTests.AsTests/TestAnalysisServicesServer.json

@@ -87,7 +87,7 @@ public AnalysisServicesServer CreateOrUpdateServer(
                 var updateParameters = new AnalysisServicesServerUpdateParameters()
                 {
                     Sku = existingServer.Sku,
-                    Tags = tags ?? new Dictionary<string, string>(),
+                    Tags = tags,
                     AsAdministrators = new ServerAdministrators(adminList)
                 };
 
@@ -103,7 +103,7 @@ public AnalysisServicesServer CreateOrUpdateServer(
                         AsAdministrators = new ServerAdministrators(adminList),
                         Location = location,
                         Sku = GetResourceSkuFromName(skuName),
-                        Tags = tags ?? new Dictionary<string, string>()
+                        Tags = tags
                     });
             }
 

src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Test/SessionRecords/Microsoft.Azure.Commands.AnalysisServices.Test.ScenarioTests.AsTests/TestNegativeAnalysisServicesServer.json

@@ -39,6 +39,8 @@ public class AzureAnalysisServicesServer
 
         public string Location { get; set; }
 
+        public string ServerFullName { get; private set; }
+
         public ServerSku Sku { get; set; }
 
         public System.Collections.Generic.IDictionary<string, string> Tag { get; set; }
@@ -52,16 +54,17 @@ internal static AzureAnalysisServicesServer FromAnalysisServicesServer(AnalysisS
 
             return new AzureAnalysisServicesServer()
             {
-                AsAdministrators = server.AsAdministrators == null 
-                    ? new List<string>() 
+                AsAdministrators = server.AsAdministrators == null
+                    ? new List<string>()
                     : new List<string>(server.AsAdministrators.Members),
                 Location = server.Location,
                 Name = server.Name,
                 Type = server.Type,
                 ProvisioningState = server.ProvisioningState,
                 Id = server.Id,
-                Sku = ServerSku.FromResourceSku(server.Sku),
-                Tag = new Dictionary<string, string>(server.Tags)
+                ServerFullName = server.ServerFullName,
+                Sku = server.Sku != null ? ServerSku.FromResourceSku(server.Sku) : new ServerSku(),
+                Tag = server.Tags != null ? new Dictionary<string, string>(server.Tags) : new Dictionary<string, string>()
             };
         }
 

src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Microsoft.Azure.Commands.AnalysisServices.dll-help.psd1

@@ -35,5 +35,5 @@
 // by using the '*' as shown below:
 
 
-[assembly: AssemblyVersion("0.0.1")]
-[assembly: AssemblyFileVersion("0.0.1")]
+[assembly: AssemblyVersion("0.0.2")]
+[assembly: AssemblyFileVersion("0.0.2")]