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

diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh b/VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh
index 8d85e345..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.
@@ -15,63 +15,105 @@
 ## limitations under the License.
 ##
 
+# Directory for package build
 BUILD_DIR="/opt/rapid"
-WORK_DIR="/home/centos" # 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, deploycentos.sh, check_prox_system_setup.sh and runrapid.py
-DPDK_VERSION="19.05"
-PROX_COMMIT="f456ab65"
-##PROX_CHECKOUT="git checkout ${PROX_COMMIT}"
+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"
 
+# 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
+	${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
 
-	sudo yum update -y
-	sudo yum install -y git wget gcc unzip libpcap-devel ncurses-devel \
+	[ "${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
+			 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 "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
+	${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" | sudo tee -a /etc/tuned/realtime-virtual-guest-variables.conf
-	sudo tuned-adm profile realtime-virtual-guest
+	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 systemctl daemon-reload
-	sudo systemctl enable check-prox-system-setup.service
-
+	${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}"
@@ -82,7 +124,7 @@ function mblib_install()
 	unzip v${MULTI_BUFFER_LIB_VER}.zip
 	pushd ${AESNI_MULTI_BUFFER_LIB_PATH}
 	make -j`getconf _NPROCESSORS_ONLN`
-	sudo make install
+	${SUDO} make install
 	popd > /dev/null 2>&1
 	popd > /dev/null 2>&1
 }
@@ -99,15 +141,21 @@ 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
+		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`
@@ -117,35 +165,140 @@ 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
-	#git checkout ${PROX_COMMIT}
-	${PROX_CHECKOUT}
+    # 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()
+{
+	[ ! -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
-	prox_compile
-	sudo ln -s ${BUILD_DIR}/samplevnf/VNFs/DPPD-PROX ${WORK_DIR}/prox
+}
+
+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
+	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
+}
+
+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"
 }
 
-if [ "$1" == "compile" ]; then
+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
-else
-	[ ! -d ${BUILD_DIR} ] && sudo mkdir -p ${BUILD_DIR}
-	sudo chmod 0777 ${BUILD_DIR}
+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
-	os_cfg
+
+	if [ "${K8S_ENV}" == "y" ]; then
+		k8s_os_cfg
+	else
+		os_cfg
+	fi
+
 	mblib_install
 	dpdk_install
 	prox_install
+
+	if [ "${K8S_ENV}" == "y" ]; then
+		port_info_build
+		create_minimal_install
+	fi
+
+	cleanup
+else
+	print_usage
 fi