Skip to content

Commit 7a4a361

Browse files
hitvyahitvya
authored
Merge pull request #1 from karravi-msft/hitvya_preview
Hitvya preview
2 parents 4319c0e + 618f824 commit 7a4a361

File tree

69 files changed

+15318
-9734
lines changed

Some content is hidden

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

69 files changed

+15318
-9734
lines changed

‎src/ResourceManager/Dns/Commands.Dns.Test/Commands.Dns.Test.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</PropertyGroup>
2727

2828
<ItemGroup>
29-
<PackageReference Include="Microsoft.Azure.Management.Dns" Version="2.2.0-preview" />
29+
<PackageReference Include="Microsoft.Azure.Management.Dns" Version="3.0.0" />
3030
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.1.0-preview" />
3131
<PackageReference Include="Moq" Version="4.2.1510.2205" />
3232
</ItemGroup>

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@
6161
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6262
<Private>True</Private>
6363
</Reference>
64-
<Reference Include="Microsoft.Azure.Management.Dns, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
64+
<Reference Include="Microsoft.Azure.Management.Dns">
6565
<SpecificVersion>False</SpecificVersion>
66-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Dns.2.2.0-preview\lib\net452\Microsoft.Azure.Management.Dns.dll</HintPath>
66+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Dns.3.0.0\lib\net452\Microsoft.Azure.Management.Dns.dll</HintPath>
6767
<Private>True</Private>
6868
</Reference>
6969
<Reference Include="Microsoft.Azure.Management.Network, Version=19.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -224,6 +224,12 @@
224224
<None Include="ScenarioTests\Common.ps1">
225225
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
226226
</None>
227+
<None Include="SessionRecords\Microsoft.Azure.Commands.ScenarioTest.DnsTests.RecordsTests\TestAliasRecordSet.json">
228+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
229+
</None>
230+
<None Include="SessionRecords\Microsoft.Azure.Commands.ScenarioTest.DnsTests.RecordsTests\TestResourceReference.json">
231+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
232+
</None>
227233
<None Include="SessionRecords\Microsoft.Azure.Commands.ScenarioTest.DnsTests.RecordsTests\TestRecordSetA.json">
228234
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
229235
</None>

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,13 @@ public void TestAliasRecordSet()
3333
DnsTestsBase.NewInstance.RunPowerShellTest("Test-AliasRecordSet");
3434
}
3535

36+
[Fact]
37+
[Trait(Category.AcceptanceType, Category.CheckIn)]
38+
public void TestResourceReference()
39+
{
40+
DnsTestsBase.NewInstance.RunPowerShellTest("Test-ResourceReference");
41+
}
42+
3643
[Fact]
3744
[Trait(Category.AcceptanceType, Category.CheckIn)]
3845
public void TestRecordSetCrud()

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

Lines changed: 58 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,11 @@ function Test-AliasRecordSet
101101
# non alias record
102102
$record = $zone | New-AzureRmDnsRecordSet -Name $recordName -Ttl 100 -RecordType $recordType -DnsRecords @()
103103
$record = $record | Add-AzureRmDnsRecordConfig -Ipv4Address 1.1.1.1
104-
$record = $record | Add-AzureRmDnsRecordConfig -Ipv4Address 2.2.2.2
105104
$record = $record | Set-AzureRmDnsRecordSet
106105

107106
# alias record pointing to non-alias record
108107
$aliasRecordName = "alias" + $(getAssetname)
109-
$aliasResourceId = "/subscriptions/$subscription/resourceGroups/$($resourceGroup.ResourceGroupName)/providers/Microsoft.Network/dnszones/$zoneName/$($record.RecordType)/$($record.Name)"
110-
$createdRecord = New-AzureRmDnsRecordSet -Name $aliasRecordName -ZoneName $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -RecordType $recordType -AliasTargetResourceId $aliasResourceId
108+
$createdRecord = New-AzureRmDnsRecordSet -Name $aliasRecordName -ZoneName $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -RecordType $recordType -TargetResourceId $record.Id
111109

112110
Assert-NotNull $createdRecord
113111
Assert-AreEqual $zoneName $createdRecord.ZoneName
@@ -116,17 +114,73 @@ function Test-AliasRecordSet
116114

117115
$aliasRecord = $zone | Get-AzureRmDnsRecordSet -Name $aliasRecordName -RecordType $recordType
118116
$nonaliasRecord = $zone | Get-AzureRmDnsRecordSet -Name $recordName -RecordType $recordType
119-
Assert-AreEqual $aliasResourceId $aliasRecord.AliasTargetResourceId
117+
Assert-AreEqual $record.Id $aliasRecord.TargetResourceId
120118

121119
$nonaliasRecord | Remove-AzureRmDnsRecordSet
122120

123121
Assert-ThrowsLike { Get-AzureRmDnsRecordSet -Name $recordName -ZoneName $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -RecordType $recordType } "*does not exist*"
122+
123+
$aliasRecord = $zone | Get-AzureRmDnsRecordSet -Name $aliasRecordName -RecordType $recordType
124+
Assert-Null $nonaliasRecord.TargetResourceId
125+
$aliasRecord | Remove-AzureRmDnsRecordSet
126+
124127
Assert-ThrowsLike { Get-AzureRmDnsRecordSet -Name $aliasRecordName -ZoneName $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -RecordType $recordType } "*does not exist*"
125128

126129
Remove-AzureRmDnsZone -Name $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -Confirm:$false
127130
Remove-AzureRmResourceGroup -Name $resourceGroup.ResourceGroupName -Force
128131
}
129132

133+
<#
134+
.SYNOPSIS
135+
Test Resource Reference API
136+
#>
137+
function Test-ResourceReference
138+
{
139+
$zoneName = Get-RandomZoneName
140+
$recordName = getAssetname
141+
$subscription = getSubscription
142+
$resourceGroup = TestSetup-CreateResourceGroup
143+
$recordType = "A"
144+
$zone = $resourceGroup | New-AzureRmDnsZone -Name $zoneName
145+
146+
# non alias record
147+
$record = $zone | New-AzureRmDnsRecordSet -Name $recordName -Ttl 100 -RecordType $recordType -DnsRecords @()
148+
$record = $record | Add-AzureRmDnsRecordConfig -Ipv4Address 1.1.1.1
149+
$record = $record | Set-AzureRmDnsRecordSet
150+
151+
$ref = Get-AzureRmDnsResourceReference -ResourceId $record.Id
152+
Assert-AreEqual $ref.DnsResources.Count 0
153+
Assert-AreEqual $ref.TargetResource.Id $record.Id
154+
155+
# alias record pointing to non-alias record
156+
$aliasRecordName = "alias" + $(getAssetname)
157+
$alias1 = New-AzureRmDnsRecordSet -Name $aliasRecordName -ZoneName $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -RecordType $recordType -TargetResourceId $record.Id
158+
159+
Assert-NotNull $alias1
160+
Assert-AreEqual $zoneName $alias1.ZoneName
161+
Assert-AreEqual $aliasRecordName $alias1.Name
162+
Assert-AreEqual $resourceGroup.ResourceGroupName $alias1.ResourceGroupName
163+
Assert-AreEqual $alias1.TargetResourceId $record.Id
164+
165+
$aliasRecordName2 = "alias" + $(getAssetname)
166+
$alias2 = New-AzureRmDnsRecordSet -Name $aliasRecordName2 -ZoneName $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -RecordType $recordType -TargetResourceId $record.Id
167+
168+
Assert-NotNull $alias2
169+
Assert-AreEqual $zoneName $alias2.ZoneName
170+
Assert-AreEqual $aliasRecordName2 $alias2.Name
171+
Assert-AreEqual $resourceGroup.ResourceGroupName $alias2.ResourceGroupName
172+
Assert-AreEqual $alias2.TargetResourceId $record.Id
173+
174+
$ref = Get-AzureRmDnsResourceReference -ResourceId $record.Id
175+
Assert-AreEqual $ref.DnsResources.Count 2
176+
Assert-True { $ref.DnsResources.Id -contains $alias1.Id }
177+
Assert-True { $ref.DnsResources.Id -contains $alias2.Id }
178+
Assert-AreEqual $ref.TargetResource.Id $record.Id
179+
180+
Remove-AzureRmDnsZone -Name $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -Confirm:$false
181+
Remove-AzureRmResourceGroup -Name $resourceGroup.ResourceGroupName -Force
182+
}
183+
130184
<#
131185
.SYNOPSIS
132186
Full Record Set CRUD cycle trims terminating dot from zone name

0 commit comments

Comments
 (0)