Skip to content

Commit c344393

Browse files
cormacpaynecormacpayne
authored
Merge branch 'preview' into release-4.2.0
2 parents 906f429 + 25431c5 commit c344393

25 files changed

+70533
-18033
lines changed

‎src/ResourceManager/AnalysisServices/AzureRM.AnalysisServices.psd1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#
1+
#
22
# Module manifest for module 'PSGet_AzureRM.AnalysisServices'
33
#
44
# Generated by: Microsoft Corporation
@@ -27,7 +27,7 @@ Author = 'Microsoft Corporation'
2727
CompanyName = 'Microsoft Corporation'
2828

2929
# Copyright statement for this module
30-
Copyright = '© Microsoft Corporation. All rights reserved.'
30+
Copyright = '© Microsoft Corporation. All rights reserved.'
3131

3232
# Description of the functionality provided by this module
3333
Description = 'Microsoft Azure PowerShell - Analysis Services'

‎src/ResourceManager/AnalysisServices/ChangeLog.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@
1818
- Additional information about change #1
1919
-->
2020
## Current Release
21+
* Fixed bug in Set-AzureRmAnalysisServciesServer
22+
- When admin was not provided, the admin will be removed.
23+
* Added BackupBlobContainerUri in New-AzureRmAnalysisServicesServer and Set-AzureRmAnalysisServicesServer
24+
- Enable to set/disable backup blob container for backup/restore Azure Analysis Services Server
25+
* Updated Sku lookup in New-AzureRmAnalysisServicesServer and Set-AzureRmAnalysisServicesServer
26+
- Changed hard coded Sku into dynamic lookup.
2127

2228
## Version 0.4.2
2329

‎src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/Models/AsAzureClientSession.cs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,17 @@ public class AsAzureClientSession
3636
public static Dictionary<string, AsAzureAuthInfo> AsAzureRolloutEnvironmentMapping = new Dictionary<string, AsAzureAuthInfo>()
3737
{
3838
{ "asazure.windows.net", new AsAzureAuthInfo()
39-
{
39+
{
4040
AuthorityUrl = "https://login.windows.net" ,
4141
DefaultResourceUriSuffix = "*.asazure.windows.net"
42-
}},
42+
}
43+
},
44+
{ "asazure-int.windows.net", new AsAzureAuthInfo()
45+
{
46+
AuthorityUrl = "https://login.windows-ppe.net" ,
47+
DefaultResourceUriSuffix = "*.asazure-int.windows.net"
48+
}
49+
}
4350
};
4451

4552
/// <summary>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@
5858
<HintPath>..\..\..\packages\Microsoft.Azure.Gallery.2.6.2-preview\lib\net40\Microsoft.Azure.Gallery.dll</HintPath>
5959
<Private>True</Private>
6060
</Reference>
61-
<Reference Include="Microsoft.Azure.Management.Analysis, Version=1.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
61+
<Reference Include="Microsoft.Azure.Management.Analysis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6262
<SpecificVersion>False</SpecificVersion>
63-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Analysis.1.1.2\lib\net452\Microsoft.Azure.Management.Analysis.dll</HintPath>
63+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Analysis.2.0.0\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>

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,13 @@ public void TestAnalysisServicesServerScaleUpDown()
3838
NewInstance.RunPsTest("Test-AnalysisServicesServerScaleUpDown");
3939
}
4040

41+
[Fact]
42+
[Trait(Category.AcceptanceType, Category.LiveOnly)]
43+
public void TestAnalysisServicesServerDisableBackup()
44+
{
45+
NewInstance.RunPsTest("Test-AnalysisServicesServerDisableBackup");
46+
}
47+
4148
[Fact]
4249
[Trait(Category.AcceptanceType, Category.CheckIn)]
4350
public void TestNegativeAnalysisServicesServer()

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

Lines changed: 93 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,16 @@ function Test-AnalysisServicesServer
1010
$location = Get-Location
1111
$resourceGroupName = Get-ResourceGroupName
1212
$serverName = Get-AnalysisServicesServerName
13+
$backupBlobContainerUri = $env:AAS_DEFAULT_BACKUP_BLOB_CONTAINER_URI
14+
1315
New-AzureRmResourceGroup -Name $resourceGroupName -Location $location
1416

1517
$serverCreated = New-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName -Location $location -Sku 'S1' -Administrator '[email protected],[email protected]'
1618

1719
Assert-AreEqual $serverName $serverCreated.Name
1820
Assert-AreEqual $location $serverCreated.Location
1921
Assert-AreEqual "Microsoft.AnalysisServices/servers" $serverCreated.Type
22+
Assert-AreEqual 2 $serverCreated.AsAdministrators.Count
2023
Assert-True {$serverCreated.Id -like "*$resourceGroupName*"}
2124
Assert-True {$serverCreated.ServerFullName -ne $null -and $serverCreated.ServerFullName.Contains("$serverName")}
2225

@@ -41,11 +44,12 @@ function Test-AnalysisServicesServer
4144
$serverUpdated = Set-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName -Tag $tagsToUpdate -PassThru
4245
Assert-NotNull $serverUpdated.Tag "Tag do not exists"
4346
Assert-NotNull $serverUpdated.Tag["TestTag"] "The updated tag 'TestTag' does not exist"
47+
Assert-AreEqual $serverUpdated.AsAdministrators.Count 2
4448

4549
$serverUpdated = Set-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName -Administrator '[email protected]' -PassThru
4650
Assert-NotNull $serverUpdated.AsAdministrators "Server Administrator list is empty"
4751
Assert-AreEqual $serverUpdated.AsAdministrators.Count 1
48-
52+
4953
Assert-AreEqual $serverName $serverUpdated.Name
5054
Assert-AreEqual $location $serverUpdated.Location
5155
Assert-AreEqual "Microsoft.AnalysisServices/servers" $serverUpdated.Type
@@ -134,7 +138,6 @@ function Test-AnalysisServicesServerScaleUpDown
134138
New-AzureRmResourceGroup -Name $resourceGroupName -Location $location
135139

136140
$serverCreated = New-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName -Location $location -Sku 'B1' -Administrator '[email protected],[email protected]'
137-
138141
Assert-AreEqual $serverName $serverCreated.Name
139142
Assert-AreEqual $location $serverCreated.Location
140143
Assert-AreEqual "Microsoft.AnalysisServices/servers" $serverCreated.Type
@@ -174,6 +177,69 @@ function Test-AnalysisServicesServerScaleUpDown
174177
}
175178
}
176179

180+
<#
181+
.SYNOPSIS
182+
Tests disable backup blob container
183+
In order to run this test successfully, Following environment variables need to be set.
184+
AAS_DEFAULT_BACKUP_BLOB_CONTAINER_URI e.x. value 'https://aassdk1.blob.core.windows.net/azsdktest?<serviceSasToken1>'
185+
AAS_SECOND_BACKUP_BLOB_CONTAINER_URI e.x. value 'https://aassdk1.blob.core.windows.net/azsdktest2?<serviceSasToken2>'
186+
#>
187+
function Test-AnalysisServicesServerDisableBackup
188+
{
189+
try
190+
{
191+
# Creating server
192+
$location = Get-Location
193+
$resourceGroupName = Get-ResourceGroupName
194+
$serverName = Get-AnalysisServicesServerName
195+
$backupBlobContainerUri = $env:AAS_DEFAULT_BACKUP_BLOB_CONTAINER_URI
196+
New-AzureRmResourceGroup -Name $resourceGroupName -Location $location
197+
198+
$serverCreated = New-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName -Location $location -Sku 'B1' -Administrator '[email protected],[email protected]' -BackupBlobContainerUri $backupBlobContainerUri
199+
Assert-AreEqual $serverName $serverCreated.Name
200+
Assert-AreEqual $location $serverCreated.Location
201+
Assert-AreEqual "Microsoft.AnalysisServices/servers" $serverCreated.Type
202+
Assert-AreEqual B1 $serverCreated.Sku.Name
203+
Assert-True {$backupBlobContainerUri.Contains($serverCreated.BackupBlobContainerUri)}
204+
Assert-True {$serverCreated.Id -like "*$resourceGroupName*"}
205+
Assert-True {$serverCreated.ServerFullName -ne $null -and $serverCreated.ServerFullName.Contains("$serverName")}
206+
207+
# Check server was created successfully
208+
[array]$serverGet = Get-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName
209+
$serverGetItem = $serverGet[0]
210+
211+
Assert-True {$serverGetItem.ProvisioningState -like "Succeeded"}
212+
Assert-True {$serverGetItem.State -like "Succeeded"}
213+
Assert-True {$backupBlobContainerUri.Contains($serverGetItem.BackupBlobContainerUri)}
214+
215+
Assert-AreEqual $serverName $serverGetItem.Name
216+
Assert-AreEqual $location $serverGetItem.Location
217+
Assert-AreEqual B1 $serverGetItem.Sku.Name
218+
Assert-AreEqual "Microsoft.AnalysisServices/servers" $serverGetItem.Type
219+
Assert-True {$serverGetItem.Id -like "*$resourceGroupName*"}
220+
221+
# Update backup container
222+
$backupBlobContainerUriToUpdate = $env:AAS_SECOND_BACKUP_BLOB_CONTAINER_URI
223+
$serverUpdated = Set-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName -BackupBlobContainerUri "$backupBlobContainerUriToUpdate" -PassThru
224+
Assert-NotNull $serverUpdated.BackupBlobContainerUri "The backup blob container Uri is empty"
225+
Assert-True {$backupBlobContainerUriToUpdate.contains($serverUpdated.BackupBlobContainerUri)}
226+
Assert-AreEqual $serverUpdated.AsAdministrators.Count 2
227+
228+
# Disable Backup
229+
$serverUpdated = Set-AzureRmAnalysisServicesServer -Name $serverName -DisableBackup -PassThru
230+
Assert-True {[string]::IsNullOrEmpty($serverUpdated.BackupBlobContainerUri)}
231+
232+
# Delete Analysis Servicesserver
233+
Remove-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName -PassThru
234+
}
235+
finally
236+
{
237+
# cleanup the resource group that was used in case it still exists. This is a best effort task, we ignore failures here.
238+
Invoke-HandledCmdlet -Command {Remove-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName -ErrorAction SilentlyContinue} -IgnoreFailures
239+
Invoke-HandledCmdlet -Command {Remove-AzureRmResourceGroup -Name $resourceGroupName -ErrorAction SilentlyContinue} -IgnoreFailures
240+
}
241+
}
242+
177243
<#
178244
.SYNOPSIS
179245
Tests Analysis Services server lifecycle Failure scenarios (Create, Update, Get, Delete).
@@ -182,7 +248,8 @@ function Test-NegativeAnalysisServicesServer
182248
{
183249
param
184250
(
185-
$fakeserverName = "psfakeservertest"
251+
$fakeserverName = "psfakeservertest",
252+
$invalidSku = "INVALID"
186253
)
187254

188255
try
@@ -193,12 +260,12 @@ function Test-NegativeAnalysisServicesServer
193260
$serverName = Get-AnalysisServicesServerName
194261
New-AzureRmResourceGroup -Name $resourceGroupName -Location $location
195262
$serverCreated = New-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName -Location $location -Sku 'S1' -Administrator '[email protected],[email protected]'
196-
263+
197264
Assert-AreEqual $serverName $serverCreated.Name
198265
Assert-AreEqual $location $serverCreated.Location
199266
Assert-AreEqual "Microsoft.AnalysisServices/servers" $serverCreated.Type
200267
Assert-True {$serverCreated.Id -like "*$resourceGroupName*"}
201-
268+
202269
# attempt to recreate the already created server
203270
Assert-Throws {New-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName -Location $location}
204271

@@ -209,6 +276,12 @@ function Test-NegativeAnalysisServicesServer
209276
# attempt to get a non-existent server
210277
Assert-Throws {Get-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $fakeserverName}
211278

279+
# attempt to create a server with invalid Sku
280+
Assert-Throws {New-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $fakeserverName -Location $location -Sku $invalidSku -Administrator '[email protected],[email protected]'}
281+
282+
# attempt to scale a server to invalid Sku
283+
Assert-Throws {Set-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName -Sku $invalidSku}
284+
212285
# Delete Analysis Servicesserver
213286
Remove-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName -PassThru
214287

@@ -237,7 +310,7 @@ function Test-AnalysisServicesServerLogExport
237310
{
238311
param
239312
(
240-
$rolloutEnvironment = $env.ASAZURE_TEST_ROLLOUT
313+
$rolloutEnvironment = $env:ASAZURE_TEST_ROLLOUT
241314
)
242315
try
243316
{
@@ -246,12 +319,13 @@ function Test-AnalysisServicesServerLogExport
246319
$serverName = Get-AnalysisServicesServerName
247320
New-AzureRmResourceGroup -Name $resourceGroupName -Location $location
248321

249-
$serverCreated = New-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName -Location $location -Sku 'S1' -Administrators '[email protected],[email protected]'
322+
$serverCreated = New-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName -Location $location -Sku 'S1' -Administrators $env:ASAZURE_TEST_ADMUSERS
250323
Assert-True {$serverCreated.ProvisioningState -like "Succeeded"}
251324
Assert-True {$serverCreated.State -like "Succeeded"}
252325

253-
$secpasswd = ConvertTo-SecureString $env.ASAZURE_TESTUSER_PWD -AsPlainText -Force
254-
$cred = New-Object System.Management.Automation.PSCredential ('[email protected]', $secpasswd)
326+
$secpasswd = ConvertTo-SecureString $env:ASAZURE_TESTUSER_PWD -AsPlainText -Force
327+
$admuser0 = $env:ASAZURE_TEST_ADMUSERS.Split(',')[0]
328+
$cred = New-Object System.Management.Automation.PSCredential ($admuser0, $secpasswd)
255329
$asAzureProfile = Login-AzureAsAccount -RolloutEnvironment $rolloutEnvironment -Credential $cred
256330
Assert-NotNull $asAzureProfile "Login-AzureAsAccount $rolloutEnvironment must not return null"
257331

@@ -275,14 +349,15 @@ function Test-AnalysisServicesServerLogExport
275349
.SYNOPSIS
276350
Tests Analysis Services server Login and restart.
277351
In order to run this test successfully, Following environment variables need to be set.
278-
ASAZURE_TEST_ROLLOUT e.x. value 'aspaaswestusloop1.asazure-int.windows.net'
279-
ASAZURE_TESTUSER_PWD e.x. value 'samplepwd'
352+
ASAZURE_TEST_ROLLOUT e.x. value 'aspaasnightly1.asazure-int.windows.net'
353+
ASAZURE_TESTUSER_PWD e.x. value 'aztest0password'
354+
ASAZURE_TEST_ADMUSERS e.x. value '[email protected],[email protected]'
280355
#>
281356
function Test-AnalysisServicesServerRestart
282357
{
283358
param
284359
(
285-
$rolloutEnvironment = $env.ASAZURE_TEST_ROLLOUT
360+
$rolloutEnvironment = $env:ASAZURE_TEST_ROLLOUT
286361
)
287362
try
288363
{
@@ -292,25 +367,20 @@ function Test-AnalysisServicesServerRestart
292367
$serverName = Get-AnalysisServicesServerName
293368
New-AzureRmResourceGroup -Name $resourceGroupName -Location $location
294369

295-
$serverCreated = New-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName -Location $location -Sku 'S1' -Administrators '[email protected],[email protected]'
370+
$serverCreated = New-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName -Location $location -Sku 'S1' -Administrator $env:ASAZURE_TEST_ADMUSERS
296371
Assert-True {$serverCreated.ProvisioningState -like "Succeeded"}
297372
Assert-True {$serverCreated.State -like "Succeeded"}
298373

299374
$asAzureProfile = Login-AzureAsAccount -RolloutEnvironment $rolloutEnvironment
300375
Assert-NotNull $asAzureProfile "Login-AzureAsAccount $rolloutEnvironment must not return null"
301376

302-
$secpasswd = ConvertTo-SecureString $env.ASAZURE_TESTUSER_PWD -AsPlainText -Force
303-
$cred = New-Object System.Management.Automation.PSCredential ('[email protected]', $secpasswd)
377+
$secpasswd = ConvertTo-SecureString $env:ASAZURE_TESTUSER_PWD -AsPlainText -Force
378+
$admuser0 = $env:ASAZURE_TEST_ADMUSERS.Split(',')[0]
379+
$cred = New-Object System.Management.Automation.PSCredential ($admuser0, $secpasswd)
304380

305381
$asAzureProfile = Login-AzureAsAccount -RolloutEnvironment $rolloutEnvironment -Credential $cred
306382
Assert-NotNull $asAzureProfile "Login-AzureAsAccount $rolloutEnvironment must not return null"
307-
Restart-AzureAsInstance -Instance $serverName
308-
309-
$asAzureProfile = Login-AzureAsAccount
310-
Assert-NotNull $asAzureProfile "Login-AzureAsAccount for empty rolloutname must not return null"
311-
312-
$asAzureProfile = Login-AzureAsAccount -Credential $cred
313-
Assert-NotNull $asAzureProfile "Login-AzureAsAccount for empty rolloutname must not return null"
383+
Assert-True { Restart-AzureAsInstance -Instance $serverName -PassThru }
314384

315385
$rolloutEnvironment = 'asazure-int.windows.net'
316386
$asAzureProfile = Login-AzureAsAccount $rolloutEnvironment
@@ -319,6 +389,7 @@ function Test-AnalysisServicesServerRestart
319389
$rolloutEnvironment = 'asazure.windows.net'
320390
$asAzureProfile = Login-AzureAsAccount $rolloutEnvironment
321391
Assert-NotNull $asAzureProfile "Login-AzureAsAccount $rolloutEnvironment must not return null"
392+
322393
}
323394
finally
324395
{

0 commit comments

Comments
 (0)