commit 6a5ec681a93a0ddf55080f164187791ed92578be
author yangyan <yangyanyj@chinamobile.com> Mon Sep 09 15:32:43 2019 +0800
committer yangyan <yangyanyj@chinamobile.com> Mon Sep 09 15:32:48 2019 +0800
tree 0348726aeeb07cafa275f3c564c3589f79cc99a3
parent 85c072848343772ead89d4e2596cc3068fe94a66

Fix the bug of cli command error when onboard ns

Change-Id: I832a1cbbbf8b882089f941033fdc2acefce7e387
Issue-ID: INT-1239
Signed-off-by: yangyan <yangyanyj@chinamobile.com>

test/hpa_automation/tosca/hpa_automation.py

diff --git a/test/hpa_automation/tosca/hpa_automation.py b/test/hpa_automation/tosca/hpa_automation.py
index 68f8487..d542c20 100755
--- a/test/hpa_automation/tosca/hpa_automation.py
+++ b/test/hpa_automation/tosca/hpa_automation.py
@@ -385,7 +385,8 @@
     return vnf_onboard_outputs
 
 def onboard_ns(parameters):
-    ns_onboard_string = 'oclip vfc-catalog-onboard-ns -c {}'.format(parameters["ns-csar-id"])
+    ns_onboard_string = 'oclip vfc-catalog-onboard-ns -m {} -c {}'.format(parameters["ns"]["url"],
+                                                                          parameters["ns"]["csar-id"])
     ns_onboard_out = (os.popen(ns_onboard_string)).read()
     return ns_onboard_out
 

test/hpa_automation/tosca/vcpe_vgw_config.json

diff --git a/test/hpa_automation/tosca/vcpe_vgw_config.json b/test/hpa_automation/tosca/vcpe_vgw_config.json
index 989734f..d4bcef9 100755
--- a/test/hpa_automation/tosca/vcpe_vgw_config.json
+++ b/test/hpa_automation/tosca/vcpe_vgw_config.json
@@ -147,6 +147,7 @@
 	}
     },
     "ns":{
+        "url": "http://msb-iag:80",
         "csar-id": "You need change it",
 	"key": "key1",
 	"value": "value1",