Merge "Openstack: Using VSPERF to Test on Openstack."
authorSridhar Rao <sridhar.rao@spirent.com>
Wed, 25 Nov 2020 09:10:56 +0000 (09:10 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Wed, 25 Nov 2020 09:10:56 +0000 (09:10 +0000)
15 files changed:
conf/02_vswitch.conf
conf/03_traffic.conf
docs/k8s/index.rst
requirements.txt
src/package-list.mk
src/trex/Makefile
systems/README.md
tools/md-testvnf/config.json [new file with mode: 0644]
tools/md-testvnf/http/ks.cfg [new file with mode: 0644]
tools/md-testvnf/playbook.yml [new file with mode: 0644]
tools/md-testvnf/scripts/ansible.sh [new file with mode: 0644]
tools/md-testvnf/scripts/deploycentostools.sh [new file with mode: 0755]
tools/md-testvnf/scripts/sshConfig.sh [new file with mode: 0644]
tools/md-testvnf/testVNF_image.json [new file with mode: 0644]
tools/pkt_gen/trex/trex_client.py [moved from tools/pkt_gen/trex/trex.py with 99% similarity]

index 283da27..4eca1a5 100644 (file)
@@ -224,7 +224,7 @@ OVS_ROUTING_TABLES = False
 #########################
 # Set of arguments used for startup of VPP
 # NOTE: DPDK socket mem allocation is driven by parameter DPDK_SOCKET_MEM
-VSWITCH_VPP_CLI_SOCK = ''
+VSWITCH_VPP_CLI_SOCK = '/run/vpp/cli.sock'
 VSWITCH_VPP_ARGS = {
     'unix' : [
         'interactive',      # required by VSPERF to detect successful VPP startup
@@ -236,6 +236,9 @@ VSWITCH_VPP_ARGS = {
         'workers 2',
         'corelist-workers 4,5',
     ],
+    'socksvr' : [
+        'socket-name /run/vpp-api.sock',
+    ],
 }
 
 # log file for VPP
index d79b0b1..01747a3 100644 (file)
@@ -579,7 +579,7 @@ PATHS['trafficgen'] = {
     'Trex': {
         'type' : 'src',
         'src': {
-            'path': os.path.join(ROOT_DIR, 'src/trex/trex/scripts/automation/trex_control_plane/stl')
+            'path': os.path.join(ROOT_DIR, 'src/trex/trex/scripts/automation/trex_control_plane/interactive')
     }
   }
 }
index 36ba760..872a328 100644 (file)
@@ -1,14 +1,40 @@
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
 .. http://creativecommons.org/licenses/by/4.0
-.. (c) OPNFV, Intel Corporation, AT&T, Red Hat, Spirent, Ixia  and others.
+.. (c) OPNFV, Spirent, AT&T, Ixia  and others.
 
 .. OPNFV VSPERF Documentation master file.
 
-**************************
-OPNFV VSPERF K8S CNB Guide
-**************************
+=========================================================
+OPNFV VSPERF Kubernetes Container Networking Benchmarking
+=========================================================
+VSPERF supports testing and benchmarking of kubernetes container networking solution, referred as kubernetes Container Networking Benchmarking (CNB). The process can be broadly classified into following four operations.
 
-============
-Introduction
-============
+1. Setting up of Kubernetes Cluster.
+2. Deploying container networking solution.
+3. Deploying pod(s).
+4. Running tests.
 
+First step is achieved through the tool present in *tools/k8s/cluster-deployment* folder. Please refer to the documentation present in that folder for automated kubernetes cluster setup. To perform the remaining steps, the user has to run the following command.
+
+.. code-block:: console
+    
+    vsperf --k8s --conf-file k8s.conf pcp_tput
+
+************************
+Important Configurations
+************************
+
+VSPERF has introduced a new configuration parameters, as listed below, for kubernetes CNB. The file *12_k8s.conf*, present in conf folder provides sample values. User has to modify these parameters to suit their environment before running the above command.
+
+1. K8S_CONFIG_FILEPATH - location of the kubernetes-cluster access file. This will be used to connect to the cluster.
+2. PLUGIN - The plugin to use. Allowed values are OvsDPDK, VPP, and SRIOV.
+3. NETWORK_ATTACHMENT_FILEPATH - location of the network attachment definition file.
+4. CONFIGMAP_FILEPATH - location of the config-map file. This will be used only for SRIOV plugin.
+5. POD_MANIFEST_FILEPATH - location of the POD definition file.
+6. APP_NAME - Application to run in the pod. Options - l2fwd, testpmd, and l3fwd.
+
+
+*********
+Testcases
+*********
+Kubernetes CNB will be done through new testcases. For Jerma release, only pcp_tput will be supported. This testcase, will be similar to pvp_tput, where VNF is replaced with a pod/container. The pcp_tput testcase, will still use phy2phy as deployment. In future releases, a new deployment model will be added to support more testcases for kubernetes
index 825f057..bd66060 100644 (file)
@@ -15,7 +15,7 @@ scapy-python3==0.18
 pylint==1.8.2
 distro
 stcrestclient
-matplotlib==2.2.2
+matplotlib
 numpy
 pycrypto
 tabulate
index 11f876d..1e40a60 100644 (file)
@@ -29,4 +29,4 @@ QEMU_TAG ?= v3.1.1
 
 # TREX section
 TREX_URL ?= https://github.com/cisco-system-traffic-generator/trex-core.git
-TREX_TAG ?= v2.38
+TREX_TAG ?= v2.86
index 9a0704a..fd5c47b 100644 (file)
@@ -29,8 +29,8 @@ all: force_pull
 force_pull: $(TAG_DONE_FLAG)
        $(AT)cd $(WORK_DIR) && git pull $(TREX_URL) $(TREX_TAG)
        @echo "git pull done"
-       $(AT)wget https://raw.githubusercontent.com/phaethon/scapy/v0.18/scapy/layers/all.py -O $(WORK_DIR)/scripts/external_libs/scapy-2.3.1/python3/scapy/layers/all.py
-       @echo "orignal SCAPY 2.3.1 layers/all.py was restored"
+#      $(AT)wget https://raw.githubusercontent.com/phaethon/scapy/v0.18/scapy/layers/all.py -O $(WORK_DIR)/scripts/external_libs/scapy-2.3.1/python3/scapy/layers/all.py
+#      @echo "orignal SCAPY 2.3.1 layers/all.py was restored"
 
 $(WORK_DIR):
        $(AT)git clone $(TREX_URL) $(WORK_DIR)
index d72aae6..ca6557e 100644 (file)
@@ -12,3 +12,7 @@ On a freshly built system, run the following with a super user privilege
 or with password less sudo access.
 
 ./build_base_machine.sh
+
+If you want to use vsperf in trafficgen-mode ONLY, then add a parameter.
+
+./build_base_machine.sh trafficgen
diff --git a/tools/md-testvnf/config.json b/tools/md-testvnf/config.json
new file mode 100644 (file)
index 0000000..fcfbf0c
--- /dev/null
@@ -0,0 +1,11 @@
+{
+    "username": "",
+    "password": "",
+    "networks" : "",
+    "source_image": "",
+    "flavor": "",
+    "domain_name": "",
+    "floating_ip_network" : "",
+
+    "ssh_path": ""
+}
diff --git a/tools/md-testvnf/http/ks.cfg b/tools/md-testvnf/http/ks.cfg
new file mode 100644 (file)
index 0000000..46aa331
--- /dev/null
@@ -0,0 +1,88 @@
+install
+cdrom
+lang en_US.UTF-8
+keyboard us
+network --bootproto=dhcp
+rootpw centos
+firewall --disabled
+selinux --permissive
+timezone UTC
+unsupported_hardware
+bootloader --location=mbr
+text
+skipx
+zerombr
+clearpart --all --initlabel
+part / --fstype="ext4" --grow --size=100
+auth --enableshadow --passalgo=sha512 --kickstart
+firstboot --disabled
+reboot
+services --disabled kdump
+user --name=centos --plaintext --password centos
+url --url=http://centos.osuosl.org/7.8.2003/os/x86_64
+repo --name=updates --baseurl=http://centos.osuosl.org/7.8.2003/updates/x86_64
+
+%packages --nobase --ignoremissing
+openssh-clients
+sudo
+wget
+nfs-utils
+net-tools
+perl-libwww-perl
+bzip2
+vim
+rsync
+man
+man-pages
+parted
+-fprintd-pam
+-intltool
+
+# unnecessary firmware
+-aic94xx-firmware
+-atmel-firmware
+-b43-openfwwf
+-bfa-firmware
+-ipw2100-firmware
+-ipw2200-firmware
+-ivtv-firmware
+-iwl1000-firmware
+-iwl100-firmware
+-iwl105-firmware
+-iwl135-firmware
+-iwl2000-firmware
+-iwl2030-firmware
+-iwl3160-firmware
+-iwl3945-firmware
+-iwl4965-firmware
+-iwl5000-firmware
+-iwl5150-firmware
+-iwl6000-firmware
+-iwl6000g2a-firmware
+-iwl6000g2b-firmware
+-iwl6050-firmware
+-iwl7260-firmware
+-libertas-sd8686-firmware
+-libertas-sd8787-firmware
+-libertas-usb8388-firmware
+-ql2100-firmware
+-ql2200-firmware
+-ql23xx-firmware
+-ql2400-firmware
+-ql2500-firmware
+-rt61pci-firmware
+-rt73usb-firmware
+-xorg-x11-drv-ati-firmware
+-zd1211-firmware
+%end
+
+%post
+yum -y upgrade
+# update root certs
+wget https://raw.githubusercontent.com/bagder/curl/master/lib/mk-ca-bundle.pl
+perl mk-ca-bundle.pl /etc/pki/tls/certs/ca-bundle.crt
+rm certdata.txt mk-ca-bundle.pl
+# sudo
+echo "%centos ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/centos
+sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers
+%end
\ No newline at end of file
diff --git a/tools/md-testvnf/playbook.yml b/tools/md-testvnf/playbook.yml
new file mode 100644 (file)
index 0000000..81a51f5
--- /dev/null
@@ -0,0 +1,36 @@
+---
+- hosts: all
+  vars:
+    username: "testvnf"
+    password: "testvnf"
+  become: true
+  tasks:
+  
+   - name: create a new user
+     user: 
+        name: "{{ username }}"
+        state:  present
+        groups: "wheel"
+        password: "{{ password | password_hash('sha512') }}"
+        comment: "user for ansible connection"
+  
+   - lineinfile:
+        path: /etc/sudoers
+        state: present
+        regexp: '^%wheel'
+        line: '%wheel ALL=(ALL) NOPASSWD: ALL'
+        validate: 'visudo -cf %s'
+    
+   - name: Ansible create file if it doesn't exist example
+     file:
+        path: "temp"
+        state: touch
+    
+
+   - name: install epel-release
+     package:
+        name: epel-release
+        state: present
+  
+   - name: Execute the deployment script
+     command: /home/centos/deploycentostools.sh deploy
\ No newline at end of file
diff --git a/tools/md-testvnf/scripts/ansible.sh b/tools/md-testvnf/scripts/ansible.sh
new file mode 100644 (file)
index 0000000..770e248
--- /dev/null
@@ -0,0 +1,7 @@
+#!/bin/bash -eux
+yum -y update
+# Install EPEL repository.
+yum -y install epel-release
+
+# Install Ansible.
+yum -y install ansible
\ No newline at end of file
diff --git a/tools/md-testvnf/scripts/deploycentostools.sh b/tools/md-testvnf/scripts/deploycentostools.sh
new file mode 100755 (executable)
index 0000000..694b020
--- /dev/null
@@ -0,0 +1,364 @@
+#!/usr/bin/env bash
+##
+## Copyright (c) 2010-2020 Intel Corporation
+##
+## Licensed under the Apache License, Version 2.0 (the "License");
+## you may not use this file except in compliance with the License.
+## You may obtain a copy of the License at
+##
+##     http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+##
+
+# Directory for package build
+BUILD_DIR="/opt/rapid"
+TREX_DIR="/opt/trex"
+RAMSPEED_DIR="/opt/ramspeed"
+STRESSNG_DIR="/opt/stressng"
+UNIXBENCH_DIR="/opt/unixbench"
+DPDK_VERSION="20.05"
+PROX_COMMIT="80dfeb5c734cc4d681f467e853a541a8a91fe1cf"
+PROX_CHECKOUT="git checkout ${PROX_COMMIT}"
+## Next line is overruling the PROX_COMMIT and will replace the version with a very specific patch. Should be commented out
+##     if you want to use a committed version of PROX with the COMMIT ID specified above
+## As an example: Following line has the commit for testing IMIX, IPV6, ... It is the merge of all PROX commits on May 27th 2020
+#PROX_CHECKOUT="git fetch \"https://gerrit.opnfv.org/gerrit/samplevnf\" refs/changes/23/70223/1 && git checkout FETCH_HEAD"
+MULTI_BUFFER_LIB_VER="0.52"
+export RTE_SDK="${BUILD_DIR}/dpdk-${DPDK_VERSION}"
+export RTE_TARGET="x86_64-native-linuxapp-gcc"
+
+# By default, do not update OS
+OS_UPDATE="n"
+# By default, asumming that we are in the VM
+K8S_ENV="n"
+
+# If already running from root, no need for sudo
+SUDO=""
+[ $(id -u) -ne 0 ] && SUDO="sudo"
+
+function os_pkgs_install()
+{
+       ${SUDO} yum install -y deltarpm yum-utils
+
+       # NASM repository for AESNI MB library
+       #${SUDO} yum-config-manager --add-repo http://www.nasm.us/nasm.repo
+
+       [ "${OS_UPDATE}" == "y" ] && ${SUDO} yum update -y
+       ${SUDO} yum install -y git wget gcc unzip libpcap-devel ncurses-devel \
+                        libedit-devel lua-devel kernel-devel iperf3 pciutils \
+                        numactl-devel vim tuna openssl-devel wireshark \
+                        make driverctl
+
+       ${SUDO} wget https://www.nasm.us/pub/nasm/releasebuilds/2.14.02/linux/nasm-2.14.02-0.fc27.x86_64.rpm
+       ${SUDO} rpm -ivh nasm-2.14.02-0.fc27.x86_64.rpm
+}
+
+function k8s_os_pkgs_runtime_install()
+{
+       [ "${OS_UPDATE}" == "y" ] && ${SUDO} yum update -y
+
+       # Install required dynamically linked libraries + required packages
+       ${SUDO} yum install -y numactl-libs libpcap openssh openssh-server \
+                 openssh-clients sudo
+}
+
+function os_cfg()
+{
+       # huge pages to be used by DPDK
+       ${SUDO} sh -c '(echo "vm.nr_hugepages = 1024") > /etc/sysctl.conf'
+
+       ${SUDO} sh -c '(echo "options vfio enable_unsafe_noiommu_mode=1") > /etc/modprobe.d/vfio.conf'
+       ${SUDO} sh -c '(echo "vfio") > /etc/modules-load.d/vfio.conf'
+       ${SUDO} sh -c '(echo "vfio-pci") > /etc/modules-load.d/vfio.conf'
+       # Enabling tuned with the realtime-virtual-guest profile
+       pushd ${BUILD_DIR} > /dev/null 2>&1
+       wget http://linuxsoft.cern.ch/cern/centos/7/rt/x86_64/Packages/tuned-profiles-realtime-2.8.0-5.el7_4.2.noarch.rpm
+       wget http://linuxsoft.cern.ch/cern/centos/7/rt/x86_64/Packages/tuned-profiles-nfv-guest-2.8.0-5.el7_4.2.noarch.rpm
+       # Install with --nodeps. The latest CentOS cloud images come with a tuned version higher than 2.8. These 2 packages however
+       # do not depend on v2.8 and also work with tuned 2.9. Need to be careful in the future
+       ${SUDO} rpm -ivh ${BUILD_DIR}/tuned-profiles-realtime-2.8.0-5.el7_4.2.noarch.rpm --nodeps
+       ${SUDO} rpm -ivh ${BUILD_DIR}/tuned-profiles-nfv-guest-2.8.0-5.el7_4.2.noarch.rpm --nodeps
+       # Although we do no know how many cores the VM will have when begin deployed for real testing, we already put a number for the
+       # isolated CPUs so we can start the realtime-virtual-guest profile. If we don't, that command will fail.
+       # When the VM will be instantiated, the check_kernel_params service will check for the real number of cores available to this VM 
+       # and update the realtime-virtual-guest-variables.conf accordingly.
+       echo "isolated_cores=1-3" | ${SUDO} tee -a /etc/tuned/realtime-virtual-guest-variables.conf
+       ${SUDO} tuned-adm profile realtime-virtual-guest
+
+       # Install the check_tuned_params service to make sure that the grub cmd line has the right cpus in isolcpu. The actual number of cpu's
+       # assigned to this VM depends on the flavor used. We don't know at this time what that will be.
+       ${SUDO} chmod +x ${BUILD_DIR}/check_prox_system_setup.sh
+       ${SUDO} mv ${BUILD_DIR}/check_prox_system_setup.sh /usr/local/libexec/
+       ${SUDO} mv ${BUILD_DIR}/check-prox-system-setup.service /etc/systemd/system/
+       ${SUDO} systemctl daemon-reload
+       ${SUDO} systemctl enable check-prox-system-setup.service
+       popd > /dev/null 2>&1
+}
+
+function k8s_os_cfg()
+{
+       [ ! -f /etc/ssh/ssh_host_rsa_key ] && ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
+       [ ! -f /etc/ssh/ssh_host_ecdsa_key ] && ssh-keygen -t ecdsa -f /etc/ssh/ssh_host_ecdsa_key -N ''
+       [ ! -f /etc/ssh/ssh_host_ed25519_key ] && ssh-keygen -t ed25519 -f /etc/ssh/ssh_host_ed25519_key -N ''
+
+       [ ! -d /var/run/sshd ] && mkdir -p /var/run/sshd
+
+       USER_NAME="centos"
+       USER_PWD="centos"
+
+       useradd -m -d /home/${USER_NAME} -s /bin/bash -U ${USER_NAME}
+       echo "${USER_NAME}:${USER_PWD}" | chpasswd
+       usermod -aG wheel ${USER_NAME}
+
+       echo "%wheel ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/wheelnopass
+}
+
+function mblib_install()
+{
+       export AESNI_MULTI_BUFFER_LIB_PATH="${BUILD_DIR}/intel-ipsec-mb-${MULTI_BUFFER_LIB_VER}"
+
+       # Downloading the Multi-buffer library. Note that the version to download is linked to the DPDK version being used
+       pushd ${BUILD_DIR} > /dev/null 2>&1
+       wget https://github.com/01org/intel-ipsec-mb/archive/v${MULTI_BUFFER_LIB_VER}.zip
+       unzip v${MULTI_BUFFER_LIB_VER}.zip
+       pushd ${AESNI_MULTI_BUFFER_LIB_PATH}
+       make -j`getconf _NPROCESSORS_ONLN`
+       ${SUDO} make install
+       popd > /dev/null 2>&1
+       popd > /dev/null 2>&1
+}
+
+function trex_install()
+{
+       pushd ${TREX_DIR} > /dev/null 2>&1
+  wget --no-cache https://trex-tgen.cisco.com/trex/release/latest
+  tar -xzvf latest
+  popd > /dev/null 2>&1
+}
+
+function unixbench_install()
+{
+       pushd ${UNIXBENCH_DIR} > /dev/null 2>&1
+  git clone https://github.com/kdlucas/byte-unixbench
+  popd > /dev/null 2>&1
+}
+
+function ramspeed_install()
+{
+  RAMSPEED_BUILD_DIR = "${RAMSPEED_DIR}/ramspeed-smp"
+  pushd ${RAMSPEED_DIR} > /dev/null 2>&1
+  git clone https://github.com/cruvolo/ramspeed-smp
+  pushd ${RAMSPEED_BUILD_DIR} > /dev/null 2>&1
+  chmod 766 build.sh
+  source build.sh
+  popd > /dev/null 2>&1
+  popd > /dev/null 2>&1
+}
+
+function collectd_install()
+{
+  ${SUDO} yum -y install collectd
+}
+
+function fio_install()
+{
+  ${SUDO} yum -y install fio
+}
+
+function stressng_install()
+{
+  STRESSNG_BUILD_DIR = "${STRESSNG_DIR}/stress-ng"
+  pushd ${STRESSNG_DIR} > /dev/null 2>&1
+  git clone https://github.com/ColinIanKing/stress-ng
+  ${SUDO} yum -y install libaio-devel libbsd-devel libcap-devel libattr-devel libgcrypt-devel
+  ${SUDO} yum -y install Judy-devel keyutils-libs-devel lksctp-tools-devel libatomic zlib-devel
+  pushd ${STRESSNG_BUILD_DIR} > /dev/null 2>&1
+  make clean
+  make
+  ${SUDO} make install
+       popd > /dev/null 2>&1
+       popd > /dev/null 2>&1
+}
+
+function dpdk_install()
+{
+       # Build DPDK for the latest kernel installed
+       LATEST_KERNEL_INSTALLED=`ls -v1 /lib/modules/ | tail -1`
+       export RTE_KERNELDIR="/lib/modules/${LATEST_KERNEL_INSTALLED}/build"
+
+       # Get and compile DPDK
+       pushd ${BUILD_DIR} > /dev/null 2>&1
+       wget http://fast.dpdk.org/rel/dpdk-${DPDK_VERSION}.tar.xz
+       tar -xf ./dpdk-${DPDK_VERSION}.tar.xz
+       popd > /dev/null 2>&1
+
+       ${SUDO} ln -s ${RTE_SDK} ${BUILD_DIR}/dpdk
+
+       pushd ${RTE_SDK} > /dev/null 2>&1
+       make config T=${RTE_TARGET}
+       # Starting from DPDK 20.05, the IGB_UIO driver is not compiled by default.
+    # Uncomment the sed command to enable the driver compilation
+    #${SUDO} sed -i 's/CONFIG_RTE_EAL_IGB_UIO=n/c\/CONFIG_RTE_EAL_IGB_UIO=y' ${RTE_SDK}/build/.config
+
+       # For Kubernetes environment we use host vfio module
+       if [ "${K8S_ENV}" == "y" ]; then
+               sed -i 's/CONFIG_RTE_EAL_IGB_UIO=y/CONFIG_RTE_EAL_IGB_UIO=n/g' ${RTE_SDK}/build/.config
+               sed -i 's/CONFIG_RTE_LIBRTE_KNI=y/CONFIG_RTE_LIBRTE_KNI=n/g' ${RTE_SDK}/build/.config
+               sed -i 's/CONFIG_RTE_KNI_KMOD=y/CONFIG_RTE_KNI_KMOD=n/g' ${RTE_SDK}/build/.config
+    fi
+
+       # Compile with MB library
+       sed -i '/CONFIG_RTE_LIBRTE_PMD_AESNI_MB=n/c\CONFIG_RTE_LIBRTE_PMD_AESNI_MB=y' ${RTE_SDK}/build/.config
+       make -j`getconf _NPROCESSORS_ONLN`
+       ln -s ${RTE_SDK}/build ${RTE_SDK}/${RTE_TARGET}
+       popd > /dev/null 2>&1
+}
+
+function prox_compile()
+{
+       # Compile PROX
+       pushd ${BUILD_DIR}/samplevnf/VNFs/DPPD-PROX
+       make -j`getconf _NPROCESSORS_ONLN`
+       ${SUDO} cp ${BUILD_DIR}/samplevnf/VNFs/DPPD-PROX/build/app/prox ${BUILD_DIR}/prox
+       popd > /dev/null 2>&1
+}
+
+function prox_install()
+{
+       # Clone and compile PROX
+       pushd ${BUILD_DIR} > /dev/null 2>&1
+       git clone https://git.opnfv.org/samplevnf
+       pushd ${BUILD_DIR}/samplevnf/VNFs/DPPD-PROX > /dev/null 2>&1
+       bash -c "${PROX_CHECKOUT}"
+       popd > /dev/null 2>&1
+       prox_compile
+       popd > /dev/null 2>&1
+}
+
+function port_info_build()
+{
+       [ ! -d ${BUILD_DIR}/port_info ] && echo "Skipping port_info compilation..." && return
+
+       pushd ${BUILD_DIR}/port_info > /dev/null 2>&1
+       make
+       ${SUDO} cp ${BUILD_DIR}/port_info/build/app/port_info_app ${BUILD_DIR}/port_info_app
+       popd > /dev/null 2>&1
+}
+
+function create_minimal_install()
+{
+       ldd ${BUILD_DIR}/prox | awk '{ if ($(NF-1) != "=>") print $(NF-1) }' >> ${BUILD_DIR}/list_of_install_components
+
+       echo "${BUILD_DIR}/prox" >> ${BUILD_DIR}/list_of_install_components
+       echo "${BUILD_DIR}/port_info_app" >> ${BUILD_DIR}/list_of_install_components
+
+       tar -czvhf ${BUILD_DIR}/install_components.tgz -T ${BUILD_DIR}/list_of_install_components
+}
+
+function cleanup()
+{
+       ${SUDO} yum autoremove -y
+       ${SUDO} yum clean all
+       ${SUDO} rm -rf /var/cache/yum
+}
+
+function k8s_runtime_image()
+{
+       k8s_os_pkgs_runtime_install
+       k8s_os_cfg
+       cleanup
+
+       pushd / > /dev/null 2>&1
+       tar -xvf ${BUILD_DIR}/install_components.tgz --skip-old-files
+       popd > /dev/null 2>&1
+
+       ldconfig
+
+       #rm -rf ${BUILD_DIR}/install_components.tgz
+}
+
+function print_usage()
+{
+       echo "Usage: ${0} [OPTIONS] [COMMAND]"
+       echo "Options:"
+       echo "   -u, --update     Full OS update"
+       echo "   -k, --kubernetes Build for Kubernetes environment"
+       echo "Commands:"
+       echo "   deploy           Run through all deployment steps"
+       echo "   compile          PROX compile only"
+       echo "   runtime_image    Apply runtime configuration only"
+}
+
+COMMAND=""
+# Parse options and comman
+for opt in "$@"; do
+       case ${opt} in
+               -u|--update)
+               echo 'Full OS update will be done!'
+               OS_UPDATE="y"
+               ;;
+               -k|--kubernetes)
+               echo "Kubernetes environment is set!"
+               K8S_ENV="y"
+               ;;
+               compile)
+               COMMAND="compile"
+               ;;
+               runtime_image)
+               COMMAND="runtime_image"
+               ;;
+               deploy)
+               COMMAND="deploy"
+               ;;
+               *)
+               echo "Unknown option/command ${opt}"
+               print_usage
+               exit 1
+               ;;
+       esac
+done
+
+if [ "${COMMAND}" == "compile" ]; then
+       echo "PROX compile only..."
+       prox_compile
+elif [ "${COMMAND}" == "runtime_image" ]; then
+       echo "Runtime image intallation and configuration..."
+       k8s_runtime_image
+elif [ "${COMMAND}" == "deploy" ]; then
+       [ ! -d ${BUILD_DIR} ] && ${SUDO} mkdir -p ${BUILD_DIR}
+       ${SUDO} chmod 0777 ${BUILD_DIR}
+
+       os_pkgs_install
+
+       if [ "${K8S_ENV}" == "y" ]; then
+               k8s_os_cfg
+       else
+               os_cfg
+       fi
+
+       mblib_install
+       dpdk_install
+       prox_install
+  trex_install
+  collectd_install
+  stressng_install
+  fio_install
+  unixbench_install
+  ramspeed_install
+
+
+
+       if [ "${K8S_ENV}" == "y" ]; then
+               port_info_build
+               create_minimal_install
+       fi
+
+       cleanup
+else
+       print_usage
+fi
diff --git a/tools/md-testvnf/scripts/sshConfig.sh b/tools/md-testvnf/scripts/sshConfig.sh
new file mode 100644 (file)
index 0000000..b746cde
--- /dev/null
@@ -0,0 +1,10 @@
+#!/bin/bash -eux
+sudo mv temp /home/testvnf/authorized_keys
+sudo mkdir /home/testvnf/.ssh 
+sudo mv /home/testvnf/authorized_keys /home/testvnf/.ssh/
+sudo chmod 700 /home/testvnf/.ssh
+sudo chmod 600 /home/testvnf/.ssh/authorized_keys
+sudo chown testvnf /home/testvnf/.ssh
+sudo chown testvnf /home/testvnf/.ssh/authorized_keys
+# Add `sync` so Packer doesn't quit too early, before the large file is deleted.
+sync
\ No newline at end of file
diff --git a/tools/md-testvnf/testVNF_image.json b/tools/md-testvnf/testVNF_image.json
new file mode 100644 (file)
index 0000000..2b27a28
--- /dev/null
@@ -0,0 +1,72 @@
+{ 
+  "builders": [
+    {
+      "boot_command": [
+        "<tab> text biosdevname=0 net.ifnames=0 ",
+        "ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>"
+      ],
+      "accelerator": "kvm",
+      "boot_wait": "10s",
+      "disk_size": 2048,
+      "disk_interface": "virtio-scsi",
+      "http_directory": "http",
+      "iso_checksum": "101bc813d2af9ccf534d112cbe8670e6d900425b297d1a4d2529c5ad5f226372",
+      "iso_checksum_type": "sha256",
+      "iso_url": "http://centos.osuosl.org/7.8.2003/isos/x86_64/CentOS-7-x86_64-NetInstall-2003.iso",
+      "output_directory": "image",
+      "qemuargs": [ [ "-m", "1024M" ]],
+      "shutdown_command": "echo 'centos'|sudo -S /sbin/halt -h -p",
+      "ssh_password": "centos",
+      "ssh_port": 22,
+      "ssh_username": "centos",
+      "ssh_wait_timeout": "10000s",
+      "type": "qemu",
+      "vm_name": "packer-centos-7-x86_64-openstack",
+      "vnc_bind_address": "0.0.0.0",
+      "Headless": "true"
+    },
+    {
+      "name": "openstack",
+      "type": "openstack",
+        "image_name": "testvnf_image",
+        "identity_endpoint": "{{user `identiy_endpoint`}}",
+        "username": "{{user `username`}}",
+        "password": "{{user `password`}}",
+        "ssh_username": "centos",
+        "networks" : "{{user `networks`}}",
+        "source_image": "{{user `source_image`}}",
+        "flavor": "{{user `flavor`}}",
+        "domain_name": "{{user `domain_name`}}",
+        "ssh_timeout": "15m",
+        "use_floating_ip": "true",
+        "floating_ip_network" : "{{user `floating_ip_network`}}"
+       } 
+],
+  "provisioners": [
+    {
+      "type": "shell",
+      "execute_command": "echo testvnf | {{.Vars}} sudo -S -E bash '{{.Path}}'",
+      "script": "scripts/ansible.sh"
+    },
+    {
+      "type": "file",
+      "source": "scripts/deploycentostools.sh",
+      "destination": "deploycentostools.sh"
+    },
+    {
+      "type": "ansible-local",
+      "playbook_file": "playbook.yml"
+    },
+    {
+      "type": "file",
+      "source": "{{user `ssh_path`}}",
+      "destination": "temp"
+    },
+    {
+      "type": "shell",
+      "execute_command": "echo testvnf | {{.Vars}} sudo -S -E bash '{{.Path}}'",
+      "script": "scripts/sshConfig.sh"
+    }
+  ]
+}
+
similarity index 99%
rename from tools/pkt_gen/trex/trex.py
rename to tools/pkt_gen/trex/trex_client.py
index e2bc1e9..3d6836d 100644 (file)
@@ -26,7 +26,7 @@ import re
 from collections import OrderedDict
 # pylint: disable=unused-import
 import netaddr
-import zmq
+#import zmq
 from conf import settings
 from conf import merge_spec
 from core.results.results_constants import ResultsConstants
@@ -35,7 +35,7 @@ try:
     # pylint: disable=wrong-import-position, import-error
     sys.path.append(settings.getValue('PATHS')['trafficgen']['Trex']['src']['path'])
     from trex_stl_lib.api import *
-    from trex_stl_lib import trex_stl_exceptions
+    from trex_stl_lib import trex_stl_exceptions
 except ImportError:
     # VSPERF performs detection of T-Rex api during testcase initialization. So if
     # T-Rex is requsted and API is not available it will fail before this code
@@ -160,7 +160,7 @@ class Trex(ITrafficGenerator):
 
         try:
             self._stlclient = STLClient(username=self._trex_user, server=self._trex_host_ip_addr,
-                                        verbose_level=0)
+                                        verbose_level='info')
             self._stlclient.connect()
         except STLError:
             raise RuntimeError('T-Rex: Cannot connect to T-Rex server. Please check if it is '