From b4f54d9d1587ee73b4f39d952117a7f7b395dc76 Mon Sep 17 00:00:00 2001
From: Ayumu Ueha <ueha.ayumu@fujitsu.com>
Date: Fri, 5 Feb 2021 09:31:18 +0000
Subject: [PATCH] Adapt to python-mistralclient v4.2.0 for PingVIM

python-mistralclient upgraded to v4.2.0 on 2021-01-26.
v4.2.0 include change of the patch [1], and this patch changed argument
of ExectutionManager.create() method.
[1] https://review.opendev.org/c/openstack/python-mistralclient/+/764897

Tacker uses above method for creating VIM monitoring task during user
will register VIM.
So, this patch fix argument of mistral_client.executions.create() method
in NfvoPlugin to adapt to python-mistralclient v4.2.0 and enable to set
up vim monitoring successfuly.

And updated the python-mistralclient version of `requirements.txt`,
`lower-constraints.txt` and `upper-constraints.txt`.
After merging this patch, the user must upgrade python-mistralclient to
v4.2.0 in order for the VIM registration state to REACHABLE.

Closes-Bug: #1914737
Change-Id: Ia02b917f0dabc715575ab7f4c93cba0ff68380b6
---
 lower-constraints.txt                                  | 2 +-
 requirements.txt                                       | 2 +-
 tacker/nfvo/workflows/vim_monitor/vim_monitor_utils.py | 2 +-
 upper-constraints.txt                                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lower-constraints.txt b/lower-constraints.txt
index 436cfb355..3bbe109ac 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -107,7 +107,7 @@ python-glanceclient==2.9.1
 python-heatclient==1.10.0
 python-keystoneclient==3.8.0
 python-mimeparse==1.6.0
-python-mistralclient==3.1.0
+python-mistralclient==4.2.0
 python-neutronclient==6.7.0
 python-novaclient==9.1.0
 python-subunit==1.0.0
diff --git a/requirements.txt b/requirements.txt
index 9eef4cf1f..9bf12990b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -43,7 +43,7 @@ rfc3986>=1.2.0 # Apache-2.0
 cryptography>=2.7 # BSD/Apache-2.0
 paramiko>=2.7.1 # LGPLv2.1+
 pyroute2>=0.4.21;sys_platform!='win32' # Apache-2.0 (+ dual licensed GPL2)
-python-mistralclient!=3.2.0,>=3.1.0 # Apache-2.0
+python-mistralclient>=4.2.0 # Apache-2.0
 python-barbicanclient>=4.5.2 # Apache-2.0
 castellan>=0.16.0 # Apache-2.0
 kubernetes>=11.0.0 # Apache-2.0
diff --git a/tacker/nfvo/workflows/vim_monitor/vim_monitor_utils.py b/tacker/nfvo/workflows/vim_monitor/vim_monitor_utils.py
index 4d0f6264d..f71858bb1 100644
--- a/tacker/nfvo/workflows/vim_monitor/vim_monitor_utils.py
+++ b/tacker/nfvo/workflows/vim_monitor/vim_monitor_utils.py
@@ -44,7 +44,7 @@ def prepare_and_create_workflow(mistral_client, vim_id, action,
 
 def execute_workflow(mistral_client, workflow):
     return mistral_client.executions.create(
-        workflow_identifier=workflow['id'],
+        wf_identifier=workflow['id'],
         workflow_input=workflow['input'],
         wf_params={})
 
diff --git a/upper-constraints.txt b/upper-constraints.txt
index cd62bcea1..256490c21 100644
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -50,7 +50,7 @@ microversion-parse===1.0.1
 Pint===0.16.1
 oslo.i18n===5.0.1
 jsonpath-rw-ext===1.2.2
-python-mistralclient===4.1.1
+python-mistralclient===4.2.0
 oslo.context===3.1.1
 python-senlinclient===2.2.0
 rcssmin===1.0.6