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/api | |
| parent | 3c8ed4ec14cab8ae6ac4f88286baac090800fa94 (diff) | |
| parent | 31764456bd4536c920fb1d768fbdebf93e016a8a (diff) | |
| download | nova-5ca55f5578a0df03533f1d6958e5d6d2bb9c4410.tar.gz nova-5ca55f5578a0df03533f1d6958e5d6d2bb9c4410.tar.xz nova-5ca55f5578a0df03533f1d6958e5d6d2bb9c4410.zip | |
Merge "Stop network.api import on network import"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/contrib/networks.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/api/openstack/compute/contrib/networks.py b/nova/api/openstack/compute/contrib/networks.py index f673bf43a..62b4a6c80 100644 --- a/nova/api/openstack/compute/contrib/networks.py +++ b/nova/api/openstack/compute/contrib/networks.py @@ -23,7 +23,7 @@ from webob import exc from nova.api.openstack import extensions from nova import exception from nova import flags -import nova.network.api +from nova import network from nova.openstack.common import log as logging @@ -58,7 +58,7 @@ def network_dict(context, network): class NetworkController(object): def __init__(self, network_api=None): - self.network_api = network_api or nova.network.api.API() + self.network_api = network_api or network.API() def action(self, req, id, body): _actions = { |