summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-01-12 22:43:31 +0000
committerGerrit Code Review <review@openstack.org>2012-01-12 22:43:31 +0000
commita0d6956ca911001d58fff44beaf1336ae1a9a84b (patch)
treecd60d7c409ee54de5a2a961b883106689234d0db /nova/api
parent0815320b5b1df711bed25704fd7542a4841c0a04 (diff)
parent08a7239a20eb5e40619b360c13fda41c11708553 (diff)
Merge "Remove network_api from Servers Controller"
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/v2/servers.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/nova/api/openstack/v2/servers.py b/nova/api/openstack/v2/servers.py
index 98f9e0686..c2655a73e 100644
--- a/nova/api/openstack/v2/servers.py
+++ b/nova/api/openstack/v2/servers.py
@@ -28,7 +28,6 @@ from nova.api.openstack import wsgi
from nova.api.openstack import xmlutil
from nova import compute
from nova.compute import instance_types
-from nova import network
from nova import exception
from nova import flags
from nova import log as logging
@@ -353,7 +352,6 @@ class Controller(wsgi.Controller):
def __init__(self, **kwargs):
super(Controller, self).__init__(**kwargs)
self.compute_api = compute.API()
- self.network_api = network.API()
@wsgi.serializers(xml=MinimalServersTemplate)
def index(self, req):