X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=VNFs%2FDPPD-PROX%2Fhelper-scripts%2Frapid%2Fdeploycentostools.sh;h=e5199257299227d827188c56392a7e60a51c3af5;hb=849357bb9ca1d27993c9e96b93156ec69b3ac3a9;hp=2f2e6fe0daec1858bb96b1ffe0616ccae7cb8adb;hpb=9d4e94ed8cbd2110cab0388181bad3223a1155ce;p=samplevnf.git

diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh b/VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh
index 2f2e6fe0..e5199257 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 ##
-## Copyright (c) 2010-2019 Intel Corporation
+## 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.
@@ -17,16 +17,13 @@
 
 # Directory for package build
 BUILD_DIR="/opt/rapid"
-# Directory where the packer tool has copied some files (e.g. check_prox_system_setup.sh)
-# Runtime scripts are assuming ${WORK_DIR} as the directory for PROX. Check the rundir variable in runrapid.py. Should be the same!
-# This variable is defined in 4 different places and should have the same value: centos.json, deploycentostools.sh, check_prox_system_setup.sh and runrapid.py
-WORK_DIR="/home/centos"
-DPDK_VERSION="19.05"
-PROX_COMMIT="b71a4cfd"
+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
-##PROX_CHECKOUT="git fetch \"https://gerrit.opnfv.org/gerrit/samplevnf\" refs/changes/75/69475/2 && git checkout FETCH_HEAD"
+## 	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"
@@ -45,13 +42,16 @@ 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
+	#${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 nasm wireshark \
-			 make
+			 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()
@@ -68,6 +68,9 @@ 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
@@ -80,29 +83,16 @@ function os_cfg()
 	# 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" | ${SUDO} tee -a /etc/tuned/realtime-virtual-guest-variables.conf
+	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 ${WORK_DIR}/check_prox_system_setup.sh
-	${SUDO} cp -r ${WORK_DIR}/check_prox_system_setup.sh /usr/local/libexec/
-	${SUDO} cp -r ${WORK_DIR}/check-prox-system-setup.service /etc/systemd/system/
+	${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
-    # Following lines are added to fix the following issue: When the VM gets
-    # instantiated, the rapid scripts will try to ssh into the VM to start
-    # the testing. Once the script connects with ssh, it starts downloading
-    # config files and then start prox, etc... The problem is that when the VM
-    # boots, check_prox_system_setup.sh will check for some things and
-    # potentially reboot, resulting in loosing the ssh connection again.
-    # To fix this issue, the following lines are disabling ssh access for the 
-    # centos user. The script will not be able to connect to the VM till ssh
-    # access is restored after a reboot. Restoring ssh is now done by
-    # check-prox-system-setup.service
-	printf "\nMatch User centos\n" | ${SUDO} tee -a /etc/ssh/sshd_config
-	printf "%sPubkeyAuthentication no\n" "    " | ${SUDO} tee -a /etc/ssh/sshd_config
-	printf "%sPasswordAuthentication no\n" "    " | ${SUDO} tee -a /etc/ssh/sshd_config
 	popd > /dev/null 2>&1
 }
 
@@ -151,15 +141,13 @@ function dpdk_install()
 	tar -xf ./dpdk-${DPDK_VERSION}.tar.xz
 	popd > /dev/null 2>&1
 
-	${SUDO} ln -s ${RTE_SDK} ${WORK_DIR}/dpdk
+	${SUDO} ln -s ${RTE_SDK} ${BUILD_DIR}/dpdk
 
 	pushd ${RTE_SDK} > /dev/null 2>&1
 	make config T=${RTE_TARGET}
-	# The next sed lines make sure that we can compile DPDK 17.11 with a relatively new OS. Using a newer DPDK (18.5) should also resolve this issue
-	#${SUDO} sed -i '/CONFIG_RTE_LIBRTE_KNI=y/c\CONFIG_RTE_LIBRTE_KNI=n' ${RTE_SDK}/build/.config
-	#${SUDO} sed -i '/CONFIG_RTE_LIBRTE_PMD_KNI=y/c\CONFIG_RTE_LIBRTE_PMD_KNI=n' ${RTE_SDK}/build/.config
-	#${SUDO} sed -i '/CONFIG_RTE_KNI_KMOD=y/c\CONFIG_RTE_KNI_KMOD=n' ${RTE_SDK}/build/.config
-	#${SUDO} sed -i '/CONFIG_RTE_KNI_PREEMPT_DEFAULT=y/c\CONFIG_RTE_KNI_PREEMPT_DEFAULT=n' ${RTE_SDK}/build/.config
+	# 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
@@ -177,23 +165,26 @@ function dpdk_install()
 
 function prox_compile()
 {
-	# Compile PROX
-	pushd ${BUILD_DIR}/samplevnf/VNFs/DPPD-PROX
-	make -j`getconf _NPROCESSORS_ONLN`
-	popd > /dev/null 2>&1
+    # 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
-	${PROX_CHECKOUT}
-	popd > /dev/null 2>&1
-	prox_compile
-	${SUDO} cp ${BUILD_DIR}/samplevnf/VNFs/DPPD-PROX/build/app/prox ${WORK_DIR}/prox
-	popd > /dev/null 2>&1
+    # Clone PROX
+    pushd ${BUILD_DIR} > /dev/null 2>&1
+    git clone https://git.opnfv.org/samplevnf
+    bash -c "${PROX_CHECKOUT}"
+    echo "${PROX_CHECKOUT}" > ${BUILD_DIR}/commit_id
+    cp -R ./samplevnf/VNFs/DPPD-PROX/helper-scripts/rapid ./src
+    popd > /dev/null 2>&1
+    prox_compile
+
+    # Clean build folder
+    rm -rf ${BUILD_DIR}/samplevnf
 }
 
 function port_info_build()
@@ -202,16 +193,17 @@ function port_info_build()
 
 	pushd ${BUILD_DIR}/port_info > /dev/null 2>&1
 	make
-	${SUDO} cp ${BUILD_DIR}/port_info/build/app/port_info ${WORK_DIR}/port_info
+	${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 ${WORK_DIR}/prox | awk '{ if ($(NF-1) != "=>") print $(NF-1) }' >> ${BUILD_DIR}/list_of_install_components
+	ldd ${BUILD_DIR}/prox | awk '{ if ($(NF-1) != "=>") print $(NF-1) }' >> ${BUILD_DIR}/list_of_install_components
 
-	echo "${WORK_DIR}/prox" >> ${BUILD_DIR}/list_of_install_components
-	echo "${WORK_DIR}/port_info" >> ${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
+	echo "${BUILD_DIR}/commit_id" >> ${BUILD_DIR}/list_of_install_components
 
 	tar -czvhf ${BUILD_DIR}/install_components.tgz -T ${BUILD_DIR}/list_of_install_components
 }
@@ -235,7 +227,7 @@ function k8s_runtime_image()
 
 	ldconfig
 
-	#rm -rf ${BUILD_DIR}/install_components.tgz
+	rm -rf ${BUILD_DIR}/install_components.tgz
 }
 
 function print_usage()