cdeeb37edc
Now that most extensions are getting instance objects from common.get_instance, we can cleanup the stragglers and remove the kwarg to verify we're using instance objects everywhere for the API extensions. While in the process, this also converts some extensions to use common.get_instance rather than directly going to compute_api.get. Part of blueprint kilo-objects Change-Id: Ia377c66f9e2f298e46d89f2e54d032b72fd7fa90
73 lines
2.7 KiB
Python
73 lines
2.7 KiB
Python
# Copyright 2011 OpenStack Foundation
|
|
# All Rights Reserved.
|
|
#
|
|
# 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.
|
|
|
|
import webob.exc
|
|
|
|
from nova.api.openstack import common
|
|
from nova.api.openstack import extensions
|
|
from nova.api.openstack import wsgi
|
|
from nova import compute
|
|
from nova import exception
|
|
from nova.i18n import _
|
|
|
|
|
|
ALIAS = "os-server-diagnostics"
|
|
authorize = extensions.os_compute_authorizer(ALIAS)
|
|
|
|
|
|
class ServerDiagnosticsController(wsgi.Controller):
|
|
def __init__(self):
|
|
self.compute_api = compute.API(skip_policy_check=True)
|
|
|
|
@extensions.expected_errors((404, 409, 501))
|
|
def index(self, req, server_id):
|
|
context = req.environ["nova.context"]
|
|
authorize(context)
|
|
|
|
instance = common.get_instance(self.compute_api, context, server_id)
|
|
|
|
try:
|
|
# NOTE(gmann): To make V21 same as V2 API, this method will call
|
|
# 'get_diagnostics' instead of 'get_instance_diagnostics'.
|
|
# In future, 'get_instance_diagnostics' needs to be called to
|
|
# provide VM diagnostics in a defined format for all driver.
|
|
# BP - https://blueprints.launchpad.net/nova/+spec/v3-diagnostics.
|
|
return self.compute_api.get_diagnostics(context, instance)
|
|
except exception.InstanceInvalidState as state_error:
|
|
common.raise_http_conflict_for_instance_invalid_state(state_error,
|
|
'get_diagnostics', server_id)
|
|
except NotImplementedError:
|
|
msg = _("Unable to get diagnostics, functionality not implemented")
|
|
raise webob.exc.HTTPNotImplemented(explanation=msg)
|
|
|
|
|
|
class ServerDiagnostics(extensions.V3APIExtensionBase):
|
|
"""Allow Admins to view server diagnostics through server action."""
|
|
|
|
name = "ServerDiagnostics"
|
|
alias = ALIAS
|
|
version = 1
|
|
|
|
def get_resources(self):
|
|
parent_def = {'member_name': 'server', 'collection_name': 'servers'}
|
|
resources = [
|
|
extensions.ResourceExtension('diagnostics',
|
|
ServerDiagnosticsController(),
|
|
parent=parent_def)]
|
|
return resources
|
|
|
|
def get_controller_extensions(self):
|
|
return []
|