From e26c26027ef9b9c24788f58d7a1f4439b4d4d5ec Mon Sep 17 00:00:00 2001 From: Kanagaraj M Date: Fri, 9 Aug 2019 06:44:12 +0530 Subject: Add request-id to vnf provision Issue-ID: CLI-169 Change-Id: Iff4ea20599879d0483b1e0d12dd72d3af573e4cc Signed-off-by: Kanagaraj Manickam k00365106 --- .../src/main/resources/script/ovp-tosca-vnf-provision.py | 6 +++++- .../src/main/java/org/onap/cli/fw/cmd/cmd/OpenCommandShellCmd.java | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/products/onap-dublin/features/integration/src/main/resources/script/ovp-tosca-vnf-provision.py b/products/onap-dublin/features/integration/src/main/resources/script/ovp-tosca-vnf-provision.py index a761fb15..2141e168 100644 --- a/products/onap-dublin/features/integration/src/main/resources/script/ovp-tosca-vnf-provision.py +++ b/products/onap-dublin/features/integration/src/main/resources/script/ovp-tosca-vnf-provision.py @@ -435,7 +435,11 @@ vnf_csar = args.vnf_csar ns_csar = args.ns_csar vnfm_driver = args.vnfm_driver result_json_path = args.result_json_path -request_id = args.request_id + +if args.request_id is None: + request_id = os.environ["OPEN_CLI_REQUEST_ID"] +else: + request_id = args.request_id # setup CLI parameters = get_parameters(config_file) diff --git a/profiles/command/src/main/java/org/onap/cli/fw/cmd/cmd/OpenCommandShellCmd.java b/profiles/command/src/main/java/org/onap/cli/fw/cmd/cmd/OpenCommandShellCmd.java index 884cde12..40ccf5c4 100644 --- a/profiles/command/src/main/java/org/onap/cli/fw/cmd/cmd/OpenCommandShellCmd.java +++ b/profiles/command/src/main/java/org/onap/cli/fw/cmd/cmd/OpenCommandShellCmd.java @@ -206,10 +206,10 @@ public class OpenCommandShellCmd extends OnapCommand { pr.setStderr(stderrStream); OnapCommandExecutionStore.getStore().storeExectutionDebug(this.getExecutionContext(), pr.toString()); - } else { - this.getResult().setDebugInfo(pr.toString()); } + this.getResult().setDebugInfo(pr.toString()); + pr.run(); } catch (Exception e) { throw new OnapCommandExecutionFailed(this.getName(), e); -- cgit 1.2.3-korg