openstack
/
manila
Code Issues Proposed changes

Merge "[Tempest] Fix tests for pre-existing share network" into stable/ocata

This commit is contained in:
Zuul 2018-06-25 23:15:38 +00:00 committed by Gerrit Code Review
parent fda79f4ce4 ed62a751c5
commit a0d23e55ab
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manila_tempest_tests/tests/api/admin/test_share_servers.py
View File

@ -195,6 +195,9 @@ class ShareServersAdminTest(base.BaseSharesAdminTest):
@tc.attr(base.TAG_POSITIVE, base.TAG_API_WITH_BACKEND)
@ddt.data(True, False)
@testtools.skipIf(CONF.share.share_network_id != "",
"This test is not suitable for pre-existing "
"share_network.")
def test_delete_share_server(self, delete_share_network):
# Get network and subnet from existing share_network and reuse it
# to be able to delete share_server after test ends.

11
manila_tempest_tests/tests/api/base.py
View File

@ -406,7 +406,9 @@ class BaseSharesTest(test.BaseTestCase):
cleanup_in_class=True, is_public=False, **kwargs):
client = client or cls.shares_v2_client
description = description or "Tempest's share"
share_network_id = share_network_id or client.share_network_id or None
share_network_id = (share_network_id or
CONF.share.share_network_id or
client.share_network_id or None)
metadata = metadata or {}
size = size or CONF.share.share_size
kwargs.update({
@ -885,9 +887,10 @@ class BaseSharesTest(test.BaseTestCase):
elif res["type"] is "snapshot":
client.delete_snapshot(res_id)
client.wait_for_resource_deletion(snapshot_id=res_id)
elif res["type"] is "share_network":
client.delete_share_network(res_id)
client.wait_for_resource_deletion(sn_id=res_id)
elif (res["type"] is "share_network" and
res_id != CONF.share.share_network_id):
client.delete_share_network(res_id)
client.wait_for_resource_deletion(sn_id=res_id)
elif res["type"] is "security_service":
client.delete_security_service(res_id)
client.wait_for_resource_deletion(ss_id=res_id)

3
manila_tempest_tests/tests/api/test_share_networks_negative.py
View File

@ -111,6 +111,9 @@ class ShareNetworksNegativeTest(base.BaseSharesTest):
@testtools.skipIf(not CONF.share.multitenancy_enabled,
'Can run only with drivers that do handle share servers '
'creation. Skipping.')
@testtools.skipIf(CONF.share.share_network_id != "",
"This test is not suitable for pre-existing "
"share_network.")
def test_try_delete_share_network_with_existing_shares(self):
# Get valid network data for successful share creation
share_network = self.shares_client.get_share_network(