Change in vdsm[master]: report mtus as string as long as engine needs it
danken at redhat.com
danken at redhat.com
Wed Dec 30 11:21:57 UTC 2015
Dan Kenigsberg has uploaded a new change for review.
Change subject: report mtus as string as long as engine needs it
......................................................................
report mtus as string as long as engine needs it
commit 59ede0b changed mtus to integers all over Vdsm. However,
ovirt-engine-3.6 expects mtu as string.
Change-Id: I719ed889bfae763ce7cbed4f2aab3f6134ba2865
Signed-off-by: Dan Kenigsberg <danken at redhat.com>
---
M lib/vdsm/netinfo/__init__.py
M vdsm/caps.py
2 files changed, 9 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/64/51164/1
diff --git a/lib/vdsm/netinfo/__init__.py b/lib/vdsm/netinfo/__init__.py
index 8804bed..f27df02 100644
--- a/lib/vdsm/netinfo/__init__.py
+++ b/lib/vdsm/netinfo/__init__.py
@@ -98,6 +98,14 @@
return networking
+def stringify_mtus(networking):
+ # REQUIRED_FOR engine < 3.7
+ for devtype in ('bondings', 'bridges', 'networks', 'nics', 'vlans'):
+ for dev in networking[devtype]:
+ dev['mtu'] = str(dev['mtu'])
+ return networking
+
+
def libvirtNets2vdsm(nets, running_config=None, routes=None, ipAddrs=None,
dhcpv4_ifaces=None, dhcpv6_ifaces=None):
if running_config is None:
diff --git a/vdsm/caps.py b/vdsm/caps.py
index 209158b..6930d2c 100644
--- a/vdsm/caps.py
+++ b/vdsm/caps.py
@@ -629,7 +629,7 @@
_getCompatibleCpuModels())
caps.update(_getVersionInfo())
- caps.update(netinfo.get())
+ caps.update(netinfo.stringify_mtus(netinfo.get()))
try:
caps['hooks'] = hooks.installed()
--
To view, visit https://gerrit.ovirt.org/51164
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I719ed889bfae763ce7cbed4f2aab3f6134ba2865
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken at redhat.com>
More information about the vdsm-patches
mailing list