diff --git a/manila/api/v1/router.py b/manila/api/v1/router.py index 3e16b5c1d5..bcf75ce294 100644 --- a/manila/api/v1/router.py +++ b/manila/api/v1/router.py @@ -26,7 +26,6 @@ import manila.api.openstack from manila.api.v1 import limits from manila.api.v1 import scheduler_stats from manila.api.v1 import security_service -from manila.api.v1 import share_instances from manila.api.v1 import share_manage from manila.api.v1 import share_metadata from manila.api.v1 import share_networks @@ -101,18 +100,6 @@ class APIRouter(manila.api.openstack.APIRouter): collection={'detail': 'GET'}, member={'action': 'POST'}) - self.resources['share_instances'] = share_instances.create_resource() - mapper.resource("share_instance", "share_instances", - controller=self.resources['share_instances'], - collection={'detail': 'GET'}, - member={'action': 'POST'}) - - mapper.connect("share_instance", - "/{project_id}/shares/{share_id}/instances", - controller=self.resources['share_instances'], - action='get_share_instances', - conditions={"method": ['GET']}) - self.resources['snapshots'] = share_snapshots.create_resource() mapper.resource("snapshot", "snapshots", controller=self.resources['snapshots'], diff --git a/manila/api/v2/router.py b/manila/api/v2/router.py index 2e4e5bb2a9..14998bdb80 100644 --- a/manila/api/v2/router.py +++ b/manila/api/v2/router.py @@ -27,7 +27,6 @@ import manila.api.openstack from manila.api.v1 import limits from manila.api.v1 import scheduler_stats from manila.api.v1 import security_service -from manila.api.v1 import share_instances from manila.api.v1 import share_manage from manila.api.v1 import share_metadata from manila.api.v1 import share_networks @@ -41,6 +40,7 @@ from manila.api.v2 import consistency_groups from manila.api.v2 import quota_class_sets from manila.api.v2 import quota_sets from manila.api.v2 import services +from manila.api.v2 import share_instances from manila.api.v2 import share_types from manila.api.v2 import shares from manila.api import versions diff --git a/manila/api/v1/share_instances.py b/manila/api/v2/share_instances.py similarity index 100% rename from manila/api/v1/share_instances.py rename to manila/api/v2/share_instances.py diff --git a/manila/tests/api/v1/test_share_instances.py b/manila/tests/api/v2/test_share_instances.py similarity index 99% rename from manila/tests/api/v1/test_share_instances.py rename to manila/tests/api/v2/test_share_instances.py index 8fd4a08fe1..b6840b9a11 100644 --- a/manila/tests/api/v1/test_share_instances.py +++ b/manila/tests/api/v2/test_share_instances.py @@ -17,7 +17,7 @@ from oslo_serialization import jsonutils import six from webob import exc as webob_exc -from manila.api.v1 import share_instances +from manila.api.v2 import share_instances from manila.common import constants from manila import context from manila import db