He Jie Xu
4354163c1e
In the V2 API, there are three cases for the name field: 1. disallow any space in the name: server_groups. 2. allow leading/trailing whitespaces, strip spaces and disallow all characters are spaces: flavor_manage, servers. 3. allow leading/trailing whitespacess, no strip spaces and allow all characters are spaces: aggregates, cells, create_backup, security_groups, create_image, rebuild But currently in the V2.1 API and V2.1 API compat mode disallows leading/trailing in the name field. For the V2.1 compat mode, we should relax the validation to avoid breaking the user, although leading/trailing is unclear usecase. This patch allows leading/trailing spaces but will strip them, and still disallows that all characters are spaces in the name fields for flavor_mange, servers, aggregates(and availability_zones), create_backup, create_image, rebuild. Due to the server_groups and security_groups(no jsons-schema in v2.1) have consistent behavior between v2 and v2.1. So this patch won't change server_groups. But when creating servers, the name of security_groups, availability_zone and keyapir isn't stripped the leading/trailing spaces. This is for backward compatible with users who already use legacy V2 API created security_group, availabilit_zone and keypair with leading/trailing in the name, otherwise the users can't use those resource anymore. For supporting servers schema extension point returns legacy v2 schema, this patch adds version parameter to the schema extension point. Then extension point can return different schema based on the version parameter. Change-Id: I9442891272284d395ea0dd8cfa302d3f74bf13ec Partial-Bug: #1498075
106 lines
3.7 KiB
Python
106 lines
3.7 KiB
Python
# Copyright 2013 IBM Corp.
|
|
#
|
|
# 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.
|
|
|
|
from nova.api.openstack.compute.schemas import access_ips
|
|
from nova.api.openstack import extensions
|
|
from nova.api.openstack import wsgi
|
|
|
|
ALIAS = "os-access-ips"
|
|
authorize = extensions.os_compute_soft_authorizer(ALIAS)
|
|
|
|
|
|
class AccessIPsController(wsgi.Controller):
|
|
def _extend_server(self, req, server):
|
|
db_instance = req.get_db_instance(server['id'])
|
|
ip_v4 = db_instance.get('access_ip_v4')
|
|
ip_v6 = db_instance.get('access_ip_v6')
|
|
server['accessIPv4'] = str(ip_v4) if ip_v4 is not None else ''
|
|
server['accessIPv6'] = str(ip_v6) if ip_v6 is not None else ''
|
|
|
|
@wsgi.extends
|
|
def show(self, req, resp_obj, id):
|
|
context = req.environ['nova.context']
|
|
if authorize(context):
|
|
server = resp_obj.obj['server']
|
|
self._extend_server(req, server)
|
|
|
|
@wsgi.extends
|
|
def update(self, req, resp_obj, id, body):
|
|
context = req.environ['nova.context']
|
|
if authorize(context):
|
|
server = resp_obj.obj['server']
|
|
self._extend_server(req, server)
|
|
|
|
@wsgi.extends(action='rebuild')
|
|
def rebuild(self, req, resp_obj, id, body):
|
|
context = req.environ['nova.context']
|
|
if authorize(context):
|
|
server = resp_obj.obj['server']
|
|
self._extend_server(req, server)
|
|
|
|
@wsgi.extends
|
|
def detail(self, req, resp_obj):
|
|
context = req.environ['nova.context']
|
|
if authorize(context):
|
|
servers = resp_obj.obj['servers']
|
|
for server in servers:
|
|
self._extend_server(req, server)
|
|
|
|
|
|
class AccessIPs(extensions.V21APIExtensionBase):
|
|
"""Access IPs support."""
|
|
|
|
name = "AccessIPs"
|
|
alias = ALIAS
|
|
version = 1
|
|
v4_key = 'accessIPv4'
|
|
v6_key = 'accessIPv6'
|
|
|
|
def get_controller_extensions(self):
|
|
controller = AccessIPsController()
|
|
extension = extensions.ControllerExtension(self, 'servers',
|
|
controller)
|
|
return [extension]
|
|
|
|
def get_resources(self):
|
|
return []
|
|
|
|
# NOTE(gmann): This function is not supposed to use 'body_deprecated_param'
|
|
# parameter as this is placed to handle scheduler_hint extension for V2.1.
|
|
# making 'body_deprecated_param' as optional to avoid changes for
|
|
# server_update & server_rebuild
|
|
def server_create(self, server_dict, create_kwargs,
|
|
body_deprecated_param=None):
|
|
if AccessIPs.v4_key in server_dict:
|
|
access_ip_v4 = server_dict.get(AccessIPs.v4_key)
|
|
if access_ip_v4:
|
|
create_kwargs['access_ip_v4'] = access_ip_v4
|
|
else:
|
|
create_kwargs['access_ip_v4'] = None
|
|
if AccessIPs.v6_key in server_dict:
|
|
access_ip_v6 = server_dict.get(AccessIPs.v6_key)
|
|
if access_ip_v6:
|
|
create_kwargs['access_ip_v6'] = access_ip_v6
|
|
else:
|
|
create_kwargs['access_ip_v6'] = None
|
|
|
|
server_update = server_create
|
|
server_rebuild = server_create
|
|
|
|
def get_server_create_schema(self, version):
|
|
return access_ips.server_create
|
|
|
|
get_server_update_schema = get_server_create_schema
|
|
get_server_rebuild_schema = get_server_create_schema
|