Skip to content

Commit 308e601

Browse files
cormacpaynecormacpayne
authored
Merge pull request Azure#2986 from corinajacobson/updates
DNS: Updates to PS tests and helpfile
2 parents 9b0504f + e8cc41b commit 308e601

File tree

3 files changed

+405
-276
lines changed

3 files changed

+405
-276
lines changed

‎src/ResourceManager/Dns/Commands.Dns.Test/ScenarioTests/RecordsTests.ps1

Lines changed: 39 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ function Test-RecordSetCrud
8282
Assert-ThrowsLike { Get-AzureRmDnsRecordSet -Name $recordName -ZoneName $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -RecordType A } "*does not exist*"
8383

8484
Remove-AzureRmDnsZone -Name $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -Confirm:$false
85+
Remove-AzureRmResourceGroup -Name $resourceGroup.ResourceGroupName -Force
8586
}
8687

8788
<#
@@ -125,6 +126,7 @@ function Test-RecordSetCrudTrimsDotFromZoneName
125126
Assert-ThrowsLike { Get-AzureRmDnsRecordSet -Name $recordName -ZoneName $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -RecordType A } "*does not exist*"
126127

127128
Remove-AzureRmDnsZone -Name $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -Confirm:$false
129+
Remove-AzureRmResourceGroup -Name $resourceGroup.ResourceGroupName -Force
128130
}
129131

130132
<#
@@ -137,6 +139,7 @@ function Test-RecordSetCrudWithPiping
137139
$recordName = getAssetname
138140
$updatedRecord = TestSetup-CreateResourceGroup | New-AzureRmDnsZone -Name $zoneName | New-AzureRmDnsRecordSet -Name $recordName -Ttl 100 -RecordType A -Metadata @{tag1 = "val1"} | Add-AzureRmDnsRecordConfig -Ipv4Address 13.13.0.13 | Set-AzureRmDnsRecordSet
139141

142+
$resourceGroupName = $updatedRecord.ResourceGroupName
140143
Assert-NotNull $updatedRecord
141144
Assert-NotNull $updatedRecord.Etag
142145
Assert-AreEqual $recordName $updatedRecord.Name
@@ -153,6 +156,7 @@ function Test-RecordSetCrudWithPiping
153156
Assert-ThrowsLike { Get-AzureRmDnsRecordSet -Name $recordName -ZoneName $zoneName -ResourceGroupName $updatedRecord.ResourceGroupName -RecordType A } "*does not exist*"
154157

155158
Remove-AzureRmDnsZone -Name $zoneName -ResourceGroupName $updatedRecord.ResourceGroupName -Confirm:$false
159+
Remove-AzureRmResourceGroup -Name $resourceGroupName -Force
156160
}
157161

158162
<#
@@ -210,6 +214,7 @@ function Test-RecordSetCrudWithPipingTrimsDotFromZoneName
210214
Assert-ThrowsLike { Get-AzureRmDnsRecordSet -Name $recordName -ZoneName $zoneName -ResourceGroupName $updatedRecord.ResourceGroupName -RecordType A } "*does not exist*"
211215

212216
Remove-AzureRmDnsZone -Name $zoneName -ResourceGroupName $zone.ResourceGroupName -Confirm:$false
217+
Remove-AzureRmResourceGroup -Name $zone.ResourceGroupName -Force
213218
}
214219

215220
<#
@@ -247,6 +252,7 @@ function Test-RecordSetA
247252
Assert-True { $removed }
248253

249254
Remove-AzureRmDnsZone -Name $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -Confirm:$false
255+
Remove-AzureRmResourceGroup -Name $resourceGroup.ResourceGroupName -Force
250256
}
251257

252258
<#
@@ -282,6 +288,7 @@ function Test-RecordSetANonEmpty
282288
Assert-True { $removed }
283289

284290
Remove-AzureRmDnsZone -Name $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -Confirm:$false
291+
Remove-AzureRmResourceGroup -Name $resourceGroup.ResourceGroupName -Force
285292
}
286293

287294
<#
@@ -322,6 +329,7 @@ function Test-RecordSetAAAA
322329
Assert-True { $removed }
323330

324331
Remove-AzureRmDnsZone -Name $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -Confirm:$false
332+
Remove-AzureRmResourceGroup -Name $resourceGroup.ResourceGroupName -Force
325333
}
326334

327335
function Test-RecordSetAAAANonEmpty
@@ -347,6 +355,7 @@ function Test-RecordSetAAAANonEmpty
347355
Assert-True { $removed }
348356

349357
Remove-AzureRmDnsZone -Name $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -Confirm:$false
358+
Remove-AzureRmResourceGroup -Name $resourceGroup.ResourceGroupName -Force
350359
}
351360

352361

@@ -385,6 +394,7 @@ function Test-RecordSetCNAME
385394
Assert-True { $removed }
386395

387396
Remove-AzureRmDnsZone -Name $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -Confirm:$false
397+
Remove-AzureRmResourceGroup -Name $resourceGroup.ResourceGroupName -Force
388398
}
389399

390400
function Test-RecordSetCNAMENonEmpty
@@ -407,6 +417,7 @@ function Test-RecordSetCNAMENonEmpty
407417
Assert-True { $removed }
408418

409419
Remove-AzureRmDnsZone -Name $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -Confirm:$false
420+
Remove-AzureRmResourceGroup -Name $resourceGroup.ResourceGroupName -Force
410421
}
411422

412423
<#
@@ -446,6 +457,7 @@ function Test-RecordSetMX
446457
Assert-True { $removed }
447458

448459
Remove-AzureRmDnsZone -Name $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -Confirm:$false
460+
Remove-AzureRmResourceGroup -Name $resourceGroup.ResourceGroupName -Force
449461
}
450462

451463
<#
@@ -474,6 +486,7 @@ function Test-RecordSetMXNonEmpty
474486
Assert-True { $removed }
475487

476488
Remove-AzureRmDnsZone -Name $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -Confirm:$false
489+
Remove-AzureRmResourceGroup -Name $resourceGroup.ResourceGroupName -Force
477490
}
478491

479492
<#
@@ -516,6 +529,7 @@ function Test-RecordSetNS
516529
Assert-True { $removed }
517530

518531
Remove-AzureRmDnsZone -Name $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -Confirm:$false
532+
Remove-AzureRmResourceGroup -Name $resourceGroup.ResourceGroupName -Force
519533
}
520534

521535
function Test-RecordSetNSNonEmpty
@@ -549,6 +563,7 @@ function Test-RecordSetNSNonEmpty
549563
Assert-True { $removed }
550564

551565
Remove-AzureRmDnsZone -Name $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -Confirm:$false
566+
Remove-AzureRmResourceGroup -Name $resourceGroup.ResourceGroupName -Force
552567
}
553568

554569
<#
@@ -589,6 +604,7 @@ function Test-RecordSetTXT
589604
Assert-True { $removed }
590605

591606
Remove-AzureRmDnsZone -Name $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -Confirm:$false
607+
Remove-AzureRmResourceGroup -Name $resourceGroup.ResourceGroupName -Force
592608
}
593609

594610
function Test-RecordSetTXTNonEmpty
@@ -618,6 +634,7 @@ function Test-RecordSetTXTNonEmpty
618634
Assert-True { $removed }
619635

620636
Remove-AzureRmDnsZone -Name $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -Confirm:$false
637+
Remove-AzureRmResourceGroup -Name $resourceGroup.ResourceGroupName -Force
621638
}
622639

623640
function Test-RecordSetTXTLegacyLengthValidation
@@ -642,6 +659,7 @@ function Test-RecordSetTXTLegacyLengthValidation
642659
Assert-AreEqual $maxRecordTxt $getResult.Records[0].Value;
643660

644661
Remove-AzureRmDnsZone -Name $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -Confirm:$false
662+
Remove-AzureRmResourceGroup -Name $resourceGroup.ResourceGroupName -Force
645663
}
646664

647665

@@ -664,6 +682,7 @@ function Test-RecordSetTXTLengthValidation
664682
Assert-AreEqual $maxRecordTxt $getResult.Records[0].Value;
665683

666684
Remove-AzureRmDnsZone -Name $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -Confirm:$false
685+
Remove-AzureRmResourceGroup -Name $resourceGroup.ResourceGroupName -Force
667686
}
668687

669688

@@ -699,6 +718,7 @@ function Test-RecordSetPTR
699718
Assert-True { $removed }
700719

701720
Remove-AzureRmDnsZone -Name $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -Confirm:$false
721+
Remove-AzureRmResourceGroup -Name $resourceGroup.ResourceGroupName -Force
702722
}
703723

704724
function Test-RecordSetPTRNonEmpty
@@ -722,6 +742,7 @@ function Test-RecordSetPTRNonEmpty
722742
Assert-True { $removed }
723743

724744
Remove-AzureRmDnsZone -Name $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -Confirm:$false
745+
Remove-AzureRmResourceGroup -Name $resourceGroup.ResourceGroupName -Force
725746
}
726747

727748
<#
@@ -765,6 +786,7 @@ function Test-RecordSetSRV
765786
Assert-True { $removed }
766787

767788
Remove-AzureRmDnsZone -Name $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -Confirm:$false
789+
Remove-AzureRmResourceGroup -Name $resourceGroup.ResourceGroupName -Force
768790
}
769791

770792
function Test-RecordSetSRVNonEmpty
@@ -792,6 +814,7 @@ function Test-RecordSetSRVNonEmpty
792814
Assert-True { $removed }
793815

794816
Remove-AzureRmDnsZone -Name $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -Confirm:$false
817+
Remove-AzureRmResourceGroup -Name $resourceGroup.ResourceGroupName -Force
795818
}
796819

797820

@@ -841,6 +864,7 @@ function Test-RecordSetSOA
841864
Assert-Throws { $listResult[0] | Remove-AzureRmDnsRecordSet -Confirm:$false -PassThru } "RecordSets of type 'SOA' with name '@' cannot be deleted."
842865

843866
Remove-AzureRmDnsZone -Name $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -Confirm:$false
867+
Remove-AzureRmResourceGroup -Name $resourceGroup.ResourceGroupName -Force
844868
}
845869

846870
<#
@@ -869,6 +893,7 @@ function Test-RecordSetNewAlreadyExists
869893

870894
$retrievedRecordSet | Remove-AzureRmDnsRecordSet -Confirm:$false
871895
$zone | Remove-AzureRmDnsZone -Confirm:$false
896+
Remove-AzureRmResourceGroup -Name $resourceGroup.ResourceGroupName -Force
872897
}
873898

874899
<#
@@ -893,7 +918,8 @@ function Test-RecordSetAddTwoCnames
893918
$recordName = getAssetname
894919

895920
$recordSet = TestSetup-CreateResourceGroup | New-AzureRmDnsZone -Name $zoneName | New-AzureRmDnsRecordSet -Name $recordName -Ttl 100 -RecordType CNAME
896-
921+
$resourceGroupName = $recordSet.ResourceGroupName
922+
897923
$recordSet | Add-AzureRmDnsRecordConfig -Cname www.goril.la
898924
Assert-Throws { $recordSet | Add-AzureRmDnsRecordConfig -Cname rubadub.dub } "There already exists a CNAME record in this set. A CNAME record set can only contain one record."
899925
Assert-AreEqual 1 $recordSet.Records.Count
@@ -906,6 +932,7 @@ function Test-RecordSetAddTwoCnames
906932

907933
$recordSet | Remove-AzureRmDnsRecordSet -Confirm:$false
908934
Remove-AzureRmDnsZone -Name $recordSet.ZoneName -ResourceGroupName $recordSet.ResourceGroupName -Confirm:$false
935+
Remove-AzureRmResourceGroup -Name $resourceGroupName -Force
909936
}
910937

911938
<#
@@ -917,11 +944,13 @@ function Test-RecordSetRemoveRecordTypeMismatch
917944
$zoneName = Get-RandomZoneName
918945
$recordName = getAssetname
919946
$recordSet = TestSetup-CreateResourceGroup | New-AzureRmDnsZone -Name $zoneName | New-AzureRmDnsRecordSet -Name $recordName -Ttl 100 -RecordType TXT
920-
947+
$resourceGroupName = $recordSet.ResourceGroupName
948+
921949
Assert-Throws { $recordSet | Remove-AzureRmDnsRecordConfig -Nsdname nsa.fed.gov } "Cannot remove a record of type NS from a record set of type TXT. The types must match."
922950

923951
$recordSet | Remove-AzureRmDnsRecordSet -Confirm:$false
924952
Remove-AzureRmDnsZone -Name $recordSet.ZoneName -ResourceGroupName $recordSet.ResourceGroupName -Confirm:$false
953+
Remove-AzureRmResourceGroup -Name $resourceGroupName -Force
925954
}
926955

927956
<#
@@ -950,6 +979,7 @@ function Test-RecordSetEtagMismatch
950979
Assert-True { $recordSet | Remove-AzureRmDnsRecordSet -Overwrite -Confirm:$false -PassThru }
951980

952981
Remove-AzureRmDnsZone -Name $zoneName -ResourceGroupName $recordSet.ResourceGroupName -Confirm:$false
982+
Remove-AzureRmResourceGroup -Name $recordSet.ResourceGroupName -Force
953983
}
954984

955985
<#
@@ -964,6 +994,7 @@ function Test-RecordSetGet
964994
$recordName3 = getAssetname
965995

966996
$zone = TestSetup-CreateResourceGroup | New-AzureRmDnsZone -Name $zoneName
997+
$resourceGroupName = $zone.ResourceGroupName
967998

968999
# test for root records
9691000
$nsRecords = Get-AzureRmDnsRecordSet -Zone $zone -RecordType NS
@@ -994,6 +1025,7 @@ function Test-RecordSetGet
9941025
$zone | Remove-AzureRmDnsRecordSet -Name $recordName3 -RecordType MX -Confirm:$false
9951026

9961027
$zone | Remove-AzureRmDnsZone -Confirm:$false -Overwrite
1028+
Remove-AzureRmResourceGroup -Name $resourceGroupName -Force
9971029
}
9981030

9991031
<#
@@ -1013,6 +1045,7 @@ function Test-RecordSetGetWithEndsWith
10131045
$recordName3 = (getAssetname) + $recordSuffix
10141046

10151047
$zone = TestSetup-CreateResourceGroup | New-AzureRmDnsZone -Name $zoneName
1048+
$resourceGroupName = $zone.ResourceGroupName
10161049

10171050
# test for root records
10181051
$rootRecords = $zone | Get-AzureRmDnsRecordSet -EndsWith $rootRecordName
@@ -1040,6 +1073,7 @@ function Test-RecordSetGetWithEndsWith
10401073
$zone | Remove-AzureRmDnsRecordSet -Name $recordName3 -RecordType MX -Confirm:$false
10411074

10421075
$zone | Remove-AzureRmDnsZone -Confirm:$false -Overwrite
1076+
Remove-AzureRmResourceGroup -Name $resourceGroupName -Force
10431077
}
10441078

10451079
<#
@@ -1064,6 +1098,7 @@ function Test-RecordSetEndsWithZoneName
10641098
}
10651099
Remove-AzureRmDnsRecordSet -Name $recordName -ZoneName $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -RecordType A -PassThru -Confirm:$false
10661100
Remove-AzureRmDnsZone -Name $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -Confirm:$false
1101+
Remove-AzureRmResourceGroup -Name $resourceGroup.ResourceGroupName -Force
10671102

10681103
}
10691104

@@ -1091,4 +1126,5 @@ function Test-RecordSetNewRecordNoName
10911126
Assert-True { $removed }
10921127
Remove-AzureRmDnsZone -Name $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -Confirm:$false
10931128

1094-
}
1129+
Remove-AzureRmResourceGroup -Name $resourceGroup.ResourceGroupName -Force
1130+
}

0 commit comments

Comments
 (0)