diff options
| -rw-r--r-- | docker/Dockerfile | 1 | ||||
| -rw-r--r-- | docker/authorization | 1 | ||||
| -rw-r--r-- | robot/resources/demo_preload.robot | 3 | ||||
| -rw-r--r-- | robot/resources/portal-sdk/portalDef.robot | 28 | ||||
| -rw-r--r-- | robot/testsuites/demo.robot | 2 | ||||
| -rw-r--r-- | robot/testsuites/portalApp.robot | 1 |
6 files changed, 26 insertions, 10 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 888d6ed7..39e03e0e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -40,6 +40,7 @@ RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key # Copy the robot code COPY / /var/opt/OpenECOMP_ETE/ COPY lighttpd.conf /etc/lighttpd/lighttpd.conf +COPY authorization /etc/lighttpd/authorization RUN chmod 777 /var/opt/OpenECOMP_ETE/setup.sh && \ chmod 777 /var/opt/OpenECOMP_ETE/runTags.sh && \ chmod 777 /var/opt/OpenECOMP_ETE/dnstraffic.sh && \ diff --git a/docker/authorization b/docker/authorization new file mode 100644 index 00000000..b254e654 --- /dev/null +++ b/docker/authorization @@ -0,0 +1 @@ +test:test diff --git a/robot/resources/demo_preload.robot b/robot/resources/demo_preload.robot index 460c249d..ff7e9bf3 100644 --- a/robot/resources/demo_preload.robot +++ b/robot/resources/demo_preload.robot @@ -150,7 +150,8 @@ APPC Mount Point ${vpg_public_ip}= Get Server Ip ${server_list} ${stack_info} vpg_name_0 network_name=public ${vpg_oam_ip}= Get From Dictionary ${stack_info} vpg_private_ip_1 #${appc}= Create Mount Point In APPC ${vpg_name_0} ${vpg_oam_ip} - ${appc}= Create Mount Point In APPC ${vnf_id} ${vpg_oam_ip} + #${appc}= Create Mount Point In APPC ${vnf_id} ${vpg_oam_ip} + ${appc}= Create Mount Point In APPC ${vnf_id} ${vpg_public_ip} Instantiate VNF [Arguments] ${service} ${vf_module_label}=NULL diff --git a/robot/resources/portal-sdk/portalDef.robot b/robot/resources/portal-sdk/portalDef.robot index 0fb9e771..10e19f57 100644 --- a/robot/resources/portal-sdk/portalDef.robot +++ b/robot/resources/portal-sdk/portalDef.robot @@ -23,20 +23,12 @@ ${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_LoginID} demoapp -${App_Email_Address} demoapp@onap.com -${Sta_LoginID} demosta -${Sta_Email_Address} demosta@onap.com -${Test_LoginID} portal -${Test_Email_Address} portal@onap.com ${PORTAL_HEALTH_CHECK_PATH} /ONAPPORTAL/portalApi/healthCheck ${PORTAL_XDEMPAPP_REST_URL} http://portal-sdk:8080/ONAPPORTALSDK/api/v2 ${PORTAL_ASSETS_DIRECTORY} ../../assets/widgets/ ${GLOBAL_APPLICATION_ID} robot-functional ${GLOBAL_PORTAL_ADMIN_USER} demo ${GLOBAL_PORTAL_ADMIN_PWD} demo123456! -${AppUserName} testApp -${AppPassword} testApp123! ${GLOBAL_MSO_STATUS_PATH} /ecomp/mso/infra/orchestrationRequests/v2/ ${GLOBAL_SELENIUM_BROWSER} chrome ${GLOBAL_SELENIUM_BROWSER_CAPABILITIES} Create Dictionary @@ -61,6 +53,26 @@ ${download_link_id} 0 *** Keywords *** +Generate Random User Name + ${RAND} Generate Random String 4 [NUMBERS] + ${App_LoginID}= Set Variable demoapp${RAND} + ${App_Email_Address}= Set Variable demoapp${RAND}@onap.com + ${Sta_LoginID}= Set Variable demosta${RAND} + ${Sta_Email_Address}= Set Variable demosta${RAND}@onap.com + ${Test_LoginID}= Set Variable portal${RAND} + ${Test_Email_Address}= Set Variable portal${RAND}@onap.com + ${AppUserName}= Set Variable testApp${RAND} + ${AppPassword}= Set Variable testApp${RAND}123! + Set Suite Variable ${App_LoginID} + Set Suite Variable ${App_Email_Address} + Set Suite Variable ${Sta_LoginID} + Set Suite Variable ${Sta_Email_Address} + Set Suite Variable ${Test_LoginID} + Set Suite Variable ${Test_Email_Address} + Set Suite Variable ${AppUserName} + Set Suite Variable ${AppPassword} + + Portal admin Login To Portal GUI [Documentation] Logs into Portal GUI ## Setup Browser Now being managed by test case diff --git a/robot/testsuites/demo.robot b/robot/testsuites/demo.robot index a6c6cb8f..72a4a8e3 100644 --- a/robot/testsuites/demo.robot +++ b/robot/testsuites/demo.robot @@ -37,7 +37,7 @@ Create APPC Mount Point Instantiate VFW [Tags] instantiateVFW - Instantiate VNF vFW + Instantiate VNF vFW base_vfw Instantiate VFWCL [Tags] instantiateVFWCL diff --git a/robot/testsuites/portalApp.robot b/robot/testsuites/portalApp.robot index b8855ec6..d5acdd90 100644 --- a/robot/testsuites/portalApp.robot +++ b/robot/testsuites/portalApp.robot @@ -3,6 +3,7 @@ Test Timeout 3 minute Documentation This is RobotFrame work script Resource ../resources/portal-sdk/portalDef.robot Resource ../resources/portal-sdk/portalSdkDef.robot +Suite Setup Generate Random User Name *** Test Cases *** |