summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2017-11-07 08:30:57 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-11-07 08:30:57 +0000
commit7cd94ecd76db61ec6a2610355103b8d966c83a72 (patch)
tree04280cd40932de9780ea3870982cd75d0161ebbe
parent925fd67983d97b16022620ef4c51a70ecf639f2a (diff)
parent420bbc865b67e9d2e633cd433ea67c8dc22299d3 (diff)
Merge "Fix rally cinder scenarios" into stable/euphrates
-rw-r--r--functest/opnfv_tests/openstack/rally/scenario/full/opnfv-cinder.yaml12
1 files changed, 2 insertions, 10 deletions
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 5f46f5192..d5c2fa656 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) }}