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 <vincent.ber...@exoscale.ch> Signed-off-by: Sebastien Goasguen <run...@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 <vincent.ber...@exoscale.ch> Authored: Mon Jul 28 18:03:32 2014 +0200 Committer: Sebastien Goasguen <run...@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"
