fix different type issue in write_rule_log_for_vm in security_group.py
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3f42601c Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3f42601c Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3f42601c Branch: refs/heads/kvm-vnc-listen Commit: 3f42601c6d179f8d8cae41769205e7399370c126 Parents: 83d3f7d Author: Wei Zhou <w.z...@leaseweb.com> Authored: Fri Sep 13 12:02:24 2013 +0200 Committer: Wei Zhou <w.z...@leaseweb.com> Committed: Fri Sep 13 12:02:24 2013 +0200 ---------------------------------------------------------------------- scripts/vm/network/security_group.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3f42601c/scripts/vm/network/security_group.py ---------------------------------------------------------------------- diff --git a/scripts/vm/network/security_group.py b/scripts/vm/network/security_group.py index 085a7f8..0e0fafb 100755 --- a/scripts/vm/network/security_group.py +++ b/scripts/vm/network/security_group.py @@ -752,7 +752,7 @@ def write_rule_log_for_vm(vmName, vmID, vmIP, domID, signature, seqno): logfilename = logpath + vm_name + ".log" logging.debug("Writing log to " + logfilename) logf = open(logfilename, 'w') - output = ','.join([vmName, vmID, vmIP, domID, signature, seqno]) + output = ','.join([vmName, vmID, vmIP, str(domID), signature, seqno]) result = True try: logf.write(output) @@ -937,7 +937,7 @@ def getvmId(vmName): conn.close() - return str(dom.ID()) + return dom.ID() def addFWFramework(brname): try:
