Skip to content

Commit 6e5acaf

Browse files
author
Igor Uzhviev
committed
Azure Analysis Services: added new sku and scale up/down support
1 parent b7d4410 commit 6e5acaf

File tree

13 files changed

+35981
-908
lines changed

13 files changed

+35981
-908
lines changed

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@
5959
<Private>True</Private>
6060
</Reference>
6161
<Reference Include="Microsoft.Azure.Management.Analysis, Version=1.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
62-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Analysis.1.0.2-preview\lib\net45\Microsoft.Azure.Management.Analysis.dll</HintPath>
63-
<Private>True</Private>
62+
<SpecificVersion>False</SpecificVersion>
63+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Analysis.1.1.2\lib\net452\Microsoft.Azure.Management.Analysis.dll</HintPath>
6464
</Reference>
6565
<Reference Include="Microsoft.Azure.Management.Authorization">
6666
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
@@ -224,6 +224,9 @@
224224
<None Include="SessionRecords\Microsoft.Azure.Commands.AnalysisServices.Test.ScenarioTests.AsTests\TestNegativeAnalysisServicesServer.json">
225225
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
226226
</None>
227+
<None Include="SessionRecords\Microsoft.Azure.Commands.AnalysisServices.Test.ScenarioTests.AsTests\TestAnalysisServicesServerScaleUpDown.json">
228+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
229+
</None>
227230
</ItemGroup>
228231
<ItemGroup>
229232
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />

src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Test/InMemoryTests/DataPlaneCommandTests.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,9 @@ public void TestAddAzureASAccountCommand()
9595
expectedProfile.Context.TokenCache = Encoding.ASCII.GetBytes(testToken);
9696

9797
// Setup
98+
// Clear the the current profile
99+
AsAzureClientSession.Instance.Profile.Environments.Clear();
100+
98101
var mockAuthenticationProvider = new Mock<IAsAzureAuthenticationProvider>();
99102
mockAuthenticationProvider.Setup(
100103
authProvider => authProvider.GetAadAuthenticatedToken(

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,14 @@ public void TestAnalysisServicesServer()
3030
{
3131
NewInstance.RunPsTest(string.Format("Test-AnalysisServicesServer -location '{0}'", AsTestsBase.resourceGroupLocation));
3232
}
33-
33+
34+
[Fact]
35+
[Trait(Category.AcceptanceType, Category.CheckIn)]
36+
public void TestAnalysisServicesServerScaleUpDown()
37+
{
38+
NewInstance.RunPsTest(string.Format("Test-AnalysisServicesServerScaleUpDown -location '{0}'", AsTestsBase.resourceGroupLocation));
39+
}
40+
3441
[Fact]
3542
[Trait(Category.AcceptanceType, Category.CheckIn)]
3643
public void TestNegativeAnalysisServicesServer()

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

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,64 @@ function Test-AnalysisServicesServer
123123
}
124124
}
125125

126+
<#
127+
.SYNOPSIS
128+
Tests scale up and down of Analysis Services server (B1 -> S2 -> S1).
129+
#>
130+
function Test-AnalysisServicesServerScaleUpDown
131+
{
132+
param
133+
(
134+
$location = "West US"
135+
)
136+
137+
try
138+
{
139+
# Creating server
140+
$resourceGroupName = Get-ResourceGroupName
141+
$serverName = Get-AnalysisServicesServerName
142+
New-AzureRmResourceGroup -Name $resourceGroupName -Location $location
143+
144+
$serverCreated = New-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName -Location $location -Sku 'B1' -Administrator '[email protected],[email protected]'
145+
146+
Assert-AreEqual $serverName $serverCreated.Name
147+
Assert-AreEqual $location $serverCreated.Location
148+
Assert-AreEqual "Microsoft.AnalysisServices/servers" $serverCreated.Type
149+
Assert-AreEqual B1 $serverCreated.Sku.Name
150+
Assert-True {$serverCreated.Id -like "*$resourceGroupName*"}
151+
Assert-True {$serverCreated.ServerFullName -ne $null -and $serverCreated.ServerFullName.Contains("$serverName")}
152+
153+
# Check server was created successfully
154+
[array]$serverGet = Get-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName
155+
$serverGetItem = $serverGet[0]
156+
157+
Assert-True {$serverGetItem.ProvisioningState -like "Succeeded"}
158+
Assert-True {$serverGetItem.State -like "Succeeded"}
159+
160+
Assert-AreEqual $serverName $serverGetItem.Name
161+
Assert-AreEqual $location $serverGetItem.Location
162+
Assert-AreEqual B1 $serverGetItem.Sku.Name
163+
Assert-AreEqual "Microsoft.AnalysisServices/servers" $serverGetItem.Type
164+
Assert-True {$serverGetItem.Id -like "*$resourceGroupName*"}
165+
166+
# Scale up B1 -> S2
167+
$serverUpdated = Set-AzureRmAnalysisServicesServer -Name $serverName -Sku S2 -PassThru
168+
Assert-AreEqual S2 $serverUpdated.Sku.Name
169+
170+
# Scale down S2 -> S1
171+
$serverUpdated = Set-AzureRmAnalysisServicesServer -Name $serverName -Sku S1 -PassThru
172+
Assert-AreEqual S1 $serverUpdated.Sku.Name
173+
174+
# Delete Analysis Servicesserver
175+
Remove-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName -PassThru
176+
}
177+
finally
178+
{
179+
# cleanup the resource group that was used in case it still exists. This is a best effort task, we ignore failures here.
180+
Invoke-HandledCmdlet -Command {Remove-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName -ErrorAction SilentlyContinue} -IgnoreFailures
181+
Invoke-HandledCmdlet -Command {Remove-AzureRmResourceGroup -Name $resourceGroupName -ErrorAction SilentlyContinue} -IgnoreFailures
182+
}
183+
}
126184

127185
<#
128186
.SYNOPSIS

0 commit comments

Comments
 (0)