3409c0e26d
It's unusual to include a '+00:00' offset in an ISO8601 timestamp rather than just using the 'Z' suffix. It's also very weird for our API to be returning timestamps which aren't in UTC. Let's make these timestamps consistent with other timestamps by using UTC always and representing that with a 'Z' suffix. Also, enforce this in the API sample tests by using a new 'isotime' regexp. A small number of the extensions in the API sample templates specified the exact timestamp, so templatize those before regenerating the API samples for GET /extensions. Full context here: http://lists.openstack.org/pipermail/openstack-dev/2014-April/033971.html Change-Id: Idf429e55e4ae13738ac531a25ce54b20d395410d
100 lines
3.8 KiB
Python
100 lines
3.8 KiB
Python
# Copyright 2011 OpenStack Foundation
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
"""The Extended Status Admin API extension."""
|
|
|
|
from nova.api.openstack import extensions
|
|
from nova.api.openstack import wsgi
|
|
from nova.api.openstack import xmlutil
|
|
from nova import compute
|
|
|
|
authorize = extensions.soft_extension_authorizer('compute', 'extended_status')
|
|
|
|
|
|
class ExtendedStatusController(wsgi.Controller):
|
|
def __init__(self, *args, **kwargs):
|
|
super(ExtendedStatusController, self).__init__(*args, **kwargs)
|
|
self.compute_api = compute.API()
|
|
|
|
def _extend_server(self, server, instance):
|
|
for state in ['task_state', 'vm_state', 'power_state']:
|
|
key = "%s:%s" % (Extended_status.alias, state)
|
|
server[key] = instance[state]
|
|
|
|
@wsgi.extends
|
|
def show(self, req, resp_obj, id):
|
|
context = req.environ['nova.context']
|
|
if authorize(context):
|
|
# Attach our slave template to the response object
|
|
resp_obj.attach(xml=ExtendedStatusTemplate())
|
|
server = resp_obj.obj['server']
|
|
db_instance = req.get_db_instance(server['id'])
|
|
# server['id'] is guaranteed to be in the cache due to
|
|
# the core API adding it in its 'show' method.
|
|
self._extend_server(server, db_instance)
|
|
|
|
@wsgi.extends
|
|
def detail(self, req, resp_obj):
|
|
context = req.environ['nova.context']
|
|
if authorize(context):
|
|
# Attach our slave template to the response object
|
|
resp_obj.attach(xml=ExtendedStatusesTemplate())
|
|
servers = list(resp_obj.obj['servers'])
|
|
for server in servers:
|
|
db_instance = req.get_db_instance(server['id'])
|
|
# server['id'] is guaranteed to be in the cache due to
|
|
# the core API adding it in its 'detail' method.
|
|
self._extend_server(server, db_instance)
|
|
|
|
|
|
class Extended_status(extensions.ExtensionDescriptor):
|
|
"""Extended Status support."""
|
|
|
|
name = "ExtendedStatus"
|
|
alias = "OS-EXT-STS"
|
|
namespace = ("http://docs.openstack.org/compute/ext/"
|
|
"extended_status/api/v1.1")
|
|
updated = "2011-11-03T00:00:00Z"
|
|
|
|
def get_controller_extensions(self):
|
|
controller = ExtendedStatusController()
|
|
extension = extensions.ControllerExtension(self, 'servers', controller)
|
|
return [extension]
|
|
|
|
|
|
def make_server(elem):
|
|
elem.set('{%s}task_state' % Extended_status.namespace,
|
|
'%s:task_state' % Extended_status.alias)
|
|
elem.set('{%s}power_state' % Extended_status.namespace,
|
|
'%s:power_state' % Extended_status.alias)
|
|
elem.set('{%s}vm_state' % Extended_status.namespace,
|
|
'%s:vm_state' % Extended_status.alias)
|
|
|
|
|
|
class ExtendedStatusTemplate(xmlutil.TemplateBuilder):
|
|
def construct(self):
|
|
root = xmlutil.TemplateElement('server', selector='server')
|
|
make_server(root)
|
|
return xmlutil.SlaveTemplate(root, 1, nsmap={
|
|
Extended_status.alias: Extended_status.namespace})
|
|
|
|
|
|
class ExtendedStatusesTemplate(xmlutil.TemplateBuilder):
|
|
def construct(self):
|
|
root = xmlutil.TemplateElement('servers')
|
|
elem = xmlutil.SubTemplateElement(root, 'server', selector='servers')
|
|
make_server(elem)
|
|
return xmlutil.SlaveTemplate(root, 1, nsmap={
|
|
Extended_status.alias: Extended_status.namespace})
|