Change in vdsm[master]: qemuimg: Move to vdsm.storage
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: qemuimg: Move to vdsm.storage
......................................................................
Patch Set 2: Code-Review+1
--
To view, visit https://gerrit.ovirt.org/79701
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Id8391c9e7806800287454fc5a4c09ef5203e2500
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com>
Gerrit-Reviewer: Ala Hino <ahino(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Freddy Rolland <frolland(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
6 years, 9 months
Change in vdsm[master]: [WIP] net.api: expose cancel_rollback()
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has uploaded a new change for review.
Change subject: [WIP] net.api: expose cancel_rollback()
......................................................................
[WIP] net.api: expose cancel_rollback()
When connectivityCheck=True is passed to the setupNetworks verb, an
automatically roll back is performed, unless unless cancel_rollback()
command is requested by the client. Note that Vdsm does not have an
explicit cancel_rollback verb. cancel_rollback is called as a side
effect of the ping verb.
Change-Id: If42316ac6ecd694e398534e3e87b915aeb4f1f38
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M lib/vdsm/constants.py.in
M lib/vdsm/network/api.py
M lib/vdsm/network/connectivity.py
M vdsm/API.py
4 files changed, 9 insertions(+), 10 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/99/79299/1
diff --git a/lib/vdsm/constants.py.in b/lib/vdsm/constants.py.in
index 32c87d9..7ad3eb1 100644
--- a/lib/vdsm/constants.py.in
+++ b/lib/vdsm/constants.py.in
@@ -80,7 +80,6 @@
P_VDSM_CONF = '@CONFDIR@/' # NOQA: E501 (potentially long line)
P_VDSM_KEYS = '/etc/pki/vdsm/keys/'
-P_VDSM_CLIENT_LOG = '@VDSMRUNDIR(a)/client.log' # NOQA: E501 (potentially long line)
P_VDSM_LOG = '@VDSMLOGDIR@' # NOQA: E501 (potentially long line)
P_VDSM_NODE_ID = '/etc/vdsm/vdsm.id'
diff --git a/lib/vdsm/network/api.py b/lib/vdsm/network/api.py
index cb7210f..8c4113e 100644
--- a/lib/vdsm/network/api.py
+++ b/lib/vdsm/network/api.py
@@ -27,6 +27,7 @@
from vdsm import hooks
+from vdsm.common.fileutils import touch_file
from vdsm.network import netswitch
from vdsm.network import sourceroute
from vdsm.network.configurators.ifcfg import ConfigWriter
@@ -281,3 +282,7 @@
def remove_ovs_port(bridge, port):
netswitch.configurator.ovs_remove_port(bridge, port)
+
+
+def cancel_rollback():
+ touch_file(constants.P_VDSM_CLIENT_LOG)
diff --git a/lib/vdsm/network/connectivity.py b/lib/vdsm/network/connectivity.py
index 3b2402d..11e5601 100644
--- a/lib/vdsm/network/connectivity.py
+++ b/lib/vdsm/network/connectivity.py
@@ -30,6 +30,7 @@
from .errors import ConfigNetworkError
CONNECTIVITY_TIMEOUT_DEFAULT = 4
+P_VDSM_CLIENT_LOG = constants.P_VDSM_RUN + 'client.log'
def _get_connectivity_timeout(options):
@@ -50,7 +51,7 @@
start = time.time()
while timeout >= 0:
try:
- if os.stat(constants.P_VDSM_CLIENT_LOG).st_mtime > start:
+ if os.stat(P_VDSM_CLIENT_LOG).st_mtime > start:
return True
except OSError as e:
if e.errno == errno.ENOENT:
diff --git a/vdsm/API.py b/vdsm/API.py
index fc928a7..056f61e 100644
--- a/vdsm/API.py
+++ b/vdsm/API.py
@@ -22,6 +22,7 @@
import os
+from vdsm.network.api import cancel_rollback
from vdsm.network.errors import ConfigNetworkError
from vdsm import commands
@@ -78,13 +79,6 @@
throttledlog.throttle('getAllVmStats', 100)
-
-
-def updateTimestamp():
- # The setup API uses this log file to determine if this host is still
- # accessible. We use a file (rather than an event) because setup is
- # performed by a separate, root process.
- fileutils.touch_file(constants.P_VDSM_CLIENT_LOG)
class APIBase(object):
@@ -1237,7 +1231,7 @@
def ping(self):
"Ping the server. Useful for tests"
- updateTimestamp()
+ cancel_rollback()
return {'status': doneCode}
def getCapabilities(self):
--
To view, visit https://gerrit.ovirt.org/79299
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If42316ac6ecd694e398534e3e87b915aeb4f1f38
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
6 years, 9 months
Change in vdsm[master]: net: Get iface mtu using netlink instead of sysfs
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/79158 )
Change subject: net: Get iface mtu using netlink instead of sysfs
......................................................................
net: Get iface mtu using netlink instead of sysfs
link.iface module mostly uses netlink to fetch iface properties.
For consistency and efficiency, mtu is now collected through netlink.
Change-Id: I219e226957cddde922f11a6f490d3f8b89a620c4
Signed-off-by: Edward Haas <edwardh(a)redhat.com>
---
M lib/vdsm/network/link/iface.py
M lib/vdsm/network/netinfo/cache.py
2 files changed, 3 insertions(+), 5 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/79158
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I219e226957cddde922f11a6f490d3f8b89a620c4
Gerrit-PatchSet: 4
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, 9 months
Change in vdsm[master]: net: Remove netinfo.mtus module and relocate content
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/79156 )
Change subject: net: Remove netinfo.mtus module and relocate content
......................................................................
net: Remove netinfo.mtus module and relocate content
The getMtu funtion has been relocated to link.iface and renamed to
get_mtu.
This patch is another step towards cleaning up netinfo package.
Change-Id: I8a3f09c81a42e27c4055bb0f364f76fb7fa1b6ea
Signed-off-by: Edward Haas <edwardh(a)redhat.com>
---
M lib/vdsm/network/configurators/__init__.py
M lib/vdsm/network/legacy_switch.py
M lib/vdsm/network/link/iface.py
M lib/vdsm/network/models.py
M lib/vdsm/network/netinfo/Makefile.am
M lib/vdsm/network/netinfo/cache.py
D lib/vdsm/network/netinfo/mtus.py
M lib/vdsm/network/ovs/info.py
M tests/network/config_network_test.py
M tests/network/models_test.py
M tests/network/ovs_info_test.py
11 files changed, 27 insertions(+), 55 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/79156
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8a3f09c81a42e27c4055bb0f364f76fb7fa1b6ea
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>
6 years, 9 months
Change in vdsm[master]: net: Remove getMaxMtu function and inline it in the caller
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/79123 )
Change subject: net: Remove getMaxMtu function and inline it in the caller
......................................................................
net: Remove getMaxMtu function and inline it in the caller
getMaxMtu implementation is trivial enough not to require a special
function.
This patch is contributing to the netinfo cleanup effort.
Change-Id: Ibdbff5892c02bcf5fb2267704d3c32d07adbe3ee
Signed-off-by: Edward Haas <edwardh(a)redhat.com>
---
M lib/vdsm/network/configurators/__init__.py
M lib/vdsm/network/netinfo/mtus.py
M tests/network/config_network_test.py
3 files changed, 2 insertions(+), 18 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/79123
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibdbff5892c02bcf5fb2267704d3c32d07adbe3ee
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>
6 years, 9 months
Change in vdsm[master]: net: Remove netinfo.mtus module and relocate content
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: net: Remove netinfo.mtus module and relocate content
......................................................................
Patch Set 4: Code-Review+2
--
To view, visit https://gerrit.ovirt.org/79156
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I8a3f09c81a42e27c4055bb0f364f76fb7fa1b6ea
Gerrit-PatchSet: 4
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, 9 months
Change in vdsm[master]: net: Remove getMaxMtu function and inline it in the caller
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: net: Remove getMaxMtu function and inline it in the caller
......................................................................
Patch Set 4: Code-Review+2
--
To view, visit https://gerrit.ovirt.org/79123
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ibdbff5892c02bcf5fb2267704d3c32d07adbe3ee
Gerrit-PatchSet: 4
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, 9 months
Change in vdsm[master]: hooking: move to static
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: hooking: move to static
......................................................................
Patch Set 4:
I know that this was my stupid suggestion, but folloeing Nir's comment about another module, I think that it would be better to keep (and deploy) hooking.py in a python subsubsubpackage of vdsm. We need to add tests for this tiny module, and making it easily importable would make it simpler.
--
To view, visit https://gerrit.ovirt.org/79638
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: If2f1581d75cfb33868af41d1b116f56af89801a5
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
6 years, 9 months
Change in vdsm[master]: tool: remove dummy bridge
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: tool: remove dummy bridge
......................................................................
Patch Set 2: Code-Review+1
--
To view, visit https://gerrit.ovirt.org/79596
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Icd78fba239b37d2c556f37c63438ee076516560b
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček <phoracek(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 Horacek <phoracek(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
6 years, 9 months
Change in vdsm[master]: tool: clear networks configured by VDSM
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: tool: clear networks configured by VDSM
......................................................................
Patch Set 4: Code-Review-1
(1 comment)
https://gerrit.ovirt.org/#/c/79495/4/lib/vdsm/tool/network.py
File lib/vdsm/tool/network.py:
Line 110: networks_request[net] = attrs
Line 111: networks_request[net]['bridged'] = False
Line 112: else:
Line 113: networks_request[net] = {'remove': True}
Line 114: net_api.setupNetworks(networks_request, {}, {'connectivityCheck': False})
I believe you need to setSafeConfig
--
To view, visit https://gerrit.ovirt.org/79495
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I63702da4dd1c5a0328797f524734813ef251bdb6
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček <phoracek(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 Horacek <phoracek(a)redhat.com>
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: Yes
6 years, 9 months