summaryrefslogtreecommitdiffstats
path: root/vnfs
diff options
context:
space:
mode:
Diffstat (limited to 'vnfs')
-rw-r--r--vnfs/qemu/qemu.py166
-rw-r--r--vnfs/qemu/qemu_dpdk.py112
-rw-r--r--vnfs/qemu/qemu_dpdk_vhost_cuse.py4
-rw-r--r--vnfs/qemu/qemu_dpdk_vhost_user.py4
-rw-r--r--vnfs/qemu/qemu_virtio_net.py53
5 files changed, 166 insertions, 173 deletions
diff --git a/vnfs/qemu/qemu.py b/vnfs/qemu/qemu.py
index 2e2c63df..4b0bf0b2 100644
--- a/vnfs/qemu/qemu.py
+++ b/vnfs/qemu/qemu.py
@@ -22,6 +22,7 @@ import re
import subprocess
from conf import settings as S
+from conf import get_test_param
from vnfs.vnf.vnf import IVnf
class IVnfQemu(IVnf):
@@ -48,8 +49,10 @@ class IVnfQemu(IVnf):
self._logfile = os.path.join(
S.getValue('LOG_DIR'),
S.getValue('LOG_FILE_QEMU')) + str(self._number)
- self._timeout = 120
+ self._timeout = S.getValue('GUEST_TIMEOUT')[self._number]
self._monitor = '%s/vm%dmonitor' % ('/tmp', self._number)
+ self._net1 = S.getValue('VANILLA_NIC1_NAME')[self._number]
+ self._net2 = S.getValue('VANILLA_NIC2_NAME')[self._number]
name = 'Client%d' % self._number
vnc = ':%d' % self._number
@@ -59,7 +62,7 @@ class IVnfQemu(IVnf):
'-m', S.getValue('GUEST_MEMORY')[self._number],
'-smp', str(S.getValue('GUEST_SMP')[self._number]),
'-cpu', 'host',
- '-drive', 'if=scsi,file=' +
+ '-drive', 'if=ide,file=' +
S.getValue('GUEST_IMAGE')[self._number],
'-boot', 'c', '--enable-kvm',
'-monitor', 'unix:%s,server,nowait' % self._monitor,
@@ -70,6 +73,9 @@ class IVnfQemu(IVnf):
'-numa', 'node,memdev=mem -mem-prealloc',
'-nographic', '-vnc', str(vnc), '-name', name,
'-snapshot', '-net none', '-no-reboot',
+ '-drive',
+ 'if=ide,file=fat:rw:%s,snapshot=off' %
+ S.getValue('GUEST_SHARE_DIR')[self._number],
]
self._configure_logging()
@@ -99,7 +105,6 @@ class IVnfQemu(IVnf):
self._affinitize()
if self._timeout:
- self._login()
self._config_guest_loopback()
# helper functions
@@ -184,7 +189,21 @@ class IVnfQemu(IVnf):
"""
Configure VM to run VNF (e.g. port forwarding application)
"""
- pass
+ # set guest loopback application based on VNF configuration
+ # cli option take precedence to config file values
+ guest_loopback = get_test_param('guest_loopback', S.getValue('GUEST_LOOPBACK')[self._number])
+ if guest_loopback == 'testpmd':
+ self._login()
+ self._configure_testpmd()
+ elif guest_loopback == 'l2fwd':
+ self._login()
+ self._configure_l2fwd()
+ elif guest_loopback == 'linux_bridge':
+ self._login()
+ self._configure_linux_bridge()
+ elif guest_loopback != 'buildin':
+ self._logger.error('Unsupported guest loopback method "%s" was specified. Option'
+ ' "buildin" will be used as a fallback.', guest_loopback)
def wait(self, prompt=S.getValue('GUEST_PROMPT'), timeout=30):
super(IVnfQemu, self).wait(prompt=prompt, timeout=timeout)
@@ -193,3 +212,142 @@ class IVnfQemu(IVnf):
prompt=S.getValue('GUEST_PROMPT')):
super(IVnfQemu, self).execute_and_wait(cmd, timeout=timeout,
prompt=prompt)
+
+ def _modify_dpdk_makefile(self):
+ """
+ Modifies DPDK makefile in Guest before compilation
+ """
+ pass
+
+ def _configure_copy_sources(self, dirname):
+ """
+ Mount shared directory and copy DPDK and l2fwd sources
+ """
+ # mount shared directory
+ self.execute_and_wait('umount ' + S.getValue('OVS_DPDK_SHARE'))
+ self.execute_and_wait('rm -rf ' + S.getValue('GUEST_OVS_DPDK_DIR'))
+ self.execute_and_wait('mkdir -p ' + S.getValue('OVS_DPDK_SHARE'))
+ self.execute_and_wait('mount -o iocharset=utf8 /dev/sdb1 ' +
+ S.getValue('OVS_DPDK_SHARE'))
+ self.execute_and_wait('mkdir -p ' + S.getValue('GUEST_OVS_DPDK_DIR'))
+ self.execute_and_wait('cp -ra ' + os.path.join(S.getValue('OVS_DPDK_SHARE'), dirname) +
+ ' ' + S.getValue('GUEST_OVS_DPDK_DIR'))
+
+ def _configure_disable_firewall(self):
+ """
+ Disable firewall in VM
+ """
+ # Disable services (F16)
+ self.execute_and_wait('systemctl status iptables.service')
+ self.execute_and_wait('systemctl stop iptables.service')
+
+ def _configure_testpmd(self):
+ """
+ Configure VM to perform L2 forwarding between NICs by DPDK's testpmd
+ """
+ self._configure_copy_sources('DPDK')
+ self._configure_disable_firewall()
+
+ # Guest images _should_ have 1024 hugepages by default,
+ # but just in case:'''
+ self.execute_and_wait('sysctl vm.nr_hugepages=1024')
+
+ # Mount hugepages
+ self.execute_and_wait('mkdir -p /dev/hugepages')
+ self.execute_and_wait(
+ 'mount -t hugetlbfs hugetlbfs /dev/hugepages')
+
+ # build and configure system for dpdk
+ self.execute_and_wait('cd ' + S.getValue('GUEST_OVS_DPDK_DIR') +
+ '/DPDK')
+ self.execute_and_wait('export CC=gcc')
+ self.execute_and_wait('export RTE_SDK=' +
+ S.getValue('GUEST_OVS_DPDK_DIR') + '/DPDK')
+ self.execute_and_wait('export RTE_TARGET=%s' % S.getValue('RTE_TARGET'))
+
+ # modify makefile if needed
+ self._modify_dpdk_makefile()
+
+ self.execute_and_wait('make RTE_OUTPUT=$RTE_SDK/$RTE_TARGET -C '
+ '$RTE_SDK/lib/librte_eal/linuxapp/igb_uio')
+ self.execute_and_wait('modprobe uio')
+ self.execute_and_wait('insmod %s/kmod/igb_uio.ko' %
+ S.getValue('RTE_TARGET'))
+ self.execute_and_wait('./tools/dpdk_nic_bind.py --status')
+ self.execute_and_wait(
+ './tools/dpdk_nic_bind.py -b igb_uio' ' ' +
+ S.getValue('GUEST_NET1_PCI_ADDRESS')[self._number] + ' ' +
+ S.getValue('GUEST_NET2_PCI_ADDRESS')[self._number])
+
+ # build and run 'test-pmd'
+ self.execute_and_wait('cd ' + S.getValue('GUEST_OVS_DPDK_DIR') +
+ '/DPDK/app/test-pmd')
+ self.execute_and_wait('make clean')
+ self.execute_and_wait('make')
+ self.execute_and_wait('./testpmd -c 0x3 -n 4 --socket-mem 512 --'
+ ' --burst=64 -i --txqflags=0xf00 ' +
+ '--disable-hw-vlan', 60, "Done")
+ self.execute('set fwd mac_retry', 1)
+ self.execute_and_wait('start', 20,
+ 'TX RS bit threshold=0 - TXQ flags=0xf00')
+
+ def _configure_l2fwd(self):
+ """
+ Configure VM to perform L2 forwarding between NICs by l2fwd module
+ """
+ self._configure_copy_sources('l2fwd')
+ self._configure_disable_firewall()
+
+ # build and configure system for l2fwd
+ self.execute_and_wait('cd ' + S.getValue('GUEST_OVS_DPDK_DIR') +
+ '/l2fwd')
+ self.execute_and_wait('export CC=gcc')
+
+ self.execute_and_wait('make')
+ self.execute_and_wait('insmod ' + S.getValue('GUEST_OVS_DPDK_DIR') +
+ '/l2fwd' + '/l2fwd.ko net1=' + self._net1 +
+ ' net2=' + self._net2)
+
+ def _configure_linux_bridge(self):
+ """
+ Configure VM to perform L2 forwarding between NICs by linux bridge
+ """
+ self._configure_disable_firewall()
+ nic1_name = get_test_param('vanilla_nic1_name', self._net1)
+ self.execute('ifconfig ' + nic1_name + ' ' +
+ S.getValue('VANILLA_NIC1_IP_CIDR')[self._number])
+
+ nic2_name = get_test_param('vanilla_nic2_name', self._net2)
+ self.execute('ifconfig ' + nic2_name + ' ' +
+ S.getValue('VANILLA_NIC2_IP_CIDR')[self._number])
+
+ # configure linux bridge
+ self.execute('brctl addbr br0')
+ self.execute('brctl addif br0 ' + self._net1 + ' ' + self._net2)
+ self.execute('ifconfig br0 ' +
+ S.getValue('VANILLA_BRIDGE_IP')[self._number])
+
+ # Add the arp entries for the IXIA ports and the bridge you are using.
+ # Use command line values if provided.
+ trafficgen_mac = get_test_param('vanilla_tgen_port1_mac',
+ S.getValue('VANILLA_TGEN_PORT1_MAC'))
+ trafficgen_ip = get_test_param('vanilla_tgen_port1_ip',
+ S.getValue('VANILLA_TGEN_PORT1_IP'))
+
+ self.execute('arp -s ' + trafficgen_ip + ' ' + trafficgen_mac)
+
+ trafficgen_mac = get_test_param('vanilla_tgen_port2_mac',
+ S.getValue('VANILLA_TGEN_PORT2_MAC'))
+ trafficgen_ip = get_test_param('vanilla_tgen_port2_ip',
+ S.getValue('VANILLA_TGEN_PORT2_IP'))
+
+ self.execute('arp -s ' + trafficgen_ip + ' ' + trafficgen_mac)
+
+ # Enable forwarding
+ self.execute('sysctl -w net.ipv4.ip_forward=1')
+
+ # Controls source route verification
+ # 0 means no source validation
+ self.execute('sysctl -w net.ipv4.conf.all.rp_filter=0')
+ self.execute('sysctl -w net.ipv4.conf.' + self._net1 + '.rp_filter=0')
+ self.execute('sysctl -w net.ipv4.conf.' + self._net2 + '.rp_filter=0')
diff --git a/vnfs/qemu/qemu_dpdk.py b/vnfs/qemu/qemu_dpdk.py
deleted file mode 100644
index 02d720f3..00000000
--- a/vnfs/qemu/qemu_dpdk.py
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 2015 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.
-
-"""Automation of QEMU hypervisor for launching vhost-cuse enabled guests.
-"""
-
-from vnfs.qemu.qemu import IVnfQemu
-from conf import settings as S
-
-class IVnfQemuDpdk(IVnfQemu):
- """
- An abstract class for controling an instance of QEMU with DPDK vHost support
- """
-
- def __init__(self):
- """
- Initialisation function.
- """
- super(IVnfQemuDpdk, self).__init__()
- self._cmd += ['-drive',
- 'if=scsi,file=fat:rw:%s,snapshot=off' %
- S.getValue('GUEST_SHARE_DIR')[self._number],
- ]
-
- def _modify_dpdk_makefile(self):
- """
- Modifies DPDK makefile in Guest before compilation
- """
- pass
-
- def _config_guest_loopback(self):
- """
- Configure VM to run testpmd
-
- Configure performs the following:
- * Mount hugepages
- * mount shared directory for copying DPDK
- * Disable firewall
- * Compile DPDK
- * DPDK NIC bind
- * Run testpmd
- """
-
- # Guest images _should_ have 1024 hugepages by default,
- # but just in case:'''
- self.execute_and_wait('sysctl vm.nr_hugepages=1024')
-
- # Mount hugepages
- self.execute_and_wait('mkdir -p /dev/hugepages')
- self.execute_and_wait(
- 'mount -t hugetlbfs hugetlbfs /dev/hugepages')
-
- # mount shared directory
- self.execute_and_wait('umount ' + S.getValue('OVS_DPDK_SHARE'))
- self.execute_and_wait('rm -rf ' + S.getValue('GUEST_OVS_DPDK_DIR'))
- self.execute_and_wait('mkdir -p ' + S.getValue('OVS_DPDK_SHARE'))
- self.execute_and_wait('mount -o iocharset=utf8 /dev/sdb1 ' +
- S.getValue('OVS_DPDK_SHARE'))
- self.execute_and_wait('mkdir -p ' + S.getValue('GUEST_OVS_DPDK_DIR'))
- self.execute_and_wait('cp -a ' + S.getValue('OVS_DPDK_SHARE') + '/* ' +
- S.getValue('GUEST_OVS_DPDK_DIR'))
- # Get VM info
- self.execute_and_wait('cat /etc/default/grub')
-
- # Disable services (F16)
- self.execute_and_wait('systemctl status iptables.service')
- self.execute_and_wait('systemctl stop iptables.service')
-
- # build and configure system for dpdk
- self.execute_and_wait('cd ' + S.getValue('GUEST_OVS_DPDK_DIR') +
- '/DPDK')
- self.execute_and_wait('export CC=gcc')
- self.execute_and_wait('export RTE_SDK=' +
- S.getValue('GUEST_OVS_DPDK_DIR') + '/DPDK')
- self.execute_and_wait('export RTE_TARGET=%s' % S.getValue('RTE_TARGET'))
-
- # modify makefile if needed
- self._modify_dpdk_makefile()
-
- self.execute_and_wait('make RTE_OUTPUT=$RTE_SDK/$RTE_TARGET -C '
- '$RTE_SDK/lib/librte_eal/linuxapp/igb_uio')
- self.execute_and_wait('modprobe uio')
- self.execute_and_wait('insmod %s/kmod/igb_uio.ko' %
- S.getValue('RTE_TARGET'))
- self.execute_and_wait('./tools/dpdk_nic_bind.py --status')
- self.execute_and_wait(
- './tools/dpdk_nic_bind.py -b igb_uio' ' ' +
- S.getValue('GUEST_NET1_PCI_ADDRESS')[self._number] + ' ' +
- S.getValue('GUEST_NET2_PCI_ADDRESS')[self._number])
-
- # build and run 'test-pmd'
- self.execute_and_wait('cd ' + S.getValue('GUEST_OVS_DPDK_DIR') +
- '/DPDK/app/test-pmd')
- self.execute_and_wait('make clean')
- self.execute_and_wait('make')
- self.execute_and_wait('./testpmd -c 0x3 -n 4 --socket-mem 512 --'
- ' --burst=64 -i --txqflags=0xf00 ' +
- '--disable-hw-vlan', 60, "Done")
- self.execute('set fwd mac_retry', 1)
- self.execute_and_wait('start', 20,
- 'TX RS bit threshold=0 - TXQ flags=0xf00')
diff --git a/vnfs/qemu/qemu_dpdk_vhost_cuse.py b/vnfs/qemu/qemu_dpdk_vhost_cuse.py
index e5351813..e5a5e823 100644
--- a/vnfs/qemu/qemu_dpdk_vhost_cuse.py
+++ b/vnfs/qemu/qemu_dpdk_vhost_cuse.py
@@ -18,9 +18,9 @@
import logging
from conf import settings as S
-from vnfs.qemu.qemu_dpdk import IVnfQemuDpdk
+from vnfs.qemu.qemu import IVnfQemu
-class QemuDpdkVhostCuse(IVnfQemuDpdk):
+class QemuDpdkVhostCuse(IVnfQemu):
"""
Control an instance of QEMU with vHost cuse guest communication.
"""
diff --git a/vnfs/qemu/qemu_dpdk_vhost_user.py b/vnfs/qemu/qemu_dpdk_vhost_user.py
index 94d87f9e..f0f97d8a 100644
--- a/vnfs/qemu/qemu_dpdk_vhost_user.py
+++ b/vnfs/qemu/qemu_dpdk_vhost_user.py
@@ -18,9 +18,9 @@
import logging
from conf import settings as S
-from vnfs.qemu.qemu_dpdk import IVnfQemuDpdk
+from vnfs.qemu.qemu import IVnfQemu
-class QemuDpdkVhostUser(IVnfQemuDpdk):
+class QemuDpdkVhostUser(IVnfQemu):
"""
Control an instance of QEMU with vHost user guest communication.
"""
diff --git a/vnfs/qemu/qemu_virtio_net.py b/vnfs/qemu/qemu_virtio_net.py
index 7de5ea1c..e5e895f2 100644
--- a/vnfs/qemu/qemu_virtio_net.py
+++ b/vnfs/qemu/qemu_virtio_net.py
@@ -18,7 +18,6 @@
import logging
from vnfs.qemu.qemu import IVnfQemu
from conf import settings as S
-from conf import get_test_param
from tools import tasks
class QemuVirtioNet(IVnfQemu):
@@ -41,8 +40,6 @@ class QemuVirtioNet(IVnfQemu):
i = self._number * 2
if1 = str(i)
if2 = str(i + 1)
- self._net1 = S.getValue('VANILLA_NIC1_NAME')[self._number]
- self._net2 = S.getValue('VANILLA_NIC2_NAME')[self._number]
self._cmd += ['-netdev',
'type=tap,id=' + self._net1 +
@@ -63,53 +60,3 @@ class QemuVirtioNet(IVnfQemu):
',netdev=' + self._net2 + ',csum=off,gso=off,' +
'guest_tso4=off,guest_tso6=off,guest_ecn=off',
]
-
- # helper functions
-
- def _config_guest_loopback(self):
- """
- Configure VM to perform forwarding between NICs
- """
-
- # Disable services (F16)
- self.execute_and_wait('systemctl stop iptables.service')
- self.execute_and_wait('systemctl stop irqbalance.service')
-
- nic1_name = get_test_param('vanilla_nic1_name', self._net1)
- self.execute('ifconfig ' + nic1_name + ' ' +
- S.getValue('VANILLA_NIC1_IP_CIDR')[self._number])
-
- nic2_name = get_test_param('vanilla_nic2_name', self._net2)
- self.execute('ifconfig ' + nic2_name + ' ' +
- S.getValue('VANILLA_NIC2_IP_CIDR')[self._number])
-
- # configure linux bridge
- self.execute('brctl addbr br0')
- self.execute('brctl addif br0 ' + self._net1 + ' ' + self._net2)
- self.execute('ifconfig br0 ' +
- S.getValue('VANILLA_BRIDGE_IP')[self._number])
-
- # Add the arp entries for the IXIA ports and the bridge you are using.
- # Use command line values if provided.
- trafficgen_mac = get_test_param('vanilla_tgen_port1_mac',
- S.getValue('VANILLA_TGEN_PORT1_MAC'))
- trafficgen_ip = get_test_param('vanilla_tgen_port1_ip',
- S.getValue('VANILLA_TGEN_PORT1_IP'))
-
- self.execute('arp -s ' + trafficgen_ip + ' ' + trafficgen_mac)
-
- trafficgen_mac = get_test_param('vanilla_tgen_port2_mac',
- S.getValue('VANILLA_TGEN_PORT2_MAC'))
- trafficgen_ip = get_test_param('vanilla_tgen_port2_ip',
- S.getValue('VANILLA_TGEN_PORT2_IP'))
-
- self.execute('arp -s ' + trafficgen_ip + ' ' + trafficgen_mac)
-
- # Enable forwarding
- self.execute('sysctl -w net.ipv4.ip_forward=1')
-
- # Controls source route verification
- # 0 means no source validation
- self.execute('sysctl -w net.ipv4.conf.all.rp_filter=0')
- self.execute('sysctl -w net.ipv4.conf.' + self._net1 + '.rp_filter=0')
- self.execute('sysctl -w net.ipv4.conf.' + self._net2 + '.rp_filter=0')