summaryrefslogtreecommitdiffstats
path: root/robot/resources/test_templates
diff options
context:
space:
mode:
authorDR695H <dr695h@att.com>2019-07-26 16:42:36 -0400
committerBrian Freeman <bf1936@att.com>2019-07-29 21:17:12 +0000
commitc0cf6a4765212cc66e364fa0eb43a2447366ce5b (patch)
tree2c06f76cf4e4767ec9193d1e956e60e4c0b78120 /robot/resources/test_templates
parent48f75c98969feebfb151d469b5cb70054f2493c3 (diff)
renaming openecomp to onap
Issue-ID: TEST-27 Change-Id: I8449025f1032719f04d0e283e12d9f9bc75542b7 Signed-off-by: DR695H <dr695h@att.com>
Diffstat (limited to 'robot/resources/test_templates')
-rw-r--r--robot/resources/test_templates/model_test_template.robot24
-rw-r--r--robot/resources/test_templates/model_test_template_vcperescust.robot16
-rw-r--r--robot/resources/test_templates/vnf_orchestration_test_template.robot4
-rw-r--r--robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot10
4 files changed, 27 insertions, 27 deletions
diff --git a/robot/resources/test_templates/model_test_template.robot b/robot/resources/test_templates/model_test_template.robot
index b327295b..8ba9349e 100644
--- a/robot/resources/test_templates/model_test_template.robot
+++ b/robot/resources/test_templates/model_test_template.robot
@@ -1,16 +1,16 @@
*** Settings ***
-Documentation The main interface for interacting with ASDC. It handles low level stuff like managing the http request library and DCAE required fields
+Documentation Model distribution
Library OperatingSystem
Library ArchiveLibrary
Library Collections
Library String
Library DateTime
Library ONAPLibrary.ServiceMapping WITH NAME ServiceMapping
-Resource ../asdc_interface.robot
+Resource ../sdc_interface.robot
*** Variables ***
-${ASDC_ASSETS_DIRECTORY} ${GLOBAL_HEAT_TEMPLATES_FOLDER}
-${ASDC_ZIP_DIRECTORY} ${ASDC_ASSETS_DIRECTORY}/temp
+${SDC_ASSETS_DIRECTORY} ${GLOBAL_HEAT_TEMPLATES_FOLDER}
+${SDC_ZIP_DIRECTORY} ${SDC_ASSETS_DIRECTORY}/temp
*** Keywords ***
Model Distribution For Directory With Teardown
@@ -29,12 +29,12 @@ Model Distribution For Directory
${catalog_service_name}= Set Variable If '${catalog_service_name}' =='' ${shortened_uuid} ${catalog_service_name}
:FOR ${directory} IN @{directory_list}
\ ${zipname}= Replace String ${directory} / _
- \ ${zip}= Catenate ${ASDC_ZIP_DIRECTORY}/${zipname}.zip
- \ ${folder}= Catenate ${ASDC_ASSETS_DIRECTORY}/${directory}
- \ OperatingSystem.Create Directory ${ASDC_ASSETS_DIRECTORY}/temp
+ \ ${zip}= Catenate ${SDC_ZIP_DIRECTORY}/${zipname}.zip
+ \ ${folder}= Catenate ${SDC_ASSETS_DIRECTORY}/${directory}
+ \ OperatingSystem.Create Directory ${SDC_ASSETS_DIRECTORY}/temp
\ Create Zip From Files In Directory ${folder} ${zip}
\ Append To List ${ziplist} ${zip}
- ${catalog_service_name} ${catalog_resource_name} ${vf_modules} ${catalog_resource_ids} ${catalog_service_id} ${catalog_resources} Distribute Model From ASDC ${ziplist} ${catalog_service_name} ${cds} ${service}
+ ${catalog_service_name} ${catalog_resource_name} ${vf_modules} ${catalog_resource_ids} ${catalog_service_id} ${catalog_resources} Distribute Model From SDC ${ziplist} ${catalog_service_name} ${cds} ${service}
Download CSAR ${catalog_service_id}
[Return] ${catalog_service_name} ${catalog_resource_name} ${vf_modules} ${catalog_resources} ${catalog_resource_ids} ${catalog_service_id}
@@ -43,7 +43,7 @@ Teardown Models
[Arguments] ${catalog_service_id} ${catalog_resource_ids}
Return From Keyword If '${catalog_service_id}' == ''
:FOR ${catalog_resource_id} IN @{catalog_resource_ids}
- \ ${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 \ No newline at end of file
+ \ ${resourece_json}= Mark SDC Catalog Resource Inactive ${catalog_resource_id}
+ ${service_json}= Mark SDC Catalog Service Inactive ${catalog_service_id}
+ ${services_json}= Delete Inactive SDC Catalog Services
+ ${resources_json}= Delete Inactive SDC 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 bcce51e2..8baca3f4 100644
--- a/robot/resources/test_templates/model_test_template_vcperescust.robot
+++ b/robot/resources/test_templates/model_test_template_vcperescust.robot
@@ -1,16 +1,16 @@
*** Settings ***
-Documentation The main interface for interacting with ASDC. It handles low level stuff like managing the http request library and DCAE required fields
+Documentation Distribute models for vcpe
Library OperatingSystem
Library ArchiveLibrary
Library Collections
Library String
Library DateTime
Library ONAPLibrary.ServiceMapping WITH NAME ServiceMapping
-Resource ../asdc_interface.robot
+Resource ../sdc_interface.robot
*** Variables ***
-${ASDC_ASSETS_DIRECTORY} ${GLOBAL_HEAT_TEMPLATES_FOLDER}
-${ASDC_ZIP_DIRECTORY} ${ASDC_ASSETS_DIRECTORY}/temp
+${SDC_ASSETS_DIRECTORY} ${GLOBAL_HEAT_TEMPLATES_FOLDER}
+${SDC_ZIP_DIRECTORY} ${SDC_ASSETS_DIRECTORY}/temp
*** Keywords ***
Model Distribution For vCPEResCust Directory
@@ -24,11 +24,11 @@ Model Distribution For vCPEResCust Directory
${catalog_service_name}= Set Variable If '${catalog_service_name}' =='' ${shortened_uuid} ${catalog_service_name}
:FOR ${directory} IN @{directory_list}
\ ${zipname}= Replace String ${directory} / _
- \ ${zip}= Catenate ${ASDC_ZIP_DIRECTORY}/${zipname}.zip
- \ ${folder}= Catenate ${ASDC_ASSETS_DIRECTORY}/${directory}
- \ OperatingSystem.Create Directory ${ASDC_ASSETS_DIRECTORY}/temp
+ \ ${zip}= Catenate ${SDC_ZIP_DIRECTORY}/${zipname}.zip
+ \ ${folder}= Catenate ${SDC_ASSETS_DIRECTORY}/${directory}
+ \ OperatingSystem.Create Directory ${SDC_ASSETS_DIRECTORY}/temp
\ Create Zip From Files In Directory ${folder} ${zip}
\ Append To List ${ziplist} ${zip}
- ${catalog_service_name} ${catalog_resource_name} ${vf_modules} ${catalog_resource_ids} ${catalog_service_id} ${catalog_resources} Distribute vCPEResCust Model From ASDC ${ziplist} ${catalog_service_name} ${cds} ${service}
+ ${catalog_service_name} ${catalog_resource_name} ${vf_modules} ${catalog_resource_ids} ${catalog_service_id} ${catalog_resources} Distribute vCPEResCust Model From SDC ${ziplist} ${catalog_service_name} ${cds} ${service}
Download CSAR ${catalog_service_id}
[Return] ${catalog_service_name} ${catalog_resource_name} ${vf_modules} ${catalog_resources} \ No newline at end of file
diff --git a/robot/resources/test_templates/vnf_orchestration_test_template.robot b/robot/resources/test_templates/vnf_orchestration_test_template.robot
index a9e7345b..190f64ac 100644
--- a/robot/resources/test_templates/vnf_orchestration_test_template.robot
+++ b/robot/resources/test_templates/vnf_orchestration_test_template.robot
@@ -28,7 +28,7 @@ Library ONAPLibrary.ServiceMapping WITH NAME ServiceMapping
*** Keywords ***
Orchestrate VNF Template
- [Documentation] Use openECOMP to Orchestrate a service.
+ [Documentation] Use ONAP to Orchestrate a service.
[Arguments] ${customer_name} ${service} ${product_family} ${delete_flag}=DELETE
${uuid}= Generate UUID4
${catalog_service_id}= Set Variable ${None} # default to empty
@@ -39,7 +39,7 @@ Orchestrate VNF Template
[Teardown] Teardown VNF ${customer_name}_${uuid} ${catalog_service_id} ${catalog_resource_ids}
Orchestrate VNF
- [Documentation] Use openECOMP to Orchestrate a service.
+ [Documentation] Use ONAP to Orchestrate a service.
[Arguments] ${customer_name} ${service} ${product_family} ${tenant_id} ${tenant_name} ${project_name}=Project-Demonstration ${owning_entity}=OE-Demonstration
${lcp_region}= Get Openstack Region
${uuid}= Generate UUID4
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 f203b167..50f1bcfb 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
@@ -40,13 +40,13 @@ ${so_uri_path} /onap/so/infra/serviceInstantiation/v7/serviceInstances
*** Keywords ***
Orchestrate VNF With CDS Template
- [Documentation] Use openECOMP to Orchestrate a service.
+ [Documentation] Use ONAP to Orchestrate a service.
[Arguments] ${customer_name} ${service_instance_name} ${product_family}
${uuid}= Generate UUID4
Orchestrate VNF With CDS ${customer_name}_${uuid} ${service_instance_name}${uuid} ${product_family}
Orchestrate VNF With CDS
- [Documentation] Use openECOMP to Orchestrate a service.
+ [Documentation] Use ONAP to Orchestrate a service.
[Arguments] ${customer_name} ${service_instance_name} ${product_family} ${project_name}=Project-Demonstration ${owning_entity}=OE-Demonstration
${lcp_region}= Get Openstack Region
${dict}= Create Dictionary
@@ -85,7 +85,7 @@ Orchestrate VNF With CDS
Log --------request--------
Log ${request}
Log --------end request--------
- ${auth}= Create List ${GLOBAL_MSO_USERNAME} ${GLOBAL_MSO_PASSWORD}
+ ${auth}= Create List ${GLOBAL_SO_USERNAME} ${GLOBAL_SO_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
@@ -94,8 +94,8 @@ Orchestrate VNF With CDS
${requestId}= Catenate ${resp.json()['requestReferences']['requestId']}
Log requestId=${requestId}
Log -------end response-------
- # ${auth}= Create List ${GLOBAL_MSO_USERNAME} ${GLOBAL_MSO_PASSWORD}
- # Run Polling Get Request ${MSO_ENDPOINT} ${GLOBAL_MSO_STATUS_PATH}${request_id} auth=${auth}
+ # ${auth}= Create List ${GLOBAL_SO_USERNAME} ${GLOBAL_SO_PASSWORD}
+ # Run Polling Get Request ${SO_ENDPOINT} ${GLOBAL_SO_STATUS_PATH}${request_id} auth=${auth}
Get VNF Info
[Documentation] Get VNF Info