Move admin_only_action_common out of v3 directory(cleanup)

This patch moves admin_only_action_common test case out of v3 directory to compute directory since it will be removed in future Partially implements blueprint v2-on-v3-api Change-Id: I4578fb8212adeda2b433059937e4946fd3549006
openstack · Dec 4, 2014 · 23c5f10 · 23c5f10
1 parent 86ad93c
commit 23c5f10
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 12 deletions.
diff --git a/...te/plugins/v3/admin_only_action_common.py → ...stack/compute/admin_only_action_common.py b/...te/plugins/v3/admin_only_action_common.py → ...stack/compute/admin_only_action_common.py
diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_admin_actions.py b/nova/tests/unit/api/openstack/compute/contrib/test_admin_actions.py
@@ -24,8 +24,7 @@
 from nova import objects
 from nova.openstack.common import uuidutils
 from nova import test
-from nova.tests.unit.api.openstack.compute.plugins.v3 import \
-     admin_only_action_common
+from nova.tests.unit.api.openstack.compute import admin_only_action_common
 from nova.tests.unit.api.openstack import fakes
 
 

diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_create_backup.py b/nova/tests/unit/api/openstack/compute/contrib/test_create_backup.py
@@ -20,8 +20,7 @@
     create_backup_v21
 from nova.openstack.common import uuidutils
 from nova import test
-from nova.tests.unit.api.openstack.compute.plugins.v3 import \
-     admin_only_action_common
+from nova.tests.unit.api.openstack.compute import admin_only_action_common
 from nova.tests.unit.api.openstack import fakes
 
 

diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_lock_server.py b/nova/tests/unit/api/openstack/compute/contrib/test_lock_server.py
@@ -18,8 +18,7 @@
 from nova.api.openstack.compute.plugins.v3 import lock_server as \
     lock_server_v21
 from nova import exception
-from nova.tests.unit.api.openstack.compute.plugins.v3 import \
-     admin_only_action_common
+from nova.tests.unit.api.openstack.compute import admin_only_action_common
 from nova.tests.unit.api.openstack import fakes
 
 

diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_migrate_server.py b/nova/tests/unit/api/openstack/compute/contrib/test_migrate_server.py
@@ -16,8 +16,7 @@
 from nova.api.openstack.compute.plugins.v3 import migrate_server
 from nova import exception
 from nova.openstack.common import uuidutils
-from nova.tests.unit.api.openstack.compute.plugins.v3 import \
-     admin_only_action_common
+from nova.tests.unit.api.openstack.compute import admin_only_action_common
 from nova.tests.unit.api.openstack import fakes
 
 

diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_pause_server.py b/nova/tests/unit/api/openstack/compute/contrib/test_pause_server.py
@@ -17,8 +17,7 @@
     pause_server_v2
 from nova.api.openstack.compute.plugins.v3 import pause_server as \
     pause_server_v21
-from nova.tests.unit.api.openstack.compute.plugins.v3 import \
-     admin_only_action_common
+from nova.tests.unit.api.openstack.compute import admin_only_action_common
 from nova.tests.unit.api.openstack import fakes
 
 

diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_suspend_server.py b/nova/tests/unit/api/openstack/compute/contrib/test_suspend_server.py
@@ -16,8 +16,7 @@
     suspend_server_v2
 from nova.api.openstack.compute.plugins.v3 import suspend_server as \
     suspend_server_v21
-from nova.tests.unit.api.openstack.compute.plugins.v3 import \
-     admin_only_action_common
+from nova.tests.unit.api.openstack.compute import admin_only_action_common
 from nova.tests.unit.api.openstack import fakes