aboutsummaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
Diffstat (limited to 'resources')
-rw-r--r--resources/libraries/python/QemuUtils.py44
-rw-r--r--resources/libraries/robot/default.robot8
-rw-r--r--resources/libraries/robot/performance.robot110
3 files changed, 133 insertions, 29 deletions
diff --git a/resources/libraries/python/QemuUtils.py b/resources/libraries/python/QemuUtils.py
index 2123e42a4b..675f074570 100644
--- a/resources/libraries/python/QemuUtils.py
+++ b/resources/libraries/python/QemuUtils.py
@@ -27,12 +27,13 @@ class QemuUtils(object):
"""QEMU utilities."""
__QEMU_BIN = '/usr/bin/qemu-system-x86_64'
- # QEMU Machine Protocol socket
- __QMP_SOCK = '/tmp/qmp.sock'
- # QEMU Guest Agent socket
- __QGA_SOCK = '/tmp/qga.sock'
- def __init__(self):
+ def __init__(self, qemu_id=1):
+ self._qemu_id = qemu_id
+ # QEMU Machine Protocol socket
+ self._qmp_sock = '/tmp/qmp{0}.sock'.format(self._qemu_id)
+ # QEMU Guest Agent socket
+ self._qga_sock = '/tmp/qga{0}.sock'.format(self._qemu_id)
self._qemu_opt = {}
# Default 1 CPU.
self._qemu_opt['smp'] = '-smp 1,sockets=1,cores=1,threads=1'
@@ -40,7 +41,8 @@ class QemuUtils(object):
# management interface.
self._qemu_opt['options'] = '-cpu host -daemonize -enable-kvm ' \
'-machine pc,accel=kvm,usb=off,mem-merge=off ' \
- '-net nic,macaddr=52:54:00:00:02:01 -balloon none'
+ '-net nic,macaddr=52:54:00:00:00:{0:02x} -balloon none'\
+ .format(self._qemu_id)
self._qemu_opt['ssh_fwd_port'] = 10022
# Default serial console port
self._qemu_opt['serial_port'] = 4556
@@ -55,7 +57,7 @@ class QemuUtils(object):
# VM node info dict
self._vm_info = {
'type': NodeType.VM,
- 'port': 10022,
+ 'port': self._qemu_opt['ssh_fwd_port'],
'username': 'cisco',
'password': 'cisco',
'interfaces': {},
@@ -65,7 +67,7 @@ class QemuUtils(object):
self._vhost_id = 0
self._ssh = None
self._node = None
- self._socks = [self.__QMP_SOCK, self.__QGA_SOCK]
+ self._socks = [self._qmp_sock, self._qga_sock]
def qemu_set_smp(self, cpus, cores, threads, sockets):
"""Set SMP option for QEMU
@@ -182,7 +184,7 @@ class QemuUtils(object):
:param socket: Path of the unix socket.
:param server: If True the socket shall be a listening socket.
:param mac: Vhost-user interface MAC address (optional, otherwise is
- used autogenerated MAC 52:54:00:00:04:xx).
+ used auto-generated MAC 52:54:00:00:xx:yy).
:type socket: str
:type server: bool
:type mac: str
@@ -198,10 +200,12 @@ class QemuUtils(object):
netdev = ' -netdev vhost-user,id=vhost{0},chardev=char{0},'\
'queues={1}'.format(self._vhost_id, self._qemu_opt['queues'])
self._qemu_opt['options'] += netdev
- # If MAC is not specified use autogenerated 52:54:00:00:04:<vhost_id>
- # e.g. vhost1 MAC is 52:54:00:00:04:01
+ # If MAC is not specified use auto-generated MAC address based on
+ # template 52:54:00:00:<qemu_id>:<vhost_id>, e.g. vhost1 MAC of QEMU
+ # with ID 1 is 52:54:00:00:01:01
if mac is None:
- mac = '52:54:00:00:04:{0:02x}'.format(self._vhost_id)
+ mac = '52:54:00:00:{0:02x}:{1:02x}'.\
+ format(self._qemu_id, self._vhost_id)
extend_options = 'mq=on,csum=off,gso=off,guest_tso4=off,'\
'guest_tso6=off,guest_ecn=off,mrg_rxbuf=off'
# Create Virtio network device.
@@ -229,7 +233,7 @@ class QemuUtils(object):
# To enter command mode, the qmp_capabilities command must be issued.
qmp_cmd = 'echo "{ \\"execute\\": \\"qmp_capabilities\\" }' \
'{ \\"execute\\": \\"' + cmd + \
- '\\" }" | sudo -S socat - UNIX-CONNECT:' + self.__QMP_SOCK
+ '\\" }" | sudo -S socat - UNIX-CONNECT:' + self._qmp_sock
(ret_code, stdout, stderr) = self._ssh.exec_command(qmp_cmd)
if int(ret_code) != 0:
@@ -248,7 +252,7 @@ class QemuUtils(object):
"""Flush the QGA parser state
"""
qga_cmd = '(printf "\xFF"; sleep 1) | sudo -S socat - UNIX-CONNECT:' + \
- self.__QGA_SOCK
+ self._qga_sock
#TODO: probably need something else
(ret_code, stdout, stderr) = self._ssh.exec_command(qga_cmd)
if int(ret_code) != 0:
@@ -272,7 +276,7 @@ class QemuUtils(object):
qga_cmd = '(echo "{ \\"execute\\": \\"' + \
cmd + \
'\\" }"; sleep 1) | sudo -S socat - UNIX-CONNECT:' + \
- self.__QGA_SOCK
+ self._qga_sock
(ret_code, stdout, stderr) = self._ssh.exec_command(qga_cmd)
if int(ret_code) != 0:
logger.debug('QGA execute failed {0}'.format(stderr))
@@ -495,22 +499,22 @@ class QemuUtils(object):
'share=on -m {0} -numa node,memdev=mem'.format(
self._qemu_opt.get('mem_size'), self._qemu_opt.get('huge_mnt'))
- # By default check only if hugepages are availbale.
+ # By default check only if hugepages are available.
# If 'huge_allocate' is set to true try to allocate as well.
self._huge_page_check(allocate=self._qemu_opt.get('huge_allocate'))
# Disk option
- drive = '-drive file={},format=raw,cache=none,if=virtio'.format(
+ drive = '-drive file={0},format=raw,cache=none,if=virtio'.format(
self._qemu_opt.get('disk_image'))
# Setup QMP via unix socket
- qmp = '-qmp unix:{0},server,nowait'.format(self.__QMP_SOCK)
+ qmp = '-qmp unix:{0},server,nowait'.format(self._qmp_sock)
# Setup serial console
serial = '-chardev socket,host=127.0.0.1,port={0},id=gnc0,server,' \
'nowait -device isa-serial,chardev=gnc0'.format(
self._qemu_opt.get('serial_port'))
# Setup QGA via chardev (unix socket) and isa-serial channel
- qga = '-chardev socket,path=/tmp/qga.sock,server,nowait,id=qga0 ' \
- '-device isa-serial,chardev=qga0'
+ qga = '-chardev socket,path={0},server,nowait,id=qga0 ' \
+ '-device isa-serial,chardev=qga0'.format(self._qga_sock)
# Graphic setup
graphic = '-monitor none -display none -vga none'
diff --git a/resources/libraries/robot/default.robot b/resources/libraries/robot/default.robot
index e3e93098a9..88d9d04cd0 100644
--- a/resources/libraries/robot/default.robot
+++ b/resources/libraries/robot/default.robot
@@ -20,6 +20,7 @@
| Library | resources.libraries.python.DUTSetup
| Library | resources.libraries.python.SchedUtils
| Library | resources.libraries.python.TGSetup
+| Library | resources.libraries.python.L2Util
| Library | resources/libraries/python/VppConfigGenerator.py
| Library | resources/libraries/python/VppCounters.py
| Library | Collections
@@ -64,6 +65,13 @@
| | :FOR | ${dut} | IN | @{duts}
| | | Vpp Show Vhost | ${nodes['${dut}']}
+| Show Bridge Domain Data On All DUTs
+| | [Documentation] | Show Bridge Domain data on all DUTs.
+| | ...
+| | ${duts}= | Get Matches | ${nodes} | DUT*
+| | :FOR | ${dut} | IN | @{duts}
+| | | Vpp Get Bridge Domain Data | ${nodes['${dut}']}
+
| Setup Scheduler Policy for Vpp On All DUTs
| | [Documentation] | Set realtime scheduling policy (SCHED_RR) with priority 1
| | ... | on all VPP worker threads on all DUTs.
diff --git a/resources/libraries/robot/performance.robot b/resources/libraries/robot/performance.robot
index a43972a7b1..59ed57a1ce 100644
--- a/resources/libraries/robot/performance.robot
+++ b/resources/libraries/robot/performance.robot
@@ -705,6 +705,50 @@
| | Interface is added to bridge domain | ${dut2} | ${vhost_if2} | ${bd_id2}
| | All Vpp Interfaces Ready Wait | ${nodes}
+| L2 bridge domains with Vhost-User for '${nr}' VMs initialized in a 3-node circular topology
+| | [Documentation]
+| | ... | Create pairs of Vhost-User interfaces for defined number of VMs on all
+| | ... | defined VPP nodes. Add each Vhost-User interface into L2 bridge
+| | ... | domains with learning enabled with physical inteface or Vhost-User
+| | ... | interface of another VM.
+| | ...
+| | ... | *Arguments:*
+| | ... | _None_
+| | ...
+| | ... | *Note:*
+| | ... | Socket paths for VM are defined in following format:
+| | ... | - /tmp/sock-${VM_ID}-1
+| | ... | - /tmp/sock-${VM_ID}-2
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| L2 bridge domains with Vhost-User for '2' VMs initialized in \
+| | ... | a 3-node circular topology \|
+| | ...
+| | ${bd_id2}= | Evaluate | ${nr}+1
+| | Interface is added to bridge domain | ${dut1} | ${dut1_if1} | ${1}
+| | Interface is added to bridge domain | ${dut1} | ${dut1_if2} | ${bd_id2}
+| | Interface is added to bridge domain | ${dut2} | ${dut2_if1} | ${1}
+| | Interface is added to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2}
+| | :FOR | ${number} | IN RANGE | 1 | ${nr}+1
+| | | ${sock1}= | Set Variable | /tmp/sock-${number}-1
+| | | ${sock2}= | Set Variable | /tmp/sock-${number}-2
+| | | VPP Vhost interfaces for L2BD forwarding are setup | ${dut1}
+| | | ... | ${sock1} | ${sock2} | dut1-vhost-${number}-if1
+| | | ... | dut1-vhost-${number}-if2
+| | | ${bd_id2}= | Evaluate | ${number}+1
+| | | Interface is added to bridge domain | ${dut1}
+| | | ... | ${dut1-vhost-${number}-if1} | ${number}
+| | | Interface is added to bridge domain | ${dut1}
+| | | ... | ${dut1-vhost-${number}-if2} | ${bd_id2}
+| | | VPP Vhost interfaces for L2BD forwarding are setup | ${dut2}
+| | | ... | ${sock1} | ${sock2} | dut2-vhost-${number}-if1
+| | | ... | dut2-vhost-${number}-if2
+| | | Interface is added to bridge domain | ${dut2}
+| | | ... | ${dut2-vhost-${number}-if1} | ${number}
+| | | Interface is added to bridge domain | ${dut2}
+| | | ... | ${dut2-vhost-${number}-if2} | ${bd_id2}
+
| L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology
| | [Documentation]
| | ... | Setup L2 bridge domain topology with VXLANoIPv4 by connecting
@@ -1420,24 +1464,35 @@
| | ... | - sock1 - Socket path for first Vhost-User interface. Type: string
| | ... | - sock2 - Socket path for second Vhost-User interface. Type: string
| | ... | - vm_name - QemuUtil instance name. Type: string
-| | ... | - skip - number of cpus which will be skipped. Type: int
-| | ... | - count - number of cpus which will be allocated for qemu. Type: int
+| | ... | - skip - Number of cpus which will be skipped. Type: integer
+| | ... | - count - Number of cpus which will be allocated for qemu.
+| | ... | Type: integer
+| | ... | - qemu_id - Qemu Id when starting more then one guest VM on DUT node.
+| | ... | Type: integer
| | ...
| | ... | *Example:*
| | ...
| | ... | \| Guest VM with dpdk-testpmd connected via vhost-user is setup \
| | ... | \| ${nodes['DUT1']} \| /tmp/sock1 \| /tmp/sock2 \| DUT1_VM \| ${6} \
| | ... | \| ${5} \|
+| | ... | \| Guest VM with dpdk-testpmd connected via vhost-user is setup \
+| | ... | \| ${nodes['DUT1']} \| /tmp/sock-2-1 \| /tmp/sock-2-2 \| DUT1_VM2 \
+| | ... | \| qemu_id=${2} \|
| | ...
| | [Arguments] | ${dut_node} | ${sock1} | ${sock2} | ${vm_name} | ${skip}=${6}
-| | ... | ${count}=${5}
+| | ... | ${count}=${5} | ${qemu_id}=${1}
| | ...
-| | Import Library | resources.libraries.python.QemuUtils
+| | Import Library | resources.libraries.python.QemuUtils | qemu_id=${qemu_id}
| | ... | WITH NAME | ${vm_name}
+| | ${serial_port}= | Evaluate | ${qemu_id} + ${4555}
+| | Run keyword | ${vm_name}.Qemu Set Serial Port | ${serial_port}
+| | ${ssh_fwd_port}= | Evaluate | ${qemu_id} + ${10021}
+| | Run keyword | ${vm_name}.Qemu Set Ssh Fwd Port | ${ssh_fwd_port}
| | ${dut_numa}= | Get interfaces numa node | ${dut_node}
| | ... | ${dut1_if1} | ${dut1_if2}
+| | ${skip_cnt}= | Evaluate | ${skip} + (${qemu_id} - 1) * ${count}
| | ${qemu_cpus}= | Cpu slice of list per node | ${dut_node} | ${dut_numa}
-| | ... | skip_cnt=${skip} | cpu_cnt=${count} | smt_used=${False}
+| | ... | skip_cnt=${skip_cnt} | cpu_cnt=${count} | smt_used=${False}
| | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock1}
| | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock2}
| | Run keyword | ${vm_name}.Qemu Set Node | ${dut_node}
@@ -1451,6 +1506,37 @@
| | ... | pmd_fwd_mode=io | pmd_disable_hw_vlan=${True}
| | Return From Keyword | ${vm}
+| '${nr}' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | [Documentation]
+| | ... | Start QEMU guests with two vhost-user interfaces and interconnecting
+| | ... | DPDK testpmd for defined number of VMs on all defined VPP nodes.
+| | ...
+| | ... | *Arguments:*
+| | ... | _None_
+| | ...
+| | ... | _NOTE:_ This KW expects following test case variables to be set:
+| | ... | - ${system_cpus} - Number of CPUs allocated for OS itself.
+| | ... | - ${vpp_cpus} - Number of CPUs allocated for VPP.
+| | ... | - ${vm_cpus} - Number of CPUs to be allocated per QEMU instance.
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| '2' Guest VM with dpdk-testpmd connected via vhost-user is setup \
+| | ... | in a 3-node circular topology \|
+| | ...
+| | :FOR | ${number} | IN RANGE | 1 | ${nr}+1
+| | | ${sock1}= | Set Variable | /tmp/sock-${number}-1
+| | | ${sock2}= | Set Variable | /tmp/sock-${number}-2
+| | | ${skip_cpus}= | Evaluate | ${vpp_cpus}+${system_cpus}
+| | | ${vm1}= | Guest VM with dpdk-testpmd connected via vhost-user is setup
+| | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM${number}
+| | | ... | skip=${skip_cpus} | count=${vm_cpus} | qemu_id=${number}
+| | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM${number} | ${vm1}
+| | | ${vm2}= | Guest VM with dpdk-testpmd connected via vhost-user is setup
+| | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM${number}
+| | | ... | skip=${skip_cpus} | count=${vm_cpus} | qemu_id=${number}
+| | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM${number} | ${vm2}
+
| Guest VM with dpdk-testpmd using SMT connected via vhost-user is setup
| | [Documentation]
| | ... | Start QEMU guest with two vhost-user interfaces and interconnecting
@@ -1686,7 +1772,7 @@
| | ... | Stop all qemu processes with dpdk-testpmd running on ${dut_node}.
| | ... | Argument is dictionary of all qemu nodes running with its names.
| | ... | Dpdk-testpmd is stopped gracefully with printing stats.
-| | ... |
+| | ...
| | ... | *Arguments:*
| | ... | - dut_node - Node where to clean qemu. Type: dictionary
| | ... | - dut_vm_refs - VM references on node. Type: dictionary
@@ -1697,18 +1783,21 @@
| | ... | \| ${dut_vm_refs} \|
| | ...
| | [Arguments] | ${dut_node} | ${dut_vm_refs}
+| | ${vms_number}= | Get Length | ${dut_vm_refs}
+| | ${index}= | Set Variable | ${0}
| | :FOR | ${vm_name} | IN | @{dut_vm_refs}
| | | ${vm}= | Get From Dictionary | ${dut_vm_refs} | ${vm_name}
+| | | ${index}= | Evaluate | ${index} + 1
| | | Dpdk Testpmd Stop | ${vm}
| | | Run Keyword | ${vm_name}.Qemu Set Node | ${dut_node}
-| | | Run Keyword | ${vm_name}.Qemu Kill
| | | Run Keyword | ${vm_name}.Qemu Clear Socks
+| | | Run Keyword If | '${index}' == '${vms_number}' | ${vm_name}.Qemu Kill
| Guest VM Teardown
| | [Documentation]
| | ... | Stop all qemu processes running on ${dut_node}.
| | ... | Argument is dictionary of all qemu nodes running with its names.
-| | ... |
+| | ...
| | ... | *Arguments:*
| | ... | - dut_node - Node where to clean qemu. Type: dictionary
| | ... | - dut_vm_refs - VM references on node. Type: dictionary
@@ -1719,11 +1808,14 @@
| | ... | \| ${dut_vm_refs} \|
| | ...
| | [Arguments] | ${dut_node} | ${dut_vm_refs}
+| | ${vms_number}= | Get Length | ${dut_vm_refs}
+| | ${index}= | Set Variable | ${0}
| | :FOR | ${vm_name} | IN | @{dut_vm_refs}
| | | ${vm}= | Get From Dictionary | ${dut_vm_refs} | ${vm_name}
+| | | ${index}= | Evaluate | ${index} + 1
| | | Run Keyword | ${vm_name}.Qemu Set Node | ${dut_node}
-| | | Run Keyword | ${vm_name}.Qemu Kill
| | | Run Keyword | ${vm_name}.Qemu Clear Socks
+| | | Run Keyword If | '${index}' == '${vms_number}' | ${vm_name}.Qemu Kill
| Lisp IPv4 forwarding initialized in a 3-node circular topology
| | [Documentation] | Custom setup of IPv4 addresses on all DUT nodes and TG \