cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kous...@apache.org
Subject [2/3] git commit: updated refs/heads/master to 53cba7c
Date Mon, 31 Aug 2015 06:48:06 GMT
Add vm scalling test that runs on simulator


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

Branch: refs/heads/master
Commit: acc11dc3fbb9a58221c9f505edbe4e9da75dd7d9
Parents: 86684cd
Author: Miguel Ferreira <miguelferreira@me.com>
Authored: Wed Aug 26 16:47:19 2015 +0200
Committer: Miguel Ferreira <miguelferreira@me.com>
Committed: Thu Aug 27 11:14:17 2015 +0200

----------------------------------------------------------------------
 setup/dev/advanced.cfg                  |  4 ++
 test/integration/smoke/test_scale_vm.py | 74 +++++++++++++++++++++++++++-
 2 files changed, 77 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/acc11dc3/setup/dev/advanced.cfg
----------------------------------------------------------------------
diff --git a/setup/dev/advanced.cfg b/setup/dev/advanced.cfg
index 53a8221..8109bb1 100644
--- a/setup/dev/advanced.cfg
+++ b/setup/dev/advanced.cfg
@@ -211,6 +211,10 @@
         {
             "name": "direct.agent.load.size",
             "value": "1000"
+        },
+        {
+            "name": "enable.dynamic.scale.vm",
+            "value": "true"
         }
     ],
     "mgtSvr": [

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/acc11dc3/test/integration/smoke/test_scale_vm.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_scale_vm.py b/test/integration/smoke/test_scale_vm.py
index 6968277..0a0f415 100644
--- a/test/integration/smoke/test_scale_vm.py
+++ b/test/integration/smoke/test_scale_vm.py
@@ -174,7 +174,79 @@ class TestScaleVm(cloudstackTestCase):
         self.assertNotEqual(
             list_vm_response,
             None,
-            "Check virtual machine is listVirtualMachines"
+            "Check virtual machine is in listVirtualMachines"
+        )
+
+        vm_response = list_vm_response[0]
+        self.assertEqual(
+            vm_response.id,
+            self.virtual_machine.id,
+            "Check virtual machine ID of scaled VM"
+        )
+
+        self.debug(
+            "Scaling VM-ID: %s from service offering: %s to new service\
+                    offering %s and the response says %s" %
+            (self.virtual_machine.id,
+             self.virtual_machine.serviceofferingid,
+             self.big_offering.id,
+             vm_response.serviceofferingid))
+        self.assertEqual(
+            vm_response.serviceofferingid,
+            self.big_offering.id,
+            "Check service offering of the VM"
+        )
+
+        self.assertEqual(
+            vm_response.state,
+            'Running',
+            "Check the state of VM"
+        )
+        return
+
+    @attr(tags=["advanced", "basic"], required_hardware="false")
+    def test_02_scale_vm_without_hypervisor_specifics(self):
+        # Validate the following
+        # Scale up the vm and see if it scales to the new svc offering and is
+        # finally in running state
+
+        #        VirtualMachine should be updated to tell cloudstack
+        #        it has PV tools
+        #        available and successfully scaled. We will only mock
+        #        that behaviour
+        #        here but it is not expected in production since the VM
+        #        scaling is not
+        #        guaranteed until tools are installed, vm rebooted
+
+        self.virtual_machine.update(
+            self.apiclient,
+            isdynamicallyscalable='true')
+
+        self.debug("Scaling VM-ID: %s to service offering: %s and state %s" % (
+            self.virtual_machine.id,
+            self.big_offering.id,
+            self.virtual_machine.state
+        ))
+
+        cmd = scaleVirtualMachine.scaleVirtualMachineCmd()
+        cmd.serviceofferingid = self.big_offering.id
+        cmd.id = self.virtual_machine.id
+        self.apiclient.scaleVirtualMachine(cmd)
+
+        list_vm_response = VirtualMachine.list(
+            self.apiclient,
+            id=self.virtual_machine.id
+        )
+        self.assertEqual(
+            isinstance(list_vm_response, list),
+            True,
+            "Check list response returns a valid list"
+        )
+
+        self.assertNotEqual(
+            list_vm_response,
+            None,
+            "Check virtual machine is in listVirtualMachines"
         )
 
         vm_response = list_vm_response[0]


Mime
View raw message