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 2014/11/13 13:58:28 UTC
[1/2] git commit: updated refs/heads/4.5 to b3faab6
Repository: cloudstack
Updated Branches:
refs/heads/4.5 2c08e30a4 -> b3faab6f4
CLOUDSTACK-7879: Skip dynamic scaling on vmware if vmware-tools are not installed
Signed-off-by: SrikanteswaraRao Talluri <ta...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/46d9f8c6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/46d9f8c6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/46d9f8c6
Branch: refs/heads/4.5
Commit: 46d9f8c6f5140019c5a9d6b929900a109abcee3f
Parents: 2c08e30
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Tue Nov 11 16:05:23 2014 +0530
Committer: SrikanteswaraRao Talluri <ta...@apache.org>
Committed: Thu Nov 13 18:27:48 2014 +0530
----------------------------------------------------------------------
.../component/test_dynamic_compute_offering.py | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/46d9f8c6/test/integration/component/test_dynamic_compute_offering.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_dynamic_compute_offering.py b/test/integration/component/test_dynamic_compute_offering.py
index a3e2d56..d96fd84 100644
--- a/test/integration/component/test_dynamic_compute_offering.py
+++ b/test/integration/component/test_dynamic_compute_offering.py
@@ -423,6 +423,7 @@ class TestScaleVmDynamicServiceOffering(cloudstackTestCase):
def setUpClass(cls):
cloudstackTestClient = super(TestScaleVmDynamicServiceOffering,cls).getClsTestClient()
cls.api_client = cloudstackTestClient.getApiClient()
+ cls.hypervisor = cloudstackTestClient.getHypervisorInfo()
# Fill services from the external config file
cls.services = cloudstackTestClient.getParsedTestDataConfig()
@@ -438,7 +439,23 @@ class TestScaleVmDynamicServiceOffering(cloudstackTestCase):
)
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
cls.services["virtual_machine"]["template"] = cls.template.id
+
cls._cleanup = []
+ cls.serviceOffering_static_1 = ServiceOffering.create(cls.api_client,
+ cls.services["service_offering"])
+ cls._cleanup.append(cls.serviceOffering_static_1)
+
+ if cls.hypervisor.lower() == "vmware":
+ virtual_machine = VirtualMachine.create(cls.api_client,cls.services["virtual_machine"],
+ serviceofferingid=cls.serviceOffering_static_1.id, mode=cls.zone.networktype)
+ cls._cleanup.append(virtual_machine)
+ sshClient = virtual_machine.get_ssh_client()
+ result = str(
+ sshClient.execute("service vmware-tools status")).lower()
+ if not "running" in result:
+ cls.tearDownClass()
+ raise unittest.SkipTest("Skipping scale VM operation because\
+ VMware tools are not installed on the VM")
return
@classmethod
[2/2] git commit: updated refs/heads/4.5 to b3faab6
Posted by ta...@apache.org.
CLOUDSTACK-7693: test_scale_vm.py - fix pep8 issues
CLOUDSTACK-7878: Skip scale VM operation on vmware if vmware tools are not installed
Signed-off-by: SrikanteswaraRao Talluri <ta...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b3faab6f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b3faab6f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b3faab6f
Branch: refs/heads/4.5
Commit: b3faab6f429fd35c381967e11444c571448caa51
Parents: 46d9f8c
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Tue Nov 11 12:41:28 2014 +0530
Committer: SrikanteswaraRao Talluri <ta...@apache.org>
Committed: Thu Nov 13 18:28:13 2014 +0530
----------------------------------------------------------------------
test/integration/smoke/test_scale_vm.py | 86 +++++++++++++++++++---------
1 file changed, 58 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b3faab6f/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 3a2983e..4e1eade 100644
--- a/test/integration/smoke/test_scale_vm.py
+++ b/test/integration/smoke/test_scale_vm.py
@@ -5,9 +5,9 @@
# 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
@@ -16,19 +16,24 @@
# under the License.
""" P1 tests for Scaling up Vm
"""
-#Import Local Modules
-import marvin
+# Import Local Modules
from marvin.codes import FAILED
-from marvin.cloudstackTestCase import *
-from marvin.cloudstackAPI import *
-from marvin.lib.utils import *
-from marvin.lib.base import *
-from marvin.lib.common import *
+from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackAPI import scaleVirtualMachine
+from marvin.lib.utils import cleanup_resources
+from marvin.lib.base import (Account,
+ VirtualMachine,
+ ServiceOffering)
+from marvin.lib.common import (get_zone,
+ get_template,
+ get_domain)
from nose.plugins.attrib import attr
_multiprocess_shared_ = True
+
class TestScaleVm(cloudstackTestCase):
+
@classmethod
def setUpClass(cls):
testClient = super(TestScaleVm, cls).getClsTestClient()
@@ -36,7 +41,9 @@ class TestScaleVm(cloudstackTestCase):
cls.services = testClient.getParsedTestDataConfig()
cls.hypervisor = cls.testClient.getHypervisorInfo()
if cls.hypervisor.lower() in ('kvm', 'hyperv', 'lxc'):
- raise unittest.SkipTest("ScaleVM is not supported on KVM, Hyper-V or LXC. Hence, skipping the test")
+ raise unittest.SkipTest(
+ "ScaleVM is not supported on KVM, Hyper-V or LXC.\
+ Hence, skipping the test")
# Get Zone, Domain and templates
domain = get_domain(cls.apiclient)
@@ -49,7 +56,8 @@ class TestScaleVm(cloudstackTestCase):
cls.services["ostype"]
)
if template == FAILED:
- assert False, "get_template() failed to return template with description %s" % cls.services["ostype"]
+ assert False, "get_template() failed to return template\
+ with description %s" % cls.services["ostype"]
# Set Zones and disk offerings ??
cls.services["small"]["zoneid"] = zone.id
@@ -72,7 +80,7 @@ class TestScaleVm(cloudstackTestCase):
cls.services["service_offerings"]["big"]
)
- #create a virtual machine
+ # create a virtual machine
cls.virtual_machine = VirtualMachine.create(
cls.apiclient,
cls.services["small"],
@@ -88,7 +96,9 @@ class TestScaleVm(cloudstackTestCase):
@classmethod
def tearDownClass(cls):
- cls.apiclient = super(TestScaleVm, cls).getClsTestClient().getApiClient()
+ cls.apiclient = super(
+ TestScaleVm,
+ cls).getClsTestClient().getApiClient()
cleanup_resources(cls.apiclient, cls._cleanup)
return
@@ -98,29 +108,48 @@ class TestScaleVm(cloudstackTestCase):
self.cleanup = []
def tearDown(self):
- #Clean up, terminate the created ISOs
+ # Clean up, terminate the created ISOs
cleanup_resources(self.apiclient, self.cleanup)
return
@attr(hypervisor="xenserver")
@attr(tags=["advanced", "basic"], required_hardware="true")
def test_01_scale_vm(self):
- """Test scale virtual machine
+ """Test scale virtual machine
"""
# 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
+ # 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')
+
+ # If hypervisor is Vmware, then check if
+ # the vmware tools are installed and the process is running
+ # Vmware tools are necessary for scale VM operation
+ if self.hypervisor.lower() == "vmware":
+ sshClient = self.virtual_machine.get_ssh_client()
+ result = str(
+ sshClient.execute("service vmware-tools status")).lower()
+ self.debug("and result is: %s" % result)
+ if not "running" in result:
+ self.skipTest("Skipping scale VM operation because\
+ VMware tools are not installed on the VM")
+
+ 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
@@ -150,12 +179,13 @@ class TestScaleVm(cloudstackTestCase):
"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.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,