diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-10-10 00:35:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-10-10 00:35:43 +0000 |
| commit | 450c0376e163aee4e3dc31ce20a32ae0ee5d408e (patch) | |
| tree | cc19ca620f2851665fbe8780a7b942c16cc0fed9 | |
| parent | d40305c109e61aef10f955f10d66c5bbb4a05cb8 (diff) | |
| parent | 597324bcf12022bc6339ecc162e30c623fbc2dae (diff) | |
| download | nova-450c0376e163aee4e3dc31ce20a32ae0ee5d408e.tar.gz nova-450c0376e163aee4e3dc31ce20a32ae0ee5d408e.tar.xz nova-450c0376e163aee4e3dc31ce20a32ae0ee5d408e.zip | |
Merge "Remove unneeded temp variable"
| -rw-r--r-- | nova/network/manager.py | 8 | ||||
| -rw-r--r-- | nova/tests/network/test_manager.py | 16 |
2 files changed, 12 insertions, 12 deletions
diff --git a/nova/network/manager.py b/nova/network/manager.py index 4f08c4e41..36cc45379 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -787,11 +787,11 @@ class NetworkManager(manager.SchedulerDependentManager): if not network_driver: network_driver = FLAGS.network_driver self.driver = importutils.import_module(network_driver) - temp = importutils.import_object(FLAGS.instance_dns_manager) - self.instance_dns_manager = temp + self.instance_dns_manager = importutils.import_object( + FLAGS.instance_dns_manager) self.instance_dns_domain = FLAGS.instance_dns_domain - temp = importutils.import_object(FLAGS.floating_ip_dns_manager) - self.floating_dns_manager = temp + self.floating_dns_manager = importutils.import_object( + FLAGS.floating_ip_dns_manager) self.network_api = network_api.API() self.security_group_api = compute_api.SecurityGroupAPI() self.compute_api = compute_api.API( diff --git a/nova/tests/network/test_manager.py b/nova/tests/network/test_manager.py index ca98587c9..b39d1b5f0 100644 --- a/nova/tests/network/test_manager.py +++ b/nova/tests/network/test_manager.py @@ -133,8 +133,8 @@ class FlatNetworkTestCase(test.TestCase): self.tempdir = tempfile.mkdtemp() self.flags(logdir=self.tempdir) self.network = network_manager.FlatManager(host=HOST) - temp = importutils.import_object('nova.network.minidns.MiniDNS') - self.network.instance_dns_manager = temp + self.network.instance_dns_manager = importutils.import_object( + 'nova.network.minidns.MiniDNS') self.network.instance_dns_domain = '' self.network.db = db self.context = context.RequestContext('testuser', 'testproject', @@ -1549,8 +1549,8 @@ class FloatingIPTestCase(test.TestCase): self.tempdir = tempfile.mkdtemp() self.flags(logdir=self.tempdir) self.network = TestFloatingIPManager() - temp = importutils.import_object('nova.network.minidns.MiniDNS') - self.network.floating_dns_manager = temp + self.network.floating_dns_manager = importutils.import_object( + 'nova.network.minidns.MiniDNS') self.network.db = db self.project_id = 'testproject' self.context = context.RequestContext('testuser', self.project_id, @@ -1787,10 +1787,10 @@ class InstanceDNSTestCase(test.TestCase): self.tempdir = tempfile.mkdtemp() self.flags(logdir=self.tempdir) self.network = TestFloatingIPManager() - temp = importutils.import_object('nova.network.minidns.MiniDNS') - self.network.instance_dns_manager = temp - temp = importutils.import_object('nova.network.dns_driver.DNSDriver') - self.network.floating_dns_manager = temp + self.network.instance_dns_manager = importutils.import_object( + 'nova.network.minidns.MiniDNS') + self.network.floating_dns_manager = importutils.import_object( + 'nova.network.dns_driver.DNSDriver') self.network.db = db self.project_id = 'testproject' self.context = context.RequestContext('testuser', self.project_id, |