You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/05/24 18:12:36 UTC
git commit: updated refs/heads/master to 90a40b0
Updated Branches:
refs/heads/master 09d2fe6a7 -> 90a40b080
Move changeOffering test to service offerings
This will reduce the time (>30m) on the vm lifecycle.
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/90a40b08
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/90a40b08
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/90a40b08
Branch: refs/heads/master
Commit: 90a40b0806bf586bca6653023d32bff270944251
Parents: 09d2fe6
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Fri May 24 21:41:46 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Fri May 24 21:42:25 2013 +0530
----------------------------------------------------------------------
test/integration/smoke/test_service_offerings.py | 366 +++++++++++++----
test/integration/smoke/test_vm_life_cycle.py | 239 -----------
2 files changed, 276 insertions(+), 329 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/90a40b08/test/integration/smoke/test_service_offerings.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_service_offerings.py b/test/integration/smoke/test_service_offerings.py
index 7f4d130..3d3b946 100644
--- a/test/integration/smoke/test_service_offerings.py
+++ b/test/integration/smoke/test_service_offerings.py
@@ -27,24 +27,80 @@ from nose.plugins.attrib import attr
_multiprocess_shared_ = True
+
class Services:
"""Test Service offerings Services
"""
def __init__(self):
self.services = {
- "off":
- {
- "name": "Service Offering",
- "displaytext": "Service Offering",
- "cpunumber": 1,
- "cpuspeed": 100, # MHz
- "memory": 128, # in MBs
- },
- }
+ "off":
+ {
+ "name": "Service Offering",
+ "displaytext": "Service Offering",
+ "cpunumber": 1,
+ "cpuspeed": 100, # MHz
+ "memory": 128, # in MBs
+ },
+ "small":
+ # Create a small virtual machine instance with disk offering
+ {
+ "displayname": "testserver",
+ "username": "root", # VM creds for SSH
+ "password": "password",
+ "ssh_port": 22,
+ "hypervisor": 'XenServer',
+ "privateport": 22,
+ "publicport": 22,
+ "protocol": 'TCP',
+ },
+ "medium": # Create a medium virtual machine instance
+ {
+ "displayname": "testserver",
+ "username": "root",
+ "password": "password",
+ "ssh_port": 22,
+ "hypervisor": 'XenServer',
+ "privateport": 22,
+ "publicport": 22,
+ "protocol": 'TCP',
+ },
+ "service_offerings":
+ {
+ "tiny":
+ {
+ "name": "Tiny Instance",
+ "displaytext": "Tiny Instance",
+ "cpunumber": 1,
+ "cpuspeed": 100, # in MHz
+ "memory": 128, # In MBs
+ },
+ "small":
+ {
+ # Small service offering ID to for change VM
+ # service offering from medium to small
+ "name": "Small Instance",
+ "displaytext": "Small Instance",
+ "cpunumber": 1,
+ "cpuspeed": 100,
+ "memory": 256,
+ },
+ "medium":
+ {
+ # Medium service offering ID to for
+ # change VM service offering from small to medium
+ "name": "Medium Instance",
+ "displaytext": "Medium Instance",
+ "cpunumber": 1,
+ "cpuspeed": 100,
+ "memory": 256,
+ }
+ },
+ "ostype": 'CentOS 5.3 (64-bit)',
+ }
-class TestCreateServiceOffering(cloudstackTestCase):
+class TestCreateServiceOffering(cloudstackTestCase):
def setUp(self):
self.apiclient = self.testClient.getApiClient()
self.dbclient = self.testClient.getDbConnection()
@@ -60,8 +116,8 @@ class TestCreateServiceOffering(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
-
- @attr(tags = ["advanced", "advancedns", "smoke", "basic", "eip", "sg"])
+
+ @attr(tags=["advanced", "advancedns", "smoke", "basic", "eip", "sg"])
def test_01_create_service_offering(self):
"""Test to create service offering"""
@@ -70,67 +126,65 @@ class TestCreateServiceOffering(cloudstackTestCase):
# 2. The Cloud Database contains the valid information
service_offering = ServiceOffering.create(
- self.apiclient,
- self.services["off"]
- )
+ self.apiclient,
+ self.services["off"]
+ )
self.cleanup.append(service_offering)
self.debug("Created service offering with ID: %s" % service_offering.id)
list_service_response = list_service_offering(
- self.apiclient,
- id=service_offering.id
- )
+ self.apiclient,
+ id=service_offering.id
+ )
self.assertEqual(
- isinstance(list_service_response, list),
- True,
- "Check list response returns a valid list"
- )
-
+ isinstance(list_service_response, list),
+ True,
+ "Check list response returns a valid list"
+ )
+
self.assertNotEqual(
- len(list_service_response),
- 0,
- "Check Service offering is created"
- )
+ len(list_service_response),
+ 0,
+ "Check Service offering is created"
+ )
service_response = list_service_response[0]
self.assertEqual(
- list_service_response[0].cpunumber,
- self.services["off"]["cpunumber"],
- "Check server id in createServiceOffering"
- )
+ list_service_response[0].cpunumber,
+ self.services["off"]["cpunumber"],
+ "Check server id in createServiceOffering"
+ )
self.assertEqual(
- list_service_response[0].cpuspeed,
- self.services["off"]["cpuspeed"],
- "Check cpuspeed in createServiceOffering"
- )
+ list_service_response[0].cpuspeed,
+ self.services["off"]["cpuspeed"],
+ "Check cpuspeed in createServiceOffering"
+ )
self.assertEqual(
- list_service_response[0].displaytext,
- self.services["off"]["displaytext"],
- "Check server displaytext in createServiceOfferings"
- )
+ list_service_response[0].displaytext,
+ self.services["off"]["displaytext"],
+ "Check server displaytext in createServiceOfferings"
+ )
self.assertEqual(
- list_service_response[0].memory,
- self.services["off"]["memory"],
- "Check memory in createServiceOffering"
- )
+ list_service_response[0].memory,
+ self.services["off"]["memory"],
+ "Check memory in createServiceOffering"
+ )
self.assertEqual(
- list_service_response[0].name,
- self.services["off"]["name"],
- "Check name in createServiceOffering"
- )
+ list_service_response[0].name,
+ self.services["off"]["name"],
+ "Check name in createServiceOffering"
+ )
return
class TestServiceOfferings(cloudstackTestCase):
-
def setUp(self):
self.apiclient = self.testClient.getApiClient()
self.dbclient = self.testClient.getDbConnection()
self.cleanup = []
def tearDown(self):
-
try:
#Clean up, terminate the created templates
cleanup_resources(self.apiclient, self.cleanup)
@@ -142,17 +196,61 @@ class TestServiceOfferings(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.services = Services().services
cls.api_client = super(TestServiceOfferings, cls).getClsTestClient().getApiClient()
+ cls.services = Services().services
+ domain = get_domain(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = cls.zone.networktype
+
cls.service_offering_1 = ServiceOffering.create(
- cls.api_client,
- cls.services["off"]
- )
+ cls.api_client,
+ cls.services["off"]
+ )
cls.service_offering_2 = ServiceOffering.create(
- cls.api_client,
- cls.services["off"]
- )
- cls._cleanup = [cls.service_offering_1]
+ cls.api_client,
+ cls.services["off"]
+ )
+ template = get_template(
+ cls.api_client,
+ cls.zone.id,
+ cls.services["ostype"]
+ )
+ # Set Zones and disk offerings
+ cls.services["small"]["zoneid"] = cls.zone.id
+ cls.services["small"]["template"] = template.id
+
+ cls.services["medium"]["zoneid"] = cls.zone.id
+ cls.services["medium"]["template"] = template.id
+
+ # Create VMs, NAT Rules etc
+ cls.account = Account.create(
+ cls.api_client,
+ cls.services["account"],
+ domainid=domain.id
+ )
+
+ cls.small_offering = ServiceOffering.create(
+ cls.api_client,
+ cls.services["service_offerings"]["small"]
+ )
+
+ cls.medium_offering = ServiceOffering.create(
+ cls.api_client,
+ cls.services["service_offerings"]["medium"]
+ )
+ cls.medium_virtual_machine = VirtualMachine.create(
+ cls.api_client,
+ cls.services["medium"],
+ accountid=cls.account.name,
+ domainid=cls.account.domainid,
+ serviceofferingid=cls.medium_offering.id,
+ mode=cls.services["mode"]
+ )
+ cls._cleanup = [
+ cls.small_offering,
+ cls.medium_offering,
+ cls.account
+ ]
return
@classmethod
@@ -166,7 +264,7 @@ class TestServiceOfferings(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
- @attr(tags = ["advanced", "advancedns", "smoke", "basic", "eip", "sg"])
+ @attr(tags=["advanced", "advancedns", "smoke", "basic", "eip", "sg"])
def test_02_edit_service_offering(self):
"""Test to update existing service offering"""
@@ -178,8 +276,8 @@ class TestServiceOfferings(cloudstackTestCase):
random_displaytext = random_gen()
random_name = random_gen()
- self.debug("Updating service offering with ID: %s" %
- self.service_offering_1.id)
+ self.debug("Updating service offering with ID: %s" %
+ self.service_offering_1.id)
cmd = updateServiceOffering.updateServiceOfferingCmd()
#Add parameters for API call
@@ -189,35 +287,35 @@ class TestServiceOfferings(cloudstackTestCase):
self.apiclient.updateServiceOffering(cmd)
list_service_response = list_service_offering(
- self.apiclient,
- id=self.service_offering_1.id
- )
+ self.apiclient,
+ id=self.service_offering_1.id
+ )
self.assertEqual(
- isinstance(list_service_response, list),
- True,
- "Check list response returns a valid list"
- )
-
+ isinstance(list_service_response, list),
+ True,
+ "Check list response returns a valid list"
+ )
+
self.assertNotEqual(
- len(list_service_response),
- 0,
- "Check Service offering is updated"
- )
+ len(list_service_response),
+ 0,
+ "Check Service offering is updated"
+ )
self.assertEqual(
- list_service_response[0].displaytext,
- random_displaytext,
- "Check server displaytext in updateServiceOffering"
- )
+ list_service_response[0].displaytext,
+ random_displaytext,
+ "Check server displaytext in updateServiceOffering"
+ )
self.assertEqual(
- list_service_response[0].name,
- random_name,
- "Check server name in updateServiceOffering"
- )
+ list_service_response[0].name,
+ random_name,
+ "Check server name in updateServiceOffering"
+ )
return
- @attr(tags = ["advanced", "advancedns", "smoke", "basic", "eip", "sg"])
+ @attr(tags=["advanced", "advancedns", "smoke", "basic", "eip", "sg"])
def test_03_delete_service_offering(self):
"""Test to delete service offering"""
@@ -225,20 +323,108 @@ class TestServiceOfferings(cloudstackTestCase):
# 1. deleteServiceOffering should return
# a valid information for newly created offering
- self.debug("Deleting service offering with ID: %s" %
- self.service_offering_2.id)
+ self.debug("Deleting service offering with ID: %s" %
+ self.service_offering_2.id)
self.service_offering_2.delete(self.apiclient)
list_service_response = list_service_offering(
- self.apiclient,
- id=self.service_offering_2.id
- )
+ self.apiclient,
+ id=self.service_offering_2.id
+ )
self.assertEqual(
- list_service_response,
- None,
- "Check if service offering exists in listDiskOfferings"
- )
+ list_service_response,
+ None,
+ "Check if service offering exists in listDiskOfferings"
+ )
+
+ return
+
+ @attr(tags=["advanced", "advancedns", "smoke"])
+ def test_04_change_offering_small(self):
+ """Test to change service to a small capacity
+ """
+ # Validate the following
+ # 1. Log in to the Vm .We should see that the CPU and memory Info of
+ # this Vm matches the one specified for "Small" service offering.
+ # 2. Using listVM command verify that this Vm
+ # has Small service offering Id.
+
+ self.debug("Stopping VM - ID: %s" % self.medium_virtual_machine.id)
+ self.medium_virtual_machine.stop(self.apiclient)
+ # Ensure that VM is in stopped state
+ list_vm_response = list_virtual_machines(
+ self.apiclient,
+ id=self.medium_virtual_machine.id
+ )
+ if isinstance(list_vm_response, list):
+ vm = list_vm_response[0]
+ if vm.state == 'Stopped':
+ self.debug("VM state: %s" % vm.state)
+ else:
+ raise Exception(
+ "Failed to stop VM (ID: %s) in change service offering" % vm.id)
+
+ self.debug("Change Service offering VM - ID: %s" %
+ self.medium_virtual_machine.id)
+
+ cmd = changeServiceForVirtualMachine.changeServiceForVirtualMachineCmd()
+ cmd.id = self.medium_virtual_machine.id
+ cmd.serviceofferingid = self.small_offering.id
+ self.apiclient.changeServiceForVirtualMachine(cmd)
+
+ self.debug("Starting VM - ID: %s" % self.medium_virtual_machine.id)
+ self.medium_virtual_machine.start(self.apiclient)
+ # Ensure that VM is in running state
+ list_vm_response = list_virtual_machines(
+ self.apiclient,
+ id=self.medium_virtual_machine.id
+ )
+
+ if isinstance(list_vm_response, list):
+ vm = list_vm_response[0]
+ if vm.state == 'Running':
+ self.debug("VM state: %s" % vm.state)
+ else:
+ raise Exception(
+ "Failed to start VM (ID: %s) after changing service offering" % vm.id)
+ try:
+ ssh = self.medium_virtual_machine.get_ssh_client()
+ except Exception as e:
+ self.fail(
+ "SSH Access failed for %s: %s" %\
+ (self.medium_virtual_machine.ipaddress, e)
+ )
+
+ cpuinfo = ssh.execute("cat /proc/cpuinfo")
+ cpu_cnt = len([i for i in cpuinfo if "processor" in i])
+ #'cpu MHz\t\t: 2660.499'
+ cpu_speed = [i for i in cpuinfo if "cpu MHz" in i][0].split()[3]
+ meminfo = ssh.execute("cat /proc/meminfo")
+ #MemTotal: 1017464 kB
+ total_mem = [i for i in meminfo if "MemTotal" in i][0].split()[1]
+
+ self.debug(
+ "CPU count: %s, CPU Speed: %s, Mem Info: %s" % (
+ cpu_cnt,
+ cpu_speed,
+ total_mem
+ ))
+ self.assertAlmostEqual(
+ int(cpu_cnt),
+ self.small_offering.cpunumber,
+ "Check CPU Count for small offering"
+ )
+ self.assertAlmostEqual(
+ list_vm_response[0].cpuspeed,
+ self.small_offering.cpuspeed,
+ "Check CPU Speed for small offering"
+ )
+ self.assertAlmostEqual(
+ int(total_mem) / 1024, # In MBs
+ self.small_offering.memory,
+ "Check Memory(kb) for small offering"
+ )
return
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/90a40b08/test/integration/smoke/test_vm_life_cycle.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_vm_life_cycle.py b/test/integration/smoke/test_vm_life_cycle.py
index d52ed9b..8c78149 100644
--- a/test/integration/smoke/test_vm_life_cycle.py
+++ b/test/integration/smoke/test_vm_life_cycle.py
@@ -489,245 +489,6 @@ class TestVMLifeCycle(cloudstackTestCase):
)
return
- @attr(tags = ["advanced", "advancedns", "smoke"])
- def test_04_change_offering_small(self):
- """Change Offering to a small capacity
- """
-
- # Validate the following
- # 1. Log in to the Vm .We should see that the CPU and memory Info of
- # this Vm matches the one specified for "Small" service offering.
- # 2. Using listVM command verify that this Vm
- # has Small service offering Id.
-
- self.debug("Stopping VM - ID: %s" % self.medium_virtual_machine.id)
-
- self.medium_virtual_machine.stop(self.apiclient)
-
- # Poll listVM to ensure VM is stopped properly
- timeout = self.services["timeout"]
-
- while True:
- time.sleep(self.services["sleep"])
-
- # Ensure that VM is in stopped state
- list_vm_response = list_virtual_machines(
- self.apiclient,
- id=self.medium_virtual_machine.id
- )
-
- if isinstance(list_vm_response, list):
-
- vm = list_vm_response[0]
- if vm.state == 'Stopped':
- self.debug("VM state: %s" % vm.state)
- break
-
- if timeout == 0:
- raise Exception(
- "Failed to stop VM (ID: %s) in change service offering" % vm.id)
-
- timeout = timeout - 1
-
- self.debug("Change Service offering VM - ID: %s" %
- self.medium_virtual_machine.id)
-
- cmd = changeServiceForVirtualMachine.changeServiceForVirtualMachineCmd()
- cmd.id = self.medium_virtual_machine.id
- cmd.serviceofferingid = self.small_offering.id
- self.apiclient.changeServiceForVirtualMachine(cmd)
-
- self.debug("Starting VM - ID: %s" % self.medium_virtual_machine.id)
- self.medium_virtual_machine.start(self.apiclient)
-
- # Poll listVM to ensure VM is started properly
- timeout = self.services["timeout"]
-
- while True:
- time.sleep(self.services["sleep"])
-
- # Ensure that VM is in running state
- list_vm_response = list_virtual_machines(
- self.apiclient,
- id=self.medium_virtual_machine.id
- )
-
- if isinstance(list_vm_response, list):
-
- vm = list_vm_response[0]
- if vm.state == 'Running':
- self.debug("VM state: %s" % vm.state)
- break
-
- if timeout == 0:
- raise Exception(
- "Failed to start VM (ID: %s) after changing service offering" % vm.id)
-
- timeout = timeout - 1
-
- try:
- ssh = self.medium_virtual_machine.get_ssh_client()
- except Exception as e:
- self.fail(
- "SSH Access failed for %s: %s" % \
- (self.medium_virtual_machine.ipaddress, e)
- )
-
- cpuinfo = ssh.execute("cat /proc/cpuinfo")
-
- cpu_cnt = len([i for i in cpuinfo if "processor" in i])
- #'cpu MHz\t\t: 2660.499'
- cpu_speed = [i for i in cpuinfo if "cpu MHz" in i ][0].split()[3]
-
- meminfo = ssh.execute("cat /proc/meminfo")
- #MemTotal: 1017464 kB
- total_mem = [i for i in meminfo if "MemTotal" in i][0].split()[1]
-
- self.debug(
- "CPU count: %s, CPU Speed: %s, Mem Info: %s" % (
- cpu_cnt,
- cpu_speed,
- total_mem
- ))
- self.assertAlmostEqual(
- int(cpu_cnt),
- self.small_offering.cpunumber,
- "Check CPU Count for small offering"
- )
-
- self.assertAlmostEqual(
- list_vm_response[0].cpuspeed,
- self.small_offering.cpuspeed,
- "Check CPU Speed for small offering"
- )
- self.assertAlmostEqual(
- int(total_mem) / 1024, # In MBs
- self.small_offering.memory,
- "Check Memory(kb) for small offering"
- )
- return
-
- @attr(tags = ["advanced", "advancedns", "smoke"])
- def test_05_change_offering_medium(self):
- """Change Offering to a medium capacity
- """
- # Validate the following
- # 1. Log in to the Vm .We should see that the CPU and memory Info of
- # this Vm matches the one specified for "Medium" service offering.
- # 2. Using listVM command verify that this Vm
- # has Medium service offering Id.
-
- self.debug("Stopping VM - ID: %s" % self.small_virtual_machine.id)
- self.small_virtual_machine.stop(self.apiclient)
-
- # Poll listVM to ensure VM is stopped properly
- timeout = self.services["timeout"]
-
- while True:
- time.sleep(self.services["sleep"])
-
- # Ensure that VM is in stopped state
- list_vm_response = list_virtual_machines(
- self.apiclient,
- id=self.small_virtual_machine.id
- )
-
- if isinstance(list_vm_response, list):
-
- vm = list_vm_response[0]
- if vm.state == 'Stopped':
- self.debug("VM state: %s" % vm.state)
- break
-
- if timeout == 0:
- raise Exception(
- "Failed to stop VM (ID: %s) in change service offering" % vm.id)
-
- timeout = timeout - 1
-
- self.debug("Change service offering VM - ID: %s" %
- self.small_virtual_machine.id)
-
- cmd = changeServiceForVirtualMachine.changeServiceForVirtualMachineCmd()
- cmd.id = self.small_virtual_machine.id
- cmd.serviceofferingid = self.medium_offering.id
- self.apiclient.changeServiceForVirtualMachine(cmd)
-
- self.debug("Starting VM - ID: %s" % self.small_virtual_machine.id)
- self.small_virtual_machine.start(self.apiclient)
-
- # Poll listVM to ensure VM is started properly
- timeout = self.services["timeout"]
-
- while True:
- time.sleep(self.services["sleep"])
-
- # Ensure that VM is in running state
- list_vm_response = list_virtual_machines(
- self.apiclient,
- id=self.small_virtual_machine.id
- )
-
- if isinstance(list_vm_response, list):
-
- vm = list_vm_response[0]
- if vm.state == 'Running':
- self.debug("VM state: %s" % vm.state)
- break
-
- if timeout == 0:
- raise Exception(
- "Failed to start VM (ID: %s) after changing service offering" % vm.id)
-
- timeout = timeout - 1
-
- list_vm_response = list_virtual_machines(
- self.apiclient,
- id=self.small_virtual_machine.id
- )
-
- try:
- ssh_client = self.small_virtual_machine.get_ssh_client()
- except Exception as e:
- self.fail(
- "SSH Access failed for %s: %s" % \
- (self.small_virtual_machine.ipaddress, e)
- )
-
- cpuinfo = ssh_client.execute("cat /proc/cpuinfo")
-
- cpu_cnt = len([i for i in cpuinfo if "processor" in i])
- #'cpu MHz\t\t: 2660.499'
- cpu_speed = [i for i in cpuinfo if "cpu MHz" in i][0].split()[3]
-
- meminfo = ssh_client.execute("cat /proc/meminfo")
- #MemTotal: 1017464 kB
- total_mem = [i for i in meminfo if "MemTotal" in i][0].split()[1]
-
- self.debug(
- "CPU count: %s, CPU Speed: %s, Mem Info: %s" % (
- cpu_cnt,
- cpu_speed,
- total_mem
- ))
- self.assertAlmostEqual(
- int(cpu_cnt),
- self.medium_offering.cpunumber,
- "Check CPU Count for medium offering"
- )
-
- self.assertAlmostEqual(
- list_vm_response[0].cpuspeed,
- self.medium_offering.cpuspeed,
- "Check CPU Speed for medium offering"
- )
-
- self.assertAlmostEqual(
- int(total_mem) / 1024, # In MBs
- self.medium_offering.memory,
- "Check Memory(kb) for medium offering"
- )
- return
@attr(tags = ["devcloud", "advanced", "advancedns", "smoke", "basic", "sg"])
def test_06_destroy_vm(self):