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 2015/01/30 12:35:51 UTC
git commit: updated refs/heads/master to fc6d925
Repository: cloudstack
Updated Branches:
refs/heads/master 3eb5c7691 -> fc6d925ad
CLOUDSTACK-8161: added skips for the tests which are not supported on LXC:
1. vm create from ISO
2. dynamic scaling of VM.
3. windows VM on LXC
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/fc6d925a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fc6d925a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fc6d925a
Branch: refs/heads/master
Commit: fc6d925ade6d120989afc21c7c1a43395ae03567
Parents: 3eb5c76
Author: SrikanteswaraRao Talluri <ta...@apache.org>
Authored: Fri Jan 30 16:43:40 2015 +0530
Committer: SrikanteswaraRao Talluri <ta...@apache.org>
Committed: Fri Jan 30 17:05:28 2015 +0530
----------------------------------------------------------------------
test/integration/component/maint/test_bugs.py | 3 +++
.../component/test_dynamic_compute_offering.py | 12 ++++++++++--
test/integration/component/test_stopped_vm.py | 6 ++++++
3 files changed, 19 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fc6d925a/test/integration/component/maint/test_bugs.py
----------------------------------------------------------------------
diff --git a/test/integration/component/maint/test_bugs.py b/test/integration/component/maint/test_bugs.py
index f68c244..160cd1d 100644
--- a/test/integration/component/maint/test_bugs.py
+++ b/test/integration/component/maint/test_bugs.py
@@ -517,6 +517,9 @@ class Test42xBugsMgmtSvr(cloudstackTestCase):
"""
# register windows 2012 VM template as windows 8 template
+ self.hypervisor = self.testClient.getHypervisorInfo()
+ if self.hypervisor.lower() in ['lxc']:
+ self.skipTest("windows VM is not supported on %s" % self.hypervisor.lower())
self.win2012_template = Template.register(
self.apiClient,
self.services["win2012template"],
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fc6d925a/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 376d419..ce6c4cd 100644
--- a/test/integration/component/test_dynamic_compute_offering.py
+++ b/test/integration/component/test_dynamic_compute_offering.py
@@ -62,6 +62,9 @@ class TestDynamicServiceOffering(cloudstackTestCase):
cls.domain = get_domain(cls.apiclient)
cls.zone = get_zone(cls.apiclient, testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
+ self.hypervisor = self.testClient.getHypervisorInfo()
+ if self.hypervisor.lower() in ['lxc']:
+ self.skipTest("dynamic scaling feature is not supported on %s" % self.hypervisor.lower())
cls.template = get_template(
cls.apiclient,
@@ -481,8 +484,7 @@ class TestScaleVmDynamicServiceOffering(cloudstackTestCase):
TestScaleVmDynamicServiceOffering,
cls).getClsTestClient()
cls.api_client = cloudstackTestClient.getApiClient()
- cls.hypervisor = cloudstackTestClient.getHypervisorInfo()
-
+ self.hypervisor = self.testClient.getHypervisorInfo()
# Fill services from the external config file
cls.services = cloudstackTestClient.getParsedTestDataConfig()
@@ -1260,6 +1262,9 @@ class TestAccountLimits(cloudstackTestCase):
# Fill services from the external config file
cls.services = cloudstackTestClient.getParsedTestDataConfig()
+ self.hypervisor = self.testClient.getHypervisorInfo()
+ if self.hypervisor.lower() in ['lxc']:
+ self.skipTest("dynamic scaling feature is not supported on %s" % self.hypervisor.lower())
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client)
@@ -1597,6 +1602,9 @@ class TestAffinityGroup(cloudstackTestCase):
# Fill services from the external config file
cls.services = cloudstackTestClient.getParsedTestDataConfig()
+ self.hypervisor = self.testClient.getHypervisorInfo()
+ if self.hypervisor.lower() in ['lxc']:
+ self.skipTest("migrate VM feature is not supported on %s" % self.hypervisor.lower())
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fc6d925a/test/integration/component/test_stopped_vm.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_stopped_vm.py b/test/integration/component/test_stopped_vm.py
index 1a928cc..8954372 100644
--- a/test/integration/component/test_stopped_vm.py
+++ b/test/integration/component/test_stopped_vm.py
@@ -826,6 +826,9 @@ class TestDeployHaEnabledVM(cloudstackTestCase):
# 1. deployHA enabled Vm using ISO with the startvm parameter=true
# 2. listVM command should return the deployed VM. State of this VM
# should be "Running".
+ self.hypervisor = self.testClient.getHypervisorInfo()
+ if self.hypervisor.lower() in ['lxc']:
+ self.skipTest("vm deploy from ISO feature is not supported on %s" % self.hypervisor.lower())
self.iso = Iso.create(
self.apiclient,
@@ -869,6 +872,9 @@ class TestDeployHaEnabledVM(cloudstackTestCase):
# 1. deployHA enabled Vm using ISO with the startvm parameter=false
# 2. listVM command should return the deployed VM. State of this VM
# should be "Stopped".
+ self.hypervisor = self.testClient.getHypervisorInfo()
+ if self.hypervisor.lower() in ['lxc']:
+ self.skipTest("vm deploy from ISO feature is not supported on %s" % self.hypervisor.lower())
self.debug("Deploying instance in the account: %s" %
self.account.name)