From 420bbc865b67e9d2e633cd433ea67c8dc22299d3 Mon Sep 17 00:00:00 2001 From: Juha Kosonen Date: Sat, 4 Nov 2017 18:24:55 +0200 Subject: [PATCH] Fix rally cinder scenarios Remove network and servers context and set image and flavor as a scenario parameters. Change-Id: I5181ccce61c4f58af3737619d1b7d259cf539937 Signed-off-by: Juha Kosonen (cherry picked from commit a9337bc5618bb90cd9502f1ec9dc409e18eae0f7) --- .../openstack/rally/scenario/full/opnfv-cinder.yaml | 12 ++---------- 1 file 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) }} -- 2.16.6