diff options
Diffstat (limited to 'test/csit')
| -rw-r--r-- | test/csit/plans/portal-sdk/testsuite/.env | 11 | ||||
| -rw-r--r-- | test/csit/plans/portal-sdk/testsuite/docker-compose.yml | 3 | ||||
| -rw-r--r-- | test/csit/plans/portal-sdk/testsuite/setup.sh | 18 | ||||
| -rw-r--r-- | test/csit/plans/portal/testsuite/setup.sh | 4 | ||||
| -rw-r--r-- | test/csit/scripts/sdc/clone_and_setup_sdc_data.sh | 4 | ||||
| -rw-r--r-- | test/csit/scripts/sdc/start_sdc_containers.sh | 2 | ||||
| -rw-r--r-- | test/csit/scripts/sdc/start_sdc_sanity.sh | 4 | ||||
| -rw-r--r-- | test/csit/tests/portal/testsuites/test1.robot | 192 | ||||
| -rwxr-xr-x | test/csit/tests/vfc/nfvo-driver-ems/test.robot | 9 |
9 files changed, 150 insertions, 97 deletions
diff --git a/test/csit/plans/portal-sdk/testsuite/.env b/test/csit/plans/portal-sdk/testsuite/.env index 1e882a0b3..0b7de9560 100644 --- a/test/csit/plans/portal-sdk/testsuite/.env +++ b/test/csit/plans/portal-sdk/testsuite/.env @@ -20,3 +20,14 @@ PORTAL_TAG=1.3.0 DOCKER_IMAGE_VERSION=1.3-STAGING-latest CLI_DOCKER_VERSION=1.1-STAGING-latest NEXUS_DOCKER_REPO=nexus3.onap.org:10003 + + +# Optional settings with no defaults. +EXTRA_HOST_IP="" +EXTRA_HOST_NAME="" +# Export shell environment variables on hosts with no DNS; +# a line is added to docker container's /etc/hosts. +# For example: +#EXTRA_HOST_IP="-i ${HOST_IP}" +#EXTRA_HOST_NAME="-n portal.api.simpledemo.openecomp.org" + diff --git a/test/csit/plans/portal-sdk/testsuite/docker-compose.yml b/test/csit/plans/portal-sdk/testsuite/docker-compose.yml index b92766f5b..7a9fb8caa 100644 --- a/test/csit/plans/portal-sdk/testsuite/docker-compose.yml +++ b/test/csit/plans/portal-sdk/testsuite/docker-compose.yml @@ -91,5 +91,8 @@ services: - portal-db:3306 - -- - /start-apps-cmd.sh + # see comments in .env file + - $EXTRA_HOST_IP + - $EXTRA_HOST_NAME logging: driver: json-file diff --git a/test/csit/plans/portal-sdk/testsuite/setup.sh b/test/csit/plans/portal-sdk/testsuite/setup.sh index 71d110521..2091d14e0 100644 --- a/test/csit/plans/portal-sdk/testsuite/setup.sh +++ b/test/csit/plans/portal-sdk/testsuite/setup.sh @@ -14,6 +14,8 @@ XVFBPID=$! HOST_IP=$(ip route get 8.8.8.8 | awk '/8.8.8.8/ {print $NF}') export HOST_IP=${HOST_IP} + + if ! ifconfig docker0; then if ! ifconfig ens3; then echo "Could not determine IP address" @@ -33,6 +35,8 @@ ROBOT_VARIABLES="-v MOCK_IP:${MOCK_IP} -v IP:${IP} -v DOCKER_IP:${DOCKER_IP}" export DOCKER_IP=${DOCKER_IP} + + # be verbose set -x @@ -54,16 +58,22 @@ rm .env rm docker-compose.yml cp $CURR/.env . cp $CURR/docker-compose.yml . -#cd properties_rackspace/ECOMPPORTALAPP +#cd properties_simpledemo/ECOMPPORTALAPP #rm system.properties #cp $CURR/system.properties . #cd ../.. # Get image names used below from docker-compose environment file source $CURR/.env +#source .env + +# Make inter-app communication work in CSIT +export EXTRA_HOST_IP="-i ${HOST_IP}" +export EXTRA_HOST_NAME="-n portal.api.simpledemo.openecomp.org" + # Copy property files to new directory mkdir -p $PROPS_DIR -cp -r properties_rackspace/* $PROPS_DIR +cp -r properties_simpledemo/* $PROPS_DIR # Also create logs directory mkdir -p $LOGS_DIR @@ -118,6 +128,8 @@ echo "Adding new hosts entry." echo "$host_entry" | sudo tee -a /etc/hosts > /dev/null fi + + sleep 3m # WAIT 5 minutes maximum and test every 5 seconds if Portal up using HealthCheck API @@ -157,7 +169,7 @@ fi HOST_IP=$(ip route get 8.8.8.8 | awk '/8.8.8.8/ {print $NF}') export HOST_IP=${HOST_IP} -docker logs deliveries_portal-db_1 +#docker logs deliveries_portal-db_1 docker logs deliveries_portal-apps_1 docker logs deliveries_portal-wms_1 diff --git a/test/csit/plans/portal/testsuite/setup.sh b/test/csit/plans/portal/testsuite/setup.sh index 2091d14e0..ff21142af 100644 --- a/test/csit/plans/portal/testsuite/setup.sh +++ b/test/csit/plans/portal/testsuite/setup.sh @@ -55,9 +55,9 @@ cd portal git pull cd deliveries rm .env -rm docker-compose.yml +#rm docker-compose.yml cp $CURR/.env . -cp $CURR/docker-compose.yml . +#cp $CURR/docker-compose.yml . #cd properties_simpledemo/ECOMPPORTALAPP #rm system.properties #cp $CURR/system.properties . diff --git a/test/csit/scripts/sdc/clone_and_setup_sdc_data.sh b/test/csit/scripts/sdc/clone_and_setup_sdc_data.sh index 97f767381..a88981299 100644 --- a/test/csit/scripts/sdc/clone_and_setup_sdc_data.sh +++ b/test/csit/scripts/sdc/clone_and_setup_sdc_data.sh @@ -27,6 +27,10 @@ echo "This is ${WORKSPACE}/test/csit/scripts/sdc/clone_and_setup_sdc_data.sh" # Clone sdc enviroment template mkdir -p ${WORKSPACE}/data/environments/ mkdir -p ${WORKSPACE}/data/clone/ +mkdir -p ${WORKSPACE}/data/logs/BE/SDC/SDC-BE +mkdir -p ${WORKSPACE}/data/logs/FE/SDC/SDC-FE +chmod -R 777 ${WORKSPACE}/data/logs + cd ${WORKSPACE}/data/clone git clone --depth 1 http://gerrit.onap.org/r/sdc -b master diff --git a/test/csit/scripts/sdc/start_sdc_containers.sh b/test/csit/scripts/sdc/start_sdc_containers.sh index bccea70bb..a1ac28b14 100644 --- a/test/csit/scripts/sdc/start_sdc_containers.sh +++ b/test/csit/scripts/sdc/start_sdc_containers.sh @@ -105,5 +105,5 @@ done if [ "$TIME" -ge "$TIME_OUT" ]; then echo TIME OUT: Docker containers not started in $TIME_OUT seconds... Could cause problems for tests... - +fi diff --git a/test/csit/scripts/sdc/start_sdc_sanity.sh b/test/csit/scripts/sdc/start_sdc_sanity.sh index 7f2de0ef9..e9e92148b 100644 --- a/test/csit/scripts/sdc/start_sdc_sanity.sh +++ b/test/csit/scripts/sdc/start_sdc_sanity.sh @@ -26,7 +26,7 @@ #start Sanity docker -docker run --detach --name sdc-sanity --env HOST_IP=${IP} --env ENVNAME="${DEP_ENV}" --env http_proxy=${http_proxy} --env https_proxy=${https_proxy} --env no_proxy=${no_proxy} --log-driver=json-file --log-opt max-size=100m --log-opt max-file=10 --ulimit memlock=-1:-1 --memory 512m --memory-swap=512m --ulimit nofile=4096:100000 --volume /etc/localtime:/etc/localtime:ro --volume ${WORKSPACE}/data/logs/sdc-sanity/target:/var/lib/tests/target --volume ${WORKSPACE}/data/logs/sdc-sanity/ExtentReport:/var/lib/tests/ExtentReport --volume ${WORKSPACE}/data/environments:/root/chef-solo/environments --publish 9560:9560 ${PREFIX}/sdc-sanity:${RELEASE} +docker run --detach --name sdc-sanity --env HOST_IP=${IP} --env ENVNAME="${DEP_ENV}" --env http_proxy=${http_proxy} --env https_proxy=${https_proxy} --env no_proxy=${no_proxy} --log-driver=json-file --log-opt max-size=100m --log-opt max-file=10 --ulimit memlock=-1:-1 --memory 1g --memory-swap=1g --ulimit nofile=4096:100000 --volume /etc/localtime:/etc/localtime:ro --volume ${WORKSPACE}/data/logs/sdc-sanity/target:/var/lib/tests/target --volume ${WORKSPACE}/data/logs/sdc-sanity/ExtentReport:/var/lib/tests/ExtentReport --volume ${WORKSPACE}/data/environments:/root/chef-solo/environments --publish 9560:9560 ${PREFIX}/sdc-sanity:${RELEASE} #echo "please wait while Sanity Docker is starting..." echo "" @@ -66,3 +66,5 @@ if [ "$TIME" -ge "$TIME_OUT" ] echo TIME OUT: Sany was NOT completed in $TIME_OUT seconds... Could cause problems for tests... fi cp -rf ${WORKSPACE}/data/logs/sdc-sanity/ExtentReport/* ${WORKSPACE}/archives/ +cp -rf ${WORKSPACE}/data/logs/ ${WORKSPACE}/archives/ + diff --git a/test/csit/tests/portal/testsuites/test1.robot b/test/csit/tests/portal/testsuites/test1.robot index 391866b76..42f88bf39 100644 --- a/test/csit/tests/portal/testsuites/test1.robot +++ b/test/csit/tests/portal/testsuites/test1.robot @@ -14,7 +14,6 @@ Resource json_templater.robot *** Variables *** -#${PORTAL_URL} http://%{HOST_IP}:8989 #${PORTAL_URL} http://localhost:8989 ${PORTAL_URL} http://portal.api.simpledemo.openecomp.org:8989 ${PORTAL_ENV} /ECOMPPORTAL @@ -22,16 +21,16 @@ ${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 -${App_First_Name} appdemo +${App_First_Name} demoapp ${App_Last_Name} demo -${App_Email_Address} appdemo@onap.com -${App_LoginID} appdemo +${App_Email_Address} demoapp@onap.com +${App_LoginID} demoapp ${App_Loginpwd} demo123456! ${App_LoginPwdCheck} demo123456! -${Sta_First_Name} stademo +${Sta_First_Name} demosta ${Sta_Last_Name} demo -${Sta_Email_Address} stademo@onap.com -${Sta_LoginID} stademo +${Sta_Email_Address} demosta@onap.com +${Sta_LoginID} demosta ${Sta_Loginpwd} demo123456! ${Sta_LoginPwdCheck} demo123456! ${Test_First_Name} portal @@ -85,47 +84,20 @@ Portal R1 Release for AAF Create Microse service onboarding Portal admin Microservice Onboarding - + + Create Widget for all users Portal Admin Create Widget for All users Delete Widget for all users Portal Admin Delete Widget for All users - + Create Widget for Application Roles - Portal Admin Create Widget for Application Roles + Portal Admin Create Widget for Application Roles Delete Widget for Application Roles - Portal Admin Delete Widget for Application Roles - -#Create a Test user for Application Admin -# Portal admin Add Application admin User New user -Test - -#Create a Test user for Standared User -# Portal admin Add Standard User New user - -#Create a Test User for Apllication Admin -# Portal admin Add Application admin User New user - -#Add Application Admin for Existing User Test user -# Portal admin Add Application Admin Exiting User -APPDEMO - -#Add Application Admin for Exisitng User -# Portal admin Add Application Admin Exiting User - -#Delete Application Admin for Exisitng User -# Portal admin Delete Application Admin Existing User - -#Add Standard User Role for Existing user -# Portal admin Add Standard User Existing user - -#Edit Standard User Role for Existing user -# Portal admin Edit Standard User Existing user - - -#Delete Standard User Role for Existing user -# Portal admin Delete Standard User Existing user - + Portal Admin Delete Widget for Application Roles + Validate Functional Top Menu Get Access Functional Top Menu Get Access @@ -143,36 +115,68 @@ Broadbond Notification functionality Category Notification functionality ${AdminCategoryMsg}= Portal Admin Category Notifications - set global variable ${AdminCategoryMsg} + set global variable ${AdminCategoryMsg} + +Create a Test user for Application Admin -Test + Portal admin Add Application admin User New user -Test + +Create a Test User for Apllication Admin + Portal admin Add Application admin User New user + +Add Application Admin for Existing User Test user + Portal admin Add Application Admin Exiting User -APPDEMO + +Create a Test user for Standared User + Portal admin Add Standard User New user + +Add Application Admin for Exisitng User + Portal admin Add Application Admin Exiting User + +Delete Application Admin for Exisitng User + Portal admin Delete Application Admin Existing User + +Add Standard User Role for Existing user + Portal admin Add Standard User Existing user + +Edit Standard User Role for Existing user + Portal admin Edit Standard User Existing user + + +Delete Standard User Role for Existing user + Portal admin Delete Standard User Existing user + + Logout from Portal GUI as Portal Admin Portal admin Logout from Portal GUI -#Login To Portal GUI as APP Admin -# Application admin Login To Portal GUI +Login To Portal GUI as APP Admin + Application admin Login To Portal GUI -#Navigate Application Link as APP Admin -# Application Admin Navigation Application Link Tab + ##Navigate Functional Link as APP Admin ## Application Admin Navigation Functional Menu -#Add Standard User Role for Existing user as APP Admin -# Application admin Add Standard User Existing user +Add Standard User Role for Existing user as APP Admin + Application admin Add Standard User Existing user -#Edit Standard User Role for Existing user as APP Admin -# Application admin Edit Standard User Existing user +Edit Standard User Role for Existing user as APP Admin + Application admin Edit Standard User Existing user -#Delete Standard User Role for Existing user as APP Admin -# Application admin Delete Standard User Existing user +Delete Standard User Role for Existing user as APP Admin + Application admin Delete Standard User Existing user + +#Navigate Application Link as APP Admin +# Application Admin Navigation Application Link Tab -#Logout from Portal GUI as APP Admin -# Application admin Logout from Portal GUI +Logout from Portal GUI as APP Admin + Application admin Logout from Portal GUI -#Login To Portal GUI as Standared User -# Standared user Login To Portal GUI +Login To Portal GUI as Standared User + Standared user Login To Portal GUI #Navigate Application Link as Standared User # Standared user Navigation Application Link Tab @@ -180,11 +184,11 @@ Logout from Portal GUI as Portal Admin ##Navigate Functional Link as Standared User ## Standared user Navigation Functional Menu -#Broadcast Notifications Standared user -# Standared user Broadcast Notifications ${AdminBroadCastMsg} +Broadcast Notifications Standared user + Standared user Broadcast Notifications ${AdminBroadCastMsg} -#Category Notifications Standared user -# Standared user Category Notifications ${AdminCategoryMsg} +Category Notifications Standared user + Standared user Category Notifications ${AdminCategoryMsg} Teardown @@ -291,8 +295,7 @@ Portal admin Add Application Admin Exiting User Click Element xpath=//span[@id='result-uuid-0'] Click Button xpath=//button[@id='search-users-button-next'] Click Button xpath=//input[@value='Select application'] - Scroll Element Into View xpath=(//input[@value='Select application']/following::*[contains(text(),'xDemo App' )])[1] - + Scroll Element Into View xpath=(//input[@value='Select application']/following::*[contains(text(),'xDemo App' )])[1] Click Element xpath=(//li[contains(.,'xDemo App' )])[2] #Select From List xpath=(//input[@value='Select application']/following::*[contains(text(),'xDemo App')])[1] xDemo App Click Button xpath=//button[@id='div-updateAdminAppsRoles'] @@ -303,7 +306,8 @@ Portal admin Add Application Admin Exiting User Click Element xpath=//input[@id='dropdown1'] Click Element xpath=//li[contains(.,'xDemo App' )] Input Text xpath=//input[@id='input-table-search'] ${Existing_User} - Element Text Should Be xpath=(//span[contains(.,'portal')])[1] ${Existing_User} + Table Column Should Contain xpath=//*[@table-data='admins.adminsTableData'] 1 ${Existing_User} + #Element Text Should Be xpath=(//span[contains(.,'portal')])[1] ${Existing_User} #Element Text Should Be xpath=(//span[contains(.,'demo')])[1] ${Existing_User} @@ -319,6 +323,8 @@ Portal admin Delete Application Admin Existing User #Is Element Visible xpath=(//*[contains(.,'Portal')] )[2] Element Should Not Contain xpath=//*[@table-data='admins.adminsTableData'] portal #Element Should Not Contain xpath=//*[@table-data='admins.adminsTableData'] demo + Click Image xpath=//img[@alt='Onap Logo'] + Set Selenium Implicit Wait 3000 Portal admin Add Application admin User New user @@ -326,7 +332,7 @@ Portal admin Add Application admin User New user Click Link xpath=//a[@title='Users'] Page Should Contain Users Click Button xpath=//button[@ng-click='toggleSidebar()'] - Click Button xpath=//button[@ng-click='users.openAddNewUserModal()'] + Click Button xpath=//button[@id='users-button-add'] Click Button xpath=//button[@id='Create-New-User-button'] Input Text xpath=//input[@ng-model='searchUsers.newUser.firstName'] ${App_First_Name} Input Text xpath=//input[@ng-model='searchUsers.newUser.lastName'] ${App_Last_Name} @@ -348,7 +354,9 @@ Portal admin Add Application admin User New user Click Element xpath=//li[contains(.,'xDemo App')] Table Column Should Contain xpath=//*[@table-data='users.accountUsers'] 1 ${App_First_Name} #Input Text xpath=//input[@id='input-table-search'] ${App_First_Name} - #Element Text Should Be xpath=(//span[contains(.,'appdemo')] )[1] ${App_First_Name} + #Element Text Should Be xpath=(//span[contains(.,'demoapp')] )[1] ${App_First_Name} + Click Image xpath=//img[@alt='Onap Logo'] + Set Selenium Implicit Wait 3000 Portal admin Add Standard User New user @@ -356,7 +364,7 @@ Portal admin Add Standard User New user Click Link xpath=//a[@title='Users'] Page Should Contain Users Click Button xpath=//button[@ng-click='toggleSidebar()'] - Click Button xpath=//button[@ng-click='users.openAddNewUserModal()'] + Click Button xpath=//button[@id='users-button-add'] Click Button xpath=//button[@id='Create-New-User-button'] Input Text xpath=//input[@ng-model='searchUsers.newUser.firstName'] ${Sta_First_Name} Input Text xpath=//input[@ng-model='searchUsers.newUser.lastName'] ${Sta_Last_Name} @@ -378,7 +386,9 @@ Portal admin Add Standard User New user Click Element xpath=//li[contains(.,'xDemo App')] Table Column Should Contain xpath=//*[@table-data='users.accountUsers'] 1 ${Sta_First_Name} #Input Text xpath=//input[@id='input-table-search'] ${Sta_First_Name} - #Element Text Should Be xpath=(//span[contains(.,'appdemo')] )[1] ${Sta_First_Name} + #Element Text Should Be xpath=(//span[contains(.,'appdemo')] )[1] ${Sta_First_Name} + Click Image xpath=//img[@alt='Onap Logo'] + Set Selenium Implicit Wait 3000 @@ -387,8 +397,7 @@ Portal admin Add Application admin User New user -Test Click Link xpath=//a[@title='Users'] Page Should Contain Users Click Button xpath=//button[@ng-click='toggleSidebar()'] - Set Selenium Implicit Wait 3000 - Click Button xpath=//button[@ng-click='users.openAddNewUserModal()'] + Click Button xpath=//button[@id='users-button-add'] Click Button xpath=//button[@id='Create-New-User-button'] Input Text xpath=//input[@ng-model='searchUsers.newUser.firstName'] ${Test_First_Name} Input Text xpath=//input[@ng-model='searchUsers.newUser.lastName'] ${Test_Last_Name} @@ -397,18 +406,23 @@ Portal admin Add Application admin User New user -Test Input Text xpath=//input[@ng-model='searchUsers.newUser.loginPwd'] ${Test_Loginpwd} Input Text xpath=//input[@ng-model='searchUsers.newUser.loginPwdCheck'] ${Test_LoginPwdCheck} Click Button xpath=//button[@ng-click='searchUsers.addNewUserFun()'] - Click Button xpath=//button[@id='next-button'] - #Scroll Element Into View xpath=//div[@id='div-app-name-dropdown-xDemo-App'] - Click Element xpath=//*[@id='div-app-name-dropdown-xDemo-App'] - Click Element xpath=//*[@id='div-app-name-xDemo-App']/following::input[@id='Standard-User-checkbox'] + Click Button xpath=//button[@id='search-users-button-cancel'] + Click Image xpath=//img[@alt='Onap Logo'] Set Selenium Implicit Wait 3000 - Click Button xpath=//button[@id='new-user-save-button'] - Set Selenium Implicit Wait 3000 - Go To ${PORTAL_HOME_PAGE} - Click Link xpath=//a[@title='Users'] - Click Element xpath=//input[@id='dropdown1'] - Click Element xpath=//li[contains(.,'xDemo App')] - Table Column Should Contain xpath=//*[@table-data='users.accountUsers'] 1 ${Test_First_Name} + + + #Click Button xpath=//button[@id='next-button'] + #Scroll Element Into View xpath=//div[@id='div-app-name-dropdown-xDemo-App'] + #Click Element xpath=//*[@id='div-app-name-dropdown-xDemo-App'] + #Click Element xpath=//*[@id='div-app-name-xDemo-App']/following::input[@id='Standard-User-checkbox'] + #Set Selenium Implicit Wait 3000 + #Click Button xpath=//button[@id='new-user-save-button'] + #Set Selenium Implicit Wait 3000 + #Go To ${PORTAL_HOME_PAGE} + #Click Link xpath=//a[@title='Users'] + #Click Element xpath=//input[@id='dropdown1'] + #Click Element xpath=//li[contains(.,'xDemo App')] + #Table Column Should Contain xpath=//*[@table-data='users.accountUsers'] 1 ${Test_First_Name} #Input Text xpath=//input[@id='input-table-search'] ${Test_First_Name} #Element Text Should Be xpath=(//span[contains(.,'appdemo')] )[1] ${Test_First_Name} @@ -428,7 +442,6 @@ Portal admin Add Application Admin Exiting User -APPDEMO Click Button xpath=//button[@id='search-users-button-next'] Click Button xpath=//input[@value='Select application'] Scroll Element Into View xpath=(//input[@value='Select application']/following::*[contains(text(),'xDemo App' )])[1] - Click Element xpath=(//li[contains(.,'xDemo App' )])[2] #Select From List xpath=(//input[@value='Select application']/following::*[contains(text(),'xDemo App')])[1] xDemo App Click Button xpath=//button[@id='div-updateAdminAppsRoles'] @@ -437,10 +450,12 @@ Portal admin Add Application Admin Exiting User -APPDEMO Get Selenium Implicit Wait Click Link xpath=//a[@aria-label='Admins'] Click Element xpath=//input[@id='dropdown1'] - Click Element xpath=//li[contains(.,'xDemo App' )] - + Click Element xpath=//li[contains(.,'xDemo App' )] Input Text xpath=//input[@id='input-table-search'] ${App_First_Name} - Element Text Should Be xpath=(//span[contains(.,'appdemo')])[1] ${App_First_Name} + #Element Text Should Be xpath=(//span[contains(.,'appdemo')])[1] ${App_First_Name} + Table Column Should Contain xpath=//*[@table-data='admins.adminsTableData'] 1 ${App_First_Name} + Click Image xpath=//img[@alt='Onap Logo'] + Set Selenium Implicit Wait 3000 @@ -462,7 +477,6 @@ Portal admin Add Standard User Existing user Click Element xpath=//*[@id='div-app-name-xDemo-App']/following::input[@id='Standard-User-checkbox'] #Click Element xpath=//div[@id='div-app-name-dropdown-xDemo-App'] #Click Element xpath=//div[@id='div-app-name-xDemo-App']/following::input[@id='Standard-User-checkbox'] - Set Selenium Implicit Wait 3000 Click Button xpath=//button[@id='new-user-save-button'] Set Selenium Implicit Wait 3000 @@ -471,7 +485,6 @@ Portal admin Add Standard User Existing user #Click Link xpath=//a[@title='Users'] #Page Should Contain Users #Focus xpath=//input[@name='dropdown1'] - Go To ${PORTAL_HOME_PAGE} Click Link xpath=//a[@title='Users'] Click Element xpath=//input[@id='dropdown1'] @@ -479,6 +492,7 @@ Portal admin Add Standard User Existing user #Click Element xpath=//li[contains(.,'XDemo App')] Input Text xpath=//input[@id='input-table-search'] ${Existing_User} Element Text Should Be xpath=(.//*[@id='rowheader_t1_0'])[2] Standard User + Portal admin Edit Standard User Existing user @@ -794,8 +808,10 @@ Application Admin Navigation Application Link Tab Click Link xpath=//a[@id='parent-item-Home'] Click Element xpath=.//h3[contains(text(),'xDemo App')]/following::div[1] Page Should Contain ONAP Portal - Click Element xpath=//i[@class='ion-close-round'] - Click Element xpath=(.//span[@id='tab-Home'])[1] + Scroll Element Into View xpath=//i[@class='ion-close-round'] + Click Element xpath=//i[@class='ion-close-round'] + Set Selenium Implicit Wait 3000 + #Click Element xpath=(.//span[@id='tab-Home'])[1] Application Admin Navigation Functional Menu @@ -862,6 +878,8 @@ Application admin Delete Standard User Existing user #Input Text xpath=//input[@id='input-table-search'] ${Existing_User} #Is Element Visible xpath=(//*[contains(.,'Portal')] )[2] Element Should Not Contain xpath=//*[@table-data='users.accountUsers'] Portal + Click Image xpath=//img[@alt='Onap Logo'] + Set Selenium Implicit Wait 3000 diff --git a/test/csit/tests/vfc/nfvo-driver-ems/test.robot b/test/csit/tests/vfc/nfvo-driver-ems/test.robot index ebbcf8a19..e1a57760d 100755 --- a/test/csit/tests/vfc/nfvo-driver-ems/test.robot +++ b/test/csit/tests/vfc/nfvo-driver-ems/test.robot @@ -6,16 +6,19 @@ Library json *** Variables *** @{return_ok_list}= 200 201 202 -${queryswagger_url} /api/emsdriver/v1/swagger +${queryswagger_url} /api/emsdriver/v1/swagger.json *** Test Cases *** EMSDriverSwaggerTest [Documentation] query swagger info of emsdriver ${headers} Create Dictionary Content-Type=application/json Accept=application/json - Create Session web_session http://${MSB_IAG_IP}:80 headers=${headers} + Create Session web_session http://${EMS_DRV_IP}:8206 headers=${headers} ${resp}= Get Request web_session ${queryswagger_url} ${responese_code}= Convert To String ${resp.status_code} - Should Be Equal 2.0 2.0 + List Should Contain Value ${return_ok_list} ${responese_code} + ${response_json} json.loads ${resp.content} + ${swagger_version}= Convert To String ${response_json['swagger']} + Should Be Equal ${swagger_version} 2.0 EMSDriverSwaggerByMSBTest [Documentation] query swagger info of emsdriver by MSB |