From 4577af7206f57497a529f43f4ab18a212a144d6b Mon Sep 17 00:00:00 2001
From: nitt10prashant <nitt10.prashant@gmail.com>
Date: Wed, 24 Jun 2015 12:31:23 +0530
Subject: [PATCH] CLOUDSTACK-8583 :fixing issue related to script
 test_stopped_vm

---
 test/integration/component/test_stopped_vm.py | 52 ++++++++++++-------
 1 file changed, 32 insertions(+), 20 deletions(-)

diff --git a/test/integration/component/test_stopped_vm.py b/test/integration/component/test_stopped_vm.py
index 89c8aec10f2..d3e5cd5be73 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