From fec0aea14426b7f8cb9845063ec72bd4d89f6f8d Mon Sep 17 00:00:00 2001 From: Viranch Mehta Date: Mon, 14 Jun 2021 13:56:19 -0700 Subject: [PATCH] minor clean up of azuredns tests --- tests/test_octodns_provider_azuredns.py | 26 ++++++++++++------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/tests/test_octodns_provider_azuredns.py b/tests/test_octodns_provider_azuredns.py index c7840d6..81a3084 100644 --- a/tests/test_octodns_provider_azuredns.py +++ b/tests/test_octodns_provider_azuredns.py @@ -1109,7 +1109,7 @@ class TestAzureDnsProvider(TestCase): def test_dynamic_no_geo(self): # test that traffic managers are generated as expected - provider, zone, record = self._get_dynamic_package() + provider = self._get_provider() external = 'Microsoft.Network/trafficManagerProfiles/externalEndpoints' record = Record.new(zone, 'foo', data={ @@ -1159,7 +1159,7 @@ class TestAzureDnsProvider(TestCase): tm_list.return_value = profiles azrecord = RecordSet( ttl=60, - target_resource=SubResource(id=profiles[0].id), + target_resource=SubResource(id=profiles[-1].id), ) azrecord.name = record.name or '@' azrecord.type = 'Microsoft.Network/dnszones/{}'.format(record._type) @@ -1168,7 +1168,7 @@ class TestAzureDnsProvider(TestCase): def test_dynamic_fallback_is_default(self): # test that traffic managers are generated as expected - provider, zone, record = self._get_dynamic_package() + provider = self._get_provider() external = 'Microsoft.Network/trafficManagerProfiles/externalEndpoints' record = Record.new(zone, 'foo', data={ @@ -1212,7 +1212,7 @@ class TestAzureDnsProvider(TestCase): tm_list.return_value = profiles azrecord = RecordSet( ttl=60, - target_resource=SubResource(id=profiles[0].id), + target_resource=SubResource(id=profiles[-1].id), ) azrecord.name = record.name or '@' azrecord.type = 'Microsoft.Network/dnszones/{}'.format(record._type) @@ -1221,8 +1221,7 @@ class TestAzureDnsProvider(TestCase): def test_dynamic_pool_contains_default(self): # test that traffic managers are generated as expected - provider, zone, record = self._get_dynamic_package() - tm_id = provider._profile_name_to_id + provider = self._get_provider() external = 'Microsoft.Network/trafficManagerProfiles/externalEndpoints' nested = 'Microsoft.Network/trafficManagerProfiles/nestedEndpoints' @@ -1292,7 +1291,7 @@ class TestAzureDnsProvider(TestCase): Endpoint( name='rule-rr', type=nested, - target_resource_id=tm_id(profiles[0].name), + target_resource_id=profiles[0].id, geo_mapping=['GEO-AF'], ), ], @@ -1303,7 +1302,7 @@ class TestAzureDnsProvider(TestCase): tm_list.return_value = profiles azrecord = RecordSet( ttl=60, - target_resource=SubResource(id=profiles[1].id), + target_resource=SubResource(id=profiles[-1].id), ) azrecord.name = record.name or '@' azrecord.type = 'Microsoft.Network/dnszones/{}'.format(record._type) @@ -1312,7 +1311,7 @@ class TestAzureDnsProvider(TestCase): def test_dynamic_pool_contains_default_no_geo(self): # test that traffic managers are generated as expected - provider, zone, record = self._get_dynamic_package() + provider = self._get_provider() external = 'Microsoft.Network/trafficManagerProfiles/externalEndpoints' record = Record.new(zone, 'foo', data={ @@ -1377,7 +1376,7 @@ class TestAzureDnsProvider(TestCase): tm_list.return_value = profiles azrecord = RecordSet( ttl=60, - target_resource=SubResource(id=profiles[0].id), + target_resource=SubResource(id=profiles[-1].id), ) azrecord.name = record.name or '@' azrecord.type = 'Microsoft.Network/dnszones/{}'.format(record._type) @@ -1386,8 +1385,7 @@ class TestAzureDnsProvider(TestCase): def test_dynamic_last_pool_contains_default_no_geo(self): # test that traffic managers are generated as expected - provider, zone, record = self._get_dynamic_package() - tm_id = provider._profile_name_to_id + provider = self._get_provider() external = 'Microsoft.Network/trafficManagerProfiles/externalEndpoints' nested = 'Microsoft.Network/trafficManagerProfiles/nestedEndpoints' @@ -1469,7 +1467,7 @@ class TestAzureDnsProvider(TestCase): Endpoint( name='rr', type=nested, - target_resource_id=tm_id(profiles[0].name), + target_resource_id=profiles[0].id, priority=2, ), ], @@ -1480,7 +1478,7 @@ class TestAzureDnsProvider(TestCase): tm_list.return_value = profiles azrecord = RecordSet( ttl=60, - target_resource=SubResource(id=profiles[1].id), + target_resource=SubResource(id=profiles[-1].id), ) azrecord.name = record.name or '@' azrecord.type = 'Microsoft.Network/dnszones/{}'.format(record._type)