diff options
| author |   yangyan <yangyanyj@chinamobile.com> | 2019-09-09 15:27:31 +0800 |
|---|---|---|
| committer | yangyan <yangyanyj@chinamobile.com> | 2019-09-09 15:29:52 +0800 |
| commit | 85c072848343772ead89d4e2596cc3068fe94a66 (patch) | |
| tree | 30f10e0b813e29c55e7e7236ae71b6e9e295f304 /test/hpa_automation | |
| parent | f1d460aa03c2dea9fa3b9cfbdd83a48b9594284a (diff) | |
Fix bug of cli command error when onboard vnf
Change-Id: I25ca6c5a2cdf6eaca44cdcdb3f94e55c6bad899a
Issue-ID: INT-1239
Signed-off-by: yangyan <yangyanyj@chinamobile.com>
Diffstat (limited to 'test/hpa_automation')
| -rwxr-xr-x | test/hpa_automation/tosca/hpa_automation.py | 5 | ||||
| -rwxr-xr-x | test/hpa_automation/tosca/vcpe_vgw_config.json | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/test/hpa_automation/tosca/hpa_automation.py b/test/hpa_automation/tosca/hpa_automation.py index 08966d9a5..68f848763 100755 --- 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 c13f1d946..989734f79 100755 --- 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", |