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 AECF8102EB for ; Fri, 15 Nov 2013 11:41:41 +0000 (UTC) Received: (qmail 84546 invoked by uid 500); 15 Nov 2013 11:41:40 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 84438 invoked by uid 500); 15 Nov 2013 11:41:39 -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 84423 invoked by uid 99); 15 Nov 2013 11:41:38 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Nov 2013 11:41:38 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 6737882E7CA; Fri, 15 Nov 2013 11:41:38 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: girish@apache.org To: commits@cloudstack.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.2 to 454d9b0 Date: Fri, 15 Nov 2013 11:41:38 +0000 (UTC) Updated Branches: refs/heads/4.2 ac9c4b023 -> 454d9b04c Fix marvin to refer to correct random_gen() function Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/454d9b04 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/454d9b04 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/454d9b04 Branch: refs/heads/4.2 Commit: 454d9b04c4531c3f3fdd405169f200fe3600bcad Parents: ac9c4b0 Author: Girish Shilamkar Authored: Fri Nov 15 17:10:40 2013 +0530 Committer: Girish Shilamkar Committed: Fri Nov 15 17:10:40 2013 +0530 ---------------------------------------------------------------------- tools/marvin/marvin/cloudstackTestClient.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/454d9b04/tools/marvin/marvin/cloudstackTestClient.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/cloudstackTestClient.py b/tools/marvin/marvin/cloudstackTestClient.py index b3826a7..3eb6939 100644 --- a/tools/marvin/marvin/cloudstackTestClient.py +++ b/tools/marvin/marvin/cloudstackTestClient.py @@ -23,6 +23,7 @@ import random import string import hashlib from configGenerator import ConfigManager +from marvin.integration.lib.utils import random_gen ''' @Desc : CloudStackTestClient is encapsulated class for getting various \ @@ -135,7 +136,7 @@ class cloudstackTestClient(object): createAcctCmd = createAccount.createAccountCmd() createAcctCmd.accounttype = acctType createAcctCmd.domainid = domId - createAcctCmd.email = "test-" + self.random_gen()\ + createAcctCmd.email = "test-" + random_gen()\ + "@cloudstack.org" createAcctCmd.firstname = UserName createAcctCmd.lastname = UserName