openstack/nova
Code Issues Proposed changes

Merge "Removed references to FLAGS.floating_ip_dns_domains."

Browse Source
This commit is contained in:
Jenkins
2012-01-19 16:52:50 +00:00
committed by Gerrit Code Review
parent 4b2035fa61 12470a324f
commit 02502f5774
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nova/flags.py
View File

@@ -375,9 +375,6 @@ DEFINE_string('instance_dns_domain', '',
DEFINE_string('floating_ip_dns_manager', DEFINE_string('floating_ip_dns_manager',
'nova.network.dns_driver.DNSDriver', 'nova.network.dns_driver.DNSDriver',
'DNS Manager for floating IPs') 'DNS Manager for floating IPs')
DEFINE_multistring('floating_ip_dns_zones', '',
'DNS zones for floating IPs.'
'e.g. "example.org"')
DEFINE_string('network_manager', 'nova.network.manager.VlanManager', DEFINE_string('network_manager', 'nova.network.manager.VlanManager',
'Manager for network') 'Manager for network')
DEFINE_string('volume_manager', 'nova.volume.manager.VolumeManager', DEFINE_string('volume_manager', 'nova.volume.manager.VolumeManager',

13
nova/network/ldapdns.py
View File

@@ -93,6 +93,17 @@ class DNSEntry(object):
(domain, entry)) (domain, entry))
return entry[0] return entry[0]
@classmethod
def _get_all_domains(cls, lobj):
entries = lobj.search_s(flags.FLAGS.ldap_dns_base_dn,
ldap.SCOPE_SUBTREE, "(sOARecord=*)")
domains = []
for entry in entries:
domain = entry[1].get('associatedDomain')
if domain:
domains.append(domain[0])
return domains
def _set_tuple(self, tuple): def _set_tuple(self, tuple):
self.ldap_tuple = tuple self.ldap_tuple = tuple
@@ -291,7 +302,7 @@ class LdapDNS(object):
flags.FLAGS.ldap_dns_password) flags.FLAGS.ldap_dns_password)
def get_domains(self): def get_domains(self):
return flags.FLAGS.floating_ip_dns_domains return DomainEntry._get_all_domains(self.lobj)
def create_entry(self, name, address, type, domain): def create_entry(self, name, address, type, domain):
if type.lower() != 'a': if type.lower() != 'a':

6
nova/tests/test_network.py
View File

@@ -1502,12 +1502,10 @@ class LdapDNSTestCase(test.TestCase):
self.driver.delete_domain(domain2) self.driver.delete_domain(domain2)
def test_ldap_dns_domains(self): def test_ldap_dns_domains(self):
flags.FLAGS.floating_ip_dns_domains = [domain1, domain2]
domains = self.driver.get_domains() domains = self.driver.get_domains()
self.assertEqual(len(domains), 2) self.assertEqual(len(domains), 2)
self.assertEqual(domains[0], domain1) self.assertIn(domain1, domains)
self.assertEqual(domains[1], domain2) self.assertIn(domain2, domains)
def test_ldap_dns_create_conflict(self): def test_ldap_dns_create_conflict(self):
address1 = "10.10.10.11" address1 = "10.10.10.11"