Merge remote-tracking branch 'origin/hotfix/4.4-7193' into 4.4

2014-08-18 20:24:33 +02:00 · 2014-08-18 20:24:33 +02:00 · 109b1c137a
parent 13bde03adf 5a68f031ce
commit 109b1c137a
1 changed files with 4 additions and 1 deletions
--- a/scripts/vm/network/security_group.py
+++ b/scripts/vm/network/security_group.py
@ -937,7 +937,10 @@ def getvmId(vmName):

    conn.close()

-    return dom.ID()
+    res = dom.ID()
+    if isinstance(res, int):
+        res = str(res)
+    return res

 def getBrfw(brname):
    cmd = "iptables-save |grep physdev-is-bridged |grep FORWARD |grep BF |grep '\-o' | grep -w " + brname  + "|awk '{print $9}' | head -1"