summaryrefslogtreecommitdiffstats
path: root/robot/resources/portal-sdk/portalDef.robot
diff options
context:
space:
mode:
authorDR695H <dr695h@att.com>2019-05-08 13:55:32 -0400
committerDR695H <dr695h@att.com>2019-05-09 10:41:52 -0400
commit910097ed0b1f7922715bfead98d3be6809fe2479 (patch)
treeb8700a356eaeb81f38d34a186ce0e4dbb879c790 /robot/resources/portal-sdk/portalDef.robot
parentc5febc8b6264a08484b23ababec8f912cdd8f70d (diff)
upgrade to python3 libraries
basing the code off of robot framework 3.1.1 instead of 3.0, replacing selenium2lib with selnium lib and selenium3, replacing extendedselenium with angularjs lib. Fixing most warnings and all errors from these moves Change-Id: Ifed68c5b8cd28c7bbdc80ee7245860914bdee5b4 Issue-ID: TEST-151 Signed-off-by: DR695H <dr695h@att.com>
Diffstat (limited to 'robot/resources/portal-sdk/portalDef.robot')
-rw-r--r--robot/resources/portal-sdk/portalDef.robot30
1 files changed, 12 insertions, 18 deletions
diff --git a/robot/resources/portal-sdk/portalDef.robot b/robot/resources/portal-sdk/portalDef.robot
index 57b6e1bb..41fbeea4 100644
--- a/robot/resources/portal-sdk/portalDef.robot
+++ b/robot/resources/portal-sdk/portalDef.robot
@@ -1,16 +1,14 @@
*** Settings ***
Documentation This is RobotFrame work script
-Library ExtendedSelenium2Library
+Library SeleniumLibrary
Library OperatingSystem
-Library ../../library/eteutils/RequestsClientCert.py
Library RequestsLibrary
-Library ../../library/eteutils/UUID.py
-Library ../../library/robot/libraries/DateTime.py
+Library UUID
+Library DateTime
Library Collections
-Library ../../library/eteutils/OSUtils.py
-Library ../../library/eteutils/StringTemplater.py
+Library OSUtils
+Library StringTemplater
Library String
-#Library XvfbRobot
Resource ../json_templater.robot
Resource ../browser_setup.robot
@@ -23,8 +21,8 @@ ${PORTAL_LOGIN_URL} ${PORTAL_URL}${PORTAL_ENV}/login.htm
${PORTAL_HOME_PAGE} ${PORTAL_URL}${PORTAL_ENV}/applicationsHome
${PORTAL_MICRO_ENDPOINT} ${PORTAL_URL}${PORTAL_ENV}/commonWidgets
${PORTAL_HOME_URL} ${PORTAL_URL}${PORTAL_ENV}/applicationsHome
-${PORTAL_HEALTH_CHECK_PATH} /ONAPPORTAL/portalApi/healthCheck
-${PORTAL_XDEMPAPP_REST_URL} http://portal-sdk:8080/ONAPPORTALSDK/api/v2
+${PORTAL_HEALTH_CHECK_PATH} ${PORTAL_ENV}/portalApi/healthCheck
+${PORTAL_XDEMPAPP_REST_URL} ${PORTAL_URL}/ONAPPORTALSDK/api/v2
${PORTAL_ASSETS_DIRECTORY} ../../assets/widgets/
${GLOBAL_APPLICATION_ID} robot-functional
${GLOBAL_PORTAL_ADMIN_USER} demo
@@ -33,14 +31,11 @@ ${GLOBAL_MSO_STATUS_PATH} /ecomp/mso/infra/orchestrationRequests/v2/
${GLOBAL_BUILD_NUMBER} 0
${GLOBAL_VM_PRIVATE_KEY} ${EXECDIR}/robot/assets/keys/robot_ssh_private_key.pvt
${jira} jira
-${RESOURCE_PATH} ONAPPORTAL/auxapi/ticketevent
+${RESOURCE_PATH} ${PORTAL_URL}/auxapi/ticketevent
${portal_Template} ${CURDIR}/portal.template
-${Result} FALSE
-${td_id} 0
-${download_link_id} 0
-${HEADLESS} False
+${download_link_id} 0
*** Keywords ***
@@ -165,8 +160,7 @@ Portal admin Add Application admin User New user
Input Text xpath=//input[@ng-model='searchUsers.newUser.loginPwd'] ${GLOBAL_PORTAL_ADMIN_PWD}
Input Text xpath=//input[@ng-model='searchUsers.newUser.loginPwdCheck'] ${GLOBAL_PORTAL_ADMIN_PWD}
Click Button xpath=//button[@ng-click='searchUsers.addNewUserFun()']
-
- ${Result}= Get Matching XPath Count xpath=//*[contains(text(),'User with same loginId already exists')]
+ ${Result}= Get Element Count xpath=//*[contains(text(),'User with same loginId already exists')]
#log ${Result}
#${type_result}= Evaluate type(${Result})
@@ -212,7 +206,7 @@ Portal admin Add Standard User New user
Input Text xpath=//input[@ng-model='searchUsers.newUser.loginPwdCheck'] ${GLOBAL_PORTAL_ADMIN_PWD}
Click Button xpath=//button[@ng-click='searchUsers.addNewUserFun()']
- ${Result}= Get Matching XPath Count xpath=//*[contains(text(),'User with same loginId already exists')]
+ ${Result}= Get Element Count xpath=//*[contains(text(),'User with same loginId already exists')]
#log ${Result}
#${type_result}= Evaluate type(${Result})
@@ -907,7 +901,7 @@ Admin widget download
Wait until page contains Element xpath=//a[@title='Widget Onboarding'] ${GLOBAL_SELENIUM_BROWSER_WAIT_TIMEOUT}
Click Link xpath=//a[@title='Widget Onboarding']
Wait until page contains Element xpath=//table[@class='ng-scope']
- ${td_id}= get element attribute xpath=//*[contains(text(),'Events')]@id
+ ${td_id}= get element attribute xpath=//*[contains(text(),'Events')] id
log ${td_id}
${test}= Get Substring ${td_id} -1
log ${test}