openstack/nova
Code Issues Proposed changes

Merge "Merge server create for security group extension"

Browse Source
This commit is contained in:
Zuul 2018-07-09 12:18:28 +00:00 committed by Gerrit Code Review
commit c0350da4a1
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nova/api/openstack/compute/security_groups.py
View File

@ -540,14 +540,3 @@ class SecurityGroupsOutputController(wsgi.Controller):
@wsgi.extends @wsgi.extends
def detail(self, req, resp_obj): def detail(self, req, resp_obj):
self._extend_servers(req, list(resp_obj.obj['servers'])) self._extend_servers(req, list(resp_obj.obj['servers']))
# 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.
def server_create(server_dict, create_kwargs, body_deprecated_param):
security_groups = server_dict.get(ATTRIBUTE_NAME)
if security_groups is not None:
create_kwargs['security_groups'] = [
sg['name'] for sg in security_groups if sg.get('name')]
create_kwargs['security_groups'] = list(
set(create_kwargs['security_groups']))

8
nova/api/openstack/compute/servers.py
View File

@ -35,7 +35,6 @@ from nova.api.openstack.compute import keypairs
from nova.api.openstack.compute import multiple_create from nova.api.openstack.compute import multiple_create
from nova.api.openstack.compute import scheduler_hints from nova.api.openstack.compute import scheduler_hints
from nova.api.openstack.compute.schemas import servers as schema_servers from nova.api.openstack.compute.schemas import servers as schema_servers
from nova.api.openstack.compute import security_groups
from nova.api.openstack.compute.views import servers as views_servers from nova.api.openstack.compute.views import servers as views_servers
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova.api import validation from nova.api import validation
@ -74,7 +73,6 @@ class ServersController(wsgi.Controller):
keypairs.server_create, keypairs.server_create,
multiple_create.server_create, multiple_create.server_create,
scheduler_hints.server_create, scheduler_hints.server_create,
security_groups.server_create,
] ]
@staticmethod @staticmethod
@ -435,6 +433,12 @@ class ServersController(wsgi.Controller):
# all of extended code into ServersController. # all of extended code into ServersController.
self._create_by_func_list(server_dict, create_kwargs, body) self._create_by_func_list(server_dict, create_kwargs, body)
create_kwargs['user_data'] = server_dict.get('user_data') create_kwargs['user_data'] = server_dict.get('user_data')
security_groups = server_dict.get('security_groups')
if security_groups is not None:
create_kwargs['security_groups'] = [
sg['name'] for sg in security_groups if sg.get('name')]
create_kwargs['security_groups'] = list(
set(create_kwargs['security_groups']))
availability_zone = server_dict.pop("availability_zone", None) availability_zone = server_dict.pop("availability_zone", None)