From: Julien Fontaine Date: Mon, 27 Jul 2020 15:26:27 +0000 (-0400) Subject: Fix empty dict in the script arguments when running a script in the cmd-exec X-Git-Tag: 1.0.0~67^2 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F26%2F110626%2F1;p=ccsdk%2Fcds.git Fix empty dict in the script arguments when running a script in the cmd-exec Add a test to check if dynamic properties are empty. If empty we don't pass them to the script. Issue-ID: CCSDK-2614 Signed-off-by: Julien Fontaine Change-Id: Iaa5a2b49e38d9a120fb193966af13f0843773e5f --- diff --git a/ms/command-executor/src/main/python/command_executor_handler.py b/ms/command-executor/src/main/python/command_executor_handler.py index eec385783..06004b551 100644 --- a/ms/command-executor/src/main/python/command_executor_handler.py +++ b/ms/command-executor/src/main/python/command_executor_handler.py @@ -104,11 +104,16 @@ class CommandExecutorHandler(): cmd = "cd " + self.venv_home + ### if properties are defined we add them to the command + properties = "" + if request.properties is not None and len(request.properties) > 0: + properties = " " + re.escape(MessageToJson(request.properties)) + ### TODO: replace with os.environ['VIRTUAL_ENV']? if "ansible-playbook" in request.command: cmd = cmd + "; " + request.command + " -e 'ansible_python_interpreter=" + self.venv_home + "/bin/python'" else: - cmd = cmd + "; " + request.command + " " + re.escape(MessageToJson(request.properties)) + cmd = cmd + "; " + request.command + properties ### extract the original header request into sys-env variables ### RequestID