From 20eb2fab49af9fe4a108728818c495975f0d2a0e Mon Sep 17 00:00:00 2001
From: fmenguy <francoisregis.menguy@orange.com>
Date: Mon, 1 Mar 2021 15:54:10 +0100
Subject: NFVBENCH-197 Upgrade NFVbench packaging (Ubuntu version and
 requirements)

Change-Id: I79c8bc86272435bd4fa9ed9d1129eb964513ec1a
Signed-off-by: fmenguy <francoisregis.menguy@orange.com>
---
 docker/Dockerfile | 28 ++++++++++++----------------
 requirements.txt  | 10 +++++-----
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 990f07e..be93d8e 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,52 +1,48 @@
 # 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.79"
+ENV TREX_VER "v2.88"
 ENV VM_IMAGE_VER "0.12"
 ENV PYTHONIOENCODING "utf8"
 
-# Note: do not clone with --depth 1 as it will cause pbr to fail extracting the nfvbench version
-# from the git tag
-
-RUN apt-get update && apt-get install -y software-properties-common
-
-RUN add-apt-repository -y ppa:deadsnakes/ppa
-
 RUN apt-get update && apt-get install -y \
        git \
        kmod \
        pciutils \
-       python3.6 \
+       python3.8 \
        vim \
        wget \
        net-tools \
        iproute2 \
        libelf1 \
        python3-dev \
-       libpython3.6-dev \
+       libpython3.8-dev \
+       python3-distutils \
        gcc \
-       && ln -s /usr/bin/python3.6 /usr/local/bin/python3 \
+       && ln -s /usr/bin/python3.8 /usr/local/bin/python3 \
        && mkdir -p /opt/trex \
        && mkdir /var/log/nfvbench \
        && 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/interactive/trex /usr/local/lib/python3.6/dist-packages/ \
+       && 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 pip==20.2.4 \
+       && python3 get-pip.py \
        && pip3 install -U pbr \
        && pip3 install -U setuptools \
        && cd / \
+       # 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 \
        # Override Xtesting testcases.yaml file by NFVbench default one
-       && cp xtesting/testcases.yaml /usr/local/lib/python3.6/dist-packages/xtesting/ci/testcases.yaml \
+       && cp xtesting/testcases.yaml /usr/local/lib/python3.8/dist-packages/xtesting/ci/testcases.yaml \
        && python3 ./docker/cleanup_generators.py \
        && rm -rf /nfvbench/.git \
-       && apt-get remove -y wget git python3-dev libpython3.6-dev gcc \
+       && 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_EXT_LIBS "/opt/trex/$TREX_VER/external_libs"
diff --git a/requirements.txt b/requirements.txt
index ba50911..732d807 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,11 +10,11 @@ paramiko>=1.14.0
 prettytable>=0.7.2
 pytz>=2016.4
 six>=1.10.0
-python-glanceclient==2.6.0
-python-neutronclient<3,>=2.3.6
-python-novaclient>=2.18.1
-python-openstackclient>=0.4.1
-python-keystoneclient>=1.0.0
+python-glanceclient==3.2.2
+python-neutronclient>=7.3.0
+python-novaclient>=17.3.0
+python-openstackclient>=5.4.0
+python-keystoneclient>=4.2.0
 pyyaml>=3.11
 pyzmq>=15.3.0
 requests>=2.13.0
-- 
cgit 1.2.3-korg