aboutsummaryrefslogtreecommitdiffstats
path: root/robot/resources/test_templates
diff options
context:
space:
mode:
Diffstat (limited to 'robot/resources/test_templates')
-rw-r--r--robot/resources/test_templates/model_test_template.robot2
-rw-r--r--robot/resources/test_templates/model_test_template_vcperescust.robot2
-rw-r--r--robot/resources/test_templates/vnf_orchestration_test_template.robot6
-rw-r--r--robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot9
4 files changed, 10 insertions, 9 deletions
diff --git a/robot/resources/test_templates/model_test_template.robot b/robot/resources/test_templates/model_test_template.robot
index dfbf541c..dbbe2644 100644
--- a/robot/resources/test_templates/model_test_template.robot
+++ b/robot/resources/test_templates/model_test_template.robot
@@ -15,7 +15,7 @@ ${ASDC_ZIP_DIRECTORY} ${ASDC_ASSETS_DIRECTORY}/temp
*** Keywords ***
Model Distribution For Directory
[Arguments] ${service} ${catalog_service_name}= ${cds}=
- ServiceMapping.Set Directory default ./demo/service_mapping
+ ServiceMapping.Set Directory default ${GLOBAL_SERVICE_MAPPING_DIRECTORY}
${directory_list}= ServiceMapping.Get Service Folder Mapping default ${service}
${ziplist}= Create List
${uuid}= Get Current Date
diff --git a/robot/resources/test_templates/model_test_template_vcperescust.robot b/robot/resources/test_templates/model_test_template_vcperescust.robot
index ad7c6a07..bcce51e2 100644
--- a/robot/resources/test_templates/model_test_template_vcperescust.robot
+++ b/robot/resources/test_templates/model_test_template_vcperescust.robot
@@ -15,7 +15,7 @@ ${ASDC_ZIP_DIRECTORY} ${ASDC_ASSETS_DIRECTORY}/temp
*** Keywords ***
Model Distribution For vCPEResCust Directory
[Arguments] ${service} ${catalog_service_name}= ${cds}=
- ServiceMapping.Set Directory default ./demo/service_mapping
+ ServiceMapping.Set Directory default ${GLOBAL_SERVICE_MAPPING_DIRECTORY}
${directory_list}= ServiceMapping.Get Service Folder Mapping default ${service}
${ziplist}= Create List
${uuid}= Get Current Date
diff --git a/robot/resources/test_templates/vnf_orchestration_test_template.robot b/robot/resources/test_templates/vnf_orchestration_test_template.robot
index 6c21e4a4..3311c8bb 100644
--- a/robot/resources/test_templates/vnf_orchestration_test_template.robot
+++ b/robot/resources/test_templates/vnf_orchestration_test_template.robot
@@ -50,7 +50,7 @@ Orchestrate VNF
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} ${project_name} ${owning_entity}
Validate Service Instance ${service_instance_id} ${service} ${customer_name}
- ServiceMapping.Set Directory default ./demo/service_mapping
+ ServiceMapping.Set Directory default ${GLOBAL_SERVICE_MAPPING_DIRECTORY}
${vnflist}= ServiceMapping.Get Service Vnf Mapping default ${service}
${generic_vnfs}= Create Dictionary
${vnf_name_index}= Set Variable 0
@@ -95,7 +95,7 @@ Orchestrate Demo VNF
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} ${project_name} ${owning_entity}
Validate Service Instance ${service_instance_id} ${service} ${customer_name}
- ServiceMapping.Set Directory default ./demo/service_mapping
+ ServiceMapping.Set Directory default ${GLOBAL_SERVICE_MAPPING_DIRECTORY}
${vnflist}= ServiceMapping.Get Service Vnf Mapping default ${service}
${generic_vnfs}= Create Dictionary
:FOR ${vnf} IN @{vnflist}
@@ -147,7 +147,7 @@ Get Catalog Resource
Get Name Pattern
[Documentation] To support services with multiple VNFs, we need to dig the vnf type out of the SDC catalog resources to select in the VID UI
[Arguments] ${vnf} ${service}
- ServiceMapping.Set Directory default ./demo/service_mapping
+ ServiceMapping.Set Directory default ${GLOBAL_SERVICE_MAPPING_DIRECTORY}
${list}= ServiceMapping.Get Service Template Mapping default ${service} ${vnf}
:FOR ${dict} IN @{list}
\ ${base_name}= Get From Dictionary ${dict} name_pattern
diff --git a/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot b/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot
index 537dc5f1..f203b167 100644
--- a/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot
+++ b/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot
@@ -18,7 +18,6 @@ Resource ../openstack/neutron_interface.robot
Resource ../heatbridge.robot
Resource ../global_properties.robot
-Resource ../so_interface.robot
Library ONAPLibrary.Openstack
Library ONAPLibrary.Utilities
@@ -29,6 +28,7 @@ Library ONAPLibrary.JSON
Library RequestsLibrary
Library Collections
+Library ONAPLibrary.SO WITH NAME SO
*** Variables ***
${service_template} robot/assets/cds/service-Vfirewall0911-template.yml
@@ -85,7 +85,8 @@ Orchestrate VNF With CDS
Log --------request--------
Log ${request}
Log --------end request--------
- ${resp}= Run MSO Post Request ${so_uri_path} ${request}
+ ${auth}= Create List ${GLOBAL_MSO_USERNAME} ${GLOBAL_MSO_PASSWORD}
+ ${resp}= SO.Run Post Request ${GLOBAL_SO_ENDPOINT} ${so_uri_path} ${data} auth=${auth}
Log --------response-------
${json_string}= Evaluate json.dumps(${resp.json()}) json
Log ${json_string}
@@ -93,8 +94,8 @@ Orchestrate VNF With CDS
${requestId}= Catenate ${resp.json()['requestReferences']['requestId']}
Log requestId=${requestId}
Log -------end response-------
- # Poll MSO Get Request ${GLOBAL_MSO_STATUS_PATH}${request_id} COMPLETE
-
+ # ${auth}= Create List ${GLOBAL_MSO_USERNAME} ${GLOBAL_MSO_PASSWORD}
+ # Run Polling Get Request ${MSO_ENDPOINT} ${GLOBAL_MSO_STATUS_PATH}${request_id} auth=${auth}
Get VNF Info
[Documentation] Get VNF Info