cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [05/18] git commit: updated refs/heads/4.9 to 9b9b49e
Date Fri, 21 Oct 2016 04:47:22 GMT
CLOUDSTACK-9161: move quota test to plugins

The quota integration test requires special setup and is moved to plugins
directory as in 4.9 and master branch.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0eb4fae8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0eb4fae8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0eb4fae8

Branch: refs/heads/4.9
Commit: 0eb4fae8b7e6f48a961d424b1f168c277bc82c78
Parents: 79f0adf
Author: Rohit Yadav <rohit.yadav@shapeblue.com>
Authored: Fri Sep 30 15:12:37 2016 +0530
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Wed Oct 5 15:11:00 2016 +0530

----------------------------------------------------------------------
 test/integration/plugins/test_quota.py | 204 ++++++++++++++++++++++++++++
 test/integration/smoke/test_quota.py   | 204 ----------------------------
 2 files changed, 204 insertions(+), 204 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0eb4fae8/test/integration/plugins/test_quota.py
----------------------------------------------------------------------
diff --git a/test/integration/plugins/test_quota.py b/test/integration/plugins/test_quota.py
new file mode 100644
index 0000000..d4e4323
--- /dev/null
+++ b/test/integration/plugins/test_quota.py
@@ -0,0 +1,204 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+""" Test cases for checking quota API
+"""
+
+#Import Local Modules
+import marvin
+from marvin.cloudstackTestCase import *
+from marvin.cloudstackAPI import *
+from marvin.lib.utils import *
+from marvin.lib.base import *
+from marvin.lib.common import *
+from marvin.lib.utils import (random_gen)
+from nose.plugins.attrib import attr
+
+#Import System modules
+import time
+
+#ENABLE THE QUOTA PLUGIN AND RESTART THE MANAGEMENT SERVER TO RUN QUOTA TESTS
+
+class TestQuota(cloudstackTestCase):
+
+    def setUp(self):
+        self.apiclient = self.testClient.getApiClient()
+        self.hypervisor = self.testClient.getHypervisorInfo()
+        self.dbclient = self.testClient.getDbConnection()
+        self.services = self.testClient.getParsedTestDataConfig()
+        self.zone = get_zone(self.apiclient, self.testClient.getZoneForTests())
+        self.pod = get_pod(self.apiclient, self.zone.id)
+        self.cleanup = []
+        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
+
+    #Check quotaTariffList API returning 22 items
+    @attr(tags=["smoke", "advanced"], required_hardware="false")
+    def test_01_quota(self):
+        cmd = quotaTariffList.quotaTariffListCmd()
+        response = self.apiclient.quotaTariffList(cmd)
+
+        self.debug("Number of quota usage types: %s" % len(response))
+        self.assertEqual(
+                         len(response), 22
+                         )
+        for quota in response:
+            self.debug("Usage Name: %s" % quota.usageName)
+            self.assertEqual(
+                hasattr(quota, 'usageName'),
+                True,
+                "Check whether usgaeName field is there"
+            )
+
+        return
+
+    #Check quota tariff on a particualr day
+    @attr(tags=["smoke", "advanced"], required_hardware="false")
+    def test_02_quota(self):
+        cmd = quotaTariffList.quotaTariffListCmd()
+        cmd.startdate='2015-07-06'
+        response = self.apiclient.quotaTariffList(cmd)
+
+        self.debug("Number of quota usage types: %s" % len(response))
+        self.assertEqual(
+                         len(response), 22
+                         )
+
+        return
+
+    #check quota tariff of a particular item
+    @attr(tags=["smoke", "advanced"], required_hardware="false")
+    def test_03_quota(self):
+        cmd = quotaTariffList.quotaTariffListCmd()
+        cmd.startdate='2015-07-06'
+        cmd.usagetype='10'
+        response = self.apiclient.quotaTariffList(cmd)
+
+        self.debug("Number of quota usage types: %s" % len(response))
+        self.assertEqual(
+                         len(response), 1
+                         )
+        return
+
+
+    #check quota tariff
+    #Change it
+    #Check on affective date the new tariff should be applicable
+    #check the old tariff it should be same
+    @attr(tags=["smoke", "advanced"], required_hardware="false")
+    def test_04_quota(self):
+        cmd = quotaTariffList.quotaTariffListCmd()
+        cmd.startdate='2015-07-06'
+        cmd.usagetype='10'
+        response = self.apiclient.quotaTariffList(cmd)
+
+        self.debug("Number of quota usage types: %s" % len(response))
+        self.assertEqual(
+                         len(response), 1
+                         )
+        quota = response[0]
+        self.debug("Tariff Value for 10: %s" % quota.tariffValue)
+
+        cmd = quotaTariffUpdate.quotaTariffUpdateCmd()
+        tomorrow = datetime.date.today() + datetime.timedelta(days=1)
+        cmd.startdate=tomorrow
+        cmd.usagetype='10'
+        cmd.value='2.9'
+        response = self.apiclient.quotaTariffUpdate(cmd)
+
+        cmd = quotaTariffList.quotaTariffListCmd()
+        cmd.startdate=tomorrow
+        cmd.usagetype='10'
+        response = self.apiclient.quotaTariffList(cmd)
+        self.assertEqual(
+                         len(response), 1
+                         )
+        quota = response[0]
+        self.debug("Tariff Value for 10: %s" % quota.tariffValue)
+
+        self.assertEqual( quota.tariffValue, 2.9)
+
+
+        cmd = quotaTariffList.quotaTariffListCmd()
+        cmd.startdate='2015-07-07'
+        cmd.usagetype='10'
+        response = self.apiclient.quotaTariffList(cmd)
+        self.assertEqual(
+                         len(response), 1
+                         )
+        quota = response[0]
+        self.debug("Tariff Value for 10: %s" % quota.tariffValue)
+
+        self.assertEqual( quota.tariffValue, 0)
+
+        return
+
+
+    #Make credit deposit
+    @attr(tags=["smoke", "advanced"], required_hardware="false")
+    def test_05_quota(self):
+        cmd = quotaCredits.quotaCreditsCmd()
+        cmd.domainid = '1'
+        cmd.account = 'admin'
+        cmd.value = '10'
+        cmd.quota_enforce = '1'
+        cmd.min_balance = '9'
+        response = self.apiclient.quotaCredits(cmd)
+
+        self.debug("Credit response update on: %s" % response.updated_on)
+
+        return
+
+
+    #Make credit deposit and check today balance
+    @attr(tags=["smoke", "advanced"], required_hardware="false")
+    def test_06_quota(self):
+        cmd = quotaBalance.quotaBalanceCmd()
+        today = datetime.date.today()
+        cmd.domainid = '1'
+        cmd.account = 'admin'
+        cmd.startdate = today
+        response = self.apiclient.quotaBalance(cmd)
+
+        self.debug("Quota Balance on: %s" % response.startdate)
+        self.debug("is: %s" % response.startquota)
+
+        self.assertGreater( response.startquota, 9)
+        return
+
+    #make credit deposit and check start and end date balances
+    @attr(tags=["smoke", "advanced"], required_hardware="false")
+    def test_07_quota(self):
+        cmd = quotaBalance.quotaBalanceCmd()
+        today = datetime.date.today()
+        cmd.domainid = '1'
+        cmd.account = 'admin'
+        cmd.startdate = today - datetime.timedelta(days=2)
+        cmd.enddate = today
+        response = self.apiclient.quotaBalance(cmd)
+
+        self.debug("Quota Balance on: %s" % response.startdate)
+        self.debug("is: %s" % response.startquota)
+
+        self.assertGreater( response.endquota, 9)
+        return

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0eb4fae8/test/integration/smoke/test_quota.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_quota.py b/test/integration/smoke/test_quota.py
deleted file mode 100644
index d4e4323..0000000
--- a/test/integration/smoke/test_quota.py
+++ /dev/null
@@ -1,204 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-""" Test cases for checking quota API
-"""
-
-#Import Local Modules
-import marvin
-from marvin.cloudstackTestCase import *
-from marvin.cloudstackAPI import *
-from marvin.lib.utils import *
-from marvin.lib.base import *
-from marvin.lib.common import *
-from marvin.lib.utils import (random_gen)
-from nose.plugins.attrib import attr
-
-#Import System modules
-import time
-
-#ENABLE THE QUOTA PLUGIN AND RESTART THE MANAGEMENT SERVER TO RUN QUOTA TESTS
-
-class TestQuota(cloudstackTestCase):
-
-    def setUp(self):
-        self.apiclient = self.testClient.getApiClient()
-        self.hypervisor = self.testClient.getHypervisorInfo()
-        self.dbclient = self.testClient.getDbConnection()
-        self.services = self.testClient.getParsedTestDataConfig()
-        self.zone = get_zone(self.apiclient, self.testClient.getZoneForTests())
-        self.pod = get_pod(self.apiclient, self.zone.id)
-        self.cleanup = []
-        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
-
-    #Check quotaTariffList API returning 22 items
-    @attr(tags=["smoke", "advanced"], required_hardware="false")
-    def test_01_quota(self):
-        cmd = quotaTariffList.quotaTariffListCmd()
-        response = self.apiclient.quotaTariffList(cmd)
-
-        self.debug("Number of quota usage types: %s" % len(response))
-        self.assertEqual(
-                         len(response), 22
-                         )
-        for quota in response:
-            self.debug("Usage Name: %s" % quota.usageName)
-            self.assertEqual(
-                hasattr(quota, 'usageName'),
-                True,
-                "Check whether usgaeName field is there"
-            )
-
-        return
-
-    #Check quota tariff on a particualr day
-    @attr(tags=["smoke", "advanced"], required_hardware="false")
-    def test_02_quota(self):
-        cmd = quotaTariffList.quotaTariffListCmd()
-        cmd.startdate='2015-07-06'
-        response = self.apiclient.quotaTariffList(cmd)
-
-        self.debug("Number of quota usage types: %s" % len(response))
-        self.assertEqual(
-                         len(response), 22
-                         )
-
-        return
-
-    #check quota tariff of a particular item
-    @attr(tags=["smoke", "advanced"], required_hardware="false")
-    def test_03_quota(self):
-        cmd = quotaTariffList.quotaTariffListCmd()
-        cmd.startdate='2015-07-06'
-        cmd.usagetype='10'
-        response = self.apiclient.quotaTariffList(cmd)
-
-        self.debug("Number of quota usage types: %s" % len(response))
-        self.assertEqual(
-                         len(response), 1
-                         )
-        return
-
-
-    #check quota tariff
-    #Change it
-    #Check on affective date the new tariff should be applicable
-    #check the old tariff it should be same
-    @attr(tags=["smoke", "advanced"], required_hardware="false")
-    def test_04_quota(self):
-        cmd = quotaTariffList.quotaTariffListCmd()
-        cmd.startdate='2015-07-06'
-        cmd.usagetype='10'
-        response = self.apiclient.quotaTariffList(cmd)
-
-        self.debug("Number of quota usage types: %s" % len(response))
-        self.assertEqual(
-                         len(response), 1
-                         )
-        quota = response[0]
-        self.debug("Tariff Value for 10: %s" % quota.tariffValue)
-
-        cmd = quotaTariffUpdate.quotaTariffUpdateCmd()
-        tomorrow = datetime.date.today() + datetime.timedelta(days=1)
-        cmd.startdate=tomorrow
-        cmd.usagetype='10'
-        cmd.value='2.9'
-        response = self.apiclient.quotaTariffUpdate(cmd)
-
-        cmd = quotaTariffList.quotaTariffListCmd()
-        cmd.startdate=tomorrow
-        cmd.usagetype='10'
-        response = self.apiclient.quotaTariffList(cmd)
-        self.assertEqual(
-                         len(response), 1
-                         )
-        quota = response[0]
-        self.debug("Tariff Value for 10: %s" % quota.tariffValue)
-
-        self.assertEqual( quota.tariffValue, 2.9)
-
-
-        cmd = quotaTariffList.quotaTariffListCmd()
-        cmd.startdate='2015-07-07'
-        cmd.usagetype='10'
-        response = self.apiclient.quotaTariffList(cmd)
-        self.assertEqual(
-                         len(response), 1
-                         )
-        quota = response[0]
-        self.debug("Tariff Value for 10: %s" % quota.tariffValue)
-
-        self.assertEqual( quota.tariffValue, 0)
-
-        return
-
-
-    #Make credit deposit
-    @attr(tags=["smoke", "advanced"], required_hardware="false")
-    def test_05_quota(self):
-        cmd = quotaCredits.quotaCreditsCmd()
-        cmd.domainid = '1'
-        cmd.account = 'admin'
-        cmd.value = '10'
-        cmd.quota_enforce = '1'
-        cmd.min_balance = '9'
-        response = self.apiclient.quotaCredits(cmd)
-
-        self.debug("Credit response update on: %s" % response.updated_on)
-
-        return
-
-
-    #Make credit deposit and check today balance
-    @attr(tags=["smoke", "advanced"], required_hardware="false")
-    def test_06_quota(self):
-        cmd = quotaBalance.quotaBalanceCmd()
-        today = datetime.date.today()
-        cmd.domainid = '1'
-        cmd.account = 'admin'
-        cmd.startdate = today
-        response = self.apiclient.quotaBalance(cmd)
-
-        self.debug("Quota Balance on: %s" % response.startdate)
-        self.debug("is: %s" % response.startquota)
-
-        self.assertGreater( response.startquota, 9)
-        return
-
-    #make credit deposit and check start and end date balances
-    @attr(tags=["smoke", "advanced"], required_hardware="false")
-    def test_07_quota(self):
-        cmd = quotaBalance.quotaBalanceCmd()
-        today = datetime.date.today()
-        cmd.domainid = '1'
-        cmd.account = 'admin'
-        cmd.startdate = today - datetime.timedelta(days=2)
-        cmd.enddate = today
-        response = self.apiclient.quotaBalance(cmd)
-
-        self.debug("Quota Balance on: %s" % response.startdate)
-        self.debug("is: %s" % response.startquota)
-
-        self.assertGreater( response.endquota, 9)
-        return


Mime
View raw message