Merge pull request Azure#3406 from shihying/as-state

Add property State in additional to ProvisioningState

Author: cormacpayne

src/ResourceManager/AnalysisServices/ChangeLog.md

@@ -18,6 +18,10 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Added State property in additional to ProvisioningState
+    - All the cmdlet returning AnalysisService would have a new property 'State' used outside of provisioing.
+    - The 'State' is intended to check status outside of provisioning, while 'ProvisioningState' is intended to check status related to Provisioning.
+    - ProvisioningState and State are same in service side at this moment, the service side would differenciate ProvisioningState and State in future
 
 ## Version 0.0.3
 * Added two new dataplane APIs in a separate module Azure.AnalysisServices.psd1

src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/packages.config

@@ -3,7 +3,7 @@
   <package id="Hyak.Common" version="1.0.3" targetFramework="net45" />
   <package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
-  <package id="Microsoft.Azure.Management.Analysis" version="1.0.1-preview" targetFramework="net45" />
+  <package id="Microsoft.Azure.Management.Analysis" version="1.0.2-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
   <package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />

src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Test/Commands.AnalysisServices.Test.csproj

@@ -58,8 +58,8 @@
       <HintPath>..\..\..\packages\Microsoft.Azure.Gallery.2.6.2-preview\lib\net40\Microsoft.Azure.Gallery.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Azure.Management.Analysis, Version=1.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Analysis.1.0.1-preview\lib\net45\Microsoft.Azure.Management.Analysis.dll</HintPath>
+    <Reference Include="Microsoft.Azure.Management.Analysis, Version=1.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Analysis.1.0.2-preview\lib\net45\Microsoft.Azure.Management.Analysis.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Azure.Management.Authorization">

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

@@ -10,7 +10,7 @@ function Test-AnalysisServicesServer
 	)
 
 	try
-	{
+	{  
 		# Creating server
 		$resourceGroupName = Get-ResourceGroupName
 		$serverName = Get-AnalysisServicesServerName
@@ -22,11 +22,14 @@ 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*")}
+		Assert-True {$serverCreated.ServerFullName -ne $null -and $serverCreated.ServerFullName.Contains("$serverName")}
 
 		[array]$serverGet = Get-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName
 		$serverGetItem = $serverGet[0]
+
 		Assert-True {$serverGetItem.ProvisioningState -like "Succeeded"}
+		Assert-True {$serverGetItem.State -like "Succeeded"}
+		
 		Assert-AreEqual $serverName $serverGetItem.Name
 		Assert-AreEqual $location $serverGetItem.Location
 		Assert-AreEqual "Microsoft.AnalysisServices/servers" $serverGetItem.Type
@@ -36,7 +39,7 @@ function Test-AnalysisServicesServer
 		Assert-True {Test-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName}
 		# Test it without specifying a resource group
 		Assert-True {Test-AzureRmAnalysisServicesServer -Name $serverName}
-
+		
 		# Updating server
 		$tagsToUpdate = @{"TestTag" = "TestUpdate"}
 		$serverUpdated = Set-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName -Tag $tagsToUpdate -PassThru
@@ -55,7 +58,7 @@ function Test-AnalysisServicesServer
 		# List all servers in resource group
 		[array]$serversInResourceGroup = Get-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName
 		Assert-True {$serversInResourceGroup.Count -ge 1}
-    
+
 		$found = 0
 		for ($i = 0; $i -lt $serversInResourceGroup.Count; $i++)
 		{
@@ -95,13 +98,16 @@ function Test-AnalysisServicesServer
 		Suspend-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName
 		[array]$serverGet = Get-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName
 		$serverGetItem = $serverGet[0]
+		# this is to ensure backward compatibility compatibility. The servie side would make change to differenciate state and provisioningState in future
+		Assert-True {$serverGetItem.State -like "Paused"}
 		Assert-True {$serverGetItem.ProvisioningState -like "Paused"}
 
 		# Resume Analysis Servicesserver
 		Resume-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName
 		[array]$serverGet = Get-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName
 		$serverGetItem = $serverGet[0]
 		Assert-True {$serverGetItem.ProvisioningState -like "Succeeded"}
+		Assert-True {$serverGetItem.State -like "Succeeded"}
 
 		# Delete Analysis Servicesserver
 		Remove-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName -PassThru
@@ -124,6 +130,7 @@ Tests Analysis Services server lifecycle  Failure scenarios (Create, Update, Get
 #>
 function Test-NegativeAnalysisServicesServer
 {
+
     param
 	(
 		$location = "West US",
@@ -193,6 +200,7 @@ function Test-AnalysisServicesServerRestart
 
 		$serverCreated = New-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName -Location $location -Sku 'S1' -Administrators '[email protected],[email protected]'
 		Assert-True {$serverCreated.ProvisioningState -like "Succeeded"}
+		Assert-True {$serverCreated.State -like "Succeeded"}
 
 		$asAzureProfile = Login-AzureAsAccount -RolloutEnvironment $rolloutEnvironment
 		Assert-NotNull $asAzureProfile "Login-AzureAsAccount $rolloutEnvironment must not return null"