summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Freeman <bf1936@att.com>2019-05-08 08:47:20 -0500
committerBrian Freeman <bf1936@att.com>2019-05-08 08:47:32 -0500
commit0c6e520a97945c9921a4b236459649ded228d309 (patch)
treedd4f8e316db874b2f06f1277c022af843e8663f6
parenta7800b7b4425937dbf11b090e2f2153e168af2ae (diff)
Cherry pick fix soutils
https://gerrit.onap.org/r/#/c/87044/ Issue-ID: INT-1061 Change-Id: Ia3f013ad57db54395db1467a13b2ee14c837bf23 Signed-off-by: Brian Freeman <bf1936@att.com>
-rw-r--r--robot/resources/so/direct_instantiate.robot17
1 files changed, 8 insertions, 9 deletions
diff --git a/robot/resources/so/direct_instantiate.robot b/robot/resources/so/direct_instantiate.robot
index 6e8ba136..1be89874 100644
--- a/robot/resources/so/direct_instantiate.robot
+++ b/robot/resources/so/direct_instantiate.robot
@@ -1,32 +1,31 @@
*** Settings ***
-Documentation Instantiate VNF
+Documentation Instantiate VNF
Library OperatingSystem
Library Collections
Library String
Library DateTime
-Library SoUtils
+Library SoUtils
*** Variables ***
*** Keywords ***
-Instantiate Service Direct To SO
+Instantiate Service Direct To SO
[Documentation] Creates an entire service from a CSAR
- [Arguments] ${service} ${csar_file} ${vnf_template_file}
+ [Arguments] ${service} ${csar_file} ${vnf_template_file}
# Example: ${csar_file}= Set Variable /tmp/csar/service-Vfw20190413133734-csar.csar
# Example: ${vnf_template_file}= Set Variable /var/opt/ONAP/testsuite/eteutils/vcpeutils/preload_templates/template.vfw_vfmodule.json
${name_suffix}= Get Current Date exclude_millis=True
${name_suffix}= Evaluate '${name_suffix}'.replace(' ','')
${name_suffix}= Evaluate '${name_suffix}'.replace(':','')
- ${heatbridge}= Set Variable false
${preload_dict}= Copy Dictionary ${GLOBAL_PRELOAD_PARAMETERS['defaults']}
${template}= Create Dictionary
@{keys}= Get Dictionary Keys ${preload_dict}
:for ${key} in @{keys}
\ ${value}= Get From Dictionary ${preload_dict} ${key}
- \ ${tmp_value}= Set Variable If 'GLOBAL_' in $value ${value}
+ \ ${tmp_value}= Set Variable If 'GLOBAL_' in $value ${value}
\ ${tmp_value}= Run Keyword If 'GLOBAL_' in $value Replace String ${tmp_value} \$ ${EMPTY}
\ ${tmp_value}= Run Keyword If 'GLOBAL_' in $value Replace String ${tmp_value} { ${EMPTY}
\ ${tmp_value}= Run Keyword If 'GLOBAL_' in $value Replace String ${tmp_value} } ${EMPTY}
@@ -45,9 +44,9 @@ Instantiate Service Direct To SO
Set To Dictionary ${template} ${tmp_key1} ${ecompnet} ${tmp_key2} ${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}
- Log ${preload_dict}
- Log ${template}
- ${service_instance_id}= Create Entire Service ${csar_file} ${vnf_template_file} ${template} ${name_suffix} ${GLOBAL_INJECTED_REGION} ${GLOBAL_INJECTED_OPENSTACK_TENANT_ID} ${heatbridge}
+ Log ${preload_dict}
+ Log ${template}
+ ${service_instance_id}= Create Entire Service ${csar_file} ${vnf_template_file} ${template} ${name_suffix} ${GLOBAL_INJECTED_REGION} ${GLOBAL_INJECTED_OPENSTACK_TENANT_ID}
Log To Console ServiceInstanceId:${service_instance_id}
Should Not Be Equal As Strings ${service_instance_id} None