From 65f3ebe8f4661d45f2c65d0c9e1722b3cddbc63d Mon Sep 17 00:00:00 2001 From: Andrew Bogott Date: Wed, 18 Jan 2012 16:52:45 -0600 Subject: 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 --- nova/tests/test_network.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'nova/tests') 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) -- cgit