forked from autotest/tp-libvirt
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request autotest#5723 from chloerh/qos-floor
Add network case of qos
- Loading branch information
Showing
2 changed files
with
94 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
- virtual_network.qos.check_qos_floor: | ||
type = check_qos_floor | ||
start_vm = no | ||
timeout = 240 | ||
net_attrs = {'name': net_name, 'forward': {'mode': 'nat'}, 'ips': [{'dhcp_ranges': {'attrs': {'start': '192.168.100.2', 'end': '192.168.100.254'}}, 'netmask': '255.255.255.0', 'address': '192.168.100.1'}]} | ||
iface_attrs = {'source': {'network': net_name}, 'type_name': 'network', 'model': 'virtio'} | ||
variants net_type: | ||
- with_floor: | ||
bw = {'bandwidth_outbound': {'average': '400', 'peak': '800', 'burst': '512'}, 'bandwidth_inbound': {'average': '500', 'peak': '400', 'burst': '512'}} | ||
net_attrs = {**${net_attrs}, **${bw}} | ||
iface_bw = {'bandwidth': {'inbound': {'average': '300', 'peak': '200', 'floor': '100', 'burst': '256'}, 'outbound': {'average': '200', 'peak': '400', 'burst': '256'}}} | ||
- without_floor: | ||
status_error = yes | ||
err_msg = Invalid use of 'floor' on interface with MAC address .* - network .* has no inbound QoS set | ||
iface_bw = {'bandwidth': {'inbound': {'average': '150', 'peak': '200', 'floor': '100', 'burst': '256'}, 'outbound': {'average': '200', 'peak': '400', 'burst': '256'}}} | ||
iface_attrs = {**${iface_attrs}, **${iface_bw}} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,78 @@ | ||
import logging | ||
|
||
from virttest import utils_misc | ||
from virttest import utils_net | ||
from virttest import virsh | ||
from virttest.libvirt_xml import vm_xml | ||
from virttest.utils_libvirt import libvirt_network | ||
from virttest.utils_libvirt import libvirt_vmxml | ||
from virttest.utils_test import libvirt | ||
|
||
from provider.virtual_network import network_base | ||
|
||
VIRSH_ARGS = {'ignore_status': False, 'debug': True} | ||
|
||
LOG = logging.getLogger('avocado.' + __name__) | ||
|
||
|
||
def run(test, params, env): | ||
""" | ||
Check the floor setting in bandwidth setting | ||
""" | ||
vm_name = params.get('main_vm') | ||
vm = env.get_vm(vm_name) | ||
status_error = 'yes' == params.get('status_error', 'no') | ||
err_msg = params.get('err_msg') | ||
|
||
rand_id = utils_misc.generate_random_string(3) | ||
net_name = params.get('net_type') + '_' + rand_id | ||
net_attrs = eval(params.get('net_attrs', '{}')) | ||
iface_attrs = eval(params.get('iface_attrs', '{}')) | ||
|
||
vmxml = vm_xml.VMXML.new_from_inactive_dumpxml(vm_name) | ||
bkxml = vmxml.copy() | ||
|
||
try: | ||
if net_attrs: | ||
libvirt_network.create_or_del_network(net_attrs) | ||
LOG.debug(f'Network xml:\n' | ||
f'{virsh.net_dumpxml(net_attrs["name"]).stdout_text}') | ||
|
||
vmxml.del_device('interface', by_tag=True) | ||
iface = libvirt_vmxml.create_vm_device_by_type( | ||
'interface', iface_attrs) | ||
libvirt.add_vm_device(vmxml, iface) | ||
LOG.debug(f'VMXMLof {vm_name}:\n{virsh.dumpxml(vm_name).stdout_text}') | ||
|
||
start_result = virsh.start(vm_name, debug=True) | ||
libvirt.check_exit_status(start_result, status_error) | ||
if err_msg: | ||
libvirt.check_result(start_result, err_msg) | ||
if status_error: | ||
return | ||
|
||
iface = network_base.get_iface_xml_inst(vm_name, '1st on vm') | ||
mac = iface.mac_address | ||
source_br = iface.source['bridge'] | ||
|
||
tap_device = libvirt.get_ifname_host(vm_name, mac) | ||
LOG.debug(f'tap device on host with mac {mac} is: {tap_device}.') | ||
|
||
bw_floor = iface_attrs['bandwidth']['inbound']['floor'] | ||
iface_attrs['bandwidth']['inbound'].pop('floor') | ||
|
||
if not utils_net.check_class_rules( | ||
source_br, '1:3', {'floor': bw_floor}): | ||
test.fail('Class rule check (floor) failed') | ||
if not utils_net.check_class_rules( | ||
tap_device, '1:1', iface_attrs['bandwidth']['inbound']): | ||
test.fail('Class rule check failed') | ||
if not utils_net.check_filter_rules( | ||
tap_device, iface_attrs['bandwidth']['outbound']): | ||
test.fail('Filter rule check failed') | ||
|
||
finally: | ||
bkxml.sync() | ||
if net_attrs: | ||
libvirt_network.create_or_del_network(net_attrs, is_del=True) |