Change in vdsm[master]: move exec_sync_bytes to common.cmdutils
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has uploaded a new change for review.
Change subject: move exec_sync_bytes to common.cmdutils
......................................................................
move exec_sync_bytes to common.cmdutils
exec_sync_bytes is useful not only in the network subpackage, so it
needs to reside under vdsm.common.
Change-Id: Idca5b123a4ce6ef5ebaff8084d788e2acd47c2be
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M lib/vdsm/common/cmdutils.py
M lib/vdsm/network/cmd.py
2 files changed, 16 insertions(+), 15 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/93/79693/1
diff --git a/lib/vdsm/common/cmdutils.py b/lib/vdsm/common/cmdutils.py
index 85a4ae0..26e08a7 100644
--- a/lib/vdsm/common/cmdutils.py
+++ b/lib/vdsm/common/cmdutils.py
@@ -22,6 +22,8 @@
import os
import re
+from vdsm.common.compat import CPopen as Popen
+
SYSTEMD_RUN = "/usr/bin/systemd-run"
@@ -106,3 +108,16 @@
CPU = 'CPU'
Memory = 'Memory'
BlockIO = 'BlockIO'
+
+
+def exec_sync_bytes(cmds):
+ logging.debug(cmdutils.command_log_line(cmds))
+
+ p = Popen(
+ cmds, close_fds=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
+ out, err = p.communicate()
+
+ logging.debug(cmdutils.retcode_log_line(p.returncode, err=err))
+
+ return p.returncode, out, err
diff --git a/lib/vdsm/network/cmd.py b/lib/vdsm/network/cmd.py
index f6d9b73..bf5d537 100644
--- a/lib/vdsm/network/cmd.py
+++ b/lib/vdsm/network/cmd.py
@@ -23,8 +23,7 @@
import uuid
from vdsm.common import cmdutils
-from vdsm.common.cmdutils import systemd_run
-from vdsm.common.compat import CPopen as Popen
+from vdsm.common.cmdutils import systemd_run, exec_sync_bytes
from vdsm.network import py2to3
@@ -50,16 +49,3 @@
cmds = systemd_run(cmds, scope=True, unit=unit, slice=slice_name)
return exec_sync(cmds)
-
-
-def exec_sync_bytes(cmds):
- logging.debug(cmdutils.command_log_line(cmds))
-
- p = Popen(
- cmds, close_fds=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-
- out, err = p.communicate()
-
- logging.debug(cmdutils.retcode_log_line(p.returncode, err=err))
-
- return p.returncode, out, err
--
To view, visit https://gerrit.ovirt.org/79693
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idca5b123a4ce6ef5ebaff8084d788e2acd47c2be
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
6 years, 10 months
Change in vdsm[master]: virt net: vhost custom property with a wrong net name
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/80672 )
Change subject: virt net: vhost custom property with a wrong net name
......................................................................
virt net: vhost custom property with a wrong net name
If the network name specified in `vhost' custom property
doesn't correspond to a network contained in the interface object,
ignore it.
Change-Id: I118a40236c7de7ad136d734e4c6653bfce332199
Bug-Url: https://bugzilla.redhat.com/1479872
Signed-off-by: Edward Haas <edwardh(a)redhat.com>
---
M lib/vdsm/virt/vmdevices/network.py
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Jenkins CI: Passed CI tests
Dan Kenigsberg: Looks good to me, approved
Arik Hadas: Looks good to me, but someone else must approve
Milan Zamazal: Looks good to me, but someone else must approve
Edward Haas: Verified
--
To view, visit https://gerrit.ovirt.org/80672
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I118a40236c7de7ad136d734e4c6653bfce332199
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Edward Haas <edwardh(a)redhat.com>
Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Edward Haas <edwardh(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Milan Zamazal <mzamazal(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
6 years, 10 months
Change in vdsm[master]: virt net: vhost custom property with a wrong net name
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: virt net: vhost custom property with a wrong net name
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.ovirt.org/80672
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I118a40236c7de7ad136d734e4c6653bfce332199
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Edward Haas <edwardh(a)redhat.com>
Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Edward Haas <edwardh(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Milan Zamazal <mzamazal(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
6 years, 10 months
Change in vdsm[master]: net: Introduce iface interface driver
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/80169 )
Change subject: net: Introduce iface interface driver
......................................................................
net: Introduce iface interface driver
The iface interface is defined and implemented using a hybrid set of
tools, including sysfs, netlink, iproute2 and ethtool.
Change-Id: Ia5d50f47194f023826aafa5e3e77ec495ea4299c
Signed-off-by: Edward Haas <edwardh(a)redhat.com>
---
M lib/vdsm/network/link/iface.py
1 file changed, 170 insertions(+), 32 deletions(-)
Approvals:
Jenkins CI: Passed CI tests
Petr Horáček: Looks good to me, but someone else must approve
Dan Kenigsberg: Looks good to me, approved
Edward Haas: Verified
--
To view, visit https://gerrit.ovirt.org/80169
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia5d50f47194f023826aafa5e3e77ec495ea4299c
Gerrit-PatchSet: 11
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Edward Haas <edwardh(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Edward Haas <edwardh(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
6 years, 10 months
Change in vdsm[master]: net: Introduce iface interface driver
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: net: Introduce iface interface driver
......................................................................
Patch Set 10: Code-Review+2
(1 comment)
https://gerrit.ovirt.org/#/c/80169/10/lib/vdsm/network/link/iface.py
File lib/vdsm/network/link/iface.py:
PS10, Line 129: if self._is_dpdk_type:
: info = dpdk.link_info(self._dev)
: else:
: info = link.get_link(self._dev)
: return info
> maybe call return right away? this is super simple function, we can do that
I don't mind either way.
--
To view, visit https://gerrit.ovirt.org/80169
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ia5d50f47194f023826aafa5e3e77ec495ea4299c
Gerrit-PatchSet: 10
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Edward Haas <edwardh(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Edward Haas <edwardh(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: Yes
6 years, 10 months
Change in vdsm[master]: net: tests: Migrate testFailWithInvalidBridgeName to the new...
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/80547 )
Change subject: net: tests: Migrate testFailWithInvalidBridgeName to the new func tests.
......................................................................
net: tests: Migrate testFailWithInvalidBridgeName to the new func tests.
Change-Id: I051754d565c3d2245c7d77837a20d187bdb23151
Signed-off-by: Leon Goldberg <lgoldber(a)redhat.com>
---
M tests/functional/networkTests.py
M tests/network/functional/net_basic_test.py
2 files changed, 11 insertions(+), 7 deletions(-)
Approvals:
Jenkins CI: Passed CI tests
Leon Goldberg: Verified
Edward Haas: Looks good to me, approved
--
To view, visit https://gerrit.ovirt.org/80547
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I051754d565c3d2245c7d77837a20d187bdb23151
Gerrit-PatchSet: 13
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Leon Goldberg <lgoldber(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Edward Haas <edwardh(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Leon Goldberg <lgoldber(a)redhat.com>
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
6 years, 10 months
Change in vdsm[master]: net: tests: Relocate a test to the public methods.
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/80216 )
Change subject: net: tests: Relocate a test to the public methods.
......................................................................
net: tests: Relocate a test to the public methods.
test_remove_unbridged_network_with_a_nic_used_by_a_vlan_network
was placed among the private methods.
also renamed "unbridged" to "bridgeless" to match the rest of the
tests.
Change-Id: Iad126084548ce7067b64be939e6c4e59dfc5106e
Signed-off-by: Leon Goldberg <lgoldber(a)redhat.com>
---
M tests/network/functional/net_basic_test.py
1 file changed, 22 insertions(+), 20 deletions(-)
Approvals:
Jenkins CI: Passed CI tests
Leon Goldberg: Verified
Edward Haas: Looks good to me, approved
--
To view, visit https://gerrit.ovirt.org/80216
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iad126084548ce7067b64be939e6c4e59dfc5106e
Gerrit-PatchSet: 10
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Leon Goldberg <lgoldber(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Edward Haas <edwardh(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Leon Goldberg <lgoldber(a)redhat.com>
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
6 years, 10 months
Change in vdsm[master]: net: Extract ethtool to its own module
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/80068 )
Change subject: net: Extract ethtool to its own module
......................................................................
net: Extract ethtool to its own module
ethtool is used to retrieve driver information for a given iface.
This patch extracts the ethtool code to an independent module in order
to ease its usage by other modules and give it a proper scope.
Change-Id: I7b5b4a89e8fa6000bcd724d070d51d46d622da0c
Signed-off-by: Edward Haas <edwardh(a)redhat.com>
---
A lib/vdsm/network/ethtool.py
M lib/vdsm/network/ipwrapper.py
M lib/vdsm/network/netinfo/nics.py
A tests/network/ethtool_test.py
M tests/network/ipwrapper_test.py
5 files changed, 104 insertions(+), 37 deletions(-)
Approvals:
Jenkins CI: Passed CI tests
Petr Horáček: Looks good to me, but someone else must approve
Dan Kenigsberg: Looks good to me, approved
Edward Haas: Verified
--
To view, visit https://gerrit.ovirt.org/80068
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7b5b4a89e8fa6000bcd724d070d51d46d622da0c
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Edward Haas <edwardh(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Edward Haas <edwardh(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
6 years, 10 months
Change in vdsm[master]: net: netinfo: Detect early that an iface is missing
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/80185 )
Change subject: net: netinfo: Detect early that an iface is missing
......................................................................
net: netinfo: Detect early that an iface is missing
While creating the network caps report using netinfo, an expected
iface may be missing. For such scenarios, the network it represents is
skipped and not reported (assumed not to exist).
This patch detects the missing iface earlier.
Change-Id: I0ac2ab3c1aeb999121e21a6f8624dd2963a1f60c
Signed-off-by: Edward Haas <edwardh(a)redhat.com>
---
M lib/vdsm/network/netinfo/cache.py
1 file changed, 6 insertions(+), 4 deletions(-)
Approvals:
Jenkins CI: Passed CI tests
Petr Horáček: Looks good to me, but someone else must approve
Dan Kenigsberg: Looks good to me, approved
Edward Haas: Verified
--
To view, visit https://gerrit.ovirt.org/80185
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0ac2ab3c1aeb999121e21a6f8624dd2963a1f60c
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Edward Haas <edwardh(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Edward Haas <edwardh(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
6 years, 10 months
Change in vdsm[master]: net: netinfo: Detect early that an iface is missing
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: net: netinfo: Detect early that an iface is missing
......................................................................
Patch Set 5: Code-Review+2
raising
--
To view, visit https://gerrit.ovirt.org/80185
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I0ac2ab3c1aeb999121e21a6f8624dd2963a1f60c
Gerrit-PatchSet: 5
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Edward Haas <edwardh(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Edward Haas <edwardh(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
6 years, 10 months