CLOUDSTACK-8132: Fixed issue related to secondary storage count of template

Ashutosh K · yadvr · commit 9a75a0cd221e · 2015-01-20T10:18:24.000+05:30
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org> (cherry picked from commit f938a5e) Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
diff --git a/test/integration/component/test_ss_limits.py b/test/integration/component/test_ss_limits.py
@@ -126,7 +126,7 @@ def setupAccount(self, accountType):
         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 @@ def test_01_register_template(self, value):
         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 @@ def test_01_register_template(self, value):
         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])
