From a8ac8cae28977041eaf1d1b94d124275327c9a19 Mon Sep 17 00:00:00 2001
From: Andrey Kurilin <andr.kurilin@gmail.com>
Date: Mon, 4 Dec 2023 20:15:20 +0100
Subject: [PATCH] Fix processing 'confirm' argument of
 NovaServers.resize_server scenario

In addition, the rally-task-nova zuul job is re-enabled with skipping
one workload to check all the others.

Change-Id: I0f0c838569ea2d5666fb17f415ca7fd4a384492f
---
 .zuul.d/zuul.yaml                              | 4 ++--
 CHANGELOG.rst                                  | 4 ++++
 rally-jobs/nova.yaml                           | 3 +++
 rally_openstack/task/scenarios/nova/servers.py | 7 ++++---
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.zuul.d/zuul.yaml b/.zuul.d/zuul.yaml
index 3cf99f51..535d06a0 100644
--- a/.zuul.d/zuul.yaml
+++ b/.zuul.d/zuul.yaml
@@ -66,8 +66,7 @@
               - tests/ci/playbooks
         - rally-task-neutron-with-extensions:
             voting: false
-        #- rally-task-nova:
-        #    voting: false
+        - rally-task-nova
         # it did not work for a long time
         #- rally-task-senlin
         #- rally-task-octavia:
@@ -115,6 +114,7 @@
               - rally_openstack/task/scenarios/neutron/trunk.py
               - rally_openstack/task/scenarios/neutron/network.py
               - tests/ci/playbooks
+        - rally-task-nova
         - rally-verify-tempest
     post:
       jobs:
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 2b93de3b..3fc736f5 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -31,6 +31,10 @@ Fixed
 
   `Launchpad-bug #2040486 <https://launchpad.net/bugs/2040486>`_
 
+* ``confirm`` argument of ``NovaServers.resize_server`` scenario
+  cannot be passed any longer due to more strict validation from
+  python-novaclient library.
+
 [2.3.0] - 2023-08-01
 --------------------
 
diff --git a/rally-jobs/nova.yaml b/rally-jobs/nova.yaml
index 2e56dbcf..2f905ca3 100755
--- a/rally-jobs/nova.yaml
+++ b/rally-jobs/nova.yaml
@@ -502,6 +502,9 @@
         users:
           tenants: 2
           users_per_tenant: 1
+      sla:
+        failure_rate:
+          max: 100
     -
       title: NovaServers.boot_server_from_volume_and_resize tests
       scenario:
diff --git a/rally_openstack/task/scenarios/nova/servers.py b/rally_openstack/task/scenarios/nova/servers.py
index 8bc70b19..f7af5b0f 100644
--- a/rally_openstack/task/scenarios/nova/servers.py
+++ b/rally_openstack/task/scenarios/nova/servers.py
@@ -372,7 +372,8 @@ class BootServerFromVolume(utils.NovaScenario, cinder_utils.CinderBasic):
                     name="NovaServers.resize_server", platform="openstack")
 class ResizeServer(utils.NovaScenario):
 
-    def run(self, image, flavor, to_flavor, force_delete=False, **kwargs):
+    def run(self, image, flavor, to_flavor, confirm=True,
+            force_delete=False, **kwargs):
         """Boot a server, then resize and delete it.
 
         This test will confirm the resize by default,
@@ -381,13 +382,13 @@ class ResizeServer(utils.NovaScenario):
         :param image: image to be used to boot an instance
         :param flavor: flavor to be used to boot an instance
         :param to_flavor: flavor to be used to resize the booted instance
+        :param confirm: perform resize confirm action right after requesting
+            a resize. If False, resize revert action will be performed.
         :param force_delete: True if force_delete should be used
         :param kwargs: Optional additional arguments for server creation
         """
         server = self._boot_server(image, flavor, **kwargs)
         self._resize(server, to_flavor)
-        # by default we confirm
-        confirm = kwargs.get("confirm", True)
         if confirm:
             self._resize_confirm(server)
         else: