cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tall...@apache.org
Subject [4/6] CLOUDSTACK-4934: Rename Limit resources tests so that they have unique names.
Date Fri, 08 Nov 2013 04:59:24 GMT
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5d6d14bc/test/integration/component/memory_limits/test_memory_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/memory_limits/test_memory_limits.py b/test/integration/component/memory_limits/test_memory_limits.py
deleted file mode 100644
index 18eab4c..0000000
--- a/test/integration/component/memory_limits/test_memory_limits.py
+++ /dev/null
@@ -1,764 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-""" P1 tests for memory 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,
-                                        Resources,
-                                        Domain
-                                        )
-from marvin.integration.lib.common import (get_domain,
-                                        get_zone,
-                                        get_template,
-                                        cleanup_resources,
-					wait_for_cleanup,
-                                        find_suitable_host,
-                                        get_resource_type
-                                        )
-
-class Services:
-    """Test memory 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": 1,
-                                "cpuspeed": 100,    # in MHz
-                                "memory": 5120,    # 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 TestMemoryLimits(cloudstackTestCase):
-
-    @classmethod
-    def setUpClass(cls):
-        cls.api_client = super(TestMemoryLimits,
-                               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"""
-        self.debug("Deploying an instance in account: %s" %
-                                                self.account.name)
-
-        if api_client is None:
-	        api_client = self.apiclient
-
-        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_stop_start_instance(self):
-        """Test Deploy VM with 5 GB RAM & verify the usage"""
-
-        # Validate the following
-        # 1. Create compute offering with 5 GB RAM & Deploy VM as root admin
-        # 2 .List Resource count for the root admin Memory usage
-        # 3. Stop and start instance, 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].memorytotal
-
-        expected_resource_count = int(self.services["service_offering"]["memory"])
-
-        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].memorytotal
-
-        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].memorytotal
-
-        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_migrate_instance(self):
-        """Test Deploy VM with 5 GB RAM & verify the usage"""
-
-        # Validate the following
-        # 1. Create compute offering with 5 GB RAM & Deploy VM as root admin
-        # 2. List Resource count for the root admin Memory usage
-        # 3. Migrate vm, 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].memorytotal
-
-        expected_resource_count = int(self.services["service_offering"]["memory"])
-
-        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].memorytotal
-
-        self.assertEqual(resource_count, resource_count_after_migrate,
-                         "Resource count should be same after stopping the instance")
-        return
-
-    @attr(tags=["advanced", "advancedns","simulator"])
-    def test_03_delete_instance(self):
-        """Test Deploy VM with 5 GB RAM & verify the usage"""
-
-        # Validate the following
-        # 1. Create compute offering with 5 GB RAM & Deploy VM as root admin
-        # 2. List Resource count for the root admin Memory usage
-        # 3. Delete instance, resource count should be 0 after delete operation.
-
-        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].memorytotal
-
-        expected_resource_count = int(self.services["service_offering"]["memory"])
-
-        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)
-
-	    # Wait for expunge interval to cleanup Memory
-	    wait_for_cleanup(self.apiclient, ["expunge.delay", "expunge.interval"])
-
-        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].memorytotal
-        self.assertEqual(resource_count_after_delete, 0 , "Resource count for %s should be 0" % get_resource_type(resource_id=9))#RAM
-        return
-
-    @attr(tags=["advanced", "advancedns","simulator"])
-    def test_04_deploy_multiple_vm_with_5gb_ram(self):
-        """Test Deploy multiple VM with 5 GB RAM & verify the usage"""
-
-        # Validate the following
-        # 1. Create compute offering with 5 GB RAM
-        # 2. Deploy multiple VMs with this service offering
-        # 3. List Resource count for the root admin Memory usage
-        # 4. Memory usage 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].memorytotal
-
-        expected_resource_count = int(self.services["service_offering"]["memory"])
-
-        self.assertEqual(resource_count, expected_resource_count,
-                         "Resource count should match with the expected resource count")
-
-        self.debug("Creating two instances with service offering: %s" %
-                                                    self.service_offering.name)
-        vm_1 = 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_new = account_list[0].memorytotal
-
-        expected_resource_count = int(self.services["service_offering"]["memory"]) * 3 #Total 3 VMs
-
-        self.assertEqual(resource_count_new, expected_resource_count,
-                         "Resource count should match 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].memorytotal
-
-        expected_resource_count -= int(self.services["service_offering"]["memory"])
-
-        self.assertEqual(resource_count_after_delete, expected_resource_count,
-                         "Resource count should match with the expected resource count")
-        return
-
-class TestDomainMemoryLimitsConfiguration(cloudstackTestCase):
-
-    @classmethod
-    def setUpClass(cls):
-        cls.api_client = super(TestDomainMemoryLimitsConfiguration,
-                               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"""
-        self.debug("Deploying an instance in account: %s" %
-                                                self.account.name)
-
-        if api_client is None:
-	        api_client = self.apiclient
-
-        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 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.debug("Creating a domain under: %s" % self.domain.name)
-
-        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 5 GB memory & verify the usage"""
-
-        # Validate the following
-        # 1. Create compute offering with 5 GB memory in child domains of root domain & Deploy VM
-        # 2. List Resource count memory 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].memorytotal
-
-            expected_resource_count = int(self.services["service_offering"]["memory"])
-
-            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].memorytotal
-
-            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].memorytotal
-
-            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 5 GB memory & verify the usage"""
-
-        # Validate the following
-        # 1. Create compute offering with 5 GB memory in child domains of root domain & 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].memorytotal
-
-            expected_resource_count = int(self.services["service_offering"]["memory"])
-
-            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].memorytotal
-
-            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 5 GB RAM & verify the usage"""
-
-        # Validate the following
-        # 1. Create compute offering with 5 GB RAM in child domains of root domain & Deploy VM
-        # 2. List Resource count for the Memory 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].memorytotal
-
-            expected_resource_count = int(self.services["service_offering"]["memory"])
-
-            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].memorytotal
-            self.assertEqual(resource_count, 0 , "Resource count for %s should be 0" % get_resource_type(resource_id=9))#RAM
-        return
-
-    @attr(tags=["advanced", "advancedns","simulator"])
-    @attr(configuration='max.account.memory')
-    def test_04_deploy_multiple_vm(self):
-        """Test Deploy multiple VM with 5 GB memory & verify the usage"""
-	    #keep the configuration value - max.account.memory = 20480
-
-        # Validate the following
-        # 1. Create compute offering with 5 GB RAM
-        # 2. Deploy multiple VMs with this service offering in child domains of root domain
-        # 3. List Resource count for the root admin Memory usage
-        # 4. Memory usage should list properly
-
-        self.debug("Creating service offering with 5 GB RAM")
-        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
-
-            memory_account_gc = Resources.list(self.apiclient,
-                                resourcetype = 9, #Memory
-                                account = self.account.name,
-                                domainid = self.domain.id
-                                )
-
-            if memory_account_gc[0].max != 20480:
-                self.skipTest("This test case requires configuration value max.account.memory to be 20480")
-
-	        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 - memory 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].memorytotal
-
-            expected_resource_count = int(self.services["service_offering"]["memory"]) * 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].memorytotal
-
-            expected_resource_count -= int(self.services["service_offering"]["memory"])
-
-            self.assertEqual(resource_count_after_delete, expected_resource_count,
-                         "Resource count should match with the expected resource 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].memorytotal
-
-            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/5d6d14bc/test/integration/component/memory_limits/test_project_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/memory_limits/test_project_limits.py b/test/integration/component/memory_limits/test_project_limits.py
deleted file mode 100644
index 1c0ed92..0000000
--- a/test/integration/component/memory_limits/test_project_limits.py
+++ /dev/null
@@ -1,350 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-""" P1 tests for memory 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,
-                                        Project
-                                        )
-from marvin.integration.lib.common import (get_domain,
-                                        get_zone,
-                                        get_template,
-                                        cleanup_resources,
-					                    wait_for_cleanup,
-                                        find_suitable_host,
-                                        get_resource_type
-                                        )
-
-class Services:
-    """Test memory 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": 1,
-                                "cpuspeed": 100,    # in MHz
-                                "memory": 5120,    # 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 TestProjectsMemoryLimits(cloudstackTestCase):
-
-    @classmethod
-    def setUpClass(cls):
-        cls.api_client = super(TestProjectsMemoryLimits,
-                               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)
-        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"""
-        self.debug("Deploying an instance in account: %s" %
-                                                self.account.name)
-
-        if api_client is None:
-	        api_client = self.apiclient
-
-        try:
-            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 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_vmlifecycle_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 to a new host
-        # 4. Resource count should list properly
-        # 5. Start VM of an accounts added to the project to a new host
-        # 6. Resource count should list properly
-
-        self.debug("Checking memory resource count for project: %s" % self.project.name)
-        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].memorytotal
-
-        self.debug(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)
-
-        self.debug("Checking memory resource count for project: %s" % self.project.name)
-        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].memorytotal
-
-        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)
-
-        self.debug("Checking memory resource count for project: %s" % self.project.name)
-        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].memorytotal
-
-        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_vmlifecycle_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.
-
-        self.debug("Checking memory resource count for project: %s" % self.project.name)
-        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].memorytotal
-        self.debug(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)
-
-        self.debug("Checking memory resource count for project: %s" % self.project.name)
-        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].memorytotal
-
-        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_vmlifecycle_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
-        # 4. Resource count should list as 0 after destroying the instance
-
-        self.debug("Checking memory resource count for project: %s" % self.project.name)
-        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].memorytotal
-        self.debug(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)
-
-        # Wait for expunge interval to cleanup Memory
-        wait_for_cleanup(self.apiclient, ["expunge.delay", "expunge.interval"])
-
-        self.debug("Checking memory resource count for project: %s" % self.project.name)
-        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].memorytotal
-        self.assertEqual(resource_count_after_delete, 0 , "Resource count for %s should be 0" % get_resource_type(resource_id=9))#RAM
-        return

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


Mime
View raw message