diff options
3 files changed, 160 insertions, 11 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 5f46f519..87fae11a 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) }} @@ -243,3 +235,105 @@ {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} + + CinderQos.create_and_get_qos: + - + args: + consumer: "both" + write_iops_sec: "10" + read_iops_sec: "1000" + context: + {{ user_context(tenants_amount, users_amount, use_existing_users) }} + runner: + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} + sla: + {{ no_failures_sla() }} + + CinderQos.create_and_list_qos: + - + args: + consumer: "both" + write_iops_sec: "10" + read_iops_sec: "1000" + context: + {{ user_context(tenants_amount, users_amount, use_existing_users) }} + runner: + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} + sla: + {{ no_failures_sla() }} + + CinderQos.create_and_set_qos: + - + args: + consumer: "back-end" + write_iops_sec: "10" + read_iops_sec: "1000" + set_consumer: "both" + set_write_iops_sec: "11" + set_read_iops_sec: "1001" + context: + {{ user_context(tenants_amount, users_amount, use_existing_users) }} + runner: + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} + sla: + {{ no_failures_sla() }} + + CinderVolumeTypes.create_and_get_volume_type: + - + args: + description: "rally tests creating types" + context: + {{ user_context(tenants_amount, users_amount, use_existing_users) }} + runner: + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} + sla: + {{ no_failures_sla() }} + + CinderVolumeTypes.create_and_list_volume_types: + - + args: + description: "rally tests creating types" + context: + {{ user_context(tenants_amount, users_amount, use_existing_users) }} + runner: + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} + sla: + {{ no_failures_sla() }} + + CinderVolumeTypes.create_and_update_volume_type: + - + args: + description: "test" + update_description: "test update" + context: + {{ user_context(tenants_amount, users_amount, use_existing_users) }} + runner: + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} + sla: + {{ no_failures_sla() }} + + CinderVolumeTypes.create_volume_type_and_encryption_type: + - + args: + description: "rally tests creating types" + provider: "LuksEncryptor" + cipher: "aes-xts-plain64" + key_size: 512 + control_location: "front-end" + context: + {{ user_context(tenants_amount, users_amount, use_existing_users) }} + runner: + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} + sla: + {{ no_failures_sla() }} + + CinderVolumeTypes.create_volume_type_add_and_list_type_access: + - + args: + description: "rally tests creating types" + context: + {{ user_context(tenants_amount, users_amount, use_existing_users) }} + runner: + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} + sla: + {{ no_failures_sla() }} diff --git a/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-cinder.yaml b/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-cinder.yaml index 5962b1db..83235807 100644 --- a/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-cinder.yaml +++ b/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-cinder.yaml @@ -82,3 +82,58 @@ {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} + + CinderQos.create_and_list_qos: + - + args: + consumer: "both" + write_iops_sec: "10" + read_iops_sec: "1000" + context: + {{ user_context(tenants_amount, users_amount, use_existing_users) }} + runner: + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} + sla: + {{ no_failures_sla() }} + + CinderQos.create_and_set_qos: + - + args: + consumer: "back-end" + write_iops_sec: "10" + read_iops_sec: "1000" + set_consumer: "both" + set_write_iops_sec: "11" + set_read_iops_sec: "1001" + context: + {{ user_context(tenants_amount, users_amount, use_existing_users) }} + runner: + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} + sla: + {{ no_failures_sla() }} + + CinderVolumeTypes.create_and_list_volume_types: + - + args: + description: "rally tests creating types" + context: + {{ user_context(tenants_amount, users_amount, use_existing_users) }} + runner: + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} + sla: + {{ no_failures_sla() }} + + CinderVolumeTypes.create_volume_type_and_encryption_type: + - + args: + description: "rally tests creating types" + provider: "LuksEncryptor" + cipher: "aes-xts-plain64" + key_size: 512 + control_location: "front-end" + context: + {{ user_context(tenants_amount, users_amount, use_existing_users) }} + runner: + {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} + sla: + {{ no_failures_sla() }} diff --git a/functest/opnfv_tests/openstack/snaps/snaps_utils.py b/functest/opnfv_tests/openstack/snaps/snaps_utils.py index 956b104a..c3cd6245 100644 --- a/functest/opnfv_tests/openstack/snaps/snaps_utils.py +++ b/functest/opnfv_tests/openstack/snaps/snaps_utils.py @@ -16,7 +16,7 @@ def get_ext_net_name(os_creds): """ neutron = neutron_utils.neutron_client(os_creds) ext_nets = neutron_utils.get_external_networks(neutron) - return ext_nets[0].name + return ext_nets[0].name if ext_nets else "" def get_active_compute_cnt(os_creds): |