diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/csit/plans/portal-sdk/testsuite/setup.sh | 2 | ||||
| -rw-r--r-- | test/csit/plans/portal/testsuite/setup.sh | 2 | ||||
| -rw-r--r-- | test/csit/tests/portal-sdk/testsuites/test1.robot | 10 | ||||
| -rw-r--r-- | test/csit/tests/portal/testsuites/test1.robot | 2 | ||||
| -rw-r--r-- | test/ete/labs/windriver/onap-openstack-template.env | 12 |
5 files changed, 18 insertions, 10 deletions
diff --git a/test/csit/plans/portal-sdk/testsuite/setup.sh b/test/csit/plans/portal-sdk/testsuite/setup.sh index 456a9343d..0c90dc66b 100644 --- a/test/csit/plans/portal-sdk/testsuite/setup.sh +++ b/test/csit/plans/portal-sdk/testsuite/setup.sh @@ -48,7 +48,7 @@ NEXUS_DOCKER_REPO=nexus3.onap.org:10003 CURR="$(pwd)" -git clone http://gerrit.onap.org/r/portal +git clone http://gerrit.onap.org/r/portal -b "release-1.3.0" # Refresh configuration and scripts cd portal diff --git a/test/csit/plans/portal/testsuite/setup.sh b/test/csit/plans/portal/testsuite/setup.sh index 456a9343d..0c90dc66b 100644 --- a/test/csit/plans/portal/testsuite/setup.sh +++ b/test/csit/plans/portal/testsuite/setup.sh @@ -48,7 +48,7 @@ NEXUS_DOCKER_REPO=nexus3.onap.org:10003 CURR="$(pwd)" -git clone http://gerrit.onap.org/r/portal +git clone http://gerrit.onap.org/r/portal -b "release-1.3.0" # Refresh configuration and scripts cd portal diff --git a/test/csit/tests/portal-sdk/testsuites/test1.robot b/test/csit/tests/portal-sdk/testsuites/test1.robot index f3e4017fb..84579d017 100644 --- a/test/csit/tests/portal-sdk/testsuites/test1.robot +++ b/test/csit/tests/portal-sdk/testsuites/test1.robot @@ -47,9 +47,14 @@ Portal admin Login To Portal GUI Portal Admin Navigation Application Link Tab [Documentation] Logs into Portal GUI as Portal admin - Click Element xpath=.//h3[contains(text(),'xDemo App')]/following::div[1] - Page Should Contain ONAP Portal + Go To ${PORTAL_HOME_PAGE} + Dismiss Alert accept=false + #Scroll Element Into View xpath=//span[@id='tab-Home'] + #Click Element xpath=//span[@id='tab-Home'] + #Click Element xpath=(//span[@id='tab-xDemo-App']/following::i[@class='ion-close-round'])[1] + Click Element xpath=.//h3[contains(text(),'xDemo App')]/following::div[1] + Validate SDK Sub Menu @@ -72,7 +77,6 @@ Click Sample Pages and validate sub Menu Click Link xpath=//a[@id='parent-item-Sample-Pages'] Click Link xpath=//a[contains(@title,'Notebook')] Element Text Should Be xpath=//h1[contains(.,'Notebook')] Notebook - #Click Link xpath=//a[@id='parent-item-Home'] Click Reports and validate sub Menu [Documentation] Click Reports Tab diff --git a/test/csit/tests/portal/testsuites/test1.robot b/test/csit/tests/portal/testsuites/test1.robot index ab5fed47e..70fdcf0d6 100644 --- a/test/csit/tests/portal/testsuites/test1.robot +++ b/test/csit/tests/portal/testsuites/test1.robot @@ -886,7 +886,7 @@ Application admin Logout from Portal GUI [Documentation] Logout from Portal GUI Click Element xpath=//div[@id='header-user-icon'] #Set Selenium Implicit Wait 3000 - Click Button xpath=//button[contains(.,'Log out')] + Click Button xpath=//button[contains(text(),'Log out')] #Set Selenium Implicit Wait 3000 Title Should Be Login diff --git a/test/ete/labs/windriver/onap-openstack-template.env b/test/ete/labs/windriver/onap-openstack-template.env index 8619cad08..b1b31ee88 100644 --- a/test/ete/labs/windriver/onap-openstack-template.env +++ b/test/ete/labs/windriver/onap-openstack-template.env @@ -8,6 +8,8 @@ parameters: public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4 + public_net_name: external + ubuntu_1404_image: ubuntu-14-04-cloud-amd64 ubuntu_1604_image: ubuntu-16-04-cloud-amd64 @@ -42,6 +44,8 @@ parameters: openstack_tenant_id: ${OS_PROJECT_ID} + openstack_tenant_name: ${OS_PROJECT_NAME} + openstack_username: ${OS_USERNAME} openstack_api_key: ${OS_PASSWORD} @@ -118,13 +122,13 @@ parameters: dnsaas_config_enabled: true dnsaas_region: RegionOne - dnsaas_tenant_id: DCAE dnsaas_keystone_url: http://10.12.25.5:5000/v3 - dnsaas_username: demo - dnsaas_password: onapdemo + dnsaas_tenant_name: ${OS_PROJECT_NAME} + dnsaas_username: ${OS_USERNAME} + dnsaas_password: ${OS_PASSWORD} dcae_keystone_url: "http://10.0.14.1/api/multicloud-titanium_cloud/v0/pod25_RegionOne/identity/v2.0" dcae_centos_7_image: CentOS-7 - dcae_security_group: open + dcae_security_group: default dcae_key_name: 'id_lji_onap' dcae_public_key: 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDloKgBHx/yKRV77lr828rqa+zK+iTZpqmH3WSUU3vdNhSbEMNKkGVXR4+Gq1hNd8UNF+jMg87kOFSlQbE5jvsQMWuu1unxLKbH3AeXJd21gR1Gx4KXjkWsfl4URWMZ9WNvH0hMvqEV5SdFIDQmx07C/NOfy3R5N1pCgNsh9RT+EpDFh7jmimxrAqdxP0HnGFC2oM3rYMnzfh2/+Obkag6O3RZOkYx/WLQKbOKTi8K1C4UM5pwFzLT/vC+d9DF8pE7P9dlrbHTF9c3IGsP5oCa8CQ/WE4lVj/L9/iFNs0WsxdYaOnf11GJmPs663hltvWbQiqsFpdjX6tk/zMb3Xipz ubuntu@lusheng-sm-b781d54e-48ac-42fa-a780-3289b56e6598' dcae_private_key: '-----BEGIN RSA PRIVATE KEY-----\n |