From b0f446c7294b1804da2b2b88c34e3445eedc3a7a Mon Sep 17 00:00:00 2001
From: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
Date: Mon, 19 May 2014 21:48:17 -0700
Subject: [PATCH] Removing tests related to sparse and fat volume provisioning
 from 4.4-forward. This feature is not part of 4.4 release.

(cherry picked from commit f278c537d527aa0a9cf0e20cf80dd48e1d85ec82)
---
 test/integration/smoke/test_disk_offerings.py | 81 -------------------
 test/integration/smoke/test_volumes.py        | 16 ----
 2 files changed, 97 deletions(-)

diff --git a/test/integration/smoke/test_disk_offerings.py b/test/integration/smoke/test_disk_offerings.py
index 780c1542703..45f438fb0c0 100644
--- a/test/integration/smoke/test_disk_offerings.py
+++ b/test/integration/smoke/test_disk_offerings.py
@@ -89,87 +89,6 @@ class TestCreateDiskOffering(cloudstackTestCase):
                         )
         return
 
-    @attr(hypervisor="kvm")
-    @attr(tags = ["advanced", "basic", "eip", "sg", "advancedns", "simulator", "smoke"])
-    def test_02_create_sparse_type_disk_offering(self):
-        """Test to create  a sparse type disk offering"""
-
-        # Validate the following:
-        # 1. createDiskOfferings should return valid info for new offering
-        # 2. The Cloud Database contains the valid information
-
-        disk_offering = DiskOffering.create(
-                                        self.apiclient,
-                                        self.services["sparse"]
-                                        )
-        self.cleanup.append(disk_offering)
-
-        self.debug("Created Disk offering with ID: %s" % disk_offering.id)
-
-        list_disk_response = list_disk_offering(
-                                                self.apiclient,
-                                                id=disk_offering.id
-                                                )
-        self.assertEqual(
-                            isinstance(list_disk_response, list),
-                            True,
-                            "Check list response returns a valid list"
-                        )
-        self.assertNotEqual(
-                            len(list_disk_response),
-                            0,
-                            "Check Disk offering is created"
-                        )
-        disk_response = list_disk_response[0]
-
-        self.assertEqual(
-                            disk_response.provisioningtype,
-                            self.services["sparse"]["provisioningtype"],
-                            "Check provisionig type in createServiceOffering"
-                        )
-        return
-
-
-    @attr(hypervisor="kvm")
-    @attr(tags = ["advanced", "basic", "eip", "sg", "advancedns", "simulator", "smoke"])
-    def test_04_create_fat_type_disk_offering(self):
-        """Test to create  a sparse type disk offering"""
-
-        # Validate the following:
-        # 1. createDiskOfferings should return valid info for new offering
-        # 2. The Cloud Database contains the valid information
-
-        disk_offering = DiskOffering.create(
-                                        self.apiclient,
-                                        self.services["fat"]
-                                        )
-        self.cleanup.append(disk_offering)
-
-        self.debug("Created Disk offering with ID: %s" % disk_offering.id)
-
-        list_disk_response = list_disk_offering(
-                                                self.apiclient,
-                                                id=disk_offering.id
-                                                )
-        self.assertEqual(
-                            isinstance(list_disk_response, list),
-                            True,
-                            "Check list response returns a valid list"
-                        )
-        self.assertNotEqual(
-                            len(list_disk_response),
-                            0,
-                            "Check Disk offering is created"
-                        )
-        disk_response = list_disk_response[0]
-
-        self.assertEqual(
-                            disk_response.provisioningtype,
-                            self.services["fat"]["provisioningtype"],
-                            "Check provisionig type in createServiceOffering"
-                        )
-        return
-
 class TestDiskOfferings(cloudstackTestCase):
 
     def setUp(self):
diff --git a/test/integration/smoke/test_volumes.py b/test/integration/smoke/test_volumes.py
index f3115afb1df..de6af779192 100644
--- a/test/integration/smoke/test_volumes.py
+++ b/test/integration/smoke/test_volumes.py
@@ -50,10 +50,6 @@ class TestCreateVolume(cloudstackTestCase):
                                     cls.apiclient,
                                     cls.services["disk_offering"]
                                     )
-        cls.sparse_disk_offering = DiskOffering.create(
-                                    cls.apiclient,
-                                    cls.services["sparse_disk_offering"]
-                                    )
         cls.custom_disk_offering = DiskOffering.create(
                                     cls.apiclient,
                                     cls.services["disk_offering"],
@@ -125,18 +121,6 @@ class TestCreateVolume(cloudstackTestCase):
             self.debug("Created a volume with ID: %s" % volume.id)
             self.volumes.append(volume)
 
-        if self.virtual_machine.hypervisor == "KVM":
-            sparse_volume = Volume.create(
-                                        self.apiClient,
-                                        self.services,
-                                        zoneid=self.zone.id,
-                                        account=self.account.name,
-                                        domainid=self.account.domainid,
-                                        diskofferingid=self.sparse_disk_offering.id
-                                        )
-            self.debug("Created a sparse volume: %s" % sparse_volume.id)
-            self.volumes.append(sparse_volume)
-
         volume = Volume.create_custom_disk(
                                     self.apiClient,
                                     self.services,