Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 58FD510FC6 for ; Tue, 17 Sep 2013 14:01:46 +0000 (UTC) Received: (qmail 71075 invoked by uid 500); 17 Sep 2013 14:01:25 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 70875 invoked by uid 500); 17 Sep 2013 14:01:24 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 70387 invoked by uid 99); 17 Sep 2013 14:01:23 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Sep 2013 14:01:23 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 40897906CC9; Tue, 17 Sep 2013 14:01:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: widodh@apache.org To: commits@cloudstack.apache.org Date: Tue, 17 Sep 2013 14:01:52 -0000 Message-Id: <42c8b43bc6f94505aa1de583f19524ce@git.apache.org> In-Reply-To: <96a00febd62c41ea853c6e3237c76d5a@git.apache.org> References: <96a00febd62c41ea853c6e3237c76d5a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [31/50] [abbrv] git commit: updated refs/heads/disk-cache to c3569db 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/disk-cache Commit: 3f42601c6d179f8d8cae41769205e7399370c126 Parents: 83d3f7d Author: Wei Zhou Authored: Fri Sep 13 12:02:24 2013 +0200 Committer: Wei Zhou 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: