diff options
| author |   Bartek Grzybowski <b.grzybowski@partner.samsung.com> | 2019-11-20 15:43:26 +0100 |
|---|---|---|
| committer | Bartek Grzybowski <b.grzybowski@partner.samsung.com> | 2019-11-20 16:25:41 +0100 |
| commit | dc3a1e8bbbc485e282bf5b5d46e4f58be78609f1 (patch) | |
| tree | 0f0ef5c6db41996dc9574e198fa6d3648a105ae7 /test/vcpe | |
| parent | 6358aa3444fe90a12040c288ba750dc9f6b4f19d (diff) | |
Fix logic for finding brg vnf template file
Change-Id: I0e31cc0a0a71a08a74ec56f4aa17321eb8d8c7ba
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
Issue-ID: INT-1345
Diffstat (limited to 'test/vcpe')
| -rwxr-xr-x | test/vcpe/vcpe.py | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/test/vcpe/vcpe.py b/test/vcpe/vcpe.py index 48190fe21..2b167a2d6 100755 --- a/test/vcpe/vcpe.py +++ b/test/vcpe/vcpe.py @@ -75,13 +75,21 @@ def deploy_brg_only(): # create multiple services based on the pre-determined order svc_instance_uuid = vcpecommon.load_object(vcpecommon.svc_instance_uuid_file) - for keyword in ['brg']: + for keyword in ['brgemu']: + keyword_vnf=keyword + "_" + keyword_gra=keyword + "gra_" heatbridge = 'gmux' == keyword csar_file = vcpecommon.find_file(keyword, 'csar', 'csar') - vnf_template_file = vcpecommon.find_file(keyword, 'json', 'preload_templates') - vcpecommon.increase_ip_address_or_vni_in_template(vnf_template_file, ['vbrgemu_private_ip_0']) - svc_instance_uuid[keyword] = create_one_service(vcpecommon, csar_file, vnf_template_file, preload_dict, - name_suffix, heatbridge) + vnf_template_file = vcpecommon.find_file(keyword_vnf, 'json', 'preload_templates') + gra_template_file = vcpecommon.find_file(keyword_gra, 'json', 'preload_templates') + if vcpecommon.gra_api_flag: + vcpecommon.increase_ip_address_or_vni_in_template(gra_template_file, ['vbrgemu_private_ip_0']) + svc_instance_uuid[keyword] = create_one_service(vcpecommon, csar_file, gra_template_file, preload_dict, + name_suffix, heatbridge) + else: + vcpecommon.increase_ip_address_or_vni_in_template(vnf_template_file, ['vbrgemu_private_ip_0']) + svc_instance_uuid[keyword] = create_one_service(vcpecommon, csar_file, vnf_template_file, preload_dict, + name_suffix, heatbridge) if not svc_instance_uuid[keyword]: sys.exit(1) |