summaryrefslogtreecommitdiffstats
path: root/robot/resources/test_templates
diff options
context:
space:
mode:
authorDR695H <dr695h@att.com>2019-07-19 14:25:43 -0400
committerDR695H <dr695h@att.com>2019-07-19 14:25:43 -0400
commita6ce951601727e8e544756f25ecb908f0cf7c904 (patch)
tree7e878b045a9cf04a2b90fca1396de668b93b0430 /robot/resources/test_templates
parentf0ff3b8817a755a3dd652839948d71f330a5fed0 (diff)
import all libraries
even ones that done have overridign keywords so there is no dual importing Issue-ID: TEST-174 Change-Id: I0b9bd9a703d3b792fa4b57ae048060525d0559cd Signed-off-by: DR695H <dr695h@att.com>
Diffstat (limited to 'robot/resources/test_templates')
-rw-r--r--robot/resources/test_templates/model_test_template.robot12
-rw-r--r--robot/resources/test_templates/model_test_template_vcperescust.robot6
2 files changed, 7 insertions, 11 deletions
diff --git a/robot/resources/test_templates/model_test_template.robot b/robot/resources/test_templates/model_test_template.robot
index 67c95e98..ab331051 100644
--- a/robot/resources/test_templates/model_test_template.robot
+++ b/robot/resources/test_templates/model_test_template.robot
@@ -5,7 +5,7 @@ Library ArchiveLibrary
Library Collections
Library String
Library DateTime
-Library ONAPLibrary.ServiceMapping
+Library ONAPLibrary.ServiceMapping WITH NAME ServiceMapping
Resource ../asdc_interface.robot
*** Variables ***
@@ -19,11 +19,10 @@ ${CATALOG_RESOURCE_IDS}
${CATALOG_SERVICE_ID}
*** Keywords ***
-
Model Distribution For Directory
[Arguments] ${service} ${catalog_service_name}= ${cds}=
- Set Directory default ./demo/service_mapping
- ${directory_list}= Get Service Folder Mapping default ${service}
+ ServiceMapping.Set Directory default ./demo/service_mapping
+ ${directory_list}= ServiceMapping.Get Service Folder Mapping default ${service}
${ziplist}= Create List
${uuid}= Get Current Date
${service_name}= Catenate ${service} ${uuid}
@@ -43,9 +42,6 @@ Model Distribution For Directory
Download CSAR ${catalog_service_id}
[Return] ${catalog_service_name} ${catalog_resource_name} ${vf_modules} ${catalog_resources}
-
-
-
Teardown Model Distribution
[Documentation] Clean up at the end of the test
Log ${CATALOG_SERVICE_ID} ${CATALOG_RESOURCE_IDS}
@@ -59,4 +55,4 @@ Teardown Models
\ ${resourece_json}= Mark ASDC Catalog Resource Inactive ${catalog_resource_id}
${service_json}= Mark ASDC Catalog Service Inactive ${catalog_service_id}
${services_json}= Delete Inactive ASDC Catalog Services
- ${resources_json}= Delete Inactive ASDC Catalog Resources
+ ${resources_json}= Delete Inactive ASDC Catalog Resources \ No newline at end of file
diff --git a/robot/resources/test_templates/model_test_template_vcperescust.robot b/robot/resources/test_templates/model_test_template_vcperescust.robot
index b096a302..c30cfb23 100644
--- a/robot/resources/test_templates/model_test_template_vcperescust.robot
+++ b/robot/resources/test_templates/model_test_template_vcperescust.robot
@@ -5,7 +5,7 @@ Library ArchiveLibrary
Library Collections
Library String
Library DateTime
-Library ONAPLibrary.ServiceMapping
+Library ONAPLibrary.ServiceMapping WITH NAME ServiceMapping
Resource ../asdc_interface.robot
*** Variables ***
@@ -22,8 +22,8 @@ ${CATALOG_SERVICE_ID}
Model Distribution For vCPEResCust Directory
[Arguments] ${service} ${catalog_service_name}= ${cds}=
- Set Directory default ./demo/service_mapping
- ${directory_list}= Get Service Folder Mapping default ${service}
+ ServiceMapping.Set Directory default ./demo/service_mapping
+ ${directory_list}= ServiceMapping.Get Service Folder Mapping default ${service}
${ziplist}= Create List
${uuid}= Get Current Date
${service_name}= Catenate ${service} ${uuid}