You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ta...@apache.org on 2013/11/08 05:54:56 UTC
git commit: updated refs/heads/master to db32526
Updated Branches:
refs/heads/master af8eb63dc -> db3252645
Revert "Renamed modules with same name to avoid confusion"
This reverts commit af8eb63dc6a8be8e47ecb86d1e50b6931e9b0231.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/db325264
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/db325264
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/db325264
Branch: refs/heads/master
Commit: db3252645d8a9d773b19b2dcea077b89f507e83f
Parents: af8eb63
Author: SrikanteswaraRao Talluri <ta...@apache.org>
Authored: Fri Nov 8 10:22:59 2013 +0530
Committer: SrikanteswaraRao Talluri <ta...@apache.org>
Committed: Fri Nov 8 10:22:59 2013 +0530
----------------------------------------------------------------------
.../cpu_limits/test_cpu_project_limits.py | 347 ------------------
.../component/cpu_limits/test_project_limits.py | 347 ++++++++++++++++++
.../memory_limits/test_mem_project_limits.py | 350 -------------------
.../memory_limits/test_project_limits.py | 350 +++++++++++++++++++
4 files changed, 697 insertions(+), 697 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/db325264/test/integration/component/cpu_limits/test_cpu_project_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/cpu_limits/test_cpu_project_limits.py b/test/integration/component/cpu_limits/test_cpu_project_limits.py
deleted file mode 100644
index 63d1a98..0000000
--- a/test/integration/component/cpu_limits/test_cpu_project_limits.py
+++ /dev/null
@@ -1,347 +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.
-
-""" 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/db325264/test/integration/component/cpu_limits/test_project_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/cpu_limits/test_project_limits.py b/test/integration/component/cpu_limits/test_project_limits.py
new file mode 100644
index 0000000..63d1a98
--- /dev/null
+++ b/test/integration/component/cpu_limits/test_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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/db325264/test/integration/component/memory_limits/test_mem_project_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/memory_limits/test_mem_project_limits.py b/test/integration/component/memory_limits/test_mem_project_limits.py
deleted file mode 100644
index 1c0ed92..0000000
--- a/test/integration/component/memory_limits/test_mem_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/db325264/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
new file mode 100644
index 0000000..1c0ed92
--- /dev/null
+++ b/test/integration/component/memory_limits/test_project_limits.py
@@ -0,0 +1,350 @@
+# 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