diff options
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | docker/Dockerfile | 20 | ||||
| -rw-r--r-- | docker/lighttpd.conf | 2 | ||||
| -rw-r--r-- | robot/resources/asdc_interface.robot | 1 | ||||
| -rwxr-xr-x | runEteTag.sh | 4 | ||||
| -rwxr-xr-x | runSoak.sh | 4 | ||||
| -rwxr-xr-x | runTags.sh | 2 |
7 files changed, 17 insertions, 18 deletions
@@ -68,7 +68,7 @@ ProjectName - robot |-- assets - put anything you need as input like json files, cert keys, heat templates | |-- templates - put any json templates in here, you can include subfolders for each component |-- library - put any python libraries need to run tests in here - | |-- OpenECOMP - put any python code libraries we write in here + | |-- eteutils - put any python code libraries we write in here |-- resources - put any robot resource files aka libraries we write in here | |-- aai | `-- vid diff --git a/docker/Dockerfile b/docker/Dockerfile index 62677af5..7795fa77 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,9 +1,9 @@ FROM ubuntu ## Be careful of Windows newlines -MAINTAINER "OpenECOMP" +MAINTAINER "ONAP" -LABEL name="Docker image for the OpenECOMP Robot Testing Framework" +LABEL name="Docker image for the ONAP Robot Testing Framework" LABEL usage="docker run -e ROBOT_TEST=<testname> -ti openecompete" # Install Python Pip, Robot framework, firefox, lighttpd web server, wget @@ -38,20 +38,20 @@ RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key apt-get --assume-yes install google-chrome-stable # Copy the robot code -COPY / /var/opt/OpenECOMP_ETE/ +COPY / /var/opt/ONAP/ 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 && \ - chmod 777 /var/opt/OpenECOMP_ETE/runSoak.sh && \ - chmod 777 /var/opt/OpenECOMP_ETE/runEteTag.sh +RUN chmod 777 /var/opt/ONAP/setup.sh && \ + chmod 777 /var/opt/ONAP/runTags.sh && \ + chmod 777 /var/opt/ONAP/dnstraffic.sh && \ + chmod 777 /var/opt/ONAP/runSoak.sh && \ + chmod 777 /var/opt/ONAP/runEteTag.sh # Set mode for the SSH keys -RUN chmod 600 /var/opt/OpenECOMP_ETE/robot/assets/keys/* +RUN chmod 600 /var/opt/ONAP/robot/assets/keys/* # Update the ssh library so that it will run properly in the docker env -RUN cd /var/opt/OpenECOMP_ETE && ./setup.sh && apt-get clean +RUN cd /var/opt/ONAP && ./setup.sh && apt-get clean CMD ["lighttpd", "-D", "-f", "/etc/lighttpd/lighttpd.conf"] diff --git a/docker/lighttpd.conf b/docker/lighttpd.conf index b6fc1fb8..7fc50dbb 100644 --- a/docker/lighttpd.conf +++ b/docker/lighttpd.conf @@ -1,4 +1,4 @@ -server.document-root = "/var/opt/OpenECOMP_ETE/html/" +server.document-root = "/var/opt/ONAP/html/" server.port = 88 diff --git a/robot/resources/asdc_interface.robot b/robot/resources/asdc_interface.robot index a044dabd..3ba4b5c2 100644 --- a/robot/resources/asdc_interface.robot +++ b/robot/resources/asdc_interface.robot @@ -297,7 +297,6 @@ Setup ASDC Catalog Resource ${license_agreement_id}= Add ASDC License Agreement ${license_model_id} ${feature_group_id} ${license_model_version_id} Submit ASDC License Model ${license_model_id} ${license_model_version_id} ${license_model_resp}= Get ASDC License Model ${license_model_id} ${license_model_version_id} - # /var/opt/OpenECOMP_ETE/demo/heat/temp/vCPE_infra.zip ${matches}= Get Regexp Matches ${model_zip_path} temp/(.*)\.zip 1 ${software_product_name_prefix}= Set Variable ${matches[0]} ${software_product_id} ${software_product_version_id}= Add ASDC Software Product ${license_agreement_id} ${feature_group_id} ${license_model_resp['vendorName']} ${license_model_id} ${license_model_version_id} ${software_product_name_prefix} diff --git a/runEteTag.sh b/runEteTag.sh index 64f36e75..7cbe03fc 100755 --- a/runEteTag.sh +++ b/runEteTag.sh @@ -1,5 +1,5 @@ #!/bin/bash -INSTALL_DIR=/var/opt/OpenECOMP_ETE +INSTALL_DIR=/var/opt/ONAP ##################################################################### # Start display on 256 if it has not already been started... @@ -70,7 +70,7 @@ export DBUS_SESSION_BUS_ADDRESS=/dev/null RES="1280x1024x24" OUTPUT_FOLDER=/share/logs/${SOAKSUBFOLDER}runEteTag_$TEST_NUMBER mkdir -p $OUTPUT_FOLDER -INSTALL_DIR="/var/opt/OpenECOMP_ETE" +INSTALL_DIR="/var/opt/ONAP" ROBOT_LIBS=./robot/library:./robot/library/eteutils:./robot/library/heatbridge VARIABLEFILES="-V /share/config/vm_properties.py -V /share/config/integration_robot_properties.py -V /share/config/integration_preload_parameters.py" @@ -1,5 +1,5 @@ #!/bin/bash -INSTALL_DIR=/var/opt/OpenECOMP_ETE +INSTALL_DIR=/var/opt/ONAP # # Execute tags built to support the hands on demo, # @@ -25,4 +25,4 @@ function usage cd ${INSTALL_DIR} export PYTHONPATH=${INSTALL_DIR}/robot/library -python -m loadtest.TestMain $@ --logfile /share/logs/soak_$$.log
\ No newline at end of file +python -m loadtest.TestMain $@ --logfile /share/logs/soak_$$.log @@ -5,7 +5,7 @@ DEFAULT_LOG_LEVEL="TRACE" # Available levels: TRACE, DEBUG, INFO (default), WARN DEFAULT_RES="1280x1024x24" DEFAULT_DISPLAY=":99" DEFAULT_ROBOT_TEST="-i health" -INSTALL_NAME="OpenECOMP_ETE" +INSTALL_NAME="ONAP" DEFAULT_OUTPUT_FOLDER=./ # To mitigate the chromedriver hanging issue |