diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-10-04 17:23:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-10-04 17:23:24 +0000 |
| commit | 5ca55f5578a0df03533f1d6958e5d6d2bb9c4410 (patch) | |
| tree | b2d63c47c9ffeeb0bedc7c46433e90d8a7c2505b /nova/virt | |
| parent | 3c8ed4ec14cab8ae6ac4f88286baac090800fa94 (diff) | |
| parent | 31764456bd4536c920fb1d768fbdebf93e016a8a (diff) | |
Merge "Stop network.api import on network import"
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/firewall.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/virt/firewall.py b/nova/virt/firewall.py index 1da76edeb..eb14a92c5 100644 --- a/nova/virt/firewall.py +++ b/nova/virt/firewall.py @@ -20,6 +20,8 @@ from nova import context from nova import db from nova import flags +from nova import network +from nova.network import linux_net from nova.openstack.common import cfg from nova.openstack.common import importutils from nova.openstack.common import log as logging @@ -138,7 +140,6 @@ class IptablesFirewallDriver(FirewallDriver): """Driver which enforces security groups through iptables rules.""" def __init__(self, **kwargs): - from nova.network import linux_net self.iptables = linux_net.iptables_manager self.instances = {} self.network_infos = {} @@ -392,8 +393,7 @@ class IptablesFirewallDriver(FirewallDriver): # has access to a nw_api handle, # and should be the only one making # making rpc calls. - import nova.network - nw_api = nova.network.API() + nw_api = network.API() for instance in rule['grantee_group']['instances']: nw_info = nw_api.get_instance_nw_info(ctxt, instance) |