aboutsummaryrefslogtreecommitdiffstats
path: root/robot/resources/asdc_interface.robot
diff options
context:
space:
mode:
authorBrian Freeman <bf1936@att.com>2019-02-13 13:54:48 -0500
committerBrian Freeman <bf1936@att.com>2019-02-13 13:54:55 -0500
commit12ff1844383b99b7b7efa8aae5bef8361bd163b1 (patch)
tree080f055b5ce96422cccf265a5fd5f13b7788d7cb /robot/resources/asdc_interface.robot
parent992832a29265fd57bdb3d2cb67f956e38790a498 (diff)
Fix dynamic service_mappin
Issue-ID: INT-883 Change-Id: Ia29b4468eaf68f0352f8dd6c84c382c5431beab2 Signed-off-by: Brian Freeman <bf1936@att.com>
Diffstat (limited to 'robot/resources/asdc_interface.robot')
-rw-r--r--robot/resources/asdc_interface.robot4
1 files changed, 2 insertions, 2 deletions
diff --git a/robot/resources/asdc_interface.robot b/robot/resources/asdc_interface.robot
index f09ddf7b..a044dabd 100644
--- a/robot/resources/asdc_interface.robot
+++ b/robot/resources/asdc_interface.robot
@@ -90,7 +90,8 @@ Distribute Model From ASDC
\ ${loop_catalog_resource_id}= Setup ASDC Catalog Resource ${zip} ${cds}
# zip can be vFW.zip or vFWDT_VFWSNK.zip
\ ${resource_type_match}= Get Regexp Matches ${zip} ${service}_(.*)\.zip 1
- \ ${resource_type_string}= Set Variable If len(${resource_type_match})==0 ${service} ${resource_type_match[0]}
+ # Need to be able to distribute preload for vFWCL vFWSNK and vFWDT vFWSNK to prepend service to vnf_type
+ \ ${resource_type_string}= Set Variable If len(${resource_type_match})==0 ${service} ${service}${resource_type_match[0]}
\ Set To Dictionary ${resource_types} ${resource_type_string} ${loop_catalog_resource_id}
\ Append To List ${catalog_resource_ids} ${loop_catalog_resource_id}
@@ -101,7 +102,6 @@ Distribute Model From ASDC
${xoffset}= Set Variable ${0}
: FOR ${vnf} IN @{vnflist}
- #\ ${catalog_resource_unique_name}= Add ASDC Resource Instance ${catalog_service_id} ${loop_catalog_resource_id} ${loop_catalog_resource_resp['name']}
\ ${loop_catalog_resource_resp}= Get ASDC Catalog Resource ${resource_types['${vnf}']}
\ Set To Dictionary ${catalog_resources} ${resource_types['${vnf}']}=${loop_catalog_resource_resp}
\ ${catalog_resource_unique_name}= Add ASDC Resource Instance ${catalog_service_id} ${resource_types['${vnf}']} ${loop_catalog_resource_resp['name']} ${xoffset}