File 0004-deployUtil-expect-integer-vlan-id-from-new-netinfo.patch of Package vdsm

File 0004-deployUtil-expect-integer-vlan-id-from-new-netinfo.patch of Package vdsm (Revision b8a0370be37a497fe883af63aa06d311)

Currently displaying revision b8a0370be37a497fe883af63aa06d311, show latest

From b88d9b90d2458cab2a7ca4fc37d42439bd5774c2 Mon Sep 17 00:00:00 2001
From: Vladimir Tananko <bs@artcon.ru>
Date: Tue, 3 Dec 2013 10:24:23 +0000
Subject: [PATCH 04/11] deployUtil: expect integer vlan id from new netinfo

Commit 8b2bbe6e5 changed netinfo.getVlanID() to return the vlan id as an
integer, istead of a string. This makes a lot of sense, but breaks
compatibility with ancient deployUtil code.

Change-Id: Ibc1c5875e0d13b110f61f9eabf6d1964fc4c1237
Bug-Url: https://bugzilla.redhat.com/1037277
Signed-off-by: Dan Kenigsberg <danken@redhat.com>
Reviewed-on: http://gerrit.ovirt.org/21948
Reviewed-by: Amador Pahim <apahim@redhat.com>
Reviewed-by: Antoni Segura Puimedon <asegurap@redhat.com>
Reviewed-on: http://gerrit.ovirt.org/21982
Reviewed-by: Yaniv Bronhaim <ybronhei@redhat.com>
Tested-by: Yaniv Bronhaim <ybronhei@redhat.com>
---
 vdsm_reg/deployUtil.py.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vdsm_reg/deployUtil.py.in b/vdsm_reg/deployUtil.py.in
index 2d379f6..ba45d64 100644
--- a/vdsm_reg/deployUtil.py.in
+++ b/vdsm_reg/deployUtil.py.in
@@ -1061,6 +1061,7 @@ def makeBridge(vdcName, vdsmDir, bridgeName=None):
         else:
             vlan, bonding, nic = _getRHELBridgeParams(mgtIface,
                                                       bridgeName=bridgeName)
+        vlan = str(vlan)
         fReturn = (nic is not None)
 
     #Delete existing bridge in oVirt
-- 
1.8.4.2