x/python-ganttclient
Code Issues Proposed changes

Rename 'zone' to 'domain.'

Browse Source 
This code was getting confusing because of the ambiguity
between dns zones and openstack availability zones.  'Domain'
seems a bit clearer than 'zone' in this context.

For blueprint public-and-private-dns.

Change-Id: I1d420be2e6f2054ee4392ce762775ece20a823b3
This commit is contained in:
Andrew Bogott
2012-01-18 14:38:12 -06:00
parent 8ec028e709
commit 9e47b88b0c
3 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nova/flags.py
View File

@@ -370,7 +370,7 @@ DEFINE_string('console_manager', 'nova.console.manager.ConsoleProxyManager',
DEFINE_string('instance_dns_manager', DEFINE_string('instance_dns_manager',
'nova.network.dns_driver.DNSDriver', 'nova.network.dns_driver.DNSDriver',
'DNS Manager for instance IPs') 'DNS Manager for instance IPs')
DEFINE_string('instance_dns_zone', '', DEFINE_string('instance_dns_domain', '',
'DNS Zone for instance IPs') 'DNS Zone for instance IPs')
DEFINE_string('floating_ip_dns_manager', DEFINE_string('floating_ip_dns_manager',
'nova.network.dns_driver.DNSDriver', 'nova.network.dns_driver.DNSDriver',

2
nova/tests/policy.json
View File

@@ -117,7 +117,7 @@
"network:add_network_to_project": [], "network:add_network_to_project": [],
"network:get_instance_nw_info": [], "network:get_instance_nw_info": [],
"network:get_dns_zones": [], "network:get_dns_domains": [],
"network:add_dns_entry": [], "network:add_dns_entry": [],
"network:modify_dns_entry": [], "network:modify_dns_entry": [],
"network:delete_dns_entry": [], "network:delete_dns_entry": [],

58
nova/tests/test_network.py
View File

@@ -1340,7 +1340,7 @@ class FloatingIPTestCase(test.TestCase):
self.network.create_public_dns_domain(context_admin, domain2, self.network.create_public_dns_domain(context_admin, domain2,
'fakeproject') 'fakeproject')
domains = self.network.get_dns_zones(self.context) domains = self.network.get_dns_domains(self.context)
self.assertEquals(len(domains), 2) self.assertEquals(len(domains), 2)
self.assertEquals(domains[0]['domain'], domain1) self.assertEquals(domains[0]['domain'], domain1)
self.assertEquals(domains[1]['domain'], domain2) self.assertEquals(domains[1]['domain'], domain2)
@@ -1377,7 +1377,7 @@ class FloatingIPTestCase(test.TestCase):
{'domain': 'example.com', 'scope': 'public'}, {'domain': 'example.com', 'scope': 'public'},
{'domain': 'test.example.org', 'scope': 'public'}] {'domain': 'test.example.org', 'scope': 'public'}]
self.stubs.Set(self.network, 'get_dns_zones', fake_domains) self.stubs.Set(self.network, 'get_dns_domains', fake_domains)
context_admin = context.RequestContext('testuser', 'testproject', context_admin = context.RequestContext('testuser', 'testproject',
is_admin=True) is_admin=True)
@@ -1387,7 +1387,7 @@ class FloatingIPTestCase(test.TestCase):
self.network.create_public_dns_domain(context_admin, domain2, self.network.create_public_dns_domain(context_admin, domain2,
'fakeproject') 'fakeproject')
domains = self.network.get_dns_zones(self.context) domains = self.network.get_dns_domains(self.context)
for domain in domains: for domain in domains:
self.network.add_dns_entry(self.context, address, self.network.add_dns_entry(self.context, address,
name1, "A", domain['domain']) name1, "A", domain['domain'])
@@ -1469,7 +1469,7 @@ class InstanceDNSTestCase(test.TestCase):
domain1, zone1) domain1, zone1)
self.network.create_private_dns_domain(context_admin, domain1, zone1) self.network.create_private_dns_domain(context_admin, domain1, zone1)
domains = self.network.get_dns_zones(self.context) domains = self.network.get_dns_domains(self.context)
self.assertEquals(len(domains), 1) self.assertEquals(len(domains), 1)
self.assertEquals(domains[0]['domain'], domain1) self.assertEquals(domains[0]['domain'], domain1)
self.assertEquals(domains[0]['availability_zone'], zone1) self.assertEquals(domains[0]['availability_zone'], zone1)
@@ -1480,8 +1480,8 @@ class InstanceDNSTestCase(test.TestCase):
self.network.delete_dns_domain(context_admin, domain1) self.network.delete_dns_domain(context_admin, domain1)
zone1 = "example.org" domain1 = "example.org"
zone2 = "example.com" domain2 = "example.com"
class LdapDNSTestCase(test.TestCase): class LdapDNSTestCase(test.TestCase):
@@ -1490,48 +1490,48 @@ class LdapDNSTestCase(test.TestCase):
super(LdapDNSTestCase, self).setUp() super(LdapDNSTestCase, self).setUp()
temp = utils.import_object('nova.network.ldapdns.FakeLdapDNS') temp = utils.import_object('nova.network.ldapdns.FakeLdapDNS')
self.driver = temp self.driver = temp
self.driver.create_domain(zone1) self.driver.create_domain(domain1)
self.driver.create_domain(zone2) self.driver.create_domain(domain2)
def tearDown(self): def tearDown(self):
super(LdapDNSTestCase, self).tearDown() super(LdapDNSTestCase, self).tearDown()
self.driver.delete_domain(zone1) self.driver.delete_domain(domain1)
self.driver.delete_domain(zone2) self.driver.delete_domain(domain2)
def test_ldap_dns_zones(self): def test_ldap_dns_domains(self):
flags.FLAGS.floating_ip_dns_zones = [zone1, zone2] flags.FLAGS.floating_ip_dns_domains = [domain1, domain2]
zones = self.driver.get_zones() domains = self.driver.get_domains()
self.assertEqual(len(zones), 2) self.assertEqual(len(domains), 2)
self.assertEqual(zones[0], zone1) self.assertEqual(domains[0], domain1)
self.assertEqual(zones[1], zone2) self.assertEqual(domains[1], domain2)
def test_ldap_dns_create_conflict(self): def test_ldap_dns_create_conflict(self):
address1 = "10.10.10.11" address1 = "10.10.10.11"
name1 = "foo" name1 = "foo"
name2 = "bar" name2 = "bar"
self.driver.create_entry(name1, address1, "A", zone1) self.driver.create_entry(name1, address1, "A", domain1)
self.assertRaises(exception.FloatingIpDNSExists, self.assertRaises(exception.FloatingIpDNSExists,
self.driver.create_entry, self.driver.create_entry,
name1, address1, "A", zone1) name1, address1, "A", domain1)
def test_ldap_dns_create_and_get(self): def test_ldap_dns_create_and_get(self):
address1 = "10.10.10.11" address1 = "10.10.10.11"
name1 = "foo" name1 = "foo"
name2 = "bar" name2 = "bar"
entries = self.driver.get_entries_by_address(address1, zone1) entries = self.driver.get_entries_by_address(address1, domain1)
self.assertFalse(entries) self.assertFalse(entries)
self.driver.create_entry(name1, address1, "A", zone1) self.driver.create_entry(name1, address1, "A", domain1)
self.driver.create_entry(name2, address1, "A", zone1) self.driver.create_entry(name2, address1, "A", domain1)
entries = self.driver.get_entries_by_address(address1, zone1) entries = self.driver.get_entries_by_address(address1, domain1)
self.assertEquals(len(entries), 2) self.assertEquals(len(entries), 2)
self.assertEquals(entries[0], name1) self.assertEquals(entries[0], name1)
self.assertEquals(entries[1], name2) self.assertEquals(entries[1], name2)
entries = self.driver.get_entries_by_name(name1, zone1) entries = self.driver.get_entries_by_name(name1, domain1)
self.assertEquals(len(entries), 1) self.assertEquals(len(entries), 1)
self.assertEquals(entries[0], address1) self.assertEquals(entries[0], address1)
@@ -1540,17 +1540,17 @@ class LdapDNSTestCase(test.TestCase):
name1 = "foo" name1 = "foo"
name2 = "bar" name2 = "bar"
self.driver.create_entry(name1, address1, "A", zone1) self.driver.create_entry(name1, address1, "A", domain1)
self.driver.create_entry(name2, address1, "A", zone1) self.driver.create_entry(name2, address1, "A", domain1)
entries = self.driver.get_entries_by_address(address1, zone1) entries = self.driver.get_entries_by_address(address1, domain1)
self.assertEquals(len(entries), 2) self.assertEquals(len(entries), 2)
self.driver.delete_entry(name1, zone1) self.driver.delete_entry(name1, domain1)
entries = self.driver.get_entries_by_address(address1, zone1) entries = self.driver.get_entries_by_address(address1, domain1)
LOG.debug("entries: %s" % entries) LOG.debug("entries: %s" % entries)
self.assertEquals(len(entries), 1) self.assertEquals(len(entries), 1)
self.assertEquals(entries[0], name2) self.assertEquals(entries[0], name2)
self.assertRaises(exception.NotFound, self.assertRaises(exception.NotFound,
self.driver.delete_entry, self.driver.delete_entry,
name1, zone1) name1, domain1)