Skip to content

Commit f0a4cd0

Browse files
deathly809deathly809
committed
Fixed tests
1 parent b73c607 commit f0a4cd0

File tree

5 files changed

+21
-21
lines changed

5 files changed

+21
-21
lines changed

‎src/StackAdmin/Azs.Backup.Admin/Tests/SessionRecords/BackupAdminClient/TestUpdateBackupLocation.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
"RequestUri": "/subscriptions/8158498d-27b1-4ccf-9aa1-de0f925731e6/resourcegroups/System.local/providers/Microsoft.Backup.Admin/backupLocations/local?api-version=2016-05-01",
6969
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvODE1ODQ5OGQtMjdiMS00Y2NmLTlhYTEtZGUwZjkyNTczMWU2L3Jlc291cmNlZ3JvdXBzL1N5c3RlbS5sb2NhbC9wcm92aWRlcnMvTWljcm9zb2Z0LkJhY2t1cC5BZG1pbi9iYWNrdXBMb2NhdGlvbnMvbG9jYWw/YXBpLXZlcnNpb249MjAxNi0wNS0wMQ==",
7070
"RequestMethod": "PUT",
71-
"RequestBody": "{\r\n \"properties\": {\r\n \"externalStoreDefault\": {\r\n \"path\": \"\\\\\\\\su1fileserver\\\\SU1_Infrastructure_3\",\r\n \"userName\": \"AzureStack\\\\AzureStackAdmin\",\r\n \"password\": \"password\",\r\n \"encryptionKeyBase64\": \"YVVOa0J3S2xTamhHZ1lyRU9wQ1pKQ0xWanhjaHlkaU5ZQnNDeHRPTGFQenJKdWZsRGtYT25oYmlaa1RMVWFKeQ==\",\r\n \"backupFrequencyInHours\": \"\",\r\n \"availableCapacity\": \"10GB\",\r\n \"isBackupSchedulerEnabled\": false\r\n }\r\n },\r\n \"location\": \"local\",\r\n \"tags\": {}\r\n}",
71+
"RequestBody": "{\r\n \"properties\": {\r\n \"externalStoreDefault\": {\r\n \"path\": \"\\\\\\\\192.168.1.1\\\\Share\",\r\n \"userName\": \"AzureStack\\\\AzureStackAdmin\",\r\n \"password\": \"password\",\r\n \"encryptionKeyBase64\": \"YVVOa0J3S2xTamhHZ1lyRU9wQ1pKQ0xWanhjaHlkaU5ZQnNDeHRPTGFQenJKdWZsRGtYT25oYmlaa1RMVWFKeQ==\",\r\n \"backupFrequencyInHours\": \"\",\r\n \"availableCapacity\": \"10GB\",\r\n \"isBackupSchedulerEnabled\": false\r\n }\r\n },\r\n \"location\": \"local\",\r\n \"tags\": {}\r\n}",
7272
"RequestHeaders": {
7373
"Content-Type": [
7474
"application/json; charset=utf-8"
@@ -87,7 +87,7 @@
8787
"Microsoft.AzureStack.Management.Backup.Admin.BackupAdminClient/0.1.0.0"
8888
]
8989
},
90-
"ResponseBody": "{\r\n \"id\": \"/subscriptions/8158498d-27b1-4ccf-9aa1-de0f925731e6/resourcegroups/System.local/providers/Microsoft.Backup.Admin/backupLocations/local\",\r\n \"name\": \"local\",\r\n \"type\": \"Microsoft.Backup.Admin/backupLocations\",\r\n \"location\": \"local\",\r\n \"tags\": {},\r\n \"properties\": {\r\n \"externalStoreDefault\": {\r\n \"path\": \"\\\\\\\\su1fileserver\\\\SU1_Infrastructure_3\",\r\n \"userName\": \"AzureStack\\\\AzureStackAdmin\",\r\n \"password\": \"\",\r\n \"encryptionKeyBase64\": \"\",\r\n \"backupFrequencyInHours\": \"\",\r\n \"availableCapacity\": \"10GB\",\r\n \"isBackupSchedulerEnabled\": false,\r\n \"nextBackupTime\": null,\r\n \"lastBackupTime\": null\r\n }\r\n }\r\n}",
90+
"ResponseBody": "{\r\n \"id\": \"/subscriptions/8158498d-27b1-4ccf-9aa1-de0f925731e6/resourcegroups/System.local/providers/Microsoft.Backup.Admin/backupLocations/local\",\r\n \"name\": \"local\",\r\n \"type\": \"Microsoft.Backup.Admin/backupLocations\",\r\n \"location\": \"local\",\r\n \"tags\": {},\r\n \"properties\": {\r\n \"externalStoreDefault\": {\r\n \"path\": \"\\\\\\\\192.168.1.1\\\\Share\",\r\n \"userName\": \"AzureStack\\\\AzureStackAdmin\",\r\n \"password\": \"\",\r\n \"encryptionKeyBase64\": \"\",\r\n \"backupFrequencyInHours\": \"\",\r\n \"availableCapacity\": \"10GB\",\r\n \"isBackupSchedulerEnabled\": false,\r\n \"nextBackupTime\": null,\r\n \"lastBackupTime\": null\r\n }\r\n }\r\n}",
9191
"ResponseHeaders": {
9292
"Content-Length": [
9393
"523"

‎src/StackAdmin/Azs.Fabric.Admin/Module/Azs.Fabric.Admin/Generated.PowerShell.Commands/SwaggerPathCommands/Start-AzsScaleUnitNode.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,11 @@ function Start-AzsScaleUnitNode {
114114

115115
$FabricAdminClient = New-ServiceClient @NewServiceClient_params
116116

117-
if($Location -ne $null) {
117+
if($Location -eq $null) {
118118
$Location = (Get-AzureRMLocation).Location
119119
}
120120

121-
if($ResourceGroupName -ne $null) {
121+
if($ResourceGroupName -eq $null) {
122122
$ResourceGroupName = "System.$Location"
123123
}
124124

‎src/StackAdmin/Azs.Fabric.Admin/Tests/src/InfraRoleInstance.tests.ps1

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ InModuleScope Azs.Fabric.Admin {
149149

150150
$InfrastructureRoleInstances = Get-AzsInfrastructureRoleInstance -ResourceGroupName $ResourceGroup -Location $Location
151151
foreach($InfrastructureRoleInstance in $InfrastructureRoleInstances) {
152-
Start-AzsInfrastructureRoleInstance -ResourceGroupName $ResourceGroup -Location $Location -Name $InfrastructureRoleInstance.Name
152+
Start-AzsInfrastructureRoleInstance -ResourceGroupName $ResourceGroup -Location $Location -Name $InfrastructureRoleInstance.Name -Force
153153
break
154154
}
155155
}
@@ -159,7 +159,7 @@ InModuleScope Azs.Fabric.Admin {
159159

160160
$InfrastructureRoleInstances = Get-AzsInfrastructureRoleInstance -ResourceGroupName $ResourceGroup -Location $Location
161161
foreach($InfrastructureRoleInstance in $InfrastructureRoleInstances) {
162-
Start-AzsInfrastructureRoleInstance -ResourceGroupName $ResourceGroup -Location $Location -Name $InfrastructureRoleInstance.Name
162+
Start-AzsInfrastructureRoleInstance -ResourceGroupName $ResourceGroup -Location $Location -Name $InfrastructureRoleInstance.Name -Force
163163
}
164164
}
165165

@@ -176,21 +176,21 @@ InModuleScope Azs.Fabric.Admin {
176176
It "TestInfrastructureRoleInstanceShutdownOnTenantVM" {
177177
$global:TestName = 'TestInfrastructureRoleInstanceShutdownOnTenantVM'
178178
{
179-
Disable-AzsInfrastructureRoleInstance -ResourceGroupName $ResourceGroup -Location $Location -Name $TenantVMName
179+
Disable-AzsInfrastructureRoleInstance -ResourceGroupName $ResourceGroup -Location $Location -Name $TenantVMName -Force
180180
} | Should Throw
181181
}
182182

183183
It "TestInfrastructureRoleInstanceRebootOnTenantVM" {
184184
$global:TestName = 'TestInfrastructureRoleInstanceRebootOnTenantVM'
185185
{
186-
ReStart-AzsInfrastructureRoleInstance -ResourceGroupName $ResourceGroup -Location $Location -Name $TenantVMName
186+
Restart-AzsInfrastructureRoleInstance -ResourceGroupName $ResourceGroup -Location $Location -Name $TenantVMName -Force
187187
} | Should Throw
188188
}
189189

190190
It "TestInfrastructureRoleInstancePowerOffOnTenantVM" {
191191
$global:TestName = 'TestInfrastructureRoleInstancePowerOffOnTenantVM'
192192
{
193-
Stop-AzsInfrastructureRoleInstance -ResourceGroupName $ResourceGroup -Location $Location -Name $TenantVMName
193+
Stop-AzsInfrastructureRoleInstance -ResourceGroupName $ResourceGroup -Location $Location -Name $TenantVMName -Force
194194
} | Should Throw
195195
}
196196

@@ -202,7 +202,7 @@ InModuleScope Azs.Fabric.Admin {
202202

203203
$InfrastructureRoleInstances = Get-AzsInfrastructureRoleInstance -ResourceGroupName $ResourceGroup -Location $Location
204204
foreach($InfrastructureRoleInstance in $InfrastructureRoleInstances) {
205-
Disable-AzsInfrastructureRoleInstance -ResourceGroupName $ResourceGroup -Location $Location -Name $InfrastructureRoleInstance.Name
205+
Disable-AzsInfrastructureRoleInstance -ResourceGroupName $ResourceGroup -Location $Location -Name $InfrastructureRoleInstance.Name -Force
206206
break
207207
}
208208
}
@@ -212,7 +212,7 @@ InModuleScope Azs.Fabric.Admin {
212212

213213
$InfrastructureRoleInstances = Get-AzsInfrastructureRoleInstance -ResourceGroupName $ResourceGroup -Location $Location
214214
foreach($InfrastructureRoleInstance in $InfrastructureRoleInstances) {
215-
Stop-AzsInfrastructureRoleInstance -ResourceGroupName $ResourceGroup -Location $Location -Name $InfrastructureRoleInstance.Name
215+
Stop-AzsInfrastructureRoleInstance -ResourceGroupName $ResourceGroup -Location $Location -Name $InfrastructureRoleInstance.Name -Force
216216
break
217217
}
218218
}
@@ -222,7 +222,7 @@ InModuleScope Azs.Fabric.Admin {
222222

223223
$InfrastructureRoleInstances = Get-AzsInfrastructureRoleInstance -ResourceGroupName $ResourceGroup -Location $Location
224224
foreach($InfrastructureRoleInstance in $InfrastructureRoleInstances) {
225-
ReStart-AzsInfrastructureRoleInstance -ResourceGroupName $ResourceGroup -Location $Location -Name $InfrastructureRoleInstance.Name
225+
Restart-AzsInfrastructureRoleInstance -ResourceGroupName $ResourceGroup -Location $Location -Name $InfrastructureRoleInstance.Name -Force
226226
break
227227
}
228228
}

‎src/StackAdmin/Azs.Fabric.Admin/Tests/src/IpPool.tests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ InModuleScope Azs.Fabric.Admin {
148148

149149

150150
$params = @($Location, $ResourceGroup, $Name, $StartIpAddress, $EndIpAddress, $AddressPrefix)
151-
$ipPool = New-AzsIpPool @params
151+
$ipPool = New-AzsIpPool @params -Force
152152

153153
$ipPool | Should not be $null
154154
}

‎src/StackAdmin/Azs.Fabric.Admin/Tests/src/ScaleUnitNode.tests.ps1

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ InModuleScope Azs.Fabric.Admin {
160160
$ScaleUnitNodes = Get-AzsScaleUnitNode -ResourceGroupName $ResourceGroup -Location $Location
161161
foreach($ScaleUnitNode in $ScaleUnitNodes) {
162162

163-
Start-AzsScaleUnitNode -ResourceGroupName $ResourceGroup -Location $Location -Name $ScaleUnitNode.Name
163+
Start-AzsScaleUnitNode -ResourceGroupName $ResourceGroup -Location $Location -Name $ScaleUnitNode.Name -Force
164164
break
165165
}
166166
}
@@ -171,8 +171,8 @@ InModuleScope Azs.Fabric.Admin {
171171
$ScaleUnitNodes = Get-AzsScaleUnitNode -ResourceGroupName $ResourceGroup -Location $Location
172172
foreach($ScaleUnitNode in $ScaleUnitNodes) {
173173
{
174-
Disable-AzsScaleUnitNode -ResourceGroupName $ResourceGroup -Location $Location -Name $ScaleUnitNode.Name
175-
Enable-AzsScaleUnitNode -ResourceGroupName $ResourceGroup -Location $Location -Name $ScaleUnitNode.Name
174+
Disable-AzsScaleUnitNode -ResourceGroupName $ResourceGroup -Location $Location -Name $ScaleUnitNode.Name -Force
175+
Enable-AzsScaleUnitNode -ResourceGroupName $ResourceGroup -Location $Location -Name $ScaleUnitNode.Name -Force
176176
} | Should Throw
177177
break
178178
}
@@ -189,7 +189,7 @@ InModuleScope Azs.Fabric.Admin {
189189
It "TestPowerOnOnTenantVM" {
190190
$global:TestName = 'TestPowerOnOnTenantVM'
191191
{
192-
$operationStatus = Start-AzsScaleUnitNode -ResourceGroupName $ResourceGroup -Location $Location -Name $TenantVMName
192+
$operationStatus = Start-AzsScaleUnitNode -ResourceGroupName $ResourceGroup -Location $Location -Name $TenantVMName -Force
193193
$operationStatus.ProvisioningState | Should not be ""
194194
$operationStatus.ProvisioningState | Should be "Failure"
195195
} | Should Throw
@@ -199,7 +199,7 @@ InModuleScope Azs.Fabric.Admin {
199199
$global:TestName = 'TestPowerOffOnTenantVM'
200200

201201
{
202-
$operationStatus = Stop-AzsScaleUnitNode -ResourceGroupName $ResourceGroup -Location $Location -Name $TenantVMName
202+
$operationStatus = Stop-AzsScaleUnitNode -ResourceGroupName $ResourceGroup -Location $Location -Name $TenantVMName -Force
203203
$operationStatus.ProvisioningState | Should not be ""
204204
$operationStatus.ProvisioningState | Should be "Failure"
205205
} | Should Throw
@@ -208,7 +208,7 @@ InModuleScope Azs.Fabric.Admin {
208208
It "TestStartMaintenanceModeOnTenantVM" {
209209
$global:TestName = 'TestStartMaintenanceModeOnTenantVM'
210210
{
211-
$operationStatus = Disable-AzsScaleUnitNode -ResourceGroupName $ResourceGroup -Location $Location -Name $TenantVMName
211+
$operationStatus = Disable-AzsScaleUnitNode -ResourceGroupName $ResourceGroup -Location $Location -Name $TenantVMName -Force
212212
$operationStatus.ProvisioningState | Should not be ""
213213
$operationStatus.ProvisioningState | Should be "Failure"
214214
} | Should Throw
@@ -222,7 +222,7 @@ InModuleScope Azs.Fabric.Admin {
222222

223223
$ScaleUnitNodes = Get-AzsScaleUnitNode -ResourceGroupName $ResourceGroup -Location $Location
224224
foreach($ScaleUnitNode in $ScaleUnitNodes) {
225-
Start-AzsScaleUnitNode -ResourceGroupName $ResourceGroup -Location $Location -Name $ScaleUnitNode.Name
225+
Start-AzsScaleUnitNode -ResourceGroupName $ResourceGroup -Location $Location -Name $ScaleUnitNode.Name -Force
226226
$retrieved | Should Be $null
227227
break
228228
}
@@ -233,7 +233,7 @@ InModuleScope Azs.Fabric.Admin {
233233

234234
$ScaleUnitNodes = Get-AzsScaleUnitNode -ResourceGroupName $ResourceGroup -Location $Location
235235
foreach($ScaleUnitNode in $ScaleUnitNodes) {
236-
$retrieved = Stop-AzsScaleUnitNode -ResourceGroupName $ResourceGroup -Location $Location -Name $ScaleUnitNode.Name
236+
$retrieved = Stop-AzsScaleUnitNode -ResourceGroupName $ResourceGroup -Location $Location -Name $ScaleUnitNode.Name -Force
237237
$retrieved | Should Be $null
238238
break
239239
}

0 commit comments

Comments
 (0)