aboutsummaryrefslogtreecommitdiffstats
path: root/robot/resources
diff options
context:
space:
mode:
authorJerry Flood <jf9860@att.com>2017-10-11 11:09:19 -0400
committerJerry Flood <jf9860@att.com>2017-10-11 11:16:23 -0400
commit3fc36a390f863a47a03a994acb0d76ee220292b0 (patch)
treefa77ccab365c04f5cc98f264d0353261e7ec120f /robot/resources
parent26c6fc25f20d90e87f08f443058fc2356fe8bea7 (diff)
Update HEAT and support in demo.sh
Issue: TEST-65 Change-Id: If9cea0cecfd5ac8fa40499995fba72bfa66f61a2 Signed-off-by: Jerry Flood <jf9860@att.com>
Diffstat (limited to 'robot/resources')
-rw-r--r--robot/resources/demo_preload.robot6
1 files changed, 5 insertions, 1 deletions
diff --git a/robot/resources/demo_preload.robot b/robot/resources/demo_preload.robot
index cb41c573..ac15288d 100644
--- a/robot/resources/demo_preload.robot
+++ b/robot/resources/demo_preload.robot
@@ -41,6 +41,8 @@ Load Models
Set Test Variable ${CUSTOMER_NAME} ${customer_name}
${status} ${value}= Run Keyword And Ignore Error Distribute Model vFW demoVFW
${status} ${value}= Run Keyword And Ignore Error Distribute Model vLB demoVLB
+ ${status} ${value}= Run Keyword And Ignore Error Distribute Model vCPE demoVCPE
+ ${status} ${value}= Run Keyword And Ignore Error Distribute Model vIMS demoVIMS
Distribute Model
[Arguments] ${service} ${modelName}
@@ -51,13 +53,15 @@ Create Customer For VNF Demo
[Arguments] ${customer_name} ${customer_id} ${customer_type} ${clouder_owner} ${cloud_region_id} ${tenant_id}
${data_template}= OperatingSystem.Get File ${ADD_DEMO_CUSTOMER_BODY}
${arguments}= Create Dictionary subscriber_name=${customer_name} global_customer_id=${customer_id} subscriber_type=${customer_type} cloud_owner=${clouder_owner} cloud_region_id=${cloud_region_id} tenant_id=${tenant_id}
- Set To Dictionary ${arguments} service1=vFW service2=vLB
+ Set To Dictionary ${arguments} service1=vFW service2=vLB service3=vCPE service4=vIMS
${data}= Fill JSON Template ${data_template} ${arguments}
${put_resp}= Run A&AI Put Request ${INDEX PATH}${ROOT_CUSTOMER_PATH}${customer_id} ${data}
${status_string}= Convert To String ${put_resp.status_code}
Should Match Regexp ${status_string} ^(201|412)$
Create Service If Not Exists vFW
Create Service If Not Exists vLB
+ Create Service If Not Exists vCPE
+ Create Service If Not Exists vIMS
Preload User Model
[Documentation] Preload the demo data for the passed VNF with the passed module name