Merge "Move test_restore_server_invalid_state test to admin test"
diff --git a/tempest/api/compute/admin/test_servers_negative.py b/tempest/api/compute/admin/test_servers_negative.py
index f52d4c0..c933c80 100644
--- a/tempest/api/compute/admin/test_servers_negative.py
+++ b/tempest/api/compute/admin/test_servers_negative.py
@@ -65,6 +65,18 @@
self.s1_id,
flavor_ref['id'])
+ @decorators.attr(type=['negative'])
+ @decorators.idempotent_id('7fcadfab-bd6a-4753-8db7-4a51e51aade9')
+ def test_restore_server_invalid_state(self):
+ """Restore-deleting a server not in 'soft-delete' state should fail
+
+ We can restore a soft deleted server, but can't restore a server that
+ is not in 'soft-delete' state.
+ """
+ self.assertRaises(lib_exc.Conflict,
+ self.client.restore_soft_deleted_server,
+ self.s1_id)
+
@decorators.idempotent_id('7368a427-2f26-4ad9-9ba9-911a0ec2b0db')
@testtools.skipUnless(CONF.compute_feature_enabled.resize,
'Resize not available.')
diff --git a/tempest/api/compute/servers/test_servers_negative.py b/tempest/api/compute/servers/test_servers_negative.py
index 22fe54d..fa40629 100644
--- a/tempest/api/compute/servers/test_servers_negative.py
+++ b/tempest/api/compute/servers/test_servers_negative.py
@@ -472,18 +472,6 @@
self.client.restore_soft_deleted_server,
nonexistent_server)
- @decorators.attr(type=['negative'])
- @decorators.idempotent_id('7fcadfab-bd6a-4753-8db7-4a51e51aade9')
- def test_restore_server_invalid_state(self):
- """Restore-deleting a server not in 'soft-delete' state should fail
-
- We can restore a soft deleted server, but can't restore a server that
- is not in 'soft-delete' state.
- """
- self.assertRaises(lib_exc.Conflict,
- self.client.restore_soft_deleted_server,
- self.server_id)
-
@decorators.idempotent_id('abca56e2-a892-48ea-b5e5-e07e69774816')
@testtools.skipUnless(CONF.compute_feature_enabled.shelve,
'Shelve is not available.')