Fix bug of cli command error when onboard vnf

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

diff --git a/test/hpa_automation/tosca/hpa_automation.py b/test/hpa_automation/tosca/hpa_automation.py
index 08966d9..68f8487 100755 (executable)
--- a/test/hpa_automation/tosca/hpa_automation.py
+++ b/test/hpa_automation/tosca/hpa_automation.py
@@ -373,13 +373,14 @@ def add_policies(parameters):
       os.system("oclip policy-push-outdated -m {} -u {} -p {} -x {} -b {} -c {}".format(parameters["policy_url"], \
         parameters["policy_username"], parameters["policy_password"], policy_name, parameters["policy_config_type"],\
         parameters["policy_pdp_group"]))
-    
+
 def onboard_vnf(parameters):
     vnfs = parameters["vnfs"]
     vnf_onboard_outputs = {}
 
     for key, value in vnfs.items():
-        vnf_onboard_string = 'oclip vfc-catalog-onboard-vnf -c {}'.format(value.get("csar-id"))
+        vnf_onboard_string = 'oclip vfc-catalog-onboard-vnf -m {} -c {}'\
+            .format(value.get("url"), value.get("csar-id"))
         vnf_onboard_outputs[key] = (os.popen(vnf_onboard_string)).read()
     return vnf_onboard_outputs
 

diff --git a/test/hpa_automation/tosca/vcpe_vgw_config.json b/test/hpa_automation/tosca/vcpe_vgw_config.json
index c13f1d9..989734f 100755 (executable)
--- a/test/hpa_automation/tosca/vcpe_vgw_config.json
+++ b/test/hpa_automation/tosca/vcpe_vgw_config.json
@@ -134,6 +134,7 @@
         "vgw":{
            "path": "/opt/oclip/dublin/vgw.csar",
            "csar-id": "You need change it",
+            "url": "http://msb-iag:80",
             "vsp-name" : "vgw-hpa-vsp",
             "vsp-desc" : "vgw-hpa-vsp-desc",
             "vsp-version" : "1.0",