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 <wrodrig...@schubergphilis.com> Authored: Wed Jun 24 09:52:26 2015 +0200 Committer: wilderrodrigues <wrodrig...@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,
