Move share server creation check under admin test suite
Getting "share_server_id" parameter requires an admin client.
Therefore it should be placed whithin the admin test suite.
Change-Id: I17c64b8ffe0538309bdd823c723dbf1176a92754
diff --git a/manila_tempest_tests/tests/api/admin/test_admin_actions.py b/manila_tempest_tests/tests/api/admin/test_admin_actions.py
index ed5f962..adb0160 100644
--- a/manila_tempest_tests/tests/api/admin/test_admin_actions.py
+++ b/manila_tempest_tests/tests/api/admin/test_admin_actions.py
@@ -155,3 +155,16 @@
waiters.wait_for_resource_status(
self.shares_v2_client, self.sh["id"], task_state,
status_attr='task_state')
+
+ @decorators.idempotent_id('4233b941-a909-4f35-9ec9-753736949dd2')
+ @tc.attr(base.TAG_POSITIVE, base.TAG_API_WITH_BACKEND)
+ def test_ensure_share_server_creation_when_dhss_enabled(self):
+ # This check will ensure that when a share creation request is handled,
+ # if the driver has the "driver handles share servers" option enabled,
+ # that a share server will be created, otherwise, not.
+ share_get = self.admin_shares_v2_client.get_share(self.sh['id'])
+ share_server = share_get['share_server_id']
+ if CONF.share.multitenancy_enabled:
+ self.assertNotEmpty(share_server)
+ else:
+ self.assertEmpty(share_server)
diff --git a/manila_tempest_tests/tests/api/test_shares.py b/manila_tempest_tests/tests/api/test_shares.py
index 76204df..8802f4c 100644
--- a/manila_tempest_tests/tests/api/test_shares.py
+++ b/manila_tempest_tests/tests/api/test_shares.py
@@ -116,16 +116,6 @@
detailed_elements.add('progress')
self.assertTrue(detailed_elements.issubset(share.keys()), msg)
- # This check will ensure that when a share creation request is handled,
- # if the driver has the "driver handles share servers" option enabled,
- # that a share server will be created, otherwise, not.
- share_get = self.admin_shares_v2_client.get_share(share['id'])
- share_server = share_get['share_server_id']
- if CONF.share.multitenancy_enabled:
- self.assertNotEmpty(share_server)
- else:
- self.assertEmpty(share_server)
-
# Delete share
self.shares_v2_client.delete_share(share['id'])
self.shares_v2_client.wait_for_resource_deletion(share_id=share['id'])