diff --git a/nova/api/openstack/compute/migrations.py b/nova/api/openstack/compute/migrations.py index e932d9ee5041..bdb4fae2a8a7 100644 --- a/nova/api/openstack/compute/migrations.py +++ b/nova/api/openstack/compute/migrations.py @@ -19,9 +19,6 @@ from nova.objects import base as obj_base from nova.policies import migrations as migrations_policies -ALIAS = "os-migrations" - - class MigrationsController(wsgi.Controller): """Controller for accessing migrations in OpenStack API.""" @@ -80,20 +77,3 @@ class MigrationsController(wsgi.Controller): return {'migrations': self._output(req, migrations, True)} return {'migrations': self._output(req, migrations)} - - -class Migrations(extensions.V21APIExtensionBase): - """Provide data on migrations.""" - name = "Migrations" - alias = ALIAS - version = 1 - - def get_resources(self): - resources = [] - resource = extensions.ResourceExtension(ALIAS, - MigrationsController()) - resources.append(resource) - return resources - - def get_controller_extensions(self): - return [] diff --git a/nova/api/openstack/compute/routes.py b/nova/api/openstack/compute/routes.py index 33d2e85e91cf..287ffbc42f29 100644 --- a/nova/api/openstack/compute/routes.py +++ b/nova/api/openstack/compute/routes.py @@ -49,6 +49,7 @@ from nova.api.openstack.compute import instance_usage_audit_log from nova.api.openstack.compute import keypairs from nova.api.openstack.compute import lock_server from nova.api.openstack.compute import migrate_server +from nova.api.openstack.compute import migrations from nova.api.openstack.compute import multinic from nova.api.openstack.compute import pause_server from nova.api.openstack.compute import quota_sets @@ -159,6 +160,10 @@ instance_usage_audit_log_controller = functools.partial(_create_controller, instance_usage_audit_log.InstanceUsageAuditLogController, [], []) +migrations_controller = functools.partial(_create_controller, + migrations.MigrationsController, [], []) + + quota_set_controller = functools.partial(_create_controller, quota_sets.QuotaSetsController, [], []) @@ -342,6 +347,9 @@ ROUTE_LIST = ( 'GET': [keypairs_controller, 'show'], 'DELETE': [keypairs_controller, 'delete'] }), + ('/os-migrations', { + 'GET': [migrations_controller, 'index'] + }), ('/os-quota-sets/{id}', { 'GET': [quota_set_controller, 'show'], 'PUT': [quota_set_controller, 'update'], diff --git a/setup.cfg b/setup.cfg index 5f15c51e9c15..3dca6a46a3ef 100644 --- a/setup.cfg +++ b/setup.cfg @@ -89,7 +89,6 @@ nova.api.v21.extensions = instance_actions = nova.api.openstack.compute.instance_actions:InstanceActions ips = nova.api.openstack.compute.ips:IPs limits = nova.api.openstack.compute.limits:Limits - migrations = nova.api.openstack.compute.migrations:Migrations multiple_create = nova.api.openstack.compute.multiple_create:MultipleCreate networks = nova.api.openstack.compute.networks:Networks networks_associate = nova.api.openstack.compute.networks_associate:NetworksAssociate