Merge "Refactor share metadata tests"
diff --git a/manila_tempest_tests/config.py b/manila_tempest_tests/config.py
index 1758064..b62c409 100644
--- a/manila_tempest_tests/config.py
+++ b/manila_tempest_tests/config.py
@@ -40,7 +40,7 @@
"This value is only used to validate the versions "
"response from Manila."),
cfg.StrOpt("max_api_microversion",
- default="2.70",
+ default="2.71",
help="The maximum api microversion is configured to be the "
"value of the latest microversion supported by Manila."),
cfg.StrOpt("region",
diff --git a/manila_tempest_tests/tests/api/admin/test_share_instances.py b/manila_tempest_tests/tests/api/admin/test_share_instances.py
index 38c3f49..4f2e454 100644
--- a/manila_tempest_tests/tests/api/admin/test_share_instances.py
+++ b/manila_tempest_tests/tests/api/admin/test_share_instances.py
@@ -95,6 +95,8 @@
expected_keys.append("cast_rules_to_readonly")
if utils.is_microversion_ge(version, '2.54'):
expected_keys.append("progress")
+ if utils.is_microversion_ge(version, '2.71'):
+ expected_keys.append("updated_at")
expected_keys = sorted(expected_keys)
actual_keys = sorted(si.keys())
self.assertEqual(expected_keys, actual_keys,
diff --git a/manila_tempest_tests/tests/api/admin/test_share_servers_migration.py b/manila_tempest_tests/tests/api/admin/test_share_servers_migration.py
index 99d712c..2535745 100644
--- a/manila_tempest_tests/tests/api/admin/test_share_servers_migration.py
+++ b/manila_tempest_tests/tests/api/admin/test_share_servers_migration.py
@@ -95,14 +95,11 @@
# protocols.
access_rules = self._get_access_rule_data_for_protocols()
for rule in access_rules:
- self.shares_v2_client.create_access_rule(
+ self.allow_access(
share['id'], access_type=rule.get('access_type'),
access_to=rule.get('access_to'),
access_level=rule.get('access_level')
)
- waiters.wait_for_resource_status(
- self.shares_v2_client, share['id'], constants.RULE_STATE_ACTIVE,
- status_attr='access_rules_status')
share = self.shares_v2_client.get_share(share['id'])['share']
@@ -124,8 +121,8 @@
self.assertIn(snapshot['status'], statuses)
def _validate_share_server_migration_complete(
- self, share, dest_host, dest_server_id, snapshot_id=None,
- share_network_id=None, version=CONF.share.max_api_microversion):
+ self, share, dest_host, dest_server_id, snapshot_id=None,
+ share_network_id=None, version=CONF.share.max_api_microversion):
"""Validates the share server migration complete. """
# Check the export locations
diff --git a/manila_tempest_tests/tests/api/base.py b/manila_tempest_tests/tests/api/base.py
index d5cc439..34f8e41 100755
--- a/manila_tempest_tests/tests/api/base.py
+++ b/manila_tempest_tests/tests/api/base.py
@@ -58,6 +58,8 @@
r"(?=.*\[.*\b(%(p)s|%(n)s)\b.*\])(?=.*\[.*\b(%(a)s|%(b)s|%(ab)s)\b.*\])" %
TAGS_MAPPER)
+LATEST_MICROVERSION = CONF.share.max_api_microversion
+
def verify_test_has_appropriate_tags(self):
if not TAGS_PATTERN.match(self.id()):
@@ -1046,7 +1048,8 @@
return waiters.wait_for_message(self.shares_v2_client, share['id'])
def allow_access(self, share_id, client=None, access_type=None,
- access_level='rw', access_to=None, status='active',
+ access_level='rw', access_to=None, metadata=None,
+ version=LATEST_MICROVERSION, status='active',
raise_rule_in_error_state=True, cleanup=True):
client = client or self.shares_v2_client
@@ -1054,15 +1057,23 @@
access_type = access_type or a_type
access_to = access_to or a_to
- rule = client.create_access_rule(share_id, access_type, access_to,
- access_level)['access']
+ kwargs = {
+ 'access_type': access_type,
+ 'access_to': access_to,
+ 'access_level': access_level
+ }
+ if client is self.shares_v2_client:
+ kwargs.update({'metadata': metadata, 'version': version})
+
+ rule = client.create_access_rule(share_id, **kwargs)['access']
waiters.wait_for_resource_status(
client, share_id, status, resource_name='access_rule',
- rule_id=rule['id'],
+ rule_id=rule['id'], version=version,
raise_rule_in_error_state=raise_rule_in_error_state)
if cleanup:
- self.addCleanup(client.wait_for_resource_deletion,
- rule_id=rule['id'], share_id=share_id)
+ self.addCleanup(
+ client.wait_for_resource_deletion, rule_id=rule['id'],
+ share_id=share_id, version=version)
self.addCleanup(client.delete_access_rule, share_id, rule['id'])
return rule
diff --git a/manila_tempest_tests/tests/api/test_access_rules_metadata.py b/manila_tempest_tests/tests/api/test_access_rules_metadata.py
index fa3c0a7..ee541ac 100644
--- a/manila_tempest_tests/tests/api/test_access_rules_metadata.py
+++ b/manila_tempest_tests/tests/api/test_access_rules_metadata.py
@@ -19,6 +19,7 @@
from testtools import testcase as tc
from manila_tempest_tests.common import constants
+from manila_tempest_tests.common import waiters
from manila_tempest_tests.tests.api import base
from manila_tempest_tests import utils
@@ -77,16 +78,19 @@
cls.share["id"], cls.access_type,
cls.access_to[cls.access_type].pop(), 'rw',
metadata=cls.md1)['access']
+ waiters.wait_for_resource_status(
+ cls.shares_v2_client, cls.share["id"], "active",
+ resource_name='access_rule', rule_id=cls.access["id"])
@decorators.idempotent_id('4c8e0236-2e7b-4337-be3c-17b51a738644')
@tc.attr(base.TAG_POSITIVE, base.TAG_API_WITH_BACKEND)
def test_set_get_delete_access_metadata(self):
data = {"key1": "v" * 255, "k" * 255: "value2"}
# set metadata
- access = self.shares_v2_client.create_access_rule(
- self.share["id"], self.access_type,
- self.access_to[self.access_type].pop(), 'rw',
- metadata=data)['access']
+ access = self.allow_access(
+ self.share["id"], access_type=self.access_type,
+ access_to=self.access_to[self.access_type].pop(),
+ access_level='rw', metadata=data)
# read metadata
get_access = self.shares_v2_client.get_access_rule(
@@ -103,10 +107,6 @@
access_without_md = self.shares_v2_client.get_access_rule(
access["id"])['access']
self.assertEqual({}, access_without_md['metadata'])
- self.shares_v2_client.delete_access_rule(self.share["id"],
- access["id"])
- self.shares_v2_client.wait_for_resource_deletion(
- rule_id=access["id"], share_id=self.share["id"])
@decorators.idempotent_id('8c294d7d-0702-49ce-b964-0945ec323370')
@tc.attr(base.TAG_POSITIVE, base.TAG_API_WITH_BACKEND)
@@ -129,10 +129,10 @@
def test_list_access_filter_by_metadata(self):
data = {"key3": "v3", "key4": "value4"}
# set metadata
- access = self.shares_v2_client.create_access_rule(
- self.share["id"], self.access_type,
- self.access_to[self.access_type].pop(), 'rw',
- metadata=data)['access']
+ access = self.allow_access(
+ self.share["id"], access_type=self.access_type,
+ access_to=self.access_to[self.access_type].pop(),
+ access_level='rw', metadata=data)
# list metadata with metadata filter
list_access = self.shares_v2_client.list_access_rules(
diff --git a/manila_tempest_tests/tests/api/test_replication.py b/manila_tempest_tests/tests/api/test_replication.py
index 20ba8fe..7873926 100644
--- a/manila_tempest_tests/tests/api/test_replication.py
+++ b/manila_tempest_tests/tests/api/test_replication.py
@@ -331,12 +331,9 @@
def test_add_access_rule_create_replica_delete_rule(self):
# Add access rule to the share
access_type, access_to = self._get_access_rule_data_from_config()
- rule = self.shares_v2_client.create_access_rule(
- self.shares[0]["id"], access_type, access_to, 'ro')['access']
- waiters.wait_for_resource_status(
- self.shares_v2_client, self.shares[0]["id"],
- constants.RULE_STATE_ACTIVE, resource_name='access_rule',
- rule_id=rule["id"])
+ self.allow_access(
+ self.shares[0]["id"], access_type=access_type, access_to=access_to,
+ access_level='ro')
# Create the replica
self._verify_create_replica()
@@ -346,12 +343,6 @@
self.shares_v2_client, self.shares[0]["id"],
constants.RULE_STATE_ACTIVE, status_attr='access_rules_status')
- # Delete rule and wait for deletion
- self.shares_v2_client.delete_access_rule(self.shares[0]["id"],
- rule["id"])
- self.shares_v2_client.wait_for_resource_deletion(
- rule_id=rule["id"], share_id=self.shares[0]['id'])
-
@decorators.idempotent_id('3af3f19a-1195-464e-870b-1a3918914f1b')
@tc.attr(base.TAG_POSITIVE, base.TAG_BACKEND)
def test_create_replica_add_access_rule_delete_replica(self):
@@ -360,12 +351,9 @@
share_replica = self._verify_create_replica()
# Add access rule
- self.shares_v2_client.create_access_rule(
- self.shares[0]["id"], access_type, access_to, 'ro')
-
- waiters.wait_for_resource_status(
- self.shares_v2_client, self.shares[0]["id"],
- constants.RULE_STATE_ACTIVE, status_attr='access_rules_status')
+ self.allow_access(
+ self.shares[0]["id"], access_type=access_type, access_to=access_to,
+ access_level='ro')
# Delete the replica
self.delete_share_replica(share_replica["id"])
@@ -421,11 +409,9 @@
share = self.create_shares([self.creation_data])[0]
# Add access rule
access_type, access_to = self._get_access_rule_data_from_config()
- rule = self.shares_v2_client.create_access_rule(
- share["id"], access_type, access_to, 'ro')['access']
- waiters.wait_for_resource_status(
- self.shares_v2_client, share["id"], constants.RULE_STATE_ACTIVE,
- resource_name='access_rule', rule_id=rule["id"])
+ self.allow_access(
+ share["id"], access_type=access_type, access_to=access_to,
+ access_level='ro')
original_replica = self.shares_v2_client.list_share_replicas(
share["id"])['share_replicas'][0]
diff --git a/manila_tempest_tests/tests/api/test_rules.py b/manila_tempest_tests/tests/api/test_rules.py
index 30b1fc5..979bf06 100644
--- a/manila_tempest_tests/tests/api/test_rules.py
+++ b/manila_tempest_tests/tests/api/test_rules.py
@@ -22,7 +22,6 @@
import testtools
from testtools import testcase as tc
-from manila_tempest_tests.common import waiters
from manila_tempest_tests.tests.api import base
from manila_tempest_tests import utils
@@ -37,13 +36,14 @@
:param self: instance of test class
"""
- if utils.is_microversion_eq(version, '1.0'):
- rule = self.shares_client.create_access_rule(
- self.share["id"], self.access_type, self.access_to, 'ro')['access']
+ if utils.is_microversion_le(version, '2.9'):
+ client = self.shares_client
else:
- rule = self.shares_v2_client.create_access_rule(
- self.share["id"], self.access_type, self.access_to, 'ro',
- version=version)['access']
+ client = self.shares_v2_client
+
+ rule = self.allow_access(
+ self.share["id"], client=client, access_type=self.access_type,
+ access_to=self.access_to, access_level='ro', version=version)
self.assertEqual('ro', rule['access_level'])
for key in ('deleted', 'deleted_at', 'instance_mappings'):
@@ -55,14 +55,6 @@
else:
self.assertEqual("queued_to_apply", rule['state'])
- if utils.is_microversion_le(version, '2.9'):
- waiters.wait_for_resource_status(
- self.shares_client, self.share["id"], "active",
- resource_name='access_rule', rule_id=rule["id"])
- else:
- waiters.wait_for_resource_status(
- self.shares_v2_client, self.share["id"], "active",
- status_attr='access_rules_status', version=version)
# If the 'access_rules_status' transitions to 'active',
# rule state must too
rules = self.shares_v2_client.list_access_rules(
@@ -70,16 +62,6 @@
rule = [r for r in rules if r['id'] == rule['id']][0]
self.assertEqual("active", rule['state'])
- if utils.is_microversion_eq(version, '1.0'):
- self.shares_client.delete_access_rule(self.share["id"], rule["id"])
- self.shares_client.wait_for_resource_deletion(
- rule_id=rule["id"], share_id=self.share['id'])
- else:
- self.shares_v2_client.delete_access_rule(
- self.share["id"], rule["id"], version=version)
- self.shares_v2_client.wait_for_resource_deletion(
- rule_id=rule["id"], share_id=self.share['id'], version=version)
-
@ddt.ddt
class ShareIpRulesForNFSTest(base.BaseSharesMixedTest):
@@ -109,8 +91,11 @@
@decorators.idempotent_id('3390df2d-f6f8-4634-a562-87c1be994f6a')
@tc.attr(base.TAG_POSITIVE, base.TAG_BACKEND)
@ddt.data(*itertools.chain(
- itertools.product({'1.0', '2.9', '2.37', LATEST_MICROVERSION}, {4}),
- itertools.product({'2.38', LATEST_MICROVERSION}, {6})
+ itertools.product(
+ utils.deduplicate(['1.0', '2.9', '2.37', LATEST_MICROVERSION]),
+ [4]),
+ itertools.product(
+ utils.deduplicate(['2.38', LATEST_MICROVERSION]), [6])
))
@ddt.unpack
def test_create_delete_access_rules_with_one_ip(self, version,
@@ -120,14 +105,16 @@
access_to = utils.rand_ip()
else:
access_to = utils.rand_ipv6_ip()
- # create rule
- if utils.is_microversion_eq(version, '1.0'):
- rule = self.shares_client.create_access_rule(
- self.share["id"], self.access_type, access_to)['access']
+
+ if utils.is_microversion_le(version, '2.9'):
+ client = self.shares_client
else:
- rule = self.shares_v2_client.create_access_rule(
- self.share["id"], self.access_type, access_to,
- version=version)['access']
+ client = self.shares_v2_client
+
+ # create rule
+ rule = self.allow_access(
+ self.share["id"], client=client, access_type=self.access_type,
+ access_to=access_to, version=version)
self.assertEqual('rw', rule['access_level'])
for key in ('deleted', 'deleted_at', 'instance_mappings'):
@@ -139,35 +126,14 @@
else:
self.assertEqual("queued_to_apply", rule['state'])
- if utils.is_microversion_eq(version, '1.0'):
- waiters.wait_for_resource_status(
- self.shares_client, self.share["id"], "active",
- resource_name='access_rule', rule_id=rule["id"])
- elif utils.is_microversion_eq(version, '2.9'):
- waiters.wait_for_resource_status(
- self.shares_v2_client, self.share["id"], "active",
- resource_name='access_rule', rule_id=rule["id"])
- else:
- waiters.wait_for_resource_status(
- self.shares_v2_client, self.share["id"], "active",
- status_attr='access_rules_status', version=version)
-
- # delete rule and wait for deletion
- if utils.is_microversion_eq(version, '1.0'):
- self.shares_client.delete_access_rule(self.share["id"], rule["id"])
- self.shares_client.wait_for_resource_deletion(
- rule_id=rule["id"], share_id=self.share['id'])
- else:
- self.shares_v2_client.delete_access_rule(
- self.share["id"], rule["id"], version=version)
- self.shares_v2_client.wait_for_resource_deletion(
- rule_id=rule["id"], share_id=self.share['id'], version=version)
-
@decorators.idempotent_id('5d25168a-d646-443e-8cf1-3151eb7887f5')
@tc.attr(base.TAG_POSITIVE, base.TAG_BACKEND)
@ddt.data(*itertools.chain(
- itertools.product({'1.0', '2.9', '2.37', LATEST_MICROVERSION}, {4}),
- itertools.product({'2.38', LATEST_MICROVERSION}, {6})
+ itertools.product(
+ utils.deduplicate(['1.0', '2.9', '2.37', LATEST_MICROVERSION]),
+ [4]),
+ itertools.product(
+ utils.deduplicate(['2.38', LATEST_MICROVERSION]), [6])
))
@ddt.unpack
def test_create_delete_access_rule_with_cidr(self, version, ip_version):
@@ -175,49 +141,19 @@
access_to = utils.rand_ip(network=True)
else:
access_to = utils.rand_ipv6_ip(network=True)
- # create rule
- if utils.is_microversion_eq(version, '1.0'):
- rule = self.shares_client.create_access_rule(
- self.share["id"], self.access_type, access_to)['access']
+ if utils.is_microversion_le(version, '2.9'):
+ client = self.shares_client
else:
- rule = self.shares_v2_client.create_access_rule(
- self.share["id"], self.access_type, access_to,
- version=version)['access']
+ client = self.shares_v2_client
+ # create rule
+ rule = self.allow_access(
+ self.share["id"], client=client, access_type=self.access_type,
+ access_to=access_to, version=version)
for key in ('deleted', 'deleted_at', 'instance_mappings'):
self.assertNotIn(key, rule.keys())
self.assertEqual('rw', rule['access_level'])
- # rules must start out in 'new' until 2.28 & 'queued_to_apply' after
- if utils.is_microversion_le(version, "2.27"):
- self.assertEqual("new", rule['state'])
- else:
- self.assertEqual("queued_to_apply", rule['state'])
-
- if utils.is_microversion_eq(version, '1.0'):
- waiters.wait_for_resource_status(
- self.shares_client, self.share["id"], "active",
- resource_name='access_rule', rule_id=rule["id"])
- elif utils.is_microversion_eq(version, '2.9'):
- waiters.wait_for_resource_status(
- self.shares_v2_client, self.share["id"], "active",
- resource_name='access_rule', rule_id=rule["id"])
- else:
- waiters.wait_for_resource_status(
- self.shares_v2_client, self.share["id"], "active",
- status_attr='access_rules_status', version=version)
-
- # delete rule and wait for deletion
- if utils.is_microversion_eq(version, '1.0'):
- self.shares_client.delete_access_rule(self.share["id"], rule["id"])
- self.shares_client.wait_for_resource_deletion(
- rule_id=rule["id"], share_id=self.share['id'])
- else:
- self.shares_v2_client.delete_access_rule(
- self.share["id"], rule["id"], version=version)
- self.shares_v2_client.wait_for_resource_deletion(
- rule_id=rule["id"], share_id=self.share['id'], version=version)
-
@decorators.idempotent_id('187a4fb0-ba1d-45b9-83c9-f0272e7e6f3e')
@tc.attr(base.TAG_POSITIVE, base.TAG_BACKEND)
@testtools.skipIf(
@@ -277,15 +213,15 @@
@ddt.data(*utils.deduplicate(['1.0', '2.9', '2.27', '2.28',
LATEST_MICROVERSION]))
def test_create_delete_user_rule(self, version):
+ if utils.is_microversion_le(version, '2.9'):
+ client = self.shares_client
+ else:
+ client = self.shares_v2_client
# create rule
- if utils.is_microversion_eq(version, '1.0'):
- rule = self.shares_client.create_access_rule(
- self.share["id"], self.access_type, self.access_to)['access']
- else:
- rule = self.shares_v2_client.create_access_rule(
- self.share["id"], self.access_type, self.access_to,
- version=version)['access']
+ rule = self.allow_access(
+ self.share["id"], client=client, access_type=self.access_type,
+ access_to=self.access_to, version=version)
self.assertEqual('rw', rule['access_level'])
for key in ('deleted', 'deleted_at', 'instance_mappings'):
@@ -297,30 +233,6 @@
else:
self.assertEqual("queued_to_apply", rule['state'])
- if utils.is_microversion_eq(version, '1.0'):
- waiters.wait_for_resource_status(
- self.shares_client, self.share["id"], "active",
- resource_name='access_rule', rule_id=rule["id"])
- elif utils.is_microversion_eq(version, '2.9'):
- waiters.wait_for_resource_status(
- self.shares_v2_client, self.share["id"], "active",
- resource_name='access_rule', rule_id=rule["id"])
- else:
- waiters.wait_for_resource_status(
- self.shares_v2_client, self.share["id"], "active",
- status_attr='access_rules_status', version=version)
-
- # delete rule and wait for deletion
- if utils.is_microversion_eq(version, '1.0'):
- self.shares_client.delete_access_rule(self.share["id"], rule["id"])
- self.shares_client.wait_for_resource_deletion(
- rule_id=rule["id"], share_id=self.share['id'])
- else:
- self.shares_v2_client.delete_access_rule(
- self.share["id"], rule["id"], version=version)
- self.shares_v2_client.wait_for_resource_deletion(
- rule_id=rule["id"], share_id=self.share['id'], version=version)
-
@decorators.idempotent_id('ccb08342-b7ef-4dda-84ba-8de9879d8862')
@tc.attr(base.TAG_POSITIVE, base.TAG_BACKEND)
@testtools.skipIf(
@@ -381,15 +293,15 @@
@ddt.data(*utils.deduplicate(['1.0', '2.9', '2.27', '2.28',
LATEST_MICROVERSION]))
def test_create_delete_cert_rule(self, version):
+ if utils.is_microversion_le(version, '2.9'):
+ client = self.shares_client
+ else:
+ client = self.shares_v2_client
# create rule
- if utils.is_microversion_eq(version, '1.0'):
- rule = self.shares_client.create_access_rule(
- self.share["id"], self.access_type, self.access_to)['access']
- else:
- rule = self.shares_v2_client.create_access_rule(
- self.share["id"], self.access_type, self.access_to,
- version=version)['access']
+ rule = self.allow_access(
+ self.share["id"], client=client, access_type=self.access_type,
+ access_to=self.access_to, version=version)
self.assertEqual('rw', rule['access_level'])
for key in ('deleted', 'deleted_at', 'instance_mappings'):
@@ -401,30 +313,6 @@
else:
self.assertEqual("queued_to_apply", rule['state'])
- if utils.is_microversion_eq(version, '1.0'):
- waiters.wait_for_resource_status(
- self.shares_client, self.share["id"], "active",
- resource_name='access_rule', rule_id=rule["id"])
- elif utils.is_microversion_eq(version, '2.9'):
- waiters.wait_for_resource_status(
- self.shares_v2_client, self.share["id"], "active",
- resource_name='access_rule', rule_id=rule["id"])
- else:
- waiters.wait_for_resource_status(
- self.shares_v2_client, self.share["id"], "active",
- status_attr='access_rules_status', version=version)
-
- # delete rule
- if utils.is_microversion_eq(version, '1.0'):
- self.shares_client.delete_access_rule(self.share["id"], rule["id"])
- self.shares_client.wait_for_resource_deletion(
- rule_id=rule["id"], share_id=self.share['id'])
- else:
- self.shares_v2_client.delete_access_rule(
- self.share["id"], rule["id"], version=version)
- self.shares_v2_client.wait_for_resource_deletion(
- rule_id=rule["id"], share_id=self.share['id'], version=version)
-
@decorators.idempotent_id('cdd93d8e-7255-4ed4-8ef0-929a62bb302c')
@tc.attr(base.TAG_POSITIVE, base.TAG_BACKEND)
@testtools.skipIf(
@@ -433,13 +321,13 @@
@ddt.data(*utils.deduplicate(['1.0', '2.9', '2.27', '2.28',
LATEST_MICROVERSION]))
def test_create_delete_cert_ro_access_rule(self, version):
- if utils.is_microversion_eq(version, '1.0'):
- rule = self.shares_client.create_access_rule(
- self.share["id"], 'cert', 'client2.com', 'ro')['access']
+ if utils.is_microversion_le(version, '2.9'):
+ client = self.shares_client
else:
- rule = self.shares_v2_client.create_access_rule(
- self.share["id"], 'cert', 'client2.com', 'ro',
- version=version)['access']
+ client = self.shares_v2_client
+ rule = self.allow_access(
+ self.share["id"], client=client, access_type='cert',
+ access_to='client2.com', access_level='ro', version=version)
self.assertEqual('ro', rule['access_level'])
for key in ('deleted', 'deleted_at', 'instance_mappings'):
@@ -451,29 +339,6 @@
else:
self.assertEqual("queued_to_apply", rule['state'])
- if utils.is_microversion_eq(version, '1.0'):
- waiters.wait_for_resource_status(
- self.shares_client, self.share["id"], "active",
- resource_name='access_rule', rule_id=rule["id"])
- elif utils.is_microversion_eq(version, '2.9'):
- waiters.wait_for_resource_status(
- self.shares_v2_client, self.share["id"], "active",
- resource_name='access_rule', rule_id=rule["id"])
- else:
- waiters.wait_for_resource_status(
- self.shares_v2_client, self.share["id"], "active",
- status_attr='access_rules_status', version=version)
-
- if utils.is_microversion_eq(version, '1.0'):
- self.shares_client.delete_access_rule(self.share["id"], rule["id"])
- self.shares_client.wait_for_resource_deletion(
- rule_id=rule["id"], share_id=self.share['id'])
- else:
- self.shares_v2_client.delete_access_rule(
- self.share["id"], rule["id"], version=version)
- self.shares_v2_client.wait_for_resource_deletion(
- rule_id=rule["id"], share_id=self.share['id'], version=version)
-
@ddt.ddt
class ShareCephxRulesForCephFSTest(base.BaseSharesMixedTest):
@@ -512,31 +377,21 @@
('rw', 'ro')))
@ddt.unpack
def test_create_delete_cephx_rule(self, version, access_to, access_level):
- rule = self.shares_v2_client.create_access_rule(
- self.share["id"], self.access_type, access_to, version=version,
- access_level=access_level)['access']
+ rule = self.allow_access(
+ self.share["id"], access_type=self.access_type,
+ access_to=access_to, version=version, access_level=access_level)
self.assertEqual(access_level, rule['access_level'])
for key in ('deleted', 'deleted_at', 'instance_mappings'):
self.assertNotIn(key, rule.keys())
- waiters.wait_for_resource_status(
- self.shares_v2_client, self.share["id"], "active",
- resource_name='access_rule', rule_id=rule["id"])
-
- self.shares_v2_client.delete_access_rule(
- self.share["id"], rule["id"], version=version)
- self.shares_v2_client.wait_for_resource_deletion(
- rule_id=rule["id"], share_id=self.share['id'])
@decorators.idempotent_id('ad907303-a439-4fcb-8845-fe91ecab7dc2')
@tc.attr(base.TAG_POSITIVE, base.TAG_API_WITH_BACKEND)
def test_different_users_in_same_tenant_can_use_same_cephx_id(self):
# Grant access to the share
- access1 = self.shares_v2_client.create_access_rule(
- self.share['id'], self.access_type, self.access_to, 'rw')['access']
- waiters.wait_for_resource_status(
- self.shares_v2_client, self.share["id"], "active",
- resource_name='access_rule', rule_id=access1["id"])
+ self.allow_access(
+ self.share['id'], access_type=self.access_type,
+ access_to=self.access_to, access_level='rw')
# Create a new user in the current project
project = self.os_admin.projects_client.show_project(
@@ -550,11 +405,10 @@
# Grant access to the second share using the same cephx ID that was
# used in access1
- access2 = user_client.shares_v2_client.create_access_rule(
- share2['id'], self.access_type, self.access_to, 'rw')['access']
- waiters.wait_for_resource_status(
- user_client.shares_v2_client, share2['id'], "active",
- resource_name='access_rule', rule_id=access2['id'])
+ self.allow_access(
+ share2['id'], client=user_client.shares_v2_client,
+ access_type=self.access_type, access_to=self.access_to,
+ access_level='rw')
@ddt.ddt
@@ -606,14 +460,14 @@
metadata = None
if utils.is_microversion_ge(version, '2.45'):
metadata = {'key1': 'v1', 'key2': 'v2'}
- # create rule
- if utils.is_microversion_eq(version, '1.0'):
- rule = self.shares_client.create_access_rule(
- self.share["id"], self.access_type, self.access_to)['access']
+ if utils.is_microversion_le(version, '2.9'):
+ client = self.shares_client
else:
- rule = self.shares_v2_client.create_access_rule(
- self.share["id"], self.access_type, self.access_to,
- metadata=metadata, version=version)['access']
+ client = self.shares_v2_client
+ # create rule
+ rule = self.allow_access(
+ self.share["id"], client=client, access_type=self.access_type,
+ access_to=self.access_to, metadata=metadata, version=version)
# verify added rule keys since 2.33 when create rule
if utils.is_microversion_ge(version, '2.33'):
@@ -629,19 +483,6 @@
else:
self.assertEqual("queued_to_apply", rule['state'])
- if utils.is_microversion_eq(version, '1.0'):
- waiters.wait_for_resource_status(
- self.shares_client, self.share["id"], "active",
- resource_name="access_rule", rule_id=rule["id"])
- elif utils.is_microversion_eq(version, '2.9'):
- waiters.wait_for_resource_status(
- self.shares_v2_client, self.share["id"], "active",
- resource_name="access_rule", rule_id=rule["id"])
- else:
- waiters.wait_for_resource_status(
- self.shares_v2_client, self.share["id"], "active",
- status_attr='access_rules_status', version=version)
-
# list rules
if utils.is_microversion_eq(version, '1.0'):
rules = self.shares_client.list_access_rules(
@@ -678,16 +519,6 @@
msg = "expected id lists %s times in rule list" % (len(gen))
self.assertEqual(1, len(gen), msg)
- if utils.is_microversion_eq(version, '1.0'):
- self.shares_client.delete_access_rule(self.share["id"], rule["id"])
- self.shares_client.wait_for_resource_deletion(
- rule_id=rule["id"], share_id=self.share['id'])
- else:
- self.shares_v2_client.delete_access_rule(
- self.share["id"], rule["id"], version=version)
- self.shares_v2_client.wait_for_resource_deletion(
- rule_id=rule["id"], share_id=self.share['id'], version=version)
-
@decorators.idempotent_id('b77bcbda-9754-48f0-9be6-79341ad1af64')
@tc.attr(base.TAG_POSITIVE, base.TAG_API_WITH_BACKEND)
@ddt.data(*utils.deduplicate(['1.0', '2.9', '2.27', '2.28',
@@ -698,18 +529,18 @@
msg = ("API version %s does not support cephx access type, need "
"version >= 2.13." % version)
raise self.skipException(msg)
+ if utils.is_microversion_le(version, '2.9'):
+ client = self.shares_client
+ else:
+ client = self.shares_v2_client
# create share
share = self.create_share(share_type_id=self.share_type_id)
# create rule
- if utils.is_microversion_eq(version, '1.0'):
- rule = self.shares_client.create_access_rule(
- share["id"], self.access_type, self.access_to)['access']
- else:
- rule = self.shares_v2_client.create_access_rule(
- share["id"], self.access_type, self.access_to,
- version=version)['access']
+ rule = self.allow_access(
+ share["id"], client=client, access_type=self.access_type,
+ access_to=self.access_to, version=version, cleanup=False)
# rules must start out in 'new' until 2.28 & 'queued_to_apply' after
if utils.is_microversion_le(version, "2.27"):
@@ -717,19 +548,6 @@
else:
self.assertEqual("queued_to_apply", rule['state'])
- if utils.is_microversion_eq(version, '1.0'):
- waiters.wait_for_resource_status(
- self.shares_client, self.share["id"], "active",
- resource_name="access_rule", rule_id=rule["id"])
- elif utils.is_microversion_eq(version, '2.9'):
- waiters.wait_for_resource_status(
- self.shares_v2_client, self.share["id"], "active",
- resource_name="access_rule", rule_id=rule["id"])
- else:
- waiters.wait_for_resource_status(
- self.shares_v2_client, share["id"], "active",
- status_attr='access_rules_status', version=version)
-
# delete share
if utils.is_microversion_eq(version, '1.0'):
self.shares_client.delete_share(share['id'])
diff --git a/manila_tempest_tests/tests/api/test_rules_negative.py b/manila_tempest_tests/tests/api/test_rules_negative.py
index 5225651..1eb858d 100644
--- a/manila_tempest_tests/tests/api/test_rules_negative.py
+++ b/manila_tempest_tests/tests/api/test_rules_negative.py
@@ -99,27 +99,15 @@
access_type = "ip"
access_to = "1.2.3.4"
- # create rule
if utils.is_microversion_eq(version, '1.0'):
- rule = self.shares_client.create_access_rule(
- self.share["id"], access_type, access_to)['access']
+ client = self.shares_client
else:
- rule = self.shares_v2_client.create_access_rule(
- self.share["id"], access_type, access_to,
- version=version)['access']
+ client = self.shares_v2_client
- if utils.is_microversion_eq(version, '1.0'):
- waiters.wait_for_resource_status(
- self.shares_client, self.share["id"], "active",
- resource_name='access_rule', rule_id=rule["id"])
- elif utils.is_microversion_eq(version, '2.9'):
- waiters.wait_for_resource_status(
- self.shares_v2_client, self.share["id"], "active",
- resource_name="access_rule", rule_id=rule["id"])
- else:
- waiters.wait_for_resource_status(
- self.shares_v2_client, self.share["id"], "active",
- status_attr='access_rules_status', version=version)
+ # create rule
+ self.allow_access(
+ self.share["id"], client=client, access_type=access_type,
+ access_to=access_to, version=version)
# try create duplicate of rule
if utils.is_microversion_eq(version, '1.0'):
@@ -132,18 +120,6 @@
self.share["id"], access_type, access_to,
version=version)
- # delete rule and wait for deletion
- if utils.is_microversion_eq(version, '1.0'):
- self.shares_client.delete_access_rule(self.share["id"],
- rule["id"])
- self.shares_client.wait_for_resource_deletion(
- rule_id=rule["id"], share_id=self.share["id"])
- else:
- self.shares_v2_client.delete_access_rule(self.share["id"],
- rule["id"])
- self.shares_v2_client.wait_for_resource_deletion(
- rule_id=rule["id"], share_id=self.share["id"], version=version)
-
@decorators.idempotent_id('63932d1d-a60a-4af7-ba3b-7cf6c68aaee9')
@tc.attr(base.TAG_NEGATIVE, base.TAG_API_WITH_BACKEND)
@ddt.data("10.20.30.40", "fd8c:b029:bba6:ac54::1",
@@ -157,13 +133,8 @@
"is %s" % CONF.share.max_api_microversion)
raise self.skipException(reason)
- rule = self.shares_v2_client.create_access_rule(
- self.share["id"], "ip", access_to)['access']
- self.addCleanup(self.shares_v2_client.delete_access_rule,
- self.share["id"], rule['id'])
- waiters.wait_for_resource_status(
- self.shares_v2_client, self.share["id"], "active",
- status_attr='access_rules_status')
+ self.allow_access(
+ self.share["id"], access_type="ip", access_to=access_to)
self.assertRaises(lib_exc.BadRequest,
self.shares_v2_client.create_access_rule,
diff --git a/manila_tempest_tests/tests/scenario/manager.py b/manila_tempest_tests/tests/scenario/manager.py
index 947d0e6..6b36d9f 100644
--- a/manila_tempest_tests/tests/scenario/manager.py
+++ b/manila_tempest_tests/tests/scenario/manager.py
@@ -14,30 +14,22 @@
# License for the specific language governing permissions and limitations
# under the License.
-import subprocess
-
import netaddr
from oslo_log import log
-from oslo_utils import netutils
from oslo_utils import uuidutils
-from tempest.common import compute
from tempest.common import image as common_image
-from tempest.common.utils.linux import remote_client
-from tempest.common.utils import net_utils
-from tempest.common import waiters
from tempest import config
-from tempest import exceptions
from tempest.lib.common.utils import data_utils
from tempest.lib.common.utils import test_utils
from tempest.lib import exceptions as lib_exc
-from tempest import test
+from tempest.scenario import manager
CONF = config.CONF
LOG = log.getLogger(__name__)
-class ScenarioTest(test.BaseTestCase):
+class ScenarioTest(manager.NetworkScenarioTest):
"""Base class for scenario tests. Uses tempest own clients. """
credentials = ['primary']
@@ -84,127 +76,6 @@
# The create_[resource] functions only return body and discard the
# resp part which is not used in scenario tests
- def _create_port(self, network_id, client=None, namestart='port-quotatest',
- **kwargs):
- if not client:
- client = self.ports_client
- name = data_utils.rand_name(namestart)
- result = client.create_port(
- name=name,
- network_id=network_id,
- **kwargs)
- self.assertIsNotNone(result, 'Unable to allocate port')
- port = result['port']
- self.addCleanup(test_utils.call_and_ignore_notfound_exc,
- client.delete_port, port['id'])
- return port
-
- def create_keypair(self, client=None):
- if not client:
- client = self.keypairs_client
- name = data_utils.rand_name(self.__class__.__name__)
- # We don't need to create a keypair by pubkey in scenario
- body = client.create_keypair(name=name)
- self.addCleanup(client.delete_keypair, name)
- return body['keypair']
-
- def create_server(self, name=None, image_id=None, flavor=None,
- validatable=False, wait_until='ACTIVE',
- clients=None, **kwargs):
- """Wrapper utility that returns a test server.
-
- This wrapper utility calls the common create test server and
- returns a test server. The purpose of this wrapper is to minimize
- the impact on the code of the tests already using this
- function.
- """
-
- # NOTE(jlanoux): As a first step, ssh checks in the scenario
- # tests need to be run regardless of the run_validation and
- # validatable parameters and thus until the ssh validation job
- # becomes voting in CI. The test resources management and IP
- # association are taken care of in the scenario tests.
- # Therefore, the validatable parameter is set to false in all
- # those tests. In this way create_server just return a standard
- # server and the scenario tests always perform ssh checks.
-
- # Needed for the cross_tenant_traffic test:
- if clients is None:
- clients = self.os_primary
-
- if name is None:
- name = data_utils.rand_name(self.__class__.__name__ + "-server")
-
- vnic_type = CONF.network.port_vnic_type
-
- # If vnic_type is configured create port for
- # every network
- if vnic_type:
- ports = []
-
- create_port_body = {'binding:vnic_type': vnic_type,
- 'namestart': 'port-smoke'}
- if kwargs:
- # Convert security group names to security group ids
- # to pass to create_port
- if 'security_groups' in kwargs:
- security_groups = (
- clients.security_groups_client.list_security_groups(
- ).get('security_groups'))
- sec_dict = {s['name']: s['id'] for s in security_groups}
-
- sec_groups_names = [s['name'] for s in kwargs.pop(
- 'security_groups')]
- security_groups_ids = [sec_dict[s]
- for s in sec_groups_names]
-
- if security_groups_ids:
- create_port_body[
- 'security_groups'] = security_groups_ids
- networks = kwargs.pop('networks', [])
- else:
- networks = []
-
- # If there are no networks passed to us we look up
- # for the project's private networks and create a port.
- # The same behaviour as we would expect when passing
- # the call to the clients with no networks
- if not networks:
- networks = clients.networks_client.list_networks(
- **{'router:external': False, 'fields': 'id'})['networks']
-
- # It's net['uuid'] if networks come from kwargs
- # and net['id'] if they come from
- # clients.networks_client.list_networks
- for net in networks:
- net_id = net.get('uuid', net.get('id'))
- if 'port' not in net:
- port = self._create_port(network_id=net_id,
- client=clients.ports_client,
- **create_port_body)
- ports.append({'port': port['id']})
- else:
- ports.append({'port': net['port']})
- if ports:
- kwargs['networks'] = ports
- self.ports = ports
-
- tenant_network = self.get_tenant_network()
-
- body, servers = compute.create_test_server(
- clients,
- tenant_network=tenant_network,
- wait_until=wait_until,
- name=name, flavor=flavor,
- image_id=image_id, **kwargs)
-
- self.addCleanup(waiters.wait_for_server_termination,
- clients.servers_client, body['id'])
- self.addCleanup(test_utils.call_and_ignore_notfound_exc,
- clients.servers_client.delete_server, body['id'])
- server = clients.servers_client.show_server(body['id'])['server']
- return server
-
def _create_loginable_secgroup_rule(self, secgroup_id=None):
_client = self.compute_security_groups_client
_client_rules = self.compute_security_group_rules_client
@@ -259,45 +130,6 @@
return secgroup
- def get_remote_client(self, ip_address, username=None, private_key=None):
- """Get a SSH client to a remote server
-
- @param ip_address the server floating or fixed IP address to use
- for ssh validation
- @param username name of the Linux account on the remote server
- @param private_key the SSH private key to use
- @return a RemoteClient object
- """
-
- if username is None:
- username = CONF.validation.image_ssh_user
- # Set this with 'keypair' or others to log in with keypair or
- # username/password.
- if CONF.validation.auth_method == 'keypair':
- password = None
- if private_key is None:
- private_key = self.keypair['private_key']
- else:
- password = CONF.validation.image_ssh_password
- private_key = None
- linux_client = remote_client.RemoteClient(ip_address, username,
- pkey=private_key,
- password=password)
- try:
- linux_client.validate_authentication()
- except Exception as e:
- message = ('Initializing SSH connection to %(ip)s failed. '
- 'Error: %(error)s' % {'ip': ip_address,
- 'error': e})
- caller = test_utils.find_test_caller()
- if caller:
- message = '(%s) %s' % (caller, message)
- LOG.exception(message)
- self._log_console_output()
- raise
-
- return linux_client
-
def _image_create(self, name, fmt, path,
disk_format=None, properties=None):
if properties is None:
@@ -345,206 +177,11 @@
return image
- def _log_console_output(self, servers=None):
- if not CONF.compute_feature_enabled.console_output:
- LOG.debug('Console output not supported, cannot log')
- return
- if not servers:
- servers = self.servers_client.list_servers()
- servers = servers['servers']
- for server in servers:
- try:
- console_output = self.servers_client.get_console_output(
- server['id'])['output']
- LOG.debug('Console output for %s\nbody=\n%s',
- server['id'], console_output)
- except lib_exc.NotFound:
- LOG.debug("Server %s disappeared(deleted) while looking "
- "for the console log", server['id'])
-
def _log_net_info(self, exc):
# network debug is called as part of ssh init
if not isinstance(exc, lib_exc.SSHTimeout):
LOG.debug('Network information on a devstack host')
- def rebuild_server(self, server_id, image=None,
- preserve_ephemeral=False, wait=True,
- rebuild_kwargs=None):
- if image is None:
- image = CONF.compute.image_ref
-
- rebuild_kwargs = rebuild_kwargs or {}
-
- LOG.debug("Rebuilding server (id: %s, image: %s, preserve eph: %s)",
- server_id, image, preserve_ephemeral)
- self.servers_client.rebuild_server(
- server_id=server_id, image_ref=image,
- preserve_ephemeral=preserve_ephemeral,
- **rebuild_kwargs)
- if wait:
- waiters.wait_for_server_status(self.servers_client,
- server_id, 'ACTIVE')
-
- def ping_ip_address(self, ip_address, should_succeed=True,
- ping_timeout=None, mtu=None):
- timeout = ping_timeout or CONF.validation.ping_timeout
- cmd = ['ping', '-c1', '-w1']
-
- if mtu:
- cmd += [
- # don't fragment
- '-M', 'do',
- # ping receives just the size of ICMP payload
- '-s', str(net_utils.get_ping_payload_size(mtu, 4))
- ]
- cmd.append(ip_address)
-
- def ping():
- proc = subprocess.Popen(cmd,
- stdout=subprocess.PIPE,
- stderr=subprocess.PIPE)
- proc.communicate()
-
- return (proc.returncode == 0) == should_succeed
-
- caller = test_utils.find_test_caller()
- LOG.debug('%(caller)s begins to ping %(ip)s in %(timeout)s sec and the'
- ' expected result is %(should_succeed)s', {
- 'caller': caller, 'ip': ip_address, 'timeout': timeout,
- 'should_succeed':
- 'reachable' if should_succeed else 'unreachable'
- })
- result = test_utils.call_until_true(ping, timeout, 1)
- LOG.debug('%(caller)s finishes ping %(ip)s in %(timeout)s sec and the '
- 'ping result is %(result)s', {
- 'caller': caller, 'ip': ip_address, 'timeout': timeout,
- 'result': 'expected' if result else 'unexpected'
- })
- return result
-
- def check_vm_connectivity(self, ip_address,
- username=None,
- private_key=None,
- should_connect=True,
- mtu=None):
- """Check server connectivity
-
- :param ip_address: server to test against
- :param username: server's ssh username
- :param private_key: server's ssh private key to be used
- :param should_connect: True/False indicates positive/negative test
- positive - attempt ping and ssh
- negative - attempt ping and fail if succeed
- :param mtu: network MTU to use for connectivity validation
-
- :raises: AssertError if the result of the connectivity check does
- not match the value of the should_connect param
- """
- if should_connect:
- msg = "Timed out waiting for %s to become reachable" % ip_address
- else:
- msg = "ip address %s is reachable" % ip_address
- self.assertTrue(self.ping_ip_address(ip_address,
- should_succeed=should_connect,
- mtu=mtu),
- msg=msg)
- if should_connect:
- # no need to check ssh for negative connectivity
- self.get_remote_client(ip_address, username, private_key)
-
- def check_public_network_connectivity(self, ip_address, username,
- private_key, should_connect=True,
- msg=None, servers=None, mtu=None):
- # The target login is assumed to have been configured for
- # key-based authentication by cloud-init.
- LOG.debug('checking network connections to IP %s with user: %s',
- ip_address, username)
- try:
- self.check_vm_connectivity(ip_address,
- username,
- private_key,
- should_connect=should_connect,
- mtu=mtu)
- except Exception:
- ex_msg = 'Public network connectivity check failed'
- if msg:
- ex_msg += ": " + msg
- LOG.exception(ex_msg)
- self._log_console_output(servers)
- raise
-
- def create_floating_ip(self, thing, pool_name=None):
- """Create a floating IP and associates to a server on Nova"""
-
- if not pool_name:
- pool_name = CONF.network.floating_network_name
- floating_ip = (self.compute_floating_ips_client.
- create_floating_ip(pool=pool_name)['floating_ip'])
- self.addCleanup(test_utils.call_and_ignore_notfound_exc,
- self.compute_floating_ips_client.delete_floating_ip,
- floating_ip['id'])
- self.compute_floating_ips_client.associate_floating_ip_to_server(
- floating_ip['ip'], thing['id'])
- return floating_ip
-
- def create_timestamp(self, ip_address, dev_name=None, mount_path='/mnt',
- private_key=None):
- ssh_client = self.get_remote_client(ip_address,
- private_key=private_key)
- if dev_name is not None:
- ssh_client.make_fs(dev_name)
- ssh_client.mount(dev_name, mount_path)
- cmd_timestamp = 'sudo sh -c "date > %s/timestamp; sync"' % mount_path
- ssh_client.exec_command(cmd_timestamp)
- timestamp = ssh_client.exec_command('sudo cat %s/timestamp'
- % mount_path)
- if dev_name is not None:
- ssh_client.umount(mount_path)
- return timestamp
-
- def get_timestamp(self, ip_address, dev_name=None, mount_path='/mnt',
- private_key=None):
- ssh_client = self.get_remote_client(ip_address,
- private_key=private_key)
- if dev_name is not None:
- ssh_client.mount(dev_name, mount_path)
- timestamp = ssh_client.exec_command('sudo cat %s/timestamp'
- % mount_path)
- if dev_name is not None:
- ssh_client.umount(mount_path)
- return timestamp
-
- def get_server_ip(self, server):
- """Get the server fixed or floating IP.
-
- Based on the configuration we're in, return a correct ip
- address for validating that a guest is up.
- """
- if CONF.validation.connect_method == 'floating':
- # The tests calling this method don't have a floating IP
- # and can't make use of the validation resources. So the
- # method is creating the floating IP there.
- return self.create_floating_ip(server)['ip']
- elif CONF.validation.connect_method == 'fixed':
- # Determine the network name to look for based on config or creds
- # provider network resources.
- if CONF.validation.network_for_ssh:
- addresses = server['addresses'][
- CONF.validation.network_for_ssh]
- else:
- creds_provider = self._get_credentials_provider()
- net_creds = creds_provider.get_primary_creds()
- network = getattr(net_creds, 'network', None)
- addresses = (server['addresses'][network['name']]
- if network else [])
- for address in addresses:
- if (address['version'] == CONF.validation.ip_version_for_ssh
- and address['OS-EXT-IPS:type'] == 'fixed'):
- return address['addr']
- raise exceptions.ServerUnreachable(server_id=server['id'])
- else:
- raise lib_exc.InvalidConfiguration()
-
class NetworkScenarioTest(ScenarioTest):
"""Base class for network scenario tests.
@@ -566,29 +203,6 @@
if not CONF.service_available.neutron:
raise cls.skipException('Neutron not available')
- def _create_network(self, networks_client=None,
- tenant_id=None,
- namestart='network-smoke-',
- port_security_enabled=True):
- if not networks_client:
- networks_client = self.networks_client
- if not tenant_id:
- tenant_id = networks_client.tenant_id
- name = data_utils.rand_name(namestart)
- network_kwargs = dict(name=name, tenant_id=tenant_id)
- # Neutron disables port security by default so we have to check the
- # config before trying to create the network with port_security_enabled
- if CONF.network_feature_enabled.port_security:
- network_kwargs['port_security_enabled'] = port_security_enabled
- result = networks_client.create_network(**network_kwargs)
- network = result['network']
-
- self.assertEqual(network['name'], name)
- self.addCleanup(test_utils.call_and_ignore_notfound_exc,
- networks_client.delete_network,
- network['id'])
- return network
-
def _create_subnet(self, network, subnets_client=None,
routers_client=None, namestart='subnet-smoke',
**kwargs):
@@ -678,44 +292,6 @@
return subnet
- def _get_server_port_id_and_ip4(self, server, ip_addr=None):
- if ip_addr:
- ports = self.os_admin.ports_client.list_ports(
- device_id=server['id'],
- fixed_ips='ip_address=%s' % ip_addr)['ports']
- else:
- ports = self.os_admin.ports_client.list_ports(
- device_id=server['id'])['ports']
- # A port can have more than one IP address in some cases.
- # If the network is dual-stack (IPv4 + IPv6), this port is associated
- # with 2 subnets
-
- def _is_active(port):
- # NOTE(vsaienko) With Ironic, instances live on separate hardware
- # servers. Neutron does not bind ports for Ironic instances, as a
- # result the port remains in the DOWN state. This has been fixed
- # with the introduction of the networking-baremetal plugin but
- # it's not mandatory (and is not used on all stable branches).
- return (port['status'] == 'ACTIVE' or
- port.get('binding:vnic_type') == 'baremetal')
-
- port_map = [(p["id"], fxip["ip_address"])
- for p in ports
- for fxip in p["fixed_ips"]
- if (netutils.is_valid_ipv4(fxip["ip_address"]) and
- _is_active(p))]
- inactive = [p for p in ports if p['status'] != 'ACTIVE']
- if inactive:
- LOG.warning("Instance has ports that are not ACTIVE: %s", inactive)
-
- self.assertNotEmpty(port_map,
- "No IPv4 addresses found in: %s" % ports)
- self.assertEqual(len(port_map), 1,
- "Found multiple IPv4 addresses: %s. "
- "Unable to determine which port to target."
- % port_map)
- return port_map[0]
-
def _get_network_by_name_or_id(self, identifier):
if uuidutils.is_uuid_like(identifier):
@@ -739,8 +315,8 @@
if not client:
client = self.floating_ips_client
if not port_id:
- port_id, ip4 = self._get_server_port_id_and_ip4(thing,
- ip_addr=ip_addr)
+ port_id, ip4 = self.get_server_port_id_and_ip4(thing,
+ ip_addr=ip_addr)
else:
ip4 = None
result = client.create_floatingip(
@@ -756,21 +332,13 @@
return floating_ip
def _associate_floating_ip(self, floating_ip, server):
- port_id, _ = self._get_server_port_id_and_ip4(server)
+ port_id, _ = self.get_server_port_id_and_ip4(server)
kwargs = dict(port_id=port_id)
floating_ip = self.floating_ips_client.update_floatingip(
floating_ip['id'], **kwargs)['floatingip']
self.assertEqual(port_id, floating_ip['port_id'])
return floating_ip
- def _disassociate_floating_ip(self, floating_ip):
- """:param floating_ip: floating_ips_client.create_floatingip"""
- kwargs = dict(port_id=None)
- floating_ip = self.floating_ips_client.update_floatingip(
- floating_ip['id'], **kwargs)['floatingip']
- self.assertIsNone(floating_ip['port_id'])
- return floating_ip
-
def check_floating_ip_status(self, floating_ip, status):
"""Verifies floatingip reaches the given status
@@ -815,10 +383,11 @@
self.check_vm_connectivity(ip_address['addr'],
username,
private_key,
- should_connect=should_connect)
+ should_connect=should_connect,
+ server=server)
except Exception as e:
LOG.exception('Tenant network connectivity check failed')
- self._log_console_output(servers_for_debug)
+ self.log_console_output(servers_for_debug)
self._log_net_info(e)
raise
@@ -1120,7 +689,7 @@
router = None
subnet = None
else:
- network = self._create_network(
+ network = self.create_network(
networks_client=networks_client,
tenant_id=tenant_id,
port_security_enabled=port_security_enabled)
diff --git a/manila_tempest_tests/tests/scenario/manager_share.py b/manila_tempest_tests/tests/scenario/manager_share.py
index 657b1f1..e1d3a8f 100644
--- a/manila_tempest_tests/tests/scenario/manager_share.py
+++ b/manila_tempest_tests/tests/scenario/manager_share.py
@@ -109,7 +109,7 @@
# Tests need to be able to ssh into the VM - so we need
# a security group, and a tenant private network
self.security_group = self._create_security_group()
- self.network = self._create_network(namestart="manila-share")
+ self.network = self.create_network(namestart="manila-share")
# When not using a "storage network" to connect shares to VMs,
# we need the subnet to match the IP version we're testing
subnet_ip_params = {} if self.storage_network else {
@@ -192,7 +192,8 @@
remote_client = self.get_remote_client(
server_or_ip=server_ip,
username=self.ssh_user,
- private_key=self.keypair['private_key'])
+ private_key=self.keypair['private_key'],
+ server=instance)
# NOTE(u_glide): Workaround for bug #1465682
remote_client = remote_client.ssh_client
@@ -307,7 +308,7 @@
linux_client.validate_authentication()
except Exception:
LOG.exception('Initializing SSH connection to %s failed', ip)
- self._log_console_output()
+ self.log_console_output()
raise
return linux_client
diff --git a/zuul.d/manila-tempest-jobs.yaml b/zuul.d/manila-tempest-jobs.yaml
index a68aafe..302bcd2 100644
--- a/zuul.d/manila-tempest-jobs.yaml
+++ b/zuul.d/manila-tempest-jobs.yaml
@@ -255,7 +255,7 @@
Test the generic driver multibackend (DHSS=True) with NFS and CIFS
parent: manila-tempest-plugin-base
vars:
- tempest_test_regex: '(^manila_tempest_tests.tests)(?=.*\[.*\bbackend\b.*\])'
+ tempest_test_regex: '(^manila_tempest_tests.tests.api)(?=.*\[.*\bbackend\b.*\])'
# The generic driver uses nova VMs as share servers; running with a
# high concurrency could starve the driver of RAM/Disk/CPUs to
# function properly in a small single node devstack VM.
@@ -289,6 +289,19 @@
image_password: manila
- job:
+ name: manila-tempest-plugin-generic-scenario
+ description: |
+ Test the scenario test cases on the generic driver multibackend
+ (DHSS=True) with NFS and CIFS
+ parent: manila-tempest-plugin-generic
+ vars:
+ tempest_test_regex: '(^manila_tempest_tests.tests.scenario)(?=.*\[.*\bbackend\b.*\])'
+ # The generic driver uses nova VMs as share servers; running with a
+ # high concurrency could starve the driver of RAM/Disk/CPUs to
+ # function properly in a small single node devstack VM.
+ tempest_concurrency: 1
+
+- job:
name: manila-tempest-plugin-cephfs-native
description: Test CephFS Native (DHSS=False)
parent: manila-tempest-plugin-base
diff --git a/zuul.d/manila-tempest-stable-jobs.yaml b/zuul.d/manila-tempest-stable-jobs.yaml
index 3d2447e..6c4d8d9 100644
--- a/zuul.d/manila-tempest-stable-jobs.yaml
+++ b/zuul.d/manila-tempest-stable-jobs.yaml
@@ -1,6 +1,23 @@
# Stable branch jobs to test the trunk version of manila-tempest-plugin against
# released stable branches of manila
- job:
+ name: manila-tempest-plugin-lvm-yoga
+ parent: manila-tempest-plugin-lvm
+ override-checkout: stable/yoga
+ nodeset: openstack-single-node-focal
+ vars:
+ # NOTE(gouthamr): Disabled until https://launchpad.net/bugs/1940324 is
+ # fixed.
+ tempest_exclude_regex: "(^manila_tempest_tests.tests.scenario.*IPv6.*)"
+ devstack_localrc:
+ MANILA_SERVICE_IMAGE_ENABLED: True
+ # NOTE(carloss): Pinning manila service image to a Focal version,
+ # since on Zed we moved to Ubuntu Jammy (22), and it requires more
+ # VM resources.
+ MANILA_SERVICE_IMAGE_URL: https://tarballs.opendev.org/openstack/manila-image-elements/images/manila-service-image-1.3.0-76-ga216835.qcow2
+ MANILA_SERVICE_IMAGE_NAME: manila-service-image-1.3.0-76-ga216835
+
+- job:
name: manila-tempest-plugin-lvm-xena
parent: manila-tempest-plugin-lvm
override-checkout: stable/xena
@@ -9,6 +26,13 @@
# NOTE(gouthamr): Disabled until https://launchpad.net/bugs/1940324 is
# fixed.
tempest_exclude_regex: "(^manila_tempest_tests.tests.scenario.*IPv6.*)"
+ devstack_localrc:
+ # NOTE(carloss): Pinning manila service image to a Focal version,
+ # since on Zed we moved to Ubuntu Jammy (22), and it requires more
+ # VM resources.
+ MANILA_SERVICE_IMAGE_ENABLED: True
+ MANILA_SERVICE_IMAGE_URL: https://tarballs.opendev.org/openstack/manila-image-elements/images/manila-service-image-1.3.0-76-ga216835.qcow2
+ MANILA_SERVICE_IMAGE_NAME: manila-service-image-1.3.0-76-ga216835
- job:
name: manila-tempest-plugin-lvm-wallaby
@@ -17,11 +41,10 @@
nodeset: openstack-single-node-focal
vars:
tempest_exclude_regex: ''
-
-- job:
- name: manila-tempest-plugin-lvm-victoria
- parent: manila-tempest-plugin-lvm
- override-checkout: stable/victoria
- nodeset: openstack-single-node-focal
- vars:
- tempest_exclude_regex: ''
+ devstack_localrc:
+ # NOTE(carloss): Pinning manila service image to a Focal version,
+ # since on Zed we moved to Ubuntu Jammy (22), and it requires more
+ # VM resources.
+ MANILA_SERVICE_IMAGE_ENABLED: True
+ MANILA_SERVICE_IMAGE_URL: https://tarballs.opendev.org/openstack/manila-image-elements/images/manila-service-image-1.3.0-76-ga216835.qcow2
+ MANILA_SERVICE_IMAGE_NAME: manila-service-image-1.3.0-76-ga216835
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index ce21547..c45dfbf 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -2,14 +2,15 @@
templates:
- check-requirements
- tempest-plugin-jobs
+ queue: manila
check:
jobs:
- manila-tempest-plugin-dummy-no-dhss
- manila-tempest-plugin-dummy-dhss
- manila-tempest-plugin-lvm
+ - manila-tempest-plugin-lvm-yoga
- manila-tempest-plugin-lvm-xena
- manila-tempest-plugin-lvm-wallaby
- - manila-tempest-plugin-lvm-victoria
- manila-tempest-plugin-zfsonlinux:
voting: false
- manila-tempest-plugin-cephfs-native:
@@ -20,10 +21,11 @@
voting: false
- manila-tempest-plugin-generic:
voting: false
+ - manila-tempest-plugin-generic-scenario:
+ voting: false
- manila-tempest-plugin-glusterfs-nfs:
voting: false
gate:
- queue: manila
jobs:
- manila-tempest-plugin-dummy-no-dhss
- manila-tempest-plugin-dummy-dhss