aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKanagaraj M <mkr1481@gmail.com>2019-08-09 06:44:12 +0530
committerKanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>2019-08-09 06:46:56 +0530
commite26c26027ef9b9c24788f58d7a1f4439b4d4d5ec (patch)
tree91320eb222b80bc8b0f0d0c295db57ffb335c32c
parent83430ba3e2e3aa5d3c1022e8c20700e632af8c11 (diff)
Add request-id to vnf provision
Issue-ID: CLI-169 Change-Id: Iff4ea20599879d0483b1e0d12dd72d3af573e4cc Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
-rw-r--r--products/onap-dublin/features/integration/src/main/resources/script/ovp-tosca-vnf-provision.py6
-rw-r--r--profiles/command/src/main/java/org/onap/cli/fw/cmd/cmd/OpenCommandShellCmd.java4
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);