You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/01/20 06:57:58 UTC
[02/12] git commit: updated refs/heads/4.5 to 30598e9
CLOUDSTACK-8132: Fixed issue related to secondary storage count of template
Signed-off-by: SrikanteswaraRao Talluri <ta...@apache.org>
(cherry picked from commit f938a5e1c352971aa61e75a60935c735c3d3920c)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9a75a0cd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9a75a0cd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9a75a0cd
Branch: refs/heads/4.5
Commit: 9a75a0cd221efc85a9d2b27fafdbf60995aa57eb
Parents: fc502a9
Author: Ashutosh K <as...@clogeny.com>
Authored: Mon Dec 29 03:34:37 2014 -0800
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Tue Jan 20 10:18:24 2015 +0530
----------------------------------------------------------------------
test/integration/component/test_ss_limits.py | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9a75a0cd/test/integration/component/test_ss_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_ss_limits.py b/test/integration/component/test_ss_limits.py
index c498302..d5ee063 100644
--- a/test/integration/component/test_ss_limits.py
+++ b/test/integration/component/test_ss_limits.py
@@ -126,7 +126,7 @@ class TestSecondaryStorageLimits(cloudstackTestCase):
except Exception as e:
return [FAIL, e]
return [PASS, None]
-
+
@data(ROOT_DOMAIN_ADMIN, CHILD_DOMAIN_ADMIN)
@attr(tags = ["advanced"], required_hardware="true")
def test_01_register_template(self, value):
@@ -143,24 +143,28 @@ class TestSecondaryStorageLimits(cloudstackTestCase):
response = self.setupAccount(value)
self.assertEqual(response[0], PASS, response[1])
+ apiclient = self.testClient.getUserApiClient(
+ UserName=self.account.name,
+ DomainName=self.account.domain)
+
builtin_info = get_builtin_template_info(self.apiclient, self.zone.id)
self.services["template_2"]["url"] = builtin_info[0]
self.services["template_2"]["hypervisor"] = builtin_info[1]
self.services["template_2"]["format"] = builtin_info[2]
try:
- template = Template.register(self.apiclient,
+ template = Template.register(apiclient,
self.services["template_2"],
zoneid=self.zone.id,
account=self.account.name,
domainid=self.account.domainid,
hypervisor=self.hypervisor)
- template.download(self.apiclient)
+ template.download(apiclient)
except Exception as e:
self.fail("Failed to register template: %s" % e)
- templates = Template.list(self.apiclient,
+ templates = Template.list(apiclient,
templatefilter=\
self.services["template_2"]["templatefilter"],
id=template.id)
@@ -170,19 +174,19 @@ class TestSecondaryStorageLimits(cloudstackTestCase):
templateSize = (templates[0].size / (1024**3))
expectedCount = templateSize
response = matchResourceCount(
- self.apiclient, expectedCount,
+ apiclient, expectedCount,
RESOURCE_SECONDARY_STORAGE,
accountid=self.account.id)
self.assertEqual(response[0], PASS, response[1])
try:
- template.delete(self.apiclient)
+ template.delete(apiclient)
except Exception as e:
self.fail("Failed to delete template: %s" % e)
expectedCount = 0
response = matchResourceCount(
- self.apiclient, expectedCount,
+ apiclient, expectedCount,
RESOURCE_SECONDARY_STORAGE,
accountid=self.account.id)
self.assertEqual(response[0], PASS, response[1])