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 <gir...@clogeny.com> Authored: Fri Nov 15 17:10:40 2013 +0530 Committer: Girish Shilamkar <gir...@clogeny.com> 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
