Skip to content

Commit 15a8f48

Browse files
Fix tests
1 parent 2c31b74 commit 15a8f48

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

src/StorageSync/StorageSync.Test/ScenarioTests/ServerEndpointTests.ps1

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ function Test-ServerEndpoint2
3737
$storageAccountTenantId = (Get-AzTenant).Id
3838
# NOTE: Check the local server drives where we are performing registration.
3939
$serverLocalPath = "D:\" + $serverEndpointName
40-
$cloudSeededDataFileShareUri = "http://dummy"
40+
$offlineDataTransferShareName = "http://dummy"
4141
$tierFilesOlderThanDays = 10
4242
$volumeFreeSpacePercent = 60
4343
$volumeFreeSpacePercent2 = 80
@@ -85,7 +85,7 @@ function Test-ServerEndpoint2
8585
$registeredServer = get-job -Id $job.Id | receive-job -Keep
8686

8787
Write-Verbose "Resource: $serverEndpointName | Loc: $resourceLocation"
88-
$job = New-AzStorageSyncServerEndpoint -ResourceGroupName $resourceGroupName -StorageSyncServiceName $storageSyncServiceName -SyncGroupName $syncGroupName -Name $serverEndpointName -ServerResourceId $registeredServer.ResourceId -ServerLocalPath $serverLocalPath -CloudTiering -CloudSeededData -VolumeFreeSpacePercent $volumeFreeSpacePercent -CloudSeededDataFileShareUri $cloudSeededDataFileShareUri -TierFilesOlderThanDays $tierFilesOlderThanDays -Verbose -AsJob
88+
$job = New-AzStorageSyncServerEndpoint -ResourceGroupName $resourceGroupName -StorageSyncServiceName $storageSyncServiceName -SyncGroupName $syncGroupName -Name $serverEndpointName -ServerResourceId $registeredServer.ResourceId -ServerLocalPath $serverLocalPath -CloudTiering -OfflineDataTransfer -VolumeFreeSpacePercent $volumeFreeSpacePercent -OfflineDataTransferShareName $offlineDataTransferShareName -TierFilesOlderThanDays $tierFilesOlderThanDays -Verbose -AsJob
8989

9090
$job | Wait-Job
9191
$serverEndpoint = get-job -Id $job.Id | receive-job -Keep
@@ -157,9 +157,9 @@ function Test-ServerEndpoint2
157157
Remove-AzStorageSyncServerEndpoint -Force -ResourceGroupName $resourceGroupName -StorageSyncServiceName $storageSyncServiceName -SyncGroupName $syncGroupName -Name $serverEndpointName -AsJob | Wait-Job
158158

159159
Write-Verbose "Executing Piping Scenarios"
160-
New-AzStorageSyncServerEndpoint -ParentObject $syncGroup -Name $serverEndpointName -ServerResourceId $registeredServer.ResourceId -ServerLocalPath $serverLocalPath -CloudTiering -CloudSeededData -VolumeFreeSpacePercent $volumeFreeSpacePercent -CloudSeededDataFileShareUri $cloudSeededDataFileShareUri -TierFilesOlderThanDays $tierFilesOlderThanDays | Get-AzStorageSyncServerEndpoint | Remove-AzStorageSyncServerEndpoint -Force -AsJob | Wait-Job
160+
New-AzStorageSyncServerEndpoint -ParentObject $syncGroup -Name $serverEndpointName -ServerResourceId $registeredServer.ResourceId -ServerLocalPath $serverLocalPath -CloudTiering -OfflineDataTransfer -VolumeFreeSpacePercent $volumeFreeSpacePercent -OfflineDataTransferShareName $offlineDataTransferShareName -TierFilesOlderThanDays $tierFilesOlderThanDays | Get-AzStorageSyncServerEndpoint | Remove-AzStorageSyncServerEndpoint -Force -AsJob | Wait-Job
161161

162-
New-AzStorageSyncServerEndpoint -ParentResourceId $syncGroup.ResourceId -Name $serverEndpointName -ServerResourceId $registeredServer.ResourceId -ServerLocalPath $serverLocalPath -CloudTiering -CloudSeededData -VolumeFreeSpacePercent $volumeFreeSpacePercent -CloudSeededDataFileShareUri $cloudSeededDataFileShareUri -TierFilesOlderThanDays $tierFilesOlderThanDays | Remove-AzStorageSyncServerEndpoint -Force -AsJob | Wait-Job
162+
New-AzStorageSyncServerEndpoint -ParentResourceId $syncGroup.ResourceId -Name $serverEndpointName -ServerResourceId $registeredServer.ResourceId -ServerLocalPath $serverLocalPath -CloudTiering -OfflineDataTransfer -VolumeFreeSpacePercent $volumeFreeSpacePercent -OfflineDataTransferShareName $offlineDataTransferShareName -TierFilesOlderThanDays $tierFilesOlderThanDays | Remove-AzStorageSyncServerEndpoint -Force -AsJob | Wait-Job
163163

164164
Write-Verbose "Unregister Server: $($registeredServer.ServerId)"
165165
Unregister-AzStorageSyncServer -Force -ResourceGroupName $resourceGroupName -StorageSyncServiceName $storageSyncServiceName -ServerId $registeredServer.ServerId -AsJob | Wait-Job
@@ -210,7 +210,7 @@ function Test-ServerEndpoint
210210
$storageAccountTenantId = (Get-AzTenant).Id
211211
# NOTE: Check the local server drives where we are performing registration.
212212
$serverLocalPath = "D:\" + $serverEndpointName
213-
$cloudSeededDataFileShareUri = "http://dummy"
213+
$offlineDataTransferShareName = "http://dummy"
214214
$tierFilesOlderThanDays = 10
215215
$volumeFreeSpacePercent = 60
216216
$volumeFreeSpacePercent2 = 80
@@ -258,7 +258,7 @@ function Test-ServerEndpoint
258258
$registeredServer = get-job -Id $job.Id | receive-job -Keep
259259

260260
Write-Verbose "Resource: $serverEndpointName | Loc: $resourceLocation"
261-
$job = New-AzStorageSyncServerEndpoint -ResourceGroupName $resourceGroupName -StorageSyncServiceName $storageSyncServiceName -SyncGroupName $syncGroupName -Name $serverEndpointName -ServerResourceId $registeredServer.ResourceId -ServerLocalPath $serverLocalPath -CloudTiering -CloudSeededData -VolumeFreeSpacePercent $volumeFreeSpacePercent -CloudSeededDataFileShareUri $cloudSeededDataFileShareUri -TierFilesOlderThanDays $tierFilesOlderThanDays -Verbose -AsJob
261+
$job = New-AzStorageSyncServerEndpoint -ResourceGroupName $resourceGroupName -StorageSyncServiceName $storageSyncServiceName -SyncGroupName $syncGroupName -Name $serverEndpointName -ServerResourceId $registeredServer.ResourceId -ServerLocalPath $serverLocalPath -CloudTiering -OfflineDataTransfer -VolumeFreeSpacePercent $volumeFreeSpacePercent -OfflineDataTransferShareName $offlineDataTransferShareName -TierFilesOlderThanDays $tierFilesOlderThanDays -Verbose -AsJob
262262

263263
$job | Wait-Job
264264
$serverEndpoint = get-job -Id $job.Id | receive-job -Keep

src/StorageSync/StorageSync/CloudEndpoint/GetCloudEndpointCommand.cs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,14 @@ public override void ExecuteCmdlet()
123123

124124
ExecuteClientAction(() =>
125125
{
126-
var parentResourceIdentifier = new ResourceIdentifier(ParentResourceId);
127-
if (!string.Equals(StorageSyncConstants.SyncGroupType, parentResourceIdentifier.ResourceType, System.StringComparison.OrdinalIgnoreCase))
126+
var parentResourceIdentifier = default(ResourceIdentifier);
127+
if (!string.IsNullOrEmpty(ParentResourceId))
128128
{
129-
throw new PSArgumentException(StorageSyncResources.MissingParentResourceIdErrorMessage);
129+
parentResourceIdentifier = new ResourceIdentifier(ParentResourceId);
130+
if (!string.Equals(StorageSyncConstants.SyncGroupType, parentResourceIdentifier.ResourceType, System.StringComparison.OrdinalIgnoreCase))
131+
{
132+
throw new PSArgumentException(StorageSyncResources.MissingParentResourceIdErrorMessage);
133+
}
130134
}
131135

132136
string resourceGroupName = ResourceGroupName ?? ParentObject?.ResourceGroupName ?? parentResourceIdentifier.ResourceGroupName;

0 commit comments

Comments
 (0)