aboutsummaryrefslogtreecommitdiffstats
path: root/robot/resources/test_templates
diff options
context:
space:
mode:
authorbdfreeman1421 <bf1936@att.com>2018-05-06 12:12:27 -0400
committerBrian Freeman <bf1936@att.com>2018-05-10 22:12:13 -0500
commit7f58ef1481134271aa6463b1cea824bc2df4391b (patch)
treed51e676e9aa6aacb8733fceba6821cbf58f6c4c1 /robot/resources/test_templates
parenta66714ebceaec20c429c0db8060ef84152e82de2 (diff)
Add Project and Owning Entity to VID
Issue-ID: TEST-89 Change-Id: I290589d74c13960a6cc57ae937f5c62f535f8c17 Signed-off-by: Brian Freeman <bf1936@att.com> Update Instantiate for Beijing Issue-ID: TEST-91 Change-Id: If56dff3719a63f45cc15e0fdd6a0499b6de5d00e Signed-off-by: Brian Freeman <bf1936@att.com>
Diffstat (limited to 'robot/resources/test_templates')
-rw-r--r--robot/resources/test_templates/vnf_orchestration_test_template.robot5
1 files changed, 3 insertions, 2 deletions
diff --git a/robot/resources/test_templates/vnf_orchestration_test_template.robot b/robot/resources/test_templates/vnf_orchestration_test_template.robot
index a8085485..838c031e 100644
--- a/robot/resources/test_templates/vnf_orchestration_test_template.robot
+++ b/robot/resources/test_templates/vnf_orchestration_test_template.robot
@@ -48,7 +48,7 @@ Orchestrate VNF Template
Orchestrate VNF
[Documentation] Use openECOMP to Orchestrate a service.
- [Arguments] ${customer_name} ${service} ${product_family} ${tenant}
+ [Arguments] ${customer_name} ${service} ${product_family} ${tenant} ${project_name}=Project-Demonstration ${owning_entity}=OE-Demonstration
${lcp_region}= Get Openstack Region
${uuid}= Generate UUID
Set Test Variable ${CUSTOMER_NAME} ${customer_name}_${uuid}
@@ -62,7 +62,7 @@ Orchestrate VNF
Create Customer For VNF ${CUSTOMER_NAME} ${CUSTOMER_NAME} INFRA ${service_type} ${GLOBAL_AAI_CLOUD_OWNER}
Setup Browser
Login To VID GUI
- ${service_instance_id}= Wait Until Keyword Succeeds 300s 5s Create VID Service Instance ${customer_name} ${service_model_type} ${service} ${service_name}
+ ${service_instance_id}= Wait Until Keyword Succeeds 300s 5s Create VID Service Instance ${customer_name} ${service_model_type} ${service} ${service_name} ${project_name} ${owning_entity}
Set Test Variable ${SERVICE_INSTANCE_ID} ${service_instance_id}
Validate Service Instance ${service_instance_id} ${service} ${customer_name}
${vnflist}= Get From Dictionary ${GLOBAL_SERVICE_VNF_MAPPING} ${service}
@@ -108,6 +108,7 @@ Get Catalog Resource
:for ${key} in @{keys}
\ ${cr}= Get From Dictionary ${resources} ${key}
\ Return From Keyword If '${base_name}' in '${cr['allArtifacts']['heat1']['artifactDisplayName']}' ${cr}
+ \ Run Keyword If 'heat2' in ${cr['allArtifacts']} Return From Keyword If '${base_name}' in '${cr['allArtifacts']['heat2']['artifactDisplayName']}' ${cr}
Fail Unable to find catalog resource for ${vnf} ${base_name}
Get Name Pattern