aboutsummaryrefslogtreecommitdiffstats
path: root/tests/portal/testsuites
diff options
context:
space:
mode:
Diffstat (limited to 'tests/portal/testsuites')
-rw-r--r--tests/portal/testsuites/json_templater.robot21
-rw-r--r--tests/portal/testsuites/test1.robot9
2 files changed, 4 insertions, 26 deletions
diff --git a/tests/portal/testsuites/json_templater.robot b/tests/portal/testsuites/json_templater.robot
deleted file mode 100644
index 01eba480..00000000
--- a/tests/portal/testsuites/json_templater.robot
+++ /dev/null
@@ -1,21 +0,0 @@
-*** Settings ***
-Documentation This resource is filling out json string templates and returning the json back
-Library RequestsLibrary
-Library eteutils/StringTemplater.py
-Library OperatingSystem
-#Resource global_properties.robot
-
-*** Keywords ***
-Fill JSON Template
- [Documentation] Runs substitution on template to return a filled in json
- [Arguments] ${json} ${arguments}
- ${returned_string}= Template String ${json} ${arguments}
- ${returned_json}= To Json ${returned_string}
- [Return] ${returned_json}
-
-Fill JSON Template File
- [Documentation] Runs substitution on template to return a filled in json
- [Arguments] ${json_file} ${arguments}
- ${json}= OperatingSystem.Get File ${json_file}
- ${returned_json}= Fill JSON Template ${json} ${arguments}
- [Return] ${returned_json} \ No newline at end of file
diff --git a/tests/portal/testsuites/test1.robot b/tests/portal/testsuites/test1.robot
index d3196f83..93316548 100644
--- a/tests/portal/testsuites/test1.robot
+++ b/tests/portal/testsuites/test1.robot
@@ -2,15 +2,13 @@
Documentation This is RobotFrame work script
Library ExtendedSelenium2Library
Library OperatingSystem
-Library eteutils/RequestsClientCert.py
Library RequestsLibrary
Library ONAPLibrary.Utilities
+Library ONAPLibrary.Templating
Library DateTime
Library Collections
-Library eteutils/StringTemplater.py
Library String
Library XvfbRobot
-Resource json_templater.robot
*** Variables ***
${PORTAL_URL} http://portal.api.simpledemo.onap.org:8989
@@ -63,7 +61,7 @@ ${GLOBAL_BUILD_NUMBER} 0
${GLOBAL_VM_PRIVATE_KEY} ${EXECDIR}/robot/assets/keys/robot_ssh_private_key.pvt
${jira} jira
${RESOURCE_PATH} ONAPPORTAL/auxapi/ticketevent
-${portal_Template} ${CURDIR}/portal.template
+${portal_Template} portal.template
${Result} FALSE
${td_id} 0
@@ -1097,7 +1095,8 @@ Enhanced Notification on ONAP Portal
Notification on ONAP Portal
[Documentation] Create Config portal
${configportal}= Create Dictionary jira_id=${jira}
- ${output} = Fill JSON Template File ${portal_Template} ${configportal}
+ Create Environment portal ${CURDIR}
+ ${output} = Apply Template portal ${portal_Template} ${configportal}
${post_resp} = Enhanced Notification on ONAP Portal ${RESOURCE_PATH} ${output}
Should Be Equal As Strings ${post_resp.status_code} 200