openstack
/
nova
Code Issues Proposed changes

Merge "Use plain routes list for server-security-groups instead of stevedore"

This commit is contained in:
Jenkins 2017-07-18 23:04:23 +00:00 committed by Gerrit Code Review
parent c327680309 75136bb5cd
commit 776df5c759
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nova/api/openstack/compute/routes.py
View File

@ -327,6 +327,10 @@ server_remote_consoles_controller = functools.partial(_create_controller,
remote_consoles.RemoteConsolesController, [], [])
server_security_groups_controller = functools.partial(_create_controller,
security_groups.ServerSecurityGroupController, [], [])
server_tags_controller = functools.partial(_create_controller,
server_tags.ServerTagsController, [], [])
@ -744,6 +748,9 @@ ROUTE_LIST = (
('/servers/{server_id}/remote-consoles', {
'POST': [server_remote_consoles_controller, 'create']
}),
('/servers/{server_id}/os-security-groups', {
'GET': [server_security_groups_controller, 'index']
}),
('/servers/{server_id}/tags', {
'GET': [server_tags_controller, 'index'],
'PUT': [server_tags_controller, 'update_all'],

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

@ -507,14 +507,10 @@ class SecurityGroups(extensions.V21APIExtensionBase):
return []
def get_resources(self):
server_secgrp_ext = extensions.ResourceExtension(
ALIAS,
controller=ServerSecurityGroupController(),
parent=dict(member_name='server', collection_name='servers'))
secgrp_rules_ext = extensions.ResourceExtension(
'os-security-group-rules',
controller=SecurityGroupRulesController())
return [server_secgrp_ext, secgrp_rules_ext]
return [secgrp_rules_ext]
# NOTE(gmann): This function is not supposed to use 'body_deprecated_param'