Change in vdsm[master]: getParent
by automation@ovirt.org
automation(a)ovirt.org has posted comments on this change.
Change subject: getParent
......................................................................
Patch Set 1:
* Update tracker::IGNORE, no Bug-Url found
* Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url.
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])
--
To view, visit https://gerrit.ovirt.org/41848
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I8489e18c431c89728c180735938a51dfc278671b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Adam Litke <alitke(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No
9 years
Change in vdsm[master]: metadata write utils
by automation@ovirt.org
automation(a)ovirt.org has posted comments on this change.
Change subject: metadata write utils
......................................................................
Patch Set 1:
* Update tracker::IGNORE, no Bug-Url found
* Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url.
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])
--
To view, visit https://gerrit.ovirt.org/41847
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ia245c589ea6bc2cf9ac1b2b59b9073d1b5fc9595
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Adam Litke <alitke(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No
9 years
Change in vdsm[master]: Metadata read utils
by automation@ovirt.org
automation(a)ovirt.org has posted comments on this change.
Change subject: Metadata read utils
......................................................................
Patch Set 1:
* Update tracker::IGNORE, no Bug-Url found
* Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url.
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])
--
To view, visit https://gerrit.ovirt.org/41846
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I5e02ad8138bae0b1d60b032662afbad15dd4feba
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Adam Litke <alitke(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No
9 years
Change in vdsm[master]: introduce uuid properties
by automation@ovirt.org
automation(a)ovirt.org has posted comments on this change.
Change subject: introduce uuid properties
......................................................................
Patch Set 1:
* Update tracker::IGNORE, no Bug-Url found
* Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url.
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])
--
To view, visit https://gerrit.ovirt.org/41845
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: If9b01fcfde212465115262d884ad76d11cf92519
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Adam Litke <alitke(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No
9 years
Change in vdsm[master]: add constructors
by automation@ovirt.org
automation(a)ovirt.org has posted comments on this change.
Change subject: add constructors
......................................................................
Patch Set 1:
* Update tracker::IGNORE, no Bug-Url found
* Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url.
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])
--
To view, visit https://gerrit.ovirt.org/41844
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I0552bea23b04b9e58e5d2cc7e016103d03194d1a
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Adam Litke <alitke(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No
9 years
Change in vdsm[master]: ssl: m2crypto removal
by ybronhei@redhat.com
Yaniv Bronhaim has posted comments on this change.
Change subject: ssl: m2crypto removal
......................................................................
Patch Set 7: Code-Review+1
--
To view, visit https://gerrit.ovirt.org/39990
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I3f2688b6c00eadd3f15be0ced926a397b55c1f33
Gerrit-PatchSet: 7
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com>
Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Dima Kuznetsov <dkuznets(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Ido Barkan <ibarkan(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com>
Gerrit-Reviewer: Simone Tiraboschi <stirabos(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: Yeela Kaplan <ykaplan(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No
9 years
Change in vdsm[ovirt-3.5]: avoid changing running libvirtd with upstart when running ov...
by ybronhei@redhat.com
Yaniv Bronhaim has uploaded a new change for review.
Change subject: avoid changing running libvirtd with upstart when running over node
......................................................................
avoid changing running libvirtd with upstart when running over node
node doesn't install libvirt doc files. libvirtd.upstart is a sample
file which part of libvirt docs. Because its currently missing this
patch avoid checking that.
Change-Id: I065d5e885301bf2899daaa9976dc32635dfc322e
Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com>
---
M lib/vdsm/tool/configurators/libvirt.py
1 file changed, 12 insertions(+), 8 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/74/41574/1
diff --git a/lib/vdsm/tool/configurators/libvirt.py b/lib/vdsm/tool/configurators/libvirt.py
index 8dc9831..6f34703 100644
--- a/lib/vdsm/tool/configurators/libvirt.py
+++ b/lib/vdsm/tool/configurators/libvirt.py
@@ -97,16 +97,20 @@
if not self._openConfig(path).hasConf():
ret = NOT_CONFIGURED
- # hack for rhbz#1222154: we need to check whether we have forgotten to
- # disabled libvirtd's sysv service. If chkconfig returns 0, it means
+ # #1 hack for rhbz#1222154: we need to check whether we have forgotten
+ # to disabled libvirtd's sysv service. If chkconfig returns 0, it means
# that sysv would run libvirtd. If chkconfig returns 1 or does not
# exist (el7, fedora, debian), all is well.
- if hasattr(service, 'chkconfigList'):
- try:
- if service.chkconfigList('libvirtd'):
- ret = NOT_CONFIGURED
- except service.ServiceNotExistError:
- pass
+
+ # #2 hack: ovirt node we doesn't install upstarts file, so avoid
+ # this check until having it installed properly
+ if not utils.isOvirtNode():
+ if hasattr(service, 'chkconfigList'):
+ try:
+ if service.chkconfigList('libvirtd'):
+ ret = NOT_CONFIGURED
+ except service.ServiceNotExistError:
+ pass
if ret == NOT_SURE:
sys.stdout.write("libvirt is already configured for vdsm\n")
--
To view, visit https://gerrit.ovirt.org/41574
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I065d5e885301bf2899daaa9976dc32635dfc322e
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>
9 years
Change in vdsm[ovirt-3.5]: Revert "patch to avoid using upstarts when libvirtd.upstart ...
by ybronhei@redhat.com
Yaniv Bronhaim has uploaded a new change for review.
Change subject: Revert "patch to avoid using upstarts when libvirtd.upstart not exist"
......................................................................
Revert "patch to avoid using upstarts when libvirtd.upstart not exist"
this patch fails ovirt-node. libvirtd.upstart exists in rpm but not
installed.
Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com>
This reverts commit cf0fdf03ce8af5e4fe7f5f7150d631271d532700.
Change-Id: I289ee957cb5dd039218d0b9ac5ba50b65dd5d6cf
---
M lib/vdsm/tool/configurators/libvirt.py
1 file changed, 46 insertions(+), 51 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/15/41815/1
diff --git a/lib/vdsm/tool/configurators/libvirt.py b/lib/vdsm/tool/configurators/libvirt.py
index 4cc83df..8dc9831 100644
--- a/lib/vdsm/tool/configurators/libvirt.py
+++ b/lib/vdsm/tool/configurators/libvirt.py
@@ -50,8 +50,6 @@
class Libvirt(ModuleConfigure):
- INITCTL = '/sbin/initctl'
-
def getName(self):
return 'libvirt'
@@ -62,9 +60,7 @@
return ["vdsmd", "supervdsmd", "libvirtd"]
def configure(self):
- packaged = self._isUpstartAvailable()
- if packaged is not None:
- self._sysvToUpstart(packaged)
+ self._sysvToUpstart()
if utils.isOvirtNode():
if not os.path.exists(constants.P_VDSM_CERT):
@@ -105,13 +101,12 @@
# disabled libvirtd's sysv service. If chkconfig returns 0, it means
# that sysv would run libvirtd. If chkconfig returns 1 or does not
# exist (el7, fedora, debian), all is well.
- if self._isUpstartAvailable() is not None:
- if hasattr(service, 'chkconfigList'):
- try:
- if service.chkconfigList('libvirtd'):
- ret = NOT_CONFIGURED
- except service.ServiceNotExistError:
- pass
+ if hasattr(service, 'chkconfigList'):
+ try:
+ if service.chkconfigList('libvirtd'):
+ ret = NOT_CONFIGURED
+ except service.ServiceNotExistError:
+ pass
if ret == NOT_SURE:
sys.stdout.write("libvirt is already configured for vdsm\n")
@@ -135,7 +130,12 @@
if cfile['persisted']
]
- def _isUpstartAvailable(self):
+ def _sysvToUpstart(self):
+ """
+ On RHEL 6, libvirtd can be started by either SysV init or Upstart.
+ We prefer upstart because it respawns libvirtd if libvirtd
+ crashed.
+ """
def iterateLibvirtFiles():
ts = rpm.TransactionSet()
for name in ['libvirt', 'libvirt-daemon']:
@@ -143,27 +143,8 @@
for filename in matches[rpm.RPMTAG_FILENAMES]:
yield filename
- LIBVIRTD_UPSTART = 'libvirtd.upstart'
- packaged = None
- if os.path.isfile(self.INITCTL) and os.access(self.INITCTL, os.X_OK):
- # libvirtd package does not provide libvirtd.upstart,
- # this could happen in Ubuntu or other distro,
- # so continue to use system default init mechanism
- for fname in iterateLibvirtFiles():
- if os.path.basename(fname) == LIBVIRTD_UPSTART:
- packaged = fname
- break
-
- return packaged
-
- def _sysvToUpstart(self, packaged):
- """
- On RHEL 6, libvirtd can be started by either SysV init or Upstart.
- We prefer upstart because it respawns libvirtd if libvirtd
- crashed.
- """
def reloadConfiguration():
- rc, out, err = utils.execCmd((self.INITCTL,
+ rc, out, err = utils.execCmd((INITCTL,
"reload-configuration"))
if rc != 0:
sys.stdout.write(out)
@@ -171,27 +152,41 @@
raise InvalidRun(
"Failed to reload upstart configuration.")
+ INITCTL = '/sbin/initctl'
+ LIBVIRTD_UPSTART = 'libvirtd.upstart'
TARGET = os.path.join(constants.SYSCONF_PATH, "init/libvirtd.conf")
- if hasattr(service, '_chkconfigDisable'):
- service._chkconfigDisable('libvirtd')
- if not os.path.isfile(TARGET):
- service.service_stop('libvirtd')
- if (not os.path.isfile(TARGET) or
- not filecmp.cmp(packaged, TARGET)):
- oldmod = None
- if os.path.isfile(TARGET):
- oldmod = os.stat(TARGET).st_mode
- if utils.isOvirtNode():
- NodeCfg().unpersist(TARGET)
- shutil.copyfile(packaged, TARGET)
- if utils.isOvirtNode():
- NodeCfg().persist(TARGET)
+ if os.path.isfile(INITCTL) and os.access(INITCTL, os.X_OK):
+ # libvirtd package does not provide libvirtd.upstart,
+ # this could happen in Ubuntu or other distro,
+ # so continue to use system default init mechanism
+ packaged = ''
+ for fname in iterateLibvirtFiles():
+ if os.path.basename(fname) == LIBVIRTD_UPSTART:
+ packaged = fname
+ break
- if (oldmod is not None and
- oldmod != os.stat(TARGET).st_mode):
- os.chmod(TARGET, oldmod)
- reloadConfiguration()
+ if os.path.isfile(packaged):
+ if hasattr(service, '_chkconfigDisable'):
+ service._chkconfigDisable('libvirtd')
+ if not os.path.isfile(TARGET):
+ service.service_stop('libvirtd')
+ if (not os.path.isfile(TARGET) or
+ not filecmp.cmp(packaged, TARGET)):
+ oldmod = None
+ if os.path.isfile(TARGET):
+ oldmod = os.stat(TARGET).st_mode
+
+ if utils.isOvirtNode():
+ NodeCfg().unpersist(TARGET)
+ shutil.copyfile(packaged, TARGET)
+ if utils.isOvirtNode():
+ NodeCfg().persist(TARGET)
+
+ if (oldmod is not None and
+ oldmod != os.stat(TARGET).st_mode):
+ os.chmod(TARGET, oldmod)
+ reloadConfiguration()
def _isSslConflict(self):
"""
--
To view, visit https://gerrit.ovirt.org/41815
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I289ee957cb5dd039218d0b9ac5ba50b65dd5d6cf
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>
9 years
Change in vdsm[ovirt-3.5]: virt: keep libvirt's <driver> element
by phoracek@redhat.com
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>
9 years
Change in vdsm[master]: veth: introduce a context manager to create and destroy a ve...
by osvoboda@redhat.com
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>
9 years