summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/__init__.py10
-rw-r--r--nova/api/openstack/common.py21
-rw-r--r--nova/api/openstack/images.py3
-rw-r--r--nova/api/openstack/servers.py1
-rw-r--r--nova/api/openstack/views/images.py7
-rw-r--r--nova/api/openstack/views/servers.py56
6 files changed, 61 insertions, 37 deletions
diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py
index 62d8f4b97..c648f550a 100644
--- a/nova/api/openstack/__init__.py
+++ b/nova/api/openstack/__init__.py
@@ -126,8 +126,10 @@ class APIRouter(wsgi.Router):
class APIRouterV10(APIRouter):
+ """Define routes specific to OpenStack API V1.0."""
+
def _setup_routes(self, mapper):
- APIRouter._setup_routes(self, mapper)
+ super(APIRouterV10, self)._setup_routes(mapper)
mapper.resource("server", "servers",
controller=servers.ControllerV10(),
collection={'detail': 'GET'},
@@ -139,8 +141,10 @@ class APIRouterV10(APIRouter):
class APIRouterV11(APIRouter):
+ """Define routes specific to OpenStack API V1.1."""
+
def _setup_routes(self, mapper):
- APIRouter._setup_routes(self, mapper)
+ super(APIRouterV11, self)._setup_routes(mapper)
mapper.resource("server", "servers",
controller=servers.ControllerV11(),
collection={'detail': 'GET'},
@@ -150,8 +154,6 @@ class APIRouterV11(APIRouter):
controller=images.ControllerV11(),
collection={'detail': 'GET'})
- super(APIRouter, self).__init__(mapper)
-
class Versions(wsgi.Application):
@webob.dec.wsgify(RequestClass=wsgi.Request)
diff --git a/nova/api/openstack/common.py b/nova/api/openstack/common.py
index b224cbfb4..bff050347 100644
--- a/nova/api/openstack/common.py
+++ b/nova/api/openstack/common.py
@@ -15,10 +15,11 @@
# License for the specific language governing permissions and limitations
# under the License.
-import re
+from urlparse import urlparse
+
+import webob
+
from nova import exception
-from webob import exc
-import webob.exc
def limited(items, request, max_limit=1000):
@@ -78,7 +79,13 @@ def get_image_id_from_image_hash(image_service, context, image_hash):
def get_id_from_href(href):
- m = re.match(r'http.+/.+/(\d)+$', href)
- if not m:
- raise exc.HTTPBadRequest(_('could not parse id from href'))
- return int(m.group(1))
+ """Return the id portion of a url as an int.
+
+ Given: http://www.foo.com/bar/123?q=4
+ Returns: 123
+
+ """
+ try:
+ return int(urlparse(href).path.split('/')[-1])
+ except:
+ raise webob.exc.HTTPBadRequest(_('could not parse id from href'))
diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index 38c8a7306..dc07348e4 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -112,9 +112,8 @@ class Controller(wsgi.Controller):
@param req: `wsgi.Request` object
"""
context = req.environ['nova.context']
- body = req.body
content_type = req.get_content_type()
- image = self._deserialize(body, content_type)
+ image = self._deserialize(req.body, content_type)
if not image:
raise exc.HTTPBadRequest()
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 73843f63e..443196146 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -22,6 +22,7 @@ from xml.dom import minidom
from webob import exc
from nova import compute
+from nova import context
from nova import exception
from nova import flags
from nova import log as logging
diff --git a/nova/api/openstack/views/images.py b/nova/api/openstack/views/images.py
index 7daa6fe26..9d0bad095 100644
--- a/nova/api/openstack/views/images.py
+++ b/nova/api/openstack/views/images.py
@@ -28,6 +28,11 @@ class ViewBuilder(object):
"""
self._url = base_url
+ def _format_dates(self, image):
+ for attr in ['created_at', 'updated_at', 'deleted_at']:
+ if image.get(attr) is not None:
+ image[attr] = image[attr].strftime('%Y-%m-%dT%H:%M:%SZ')
+
def generate_href(self, image_id):
"""
Return an href string pointing to this object.
@@ -38,6 +43,8 @@ class ViewBuilder(object):
"""
Return a standardized image structure for display by the API.
"""
+ self._format_dates(image_obj)
+
image = {
"id": image_obj["id"],
"name": image_obj["name"],
diff --git a/nova/api/openstack/views/servers.py b/nova/api/openstack/views/servers.py
index 8d47ac757..f93435198 100644
--- a/nova/api/openstack/views/servers.py
+++ b/nova/api/openstack/views/servers.py
@@ -16,7 +16,10 @@
# under the License.
import hashlib
+
from nova.compute import power_state
+import nova.compute
+import nova.context
from nova.api.openstack import common
from nova.api.openstack.views import addresses as addresses_view
from nova.api.openstack.views import flavors as flavors_view
@@ -25,28 +28,29 @@ from nova import utils
class ViewBuilder(object):
- '''
- Models a server response as a python dictionary.
+ """Model a server response as a python dictionary.
+
+ Public methods: build
Abstract methods: _build_image, _build_flavor
- '''
+
+ """
def __init__(self, addresses_builder):
self.addresses_builder = addresses_builder
def build(self, inst, is_detail):
- """
- Coerces into dictionary format, mapping everything to
- Rackspace-like attributes for return
- """
+ """Return a dict that represenst a server."""
if is_detail:
return self._build_detail(inst)
else:
return self._build_simple(inst)
def _build_simple(self, inst):
- return dict(server=dict(id=inst['id'], name=inst['display_name']))
+ """Return a simple model of a server."""
+ return dict(server=dict(id=inst['id'], name=inst['display_name']))
def _build_detail(self, inst):
+ """Returns a detailed model of a server."""
power_mapping = {
None: 'build',
power_state.NOSTATE: 'build',
@@ -58,18 +62,22 @@ class ViewBuilder(object):
power_state.SHUTOFF: 'active',
power_state.CRASHED: 'error',
power_state.FAILED: 'error'}
- inst_dict = {}
- inst_dict['id'] = int(inst['id'])
- inst_dict['name'] = inst['display_name']
- inst_dict['status'] = power_mapping[inst.get('state')]
- inst_dict['addresses'] = self.addresses_builder.build(inst)
+ inst_dict = {
+ 'id': int(inst['id']),
+ 'name': inst['display_name'],
+ 'addresses': self.addresses_builder.build(inst),
+ 'status': power_mapping[inst.get('state')]}
+
+ ctxt = nova.context.get_admin_context()
+ compute_api = nova.compute.API()
+ if compute_api.has_finished_migration(ctxt, inst['id']):
+ inst_dict['status'] = 'resize-confirm'
# Return the metadata as a dictionary
metadata = {}
- if 'metadata' in inst:
- for item in inst['metadata']:
- metadata[item['key']] = item['value']
+ for item in inst.get('metadata', []):
+ metadata[item['key']] = item['value']
inst_dict['metadata'] = metadata
inst_dict['hostId'] = ''
@@ -82,36 +90,36 @@ class ViewBuilder(object):
return dict(server=inst_dict)
def _build_image(self, response, inst):
+ """Return the image sub-resource of a server."""
raise NotImplementedError()
def _build_flavor(self, response, inst):
+ """Return the flavor sub-resource of a server."""
raise NotImplementedError()
class ViewBuilderV10(ViewBuilder):
+ """Model an Openstack API V1.0 server response."""
+
def _build_image(self, response, inst):
- if inst.get('image_id') != None:
- response['imageId'] = inst['image_id']
+ response['imageId'] = inst['image_id']
def _build_flavor(self, response, inst):
- if inst.get('instance_type') != None:
- response['flavorId'] = inst['instance_type']
+ response['flavorId'] = inst['instance_type']
class ViewBuilderV11(ViewBuilder):
+ """Model an Openstack API V1.0 server response."""
+
def __init__(self, addresses_builder, flavor_builder, image_builder):
ViewBuilder.__init__(self, addresses_builder)
self.flavor_builder = flavor_builder
self.image_builder = image_builder
def _build_image(self, response, inst):
- if inst.get('image_id') == None:
- return
image_id = inst["image_id"]
response["imageRef"] = self.image_builder.generate_href(image_id)
def _build_flavor(self, response, inst):
- if inst.get('instance_type') == None:
- return
flavor_id = inst["instance_type"]
response["flavorRef"] = self.flavor_builder.generate_href(flavor_id)
generated by cgit (git 2.34.1) at 2026-03-16 23:14:09 +0000