cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seb...@apache.org
Subject [1/2] git commit: updated refs/heads/master to 758a73d
Date Mon, 18 Aug 2014 14:37:40 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master bbd1da19d -> 758a73d7c


CLOUDSTACK-7193: handle domain ID being an int

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 <Vincent.Bernat@exoscale.ch>
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/53650ed7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/53650ed7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/53650ed7

Branch: refs/heads/master
Commit: 53650ed7bfaeeeaca3218cbf26601162c13f48b9
Parents: 880bff2
Author: Vincent Bernat <Vincent.Bernat@exoscale.ch>
Authored: Mon Jul 28 18:03:32 2014 +0200
Committer: Sebastien Goasguen <runseb@gmail.com>
Committed: Mon Aug 18 10:36:21 2014 -0400

----------------------------------------------------------------------
 scripts/vm/network/security_group.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/53650ed7/scripts/vm/network/security_group.py
----------------------------------------------------------------------
diff --git a/scripts/vm/network/security_group.py b/scripts/vm/network/security_group.py
index 704b279..14f7e84 100755
--- 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"


Mime
View raw message