x/python-ganttclient
Code Issues Proposed changes

Merge "Improve the minidns tests to handle zone matching."

Browse Source
This commit is contained in:
Jenkins
2011-12-20 21:52:35 +00:00
committed by Gerrit Code Review
parent 0dc8d7cd66 d7cc933672
commit 45fd640d32
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
nova/tests/test_network.py
View File

@@ -292,19 +292,26 @@ class FlatNetworkTestCase(test.TestCase):
networks[0]['id']) networks[0]['id'])
def test_mini_dns_driver(self): def test_mini_dns_driver(self):
zone1 = "example.org"
zone2 = "example.com"
driver = self.network.instance_dns_manager driver = self.network.instance_dns_manager
driver.create_entry("hostone", "10.0.0.1", 0, "foozone") driver.create_entry("hostone", "10.0.0.1", 0, zone1)
driver.create_entry("hosttwo", "10.0.0.2", 0, "foozone") driver.create_entry("hosttwo", "10.0.0.2", 0, zone1)
driver.create_entry("hostthree", "10.0.0.3", 0, "foozone") driver.create_entry("hostthree", "10.0.0.3", 0, zone1)
driver.create_entry("hostfour", "10.0.0.4", 0, "foozone") driver.create_entry("hostfour", "10.0.0.4", 0, zone1)
driver.delete_entry("hosttwo", "foozone") driver.create_entry("hostfive", "10.0.0.5", 0, zone2)
driver.rename_entry("10.0.0.3", "hostone", "foozone") driver.create_entry("hostsix", "10.0.0.6", 0, zone2)
driver.modify_address("hostfour", "10.0.0.1", "foozone") driver.delete_entry("hosttwo", zone1)
names = driver.get_entries_by_address("10.0.0.1", "foozone") driver.rename_entry("10.0.0.3", "hostone", zone1)
driver.modify_address("hostfour", "10.0.0.1", zone1)
names = driver.get_entries_by_address("10.0.0.1", zone1)
self.assertEqual(len(names), 2) self.assertEqual(len(names), 2)
self.assertIn('hostone.foozone', names) self.assertIn('hostone', names)
self.assertIn('hostfour.foozone', names) self.assertIn('hostfour', names)
addresses = driver.get_entries_by_name("hostone", "foozone") names = driver.get_entries_by_address("10.0.0.6", zone2)
self.assertEqual(len(names), 1)
self.assertIn('hostsix', names)
addresses = driver.get_entries_by_name("hostone", zone1)
self.assertEqual(len(addresses), 2) self.assertEqual(len(addresses), 2)
self.assertIn('10.0.0.1', addresses) self.assertIn('10.0.0.1', addresses)
self.assertIn('10.0.0.3', addresses) self.assertIn('10.0.0.3', addresses)