diff options
| author | Andrew Bogott <abogott@wikimedia.org> | 2012-01-18 16:52:45 -0600 |
|---|---|---|
| committer | Andrew Bogott <abogott@wikimedia.org> | 2012-01-18 18:18:52 -0600 |
| commit | 65f3ebe8f4661d45f2c65d0c9e1722b3cddbc63d (patch) | |
| tree | 4d3b94cdd502a024fbacf66c29deb3c6ffb769e7 | |
| parent | d69b64e27c63439a1880fc951066045e623c696f (diff) | |
| download | nova-65f3ebe8f4661d45f2c65d0c9e1722b3cddbc63d.tar.gz nova-65f3ebe8f4661d45f2c65d0c9e1722b3cddbc63d.tar.xz nova-65f3ebe8f4661d45f2c65d0c9e1722b3cddbc63d.zip | |
Removed some vestigial default args from DNS drivers.
In an early design, the domain was optional for several
DNS driver methods. That would add some needless complexity
to the drivers, and I never really implemented it anyway.
For blueprint public-and-private-dns.
Change-Id: Ia7b4c9ff7eaa9b6d8c1091a92bb7439941ac0a9f
| -rw-r--r-- | nova/network/dns_driver.py | 4 | ||||
| -rw-r--r-- | nova/network/manager.py | 6 | ||||
| -rw-r--r-- | nova/network/minidns.py | 4 | ||||
| -rw-r--r-- | nova/tests/test_network.py | 7 |
4 files changed, 13 insertions, 8 deletions
diff --git a/nova/network/dns_driver.py b/nova/network/dns_driver.py index 7090d665b..cd2001b64 100644 --- a/nova/network/dns_driver.py +++ b/nova/network/dns_driver.py @@ -31,10 +31,10 @@ class DNSDriver(object): def modify_address(self, _name, _address, _domain): pass - def get_entries_by_address(self, _address, _domain=""): + def get_entries_by_address(self, _address, _domain): return [] - def get_entries_by_name(self, _name, _domain=""): + def get_entries_by_name(self, _name, _domain): return [] def create_domain(self, _fqdomain): diff --git a/nova/network/manager.py b/nova/network/manager.py index b2501edf9..4146fd516 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -1185,8 +1185,10 @@ class NetworkManager(manager.SchedulerDependentManager): instance_id) if self._validate_instance_zone_for_dns_domain(context, instance_id): - for n in self.instance_dns_manager.get_entries_by_address(address): - self.instance_dns_manager.delete_entry(n) + for n in self.instance_dns_manager.get_entries_by_address(address, + self.instance_dns_domain): + self.instance_dns_manager.delete_entry(n, + self.instance_dns_domain) if FLAGS.force_dhcp_release: network = self._get_network_by_id(context, diff --git a/nova/network/minidns.py b/nova/network/minidns.py index 010925143..f3b4fde77 100644 --- a/nova/network/minidns.py +++ b/nova/network/minidns.py @@ -124,7 +124,7 @@ class MiniDNS(object): outfile.close() shutil.move(outfile.name, self.filename) - def get_entries_by_address(self, address, domain=""): + def get_entries_by_address(self, address, domain): entries = [] infile = open(self.filename, 'r') for line in infile: @@ -136,7 +136,7 @@ class MiniDNS(object): infile.close() return entries - def get_entries_by_name(self, name, domain=""): + def get_entries_by_name(self, name, domain): entries = [] infile = open(self.filename, 'r') for line in infile: diff --git a/nova/tests/test_network.py b/nova/tests/test_network.py index c3257db2d..f0decc233 100644 --- a/nova/tests/test_network.py +++ b/nova/tests/test_network.py @@ -128,6 +128,7 @@ class FlatNetworkTestCase(test.TestCase): self.network = network_manager.FlatManager(host=HOST) temp = utils.import_object('nova.network.minidns.MiniDNS') self.network.instance_dns_manager = temp + self.network.instance_dns_domain = '' self.network.db = db self.context = context.RequestContext('testuser', 'testproject', is_admin=False) @@ -358,10 +359,12 @@ class FlatNetworkTestCase(test.TestCase): self.network.add_fixed_ip_to_instance(self.context, 1, HOST, networks[0]['id']) instance_manager = self.network.instance_dns_manager - addresses = instance_manager.get_entries_by_name(HOST) + addresses = instance_manager.get_entries_by_name(HOST, + self.network.instance_dns_domain) self.assertEqual(len(addresses), 1) self.assertEqual(addresses[0], fixedip) - addresses = instance_manager.get_entries_by_name('test-00001') + addresses = instance_manager.get_entries_by_name('test-00001', + self.network.instance_dns_domain) self.assertEqual(len(addresses), 1) self.assertEqual(addresses[0], fixedip) |