x/python-ganttclient
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 b7b49d6e58 6f297c3b7e
commit eb6e4c296d
2 changed files with 2 additions and 7 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',
'nova.network.dns_driver.DNSDriver',
'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',
'Manager for network')
DEFINE_string('volume_manager', 'nova.volume.manager.VolumeManager',

6
nova/tests/test_network.py
View File

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