Merge "Use plain routes list for os-tenant-networks instead of stevedore"

This commit is contained in:
Jenkins 2017-06-19 20:15:58 +00:00 committed by Gerrit Code Review
commit fc4e609857
3 changed files with 13 additions and 18 deletions

View File

@ -80,6 +80,7 @@ from nova.api.openstack.compute import services
from nova.api.openstack.compute import shelve
from nova.api.openstack.compute import simple_tenant_usage
from nova.api.openstack.compute import suspend_server
from nova.api.openstack.compute import tenant_networks
from nova.api.openstack.compute import used_limits
from nova.api.openstack.compute import virtual_interfaces
from nova.api.openstack import wsgi
@ -305,6 +306,10 @@ simple_tenant_usage_controller = functools.partial(_create_controller,
simple_tenant_usage.SimpleTenantUsageController, [], [])
tenant_networks_controller = functools.partial(_create_controller,
tenant_networks.TenantNetworkController, [], [])
virtual_interfaces_controller = functools.partial(_create_controller,
virtual_interfaces.ServerVirtualInterfaceController, [], [])
@ -540,6 +545,14 @@ ROUTE_LIST = (
('/os-simple-tenant-usage/{id}', {
'GET': [simple_tenant_usage_controller, 'show']
}),
('/os-tenant-networks', {
'GET': [tenant_networks_controller, 'index'],
'POST': [tenant_networks_controller, 'create']
}),
('/os-tenant-networks/{id}', {
'GET': [tenant_networks_controller, 'show'],
'DELETE': [tenant_networks_controller, 'delete']
}),
('/os-volumes_boot', {
'GET': [server_controller, 'index'],
'POST': [server_controller, 'create']

View File

@ -37,8 +37,6 @@ from nova import quota
CONF = nova.conf.CONF
ALIAS = 'os-tenant-networks'
QUOTAS = quota.QUOTAS
LOG = logging.getLogger(__name__)
@ -184,21 +182,6 @@ class TenantNetworkController(wsgi.Controller):
return {"network": network_dict(networks[0])}
class TenantNetworks(extensions.V21APIExtensionBase):
"""Tenant-based Network Management Extension."""
name = "OSTenantNetworks"
alias = ALIAS
version = 1
def get_resources(self):
ext = extensions.ResourceExtension(ALIAS, TenantNetworkController())
return [ext]
def get_controller_extensions(self):
return []
def _sync_networks(context, project_id, session):
ctx = nova_context.RequestContext(user_id=None, project_id=project_id)
ctx = ctx.elevated()

View File

@ -84,7 +84,6 @@ nova.api.v21.extensions =
remote_consoles = nova.api.openstack.compute.remote_consoles:RemoteConsoles
security_group_default_rules = nova.api.openstack.compute.security_group_default_rules:SecurityGroupDefaultRules
security_groups = nova.api.openstack.compute.security_groups:SecurityGroups
tenant_networks = nova.api.openstack.compute.tenant_networks:TenantNetworks
versions = nova.api.openstack.compute.versionsV21:Versions
volumes = nova.api.openstack.compute.volumes:Volumes