Update rally-openstack to latest crucial changes

It fixes cinder "update_volume_type() got an unexpected keyword and
the bugs detected by CI (here Cinder v3)
Then it also reverts:
 - Temporarily remove CinderVolumeTypes.create_and_update_volume_type
 - Temporarily blacklist CinderVolumeTypes.create_volume_type_add_and_list_type_access

Change-Id: I3bdcc6891da25728453a80903aa18c113f81fd81
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

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 7abeeac..4b3c22e 100644 (file)
--- a/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-cinder.yaml
+++ b/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-cinder.yaml
@@ -348,6 +348,20 @@
       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) }}
+        api_versions:
+          {{ volume_service(version=volume_version, service_type=volume_service_type) }}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+      sla:
+        {{ no_failures_sla() }}
+
   CinderVolumeTypes.create_volume_type_and_encryption_type:
     -
       args:
@@ -364,3 +378,16 @@
         {{ 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) }}
+        api_versions:
+          {{ volume_service(version=volume_version, service_type=volume_service_type) }}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+      sla:
+        {{ no_failures_sla() }}

diff --git a/upper-constraints.txt b/upper-constraints.txt
index 57e54a1..c2f5af0 100644 (file)
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -10,7 +10,7 @@ bandit===1.7.0
 ruamel.yaml.jinja2==0.2.2
 -e git+https://opendev.org/openstack/tempest@29.0.0#egg=tempest
 -e git+https://opendev.org/openstack/rally.git@3.3.0#egg=rally
-git+https://opendev.org/openstack/rally-openstack.git@2.2.0#egg=rally-openstack
+git+https://opendev.org/openstack/rally-openstack.git@1c470d56f4dd63374f41f7b243092b0a0751a22f#egg=rally-openstack
 git+https://github.com/xrally/xrally-kubernetes.git@2ffa85af2bff3438b6b23034b6ec6ee1de481090#egg=xrally-kubernetes
 pylint===2.11.1
 flake8===4.0.1