vdsm-patches April 2015

vdsm-patches@lists.fedorahosted.org

51 participants
798 discussions

Change in vdsm[ovirt-3.5]: virt: keep libvirt's <driver> element
by phoracek＠redhat.com 02 Jun '15

02 Jun '15

Petr Horáček has uploaded a new change for review. Change subject: virt: keep libvirt's <driver> element ...................................................................... virt: keep libvirt's <driver> element Most commonly, vdsm does not supply the <driver> element to libvirt, so that libvirt is able to apply its logic for setting the correct one (qemu/vhost). Once libvirt has chosen the driver, it must not change. When link state is modified, the chosen driver must be stated explicitly. Change-Id: I043b1c4b932cf0bc83b1f911415245e858ae350d Signed-off-by: Petr Horáček <phoracek(a)redhat.com> Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1200418 --- M vdsm/virt/vm.py 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/20/39220/1 diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py index 904c8e1..ed4975c 100644 --- a/vdsm/virt/vm.py +++ b/vdsm/virt/vm.py @@ -5510,6 +5510,10 @@ devType = x.getAttribute('type') mac = x.getElementsByTagName('mac')[0].getAttribute('address') alias = x.getElementsByTagName('alias')[0].getAttribute('name') + xdrivers = x.getElementsByTagName('driver') + driver = ({'name': xdrivers[0].getAttribute('name'), + 'queues': xdrivers[0].getAttribute('queues')} + if xdrivers else {}) if devType == 'hostdev': name = alias model = 'passthrough' @@ -5541,6 +5545,8 @@ nic.alias = alias nic.address = address nic.linkActive = linkActive + if driver: + nic.driver = driver # Update vm's conf with address for known nic devices knownDev = False for dev in self.conf['devices']: -- To view, visit https://gerrit.ovirt.org/39220 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I043b1c4b932cf0bc83b1f911415245e858ae350d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Petr Horáček <phoracek(a)redhat.com>

3 6

Change in vdsm[master]: veth: introduce a context manager to create and destroy a ve...
by osvoboda＠redhat.com 02 Jun '15

02 Jun '15

Ondřej Svoboda has uploaded a new change for review. Change subject: veth: introduce a context manager to create and destroy a veth pair ...................................................................... veth: introduce a context manager to create and destroy a veth pair Change-Id: I58688d23ea059ced35c77fd1c4262543582ae53b Signed-off-by: Ondřej Svoboda <osvoboda(a)redhat.com> --- M tests/functional/networkTests.py M tests/functional/veth.py M tests/netinfoTests.py 3 files changed, 39 insertions(+), 48 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/45/38945/1 diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py index 07f5e86..aa2a373 100644 --- a/tests/functional/networkTests.py +++ b/tests/functional/networkTests.py @@ -150,16 +150,6 @@ dummyPool.add(nic) -@contextmanager -def vethIf(): - """ Yields a tuple containing pair of veth devices.""" - (left, right) = veth.create() - try: - yield (left, right) - finally: - veth.remove(left) - - def _waitForKnownOperstate(device, timeout=1): with monitor.Monitor(groups=('link',), timeout=timeout) as mon: state = operstate(device).lower() @@ -421,7 +411,7 @@ <= (ARP_REQUEST_SIZE + DHCP_PACKET_SIZE), '%s is out of range' % diff) - with vethIf() as (left, right): + with veth.pair() as (left, right): # disabling IPv6 on Interface for removal of Router Solicitation sysctl.disable_ipv6(left) sysctl.disable_ipv6(right) @@ -1755,7 +1745,7 @@ if el6 and 6 in families: raise SkipTest("el6's dnsmasq does not support DHCPv6") - with vethIf() as (left, right): + with veth.pair() as (left, right): veth.setIP(left, IP_ADDRESS, IP_CIDR) veth.setIP(left, IPv6_ADDRESS, IPv6_CIDR, 6) veth.setLinkUp(left) @@ -1861,7 +1851,7 @@ ifcfg_bootproto) self.assertEqual(bridges[NETWORK_NAME]['dhcpv4'], dhcp) - with vethIf() as (left, right): + with veth.pair() as (left, right): veth.setIP(left, IP_ADDRESS, IP_CIDR) veth.setLinkUp(left) el6 = _system_is_el6() @@ -1885,7 +1875,7 @@ dhcpv4_ifaces = set() dhcpv6_ifaces = set() - with vethIf() as (server, client): + with veth.pair() as (server, client): veth.setIP(server, IP_ADDRESS, IP_CIDR) veth.setIP(server, IPv6_ADDRESS, IPv6_CIDR, 6) veth.setLinkUp(server) @@ -2170,7 +2160,7 @@ return [open('/proc/%s/cmdline' % pid).read().strip('\0') .split('\0')[-1] for pid in pids] - with vethIf() as (server, client): + with veth.pair() as (server, client): veth.setIP(server, IP_ADDRESS, IP_CIDR) veth.setLinkUp(server) with dnsmasqDhcp(server, _system_is_el6()): diff --git a/tests/functional/veth.py b/tests/functional/veth.py index d28fd6a..3f0b71d 100644 --- a/tests/functional/veth.py +++ b/tests/functional/veth.py @@ -16,32 +16,35 @@ # # Refer to the README and COPYING files for full details of the license # +from contextlib import contextmanager + from nose.plugins.skip import SkipTest -import dummy from vdsm.ipwrapper import linkAdd, IPRoute2Error from vdsm.utils import random_iface_name +import dummy -def create(prefix='veth_', max_length=15): + +@contextmanager +def pair(prefix='veth_', max_length=15): """ - Create a veth interface with a pseudo-random suffix (e.g. veth_m6Lz7uMK9c) - for both endpoints. Use the longest possible name length by default. - This assumes root privileges. + Yield a pair of veth devices. This assumes root privileges (currently + required by all tests anyway). + + Both sides of the pair have a pseudo-random suffix (e.g. veth_m6Lz7uMK9c). """ - leftPoint = random_iface_name(prefix, max_length) - rightPoint = random_iface_name(prefix, max_length) + left_side = random_iface_name(prefix, max_length) + right_side = random_iface_name(prefix, max_length) try: - linkAdd(leftPoint, linkType='veth', args=('peer', 'name', rightPoint)) + linkAdd(left_side, linkType='veth', + args=('peer', 'name', right_side)) + yield left_side, right_side except IPRoute2Error: - raise SkipTest('Failed to create a veth interface') - else: - return (leftPoint, rightPoint) - - -# the peer device is removed by the kernel -remove = dummy.remove -remove + raise SkipTest('Failed to create a veth pair.') + finally: + # the peer device is removed by the kernel + dummy.remove(left_side) setIP = dummy.setIP diff --git a/tests/netinfoTests.py b/tests/netinfoTests.py index d70f92a..fb43089 100644 --- a/tests/netinfoTests.py +++ b/tests/netinfoTests.py @@ -180,24 +180,22 @@ def testFakeNics(self): with MonkeyPatchScope([(ipwrapper.Link, '_fakeNics', ['veth_*', 'dummy_*'])]): - d1 = dummy.create() - d2 = dummy.create(prefix='mehd_') - v1a, v1b = veth.create() - v2a, v2b = veth.create(prefix='mehv_') + with veth.pair() as (v1a, v1b): + d1 = dummy.create() + fakes = set([d1, v1a, v1b]) + nics = netinfo.nics() + dummy.remove(d1) + self.assertTrue(fakes.issubset(nics), 'Fake devices %s are not' + ' listed in nics %s' % (fakes, nics)) - fakes = set([d1, v1a, v1b]) - hiddens = set([d2, v2a, v2b]) - nics = netinfo.nics() - dummy.remove(d1) - dummy.remove(d2) - veth.remove(v1a) - veth.remove(v2a) - - self.assertTrue(fakes.issubset(nics), 'Fake devices %s are not ' - 'listed in nics %s' % (fakes, nics)) - self.assertFalse(hiddens.intersection(nics), 'Some of hidden ' - 'devices %s is shown in nics %s' % (hiddens, - nics)) + with veth.pair(prefix='mehv_') as (v2a, v2b): + d2 = dummy.create(prefix='mehd_') + hiddens = set([d2, v2a, v2b]) + dummy.remove(d2) + nics = netinfo.nics() + self.assertFalse(hiddens.intersection(nics), 'Some of hidden ' + 'devices %s is shown in nics %s' % (hiddens, + nics)) def testGetIfaceCfg(self): deviceName = "___This_could_never_be_a_device_name___" -- To view, visit https://gerrit.ovirt.org/38945 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I58688d23ea059ced35c77fd1c4262543582ae53b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ondřej Svoboda <osvoboda(a)redhat.com>

6 17

Change in vdsm[master]: vm: Add _findConfDisk() helper
by Nir Soffer 01 Jun '15

01 Jun '15

Nir Soffer has uploaded a new change for review. Change subject: vm: Add _findConfDisk() helper ...................................................................... vm: Add _findConfDisk() helper The new helper eliminate duplicate code looking up a disk in Vm.conf dict in 3 methods. Change-Id: Ib3a59a2b798650035870c335ed7c949e2bd431d0 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M vdsm/virt/vm.py 1 file changed, 21 insertions(+), 25 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/17/40217/1 diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py index ec7ce9c..9e61cc4 100644 --- a/vdsm/virt/vm.py +++ b/vdsm/virt/vm.py @@ -2710,6 +2710,13 @@ raise LookupError("No such drive: '%s'" % drive) + def _findConfDisk(self, name): + devices = self.conf["devices"][:] + for device in devices: + if device['type'] == hwclass.DISK and device.get("name") == name: + return device + raise LookupError("No such disk %r" % name) + def updateDriveVolume(self, vmDrive): if not vmDrive.device == 'disk' or not isVdsmImage(vmDrive): return @@ -2741,14 +2748,13 @@ driveParams["name"]) # Updating the VM configuration - for vmDriveConfig in self.conf["devices"][:]: - if (vmDriveConfig['type'] == hwclass.DISK and - vmDriveConfig.get("name") == driveParams["name"]): - vmDriveConfig.update(driveParams) - break - else: + try: + disk = self._findConfDisk(driveParams["name"]) + except LookupError: self.log.error("Unable to update the device configuration ", - "for: %s", driveParams["name"]) + "for disk %s", driveParams["name"]) + else: + disk.update(driveParams) self.saveState() @@ -3001,15 +3007,10 @@ raise RuntimeError("Disk '%s' already has an ongoing " "replication" % drive.name) - for device in self.conf["devices"]: - if (device['type'] == hwclass.DISK - and device.get("name") == drive.name): - with self._confLock: - device['diskReplicate'] = replica - self.saveState() - break - else: - raise LookupError("No such drive: '%s'" % drive.name) + disk = self._findConfDisk(drive.name) + with self._confLock: + disk['diskReplicate'] = replica + self.saveState() drive.diskReplicate = replica @@ -3018,15 +3019,10 @@ This utility method is the inverse of _setDiskReplica, look at the _setDiskReplica description for more information. """ - for device in self.conf["devices"]: - if (device['type'] == hwclass.DISK - and device.get("name") == drive.name): - with self._confLock: - del device['diskReplicate'] - self.saveState() - break - else: - raise LookupError("No such drive: '%s'" % drive.name) + disk = self._findConfDisk(drive.name) + with self._confLock: + del disk['diskReplicate'] + self.saveState() del drive.diskReplicate -- To view, visit https://gerrit.ovirt.org/40217 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib3a59a2b798650035870c335ed7c949e2bd431d0 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

7 39

Change in vdsm[master]: dummy: move dummy_if from samplingTests as dummy.device, use...
by osvoboda＠redhat.com 01 Jun '15

01 Jun '15

Ondřej Svoboda has uploaded a new change for review. Change subject: dummy: move dummy_if from samplingTests as dummy.device, use in netinfoTests ...................................................................... dummy: move dummy_if from samplingTests as dummy.device, use in netinfoTests Change-Id: Ibd114b313a08f92503e6e7ba643f3c565a4eaf7b Signed-off-by: Ondřej Svoboda <osvoboda(a)redhat.com> --- M tests/functional/dummy.py M tests/netinfoTests.py M tests/samplingTests.py 3 files changed, 24 insertions(+), 24 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/33/37733/1 diff --git a/tests/functional/dummy.py b/tests/functional/dummy.py index 9385e45..8594734 100644 --- a/tests/functional/dummy.py +++ b/tests/functional/dummy.py @@ -16,6 +16,8 @@ # # Refer to the README and COPYING files for full details of the license # +from contextlib import contextmanager + from nose.plugins.skip import SkipTest from vdsm.ipwrapper import linkAdd, linkDel, addrAdd, linkSet, IPRoute2Error @@ -53,6 +55,15 @@ (dummy_name, e)) +@contextmanager +def device(prefix='dummy_', max_length=11): + dummy_name = create() + try: + yield dummy_name + finally: + remove(dummy_name) + + def setIP(dummy_name, ipaddr, netmask, family=4): try: addrAdd(dummy_name, ipaddr, netmask, family) diff --git a/tests/netinfoTests.py b/tests/netinfoTests.py index b64cc94..ef4bf64 100644 --- a/tests/netinfoTests.py +++ b/tests/netinfoTests.py @@ -182,21 +182,19 @@ with MonkeyPatchScope([(ipwrapper.Link, '_fakeNics', ['veth_*', 'dummy_*'])]): with veth.pair() as (v1a, v1b): - d1 = dummy.create() - fakes = set([d1, v1a, v1b]) - nics = netinfo.nics() - dummy.remove(d1) - self.assertTrue(fakes.issubset(nics), 'Fake devices %s are not' - ' listed in nics %s' % (fakes, nics)) + with dummy.device() as d1: + fakes = set([d1, v1a, v1b]) + nics = netinfo.nics() + self.assertTrue(fakes.issubset(nics), 'Fake devices %s are' + ' not listed in nics %s' % (fakes, nics)) with veth.pair(prefix='mehv_') as (v2a, v2b): - d2 = dummy.create(prefix='mehd_') - hiddens = set([d2, v2a, v2b]) - dummy.remove(d2) - nics = netinfo.nics() - self.assertFalse(hiddens.intersection(nics), 'Some of hidden ' - 'devices %s is shown in nics %s' % (hiddens, - nics)) + with dummy.device(prefix='mehd_') as d2: + hiddens = set([d2, v2a, v2b]) + nics = netinfo.nics() + self.assertFalse(hiddens.intersection(nics), 'Some of ' + 'hidden devices %s is shown in nics %s' % + (hiddens, nics)) def testGetIfaceCfg(self): deviceName = "___This_could_never_be_a_device_name___" diff --git a/tests/samplingTests.py b/tests/samplingTests.py index 1d0dd4d..3585530 100644 --- a/tests/samplingTests.py +++ b/tests/samplingTests.py @@ -112,15 +112,6 @@ @contextmanager -def dummy_if(): - dummy_name = dummy.create() - try: - yield dummy_name - finally: - dummy.remove(dummy_name) - - -@contextmanager def vlan(name, link, vlan_id): ipwrapper.linkAdd(name, 'vlan', link=link, args=['id', str(vlan_id)]) try: @@ -150,7 +141,7 @@ hs_before = sampling.HostSample(os.getpid()) interfaces_before = set(hs_before.interfaces.iterkeys()) - with dummy_if() as dummy_name: + with dummy.device() as dummy_name: hs_after = sampling.HostSample(os.getpid()) interfaces_after = set(hs_after.interfaces.iterkeys()) interfaces_diff = interfaces_after - interfaces_before @@ -167,7 +158,7 @@ with MonkeyPatchScope( [(ipwrapper, 'getLinks', faultyGetLinks)]): - with dummy_if() as dummy_name: + with dummy.device() as dummy_name: with vlan(self.NEW_VLAN, dummy_name, 999): hs = sampling.HostSample(os.getpid()) self.assertNotIn(self.NEW_VLAN, hs.interfaces) -- To view, visit http://gerrit.ovirt.org/37733 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibd114b313a08f92503e6e7ba643f3c565a4eaf7b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ondřej Svoboda <osvoboda(a)redhat.com>

6 35

Change in vdsm[master]: firewall: move the context manager from networkTests to the ...
by osvoboda＠redhat.com 31 May '15

31 May '15

Ondřej Svoboda has uploaded a new change for review. Change subject: firewall: move the context manager from networkTests to the module ...................................................................... firewall: move the context manager from networkTests to the module Change-Id: I125fed1a54492137675020d6dcbb4c70aa629ec3 Signed-off-by: Ondřej Svoboda <osvoboda(a)redhat.com> --- M tests/functional/firewall.py M tests/functional/networkTests.py 2 files changed, 15 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/43/37743/1 diff --git a/tests/functional/firewall.py b/tests/functional/firewall.py index 259f296..071e349 100644 --- a/tests/functional/firewall.py +++ b/tests/functional/firewall.py @@ -16,8 +16,9 @@ # # Refer to the README and COPYING files for full details of the license # - +from contextlib import contextmanager import logging + from nose.plugins.skip import SkipTest from vdsm.utils import CommandPath @@ -32,7 +33,17 @@ pass -def allowDhcp(veth): +@contextmanager +def allow_dhcp(interface): + """Temporarily allow DHCP traffic in firewall.""" + _allow_dhcp(interface) + try: + yield + finally: + _forbid_dhcp(interface) + + +def _allow_dhcp(veth): """Allows DHCP traffic on a testing veth interface. When using the iptables service, no other traffic is allowed. @@ -56,7 +67,7 @@ raise SkipTest('Failed to allow DHCP traffic in firewall: %s' % e) -def stopAllowingDhcp(veth): +def _forbid_dhcp(veth): """Removes the rules allowing DHCP on the testing veth interface. As the interface is expected to be removed from the system, diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py index 14cb10f..c721062 100644 --- a/tests/functional/networkTests.py +++ b/tests/functional/networkTests.py @@ -119,7 +119,7 @@ except dhcp.DhcpError as e: raise SkipTest(e) - with firewallDhcp(interface): + with firewall.allow_dhcp(interface): try: yield finally: @@ -140,16 +140,6 @@ finally: if has_nm: dhcp.removeNMplaceholderConnection(connectionName) - - -@contextmanager -def firewallDhcp(interface): - """ Adds and removes firewall rules for DHCP""" - firewall.allowDhcp(interface) - try: - yield - finally: - firewall.stopAllowingDhcp(interface) @contextmanager -- To view, visit http://gerrit.ovirt.org/37743 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I125fed1a54492137675020d6dcbb4c70aa629ec3 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ondřej Svoboda <osvoboda(a)redhat.com>

4 11

Change in vdsm[master]: detector: close acceptor when stopping detection
by Piotr Kliczewski 30 May '15

30 May '15

Piotr Kliczewski has uploaded a new change for review. Change subject: detector: close acceptor when stopping detection ...................................................................... detector: close acceptor when stopping detection Change-Id: I92e24b6265a7480218a7271e8c6242a78bb535cf Signed-off-by: pkliczewski <piotr.kliczewski(a)gmail.com> --- M vdsm/protocoldetector.py 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/25/39725/1 diff --git a/vdsm/protocoldetector.py b/vdsm/protocoldetector.py index e3c8312..c5b5e32 100644 --- a/vdsm/protocoldetector.py +++ b/vdsm/protocoldetector.py @@ -217,6 +217,7 @@ def stop(self): self.log.debug("Stopping Acceptor") self._reactor.stop() + self._acceptor.close() class _CannotDetectProtocol(Exception): -- To view, visit https://gerrit.ovirt.org/39725 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I92e24b6265a7480218a7271e8c6242a78bb535cf Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>

6 18

Change in vdsm[master]: v2v: add format for disk conversion
by shavivi＠redhat.com 30 May '15

30 May '15

Shahar Havivi has uploaded a new change for review. Change subject: v2v: add format for disk conversion ...................................................................... v2v: add format for disk conversion Change-Id: I1da72771c9b02fa741cc84aa7159e862675fb577 Signed-off-by: Shahar Havivi <shaharh(a)redhat.com> --- M vdsm/v2v.py 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/43/40343/1 diff --git a/vdsm/v2v.py b/vdsm/v2v.py index ccc7e83..c3f92f4 100644 --- a/vdsm/v2v.py +++ b/vdsm/v2v.py @@ -416,7 +416,8 @@ (self._id, event)) def _create_command(self): - cmd = [_VIRT_V2V.cmd, '-ic', self._uri, '-o', 'vdsm', '-of', 'raw'] + fmt = self._vminfo.get('format', 'raw') + cmd = [_VIRT_V2V.cmd, '-ic', self._uri, '-o', 'vdsm', '-of', fmt] cmd.extend(self._generate_disk_parameters()) cmd.extend(['--password-file', self._passwd_file, -- To view, visit https://gerrit.ovirt.org/40343 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1da72771c9b02fa741cc84aa7159e862675fb577 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Shahar Havivi <shavivi(a)redhat.com>

7 23

Change in vdsm[master]: sourceroute: move static methods out of classes and simplify...
by osvoboda＠redhat.com 29 May '15

29 May '15

Ondřej Svoboda has uploaded a new change for review. Change subject: sourceroute: move static methods out of classes and simplify test code ...................................................................... sourceroute: move static methods out of classes and simplify test code Change-Id: I7906cb20fb34fb09f0de18407cea8f270d710471 Signed-off-by: Ondřej Svoboda <osvoboda(a)redhat.com> --- M tests/functional/networkTests.py M vdsm/network/sourceroute.py M vdsm/network/sourceroutethread.py 3 files changed, 139 insertions(+), 151 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/35/37835/1 diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py index 4c75dad..8b5d8c6 100644 --- a/tests/functional/networkTests.py +++ b/tests/functional/networkTests.py @@ -36,9 +36,8 @@ from vdsm.utils import CommandPath, RollbackContext, execCmd, pgrep, running import caps -from network import api, errors, tc +from network import api, errors, sourceroute, tc from network.configurators.ifcfg import Ifcfg -from network.sourceroute import StaticSourceRoute from hookValidation import ValidatesHook from testlib import (VdsmTestCase as TestCaseBase, namedTemporaryDir, @@ -202,6 +201,11 @@ and caps.osversion()['version'].startswith('6')) +def _get_source_route(device_name, ipv4_address): + return sourceroute.StaticSourceRoute( + device, None, ipv4_address, IP_MASK, IP_GATEWAY) + + @expandPermutations class NetworkTest(TestCaseBase): @@ -334,25 +338,14 @@ if ruleExists(rule): raise self.failureException("routing rule {0} found".format(rule)) - def getSourceRoutingRules(self, deviceName, ip_addr): - return (StaticSourceRoute(deviceName, None, ip_addr, - IP_MASK, IP_GATEWAY))._buildRules() - - def getSourceRoutingRoutes(self, deviceName, ip_addr): - return (StaticSourceRoute(deviceName, None, ip_addr, - IP_MASK, IP_GATEWAY))._buildRoutes() - - def getSourceRoutingTable(self, deviceName, ip_addr): - return (StaticSourceRoute(deviceName, None, ip_addr, - IP_MASK, IP_GATEWAY))._table - - def assertSourceRoutingConfiguration(self, deviceName, ip_addr): + def assertSourceRoutingConfiguration(self, device_name, ipv4_address): """assert that the IP rules and the routing tables pointed by them are configured correctly in order to implement source routing""" - table = self.getSourceRoutingTable(deviceName, ip_addr) - for route in self.getSourceRoutingRoutes(deviceName, ip_addr): + source_route = _get_source_route(device_name, ipv4_address) + table = sourceroute._generateTableId(ipv4_address) + for route in source_route._buildRoutes(): self.assertRouteExists(route, table) - for rule in self.getSourceRoutingRules(deviceName, ip_addr): + for rule in source_route._buildRules(): self.assertRuleExists(rule) def assertMtu(self, mtu, *elems): @@ -1517,9 +1510,10 @@ self.assertEqual(status, SUCCESS, msg) # Assert that routes and rules don't exist - for route in self.getSourceRoutingRoutes(deviceName, ip_addr): + source_route = _get_source_route(deviceName, ip_addr) + for route in source_route._buildRoutes(): self.assertRouteDoesNotExist(route) - for rule in self.getSourceRoutingRules(deviceName, ip_addr): + for rule in source_route._buildRules(): self.assertRuleDoesNotExist(rule) @cleanupNet @@ -1807,13 +1801,10 @@ # Assert that routes and rules don't exist if dhcpv4: - routes = self.getSourceRoutingRoutes(device_name, - ip_addr) - for route in routes: + source_route = _get_source_route(device_name, ip_addr) + for route in source_route._buildRoutes(): self.assertRouteDoesNotExist(route) - rules = self.getSourceRoutingRules(device_name, - ip_addr) - for rule in rules: + for rule in source_route._buildRules(): self.assertRuleDoesNotExist(rule) finally: dhcp.delete_dhclient_leases( diff --git a/vdsm/network/sourceroute.py b/vdsm/network/sourceroute.py index bf11162..d871591 100644 --- a/vdsm/network/sourceroute.py +++ b/vdsm/network/sourceroute.py @@ -43,18 +43,8 @@ self._ipaddr = ipaddr self._mask = mask self._gateway = gateway - self._table = str(self._generateTableId(ipaddr)) if ipaddr else None - self._network = self._parse_network(ipaddr, mask) - - def _parse_network(self, ipaddr, mask): - if not ipaddr or not mask: - return None - network = netaddr.IPNetwork('%s/%s' % (ipaddr, mask)) - return "%s/%s" % (network.network, network.prefixlen) - - def _generateTableId(self, ipaddr): - # TODO: Future proof for IPv6 - return netaddr.IPAddress(ipaddr).value + self._table = str(_generateTableId(ipaddr)) if ipaddr else None + self._network = _parse_network(ipaddr, mask) def _buildRoutes(self): return [Route(network='0.0.0.0/0', via=self._gateway, @@ -86,127 +76,133 @@ self._configurator.removeSourceRoute(None, None, self.device) +def _generateTableId(ipaddr): + # TODO: Future proof for IPv6 + return netaddr.IPAddress(ipaddr).value + + +def _parse_network(ipaddr, mask): + if not ipaddr or not mask: + return None + network = netaddr.IPNetwork('%s/%s' % (ipaddr, mask)) + return "%s/%s" % (network.network, network.prefixlen) + + class DynamicSourceRoute(StaticSourceRoute): - @staticmethod - def getTrackingFilePath(device): - return os.path.join(TRACKED_INTERFACES_FOLDER, device) - - @staticmethod - def addInterfaceTracking(device): - if device.ipConfig.bootproto == 'dhcp': - open(DynamicSourceRoute.getTrackingFilePath(device.name), 'a').\ - close() - - @staticmethod - def removeInterfaceTracking(device): - rmFile(DynamicSourceRoute.getTrackingFilePath(device)) - - @staticmethod - def _getRoutes(table): - routes = [] - for entry in routeShowTable('all'): - try: - route = Route.fromText(entry) - except ValueError: - logging.debug("Could not parse route %s", entry) - else: - if route.table == table: - routes.append(route) - return routes - - @staticmethod - def _getTable(rules): - if rules: - return rules[0].table - else: - logging.error("Table not found") - return None - - @staticmethod - def _getRules(device): - """ - 32764: from all to 10.35.0.0/23 iif ovirtmgmt lookup 170066094 - 32765: from 10.35.0.0/23 lookup 170066094 - - The first rule we'll find directly via the interface name - We'll then use that rule's destination network, and use it - to find the second rule via its source network - """ - allRules = [] - for entry in ruleList(): - try: - rule = Rule.fromText(entry) - except ValueError: - logging.debug("Could not parse rule %s", entry) - else: - allRules.append(rule) - - # Find the rule we put in place with 'device' as its 'srcDevice' - rules = [r for r in allRules if r.srcDevice == device] - - if not rules: - logging.error("Routing rules not found for device %s", device) - return - - # Extract its destination network - network = rules[0].destination - - # Find the other rule we put in place - It'll have 'network' as - # its source - rules += [r for r in allRules if r.source == network] - - return rules - def remove(self): logging.info("Removing gateway - device: %s", self.device) - rules = self._getRules(self.device) + rules = _getRules(self.device) if rules: - table = self._getTable(rules) + table = _getTable(rules) if table: try: self._configurator.removeSourceRoute( - self._getRoutes(table), rules, - self.device) + _getRoutes(table), rules, self.device) except IPRoute2Error as e: logging.error('ip binary failed during source route ' - 'removal: %s' % e.message) + 'removal: %s', e.message) - @staticmethod - def _isLibvirtInterfaceFallback(device): - """ - Checks whether the device belongs to libvirt when libvirt is not yet - running (network.service runs before libvirtd is started). To do so, - it must check if there is an autostart network that uses the device. - """ - bridged_name = "bridge name='%s'" % device - bridgeless_name = "interface dev='%s'" % device - for filename in iglob('/etc/libvirt/qemu/networks/autostart/' - 'vdsm-*'): - with open(filename, 'r') as xml_file: - xml_content = xml_file.read() - if bridged_name in xml_content or \ - bridgeless_name in xml_content: - return True - return False - @staticmethod - def _isLibvirtInterface(device): +def addInterfaceTracking(device): + if device.ipConfig.bootproto == 'dhcp': + open(_getTrackingFilePath(device.name), 'a').close() + + +def removeInterfaceTracking(device): + rmFile(_getTrackingFilePath(device)) + + +def isVDSMInterface(device): + if os.path.exists(_getTrackingFilePath(device)): + return True + else: + return _isLibvirtInterface(device) + + +def _getTrackingFilePath(device): + return os.path.join(TRACKED_INTERFACES_FOLDER, device) + + +def _getRoutes(table): + routes = [] + for entry in routeShowTable('all'): try: - networks = netinfo.networks() - except libvirtError: # libvirt might not be started or it just fails - logging.error('Libvirt failed to answer. It might be the case that' - ' this script is being run before libvirt startup. ' - ' Thus, check if vdsm owns %s an alternative way' % - device) - return DynamicSourceRoute._isLibvirtInterfaceFallback(device) - trackedInterfaces = [network.get('bridge') or network.get('iface') - for network in networks.itervalues()] - return device in trackedInterfaces - - @staticmethod - def isVDSMInterface(device): - if os.path.exists(DynamicSourceRoute.getTrackingFilePath(device)): - return True + route = Route.fromText(entry) + except ValueError: + logging.debug("Could not parse route %s", entry) else: - return DynamicSourceRoute._isLibvirtInterface(device) + if route.table == table: + routes.append(route) + return routes + + +def _getTable(rules): + if rules: + return rules[0].table + else: + logging.error("Table not found") + return None + + +def _getRules(device): + """ + 32764: from all to 10.35.0.0/23 iif ovirtmgmt lookup 170066094 + 32765: from 10.35.0.0/23 lookup 170066094 + + The first rule we'll find directly via the interface name + We'll then use that rule's destination network, and use it + to find the second rule via its source network + """ + allRules = [] + for entry in ruleList(): + try: + rule = Rule.fromText(entry) + except ValueError: + logging.debug("Could not parse rule %s", entry) + else: + allRules.append(rule) + + # Find the rule we put in place with 'device' as its 'srcDevice' + rules = [r for r in allRules if r.srcDevice == device] + + if not rules: + logging.error("Routing rules not found for device %s", device) + return + + # Extract its destination network + network = rules[0].destination + + # Find the other rule we put in place - It'll have 'network' as its source + rules += [r for r in allRules if r.source == network] + + return rules + + +def _isLibvirtInterface(device): + try: + networks = netinfo.networks() + except libvirtError: # libvirt might not be started or it just fails + logging.error('libvirt failed to answer. It might be the case that ' + 'this script is being run before libvirt startup. Thus, ' + 'check if VDSM owns %s an alternative way', device) + return _isLibvirtInterfaceFallback(device) + trackedInterfaces = [network.get('bridge') or network.get('iface') + for network in networks.itervalues()] + return device in trackedInterfaces + + +def _isLibvirtInterfaceFallback(device): + """ + Checks whether the device belongs to libvirt when libvirt is not yet + running (network.service runs before libvirtd is started). To do so, + it must check if there is an autostart network that uses the device. + """ + bridged_name = "bridge name='%s'" % device + bridgeless_name = "interface dev='%s'" % device + for filename in iglob('/etc/libvirt/qemu/networks/autostart/vdsm-*'): + with open(filename, 'r') as xml_file: + xml_content = xml_file.read() + if bridged_name in xml_content or bridgeless_name in xml_content: + return True + return False diff --git a/vdsm/network/sourceroutethread.py b/vdsm/network/sourceroutethread.py index 928384e..752bcb0 100644 --- a/vdsm/network/sourceroutethread.py +++ b/vdsm/network/sourceroutethread.py @@ -26,7 +26,8 @@ from vdsm import utils from .configurators.iproute2 import Iproute2 -from .sourceroute import DynamicSourceRoute +from .sourceroute import (DynamicSourceRoute, isVDSMInterface, + removeInterfaceTracking) SOURCE_ROUTES_FOLDER = P_VDSM_RUN + 'sourceRoutes' @@ -41,7 +42,7 @@ action = sourceRouteContents[0] device = sourceRouteContents[-1] - if DynamicSourceRoute.isVDSMInterface(device): + if isVDSMInterface(device): if action == 'configure': ip = sourceRouteContents[1] mask = sourceRouteContents[2] @@ -58,7 +59,7 @@ else: logging.info("interface %s is not a libvirt interface", device) - DynamicSourceRoute.removeInterfaceTracking(device) + removeInterfaceTracking(device) os.remove(sourceRouteFilePath) -- To view, visit http://gerrit.ovirt.org/37835 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7906cb20fb34fb09f0de18407cea8f270d710471 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ondřej Svoboda <osvoboda(a)redhat.com>

3 11

Change in vdsm[master]: models, configurators: replace the internal 'async' flag wit...
by osvoboda＠redhat.com 28 May '15

28 May '15

Ondřej Svoboda has uploaded a new change for review. Change subject: models, configurators: replace the internal 'async' flag with blockingdhcp ...................................................................... models, configurators: replace the internal 'async' flag with blockingdhcp DHCP is queried asynchronously in usual situations so it is better to use a flag that signals some exceptional flow (network restoration, for example). blockingdhcp is also a part of the API so now there is direct correspondence between network configurators' code and the API. Change-Id: I0e60040320d65ddbc4146a31c02c388ddad13ea9 Signed-off-by: Ondřej Svoboda <osvoboda(a)redhat.com> --- M vdsm/network/configurators/__init__.py M vdsm/network/configurators/dhclient.py M vdsm/network/configurators/ifcfg.py M vdsm/network/models.py 4 files changed, 14 insertions(+), 18 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/56/40456/1 diff --git a/vdsm/network/configurators/__init__.py b/vdsm/network/configurators/__init__.py index 0df5731..39679c5 100644 --- a/vdsm/network/configurators/__init__.py +++ b/vdsm/network/configurators/__init__.py @@ -177,7 +177,7 @@ def runDhclient(iface, family=4): dhclient = DhcpClient(iface.name, family) - rc = dhclient.start(iface.asynchronous_dhcp) - if not iface.asynchronous_dhcp and rc: + rc = dhclient.start(iface.blockingdhcp) + if iface.blockingdhcp and rc: raise ConfigNetworkError(ERR_FAILED_IFUP, 'dhclient%s failed', family) diff --git a/vdsm/network/configurators/dhclient.py b/vdsm/network/configurators/dhclient.py index f6db491..8b78cc7 100644 --- a/vdsm/network/configurators/dhclient.py +++ b/vdsm/network/configurators/dhclient.py @@ -55,15 +55,15 @@ '-lf', self.leaseFile, self.iface]) return rc, out, err - def start(self, async): - if async: + def start(self, blocking): + if blocking: + rc, _, _ = self._dhclient() + return rc + else: t = threading.Thread(target=self._dhclient, name='vdsm-dhclient-%s' % self.iface) t.daemon = True t.start() - else: - rc, _, _ = self._dhclient() - return rc def shutdown(self): try: diff --git a/vdsm/network/configurators/ifcfg.py b/vdsm/network/configurators/ifcfg.py index 6d35c0a..2a5faba 100644 --- a/vdsm/network/configurators/ifcfg.py +++ b/vdsm/network/configurators/ifcfg.py @@ -90,13 +90,13 @@ if bridge.port: bridge.port.configure(**opts) self._addSourceRoute(bridge) - ifup(bridge.name, bridge.asynchronous_dhcp) + ifup(bridge.name) def configureVlan(self, vlan, **opts): self.configApplier.addVlan(vlan, **opts) vlan.device.configure(**opts) self._addSourceRoute(vlan) - ifup(vlan.name, vlan.asynchronous_dhcp) + ifup(vlan.name) def configureBond(self, bond, **opts): self.configApplier.addBonding(bond, **opts) @@ -106,7 +106,7 @@ for slave in bond.slaves: slave.configure(**opts) self._addSourceRoute(bond) - ifup(bond.name, bond.asynchronous_dhcp) + ifup(bond.name) if self.unifiedPersistence: self.runningConfig.setBonding( bond.name, {'options': bond.options, @@ -159,7 +159,7 @@ if nic.bond is None: if not netinfo.isVlanned(nic.name): ifdown(nic.name) - ifup(nic.name, nic.asynchronous_dhcp) + ifup(nic.name) def removeBridge(self, bridge): DynamicSourceRoute.addInterfaceTracking(bridge) @@ -764,7 +764,7 @@ return rc -def ifup(iface, async=False): +def ifup(iface): "Bring up an interface" def _ifup(netIf): rc, out, err = utils.execCmd([constants.EXT_IFUP, netIf], raw=False) @@ -775,7 +775,8 @@ raise ConfigNetworkError(ERR_FAILED_IFUP, out[-1] if out else '') return rc, out, err - if async: + if not iface.blockingdhcp and (iface.ipv4.bootproto == 'dhcp' or + iface.ipv6.dhcpv6): # wait for dhcp in another thread, # so vdsm won't get stuck (BZ#498940) t = threading.Thread(target=_ifup, name='ifup-waiting-on-dhcp', diff --git a/vdsm/network/models.py b/vdsm/network/models.py index 708bad8..5365797 100644 --- a/vdsm/network/models.py +++ b/vdsm/network/models.py @@ -80,11 +80,6 @@ def backing_device(self): return False - @property - def asynchronous_dhcp(self): - return ((self.ipv4.bootproto == 'dhcp' or self.ipv6.dhcpv6) and - not self.blockingdhcp) - class Nic(NetDevice): def __init__(self, name, configurator, ipv4=None, ipv6=None, -- To view, visit https://gerrit.ovirt.org/40456 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0e60040320d65ddbc4146a31c02c388ddad13ea9 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ondřej Svoboda <osvoboda(a)redhat.com>

5 23

Change in vdsm[master]: network: support PCI passthrough of SR-IOV network interface...
by ibarkan＠redhat.com 27 May '15

27 May '15

Ido Barkan has uploaded a new change for review. Change subject: network: support PCI passthrough of SR-IOV network interfaces. Only SR-IOV (Single Root I/O Virtualization) virtual function (VF) devices can be assigned in this manner. ...................................................................... network: support PCI passthrough of SR-IOV network interfaces. Only SR-IOV (Single Root I/O Virtualization) virtual function (VF) devices can be assigned in this manner. Change-Id: Ib962fbf1bb08cd5b82b649cc05612471e4e4d0b8 Signed-off-by: Ido Barkan <ibarkan(a)redhat.com> --- M vdsm/virt/vmdevices/hostdevice.py M vdsm/virt/vmdevices/hwclass.py 2 files changed, 46 insertions(+), 15 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/49/38249/1 diff --git a/vdsm/virt/vmdevices/hostdevice.py b/vdsm/virt/vmdevices/hostdevice.py index d61ef45..96e9adb 100644 --- a/vdsm/virt/vmdevices/hostdevice.py +++ b/vdsm/virt/vmdevices/hostdevice.py @@ -24,11 +24,12 @@ class HostDevice(core.Base): - __slots__ = ('name', '_deviceParams') + __slots__ = ('name', '_deviceParams', '_mac_address') def __init__(self, conf, log, **kwargs): super(HostDevice, self).__init__(conf, log, **kwargs) self._deviceParams = {} + self._mac_address = kwargs.get('mac_address') def detach(self): """ @@ -38,28 +39,33 @@ self._deviceParams = detach_detachable(self.name) def getXML(self): - """ - Create domxml for a host device. + if self._mac_address: + return self._build_network_host_device() + else: + return self._build_standard_host_device() - <devices> - <hostdev mode='subsystem' type='pci' managed='yes'> - <source> - <address domain='0x0000' bus='0x06' slot='0x02' function='0x0'/> - </source> - <boot order='1'/> - <rom bar='on' file='/etc/fake/boot.bin'/> - </hostdev> - </devices> + def _build_standard_host_device(self): """ + Create domxml for a host device. + + <devices> + <hostdev mode='subsystem' type='pci' managed='yes'> + <source> + <address domain='0x0000' bus='0x06' slot='0x02' + function='0x0'/> + </source> + <boot order='1'/> + <rom bar='on' file='/etc/fake/boot.bin'/> + </hostdev> + </devices> + """ hostdev = self.createXmlElem(hwclass.HOSTDEV, None) hostdev.setAttrs(managed='no', mode='subsystem', type=self._deviceParams['capability']) source = hostdev.appendChildWithArgs('source') - if 'bootOrder' in self.specParams: hostdev.appendChildWithArgs( 'boot', order=self.specParams['bootOrder']) - if self._deviceParams['capability'] == 'pci': source.appendChildWithArgs('address', None, **self._deviceParams['address']) @@ -75,5 +81,29 @@ romAttrs['file'] = self.specParams['file'] rom.setAttrs(**romAttrs) - return hostdev + + def _build_network_host_device(self): + """ + Create domxml for a host device. + + <devices> + <interface type='hostdev' managed='no'> + <driver name='vfio'/> + <source> + <address type='pci' domain='0x0000' bus='0x00' slot='0x07' + function='0x0'/> + </source> + <mac address='52:54:00:6d:90:02'/> + </interface> + </devices> + """ + interface = self.createXmlElem(hwclass.INTERFACE, hwclass.HOSTDEV) + interface.setAttrs(managed='no') + interface.appendChildWithArgs('driver', name='vfio') + source = interface.appendChildWithArgs('source') + source.appendChildWithArgs('address', **self._deviceParams['address']) + if self._mac_address: + interface.appendChildWithArgs('mac', address=self._mac_address) + + return interface diff --git a/vdsm/virt/vmdevices/hwclass.py b/vdsm/virt/vmdevices/hwclass.py index 2a55ee8..afaba53 100644 --- a/vdsm/virt/vmdevices/hwclass.py +++ b/vdsm/virt/vmdevices/hwclass.py @@ -34,3 +34,4 @@ SMARTCARD = 'smartcard' TPM = 'tpm' HOSTDEV = 'hostdev' +INTERFACE = 'interface' -- To view, visit https://gerrit.ovirt.org/38249 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib962fbf1bb08cd5b82b649cc05612471e4e4d0b8 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ido Barkan <ibarkan(a)redhat.com>

6 58

← Newer
1
...
21
22
23
24
25
26
27
...
80
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches April 2015