You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by gi...@apache.org on 2014/09/01 10:08:53 UTC
git commit: updated refs/heads/master to a1dc171
Repository: cloudstack
Updated Branches:
refs/heads/master 6827d677a -> a1dc17125
CLOUDSTACK-7444: Allowing user account to submit async jobs in addition to admin
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a1dc1712
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a1dc1712
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a1dc1712
Branch: refs/heads/master
Commit: a1dc17125b57ea279296df2c166dd05adeb31b6c
Parents: 6827d67
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Wed Aug 27 21:46:30 2014 +0530
Committer: Girish Shilamkar <gi...@clogeny.com>
Committed: Mon Sep 1 13:35:01 2014 +0530
----------------------------------------------------------------------
test/integration/component/test_snapshots_improvement.py | 7 ++++++-
tools/marvin/marvin/cloudstackTestClient.py | 6 ++++--
2 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a1dc1712/test/integration/component/test_snapshots_improvement.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_snapshots_improvement.py b/test/integration/component/test_snapshots_improvement.py
index 1646b69..6638ddd 100644
--- a/test/integration/component/test_snapshots_improvement.py
+++ b/test/integration/component/test_snapshots_improvement.py
@@ -615,8 +615,13 @@ class TestCreateSnapshot(cloudstackTestCase):
self.debug("Create a template from snapshot: %s" % snapshot.name)
jobs.append(self.create_Template_from_Snapshot(snapshot))
+
+ userapiclient = self.testClient.getUserApiClient(
+ UserName=self.account.name,
+ DomainName=self.account.domain)
+
# Verify IO usage by submitting the concurrent jobs
- self.testClient.submitCmdsAndWait(jobs)
+ self.testClient.submitCmdsAndWait(jobs, apiclient=userapiclient)
self.debug("Verifying if templates are created properly or not?")
templates = Template.list(
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a1dc1712/tools/marvin/marvin/cloudstackTestClient.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/cloudstackTestClient.py b/tools/marvin/marvin/cloudstackTestClient.py
index 521d043..ce7ffc9 100644
--- a/tools/marvin/marvin/cloudstackTestClient.py
+++ b/tools/marvin/marvin/cloudstackTestClient.py
@@ -417,12 +417,14 @@ class CSTestClient(object):
return FAILED
return self.__createUserApiClient(UserName, DomainName, type)
- def submitCmdsAndWait(self, cmds, workers=1):
+ def submitCmdsAndWait(self, cmds, workers=1, apiclient=None):
'''
@Desc : FixME, httplib has issue if more than one thread submitted
'''
+ if not apiclient:
+ apiclient = self.__apiClient
if self.__asyncJobMgr is None:
- self.__asyncJobMgr = asyncJobMgr(self.__apiClient,
+ self.__asyncJobMgr = asyncJobMgr(apiclient,
self.__dbConnection)
return self.__asyncJobMgr.submitCmdsAndWait(cmds, workers)