diff options
| author |   DR695H <dr695h@att.com> | 2019-07-15 17:19:12 -0400 |
|---|---|---|
| committer |   Gary Wu <gary.wu@futurewei.com> | 2019-07-16 20:08:36 +0000 |
| commit | 1ccabd032ef21aee844640b49541d6f1224d572b (patch) | |
| tree | e25a1cbb60881f9ec62405bf760972ca5e701aad /robot/resources/stack_validation | |
| parent | 97fec22483d9410037714505b954ff80a0d15a0c (diff) | |
removing the rest of preload global vars
Issue-ID: TEST-174
Change-Id: Ie5354df3526133d398d3fea703145c4a1649b3c1
Signed-off-by: DR695H <dr695h@att.com>
Diffstat (limited to 'robot/resources/stack_validation')
3 files changed, 7 insertions, 8 deletions
diff --git a/robot/resources/stack_validation/policy_check_vfw.robot b/robot/resources/stack_validation/policy_check_vfw.robot index 170d6388..927b1ec1 100644 --- a/robot/resources/stack_validation/policy_check_vfw.robot +++ b/robot/resources/stack_validation/policy_check_vfw.robot @@ -8,7 +8,7 @@ Library ONAPLibrary.JSON Library ONAPLibrary.Openstack Library Collections Library String -Library ONAPLibrary.ServiceMapping +Library ONAPLibrary.ServiceMapping WITH NAME ServiceMapping Resource ../openstack/keystone_interface.robot Resource ../openstack/nova_interface.robot @@ -17,7 +17,6 @@ Resource ../ssh/files.robot Resource ../demo_preload.robot Resource packet_generator_interface.robot Resource validate_common.robot -Resource ../test_templates/vnf_orchestration_test_template.robot *** Variables *** @@ -91,8 +90,8 @@ Policy Check vLB Stack [Return] ${dnsscaling} Get DNSScaling Prefix - Set Directory default ./demo/service_mapping - ${mapping}= Get Service Template Mapping default vLB vLB + ServiceMapping.Set Directory default ./demo/service_mapping + ${mapping}= ServiceMapping.Get Service Template Mapping default vLB vLB :FOR ${dict} IN @{mapping} \ Return From Keyword If '${dict['isBase']}' == 'false' ${dict['prefix']} [Return] None diff --git a/robot/resources/stack_validation/validate_dns_scaling.robot b/robot/resources/stack_validation/validate_dns_scaling.robot index 0778a2b2..9082ecab 100644 --- a/robot/resources/stack_validation/validate_dns_scaling.robot +++ b/robot/resources/stack_validation/validate_dns_scaling.robot @@ -20,9 +20,9 @@ Resource validate_common.robot *** Keywords *** Validate Dns Scaling Stack [Documentation] Wait for the DNS scaling stack to be instantiated - [Arguments] ${STACK_NAME} + [Arguments] ${stack_name} Run Openstack Auth Request auth - ${stack_info}= Wait for Stack to Be Deployed auth ${STACK_NAME} + ${stack_info}= Wait for Stack to Be Deployed auth ${stack_name} ${stack_id}= Get From Dictionary ${stack_info} id ${server_list}= Get Openstack Servers auth Log ${server_list} diff --git a/robot/resources/stack_validation/validate_vfw.robot b/robot/resources/stack_validation/validate_vfw.robot index 4ef7f0c7..4646720e 100644 --- a/robot/resources/stack_validation/validate_vfw.robot +++ b/robot/resources/stack_validation/validate_vfw.robot @@ -21,9 +21,9 @@ Resource validate_common.robot *** Keywords *** Validate Firewall Stack [Documentation] Identifies and validates the firewall servers in the VFW Stack - [Arguments] ${STACK_NAME} + [Arguments] ${stack_name} Run Openstack Auth Request auth - ${stack_info}= Wait for Stack to Be Deployed auth ${STACK_NAME} + ${stack_info}= Wait for Stack to Be Deployed auth ${stack_name} ${stack_id}= Get From Dictionary ${stack_info} id ${server_list}= Get Openstack Servers auth |