You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ek...@apache.org on 2015/06/24 09:54:57 UTC
[1/3] git commit: updated refs/heads/master to 6c5bc96
Repository: cloudstack
Updated Branches:
refs/heads/master da72bb9ae -> 6c5bc9617
CLOUDSTACK-8583 :fixing issue related to script test_stopped_vm
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4577af72
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4577af72
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4577af72
Branch: refs/heads/master
Commit: 4577af7206f57497a529f43f4ab18a212a144d6b
Parents: c599f63
Author: nitt10prashant <ni...@gmail.com>
Authored: Wed Jun 24 12:31:23 2015 +0530
Committer: nitt10prashant <ni...@gmail.com>
Committed: Wed Jun 24 12:31:23 2015 +0530
----------------------------------------------------------------------
test/integration/component/test_stopped_vm.py | 52 +++++++++++++---------
1 file changed, 32 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4577af72/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 89c8aec..d3e5cd5 100644
--- a/test/integration/component/test_stopped_vm.py
+++ b/test/integration/component/test_stopped_vm.py
@@ -36,7 +36,8 @@ from marvin.lib.common import (get_zone,
get_domain,
get_template,
get_builtin_template_info,
- update_resource_limit)
+ update_resource_limit,
+ find_storage_pool_type)
from marvin.codes import PASS
@@ -52,6 +53,11 @@ class TestDeployVM(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
+ cls.hypervisor = cls.testClient.getHypervisorInfo()
+ cls.unsupportedStorageType = False
+ if cls.hypervisor.lower() == 'lxc':
+ if not find_storage_pool_type(cls.api_client, storagetype='rbd'):
+ cls.unsupportedStorageType = True
cls.template = get_template(
cls.api_client,
@@ -136,11 +142,11 @@ class TestDeployVM(cloudstackTestCase):
@attr(
tags=[
- "advanced",
- "eip",
- "advancedns",
- "basic",
- "sg"],
+ "advanced",
+ "eip",
+ "advancedns",
+ "basic",
+ "sg"],
required_hardware="false")
def test_02_deploy_vm_startvm_true(self):
"""Test Deploy Virtual Machine with startVM=true parameter
@@ -161,7 +167,6 @@ class TestDeployVM(cloudstackTestCase):
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
startvm=True,
- diskofferingid=self.disk_offering.id,
mode=self.zone.networktype
)
@@ -492,14 +497,15 @@ class TestDeployVM(cloudstackTestCase):
@attr(
tags=[
- "advanced",
- "eip",
- "advancedns",
- "basic",
- "sg"],
+ "advanced",
+ "eip",
+ "advancedns",
+ "basic",
+ "sg"],
required_hardware="false")
def test_08_deploy_attached_volume(self):
- """Test Deploy Virtual Machine with startVM=false and attach volume already attached to different machine
+ """Test Deploy Virtual Machine with startVM=false and attach volume
+ already attached to different machine
"""
# Validate the following:
@@ -509,6 +515,10 @@ class TestDeployVM(cloudstackTestCase):
# 3. Create an instance with datadisk attached to it. Detach DATADISK
# 4. Attach the volume to first virtual machine.
+ if self.unsupportedStorageType:
+ self.skipTest(
+ "unsupported storage type")
+
self.debug("Deploying instance in the account: %s" %
self.account.name)
self.virtual_machine_1 = VirtualMachine.create(
@@ -653,7 +663,8 @@ class TestDeployVM(cloudstackTestCase):
break
if i == 0:
self.skipTest(
- "No cluster with more than one primary storage pool to perform migrate volume test")
+ "No cluster with more than one primary storage pool to "
+ "perform migrate volume test")
hosts = Host.list(
self.apiclient,
@@ -1074,7 +1085,8 @@ class TestRouterStateAfterDeploy(cloudstackTestCase):
self.assertEqual(
router.state,
"Running",
- "Router should be in running state when instance is running in the account")
+ "Router should be in running state when "
+ "instance is running in the account")
self.debug("Destroying the running VM:%s" %
self.virtual_machine_2.name)
self.virtual_machine_2.delete(self.apiclient, expunge=True)
@@ -1245,11 +1257,11 @@ class TestDeployVMFromTemplate(cloudstackTestCase):
@attr(
tags=[
- "advanced",
- "eip",
- "advancedns",
- "basic",
- "sg"],
+ "advanced",
+ "eip",
+ "advancedns",
+ "basic",
+ "sg"],
required_hardware="true")
def test_deploy_vm_password_enabled(self):
"""Test Deploy Virtual Machine with startVM=false & enabledpassword in
[2/3] git commit: updated refs/heads/master to 6c5bc96
Posted by ek...@apache.org.
Merge branch 'stop_vm' of https://github.com/nitt10prashant/cloudstack into test/pr518
This closes #518
Remark: I had to merge in the old-fashion way (not using the PR alias) due to a problem with the patch
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4463881b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4463881b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4463881b
Branch: refs/heads/master
Commit: 4463881be45a741e25cdee9ece2532b38d52342d
Parents: da72bb9 4577af7
Author: wilderrodrigues <wr...@schubergphilis.com>
Authored: Wed Jun 24 09:52:26 2015 +0200
Committer: wilderrodrigues <wr...@schubergphilis.com>
Committed: Wed Jun 24 09:52:26 2015 +0200
----------------------------------------------------------------------
test/integration/component/test_stopped_vm.py | 49 +++++++++++++---------
1 file changed, 30 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4463881b/test/integration/component/test_stopped_vm.py
----------------------------------------------------------------------
diff --cc test/integration/component/test_stopped_vm.py
index f31b803,d3e5cd5..bda0fe2
--- a/test/integration/component/test_stopped_vm.py
+++ b/test/integration/component/test_stopped_vm.py
@@@ -53,15 -53,12 +53,20 @@@ class TestDeployVM(cloudstackTestCase)
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
+ cls.hypervisor = cls.testClient.getHypervisorInfo()
+ cls.unsupportedStorageType = False
+ if cls.hypervisor.lower() == 'lxc':
+ if not find_storage_pool_type(cls.api_client, storagetype='rbd'):
+ cls.unsupportedStorageType = True
+ cls.hypervisor = cls.testClient.getHypervisorInfo()
+ cls.skip = False
+
+ if cls.hypervisor.lower() == 'lxc':
+ if not find_storage_pool_type(cls.apiclient, storagetype='rbd'):
+ cls.skip = True
+ return
+
cls.template = get_template(
cls.api_client,
cls.zone.id,
[3/3] git commit: updated refs/heads/master to 6c5bc96
Posted by ek...@apache.org.
Merge branch 'test/pr518'
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6c5bc961
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6c5bc961
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6c5bc961
Branch: refs/heads/master
Commit: 6c5bc96174a8b081c3153db85c15b5afeb16b4b8
Parents: da72bb9 4463881
Author: wilderrodrigues <wr...@schubergphilis.com>
Authored: Wed Jun 24 09:54:07 2015 +0200
Committer: wilderrodrigues <wr...@schubergphilis.com>
Committed: Wed Jun 24 09:54:07 2015 +0200
----------------------------------------------------------------------
test/integration/component/test_stopped_vm.py | 49 +++++++++++++---------
1 file changed, 30 insertions(+), 19 deletions(-)
----------------------------------------------------------------------