Skip to content

Dns make zone obsolete #15235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bquantump wants to merge 25 commits into from
Closed

Dns make zone obsolete #15235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
b2a4f14
WIP: Initial CRUD and List test for record and zone
bquantump Aug 11, 2020
38b9eb1
WIP: Port of cloud issues
bquantump Aug 12, 2020
e15afb3
WIP: OneTimeTearDown and setup working. No double test runs
bquantump Aug 16, 2020
4c799eb
WIP: don't make zone twice
bquantump Aug 17, 2020
3f88fd3
WIP: Commit test
Aug 18, 2020
90204f1
WIP: Fix changelog and readme
bquantump Aug 18, 2020
ce4d0de
Merge branch 'master' of https://github.com/Azure/azure-sdk-for-net
bquantump Aug 18, 2020
6fee9cf
WIP: Fix yaml
bquantump Aug 18, 2020
66d2634
WIP: Fix yml 2
bquantump Aug 18, 2020
a92d37c
WIP: Remove unused function
bquantump Aug 19, 2020
c0abf80
Remove .swp file
bquantump Aug 20, 2020
8fed2c7
Merge branch 'master' of https://github.com/Azure/azure-sdk-for-net
bquantump Aug 20, 2020
f34768b
Remove SWP file
bquantump Aug 20, 2020
040df84
Update DNS Track 2 test
bquantump Aug 27, 2020
f28d520
Add Tests Recordings
bquantump Aug 27, 2020
936583d
Fix Class name
bquantump Aug 27, 2020
6cf295d
WIP: Update tests
bquantump Sep 1, 2020
212e5c4
Merge branch 'master' of https://github.com/Azure/azure-sdk-for-net
bquantump Sep 1, 2020
88c43bf
WIP: Make exception test clearner
bquantump Sep 1, 2020
a3e2c57
WIP: Update live test records
bquantump Sep 1, 2020
5cf8665
Revert json change
bquantump Sep 2, 2020
556c220
Merge branch 'master' of https://github.com/Azure/azure-sdk-for-net
bquantump Sep 2, 2020
becddf3
Small fixes
bquantump Sep 4, 2020
932730f
WIP: Update SLN
bquantump Sep 11, 2020
2c0317c
WIP: Dns gen update
bquantump Sep 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 40 additions & 37 deletions sdk/dns/Azure.ResourceManager.Dns/Azure.ResourceManager.Dns.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,41 +8,44 @@ EndProject
Project("{B89A7445-9F90-4BEF-A2CD-E38E1C6AD1DF}") = "Azure.ResourceManager.Dns.Tests", "tests\Azure.ResourceManager.Dns.Tests.csproj", "{B27A3240-EDB9-4C64-ABD4-02F492C27D64}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{334FB216-0D38-4370-92DB-65BC85EBFDB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{334FB216-0D38-4370-92DB-65BC85EBFDB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{334FB216-0D38-4370-92DB-65BC85EBFDB5}.Debug|x64.ActiveCfg = Debug|Any CPU
{334FB216-0D38-4370-92DB-65BC85EBFDB5}.Debug|x64.Build.0 = Debug|Any CPU
{334FB216-0D38-4370-92DB-65BC85EBFDB5}.Debug|x86.ActiveCfg = Debug|Any CPU
{334FB216-0D38-4370-92DB-65BC85EBFDB5}.Debug|x86.Build.0 = Debug|Any CPU
{334FB216-0D38-4370-92DB-65BC85EBFDB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{334FB216-0D38-4370-92DB-65BC85EBFDB5}.Release|Any CPU.Build.0 = Release|Any CPU
{334FB216-0D38-4370-92DB-65BC85EBFDB5}.Release|x64.ActiveCfg = Release|Any CPU
{334FB216-0D38-4370-92DB-65BC85EBFDB5}.Release|x64.Build.0 = Release|Any CPU
{334FB216-0D38-4370-92DB-65BC85EBFDB5}.Release|x86.ActiveCfg = Release|Any CPU
{334FB216-0D38-4370-92DB-65BC85EBFDB5}.Release|x86.Build.0 = Release|Any CPU
{B27A3240-EDB9-4C64-ABD4-02F492C27D64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B27A3240-EDB9-4C64-ABD4-02F492C27D64}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B27A3240-EDB9-4C64-ABD4-02F492C27D64}.Debug|x64.ActiveCfg = Debug|Any CPU
{B27A3240-EDB9-4C64-ABD4-02F492C27D64}.Debug|x64.Build.0 = Debug|Any CPU
{B27A3240-EDB9-4C64-ABD4-02F492C27D64}.Debug|x86.ActiveCfg = Debug|Any CPU
{B27A3240-EDB9-4C64-ABD4-02F492C27D64}.Debug|x86.Build.0 = Debug|Any CPU
{B27A3240-EDB9-4C64-ABD4-02F492C27D64}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B27A3240-EDB9-4C64-ABD4-02F492C27D64}.Release|Any CPU.Build.0 = Release|Any CPU
{B27A3240-EDB9-4C64-ABD4-02F492C27D64}.Release|x64.ActiveCfg = Release|Any CPU
{B27A3240-EDB9-4C64-ABD4-02F492C27D64}.Release|x64.Build.0 = Release|Any CPU
{B27A3240-EDB9-4C64-ABD4-02F492C27D64}.Release|x86.ActiveCfg = Release|Any CPU
{B27A3240-EDB9-4C64-ABD4-02F492C27D64}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {22B5C190-A09C-48DF-A800-D892011143EE}
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{7C8507C6-BFAE-4DD2-B4AD-FE1A49B8E246}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7C8507C6-BFAE-4DD2-B4AD-FE1A49B8E246}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7C8507C6-BFAE-4DD2-B4AD-FE1A49B8E246}.Debug|x64.ActiveCfg = Debug|Any CPU
{7C8507C6-BFAE-4DD2-B4AD-FE1A49B8E246}.Debug|x64.Build.0 = Debug|Any CPU
{7C8507C6-BFAE-4DD2-B4AD-FE1A49B8E246}.Debug|x86.ActiveCfg = Debug|Any CPU
{7C8507C6-BFAE-4DD2-B4AD-FE1A49B8E246}.Debug|x86.Build.0 = Debug|Any CPU
{7C8507C6-BFAE-4DD2-B4AD-FE1A49B8E246}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7C8507C6-BFAE-4DD2-B4AD-FE1A49B8E246}.Release|Any CPU.Build.0 = Release|Any CPU
{7C8507C6-BFAE-4DD2-B4AD-FE1A49B8E246}.Release|x64.ActiveCfg = Release|Any CPU
{7C8507C6-BFAE-4DD2-B4AD-FE1A49B8E246}.Release|x64.Build.0 = Release|Any CPU
{7C8507C6-BFAE-4DD2-B4AD-FE1A49B8E246}.Release|x86.ActiveCfg = Release|Any CPU
{7C8507C6-BFAE-4DD2-B4AD-FE1A49B8E246}.Release|x86.Build.0 = Release|Any CPU
{3EC07824-4ECC-4909-8F2A-4796B3B157C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3EC07824-4ECC-4909-8F2A-4796B3B157C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3EC07824-4ECC-4909-8F2A-4796B3B157C6}.Debug|x64.ActiveCfg = Debug|Any CPU
{3EC07824-4ECC-4909-8F2A-4796B3B157C6}.Debug|x64.Build.0 = Debug|Any CPU
{3EC07824-4ECC-4909-8F2A-4796B3B157C6}.Debug|x86.ActiveCfg = Debug|Any CPU
{3EC07824-4ECC-4909-8F2A-4796B3B157C6}.Debug|x86.Build.0 = Debug|Any CPU
{3EC07824-4ECC-4909-8F2A-4796B3B157C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3EC07824-4ECC-4909-8F2A-4796B3B157C6}.Release|Any CPU.Build.0 = Release|Any CPU
{3EC07824-4ECC-4909-8F2A-4796B3B157C6}.Release|x64.ActiveCfg = Release|Any CPU
{3EC07824-4ECC-4909-8F2A-4796B3B157C6}.Release|x64.Build.0 = Release|Any CPU
{3EC07824-4ECC-4909-8F2A-4796B3B157C6}.Release|x86.ActiveCfg = Release|Any CPU
{3EC07824-4ECC-4909-8F2A-4796B3B157C6}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal
14 changes: 12 additions & 2 deletions sdk/dns/Azure.ResourceManager.Dns/src/Generated/Models/Zone.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions sdk/dns/Azure.ResourceManager.Dns/tests/Azure.ResourceManager.Dns.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TestHelperProjects>Resources201705;</TestHelperProjects>
<NoWarn>$(NoWarn);SA1649</NoWarn>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="$(AzureCoreTestFramework)" />
Expand Down
39 changes: 15 additions & 24 deletions sdk/dns/Azure.ResourceManager.Dns/tests/Helper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,37 +22,33 @@ public static bool AreEqualPrereq(
Azure.ResourceManager.Dns.Models.Resource second,
bool ignoreEtag = false)
{
if (first == null && second == null)

if (first == null || second == null)
{
return true;
return false;
}
else if (first == null || second == null)

if (!String.Equals(first.Location, second.Location, StringComparison.OrdinalIgnoreCase))
{
return false;
}

if (first.Location != second.Location
|| first.Name != second.Name)
if (first.Tags == null || second.Tags == null)
{
return false;
}

if (first.Tags != null || second.Tags != null)
}
if (first.Tags.Count != second.Tags.Count)
{
return false;
}
foreach (string key in first.Tags.Keys)
{
if (first.Tags == null || second.Tags == null ||
first.Tags.Count != second.Tags.Count)
if (!second.Tags.ContainsKey(key) ||
first.Tags[key] != second.Tags[key])
{
return false;
}

foreach (string key in first.Tags.Keys)
{
if (!second.Tags.ContainsKey(key) ||
first.Tags[key] != second.Tags[key])
{
return false;
}
}
}

return true;
Expand All @@ -67,12 +63,7 @@ public static bool AreEqual(
return false;
}

if (first != null && second != null)
{
return ignoreEtag || (first.Etag == second.Etag);
}

return true;
return ignoreEtag || (first.Etag == second.Etag);
}

public static bool AreEqual(
Expand Down
165 changes: 0 additions & 165 deletions ...ResourceManager.Dns/tests/SessionRecords/ScenarioTests/DnsCreateARecordDelete()Async.json
View file
Open in desktop

This file was deleted.

Loading