diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 54 | ||||
| -rwxr-xr-x | docker/cleanup_generators.py | 14 | ||||
| -rwxr-xr-x | docker/nfvbench-entrypoint.sh | 14 |
3 files changed, 51 insertions, 31 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index cd59fa0..46be733 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,41 +1,53 @@ # docker file for creating a container that has nfvbench installed and ready to use -FROM ubuntu:16.04 +FROM ubuntu:20.04 -ENV TREX_VER "v2.32" -ENV VM_IMAGE_VER "0.6" +ENV TREX_VER "v2.89" +ENV VM_IMAGE_VER "0.15" +ENV PYTHONIOENCODING "utf8" RUN apt-get update && apt-get install -y \ git \ kmod \ pciutils \ - python \ - python-pip \ + python3.8 \ vim \ wget \ net-tools \ + iproute2 \ libelf1 \ - && mkdir /tmp/http_root \ + python3-dev \ + libpython3.8-dev \ + python3-distutils \ + gcc \ + && ln -s /usr/bin/python3.8 /usr/local/bin/python3 \ && mkdir -p /opt/trex \ && mkdir /var/log/nfvbench \ - && wget --no-cache https://trex-tgn.cisco.com/trex/release/$TREX_VER.tar.gz \ + && wget --no-cache --no-check-certificate https://trex-tgn.cisco.com/trex/release/$TREX_VER.tar.gz \ && tar xzf $TREX_VER.tar.gz -C /opt/trex \ && rm -f /$TREX_VER.tar.gz \ && rm -f /opt/trex/$TREX_VER/trex_client_$TREX_VER.tar.gz \ - && cp -a /opt/trex/$TREX_VER/automation/trex_control_plane/stl/trex_stl_lib /usr/local/lib/python2.7/dist-packages/ \ - && rm -rf /opt/trex/$TREX_VER/automation/trex_control_plane/stl/trex_stl_lib \ - && sed -i -e "s/2048 /512 /" -e "s/2048\"/512\"/" /opt/trex/$TREX_VER/trex-cfg \ - && pip install -U pip pbr \ - && hash -r pip \ - && pip install -U setuptools \ - && cd / \ - && git clone --depth 1 https://gerrit.opnfv.org/gerrit/nfvbench \ - && cd /nfvbench && pip install -e . \ + && cp -a /opt/trex/$TREX_VER/automation/trex_control_plane/interactive/trex /usr/local/lib/python3.8/dist-packages/ \ + && rm -rf /opt/trex/$TREX_VER/automation/trex_control_plane/interactive/trex \ + && wget https://bootstrap.pypa.io/get-pip.py \ + && python3 get-pip.py \ + && pip3 install -U pbr \ + && pip3 install -U setuptools \ + && cd /opt \ + # Note: do not clone with --depth 1 as it will cause pbr to fail extracting the nfvbench version + # from the git tag + && git clone https://gerrit.opnfv.org/gerrit/nfvbench \ + && cd nfvbench && pip3 install -e . \ && wget -O nfvbenchvm-$VM_IMAGE_VER.qcow2 http://artifacts.opnfv.org/nfvbench/images/nfvbenchvm_centos-$VM_IMAGE_VER.qcow2 \ - && python ./docker/cleanup_generators.py \ - && rm -rf /nfvbench/.git \ - && apt-get remove -y wget git \ + # Override Xtesting testcases.yaml file by NFVbench default one + && cp xtesting/testcases.yaml /usr/local/lib/python3.8/dist-packages/xtesting/ci/testcases.yaml \ + && python3 ./docker/cleanup_generators.py \ + && rm -rf /opt/nfvbench/.git \ + # Symlink for retrocompatibility 4.x + && ln -s /opt/nfvbench /nfvbench \ + && apt-get remove -y wget git python3-dev libpython3.8-dev gcc \ && apt-get autoremove -y && apt-get clean && rm -rf /var/lib/apt/lists/* -ENV TREX_STL_EXT_PATH "/opt/trex/$TREX_VER/external_libs" +ENV TREX_EXT_LIBS "/opt/trex/$TREX_VER/external_libs" -ENTRYPOINT ["/nfvbench/docker/nfvbench-entrypoint.sh"] + +ENTRYPOINT ["/opt/nfvbench/docker/nfvbench-entrypoint.sh"] diff --git a/docker/cleanup_generators.py b/docker/cleanup_generators.py index db68dcb..c555d59 100755 --- a/docker/cleanup_generators.py +++ b/docker/cleanup_generators.py @@ -40,8 +40,8 @@ def remove_unused_libs(path, files): else: os.remove(f) except OSError: - print "Skipped file:" - print f + print("Skipped file:") + print(f) continue @@ -65,14 +65,14 @@ if __name__ == "__main__": versions = os.listdir(TREX_OPT) for version in versions: trex_path = os.path.join(TREX_OPT, version) - print 'Cleaning TRex', version + print('Cleaning TRex', version) try: size_before = get_dir_size(trex_path) remove_unused_libs(trex_path, TREX_UNUSED) size_after = get_dir_size(trex_path) - print '==== Saved Space ====' - print size_before - size_after + print('==== Saved Space ====') + print(size_before - size_after) except OSError: import traceback - print traceback.print_exc() - print 'Cleanup was not finished.' + print(traceback.print_exc()) + print('Cleanup was not finished.') diff --git a/docker/nfvbench-entrypoint.sh b/docker/nfvbench-entrypoint.sh index ed98ced..913e5ba 100755 --- a/docker/nfvbench-entrypoint.sh +++ b/docker/nfvbench-entrypoint.sh @@ -13,11 +13,19 @@ # License for the specific language governing permissions and limitations # under the License. # - -if [ -z "$1" ] || [ $1 != 'start_rest_server' ]; then +if [ -z "$1" ] || ([ $1 != 'start_rest_server' ] && [ $1 != 'run_tests' ] && [ $1 != 'zip_campaign' ]); then tail -f /dev/null +elif [ $1 == 'run_tests' ]; then + PARAMS="" + for var in "${@:2}" + do + PARAMS+="$var " + done + eval "run_tests $PARAMS" +elif [ $1 == 'zip_campaign' ]; then + zip_campaign else - PARAMS="--server /tmp/http_root" + PARAMS="--server" if [ -n "$HOST" ]; then PARAMS+=" --host $HOST" fi |