Merge "Rename API schema modules with removing "_schema""

openstack/nova

Code Issues Proposed changes

Browse Source

This commit is contained in:

Jenkins

2014年02月04日 20:24:43 +00:00

committed by Gerrit Code Review

parent b7e9257292 fb199c0564

commit d9fe8832d5

10 changed files with 14 additions and 18 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

5
nova/api/openstack/compute/plugins/v3/admin_password.py

View File

@@ -15,7 +15,7 @@

from webob import exc

from nova.api.openstack import common

from nova.api.openstack.compute.schemas.v3 import admin_password_schema

from nova.api.openstack.compute.schemas.v3 import admin_password

from nova.api.openstack import extensions

from nova.api.openstack import wsgi

from nova.api import validation

@@ -37,8 +37,7 @@ class AdminPasswordController(wsgi.Controller):

@wsgi.action('change_password')

@wsgi.response(204)

@extensions.expected_errors((400, 404, 409, 501))

@validation.schema(request_body_schema=

admin_password_schema.change_password)

@validation.schema(admin_password.change_password)

def change_password(self, req, id, body):

context = req.environ['nova.context']

authorize(context)

6
nova/api/openstack/compute/plugins/v3/agents.py

View File

@@ -15,7 +15,7 @@

import webob.exc

from nova.api.openstack.compute.schemas.v3 import agents_schema

from nova.api.openstack.compute.schemas.v3 import agents as schema

from nova.api.openstack import extensions

from nova.api.openstack import wsgi

from nova.api import validation

@@ -74,7 +74,7 @@ class AgentController(object):

return {'agents': agents}

@extensions.expected_errors((400, 404))

@validation.schema(request_body_schema=agents_schema.update)

@validation.schema(schema.update)

def update(self, req, id, body):

"""Update an existing agent build."""

context = req.environ['nova.context']

@@ -110,7 +110,7 @@ class AgentController(object):

@extensions.expected_errors((400, 409))

@wsgi.response(201)

@validation.schema(request_body_schema=agents_schema.create)

@validation.schema(schema.create)

def create(self, req, body):

"""Creates a new agent build."""

context = req.environ['nova.context']

9
nova/api/openstack/compute/plugins/v3/extended_volumes.py

View File

@@ -17,7 +17,7 @@ import webob

from webob import exc

from nova.api.openstack import common

from nova.api.openstack.compute.schemas.v3 import extended_volumes_schema

from nova.api.openstack.compute.schemas.v3 import extended_volumes

from nova.api.openstack import extensions

from nova.api.openstack import wsgi

from nova.api import validation

@@ -52,8 +52,7 @@ class ExtendedVolumesController(wsgi.Controller):

@extensions.expected_errors((400, 404, 409))

@wsgi.action('swap_volume_attachment')

@validation.schema(request_body_schema=

extended_volumes_schema.swap_volume_attachment)

@validation.schema(extended_volumes.swap_volume_attachment)

def swap(self, req, id, body):

context = req.environ['nova.context']

authorize_swap(context)

@@ -126,7 +125,7 @@ class ExtendedVolumesController(wsgi.Controller):

@extensions.expected_errors((400, 404, 409))

@wsgi.response(202)

@wsgi.action('attach')

@validation.schema(request_body_schema=extended_volumes_schema.attach)

@validation.schema(extended_volumes.attach)

def attach(self, req, id, body):

server_id = id

context = req.environ['nova.context']

@@ -161,7 +160,7 @@ class ExtendedVolumesController(wsgi.Controller):

@extensions.expected_errors((400, 404, 409))

@wsgi.response(202)

@wsgi.action('detach')

@validation.schema(request_body_schema=extended_volumes_schema.detach)

@validation.schema(extended_volumes.detach)

def detach(self, req, id, body):

server_id = id

context = req.environ['nova.context']

8
nova/api/openstack/compute/plugins/v3/flavor_access.py

View File

@@ -17,7 +17,7 @@

import webob

from nova.api.openstack.compute.schemas.v3 import flavor_access_schema

from nova.api.openstack.compute.schemas.v3 import flavor_access

from nova.api.openstack import extensions

from nova.api.openstack import wsgi

from nova.api import validation

@@ -107,8 +107,7 @@ class FlavorActionController(wsgi.Controller):

@extensions.expected_errors((400, 403, 404, 409))

@wsgi.action("add_tenant_access")

@validation.schema(request_body_schema=

flavor_access_schema.add_tenant_access)

@validation.schema(flavor_access.add_tenant_access)

def _add_tenant_access(self, req, id, body):

context = req.environ['nova.context']

authorize(context, action="add_tenant_access")

@@ -129,8 +128,7 @@ class FlavorActionController(wsgi.Controller):

@extensions.expected_errors((400, 403, 404))

@wsgi.action("remove_tenant_access")

@validation.schema(request_body_schema=

flavor_access_schema.remove_tenant_access)

@validation.schema(flavor_access.remove_tenant_access)

def _remove_tenant_access(self, req, id, body):

context = req.environ['nova.context']

authorize(context, action="remove_tenant_access")

4
nova/api/openstack/compute/plugins/v3/keypairs.py

View File

@@ -18,7 +18,7 @@

import webob

import webob.exc

from nova.api.openstack.compute.schemas.v3 import keypairs_schema

from nova.api.openstack.compute.schemas.v3 import keypairs

from nova.api.openstack import extensions

from nova.api.openstack import wsgi

from nova.api import validation

@@ -50,7 +50,7 @@ class KeypairController(object):

@extensions.expected_errors((400, 409, 413))

@wsgi.response(201)

@validation.schema(request_body_schema=keypairs_schema.create)

@validation.schema(keypairs.create)

def create(self, req, body):

"""

Create or import keypair.