Skip to content

Commit 0acc720

Browse files
markcowlshpimpal
markcowl
authored and
shpimpal
committed
Merge pull request Azure#8976 from anpint/updates-2019-02-01
Az.StorageSync update for 2019-02-01 API version
2 parents be67265 + 794982c commit 0acc720

File tree

64 files changed

+10919
-12133
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+10919
-12133
lines changed

‎src/StorageSync/StorageSync.Test/ScenarioTests/CloudEndpointTests.ps1

Lines changed: 28 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,14 @@ function Test-CloudEndpoint
2929
$storageSyncServiceName = Get-ResourceName("sss")
3030
$syncGroupName = Get-ResourceName("sg")
3131
$cloudEndpointName = Get-ResourceName("cep")
32+
$resourceGroupLocation = Get-ResourceGroupLocation
3233
$resourceLocation = Get-StorageSyncLocation("Microsoft.StorageSync/storageSyncServices")
3334
$AzureFileShareName = "testfs" #Get-ResourceName("fs")
3435
$StorageAccountName = Get-ResourceName("sa")
3536
$StorageAccountTenantId = (Get-AzTenant).Id
3637

37-
Write-Verbose "RGName: $resourceGroupName | Loc: $resourceLocation | Type : ResourceGroup"
38-
New-AzResourceGroup -Name $resourceGroupName -Location $resourceLocation;
38+
Write-Verbose "RGName: $resourceGroupName | Loc: $resourceGroupLocation | Type : ResourceGroup"
39+
New-AzResourceGroup -Name $resourceGroupName -Location $resourceGroupLocation;
3940

4041
Write-Verbose "Resource: $storageSyncServiceName | Loc: $resourceLocation | Type : StorageSyncService"
4142
New-AzStorageSyncService -ResourceGroupName $resourceGroupName -Location $resourceLocation -StorageSyncServiceName $storageSyncServiceName
@@ -134,13 +135,14 @@ function Test-NewCloudEndpoint
134135
$storageSyncServiceName = Get-ResourceName("sss")
135136
$syncGroupName = Get-ResourceName("sg")
136137
$cloudEndpointName = Get-ResourceName("cep")
138+
$resourceGroupLocation = Get-ResourceGroupLocation
137139
$resourceLocation = Get-StorageSyncLocation("Microsoft.StorageSync/storageSyncServices")
138140
$AzureFileShareName = "testfs" #Get-StorageManagementTestResourceName
139141
$StorageAccountName = Get-ResourceName("sa")
140142
$StorageAccountTenantId = (Get-AzTenant).Id
141143

142-
Write-Verbose "RGName: $resourceGroupName | Loc: $resourceLocation | Type : ResourceGroup"
143-
New-AzResourceGroup -Name $resourceGroupName -Location $resourceLocation;
144+
Write-Verbose "RGName: $resourceGroupName | Loc: $resourceGroupLocation | Type : ResourceGroup"
145+
New-AzResourceGroup -Name $resourceGroupName -Location $resourceGroupLocation;
144146

145147
Write-Verbose "Resource: $storageSyncServiceName | Loc: $resourceLocation | Type : StorageSyncService"
146148
New-AzStorageSyncService -ResourceGroupName $resourceGroupName -Location $resourceLocation -StorageSyncServiceName $storageSyncServiceName
@@ -192,7 +194,7 @@ function Test-NewCloudEndpoint
192194
{
193195
# Cleanup
194196
Write-Verbose "Removing ResourceGroup : $resourceGroupName"
195-
Clean-ResourceGroup $resourceGroupName
197+
Clean-ResourceGroup $resourceGroupName
196198
}
197199
}
198200

@@ -213,13 +215,14 @@ function Test-GetCloudEndpoint
213215
$storageSyncServiceName = Get-ResourceName("sss")
214216
$syncGroupName = Get-ResourceName("sg")
215217
$cloudEndpointName = Get-ResourceName("cep")
218+
$resourceGroupLocation = Get-ResourceGroupLocation
216219
$resourceLocation = Get-StorageSyncLocation("Microsoft.StorageSync/storageSyncServices")
217220
$AzureFileShareName = "testfs" #Get-StorageManagementTestResourceName
218221
$StorageAccountName = Get-ResourceName("sa")
219222
$StorageAccountTenantId = (Get-AzTenant).Id
220223

221-
Write-Verbose "RGName: $resourceGroupName | Loc: $resourceLocation | Type : ResourceGroup"
222-
New-AzResourceGroup -Name $resourceGroupName -Location $resourceLocation;
224+
Write-Verbose "RGName: $resourceGroupName | Loc: $resourceGroupLocation | Type : ResourceGroup"
225+
New-AzResourceGroup -Name $resourceGroupName -Location $resourceGroupLocation;
223226

224227
Write-Verbose "Resource: $storageSyncServiceName | Loc: $resourceLocation | Type : StorageSyncService"
225228
New-AzStorageSyncService -ResourceGroupName $resourceGroupName -Location $resourceLocation -StorageSyncServiceName $storageSyncServiceName
@@ -299,13 +302,14 @@ function Test-GetCloudEndpoints
299302
$storageSyncServiceName = Get-ResourceName("sss")
300303
$syncGroupName = Get-ResourceName("sg")
301304
$cloudEndpointName = Get-ResourceName("cep")
305+
$resourceGroupLocation = Get-ResourceGroupLocation
302306
$resourceLocation = Get-StorageSyncLocation("Microsoft.StorageSync/storageSyncServices")
303307
$AzureFileShareName = "testfs" #Get-StorageManagementTestResourceName
304308
$StorageAccountName = Get-ResourceName("sa")
305309
$StorageAccountTenantId = (Get-AzTenant).Id
306310

307-
Write-Verbose "RGName: $resourceGroupName | Loc: $resourceLocation | Type : ResourceGroup"
308-
New-AzResourceGroup -Name $resourceGroupName -Location $resourceLocation;
311+
Write-Verbose "RGName: $resourceGroupName | Loc: $resourceGroupLocation | Type : ResourceGroup"
312+
New-AzResourceGroup -Name $resourceGroupName -Location $resourceGroupLocation;
309313

310314
Write-Verbose "Resource: $storageSyncServiceName | Loc: $resourceLocation | Type : StorageSyncService"
311315
New-AzStorageSyncService -ResourceGroupName $resourceGroupName -Location $resourceLocation -StorageSyncServiceName $storageSyncServiceName
@@ -387,13 +391,14 @@ function Test-GetCloudEndpointParentObject
387391
$storageSyncServiceName = Get-ResourceName("sss")
388392
$syncGroupName = Get-ResourceName("sg")
389393
$cloudEndpointName = Get-ResourceName("cep")
394+
$resourceGroupLocation = Get-ResourceGroupLocation
390395
$resourceLocation = Get-StorageSyncLocation("Microsoft.StorageSync/storageSyncServices")
391396
$AzureFileShareName = "testfs" #Get-StorageManagementTestResourceName
392397
$StorageAccountName = Get-ResourceName("sa")
393398
$StorageAccountTenantId = (Get-AzTenant).Id
394399

395-
Write-Verbose "RGName: $resourceGroupName | Loc: $resourceLocation | Type : ResourceGroup"
396-
New-AzResourceGroup -Name $resourceGroupName -Location $resourceLocation;
400+
Write-Verbose "RGName: $resourceGroupName | Loc: $resourceGroupLocation | Type : ResourceGroup"
401+
New-AzResourceGroup -Name $resourceGroupName -Location $resourceGroupLocation;
397402

398403
Write-Verbose "Resource: $storageSyncServiceName | Loc: $resourceLocation | Type : StorageSyncService"
399404
New-AzStorageSyncService -ResourceGroupName $resourceGroupName -Location $resourceLocation -StorageSyncServiceName $storageSyncServiceName
@@ -471,13 +476,14 @@ function Test-GetCloudEndpointParentResourceId
471476
$storageSyncServiceName = Get-ResourceName("sss")
472477
$syncGroupName = Get-ResourceName("sg")
473478
$cloudEndpointName = Get-ResourceName("cep")
479+
$resourceGroupLocation = Get-ResourceGroupLocation
474480
$resourceLocation = Get-StorageSyncLocation("Microsoft.StorageSync/storageSyncServices")
475481
$AzureFileShareName = "testfs" #Get-StorageManagementTestResourceName
476482
$StorageAccountName = Get-ResourceName("sa")
477483
$StorageAccountTenantId = (Get-AzTenant).Id
478484

479-
Write-Verbose "RGName: $resourceGroupName | Loc: $resourceLocation | Type : ResourceGroup"
480-
New-AzResourceGroup -Name $resourceGroupName -Location $resourceLocation;
485+
Write-Verbose "RGName: $resourceGroupName | Loc: $resourceGroupLocation | Type : ResourceGroup"
486+
New-AzResourceGroup -Name $resourceGroupName -Location $resourceGroupLocation;
481487

482488
Write-Verbose "Resource: $storageSyncServiceName | Loc: $resourceLocation | Type : StorageSyncService"
483489
New-AzStorageSyncService -ResourceGroupName $resourceGroupName -Location $resourceLocation -StorageSyncServiceName $storageSyncServiceName
@@ -555,13 +561,14 @@ function Test-RemoveCloudEndpoint
555561
$storageSyncServiceName = Get-ResourceName("sss")
556562
$syncGroupName = Get-ResourceName("sg")
557563
$cloudEndpointName = Get-ResourceName("cep")
564+
$resourceGroupLocation = Get-ResourceGroupLocation
558565
$resourceLocation = Get-StorageSyncLocation("Microsoft.StorageSync/storageSyncServices")
559566
$AzureFileShareName = "testfs" #Get-StorageManagementTestResourceName
560567
$StorageAccountName = Get-ResourceName("sa")
561568
$StorageAccountTenantId = (Get-AzTenant).Id
562569

563-
Write-Verbose "RGName: $resourceGroupName | Loc: $resourceLocation | Type : ResourceGroup"
564-
New-AzResourceGroup -Name $resourceGroupName -Location $resourceLocation;
570+
Write-Verbose "RGName: $resourceGroupName | Loc: $resourceGroupLocation | Type : ResourceGroup"
571+
New-AzResourceGroup -Name $resourceGroupName -Location $resourceGroupLocation;
565572

566573
Write-Verbose "Resource: $storageSyncServiceName | Loc: $resourceLocation | Type : StorageSyncService"
567574
New-AzStorageSyncService -ResourceGroupName $resourceGroupName -Location $resourceLocation -StorageSyncServiceName $storageSyncServiceName
@@ -635,13 +642,14 @@ function Test-RemoveCloudEndpointInputObject
635642
$storageSyncServiceName = Get-ResourceName("sss")
636643
$syncGroupName = Get-ResourceName("sg")
637644
$cloudEndpointName = Get-ResourceName("cep")
645+
$resourceGroupLocation = Get-ResourceGroupLocation
638646
$resourceLocation = Get-StorageSyncLocation("Microsoft.StorageSync/storageSyncServices")
639647
$AzureFileShareName = "testfs" #Get-StorageManagementTestResourceName
640648
$StorageAccountName = Get-ResourceName("sa")
641649
$StorageAccountTenantId = (Get-AzTenant).Id
642650

643-
Write-Verbose "RGName: $resourceGroupName | Loc: $resourceLocation | Type : ResourceGroup"
644-
New-AzResourceGroup -Name $resourceGroupName -Location $resourceLocation;
651+
Write-Verbose "RGName: $resourceGroupName | Loc: $resourceGroupLocation | Type : ResourceGroup"
652+
New-AzResourceGroup -Name $resourceGroupName -Location $resourceGroupLocation;
645653

646654
Write-Verbose "Resource: $storageSyncServiceName | Loc: $resourceLocation | Type : StorageSyncService"
647655
New-AzStorageSyncService -ResourceGroupName $resourceGroupName -Location $resourceLocation -StorageSyncServiceName $storageSyncServiceName
@@ -708,13 +716,14 @@ function Test-RemoveCloudEndpointResourceId
708716
$storageSyncServiceName = Get-ResourceName("sss")
709717
$syncGroupName = Get-ResourceName("sg")
710718
$cloudEndpointName = Get-ResourceName("cep")
719+
$resourceGroupLocation = Get-ResourceGroupLocation
711720
$resourceLocation = Get-StorageSyncLocation("Microsoft.StorageSync/storageSyncServices")
712721
$AzureFileShareName = "testfs" #Get-StorageManagementTestResourceName
713722
$StorageAccountName = Get-ResourceName("sa")
714723
$StorageAccountTenantId = (Get-AzTenant).Id
715724

716-
Write-Verbose "RGName: $resourceGroupName | Loc: $resourceLocation | Type : ResourceGroup"
717-
New-AzResourceGroup -Name $resourceGroupName -Location $resourceLocation;
725+
Write-Verbose "RGName: $resourceGroupName | Loc: $resourceGroupLocation | Type : ResourceGroup"
726+
New-AzResourceGroup -Name $resourceGroupName -Location $resourceGroupLocation;
718727

719728
Write-Verbose "Resource: $storageSyncServiceName | Loc: $resourceLocation | Type : StorageSyncService"
720729
New-AzStorageSyncService -ResourceGroupName $resourceGroupName -Location $resourceLocation -StorageSyncServiceName $storageSyncServiceName

‎src/StorageSync/StorageSync.Test/ScenarioTests/Common.ps1

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ Gets the default location for a provider
176176
#>
177177
function Get-StorageSyncLocation($provider)
178178
{
179-
$defaultLocation = "West Central US"
179+
$defaultLocation = "Central US EUAP"
180180
if ([Microsoft.Azure.Test.HttpRecorder.HttpMockServer]::Mode -ne [Microsoft.Azure.Test.HttpRecorder.HttpRecorderMode]::Playback)
181181
{
182182
$namespace = $provider.Split("/")[0]
@@ -200,6 +200,15 @@ function Get-StorageSyncLocation($provider)
200200
return $defaultLocation
201201
}
202202

203+
<#
204+
.SYNOPSIS
205+
Gets the default location for a resource group
206+
#>
207+
function Get-ResourceGroupLocation()
208+
{
209+
return Get-Location -providerNamespace "Microsoft.Resources" -resourceType "resourceGroups" -preferredLocation "West US"
210+
}
211+
203212
<#
204213
.SYNOPSIS
205214
Normalize Location

0 commit comments

Comments
 (0)