diff options
| -rw-r--r-- | functest/ci/tier_handler.py | 3 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/rally/scenario/full/opnfv-cinder.yaml | 12 |
2 files changed, 2 insertions, 13 deletions
diff --git a/functest/ci/tier_handler.py b/functest/ci/tier_handler.py index cbabe63bc..dd3e77ce3 100644 --- a/functest/ci/tier_handler.py +++ b/functest/ci/tier_handler.py @@ -121,9 +121,6 @@ class TestCase(object): def is_compatible(self, ci_installer, ci_scenario): try: - if (self.is_none(ci_installer) and not - self.is_none(self.dependency.get_installer())): - return False if not self.is_none(ci_installer): if re.search(self.dependency.get_installer(), ci_installer) is None: diff --git a/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-cinder.yaml b/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-cinder.yaml index 7840a294e..87fae11a3 100644 --- a/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-cinder.yaml +++ b/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-cinder.yaml @@ -79,6 +79,7 @@ CinderVolumes.create_nested_snapshots_and_attach_volume: - args: + {{ vm_params(image_name,flavor_name) }} nested_level: 1 size: max: 1 @@ -87,11 +88,6 @@ {% call user_context(tenants_amount, users_amount, use_existing_users) %} quotas: {{ unlimited_volumes() }} - servers: - {{ vm_params(image_name,flavor_name,none)|indent(2,true) }} - servers_per_tenant: 1 - auto_assign_nic: true - network: {} {% endcall %} runner: {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} @@ -101,6 +97,7 @@ CinderVolumes.create_snapshot_and_attach_volume: - args: + {{ vm_params(image_name,flavor_name) }} size: min: 1 max: 5 @@ -108,11 +105,6 @@ {% call user_context(tenants_amount, users_amount, use_existing_users) %} quotas: {{ unlimited_volumes() }} - servers: - {{ vm_params(image_name,flavor_name,none)|indent(2,true) }} - servers_per_tenant: 2 - auto_assign_nic: true - network: {} {% endcall %} runner: {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} |