diff options
Diffstat (limited to 'nfvbenchvm/dib/elements')
20 files changed, 540 insertions, 24 deletions
diff --git a/nfvbenchvm/dib/elements/nfvbenchvm/finalise.d/51-add-cpu-isolation b/nfvbenchvm/dib/elements/nfvbenchvm/finalise.d/51-add-cpu-isolation index f81485d..12ffcdc 100755 --- a/nfvbenchvm/dib/elements/nfvbenchvm/finalise.d/51-add-cpu-isolation +++ b/nfvbenchvm/dib/elements/nfvbenchvm/finalise.d/51-add-cpu-isolation @@ -1,4 +1,5 @@ #!/bin/bash -grubby --update-kernel=ALL --args="isolcpus=1 rcu_nocbs=1 nohz=on nohz_full=1 nmi_watchdog=0" -grubby --update-kernel=ALL --args="default_hugepagesz=1G hugepagesz=1G hugepages=2" +grubby --update-kernel=ALL --args="isolcpus=1-7 rcu_nocbs=1 nohz=on nohz_full=1 nmi_watchdog=0" +grubby --update-kernel=ALL --args="default_hugepagesz=1G hugepagesz=1G hugepages=4" +grubby --update-kernel=ALL --args="intel_iommu=on iommu=pt" diff --git a/nfvbenchvm/dib/elements/nfvbenchvm/package-installs.yaml b/nfvbenchvm/dib/elements/nfvbenchvm/package-installs.yaml index a5868fa..60efec1 100644 --- a/nfvbenchvm/dib/elements/nfvbenchvm/package-installs.yaml +++ b/nfvbenchvm/dib/elements/nfvbenchvm/package-installs.yaml @@ -4,7 +4,6 @@ tuna: wget: screen: telnet: -python-devel: libyaml-devel: numactl-libs: numactl-devel: @@ -14,4 +13,8 @@ vpp-config: kernel-firmware: kernel-headers: kernel-devel: -openssh-server:
\ No newline at end of file +openssh-server: +dpdk-tools: +git: +python3-dev: +libpython3.6-dev:
\ No newline at end of file diff --git a/nfvbenchvm/dib/elements/nfvbenchvm/post-install.d/02-testpmd-script b/nfvbenchvm/dib/elements/nfvbenchvm/post-install.d/02-testpmd-script index 6f133d1..f18ed60 100755 --- a/nfvbenchvm/dib/elements/nfvbenchvm/post-install.d/02-testpmd-script +++ b/nfvbenchvm/dib/elements/nfvbenchvm/post-install.d/02-testpmd-script @@ -1,5 +1,9 @@ #!/bin/bash +if [ $DIB_DEV_IMAGE != "loopvm" ]; then + exit 0 +fi + DPDK=dpdk-18.02 DPDK_UNTAR=dpdk-18.02 @@ -15,8 +19,6 @@ export RTE_KERNELDIR=/lib/modules/$kernel_version/build export ARCH=x86 make -j4 install T=x86_64-native-linuxapp-gcc -cp usertools/dpdk-devbind.py ../dpdk -# cp tools/dpdk_nic_bind.py ../dpdk/dpdk-devbind.py cp x86_64-native-linuxapp-gcc/app/testpmd ../dpdk cp x86_64-native-linuxapp-gcc/kmod/igb_uio.ko ../dpdk echo "set promisc all off" > /dpdk/testpmd_cmd.txt diff --git a/nfvbenchvm/dib/elements/nfvbenchvm/post-install.d/03-add-execute-attribute b/nfvbenchvm/dib/elements/nfvbenchvm/post-install.d/03-add-execute-attribute deleted file mode 100755 index a13ab95..0000000 --- a/nfvbenchvm/dib/elements/nfvbenchvm/post-install.d/03-add-execute-attribute +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -chmod +x /etc/rc.d/rc.local -chmod +x /etc/sysconfig/network-scripts/ifcfg-eth0 diff --git a/nfvbenchvm/dib/elements/nfvbenchvm/post-install.d/03-copy-rc-local b/nfvbenchvm/dib/elements/nfvbenchvm/post-install.d/03-copy-rc-local new file mode 100644 index 0000000..3311530 --- /dev/null +++ b/nfvbenchvm/dib/elements/nfvbenchvm/post-install.d/03-copy-rc-local @@ -0,0 +1,8 @@ +#!/bin/bash + +# set accurate rc.local file corresponding to current image built +if [ $DIB_DEV_IMAGE = "loopvm" ]; then + mv /etc/rc.d/rc.local.loopvm /etc/rc.d/rc.local +else + mv /etc/rc.d/rc.local.generator /etc/rc.d/rc.local +fi
\ No newline at end of file diff --git a/nfvbenchvm/dib/elements/nfvbenchvm/post-install.d/04-add-execute-attribute b/nfvbenchvm/dib/elements/nfvbenchvm/post-install.d/04-add-execute-attribute new file mode 100644 index 0000000..666d9dc --- /dev/null +++ b/nfvbenchvm/dib/elements/nfvbenchvm/post-install.d/04-add-execute-attribute @@ -0,0 +1,7 @@ +#!/bin/bash + +chmod +x /etc/rc.d/rc.local +chmod +x /etc/sysconfig/network-scripts/ifcfg-eth0 +chmod +x /etc/profile.d/nfvbench.sh +chmod +x /nfvbench/configure-nfvbench.sh +chmod +x /nfvbench/start-nfvbench.sh diff --git a/nfvbenchvm/dib/elements/nfvbenchvm/post-install.d/50-pip-package b/nfvbenchvm/dib/elements/nfvbenchvm/post-install.d/50-pip-package index 2d74ff5..9707841 100755 --- a/nfvbenchvm/dib/elements/nfvbenchvm/post-install.d/50-pip-package +++ b/nfvbenchvm/dib/elements/nfvbenchvm/post-install.d/50-pip-package @@ -2,7 +2,7 @@ cd /tmp wget https://bootstrap.pypa.io/get-pip.py -python get-pip.py +python3 get-pip.py -pip install setuptools wheel -pip install pyyaml +pip3 install setuptools wheel pbr +pip3 install pyyaml diff --git a/nfvbenchvm/dib/elements/nfvbenchvm/post-install.d/51-cloudcfg-edit b/nfvbenchvm/dib/elements/nfvbenchvm/post-install.d/51-cloudcfg-edit index dc51030..1a0dec9 100755 --- a/nfvbenchvm/dib/elements/nfvbenchvm/post-install.d/51-cloudcfg-edit +++ b/nfvbenchvm/dib/elements/nfvbenchvm/post-install.d/51-cloudcfg-edit @@ -7,6 +7,9 @@ user = "cloud-user" with open(cloudcfg) as f: cfg = yaml.safe_load(f) +# allow SSH password auth +cfg['ssh_pwauth'] = "1" + try: if cfg['system_info']['default_user']['name']: synver = "2" diff --git a/nfvbenchvm/dib/elements/nfvbenchvm/post-install.d/52-nfvbench-script b/nfvbenchvm/dib/elements/nfvbenchvm/post-install.d/52-nfvbench-script new file mode 100644 index 0000000..9162952 --- /dev/null +++ b/nfvbenchvm/dib/elements/nfvbenchvm/post-install.d/52-nfvbench-script @@ -0,0 +1,31 @@ +#!/bin/bash + +if [ $DIB_DEV_IMAGE != "generator" ]; then + exit 0 +fi + +# TRex installation +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/site-packages/ +rm -rf /opt/trex/$TREX_VER/automation/trex_control_plane/interactive/trex + +# NFVbench installation +cd /opt +git clone https://gerrit.opnfv.org/gerrit/nfvbench +cd nfvbench/ +pip3 install . --use-deprecated=legacy-resolver +cp xtesting/testcases.yaml /usr/local/lib/python3.6/site-packages/xtesting/ci/testcases.yaml +python3 ./docker/cleanup_generators.py +rm -rf /opt/nfvbench/.git +rm -rf /opt/nfvbench/nfvbench +# symlink to NFVbench sources +ln -s /usr/local/lib/python3.6/site-packages/nfvbench /opt/nfvbench/nfvbench +# persist env variables +echo "export TREX_VER=\"$TREX_VER\"" >> /etc/profile.d/nfvbench.sh +echo "export TREX_EXT_LIBS=\"/opt/trex/$TREX_VER/external_libs\"" >> /etc/profile.d/nfvbench.sh diff --git a/nfvbenchvm/dib/elements/nfvbenchvm/post-install.d/53-sshd-script b/nfvbenchvm/dib/elements/nfvbenchvm/post-install.d/53-sshd-script new file mode 100644 index 0000000..64e8877 --- /dev/null +++ b/nfvbenchvm/dib/elements/nfvbenchvm/post-install.d/53-sshd-script @@ -0,0 +1,4 @@ +#!/bin/bash + +# Set UseDNS no value in sshd_config to reduce time to connect +echo "UseDNS no" >> /etc/ssh/sshd_config
\ No newline at end of file diff --git a/nfvbenchvm/dib/elements/nfvbenchvm/post-install.d/99-cleanup b/nfvbenchvm/dib/elements/nfvbenchvm/post-install.d/99-cleanup index 14e9f27..e48ca52 100755 --- a/nfvbenchvm/dib/elements/nfvbenchvm/post-install.d/99-cleanup +++ b/nfvbenchvm/dib/elements/nfvbenchvm/post-install.d/99-cleanup @@ -1,3 +1,3 @@ #!/bin/bash -yum erase -y python-devel libyaml-devel numactl-devel kernel-devel kernel-headers kernel-lt-headers kernel-lt-devel gcc +yum erase -y python-devel libyaml-devel numactl-devel kernel-devel kernel-headers kernel-lt-headers kernel-lt-devel gcc git python3-dev libpython3.6-dev diff --git a/nfvbenchvm/dib/elements/nfvbenchvm/static/etc/modprobe.d/vfio.conf b/nfvbenchvm/dib/elements/nfvbenchvm/static/etc/modprobe.d/vfio.conf new file mode 100644 index 0000000..f32633f --- /dev/null +++ b/nfvbenchvm/dib/elements/nfvbenchvm/static/etc/modprobe.d/vfio.conf @@ -0,0 +1 @@ +options vfio enable_unsafe_noiommu_mode=1 diff --git a/nfvbenchvm/dib/elements/nfvbenchvm/static/etc/modules-load.d/vfio-pci.conf b/nfvbenchvm/dib/elements/nfvbenchvm/static/etc/modules-load.d/vfio-pci.conf new file mode 100644 index 0000000..7ce4214 --- /dev/null +++ b/nfvbenchvm/dib/elements/nfvbenchvm/static/etc/modules-load.d/vfio-pci.conf @@ -0,0 +1 @@ +vfio-pci diff --git a/nfvbenchvm/dib/elements/nfvbenchvm/static/etc/profile.d/nfvbench.sh b/nfvbenchvm/dib/elements/nfvbenchvm/static/etc/profile.d/nfvbench.sh new file mode 100644 index 0000000..a9bf588 --- /dev/null +++ b/nfvbenchvm/dib/elements/nfvbenchvm/static/etc/profile.d/nfvbench.sh @@ -0,0 +1 @@ +#!/bin/bash diff --git a/nfvbenchvm/dib/elements/nfvbenchvm/static/etc/rc.d/rc.local.generator b/nfvbenchvm/dib/elements/nfvbenchvm/static/etc/rc.d/rc.local.generator new file mode 100644 index 0000000..0746fd6 --- /dev/null +++ b/nfvbenchvm/dib/elements/nfvbenchvm/static/etc/rc.d/rc.local.generator @@ -0,0 +1,109 @@ +#!/bin/bash + +touch /var/lock/subsys/local + +# Waiting for cloud-init to generate $NFVBENCH_CONF, retry 60 seconds +NFVBENCH_CONF=/etc/nfvbenchvm.conf +OPENRC=/etc/nfvbench/openrc +retry=30 +until [ $retry -eq 0 ]; do + if [ -f $NFVBENCH_CONF ]; then break; fi + retry=$[$retry-1] + sleep 2 +done +if [ ! -f $NFVBENCH_CONF ]; then + exit 0 +fi + +# Parse and obtain all configurations +echo "Generating configurations for NFVbench and TRex..." +eval $(cat $NFVBENCH_CONF) +touch /nfvbench_configured.flag + +if [ -f $OPENRC ]; then + source $OPENRC +fi + +# Add DNS entry +if [ $DNS_SERVERS ]; then + IFS="," read -a dns <<< $DNS_SERVERS + for d in "${dns[@]}"; do + echo "nameserver $d" >> /etc/resolv.conf + done +fi + +# CPU isolation optimizations +echo 1 > /sys/bus/workqueue/devices/writeback/cpumask +echo 1 > /sys/devices/virtual/workqueue/cpumask +echo 1 > /proc/irq/default_smp_affinity +for irq in `ls /proc/irq/`; do + if [ -f /proc/irq/$irq/smp_affinity ]; then + echo 1 > /proc/irq/$irq/smp_affinity + fi +done + +NET_PATH=/sys/class/net + +get_eth_port() { + # device mapping for CentOS Linux 7: + # lspci: + # 00.03.0 Ethernet controller: Red Hat, Inc. Virtio network device + # 00.04.0 Ethernet controller: Red Hat, Inc. Virtio network device + # /sys/class/net: + # /sys/class/net/eth0 -> ../../devices/pci0000:00/0000:00:03.0/virtio0/net/eth0 + # /sys/class/net/eth1 -> ../../devices/pci0000:00/0000:00:04.0/virtio1/net/eth1 + + mac=$1 + for f in $(ls $NET_PATH/); do + if grep -q "$mac" $NET_PATH/$f/address; then + eth_port=$(readlink $NET_PATH/$f | cut -d "/" -f8) + # some virtual interfaces match on MAC and do not have a PCI address + if [ "$eth_port" -a "$eth_port" != "N/A" ]; then + # Found matching interface + logger "NFVBENCHVM: found interface $f ($eth_port) matching $mac" + break + else + eth_port="" + fi + fi; + done + if [ -z "$eth_port" ]; then + echo "ERROR: Cannot find eth port for MAC $mac" >&2 + logger "NFVBENCHVM ERROR: Cannot find eth port for MAC $mac" + return 1 + fi + echo $eth_port + return 0 +} + +# Set VM MANAGEMENT port up and running +if [ $INTF_MGMT_CIDR ] && [ $INTF_MGMT_IP_GW ]; then + if [ $INTF_MAC_MGMT ]; then + ETH_PORT=$(get_eth_port $INTF_MAC_MGMT) + elif [ -f $OPENRC ] && [ "$PORT_MGMT_NAME" ]; then + $INTF_MAC_MGMT=$(openstack port list | grep $PORT_MGMT_NAME | grep -o -Ei '([a-fA-F0-9:]{17}|[a-fA-F0-9]{12}$)' | head -1) + ETH_PORT=$(get_eth_port $INTF_MAC_MGMT) + else + ETH_PORT="" + fi + if [ -z "$ETH_PORT" ]; then + echo "ERROR: Cannot find eth port for management port" >&2 + logger "NFVBENCHVM ERROR: Cannot find eth port for management port" + return 1 + fi + ip addr add $INTF_MGMT_CIDR dev $ETH_PORT + ip link set $ETH_PORT up + ip route add default via $INTF_MGMT_IP_GW dev $ETH_PORT +else + echo "INFO: VM management IP Addresses missing in $NFVBENCH_CONF" +fi + +/nfvbench/configure-nfvbench.sh + +if [ $ACTION ]; then + /nfvbench/start-nfvbench.sh $ACTION +else + /nfvbench/start-nfvbench.sh +fi + +exit 0
\ No newline at end of file diff --git a/nfvbenchvm/dib/elements/nfvbenchvm/static/etc/rc.d/rc.local b/nfvbenchvm/dib/elements/nfvbenchvm/static/etc/rc.d/rc.local.loopvm index d69cd0e..a83e7ba 100644 --- a/nfvbenchvm/dib/elements/nfvbenchvm/static/etc/rc.d/rc.local +++ b/nfvbenchvm/dib/elements/nfvbenchvm/static/etc/rc.d/rc.local.loopvm @@ -2,7 +2,7 @@ touch /var/lock/subsys/local -# Waiting for cloud-init to generate $TESTPMD_CONF, retry 60 seconds +# Waiting for cloud-init to generate $NFVBENCH_CONF, retry 60 seconds NFVBENCH_CONF=/etc/nfvbenchvm.conf retry=30 until [ $retry -eq 0 ]; do @@ -175,8 +175,8 @@ if [ $PCI_ADDRESS_1 ] && [ $PCI_ADDRESS_2 ]; then if [ "$FORWARDER" == "testpmd" ]; then echo "Configuring testpmd..." # Binding ports to DPDK - /dpdk/dpdk-devbind.py -b igb_uio $PCI_ADDRESS_1 - /dpdk/dpdk-devbind.py -b igb_uio $PCI_ADDRESS_2 + dpdk-devbind -b igb_uio $PCI_ADDRESS_1 + dpdk-devbind -b igb_uio $PCI_ADDRESS_2 screen -dmSL testpmd /dpdk/testpmd \ -c $CORE_MASK \ -n 4 \ @@ -195,7 +195,7 @@ if [ $PCI_ADDRESS_1 ] && [ $PCI_ADDRESS_2 ]; then --cmdline-file=/dpdk/testpmd_cmd.txt echo "testpmd running in screen 'testpmd'" logger "NFVBENCHVM: testpmd running in screen 'testpmd'" - else + elif [ "$FORWARDER" == "vpp" ]; then echo "Configuring vpp..." cp /vpp/startup.conf /etc/vpp/startup.conf cp /vpp/vm.conf /etc/vpp/vm.conf @@ -233,6 +233,9 @@ if [ $PCI_ADDRESS_1 ] && [ $PCI_ADDRESS_2 ]; then sed -i "s/{{TG_GATEWAY2_IP}}/${TG_GATEWAY2_IP}/g" /etc/vpp/vm.conf service vpp restart logger "NFVBENCHVM: vpp service restarted" + else + echo "ERROR: Unknown forwarder value. Accepted values: testpmd or vpp" + exit 1 fi else echo "ERROR: Cannot find PCI Address from MAC" @@ -241,9 +244,4 @@ else logger "NFVBENCHVM ERROR: Cannot find PCI Address from MAC" fi -# Set SSH config -logger $(cat /etc/ssh/sshd_config | grep "PasswordAuthentication") -sed -i 's/PasswordAuthentication no/#PasswordAuthentication no/g' /etc/ssh/sshd_config -sed -i 's/#PasswordAuthentication yes/PasswordAuthentication yes/g' /etc/ssh/sshd_config -logger $(cat /etc/ssh/sshd_config | grep "PasswordAuthentication") -service sshd restart +exit 0
\ No newline at end of file diff --git a/nfvbenchvm/dib/elements/nfvbenchvm/static/etc/systemd/system/nfvbench.service b/nfvbenchvm/dib/elements/nfvbenchvm/static/etc/systemd/system/nfvbench.service new file mode 100644 index 0000000..e952070 --- /dev/null +++ b/nfvbenchvm/dib/elements/nfvbenchvm/static/etc/systemd/system/nfvbench.service @@ -0,0 +1,12 @@ +[Unit] +Description=nfvbench service +After=network.target + +[Service] +Type=forking +User=root +RemainAfterExit=yes +ExecStart=/bin/bash -a -c "source /etc/profile.d/nfvbench.sh && /usr/bin/screen -dmSL nfvbench /usr/local/bin/nfvbench -c /etc/nfvbench/nfvbench.conf --server" + +[Install] +WantedBy=multi-user.target diff --git a/nfvbenchvm/dib/elements/nfvbenchvm/static/nfvbench/configure-nfvbench.sh b/nfvbenchvm/dib/elements/nfvbenchvm/static/nfvbench/configure-nfvbench.sh new file mode 100644 index 0000000..5ec584b --- /dev/null +++ b/nfvbenchvm/dib/elements/nfvbenchvm/static/nfvbench/configure-nfvbench.sh @@ -0,0 +1,263 @@ +#!/bin/bash + +set -e + +NFVBENCH_CONF=/etc/nfvbenchvm.conf +E2E_CFG=/etc/nfvbench/e2e.cfg +LOOPBACK_CFG=/etc/nfvbench/loopback.cfg +NFVBENCH_CFG=/etc/nfvbench/nfvbench.cfg +OPENRC=/etc/nfvbench/openrc + +# Parse and obtain all configurations +eval $(cat $NFVBENCH_CONF) + +if [ -f $OPENRC ]; then + source $OPENRC +fi + +# WE assume there are at least 2 cores available for the VM +CPU_CORES=$(grep -c ^processor /proc/cpuinfo) + +# We need at least 2 admin cores (one master and another latency). +if [ $CPU_CORES -le 3 ]; then + ADMIN_CORES=2 +else + # If the number of cores is even we + # reserve 3 cores for admin (third being idle) so the number of + # workers is either 1 (if CPU_CORES is 4) or always even + if (( $CPU_CORES % 2 )); then + ADMIN_CORES=2 + else + ADMIN_CORES=3 + fi +fi +# 2 vcpus: AW (core 0: Admin, core 1: Worker) +# 3 vcpus: AWW (core 0: Admin, core 1,2: Worker) +# 4 vcpus: AWWU (core 0: Admin, core 1,2: Worker, core 3: Unused) +# 5 vcpus: AWWWW +# 6 vcpus: AWWWWU +WORKER_CORES=$(expr $CPU_CORES - $ADMIN_CORES) +# worker cores are all cores except the admin core (core 0) and the eventual unused core +# AW -> 1 +# AWW -> 1,2 +# AWWU -> 1,2 +WORKER_CORE_LIST=$(seq -s, $ADMIN_CORES $WORKER_CORES) +# always use all cores +CORE_MASK=0x$(echo "obase=16; 2 ^ $CPU_CORES - 1" | bc) + +logger "NFVBENCHVM: CPU_CORES=$CPU_CORES, ADMIN_CORES=$ADMIN_CORES, WORKER_CORES=$WORKER_CORES ($WORKER_CORE_LIST)" + +# Isolate all cores that are reserved for workers +tuna -c $WORKER_CORE_LIST --isolate + +NET_PATH=/sys/class/net + +get_pci_address() { + # device mapping for CentOS Linux 7: + # lspci: + # 00.03.0 Ethernet controller: Red Hat, Inc. Virtio network device + # 00.04.0 Ethernet controller: Red Hat, Inc. Virtio network device + # /sys/class/net: + # /sys/class/net/eth0 -> ../../devices/pci0000:00/0000:00:03.0/virtio0/net/eth0 + # /sys/class/net/eth1 -> ../../devices/pci0000:00/0000:00:04.0/virtio1/net/eth1 + + mac=$1 + for f in $(ls $NET_PATH/); do + if grep -q "$mac" $NET_PATH/$f/address; then + pci_addr=$(readlink $NET_PATH/$f | cut -d "/" -f5) + # some virtual interfaces match on MAC and do not have a PCI address + if [ "$pci_addr" -a "$pci_addr" != "N/A" ]; then + # Found matching interface + logger "NFVBENCHVM: found interface $f ($pci_addr) matching $mac" + break + else + pci_addr="" + fi + fi; + done + if [ -z "$pci_addr" ]; then + echo "ERROR: Cannot find pci address for MAC $mac" >&2 + logger "NFVBENCHVM ERROR: Cannot find pci address for MAC $mac" + return 1 + fi + echo $pci_addr + return 0 +} + +get_interfaces_mac_values(){ + # Set dynamically interfaces mac values, if VM is spawn with SRIOV PF ports + # and openstack API are accessible + if [ -z "$LOOPBACK_INTF_MAC1" ] && [ -z "$LOOPBACK_INTF_MAC2" ]; then + if [ -f $OPENRC ] && [ "$LOOPBACK_PORT_NAME1" ] && [ "$LOOPBACK_PORT_NAME2" ]; then + LOOPBACK_INTF_MAC1=$(openstack port list | grep $LOOPBACK_PORT_NAME1 | grep -o -Ei '([a-fA-F0-9:]{17}|[a-fA-F0-9]{12}$)' | head -1) + LOOPBACK_INTF_MAC2=$(openstack port list | grep $LOOPBACK_PORT_NAME2 | grep -o -Ei '([a-fA-F0-9:]{17}|[a-fA-F0-9]{12}$)' | head -1) + fi + fi + if [ -z "$E2E_INTF_MAC1" ] && [ -z "$E2E_INTF_MAC2" ]; then + if [ -f $OPENRC ] && [ "$E2E_PORT_NAME1" ] && [ "$E2E_PORT_NAME2" ]; then + E2E_INTF_MAC1=$(openstack port list | grep $E2E_PORT_NAME1 | grep -o -Ei '([a-fA-F0-9:]{17}|[a-fA-F0-9]{12}$)' | head -1) + E2E_INTF_MAC2=$(openstack port list | grep $E2E_PORT_NAME2 | grep -o -Ei '([a-fA-F0-9:]{17}|[a-fA-F0-9]{12}$)' | head -1) + fi + fi + if [ -z "$INTF_MAC1" ] && [ -z "$INTF_MAC2" ]; then + if [ -f $OPENRC ] && [ "$PORT_NAME1" ] && [ "$PORT_NAME2" ]; then + INTF_MAC1=$(openstack port list | grep $PORT_NAME1 | grep -o -Ei '([a-fA-F0-9:]{17}|[a-fA-F0-9]{12}$)' | head -1) + INTF_MAC2=$(openstack port list | grep $PORT_NAME2 | grep -o -Ei '([a-fA-F0-9:]{17}|[a-fA-F0-9]{12}$)' | head -1) + fi + fi +} + +get_interfaces_pci_address(){ + # Sometimes the interfaces on the generator VM will use different physical networks. In this case, + # we have to make sure the generator uses them in the right order. + if [ $LOOPBACK_INTF_MAC1 ] && [ $LOOPBACK_INTF_MAC2 ]; then + LOOPBACK_PCI_ADDRESS_1=$(get_pci_address $LOOPBACK_INTF_MAC1) + LOOPBACK_PCI_ADDRESS_2=$(get_pci_address $LOOPBACK_INTF_MAC2) + + echo LOOPBACK_PCI_ADDRESS_1=$LOOPBACK_PCI_ADDRESS_1 >> $NFVBENCH_CONF + echo LOOPBACK_PCI_ADDRESS_2=$LOOPBACK_PCI_ADDRESS_2 >> $NFVBENCH_CONF + fi + if [ $E2E_INTF_MAC1 ] && [ $E2E_INTF_MAC2 ]; then + E2E_PCI_ADDRESS_1=$(get_pci_address $E2E_INTF_MAC1) + E2E_PCI_ADDRESS_2=$(get_pci_address $E2E_INTF_MAC2) + + echo E2E_PCI_ADDRESS_1=$E2E_PCI_ADDRESS_1 >> $NFVBENCH_CONF + echo E2E_PCI_ADDRESS_2=$E2E_PCI_ADDRESS_2 >> $NFVBENCH_CONF + fi + if [ $INTF_MAC1 ] && [ $INTF_MAC2 ]; then + PCI_ADDRESS_1=$(get_pci_address $INTF_MAC1) + PCI_ADDRESS_2=$(get_pci_address $INTF_MAC2) + + echo PCI_ADDRESS_1=$PCI_ADDRESS_1 >> $NFVBENCH_CONF + echo PCI_ADDRESS_2=$PCI_ADDRESS_2 >> $NFVBENCH_CONF + fi +} + +bind_interfaces(){ + if [ $LOOPBACK_PCI_ADDRESS_1 ]; then + dpdk-devbind -b vfio-pci $LOOPBACK_PCI_ADDRESS_1 + fi + if [ $LOOPBACK_PCI_ADDRESS_2 ]; then + dpdk-devbind -b vfio-pci $LOOPBACK_PCI_ADDRESS_2 + fi + if [ $E2E_PCI_ADDRESS_1 ]; then + dpdk-devbind -b vfio-pci $E2E_PCI_ADDRESS_1 + fi + if [ $E2E_PCI_ADDRESS_2 ]; then + dpdk-devbind -b vfio-pci $E2E_PCI_ADDRESS_2 + fi + if [ $PCI_ADDRESS_1 ]; then + dpdk-devbind -b vfio-pci $PCI_ADDRESS_1 + fi + if [ $PCI_ADDRESS_2 ]; then + dpdk-devbind -b vfio-pci $PCI_ADDRESS_2 + fi +} + +configure_loopback_mode(){ + if [ $LOOPBACK_PCI_ADDRESS_1 ] && [ $LOOPBACK_PCI_ADDRESS_2 ]; then + logger "NFVBENCHVM: loopback - Using pci $LOOPBACK_PCI_ADDRESS_1 ($LOOPBACK_INTF_MAC1)" + logger "NFVBENCHVM: loopback - Using pci $LOOPBACK_PCI_ADDRESS_2 ($LOOPBACK_INTF_MAC2)" + + echo "Configuring nfvbench and TRex for loopback mode..." + # execute env script to avoid no ENV in screen and a nfvbench error + source /etc/profile.d/nfvbench.sh + sed -i "s/{{PCI_ADDRESS_1}}/$LOOPBACK_PCI_ADDRESS_1/g" /etc/nfvbench/loopback.cfg + sed -i "s/{{PCI_ADDRESS_2}}/$LOOPBACK_PCI_ADDRESS_2/g" /etc/nfvbench/loopback.cfg + sed -i "s/{{CORES}}/$WORKER_CORES/g" /etc/nfvbench/loopback.cfg + CORE_THREADS=$(seq -s, 2 $((2+$WORKER_CORES))) + sed -i "s/{{CORE_THREADS}}/$CORE_THREADS/g" /etc/nfvbench/loopback.cfg + else + echo "ERROR: Cannot find PCI Address from MAC" + echo "$LOOPBACK_INTF_MAC1: $LOOPBACK_PCI_ADDRESS_1" + echo "$LOOPBACK_INTF_MAC2: $LOOPBACK_PCI_ADDRESS_2" + logger "NFVBENCHVM ERROR: Cannot find PCI Address from MAC (loopback mode)" + fi + +} + +configure_e2e_mode(){ + if [ $E2E_PCI_ADDRESS_1 ] && [ $E2E_PCI_ADDRESS_2 ]; then + logger "NFVBENCHVM: e2e - Using pci $E2E_PCI_ADDRESS_1 ($E2E_INTF_MAC1)" + logger "NFVBENCHVM: e2e - Using pci $E2E_PCI_ADDRESS_2 ($E2E_INTF_MAC2)" + + echo "Configuring nfvbench and TRex for e2e mode..." + # execute env script to avoid no ENV in screen and a nfvbench error + source /etc/profile.d/nfvbench.sh + sed -i "s/{{PCI_ADDRESS_1}}/$E2E_PCI_ADDRESS_1/g" /etc/nfvbench/e2e.cfg + sed -i "s/{{PCI_ADDRESS_2}}/$E2E_PCI_ADDRESS_2/g" /etc/nfvbench/e2e.cfg + sed -i "s/{{CORES}}/$WORKER_CORES/g" /etc/nfvbench/e2e.cfg + CORE_THREADS=$(seq -s, 2 $((2+$WORKER_CORES))) + sed -i "s/{{CORE_THREADS}}/$CORE_THREADS/g" /etc/nfvbench/e2e.cfg + else + echo "ERROR: Cannot find PCI Address from MAC" + echo "$E2E_INTF_MAC1: $E2E_PCI_ADDRESS_1" + echo "$E2E_INTF_MAC2: $E2E_PCI_ADDRESS_2" + logger "NFVBENCHVM ERROR: Cannot find PCI Address from MAC (e2e mode)" + fi +} + +configure_nfvbench(){ + if [ $PCI_ADDRESS_1 ] && [ $PCI_ADDRESS_2 ]; then + logger "NFVBENCHVM: Using pci $PCI_ADDRESS_1 ($INTF_MAC1)" + logger "NFVBENCHVM: Using pci $PCI_ADDRESS_2 ($INTF_MAC2)" + + echo "Configuring nfvbench and TRex..." + # execute env script to avoid no ENV in screen and a nfvbench error + source /etc/profile.d/nfvbench.sh + + if [ $DEFAULT ]; then + cp /nfvbench/nfvbench.conf /etc/nfvbench/nfvbench.cfg + fi + sed -i "s/{{PCI_ADDRESS_1}}/$PCI_ADDRESS_1/g" /etc/nfvbench/nfvbench.cfg + sed -i "s/{{PCI_ADDRESS_2}}/$PCI_ADDRESS_2/g" /etc/nfvbench/nfvbench.cfg + sed -i "s/{{CORES}}/$WORKER_CORES/g" /etc/nfvbench/nfvbench.cfg + CORE_THREADS=$(seq -s, 2 $((2+$WORKER_CORES))) + sed -i "s/{{CORE_THREADS}}/$CORE_THREADS/g" /etc/nfvbench/nfvbench.cfg + + else + echo "ERROR: Cannot find PCI Address from MAC" + echo "$INTF_MAC1: $PCI_ADDRESS_1" + echo "$INTF_MAC2: $PCI_ADDRESS_2" + logger "NFVBENCHVM ERROR: Cannot find PCI Address from MAC" + fi +} + +# Check if config files are provided by config drive (CLI command) or Ansible script +# and configure NFVbench accordingly to these files +if [ -f $E2E_CFG ]; then + if [ -z $E2E_PCI_ADDRESS_1 ] && [ -z $E2E_PCI_ADDRESS_2 ]; then + get_interfaces_mac_values + get_interfaces_pci_address + bind_interfaces + fi + configure_e2e_mode +fi +if [ -f $LOOPBACK_CFG ]; then + if [ -z $LOOPBACK_PCI_ADDRESS_1 ] && [ -z $LOOPBACK_PCI_ADDRESS_2 ]; then + get_interfaces_mac_values + get_interfaces_pci_address + bind_interfaces + fi + configure_loopback_mode +fi +# if nfvbench.cfg is provided by config drive (CLI command) or Ansible script +# configure nfvbench using this file otherwise untemplate default config if no file exists +if [ -f $NFVBENCH_CFG ]; then + if [ -z $PCI_ADDRESS_1 ] && [ -z $PCI_ADDRESS_2 ]; then + get_interfaces_mac_values + get_interfaces_pci_address + bind_interfaces + fi + configure_nfvbench +elif [ ! -f $E2E_CFG ] && [ ! -f $LOOPBACK_CFG ]; then + if [ -z $PCI_ADDRESS_1 ] && [ -z $PCI_ADDRESS_2 ]; then + get_interfaces_mac_values + get_interfaces_pci_address + bind_interfaces + fi + DEFAULT=true + configure_nfvbench +fi + +exit 0
\ No newline at end of file diff --git a/nfvbenchvm/dib/elements/nfvbenchvm/static/nfvbench/nfvbench.conf b/nfvbenchvm/dib/elements/nfvbenchvm/static/nfvbench/nfvbench.conf new file mode 100644 index 0000000..c1ca23e --- /dev/null +++ b/nfvbenchvm/dib/elements/nfvbenchvm/static/nfvbench/nfvbench.conf @@ -0,0 +1,25 @@ +traffic_generator: + generator_profile: + - name: trex-local + tool: TRex + ip: 127.0.0.1 + zmq_pub_port: 4500 + zmq_rpc_port: 4501 + software_mode: false + + cores: {{CORES}} + platform: + master_thread_id: '0' + latency_thread_id: '1' + dual_if: + - socket: 0 + threads: [{{CORE_THREADS}}] + + interfaces: + - port: 0 + pci: "{{PCI_ADDRESS_1}}" + switch: + - port: 1 + pci: "{{PCI_ADDRESS_2}}" + switch: + intf_speed:
\ No newline at end of file diff --git a/nfvbenchvm/dib/elements/nfvbenchvm/static/nfvbench/start-nfvbench.sh b/nfvbenchvm/dib/elements/nfvbenchvm/static/nfvbench/start-nfvbench.sh new file mode 100644 index 0000000..1f6fa28 --- /dev/null +++ b/nfvbenchvm/dib/elements/nfvbenchvm/static/nfvbench/start-nfvbench.sh @@ -0,0 +1,51 @@ +#!/bin/bash + + +restart_nfvbench_service(){ + service nfvbench restart + echo "NFVbench running in screen 'nfvbench'" + logger "NFVBENCHVM: NFVbench running in screen 'nfvbench'" +} + +start_nfvbench(){ + ln -sfn /etc/nfvbench/nfvbench.cfg /etc/nfvbench/nfvbench.conf + restart_nfvbench_service +} + +start_nfvbench_e2e_mode(){ + ln -sfn /etc/nfvbench/e2e.cfg /etc/nfvbench/nfvbench.conf + restart_nfvbench_service +} + +start_nfvbench_loopback_mode(){ + ln -sfn /etc/nfvbench/loopback.cfg /etc/nfvbench/nfvbench.conf + restart_nfvbench_service +} + +usage() { + echo "Usage: $0 action" + echo "action (optional):" + echo "e2e start NFVbench with E2E config file" + echo "loopback start NFVbench with loopback config file" + echo "" + echo "If no action is given NFVbench will start with default config file" + exit 1 +} + +# ---------------------------------------------------------------------------- +# Parse command line options and configure the script +# ---------------------------------------------------------------------------- +if [ "$#" -lt 1 ]; then + start_nfvbench + exit 0 +else + if [ $1 = "e2e" ]; then + start_nfvbench_e2e_mode + exit 0 + elif [ $1 = "loopback" ]; then + start_nfvbench_loopback_mode + exit 0 + else + usage + fi +fi |