diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-01-19 16:25:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-01-19 16:25:54 +0000 |
| commit | 4b2035fa61b57052ca17e325e3783099a482f6ae (patch) | |
| tree | be9446ff9a18dae0a044fbde2374b91583c92103 /nova/tests | |
| parent | f2027a63a1f8aae1cb2105b3e10ae66318beef1d (diff) | |
| parent | 65f3ebe8f4661d45f2c65d0c9e1722b3cddbc63d (diff) | |
Merge "Removed some vestigial default args from DNS drivers."
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/test_network.py | 7 |
1 files changed, 5 insertions, 2 deletions
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) |