You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/08/18 20:24:42 UTC
[1/2] git commit: updated refs/heads/4.4 to 109b1c1
Repository: cloudstack
Updated Branches:
refs/heads/4.4 13bde03ad -> 109b1c137
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 <Vi...@exoscale.ch>
Signed-off-by: Sebastien Goasguen <ru...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5a68f031
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5a68f031
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5a68f031
Branch: refs/heads/4.4
Commit: 5a68f031ce3fe211dce2287d6ca67294e582b84f
Parents: 838a1a8
Author: Vincent Bernat <Vi...@exoscale.ch>
Authored: Mon Jul 28 18:03:32 2014 +0200
Committer: Sebastien Goasguen <ru...@gmail.com>
Committed: Mon Aug 18 10:45:53 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/5a68f031/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"
[2/2] git commit: updated refs/heads/4.4 to 109b1c1
Posted by da...@apache.org.
Merge remote-tracking branch 'origin/hotfix/4.4-7193' into 4.4
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/109b1c13
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/109b1c13
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/109b1c13
Branch: refs/heads/4.4
Commit: 109b1c137a67ca7e87ece4a086ac98a800110fe7
Parents: 13bde03 5a68f03
Author: Daan Hoogland <da...@onecht.net>
Authored: Mon Aug 18 20:24:33 2014 +0200
Committer: Daan Hoogland <da...@onecht.net>
Committed: Mon Aug 18 20:24:33 2014 +0200
----------------------------------------------------------------------
scripts/vm/network/security_group.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------