Quota test fixes (apache#5959)

* fixes and cleanups on quota integration test

* text changes in exception messages

Co-authored-by: Daan Hoogland <dahn@onecht.net>
Co-authored-by: sureshanaparti <12028987+sureshanaparti@users.noreply.github.com>

Author: 3 people

test/integration/plugins/test_quota.py

@@ -56,11 +56,7 @@ def setUpClass(cls):
 
     @classmethod
     def tearDownClass(cls):
-        try:
-            cleanup_resources(cls.apiclient, cls._cleanup)
-        except Exception as e:
-            raise Exception("Warning: Exception during cleanup : %s" % e)
-        return
+        super(TestQuota, cls).tearDownClass()
 
     def setUp(self):
         self.apiclient = self.testClient.getApiClient()
@@ -73,12 +69,7 @@ def setUp(self):
         return
 
     def tearDown(self):
-        try:
-            #Clean up, terminate the created templates
-            cleanup_resources(self.apiclient, self.cleanup)
-        except Exception as e:
-            raise Exception("Warning: Exception during cleanup : %s" % e)
-        return
+        super(TestQuota, self).tearDown()
 
     #Check quotaTariffList API returning 22 items
     @attr(tags=["smoke", "advanced"], required_hardware="false")
@@ -244,10 +235,9 @@ def test_06_quota(self):
         cmd.startdate = today
         response = self.apiclient.quotaBalance(cmd)
 
-        self.debug("Quota Balance on: %s" % response.startdate)
-        self.debug("is: %s" % response.startquota)
+        self.debug(f"Quota Balance: {response.balance}")
 
-        self.assertEqual( response.startquota, 10)
+        self.assertEqual( response.startquota, 0, f"startQuota is supposed to be 0 but was {response.balance.startquota}")
         return
 
     #make credit deposit and check start and end date balances
@@ -267,9 +257,8 @@ def test_07_quota(self):
         cmd.enddate = today 
         response = self.apiclient.quotaBalance(cmd)
 
-        self.debug("Quota Balance on: %s" % response.startdate)
-        self.debug("is: %s" % response.startquota)
+        self.debug("Quota Balance: {response.balance}")
 
-        self.assertEqual( response.startquota, 0)
-        self.assertEqual( response.endquota, 10)
+        self.assertEqual( response.balance.startquota, 0, f"startquota was supposed to be 0 but was {response.balance.startquota}")
+        self.assertEqual( response.balance.endquota, 10, f"endquota was supposed to be 10 but was {response.balance.endquota}")
         return