CLOUDSTACK-7193: handle domain ID being an int

vincentbernat · sebgoa · commit 53650ed7bfae · 2014-08-18T10:36:21.000-04:00
Recent versions of libvirt (at least 0.9.8) will return an int when
queried for the ID of a domain, not a string. This breaks some parts of
the `security_group.py` script which expects a string containing an
int. Notably, this breaks the part handling VM reboots which is
therefore not executed.

Signed-off-by: Vincent Bernat &lt;Vincent.Bernat@exoscale.ch&gt;
Signed-off-by: Sebastien Goasguen &lt;runseb@gmail.com&gt;
diff --git 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"
