cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tall...@apache.org
Subject [3/6] CLOUDSTACK-4934: Rename Limit resources tests so that they have unique names.
Date Fri, 08 Nov 2013 04:59:23 GMT
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5d6d14bc/test/integration/component/test_cpu_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_cpu_limits.py b/test/integration/component/test_cpu_limits.py
new file mode 100644
index 0000000..d721a45
--- /dev/null
+++ b/test/integration/component/test_cpu_limits.py
@@ -0,0 +1,745 @@
+# 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")

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5d6d14bc/test/integration/component/test_cpu_max_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_cpu_max_limits.py b/test/integration/component/test_cpu_max_limits.py
new file mode 100644
index 0000000..9161cee
--- /dev/null
+++ b/test/integration/component/test_cpu_max_limits.py
@@ -0,0 +1,377 @@
+# 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

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5d6d14bc/test/integration/component/test_cpu_project_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_cpu_project_limits.py b/test/integration/component/test_cpu_project_limits.py
new file mode 100644
index 0000000..63d1a98
--- /dev/null
+++ b/test/integration/component/test_cpu_project_limits.py
@@ -0,0 +1,347 @@
+# 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 projects
+"""
+# 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,
+                                        Project
+                                        )
+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 TestProjectsCPULimits(cloudstackTestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        cls.api_client = super(TestProjectsCPULimits,
+                               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.cleanup = [self.account, ]
+
+        self.debug("Setting up account and domain hierarchy")
+        self.setupProjectAccounts()
+
+        api_client = self.testClient.createUserApiClient(
+            UserName=self.admin.name,
+            DomainName=self.admin.domain)
+
+        self.debug("Creating an instance with service offering: %s" %
+                   self.service_offering.name)
+        self.vm = self.createInstance(project=self.project,
+            service_off=self.service_offering, api_client=api_client)
+
+        return
+
+    def tearDown(self):
+        try:
+            # Clean up, terminate the created instance, volumes and snapshots
+            cleanup_resources(self.apiclient, self.cleanup)
+            pass
+        except Exception as e:
+            raise Exception("Warning: Exception during cleanup : %s" % e)
+        return
+
+    def createInstance(self, project, service_off, networks=None, api_client=None):
+        """Creates an instance in account"""
+
+        if api_client is None:
+            api_client = self.api_client
+
+        try:
+            self.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=self.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 self.vm
+        except Exception as e:
+            self.fail("Failed to deploy an instance: %s" % e)
+
+    def setupProjectAccounts(self):
+
+        self.debug("Creating a domain under: %s" % self.domain.name)
+        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
+                            )
+
+        # Create project as a domain admin
+        self.project = Project.create(self.apiclient,
+                                 self.services["project"],
+                                 account=self.admin.name,
+                                 domainid=self.admin.domainid)
+        # Cleanup created project at end of test
+        self.cleanup.append(self.project)
+        self.cleanup.append(self.admin)
+        self.cleanup.append(self.domain)
+        self.debug("Created project with domain admin with name: %s" %
+                                                        self.project.name)
+
+        projects = Project.list(self.apiclient, id=self.project.id,
+                                listall=True)
+
+        self.assertEqual(isinstance(projects, list), True,
+                        "Check for a valid list projects response")
+        project = projects[0]
+        self.assertEqual(project.name, self.project.name,
+                        "Check project name from list response")
+        return
+
+    @attr(tags=["advanced", "advancedns","simulator"])
+    def test_01_project_counts_start_stop_instance(self):
+
+        # Validate the following
+        # 1. Assign account to projects and verify the resource updates
+        # 2. Deploy VM with the accounts added to the project
+        # 3. Stop VM of an accounts added to the project.
+        # 4. Resource count should list properly.
+
+        project_list = Project.list(self.apiclient, id=self.project.id, listall=True)
+        self.debug(project_list)
+        self.assertIsInstance(project_list,
+                              list,
+                              "List Projects should return a valid response"
+                              )
+        resource_count = project_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)
+
+        project_list = Project.list(self.apiclient, id=self.project.id, listall=True)
+        self.assertIsInstance(project_list,
+                              list,
+                              "List Projects should return a valid response"
+                              )
+        resource_count_after_stop = project_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)
+
+        project_list = Project.list(self.apiclient, id=self.project.id, listall=True)
+        self.assertIsInstance(project_list,
+                              list,
+                              "List Projects should return a valid response"
+                              )
+        resource_count_after_start = project_list[0].cputotal
+
+        self.assertEqual(resource_count, resource_count_after_start,
+                         "Resource count should be same after starting the instance")
+        return
+
+    @attr(tags=["advanced", "advancedns","simulator"])
+    def test_02_project_counts_migrate_instance(self):
+
+        # Validate the following
+        # 1. Assign account to projects and verify the resource updates
+        # 2. Deploy VM with the accounts added to the project
+        # 3. Migrate VM of an accounts added to the project to a new host
+        # 4. Resource count should list properly.
+
+        project_list = Project.list(self.apiclient, id=self.project.id, listall=True)
+        self.assertIsInstance(project_list,
+                              list,
+                              "List Projects should return a valid response"
+                              )
+        resource_count = project_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)
+
+        project_list = Project.list(self.apiclient, id=self.project.id, listall=True)
+        self.assertIsInstance(project_list,
+                              list,
+                              "List Projects should return a valid response"
+                              )
+        resource_count_after_migrate = project_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_project_counts_delete_instance(self):
+
+        # Validate the following
+        # 1. Assign account to projects and verify the resource updates
+        # 2. Deploy VM with the accounts added to the project
+        # 3. Destroy VM of an accounts added to the project to a new host
+        # 4. Resource count should list properly.
+
+        project_list = Project.list(self.apiclient, id=self.project.id, listall=True)
+        self.assertIsInstance(project_list,
+                              list,
+                              "List Projects should return a valid response"
+                              )
+        resource_count = project_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)
+
+        project_list = Project.list(self.apiclient, id=self.project.id, listall=True)
+        self.assertIsInstance(project_list,
+                              list,
+                              "List Projects should return a valid response"
+                              )
+        resource_count_after_delete = project_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


Mime
View raw message