From b8ad58fc06cef1af61a6dad31e71d4c15626f5f6 Mon Sep 17 00:00:00 2001 From: sharath Date: Thu, 23 Aug 2018 21:14:33 +0530 Subject: Fix: enhancing the build scripts Change-Id: Ibc52debf304335e8a69b4d3d5c5f6478d654ab88 Signed-off-by: sharath --- stacks/lwip_stack/vagrant/Vagrantfile | 6 +- stacks/lwip_stack/vagrant/build.sh | 237 ++------------------------ stacks/lwip_stack/vagrant/env.sh | 0 stacks/lwip_stack/vagrant/install_prereq.sh | 39 ----- stacks/lwip_stack/vagrant/start_nstackMain.sh | 118 +++++++++++++ 5 files changed, 136 insertions(+), 264 deletions(-) mode change 100644 => 100755 stacks/lwip_stack/vagrant/build.sh mode change 100644 => 100755 stacks/lwip_stack/vagrant/env.sh delete mode 100644 stacks/lwip_stack/vagrant/install_prereq.sh create mode 100755 stacks/lwip_stack/vagrant/start_nstackMain.sh (limited to 'stacks') diff --git a/stacks/lwip_stack/vagrant/Vagrantfile b/stacks/lwip_stack/vagrant/Vagrantfile index cd59dbf..b3a31c1 100644 --- a/stacks/lwip_stack/vagrant/Vagrantfile +++ b/stacks/lwip_stack/vagrant/Vagrantfile @@ -14,12 +14,14 @@ Vagrant.configure(2) do |config| # Create DMM client and server VM's config.vm.define "dmm-stackx-server" do |server| - server.vm.provision :shell, :path => File.join(File.dirname(__FILE__),"install_prereq.sh") + server.vm.provision :shell, :path => File.join(File.dirname(__FILE__),"../../../scripts/install_prereq.sh") server.vm.provision :shell, :path => File.join(File.dirname(__FILE__),"build.sh"), :args => "/DMM vagrant" + server.vm.provision :shell, :path => File.join(File.dirname(__FILE__),"start_nstackMain.sh"), :args => "/DMM vagrant" end config.vm.define "dmm-stackx-client" do |client| - client.vm.provision :shell, :path => File.join(File.dirname(__FILE__),"install_prereq.sh") + client.vm.provision :shell, :path => File.join(File.dirname(__FILE__),"../../../scripts/install_prereq.sh") client.vm.provision :shell, :path => File.join(File.dirname(__FILE__),"build.sh"), :args => "/DMM vagrant" + client.vm.provision :shell, :path => File.join(File.dirname(__FILE__),"start_nstackMain.sh"), :args => "/DMM vagrant" end diff --git a/stacks/lwip_stack/vagrant/build.sh b/stacks/lwip_stack/vagrant/build.sh old mode 100644 new mode 100755 index 8b1cb37..a934eef --- a/stacks/lwip_stack/vagrant/build.sh +++ b/stacks/lwip_stack/vagrant/build.sh @@ -21,16 +21,17 @@ log_file="/tmp/build_log.txt-$TIMESTAMP" exec 1> >(tee -a "$log_file") 2>&1 # Get Command Line arguements if present -TEMP_DIR=$1 -if [ "x$1" != "x" ]; then +if [ "$1" == "from-base-build" ]; then + WAS_DMM_BUILT="YES" +fi + +if [ "x$1" != "x" ] && [ "$1" != "from-base-build" ]; then TEMP_DIR=$1 - DMM_BUILD_DIR=${TEMP_DIR}/build - DPDK_BUILD_SCRIPT_DIR=${DMM_BUILD_DIR}/../scripts + DMM_BUILD_SCRIPT_DIR=${TEMP_DIR}/scripts LWIP_BUILD_DIR=${TEMP_DIR}/stacks/lwip_stack/build/ else TEMP_DIR=`dirname $(readlink -f $0)`/.. - DMM_BUILD_DIR=${TEMP_DIR}/../../build - DPDK_BUILD_SCRIPT_DIR=${DMM_BUILD_DIR}/../scripts + DMM_BUILD_SCRIPT_DIR=${TEMP_DIR}/../../scripts LWIP_BUILD_DIR=${TEMP_DIR}/build/ fi @@ -38,231 +39,21 @@ echo 0:$0 echo 1:$1 echo 2:$2 echo TEMP_DIR: $TEMP_DIR -echo DMM_BUILD_DIR: $DMM_BUILD_DIR -echo DPDK_BUILD_SCRIPT_DIR: $DPDK_BUILD_SCRIPT_DIR +echo DMM_BUILD_SCRIPT_DIR: $DMM_BUILD_SCRIPT_DIR echo LWIP_BUILD_DIR: $LWIP_BUILD_DIR -OS_ID=$(grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g') -OS_VERSION_ID=$(grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g') -KERNEL_OS=`uname -o` -KERNEL_MACHINE=`uname -m` -KERNEL_RELEASE=`uname -r` -KERNEL_VERSION=`uname -v` - -echo KERNEL_OS: $KERNEL_OS -echo KERNEL_MACHINE: $KERNEL_MACHINE -echo KERNEL_RELEASE: $KERNEL_RELEASE -echo KERNEL_VERSION: $KERNEL_VERSION -echo OS_ID: $OS_ID -echo OS_VERSION_ID: $OS_ID - -#DPDK download path -DPDK_DOWNLOAD_PATH=/tmp/dpdk - -#dpdk installation path -DPDK_INSTALL_PATH=/usr - -#set and check the environment for Linux -if [ "$OS_ID" == "ubuntu" ]; then - export DEBIAN_FRONTEND=noninteractive - export DEBCONF_NONINTERACTIVE_SEEN=true - - APT_OPTS="--assume-yes --no-install-suggests --no-install-recommends -o Dpkg::Options::=\"--force-confdef\" -o Dpkg::Options::=\"--force-confold\"" - sudo apt-get update ${APT_OPTS} - sudo DEBIAN_FRONTEND=noninteractive apt-get install -yq git cmake gcc g++ automake libtool wget lsof lshw pciutils net-tools tcpdump libpcre3 libpcre3-dev zlibc zlib1g zlib1g-dev vim ethtool unzip -elif [ "$OS_ID" == "debian" ]; then - echo "not tested for debian and exit" - exit 1 - export DEBIAN_FRONTEND=noninteractive - export DEBCONF_NONINTERACTIVE_SEEN=true - - APT_OPTS="--assume-yes --no-install-suggests --no-install-recommends -o Dpkg::Options::=\"--force-confdef\" -o Dpkg::Options::=\"--force-confold\"" - sudo apt-get update ${APT_OPTS} - sudo DEBIAN_FRONTEND=noninteractive apt-get install -yq git cmake gcc g++ automake libtool wget lsof lshw pciutils net-tools tcpdump libpcre3 libpcre3-dev zlibc zlib1g zlib1g-dev vim -elif [ "$OS_ID" == "centos" ]; then - sudo yum install -y git cmake gcc g++ automake libtool wget lsof lshw pciutils net-tools tcpdump vim sudo yum-utils pcre-devel zlib-devel -elif [ "$OS_ID" == "opensuse" ]; then - echo "not tested for opensuse and exit" - exit 1 - sudo yum install -y git cmake gcc g++ automake libtool wget lsof lshw pciutils net-tools tcpdump vim sudo yum-utils pcre-devel zlib-devel -fi - -#DPDK will be having dependancy on linux headers -if [ "$OS_ID" == "ubuntu" ]; then - sudo apt-get -y install git build-essential linux-headers-`uname -r` - sudo apt-get -y install libnuma-dev -elif [ "$OS_ID" == "debian" ]; then - sudo apt-get -y install git build-essential linux-headers-`uname -r` -elif [ "$OS_ID" == "centos" ]; then - sudo yum groupinstall -y "Development Tools" - sudo yum install -y kernel-headers - sudo yum install -y numactl-devel -elif [ "$OS_ID" == "opensuse" ]; then - sudo yum groupinstall -y "Development Tools" - sudo yum install -y kernel-headers +if [ 'x$WAS_DMM_BUILT' != "xYES" ]; then + bash -x $DMM_BUILD_SCRIPT_DIR/build.sh fi -#===========build DPDK================ - -if [ ! -d /usr/include/dpdk ] || [ ! -d /usr/share/dpdk ] || [ ! -d /usr/lib/modules/4.4.0-31-generic/extra/dpdk ]; then - mkdir -p $DPDK_DOWNLOAD_PATH - - cd $DPDK_DOWNLOAD_PATH - wget -N https://fast.dpdk.org/rel/dpdk-18.02.tar.xz --no-check-certificate - tar xvf dpdk-18.02.tar.xz - cd dpdk-18.02/ - - sed -i 's!CONFIG_RTE_EXEC_ENV=.*!CONFIG_RTE_EXEC_ENV=y!1' config/common_base - sed -i 's!CONFIG_RTE_BUILD_SHARED_LIB=.*!CONFIG_RTE_BUILD_SHARED_LIB=y!1' config/common_base - sed -i 's!CONFIG_RTE_LIBRTE_EAL=.*!CONFIG_RTE_LIBRTE_EAL=y!1' config/common_base - sed -i 's!CONFIG_RTE_EAL_PMD_PATH=.*!CONFIG_RTE_EAL_PMD_PATH="/tmp/dpdk/drivers/"!1' config/common_base - - sudo make install T=x86_64-native-linuxapp-gcc DESTDIR=${DPDK_INSTALL_PATH} -j 4 - - mkdir -p /tmp/dpdk/drivers/ - cp -f /usr/lib/librte_mempool_ring.so /tmp/dpdk/drivers/ -fi -#===========build DMM================= -echo "DMM build started....." - -cd $DMM_BUILD_DIR -ldconfig -rm -rf * -cmake .. -make -j 8 -if [ $? -eq 0 ]; then - echo "DMM build is SUCCESS" -else - echo "DMM build has FAILED" - exit 1 -fi -echo "DMM build finished....." - -#===========build Stackpool=========== -echo "Stackpool build started....." +#===========build LWIP=========== +echo "LWIP build started....." cd $LWIP_BUILD_DIR cmake .. make -j 8 if [ $? -eq 0 ]; then - echo "Stackpool build is SUCCESS" + echo "LWIP build is SUCCESS" else - echo "Stackpool build has FAILED" - exit 1 -fi -echo "Stackpool build finished....." - -#===========check running env ================= -hugepagesize=$(cat /proc/meminfo | grep Hugepagesize | awk -F " " {'print$2'}) -if [ "$hugepagesize" == "2048" ]; then - pages=1536 -elif [ "$hugepagesize" == "1048576" ]; then - pages=3 -fi -sudo sysctl -w vm.nr_hugepages=$pages -HUGEPAGES=`sysctl -n vm.nr_hugepages` -if [ $HUGEPAGES != $pages ]; then - echo "ERROR: Unable to get $pages hugepages, only got $HUGEPAGES. Cannot finish." - exit -fi - - -hugepageTotal=$(cat /proc/meminfo | grep -c "HugePages_Total: 0") -if [ $hugepageTotal -ne 0 ]; then - echo "HugePages_Total is zero" - exit -fi - -hugepageFree=$(cat /proc/meminfo | grep -c "HugePages_Free: 0") -if [ $hugepageFree -ne 0 ]; then - echo "HugePages_Free is zero" - exit -fi - -hugepageSize=$(cat /proc/meminfo | grep -c "Hugepagesize: 0 kB") -if [ $hugepageSize -ne 0 ]; then - echo "Hugepagesize is zero" - exit -fi - - -sudo mkdir /mnt/nstackhuge -p -if [ "$hugepagesize" == "2048" ]; then -sudo mount -t hugetlbfs -o pagesize=2M none /mnt/nstackhuge/ -elif [ "$hugepagesize" == "1048576" ]; then - sudo mount -t hugetlbfs -o pagesize=1G none /mnt/nstackhuge/ -fi -sudo mkdir -p /var/run/ip_module/ -sudo mkdir -p /var/log/nStack/ip_module/ - -export LD_LIBRARY_PATH=$LIB_PATH -export NSTACK_LOG_ON=DBG - - - -#===========set environment=========== -if [ "$OS_ID" == "centos" ]; then - ifaddress1=$(ifconfig enp0s8 | grep 'inet' | cut -d: -f2 | awk '{print $2}') - echo $ifaddress1 - ifaddresscut=$(ifconfig enp0s8 | grep 'inet' | head -n 1 | awk -F " " '{print $2}' | awk -F "." '{print $1"."$2"."$3}') - echo $ifaddresscut - ifmac=$(ifconfig enp0s8 | grep 'ether' | awk -F " " '{print $2}') - echo $ifmac -elif [ "$OS_ID" == "ubuntu" ]; then - ifaddress1=$(ifconfig enp0s8 | grep 'inet' | head -n 1 | cut -d: -f2 | awk '{print $1}') - echo $ifaddress1 - ifaddresscut=$(ifconfig enp0s8 | grep 'inet' | head -n 1 | cut -d: -f2 | awk '{print $1}' | awk -F "." '{print $1"."$2"."$3}') - echo $ifaddresscut - ifmac=$(ifconfig enp0s8 | grep 'HWaddr' | awk -F " " '{print $5}') - echo $ifmac -fi - -cd $LWIP_BUILD_DIR/../ -bash ./release_tar.sh -cd nStackServer/script -sed -i 's!/root/dpdk/dpdk-18.02!'$DPDK_DOWNLOAD_PATH'/dpdk-18.02!1' nstack_var.sh - -cd ../ -cp ./configure/*.json bin/ -cd bin - -if [ "$OS_ID" == "centos" ]; then - sed -i 's!eth7!enp0s8!1' ip_data.json -elif [ "$OS_ID" == "ubuntu" ]; then - sed -i 's!eth7!enp0s8!1' ip_data.json -fi - -sed -i 's!00:54:32:19:3d:19!'$ifmac'!1' ip_data.json -sed -i 's!192.168.1.207!'$ifaddress1'!1' ip_data.json - -sed -i 's!192.168.1.1!'$ifaddresscut'.0!1' network_data_tonStack.json -sed -i 's!192.168.1.254!'$ifaddresscut'.1!1' network_data_tonStack.json -sed -i 's!192.168.1.098!'$ifaddresscut'.5!1' network_data_tonStack.json -sed -i 's!192.168.1.209!'$ifaddresscut'.254!1' network_data_tonStack.json -sed -i 's!192.168.1.0!'$ifaddresscut'.0!1' network_data_tonStack.json -sed -i 's!192.168.1.254!'$ifaddresscut'.1!1' network_data_tonStack.json - -if [ "$OS_ID" == "centos" ]; then - sed -i 's!eth7!enp0s8!1' network_data_tonStack.json -elif [ "$OS_ID" == "ubuntu" ]; then - sed -i 's!eth7!enp0s8!1' network_data_tonStack.json -fi -sed -i 's!eth7!enp0s8!1' network_data_tonStack.json - -cd $DMM_BUILD_DIR/../release/bin -cp -r . ../../stacks/lwip_stack/app_test -cd $DMM_BUILD_DIR/../stacks/lwip_stack/app_test -cp -r ../app_conf/*.json . - -sed -i 's!192.168.1.1!'$ifaddresscut'.0!1' rd_config.json - -cd $LWIP_BUILD_DIR/../nStackServer -bash -x ./stop_nstack.sh -bash -x ./start_nstack.sh -check_result=$(pgrep nStackMain) -if [ -z "$check_result" ]; then - echo "nStackMain execute failed" + echo "LWIP build has FAILED" exit 1 -else - echo "nStackMain execute successful" - exit 0 fi diff --git a/stacks/lwip_stack/vagrant/env.sh b/stacks/lwip_stack/vagrant/env.sh old mode 100644 new mode 100755 diff --git a/stacks/lwip_stack/vagrant/install_prereq.sh b/stacks/lwip_stack/vagrant/install_prereq.sh deleted file mode 100644 index ae8d442..0000000 --- a/stacks/lwip_stack/vagrant/install_prereq.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash -x -log_file="/DMM/thirdpary/stackpool/vagrant/pre_install_log.txt-`date +'%Y-%m-%d_%H-%M-%S'`" -exec 1> >(tee -a "$log_file") 2>&1 - -if [ "$(uname)" <> "Darwin" ]; then - OS_ID=$(grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g') - OS_VERSION_ID=$(grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g') -fi - -if [ "$OS_ID" == "ubuntu" ]; then - # Standard update + upgrade dance - cat << EOF >> /etc/apt/sources.list - deb http://in.archive.ubuntu.com/ubuntu/ trusty main restricted - deb-src http://in.archive.ubuntu.com/ubuntu/ trusty main restricted - deb http://in.archive.ubuntu.com/ubuntu/ trusty-updates main restricted - deb-src http://in.archive.ubuntu.com/ubuntu/ trusty-updates main restricted - deb http://in.archive.ubuntu.com/ubuntu/ trusty universe - deb-src http://in.archive.ubuntu.com/ubuntu/ trusty universe - deb http://in.archive.ubuntu.com/ubuntu/ trusty-updates universe - deb-src http://in.archive.ubuntu.com/ubuntu/ trusty-updates universe - deb http://in.archive.ubuntu.com/ubuntu/ trusty multiverse - deb-src http://in.archive.ubuntu.com/ubuntu/ trusty multiverse - deb http://in.archive.ubuntu.com/ubuntu/ trusty-updates multiverse - deb-src http://in.archive.ubuntu.com/ubuntu/ trusty-updates multiverse - deb http://in.archive.ubuntu.com/ubuntu/ trusty-backports main restricted universe multiverse - deb-src http://in.archive.ubuntu.com/ubuntu/ trusty-backports main restricted universe multiverse - deb http://security.ubuntu.com/ubuntu trusty-security main restricted - deb-src http://security.ubuntu.com/ubuntu trusty-security main restricted - deb http://security.ubuntu.com/ubuntu trusty-security universe - deb-src http://security.ubuntu.com/ubuntu trusty-security universe - deb http://security.ubuntu.com/ubuntu trusty-security multiverse - deb-src http://security.ubuntu.com/ubuntu trusty-security multiverse - deb http://extras.ubuntu.com/ubuntu trusty main - deb-src http://extras.ubuntu.com/ubuntu trusty main -EOF -elif [ "$OS_ID" == "centos" ]; then - - echo centos -fi diff --git a/stacks/lwip_stack/vagrant/start_nstackMain.sh b/stacks/lwip_stack/vagrant/start_nstackMain.sh new file mode 100755 index 0000000..72d1375 --- /dev/null +++ b/stacks/lwip_stack/vagrant/start_nstackMain.sh @@ -0,0 +1,118 @@ +######################################################################### +# Copyright (c) 2018 Huawei Technologies Co.,Ltd. +# 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. +######################################################################### +#!/bin/bash -x + +set -x + +DPDK_DOWNLOAD_PATH=/tmp/dpdk +ifname=enp0s8 + +if [ "x$1" != "x" ] && [ "$1" != "from-base-build" ]; then + TEMP_DIR=$1 + DMM_BUILD_SCRIPT_DIR=${TEMP_DIR}/scripts + LWIP_BUILD_DIR=${TEMP_DIR}/stacks/lwip_stack/build/ +else + TEMP_DIR=`dirname $(readlink -f $0)`/.. + DMM_BUILD_SCRIPT_DIR=${TEMP_DIR}/../../scripts + LWIP_BUILD_DIR=${TEMP_DIR}/build/ +fi + +LIB_PATH=$LWIP_BUILD_DIR/../release/lib64/ + +echo 0:$0 +echo 1:$1 +echo 2:$2 +echo TEMP_DIR: $TEMP_DIR +echo DMM_BUILD_SCRIPT_DIR: $DMM_BUILD_SCRIPT_DIR +echo LWIP_BUILD_DIR: $LWIP_BUILD_DIR +echo LIB_PATH: $LIB_PATH + +#===========check hugepages================= +source $DMM_BUILD_SCRIPT_DIR/check_hugepage.sh + +OS_ID=$(grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g') +if [ "$OS_ID" == "centos" ]; then + ifaddress1=$(ifconfig $ifname | grep 'inet' | cut -d: -f2 | awk '{print $2}') + echo $ifaddress1 + ifaddresscut=$(ifconfig $ifname | grep 'inet' | head -n 1 | awk -F " " '{print $2}' | awk -F "." '{print $1"."$2"."$3}') + echo $ifaddresscut + ifmac=$(ifconfig $ifname | grep 'ether' | awk -F " " '{print $2}') + echo $ifmac +elif [ "$OS_ID" == "ubuntu" ]; then + ifaddress1=$(ifconfig $ifname | grep 'inet' | head -n 1 | cut -d: -f2 | awk '{print $1}') + echo $ifaddress1 + ifaddresscut=$(ifconfig $ifname | grep 'inet' | head -n 1 | cut -d: -f2 | awk '{print $1}' | awk -F "." '{print $1"."$2"."$3}') + echo $ifaddresscut + ifmac=$(ifconfig $ifname | grep 'HWaddr' | awk -F " " '{print $5}') + echo $ifmac +fi + +cd $LWIP_BUILD_DIR/../ +bash ./release_tar.sh +cd nStackServer/script +sed -i 's!/root/dpdk/dpdk-18.02!'$DPDK_DOWNLOAD_PATH'/dpdk-18.02!1' nstack_var.sh + +cd ../ +chmod 775 * +cp ./configure/*.json bin/ +cd bin + +if [ "$OS_ID" == "centos" ]; then + sed -i 's!eth7!'$ifname'!1' ip_data.json +elif [ "$OS_ID" == "ubuntu" ]; then + sed -i 's!eth7!'$ifname'!1' ip_data.json +fi + +sed -i 's!00:54:32:19:3d:19!'$ifmac'!1' ip_data.json +sed -i 's!192.168.1.207!'$ifaddress1'!1' ip_data.json + +sed -i 's!192.168.1.1!'$ifaddresscut'.0!1' network_data_tonStack.json +sed -i 's!192.168.1.254!'$ifaddresscut'.1!1' network_data_tonStack.json +sed -i 's!192.168.1.098!'$ifaddresscut'.5!1' network_data_tonStack.json +sed -i 's!192.168.1.209!'$ifaddresscut'.254!1' network_data_tonStack.json +sed -i 's!192.168.1.0!'$ifaddresscut'.0!1' network_data_tonStack.json +sed -i 's!192.168.1.254!'$ifaddresscut'.1!1' network_data_tonStack.json + +if [ "$OS_ID" == "centos" ]; then + sed -i 's!eth7!'$ifname'!1' network_data_tonStack.json +elif [ "$OS_ID" == "ubuntu" ]; then + sed -i 's!eth7!'$ifname'!1' network_data_tonStack.json +fi +sed -i 's!eth7!'$ifname'!1' network_data_tonStack.json + +cd $DMM_BUILD_SCRIPT_DIR/../release/bin +cp -r . ../../stacks/lwip_stack/app_test +cd $DMM_BUILD_SCRIPT_DIR/../stacks/lwip_stack/app_test +cp -r ../app_conf/*.json . + +sed -i 's!192.168.1.1!'$ifaddresscut'.0!1' rd_config.json + +sudo mkdir -p /var/run/ip_module/ +sudo mkdir -p /var/log/nStack/ip_module/ + +export LD_LIBRARY_PATH=$LIB_PATH +export NSTACK_LOG_ON=DBG + +cd $LWIP_BUILD_DIR/../nStackServer +bash -x ./stop_nstack.sh +bash -x ./start_nstack.sh +check_result=$(pgrep nStackMain) +if [ -z "$check_result" ]; then + echo "nStackMain execute failed" + exit 1 +else + echo "nStackMain execute successful" + exit 0 +fi -- cgit 1.2.3-korg