cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [2/2] git commit: updated refs/heads/master to 95e4b7a
Date Thu, 29 Aug 2013 08:44:47 GMT
Automation: Limit Resources - Adding tests related to CPU limits

Reviewed-by: Sanjay Tripathi <Sanjay.Tripathi@citrix.com>
Signed-off-by: Prasanna Santhanam <tsp@apache.org>


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

Branch: refs/heads/master
Commit: 95e4b7afa80a9d4d6567e5058bbcd7b755c87680
Parents: c6f0d46
Author: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
Authored: Mon Jul 29 04:00:08 2013 -0400
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Thu Aug 29 14:13:39 2013 +0530

----------------------------------------------------------------------
 .../component/cpu_limits/test_cpu_limits.py     | 747 ++++++++++++++++++
 .../component/cpu_limits/test_domain_limits.py  | 761 +++++++++++++++++++
 .../component/cpu_limits/test_maximum_limits.py | 374 +++++++++
 .../component/cpu_limits/test_project_limits.py | 347 +++++++++
 tools/marvin/marvin/integration/lib/base.py     |  30 +
 tools/marvin/marvin/integration/lib/common.py   |  57 ++
 6 files changed, 2316 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/95e4b7af/test/integration/component/cpu_limits/test_cpu_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/cpu_limits/test_cpu_limits.py b/test/integration/component/cpu_limits/test_cpu_limits.py
new file mode 100644
index 0000000..96be62b
--- /dev/null
+++ b/test/integration/component/cpu_limits/test_cpu_limits.py
@@ -0,0 +1,747 @@
+# 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.
+
+""" Tests for cpu resource limits
+"""
+# Import Local Modules
+from nose.plugins.attrib import attr
+from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.integration.lib.base import (
+                                        Account,
+                                        ServiceOffering,
+                                        VirtualMachine,
+                                        Domain,
+                                        Resources
+                                        )
+from marvin.integration.lib.common import (get_domain,
+                                        get_zone,
+                                        get_template,
+                                        cleanup_resources,
+                                        find_suitable_host,
+                                        get_resource_type
+                                        )
+
+
+class Services:
+    """Test resource limit services
+    """
+
+    def __init__(self):
+        self.services = {
+                        "account": {
+                                "email": "test@test.com",
+                                "firstname": "Test",
+                                "lastname": "User",
+                                "username": "resource",
+                                # Random characters are appended for unique
+                                # username
+                                "password": "password",
+                         },
+                         "service_offering": {
+                                "name": "Tiny Instance",
+                                "displaytext": "Tiny Instance",
+                                "cpunumber": 4,
+                                "cpuspeed": 100,    # in MHz
+                                "memory": 128,    # In MBs
+                        },
+                        "virtual_machine": {
+                                "displayname": "TestVM",
+                                "username": "root",
+                                "password": "password",
+                                "ssh_port": 22,
+                                "hypervisor": 'KVM',
+                                "privateport": 22,
+                                "publicport": 22,
+                                "protocol": 'TCP',
+                                },
+                         "network": {
+                                "name": "Test Network",
+                                "displaytext": "Test Network",
+                                "netmask": '255.255.255.0'
+                                },
+                         "project": {
+                                "name": "Project",
+                                "displaytext": "Test project",
+                                },
+                         "domain": {
+                                "name": "Domain",
+                                },
+                        "ostype": 'CentOS 5.3 (64-bit)',
+                        "sleep": 60,
+                        "timeout": 10,
+                        "mode": 'advanced',
+                        # Networking mode: Advanced, Basic
+                    }
+
+class TestCPULimits(cloudstackTestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        cls.api_client = super(TestCPULimits,
+                               cls).getClsTestClient().getApiClient()
+        cls.services = Services().services
+        # Get Zone, Domain and templates
+        cls.domain = get_domain(cls.api_client, cls.services)
+        cls.zone = get_zone(cls.api_client, cls.services)
+        cls.services["mode"] = cls.zone.networktype
+
+        cls.template = get_template(
+                            cls.api_client,
+                            cls.zone.id,
+                            cls.services["ostype"]
+                            )
+
+        cls.services["virtual_machine"]["zoneid"] = cls.zone.id
+
+        cls.service_offering = ServiceOffering.create(
+                                            cls.api_client,
+                                            cls.services["service_offering"]
+                                            )
+
+        cls._cleanup = [cls.service_offering, ]
+        return
+
+    @classmethod
+    def tearDownClass(cls):
+        try:
+            # Cleanup resources used
+            cleanup_resources(cls.api_client, cls._cleanup)
+        except Exception as e:
+            raise Exception("Warning: Exception during cleanup : %s" % e)
+        return
+
+    def setUp(self):
+        self.apiclient = self.testClient.getApiClient()
+        self.dbclient = self.testClient.getDbConnection()
+        self.account = Account.create(
+                            self.apiclient,
+                            self.services["account"],
+                            admin=True
+                            )
+
+        self.debug("Creating an instance with service offering: %s" %
+                                                    self.service_offering.name)
+        self.vm = self.createInstance(service_off=self.service_offering)
+
+        self.cleanup = [self.account, ]
+        return
+
+    def tearDown(self):
+        try:
+            # Clean up, terminate the created instance, volumes and snapshots
+            cleanup_resources(self.apiclient, self.cleanup)
+        except Exception as e:
+            raise Exception("Warning: Exception during cleanup : %s" % e)
+        return
+
+    def createInstance(self, service_off, networks=None, api_client=None):
+        """Creates an instance in account"""
+
+   if api_client is None:
+       api_client = self.apiclient
+
+        self.debug("Deploying an instance in account: %s" %
+                                                self.account.name)
+        try:
+            vm = VirtualMachine.create(
+                                api_client,
+                                self.services["virtual_machine"],
+                                templateid=self.template.id,
+                                accountid=self.account.name,
+                                domainid=self.account.domainid,
+                                networkids=networks,
+                                serviceofferingid=service_off.id)
+            vms = VirtualMachine.list(api_client, id=vm.id, listall=True)
+            self.assertIsInstance(vms,
+                                  list,
+                                  "List VMs should return a valid response")
+            self.assertEqual(vms[0].state, "Running",
+                             "Vm state should be running after deployment")
+            return vm
+        except Exception as e:
+            self.fail("Failed to deploy an instance: %s" % e)
+
+    @attr(tags=["advanced", "advancedns","simulator"])
+    def test_01_multiplecore_start_stop_instance(self):
+        """Test Deploy VM with multiple core CPU & verify the usage"""
+
+        # Validate the following
+        # 1. Deploy VM with multiple core CPU & verify the usage
+        # 2. Stop VM & verify the update resource count of Root Admin Account
+        # 3. Start VM & verify the update resource count of Root Admin Account
+        # 4. Resource count should list properly.
+
+        account_list = Account.list(self.apiclient, id=self.account.id)
+        self.assertIsInstance(account_list,
+                              list,
+                              "List Accounts should return a valid response"
+                              )
+        resource_count = account_list[0].cputotal
+
+        expected_resource_count = int(self.services["service_offering"]["cpunumber"])
+
+        self.assertEqual(resource_count, expected_resource_count,
+                         "Resource count should match with the expected resource count")
+
+        self.debug("Stopping instance: %s" % self.vm.name)
+        try:
+            self.vm.stop(self.apiclient)
+        except Exception as e:
+            self.fail("Failed to stop instance: %s" % e)
+
+        account_list = Account.list(self.apiclient, id=self.account.id)
+        self.assertIsInstance(account_list,
+                              list,
+                              "List Accounts should return a valid response"
+                              )
+        resource_count_after_stop = account_list[0].cputotal
+
+        self.assertEqual(resource_count, resource_count_after_stop,
+                         "Resource count should be same after stopping the instance")
+
+        self.debug("Starting instance: %s" % self.vm.name)
+        try:
+            self.vm.start(self.apiclient)
+        except Exception as e:
+            self.fail("Failed to start instance: %s" % e)
+
+        account_list = Account.list(self.apiclient, id=self.account.id)
+        self.assertIsInstance(account_list,
+                              list,
+                              "List Accounts should return a valid response"
+                              )
+        resource_count_after_start = account_list[0].cputotal
+
+        self.assertEqual(resource_count, resource_count_after_start,
+                         "Resource count should be same after stopping the instance")
+        return
+
+    @attr(tags=["advanced", "advancedns","simulator"])
+    def test_02_multiplecore_migrate_instance(self):
+        """Test Deploy VM with multiple core CPU & verify the usage"""
+
+        # Validate the following
+        # 1. Deploy VM with multiple core CPU & verify the usage
+        # 2. Migrate VM & verify updated resource count of Root Admin Account
+        # 3. Resource count should list properly.
+
+        account_list = Account.list(self.apiclient, id=self.account.id)
+        self.assertIsInstance(account_list,
+                              list,
+                              "List Accounts should return a valid response"
+                              )
+        resource_count = account_list[0].cputotal
+
+        expected_resource_count = int(self.services["service_offering"]["cpunumber"])
+
+        self.assertEqual(resource_count, expected_resource_count,
+                         "Resource count should match with the expected resource count")
+
+        host = find_suitable_host(self.apiclient, self.vm)
+        self.debug("Migrating instance: %s to host: %s" % (self.vm.name, host.name))
+        try:
+            self.vm.migrate(self.apiclient, host.id)
+        except Exception as e:
+            self.fail("Failed to migrate instance: %s" % e)
+
+        account_list = Account.list(self.apiclient, id=self.account.id)
+        self.assertIsInstance(account_list,
+                              list,
+                              "List Accounts should return a valid response"
+                              )
+        resource_count_after_migrate = account_list[0].cputotal
+
+        self.assertEqual(resource_count, resource_count_after_migrate,
+                         "Resource count should be same after migrating the instance")
+        return
+
+    @attr(tags=["advanced", "advancedns","simulator"])
+    def test_03_multiplecore_delete_instance(self):
+        """Test Deploy VM with multiple core CPU & verify the usage"""
+
+        # Validate the following
+        # 1. Deploy VM with multiple core CPU & verify the usage
+        # 2. Destroy VM & verify update resource count of Root Admin Account
+        # 3. Resource count should list properly.
+
+        account_list = Account.list(self.apiclient, id=self.account.id)
+        self.assertIsInstance(account_list,
+                              list,
+                              "List Accounts should return a valid response"
+                              )
+        resource_count = account_list[0].cputotal
+
+        expected_resource_count = int(self.services["service_offering"]["cpunumber"])
+
+        self.assertEqual(resource_count, expected_resource_count,
+                         "Resource count should match with the expected resource count")
+
+        self.debug("Destroying instance: %s" % self.vm.name)
+        try:
+            self.vm.delete(self.apiclient)
+        except Exception as e:
+            self.fail("Failed to delete instance: %s" % e)
+
+        account_list = Account.list(self.apiclient, id=self.account.id)
+        self.assertIsInstance(account_list,
+                              list,
+                              "List Accounts should return a valid response"
+                              )
+        resource_count = account_list[0].cputotal
+        self.assertEqual(resource_count, 0 , "Resource count for %s should be 0" % get_resource_type(resource_id=8))#CPU
+        return
+
+    @attr(tags=["advanced", "advancedns","simulator"])
+    def test_04_deploy_multiple_vm_with_multiple_cpus(self):
+        """Test Deploy multiple VM with 4 core CPU & verify the usage"""
+
+        # Validate the following
+        # 1. Create compute offering with 4 core CPU
+        # 2. Deploy multiple VMs with this service offering
+        # 3. List Resource count for the root admin CPU usage
+        # 4. CPU usage should list properly
+        # 5. Destroy one VM among multiple VM's and verify the resource count
+        # 6. Migrate VM from & verify resource updates
+        # 7. List resource count for Root Admin
+        # 8. Failed to deploy VM and verify the resource usage
+
+        self.debug("Creating service offering with 4 CPU cores")
+        self.service_offering = ServiceOffering.create(
+                                            self.apiclient,
+                                            self.services["service_offering"]
+                                            )
+        # Adding to cleanup list after execution
+        self.cleanup.append(self.service_offering)
+
+        self.debug("Creating an instance with service offering: %s" %
+                                                    self.service_offering.name)
+        vm_1 = self.createInstance(service_off=self.service_offering)
+        vm_2 = self.createInstance(service_off=self.service_offering)
+        self.createInstance(service_off=self.service_offering)
+
+        account_list = Account.list(self.apiclient, id=self.account.id)
+        self.assertIsInstance(account_list,
+                              list,
+                              "List Accounts should return a valid response"
+                              )
+        resource_count = account_list[0].cputotal
+
+        expected_resource_count = int(self.services["service_offering"]["cpunumber"]) * 4 #Total 4 Vms
+        self.assertTrue(resource_count == expected_resource_count,
+                         "Resource count does not match the expected vavlue")
+        return
+
+class TestDomainCPULimitsConfiguration(cloudstackTestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        cls.api_client = super(TestDomainCPULimitsConfiguration,
+                               cls).getClsTestClient().getApiClient()
+        cls.services = Services().services
+        # Get Zone, Domain and templates
+        cls.domain = get_domain(cls.api_client, cls.services)
+        cls.zone = get_zone(cls.api_client, cls.services)
+        cls.services["mode"] = cls.zone.networktype
+        cls.template = get_template(
+                            cls.api_client,
+                            cls.zone.id,
+                            cls.services["ostype"]
+                            )
+
+        cls.service_offering = ServiceOffering.create(
+                                            cls.api_client,
+                                            cls.services["service_offering"]
+                                            )
+
+        cls.services["virtual_machine"]["zoneid"] = cls.zone.id
+
+        cls._cleanup = [cls.service_offering, ]
+        return
+
+    @classmethod
+    def tearDownClass(cls):
+        try:
+            # Cleanup resources used
+            cleanup_resources(cls.api_client, cls._cleanup)
+        except Exception as e:
+            raise Exception("Warning: Exception during cleanup : %s" % e)
+        return
+
+    def setUp(self):
+        self.apiclient = self.testClient.getApiClient()
+        self.dbclient = self.testClient.getDbConnection()
+        self.cleanup = []
+        return
+
+    def tearDown(self):
+        try:
+            # Clean up, terminate the created instance, volumes and snapshots
+            cleanup_resources(self.apiclient, self.cleanup)
+        except Exception as e:
+            raise Exception("Warning: Exception during cleanup : %s" % e)
+        return
+
+    def createInstance(self, service_off, networks=None, api_client=None):
+        """Creates an instance in account"""
+
+   if api_client is None:
+       api_client = self.apiclient
+
+        self.debug("Deploying an instance in account: %s" %
+                                                self.account.name)
+        try:
+            vm = VirtualMachine.create(
+                                api_client,
+                                self.services["virtual_machine"],
+                                templateid=self.template.id,
+                                accountid=self.account.name,
+                                domainid=self.account.domainid,
+                                networkids=networks,
+                                serviceofferingid=service_off.id)
+            vms = VirtualMachine.list(api_client, id=vm.id, listall=True)
+            self.assertIsInstance(vms,
+                                  list,
+                                  "List VMs should return a valid response")
+            self.assertEqual(vms[0].state, "Running",
+                             "Vm state should be running after deployment")
+            return vm
+        except Exception as e:
+            self.fail("Failed to deploy an instance: %s" % e)
+
+    def setupAccounts(self):
+
+        self.debug("Creating a sub-domain under: %s" % self.domain.name)
+   self.child_domain_1 = Domain.create(
+               self.apiclient,
+                                services=self.services["domain"],
+                                parentdomainid=self.domain.id
+               )
+   self.child_do_admin_1 = Account.create(
+                                self.apiclient,
+                                self.services["account"],
+                                admin=True,
+                                domainid=self.child_domain_1.id
+                                )
+   # Cleanup the resources created at end of test
+   self.cleanup.append(self.child_do_admin_1)
+   self.cleanup.append(self.child_domain_1)
+
+   self.child_domain_2 = Domain.create(
+                 self.apiclient,
+                              services=self.services["domain"],
+                              parentdomainid=self.domain.id
+                 )
+
+   self.child_do_admin_2 = Account.create(
+                                self.apiclient,
+                                self.services["account"],
+                                admin=True,
+                                domainid=self.child_domain_2.id
+                   )
+
+   # Cleanup the resources created at end of test
+   self.cleanup.append(self.child_do_admin_2)
+   self.cleanup.append(self.child_domain_2)
+
+        return
+
+    @attr(tags=["advanced", "advancedns","simulator"])
+    def test_01_stop_start_instance(self):
+        """Test Deploy VM with 4 core CPU & verify the usage"""
+
+        # Validate the following
+        # 1. Create compute offering with 4 core CPU & Deploy VM
+        # 2. List Resource count CPU usage
+        # 3. Stop and Start instance, check resource count.
+        # 4. Resource count should list properly.
+
+        self.debug("Setting up account and domain hierarchy")
+        self.setupAccounts()
+        users = {self.child_domain_1: self.child_do_admin_1,
+                 self.child_domain_2: self.child_do_admin_2
+                 }
+        for domain, admin in users.items():
+            self.account = admin
+            self.domain = domain
+
+       api_client = self.testClient.createUserApiClient(
+                             UserName=self.account.name,
+                             DomainName=self.account.domain)
+
+            self.debug("Creating an instance with service offering: %s" %
+                                                    self.service_offering.name)
+            vm = self.createInstance(service_off=self.service_offering, api_client=api_client)
+
+            account_list = Account.list(self.apiclient, id=self.account.id)
+            self.assertIsInstance(account_list,
+                                  list,
+                                  "List Accounts should return a valid response"
+                                  )
+            resource_count = account_list[0].cputotal
+
+            expected_resource_count = int(self.services["service_offering"]["cpunumber"])
+
+            self.assertEqual(resource_count, expected_resource_count,
+                         "Initial resource count should match with the expected resource count")
+
+            self.debug("Stopping instance: %s" % vm.name)
+            try:
+                vm.stop(self.apiclient)
+            except Exception as e:
+                self.fail("Failed to stop instance: %s" % e)
+
+            account_list = Account.list(self.apiclient, id=self.account.id)
+            self.assertIsInstance(account_list,
+                                  list,
+                                  "List Accounts should return a valid response"
+                                  )
+            resource_count_after_stop = account_list[0].cputotal
+
+            self.assertEqual(resource_count, resource_count_after_stop,
+                         "Resource count should be same after stopping the instance")
+
+            self.debug("Starting instance: %s" % vm.name)
+            try:
+                vm.start(self.apiclient)
+            except Exception as e:
+                self.fail("Failed to start instance: %s" % e)
+
+            account_list = Account.list(self.apiclient, id=self.account.id)
+            self.assertIsInstance(account_list,
+                                  list,
+                                  "List Accounts should return a valid response"
+                                  )
+            resource_count_after_start = account_list[0].cputotal
+
+            self.assertEqual(resource_count_after_stop, resource_count_after_start,
+                         "Resource count should be same after starting the instance")
+        return
+
+    @attr(tags=["advanced", "advancedns","simulator"])
+    def test_02_migrate_instance(self):
+        """Test Deploy VM with 4 core CPU & verify the usage"""
+
+        # Validate the following
+        # 1. Create compute offering with 4 core CPU & Deploy VM
+        # 2. List Resource count
+        # 3. Migrate instance to another host
+        # 4. Resource count should list properly.
+
+        self.debug("Setting up account and domain hierarchy")
+        self.setupAccounts()
+        users = {self.child_domain_1: self.child_do_admin_1,
+                 self.child_domain_2: self.child_do_admin_2
+                 }
+        for domain, admin in users.items():
+            self.account = admin
+            self.domain = domain
+
+       api_client = self.testClient.createUserApiClient(
+                             UserName=self.account.name,
+                             DomainName=self.account.domain)
+
+            self.debug("Creating an instance with service offering: %s" %
+                                                    self.service_offering.name)
+            vm = self.createInstance(service_off=self.service_offering, api_client=api_client)
+
+            account_list = Account.list(self.apiclient, id=self.account.id)
+            self.assertIsInstance(account_list,
+                                  list,
+                                  "List Accounts should return a valid response"
+                                  )
+            resource_count = account_list[0].cputotal
+
+            expected_resource_count = int(self.services["service_offering"]["cpunumber"])
+
+            self.assertEqual(resource_count, expected_resource_count,
+                         "Initial resource count should with the expected resource count")
+
+            host = find_suitable_host(self.apiclient, vm)
+            self.debug("Migrating instance: %s to host: %s" %
+                                                        (vm.name, host.name))
+            try:
+                vm.migrate(self.apiclient, host.id)
+            except Exception as e:
+                self.fail("Failed to migrate instance: %s" % e)
+
+            account_list = Account.list(self.apiclient, id=self.account.id)
+            self.assertIsInstance(account_list,
+                                  list,
+                                  "List Accounts should return a valid response"
+                                  )
+            resource_count_after_migrate = account_list[0].cputotal
+
+            self.assertEqual(resource_count, resource_count_after_migrate,
+                         "Resource count should be same after starting the instance")
+        return
+
+    @attr(tags=["advanced", "advancedns","simulator"])
+    def test_03_delete_instance(self):
+        """Test Deploy VM with 4 core CPU & verify the usage"""
+
+        # Validate the following
+        # 1. Create compute offering with 4 core CPU & Deploy VM
+        # 2. List Resource count for the CPU usage
+        # 3. Delete instance
+        # 4. Resource count should list as 0
+
+        self.debug("Setting up account and domain hierarchy")
+        self.setupAccounts()
+        users = {self.child_domain_1: self.child_do_admin_1,
+                 self.child_domain_2: self.child_do_admin_2
+                 }
+        for domain, admin in users.items():
+            self.account = admin
+            self.domain = domain
+
+       api_client = self.testClient.createUserApiClient(
+                             UserName=self.account.name,
+                             DomainName=self.account.domain)
+
+            self.debug("Creating an instance with service offering: %s" %
+                                                    self.service_offering.name)
+            vm = self.createInstance(service_off=self.service_offering, api_client=api_client)
+
+            account_list = Account.list(self.apiclient, id=self.account.id)
+            self.assertIsInstance(account_list,
+                                  list,
+                                  "List Accounts should return a valid response"
+                                  )
+            resource_count = account_list[0].cputotal
+
+            expected_resource_count = int(self.services["service_offering"]["cpunumber"])
+
+            self.assertEqual(resource_count, expected_resource_count,
+                         "Initial resource count should match with the expected resource count")
+
+            self.debug("Destroying instance: %s" % vm.name)
+            try:
+                vm.delete(self.apiclient)
+            except Exception as e:
+                self.fail("Failed to delete instance: %s" % e)
+
+            account_list = Account.list(self.apiclient, id=self.account.id)
+            self.assertIsInstance(account_list,
+                                  list,
+                                  "List Accounts should return a valid response"
+                                  )
+            resource_count = account_list[0].cputotal
+            self.assertEqual(resource_count, 0 , "Resource count for %s should be 0" % get_resource_type(resource_id=8))#CPU
+        return
+
+    @attr(tags=["advanced", "advancedns","simulator"])
+    @attr(configuration='max.account.cpus')
+    def test_04_deploy_multiple_vm_with_multiple_cpus(self):
+        """Test Deploy multiple VM with 4 core CPU & verify the usage"""
+   #keep the configuration value - max.account.cpus number = 16
+
+        # Validate the following
+        # 1. Create compute offering with 4 core CPU
+        # 2. Deploy multiple VMs with this service offering
+        # 3. List Resource count for the root admin CPU usage
+        # 4. CPU usage should list properly
+
+        self.debug("Creating service offering with 4 CPU cores")
+        self.service_offering = ServiceOffering.create(
+                                            self.apiclient,
+                                            self.services["service_offering"]
+                                            )
+        # Adding to cleanup list after execution
+        self.cleanup.append(self.service_offering)
+
+        self.debug("Setting up account and domain hierarchy")
+        self.setupAccounts()
+        users = {self.child_domain_1: self.child_do_admin_1,
+                 self.child_domain_2: self.child_do_admin_2
+                 }
+        for domain, admin in users.items():
+            self.account = admin
+            self.domain = domain
+
+            cpu_account_gc = Resources.list(self.apiclient,
+                                resourcetype = 8, #CPU
+                                account = self.account.name,
+                                domainid = self.domain.id
+                                )
+
+            if cpu_account_gc[0].max != 16:
+                self.skipTest("This test case requires configuration value max.account.cpus to be 16")
+
+       api_client = self.testClient.createUserApiClient(
+                             UserName=self.account.name,
+                             DomainName=self.account.domain)
+
+            self.debug("Creating an instance with service offering: %s" %
+                                                    self.service_offering.name)
+            vm_1 = self.createInstance(service_off=self.service_offering, api_client=api_client)
+            vm_2 = self.createInstance(service_off=self.service_offering, api_client=api_client)
+            self.createInstance(service_off=self.service_offering, api_client=api_client)
+            self.createInstance(service_off=self.service_offering, api_client=api_client)
+
+            self.debug("Deploying instance - CPU capacity is fully utilized")
+            with self.assertRaises(Exception):
+                self.createInstance(service_off=self.service_offering, api_client=api_client)
+
+            account_list = Account.list(self.apiclient, id=self.account.id)
+            self.assertIsInstance(account_list,
+                                  list,
+                                  "List Accounts should return a valid response"
+                                  )
+            resource_count = account_list[0].cputotal
+
+            expected_resource_count = int(self.services["service_offering"]["cpunumber"]) * 4 #Total 4 vms
+
+            self.assertEqual(resource_count, expected_resource_count,
+                         "Initial resource count should with the expected resource count")
+
+            self.debug("Destroying instance: %s" % vm_1.name)
+            try:
+                vm_1.delete(self.apiclient)
+            except Exception as e:
+                self.fail("Failed to delete instance: %s" % e)
+
+            account_list = Account.list(self.apiclient, id=self.account.id)
+            self.assertIsInstance(account_list,
+                                  list,
+                                  "List Accounts should return a valid response"
+                                  )
+            resource_count_after_delete = account_list[0].cputotal
+
+            expected_resource_count -= int(self.services["service_offering"]["cpunumber"])
+
+            self.assertEqual(resource_count_after_delete, expected_resource_count,
+                         "Resource count should be less than before after deleting the instance")
+
+            host = find_suitable_host(self.apiclient, vm_2)
+            self.debug("Migrating instance: %s to host: %s" % (vm_2.name,
+                                                               host.name))
+            try:
+                vm_2.migrate(self.apiclient, host.id)
+            except Exception as e:
+                self.fail("Failed to migrate instance: %s" % e)
+
+            account_list = Account.list(self.apiclient, id=self.account.id)
+            self.assertIsInstance(account_list,
+                                  list,
+                                  "List Accounts should return a valid response"
+                                  )
+            resource_count_after_migrate = account_list[0].cputotal
+
+            self.debug(resource_count_after_migrate)
+            self.assertEqual(resource_count_after_delete, resource_count_after_migrate,
+                         "Resource count should be same after migrating the instance")
+        return

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/95e4b7af/test/integration/component/cpu_limits/test_domain_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/cpu_limits/test_domain_limits.py b/test/integration/component/cpu_limits/test_domain_limits.py
new file mode 100644
index 0000000..057c6b9
--- /dev/null
+++ b/test/integration/component/cpu_limits/test_domain_limits.py
@@ -0,0 +1,761 @@
+# 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.
+
+""" Tests for cpu resource limits related to domains
+"""
+# Import Local Modules
+from nose.plugins.attrib import attr
+from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.integration.lib.base import (
+                                        Account,
+                                        ServiceOffering,
+                                        VirtualMachine,
+                                        Resources,
+                                        Domain
+                                        )
+from marvin.integration.lib.common import (get_domain,
+                                        get_zone,
+                                        get_template,
+                                        cleanup_resources,
+                                        find_suitable_host,
+                                        get_resource_type
+                                        )
+
+class Services:
+    """Test resource limit services
+    """
+
+    def __init__(self):
+        self.services = {
+                        "account": {
+                                "email": "test@test.com",
+                                "firstname": "Test",
+                                "lastname": "User",
+                                "username": "resource",
+                                # Random characters are appended for unique
+                                # username
+                                "password": "password",
+                         },
+                         "service_offering": {
+                                "name": "Tiny Instance",
+                                "displaytext": "Tiny Instance",
+                                "cpunumber": 4,
+                                "cpuspeed": 100,    # in MHz
+                                "memory": 128,    # In MBs
+                        },
+                        "virtual_machine": {
+                                "displayname": "TestVM",
+                                "username": "root",
+                                "password": "password",
+                                "ssh_port": 22,
+                                "hypervisor": 'KVM',
+                                "privateport": 22,
+                                "publicport": 22,
+                                "protocol": 'TCP',
+                                },
+                         "network": {
+                                "name": "Test Network",
+                                "displaytext": "Test Network",
+                                "netmask": '255.255.255.0'
+                                },
+                         "project": {
+                                "name": "Project",
+                                "displaytext": "Test project",
+                                },
+                         "domain": {
+                                "name": "Domain",
+                                },
+                        "ostype": 'CentOS 5.3 (64-bit)',
+                        "sleep": 60,
+                        "timeout": 10,
+                        "mode": 'advanced',
+                        # Networking mode: Advanced, Basic
+                    }
+
+class TestDomainCPULimitsUpdateResources(cloudstackTestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        cls.api_client = super(TestDomainCPULimitsUpdateResources,
+                               cls).getClsTestClient().getApiClient()
+        cls.services = Services().services
+        # Get Zone, Domain and templates
+        cls.domain = get_domain(cls.api_client, cls.services)
+        cls.zone = get_zone(cls.api_client, cls.services)
+        cls.services["mode"] = cls.zone.networktype
+        cls.template = get_template(
+                            cls.api_client,
+                            cls.zone.id,
+                            cls.services["ostype"]
+                            )
+
+        cls.services["virtual_machine"]["zoneid"] = cls.zone.id
+
+        cls.service_offering = ServiceOffering.create(
+                                            cls.api_client,
+                                            cls.services["service_offering"]
+                                            )
+
+        cls._cleanup = [cls.service_offering, ]
+        return
+
+    @classmethod
+    def tearDownClass(cls):
+        try:
+            # Cleanup resources used
+            cleanup_resources(cls.api_client, cls._cleanup)
+        except Exception as e:
+            raise Exception("Warning: Exception during cleanup : %s" % e)
+        return
+
+    def setUp(self):
+        self.apiclient = self.testClient.getApiClient()
+        self.dbclient = self.testClient.getDbConnection()
+        self.cleanup = []
+        return
+
+    def tearDown(self):
+        try:
+            # Clean up, terminate the created instance, volumes and snapshots
+            cleanup_resources(self.apiclient, self.cleanup)
+        except Exception as e:
+            raise Exception("Warning: Exception during cleanup : %s" % e)
+        return
+
+    def createInstance(self, service_off, networks=None, api_client=None):
+        """Creates an instance in account"""
+
+   if api_client is None:
+       api_client = self.apiclient
+
+        self.debug("Deploying an instance in account: %s" %
+                                                self.account.name)
+        try:
+            vm = VirtualMachine.create(
+                                api_client,
+                                self.services["virtual_machine"],
+                                templateid=self.template.id,
+                                accountid=self.account.name,
+                                domainid=self.account.domainid,
+                                networkids=networks,
+                                serviceofferingid=service_off.id)
+            vms = VirtualMachine.list(api_client, id=vm.id, listall=True)
+            self.assertIsInstance(vms,
+                                  list,
+                                  "List VMs should return a valid response")
+            self.assertEqual(vms[0].state, "Running",
+                             "Vm state should be running after deployment")
+            return vm
+        except Exception as e:
+            self.fail("Failed to deploy an instance: %s" % e)
+
+    def setupAccounts(self):
+
+        self.debug("Creating a sub-domain under: %s" % self.domain.name)
+   self.child_domain = Domain.create(
+               self.apiclient,
+                                services=self.services["domain"],
+                                parentdomainid=self.domain.id
+               )
+   self.child_do_admin = Account.create(
+                                self.apiclient,
+                                self.services["account"],
+                                admin=True,
+                                domainid=self.child_domain.id
+                                )
+   # Cleanup the resources created at end of test
+   self.cleanup.append(self.child_do_admin)
+   self.cleanup.append(self.child_domain)
+
+   Resources.updateLimit(
+       self.apiclient,
+                resourcetype=8,
+                max=16,
+                account=self.child_do_admin.name,
+                domainid=self.child_do_admin.domainid
+       )
+
+   self.domain = Domain.create(
+           self.apiclient,
+                        services=self.services["domain"],
+                        parentdomainid=self.domain.id
+           )
+
+   self.admin = Account.create(
+                            self.apiclient,
+                            self.services["account"],
+                            admin=True,
+                            domainid=self.domain.id
+               )
+
+   # Cleanup the resources created at end of test
+   self.cleanup.append(self.admin)
+   self.cleanup.append(self.domain)
+
+   Resources.updateLimit(
+             self.apiclient,
+                      resourcetype=8,
+                      max=16,
+                      account=self.admin.name,
+                      domainid=self.admin.domainid
+             )
+        return
+
+    @attr(tags=["advanced", "advancedns","simulator"])
+    def test_01_multiple_core_vm_start_stop_instance(self):
+        """Test Deploy VM with 4 core CPU & verify the usage"""
+
+        # Validate the following
+        # 1. Create two domains and set specific resource (cpu) limit for them
+        # 2. Create compute offering with 4 core CPU & deploy vm
+        # 3. Update Resource count for the domains
+        # 4. Reboot instance and check resource count
+        # 5. Resource count should list properly.
+
+        self.debug("Setting up account and domain hierarchy")
+        self.setupAccounts()
+        users = {self.domain: self.admin,
+                 self.child_domain: self.child_do_admin
+                 }
+        for domain, admin in users.items():
+            self.account = admin
+            self.domain = domain
+
+       api_client = self.testClient.createUserApiClient(
+                             UserName=self.account.name,
+                             DomainName=self.account.domain)
+
+            self.debug("Creating an instance with service offering: %s" %
+                                                    self.service_offering.name)
+            vm = self.createInstance(service_off=self.service_offering, api_client=api_client)
+
+            account_list = Account.list(self.apiclient, id=self.account.id)
+            self.assertIsInstance(account_list,
+                                  list,
+                                  "List Accounts should return a valid response"
+                                  )
+            resource_count = account_list[0].cputotal
+
+            expected_resource_count = int(self.services["service_offering"]["cpunumber"])
+
+            self.assertEqual(resource_count, expected_resource_count,
+                             "Initial resource count should match with the expected resource count")
+
+            self.debug("Stopping instance: %s" % vm.name)
+            try:
+                vm.stop(self.apiclient)
+            except Exception as e:
+                self.fail("Failed to stop instance: %s" % e)
+
+            account_list = Account.list(self.apiclient, id=self.account.id)
+            self.assertIsInstance(account_list,
+                                  list,
+                                  "List Accounts should return a valid response"
+                                  )
+            resource_count_after_stop = account_list[0].cputotal
+
+            self.assertEqual(resource_count, resource_count_after_stop,
+                             "Resource count should be same as before, after stopping the instance")
+
+            self.debug("Starting instance: %s" % vm.name)
+            try:
+                vm.start(self.apiclient)
+            except Exception as e:
+                self.fail("Failed to start instance: %s" % e)
+
+            account_list = Account.list(self.apiclient, id=self.account.id)
+            self.assertIsInstance(account_list,
+                                  list,
+                                  "List Accounts should return a valid response"
+                                  )
+            resource_count_after_start = account_list[0].cputotal
+
+            self.assertEqual(resource_count_after_stop, resource_count_after_start,
+                             "Resource count should be same as before, after starting the instance")
+        return
+
+    @attr(tags=["advanced", "advancedns","simulator"])
+    def test_02_multiple_core_vm_migrate_instance(self):
+        """Test Deploy VM with 4 core CPU & verify the usage"""
+
+        # Validate the following
+        # 1. Create two domains and set specific resource (cpu) limit for them
+        # 2. Create compute offering with 4 core CPU & deploy vm
+        # 3. Update Resource count for the domains
+        # 4. Migrate instance to new host and check resource count
+        # 5. Resource count should list properly.
+
+        self.debug("Setting up account and domain hierarchy")
+        self.setupAccounts()
+        users = {self.domain: self.admin,
+                 self.child_domain: self.child_do_admin
+                 }
+        for domain, admin in users.items():
+            self.account = admin
+            self.domain = domain
+
+       api_client = self.testClient.createUserApiClient(
+                             UserName=self.account.name,
+                             DomainName=self.account.domain)
+
+            self.debug("Creating an instance with service offering: %s" %
+                                                    self.service_offering.name)
+            vm = self.createInstance(service_off=self.service_offering, api_client=api_client)
+
+            account_list = Account.list(self.apiclient, id=self.account.id)
+            self.assertIsInstance(account_list,
+                                  list,
+                                  "List Accounts should return a valid response"
+                                  )
+            resource_count = account_list[0].cputotal
+
+            expected_resource_count = int(self.services["service_offering"]["cpunumber"])
+
+            self.assertEqual(resource_count, expected_resource_count,
+                             "Initial resource count should match with the expected resource count")
+
+            host = find_suitable_host(self.apiclient, vm)
+            self.debug("Migrating instance: %s to host: %s" %
+                                                        (vm.name, host.name))
+            try:
+                vm.migrate(self.apiclient, host.id)
+            except Exception as e:
+                self.fail("Failed to migrate instance: %s" % e)
+
+            account_list = Account.list(self.apiclient, id=self.account.id)
+            self.assertIsInstance(account_list,
+                                  list,
+                                  "List Accounts should return a valid response"
+                                  )
+            resource_count_after_migrate = account_list[0].cputotal
+
+            self.assertEqual(resource_count, resource_count_after_migrate,
+                             "Resource count should be same as before, after migrating the instance")
+        return
+
+    @attr(tags=["advanced", "advancedns","simulator"])
+    def test_03_multiple_core_vm_delete_instance(self):
+        """Test Deploy VM with 4 core CPU & verify the usage"""
+
+        # Validate the following
+        # 1. Create two domains and set specific resource (cpu) limit for them
+        # 2. Create compute offering with 4 core CPU & deploy vm
+        # 3. Update Resource count for the domains
+        # 4. delete instance and check resource count
+        # 5. Resource count should list properly.
+
+        self.debug("Setting up account and domain hierarchy")
+        self.setupAccounts()
+        users = {self.domain: self.admin,
+                 self.child_domain: self.child_do_admin
+                 }
+        for domain, admin in users.items():
+            self.account = admin
+            self.domain = domain
+
+       api_client = self.testClient.createUserApiClient(
+                             UserName=self.account.name,
+                             DomainName=self.account.domain)
+
+            self.debug("Creating an instance with service offering: %s" %
+                                                    self.service_offering.name)
+            vm = self.createInstance(service_off=self.service_offering, api_client=api_client)
+
+            account_list = Account.list(self.apiclient, id=self.account.id)
+            self.assertIsInstance(account_list,
+                                  list,
+                                  "List Accounts should return a valid response"
+                                  )
+            resource_count = account_list[0].cputotal
+
+            expected_resource_count = int(self.services["service_offering"]["cpunumber"])
+
+            self.assertEqual(resource_count, expected_resource_count,
+                             "Initial resource count should with the expected resource count")
+
+            self.debug("Destroying instance: %s" % vm.name)
+            try:
+                vm.delete(self.apiclient)
+            except Exception as e:
+                self.fail("Failed to delete instance: %s" % e)
+
+            account_list = Account.list(self.apiclient, id=self.account.id)
+            self.assertIsInstance(account_list,
+                                  list,
+                                  "List Accounts should return a valid response"
+                                  )
+            resource_count_after_delete = account_list[0].cputotal
+
+            self.assertEqual(resource_count_after_delete, 0 , "Resource count for %s should be 0" % get_resource_type(resource_id=8))#CPU
+        return
+
+    @attr(tags=["advanced", "advancedns","simulator"])
+    def test_04_deploy_multiple_vm_with_multiple_core(self):
+        """Test Deploy multiple VM with 4 core CPU & verify the usage"""
+
+        # Validate the following
+        # 1. Create compute offering with 4 core CPU
+        # 2. Deploy multiple VMs within domain with this service offering
+        # 3. Update Resource count for the domain
+        # 4. CPU usage should list properly
+
+        self.debug("Creating service offering with 4 CPU cores")
+        self.service_offering = ServiceOffering.create(
+                                            self.apiclient,
+                                            self.services["service_offering"]
+                                            )
+        # Adding to cleanup list after execution
+        self.cleanup.append(self.service_offering)
+
+        self.debug("Setting up account and domain hierarchy")
+        self.setupAccounts()
+        users = {self.domain: self.admin,
+                 self.child_domain: self.child_do_admin
+                 }
+        for domain, admin in users.items():
+            self.account = admin
+            self.domain = domain
+
+       api_client = self.testClient.createUserApiClient(
+                             UserName=self.account.name,
+                             DomainName=self.account.domain)
+
+            self.debug("Creating an instance with service offering: %s" %
+                                                    self.service_offering.name)
+            vm_1 = self.createInstance(service_off=self.service_offering, api_client=api_client)
+            vm_2 = self.createInstance(service_off=self.service_offering, api_client=api_client)
+            self.createInstance(service_off=self.service_offering, api_client=api_client)
+            self.createInstance(service_off=self.service_offering, api_client=api_client)
+
+            self.debug("Deploying instance - CPU capacity is fully utilized")
+            with self.assertRaises(Exception):
+                self.createInstance(service_off=self.service_offering, api_client=api_client)
+
+            account_list = Account.list(self.apiclient, id=self.account.id)
+            self.assertIsInstance(account_list,
+                                  list,
+                                  "List Accounts should return a valid response"
+                                  )
+            resource_count = account_list[0].cputotal
+
+            expected_resource_count = int(self.services["service_offering"]["cpunumber"]) * 4 #Total 4 VMs
+
+            self.assertEqual(resource_count, expected_resource_count,
+                             "Initial resource count should be 4")
+
+            self.debug("Destroying instance: %s" % vm_1.name)
+            try:
+                vm_1.delete(self.apiclient)
+            except Exception as e:
+                self.fail("Failed to delete instance: %s" % e)
+
+            account_list = Account.list(self.apiclient, id=self.account.id)
+            self.assertIsInstance(account_list,
+                                  list,
+                                  "List Accounts should return a valid response"
+                                  )
+            resource_count_after_delete = account_list[0].cputotal
+
+            expected_resource_count -= int(self.services["service_offering"]["cpunumber"])
+
+            self.assertEqual(resource_count_after_delete, expected_resource_count,
+                            "Resource count should match with the expected count")
+
+            host = find_suitable_host(self.apiclient, vm_2)
+            self.debug("Migrating instance: %s to host: %s" % (vm_2.name,
+                                                               host.name))
+            try:
+                vm_2.migrate(self.apiclient, host.id)
+            except Exception as e:
+                self.fail("Failed to migrate instance: %s" % e)
+
+            account_list = Account.list(self.apiclient, id=self.account.id)
+            self.assertIsInstance(account_list,
+                                  list,
+                                  "List Accounts should return a valid response"
+                                  )
+            resource_count_after_migrate = account_list[0].cputotal
+
+            self.assertEqual(resource_count_after_migrate, resource_count_after_delete,
+                            "Resource count should not change after migrating the instance")
+        return
+
+class TestMultipleChildDomains(cloudstackTestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        cls.api_client = super(TestMultipleChildDomains,
+                               cls).getClsTestClient().getApiClient()
+        cls.services = Services().services
+        # Get Zone, Domain and templates
+        cls.domain = get_domain(cls.api_client, cls.services)
+        cls.zone = get_zone(cls.api_client, cls.services)
+        cls.services["mode"] = cls.zone.networktype
+        cls.template = get_template(
+                            cls.api_client,
+                            cls.zone.id,
+                            cls.services["ostype"]
+                            )
+
+        cls.services["virtual_machine"]["zoneid"] = cls.zone.id
+
+        cls._cleanup = []
+        return
+
+    @classmethod
+    def tearDownClass(cls):
+        try:
+            # Cleanup resources used
+            cleanup_resources(cls.api_client, cls._cleanup)
+        except Exception as e:
+            raise Exception("Warning: Exception during cleanup : %s" % e)
+        return
+
+    def setUp(self):
+        self.apiclient = self.testClient.getApiClient()
+        self.dbclient = self.testClient.getDbConnection()
+        self.cleanup = []
+        return
+
+    def tearDown(self):
+        try:
+            # Clean up, terminate the created instance, volumes and snapshots
+            cleanup_resources(self.apiclient, self.cleanup)
+        except Exception as e:
+            raise Exception("Warning: Exception during cleanup : %s" % e)
+        return
+
+    def createInstance(self, account, service_off, networks=None, api_client=None):
+        """Creates an instance in account"""
+
+   if api_client is None:
+       api_client = self.apiclient
+
+        self.debug("Deploying an instance in account: %s" %
+                                                account.name)
+        try:
+            vm = VirtualMachine.create(
+                                api_client,
+                                self.services["virtual_machine"],
+                                templateid=self.template.id,
+                                accountid=account.name,
+                                domainid=account.domainid,
+                                networkids=networks,
+                                serviceofferingid=service_off.id)
+            vms = VirtualMachine.list(api_client, id=vm.id, listall=True)
+            self.assertIsInstance(vms,
+                                  list,
+                                  "List VMs should return a valid response")
+            self.assertEqual(vms[0].state, "Running",
+                             "Vm state should be running after deployment")
+            return vm
+        except Exception as e:
+            self.fail("Failed to deploy an instance: %s" % e)
+
+    def setupAccounts(self):
+
+        self.debug("Creating a domain under: %s" % self.domain.name)
+   self.parent_domain = Domain.create(self.apiclient,
+                                services=self.services["domain"],
+                                parentdomainid=self.domain.id)
+   self.parentd_admin = Account.create(
+                    self.apiclient,
+                    self.services["account"],
+                    admin=True,
+                    domainid=self.domain.id
+                    )
+
+   self.debug("Updating the Memory resource limit for domain: %s" %
+                                                    self.domain.name)
+   Resources.updateLimit(self.apiclient,
+                      resourcetype=8,
+                      max=10,
+                      domainid=self.parentd_admin.domainid,
+                      account=self.parentd_admin.name)
+   self.debug("Creating a sub-domain under: %s" % self.parent_domain.name)
+   self.cdomain_1 = Domain.create(self.apiclient,
+                                services=self.services["domain"],
+                                parentdomainid=self.parent_domain.id)
+
+   self.debug("Creating a sub-domain under: %s" % self.parent_domain.name)
+   self.cdomain_2 = Domain.create(self.apiclient,
+                                services=self.services["domain"],
+                                parentdomainid=self.parent_domain.id)
+
+   self.cadmin_1 = Account.create(
+                                self.apiclient,
+                                self.services["account"],
+                                admin=True,
+                                domainid=self.cdomain_1.id
+                                )
+
+   self.debug("Updating the Memory resource count for domain: %s" %
+                                                self.cdomain_1.name)
+   Resources.updateLimit(self.apiclient,
+                      resourcetype=8,
+                      max=4,
+                      domainid=self.cadmin_1.domainid)
+
+        self.debug("Updating the Memory resource count for account: %s" %
+                                                self.cadmin_1.name)
+   Resources.updateLimit(self.apiclient,
+                      resourcetype=8,
+                      max=2,
+                      account=self.cadmin_1.name,
+                      domainid=self.cadmin_1.domainid)
+
+   self.cadmin_2 = Account.create(
+                                self.apiclient,
+                                self.services["account"],
+                                admin=True,
+                                domainid=self.cdomain_2.id
+                                )
+
+        self.debug("Updating the Memory resource count for domain: %s" %
+                                                self.cdomain_2.name)
+   Resources.updateLimit(self.apiclient,
+                      resourcetype=8,
+                      max=5,
+                      domainid=self.cadmin_2.domainid)
+
+        self.debug("Updating the Memory resource count for account: %s" %
+                                                self.cadmin_2.name)
+   Resources.updateLimit(self.apiclient,
+                      resourcetype=8,
+                      max=3,
+                      account=self.cadmin_2.name,
+                      domainid=self.cadmin_2.domainid)
+   # Cleanup the resources created at end of test
+   self.cleanup.append(self.cadmin_1)
+   self.cleanup.append(self.cadmin_2)
+   self.cleanup.append(self.cdomain_1)
+   self.cleanup.append(self.cdomain_2)
+   self.cleanup.append(self.parentd_admin)
+   self.cleanup.append(self.parent_domain)
+
+   users = {
+                self.parent_domain: self.parentd_admin,
+            self.cdomain_1: self.cadmin_1,
+            self.cdomain_2: self.cadmin_2
+           }
+        return users
+
+    @attr(tags=["advanced", "advancedns","simulator"])
+    def test_01_multiple_child_domains(self):
+        """Test CPU limits with multiple child domains"""
+
+        # Validate the following
+        # 1. Create Domain1 with 10 core CPU and 2 child domains with 4 core
+        #    each.Assign 2 cores for Domain1 admin1 & Domain1 User1 .Assign 2
+        #    cores for Domain2 admin1 & Domain2 User1
+        # 2. Deploy VM's by Domain1 admin1/user1/ Domain2 user1/Admin1 account
+        #    and verify the resource updates
+        # 3. Deploy VM by admin account after reaching max parent domain limit
+        # 4. Deploy VM with child account after reaching max child domain limit
+        # 5. Destroy user/admin account VM's and verify the child & Parent
+        #    domain resource updates
+
+        self.debug("Creating service offering with 2 CPU cores")
+        self.services["service_offering"]["cpunumber"] = 2
+        self.service_offering = ServiceOffering.create(
+                                            self.apiclient,
+                                            self.services["service_offering"]
+                                            )
+        # Adding to cleanup list after execution
+        self.cleanup.append(self.service_offering)
+
+        self.debug("Setting up account and domain hierarchy")
+        self.setupAccounts()
+
+   api_client_cadmin_1 = self.testClient.createUserApiClient(
+                             UserName=self.cadmin_1.name,
+                             DomainName=self.cadmin_1.domain)
+
+   api_client_cadmin_2 = self.testClient.createUserApiClient(
+                             UserName=self.cadmin_2.name,
+                             DomainName=self.cadmin_2.domain)
+
+        self.debug("Creating an instance with service offering: %s" %
+                                                self.service_offering.name)
+        vm_1 = self.createInstance(account=self.cadmin_1,
+                                  service_off=self.service_offering, api_client=api_client_cadmin_1)
+
+        vm_2 = self.createInstance(account=self.cadmin_2,
+                                  service_off=self.service_offering, api_client=api_client_cadmin_2)
+
+        self.debug("Checking resource count for account: %s" % self.cadmin_1.name)
+
+        account_list = Account.list(self.apiclient, id=self.cadmin_1.id)
+        self.assertIsInstance(account_list,
+                                  list,
+                                  "List Accounts should return a valid response"
+                                  )
+        resource_count_cadmin_1 = account_list[0].cputotal
+
+        self.debug(resource_count_cadmin_1)
+
+        self.debug("Checking resource count for account: %s" % self.cadmin_2.name)
+        account_list = Account.list(self.apiclient, id=self.cadmin_2.id)
+        self.assertIsInstance(account_list,
+                                  list,
+                                  "List Accounts should return a valid response"
+                                  )
+        resource_count_cadmin_2 = account_list[0].cputotal
+
+        self.debug(resource_count_cadmin_2)
+
+        self.debug(
+            "Creating instance when CPU limit is fully used in child domain 1")
+        with self.assertRaises(Exception):
+            self.createInstance(account=self.cadmin_1,
+                                  service_off=self.service_offering, api_client=api_client_cadmin_1)
+
+        self.debug(
+            "Creating instance when CPU limit is fully used in child domain 2")
+        with self.assertRaises(Exception):
+            self.createInstance(account=self.cadmin_2,
+                                  service_off=self.service_offering, api_client=api_client_cadmin_2)
+        self.debug("Destroying instances: %s, %s" % (vm_1.name, vm_2.name))
+        try:
+            vm_1.delete(self.apiclient)
+            vm_2.delete(self.apiclient)
+        except Exception as e:
+            self.fail("Failed to delete instance: %s" % e)
+
+        self.debug("Checking resource count for account: %s" % self.cadmin_1.name)
+
+        account_list = Account.list(self.apiclient, id=self.cadmin_1.id)
+        self.assertIsInstance(account_list,
+                                  list,
+                                  "List Accounts should return a valid response"
+                                  )
+        resource_count_cadmin_1 = account_list[0].cputotal
+
+        self.debug(resource_count_cadmin_1)
+        self.assertEqual(resource_count_cadmin_1, 0 , "Resource count for %s should be 0" % get_resource_type(resource_id=8))#CPU
+
+        self.debug("Checking resource count for account: %s" % self.cadmin_2.name)
+        account_list = Account.list(self.apiclient, id=self.cadmin_2.id)
+        self.assertIsInstance(account_list,
+                                  list,
+                                  "List Accounts should return a valid response"
+                                  )
+        resource_count_cadmin_2 = account_list[0].cputotal
+
+        self.debug(resource_count_cadmin_2)
+        self.assertEqual(resource_count_cadmin_2, 0 , "Resource count for %s should be 0" % get_resource_type(resource_id=8))#CPU
+        return

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/95e4b7af/test/integration/component/cpu_limits/test_maximum_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/cpu_limits/test_maximum_limits.py b/test/integration/component/cpu_limits/test_maximum_limits.py
new file mode 100644
index 0000000..dec8413
--- /dev/null
+++ b/test/integration/component/cpu_limits/test_maximum_limits.py
@@ -0,0 +1,374 @@
+# 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.
+
+""" Tests for cpu resource limits - Maximum Limits
+"""
+# Import Local Modules
+from nose.plugins.attrib import attr
+from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.integration.lib.base import (
+                                        Account,
+                                        ServiceOffering,
+                                        VirtualMachine,
+                                        Resources,
+                                        Domain,
+                                        Project
+                                        )
+from marvin.integration.lib.common import (get_domain,
+                                        get_zone,
+                                        get_template,
+                                        cleanup_resources
+                                        )
+
+class Services:
+    """Test resource limit services
+    """
+
+    def __init__(self):
+        self.services = {
+                        "account": {
+                                "email": "test@test.com",
+                                "firstname": "Test",
+                                "lastname": "User",
+                                "username": "resource",
+                                # Random characters are appended for unique
+                                # username
+                                "password": "password",
+                         },
+                         "service_offering": {
+                                "name": "Tiny Instance",
+                                "displaytext": "Tiny Instance",
+                                "cpunumber": 5,
+                                "cpuspeed": 100,    # in MHz
+                                "memory": 128,    # In MBs
+                        },
+                        "virtual_machine": {
+                                "displayname": "TestVM",
+                                "username": "root",
+                                "password": "password",
+                                "ssh_port": 22,
+                                "hypervisor": 'KVM',
+                                "privateport": 22,
+                                "publicport": 22,
+                                "protocol": 'TCP',
+                                },
+                         "network": {
+                                "name": "Test Network",
+                                "displaytext": "Test Network",
+                                "netmask": '255.255.255.0'
+                                },
+                         "project": {
+                                "name": "Project",
+                                "displaytext": "Test project",
+                                },
+                         "domain": {
+                                "name": "Domain",
+                                },
+                        "ostype": 'CentOS 5.3 (64-bit)',
+                        "sleep": 60,
+                        "timeout": 10,
+                        "mode": 'advanced',
+                        # Networking mode: Advanced, Basic
+                    }
+
+class TestMaxCPULimits(cloudstackTestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        cls.api_client = super(TestMaxCPULimits,
+                               cls).getClsTestClient().getApiClient()
+        cls.services = Services().services
+        # Get Zone, Domain and templates
+        cls.domain = get_domain(cls.api_client, cls.services)
+        cls.zone = get_zone(cls.api_client, cls.services)
+        cls.services["mode"] = cls.zone.networktype
+        cls.template = get_template(
+                            cls.api_client,
+                            cls.zone.id,
+                            cls.services["ostype"]
+                            )
+
+        cls.services["virtual_machine"]["zoneid"] = cls.zone.id
+
+        cls._cleanup = []
+        return
+
+    @classmethod
+    def tearDownClass(cls):
+        try:
+            # Cleanup resources used
+            cleanup_resources(cls.api_client, cls._cleanup)
+        except Exception as e:
+            raise Exception("Warning: Exception during cleanup : %s" % e)
+        return
+
+    def setUp(self):
+        self.apiclient = self.testClient.getApiClient()
+        self.dbclient = self.testClient.getDbConnection()
+        self.cleanup = []
+        return
+
+    def tearDown(self):
+        try:
+            # Clean up, terminate the created instance, volumes and snapshots
+            cleanup_resources(self.apiclient, self.cleanup)
+        except Exception as e:
+            raise Exception("Warning: Exception during cleanup : %s" % e)
+        return
+
+    def createInstance(self, service_off, account=None,
+                        project=None, networks=None, api_client=None):
+        """Creates an instance in account"""
+
+   if api_client is None:
+       api_client = self.apiclient
+
+        self.debug("Deploying instance")
+        try:
+            if account:
+                vm = VirtualMachine.create(
+                                api_client,
+                                self.services["virtual_machine"],
+                                templateid=self.template.id,
+                                accountid=account.name,
+                                domainid=account.domainid,
+                                networkids=networks,
+                                serviceofferingid=service_off.id)
+            elif project:
+                vm = VirtualMachine.create(
+                                api_client,
+                                self.services["virtual_machine"],
+                                templateid=self.template.id,
+                                projectid=project.id,
+                                networkids=networks,
+                                serviceofferingid=service_off.id)
+            vms = VirtualMachine.list(api_client, id=vm.id, listall=True)
+            self.assertIsInstance(vms,
+                                  list,
+                                  "List VMs should return a valid response")
+            self.assertEqual(vms[0].state, "Running",
+                             "Vm state should be running after deployment")
+            return vm
+        except Exception as e:
+            self.fail("Failed to deploy an instance: %s" % e)
+
+    def setupAccounts(self, account_limit=2, domain_limit=2, project_limit=2):
+
+   self.debug("Creating a domain under: %s" % self.domain.name)
+   self.child_domain = Domain.create(self.apiclient,
+                                     services=self.services["domain"],
+                                 parentdomainid=self.domain.id)
+
+
+   self.debug("domain crated with domain id %s" % self.child_domain.id)
+
+   self.child_do_admin = Account.create(self.apiclient,
+                                self.services["account"],
+                                admin=True,
+                                domainid=self.child_domain.id)
+
+   self.debug("domain admin created for domain id %s" %
+                self.child_do_admin.domainid)
+
+   # Create project as a domain admin
+   self.project = Project.create(self.apiclient,
+                             self.services["project"],
+                             account=self.child_do_admin.name,
+                             domainid=self.child_do_admin.domainid)
+   # Cleanup created project at end of test
+   self.cleanup.append(self.project)
+
+   # Cleanup accounts created
+   self.cleanup.append(self.child_do_admin)
+   self.cleanup.append(self.child_domain)
+
+   self.debug("Updating the CPU resource count for domain: %s" %
+                                                self.child_domain.name)
+   # Update resource limits for account 1
+   responses = Resources.updateLimit(self.apiclient,
+                             resourcetype=8,
+                             max=account_limit,
+                             account=self.child_do_admin.name,
+                             domainid=self.child_do_admin.domainid)
+
+   self.debug("CPU Resource count for child domain admin account is now: %s" %
+                                                                 responses.max)
+
+   self.debug("Updating the CPU limit for project")
+   responses = Resources.updateLimit(self.apiclient,
+                             resourcetype=8,
+                             max=project_limit,
+                             projectid=self.project.id)
+
+   self.debug("CPU Resource count for project is now")
+   self.debug(responses.max)
+
+   self.debug("Updating the CPU limit for domain only")
+   responses = Resources.updateLimit(self.apiclient,
+                                 resourcetype=8,
+                             max=domain_limit,
+                             domainid=self.child_domain.id)
+
+   self.debug("CPU Resource count for domain %s with id %s is now %s" %
+                    (responses.domain, responses.domainid, responses.max))
+
+        return
+
+    @attr(tags=["advanced", "advancedns","simulator"])
+    def test_01_deploy_vm_domain_limit_reached(self):
+        """Test Try to deploy VM with admin account where account has not used
+            the resources but @ domain they are not available"""
+
+        # Validate the following
+        # 1. Try to deploy VM with admin account where account has not used the
+        #    resources but @ domain they are not available
+        # 2. Deploy VM should error out saying  ResourceAllocationException
+        #    with "resource limit exceeds"
+
+        self.debug("Creating service offering with 3 CPU cores")
+   self.services["service_offering"]["cpunumber"] = 3
+        self.service_offering = ServiceOffering.create(
+                                            self.apiclient,
+                                            self.services["service_offering"]
+                                            )
+        # Adding to cleanup list after execution
+        self.cleanup.append(self.service_offering)
+
+        self.debug("Setting up account and domain hierarchy")
+        self.setupAccounts(account_limit=4, domain_limit=2)
+
+   api_client_admin = self.testClient.createUserApiClient(
+                           UserName=self.child_do_admin.name,
+                           DomainName=self.child_do_admin.domain)
+
+        with self.assertRaises(Exception):
+            self.createInstance(account=self.child_do_admin,
+                                  service_off=self.service_offering, api_client=api_client_admin)
+        return
+
+    @attr(tags=["advanced", "advancedns","simulator"])
+    def test_02_deploy_vm_account_limit_reached(self):
+        """Test Try to deploy VM with admin account where account has used
+            the resources but @ domain they are available"""
+
+        # Validate the following
+        # 1. Try to deploy VM with admin account where account has used the
+        #    resources but @ domain they are available
+        # 2. Deploy VM should error out saying  ResourceAllocationException
+        #    with "resource limit exceeds"
+
+        self.debug("Creating service offering with 4 CPU cores")
+   self.services["service_offering"]["cpunumber"] = 4
+        self.service_offering = ServiceOffering.create(
+                                            self.apiclient,
+                                            self.services["service_offering"]
+                                            )
+        # Adding to cleanup list after execution
+        self.cleanup.append(self.service_offering)
+
+        self.debug("Setting up account and domain hierarchy")
+        self.setupAccounts(account_limit=6, domain_limit=8)
+
+   api_client_admin = self.testClient.createUserApiClient(
+                             UserName=self.child_do_admin.name,
+                             DomainName=self.child_do_admin.domain)
+
+   self.debug("Deploying instance with account: %s" %
+                                                    self.child_do_admin.name)
+
+        self.createInstance(account=self.child_do_admin,
+                                  service_off=self.service_offering, api_client=api_client_admin)
+
+        self.debug("Deploying instance when CPU limit is reached in account")
+
+        with self.assertRaises(Exception):
+            self.createInstance(account=self.chid_do_admin,
+                                  service_off=self.service_offering, api_client=api_client_admin)
+        return
+
+    @attr(tags=["advanced", "advancedns","simulator"])
+    def test_03_deploy_vm_project_limit_reached(self):
+        """Test TTry to deploy VM with admin account where account has not used
+        the resources but @ project they are not available"""
+
+        # Validate the following
+        # 1. Try to deploy VM with admin account where account has not used the
+        #    resources but @ project they are not available
+        # 2. Deploy VM should error out saying  ResourceAllocationException
+        #    with "resource limit exceeds"
+
+        self.debug("Creating service offering with 3 CPU cores")
+   self.services["service_offering"]["cpunumber"] = 3
+        self.service_offering = ServiceOffering.create(
+                                            self.apiclient,
+                                            self.services["service_offering"]
+                                            )
+        # Adding to cleanup list after execution
+        self.cleanup.append(self.service_offering)
+
+        self.debug("Setting up account and domain hierarchy")
+        self.setupAccounts(account_limit=4, domain_limit=4, project_limit=2)
+
+   api_client_admin = self.testClient.createUserApiClient(
+                             UserName=self.child_do_admin.name,
+                             DomainName=self.child_do_admin.domain)
+
+        self.debug("Deploying instance in account 2 when CPU limit is reached")
+
+        with self.assertRaises(Exception):
+            self.createInstance(project=self.project,
+                                  service_off=self.service_offering, api_client=api_client_admin)
+        return
+
+    @attr(tags=["advanced", "advancedns","simulator"])
+    def test_04_deployVm__account_limit_reached(self):
+        """Test Try to deploy VM with admin account where account has used
+            the resources but @ project they are available"""
+
+        # Validate the following
+        # 1. Try to deploy VM with admin account where account has used the
+        #    resources but @ project they are not available
+        # 2. Deploy VM should error out saying  ResourceAllocationException
+        #    with "resource limit exceeds"
+
+        self.debug("Creating service offering with 4 CPU cores")
+   self.services["service_offering"]["cpunumber"] = 4
+        self.service_offering = ServiceOffering.create(
+                                            self.apiclient,
+                                            self.services["service_offering"]
+                                            )
+        # Adding to cleanup list after execution
+        self.cleanup.append(self.service_offering)
+
+        self.debug("Setting up account and domain hierarchy")
+        self.setupAccounts(account_limit=6, domain_limit=6, project_limit=6)
+
+   api_client_admin = self.testClient.createUserApiClient(
+                             UserName=self.child_do_admin.name,
+                             DomainName=self.child_do_admin.domain)
+
+        self.debug("Deploying instance with account: %s" %
+                                                    self.child_do_admin.name)
+        self.createInstance(account=self.child_do_admin,
+                                  service_off=self.service_offering, api_client=api_client_admin)
+
+        self.debug("Deploying instance in project when CPU limit is reached in account")
+
+        with self.assertRaises(Exception):
+            self.createInstance(project=self.project,
+                                  service_off=self.service_offering)
+        return


Mime
View raw message