You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2014/08/24 16:04:49 UTC
[29/50] [abbrv] git commit: updated refs/heads/saml2 to ba68616
CLOUDSTACK-7354: Set isdynamicallyscalable before attempting to scale the VM
Signed-off-by: Santhosh Edukulla <sa...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2995c7f3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2995c7f3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2995c7f3
Branch: refs/heads/saml2
Commit: 2995c7f34ba982f6ee5afaae0b7b5ca6e2a61619
Parents: 4e115c2
Author: John Dilley <jo...@citrix.com>
Authored: Fri Aug 15 15:20:04 2014 +0000
Committer: Santhosh Edukulla <sa...@gmail.com>
Committed: Fri Aug 22 19:10:38 2014 +0530
----------------------------------------------------------------------
test/integration/smoke/test_scale_vm.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2995c7f3/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 b3804dc..0b770c4 100644
--- a/test/integration/smoke/test_scale_vm.py
+++ b/test/integration/smoke/test_scale_vm.py
@@ -110,6 +110,12 @@ class TestScaleVm(cloudstackTestCase):
# 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,
@@ -144,12 +150,6 @@ class TestScaleVm(cloudstackTestCase):
"Check virtual machine ID of scaled VM"
)
- # 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 from service offering: %s to new service offering %s and the response says %s" % (
self.virtual_machine.id,
self.virtual_machine.serviceofferingid,