mirror of https://github.com/apache/cloudstack.git
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 f278c537d5)
This commit is contained in:
parent
247377c4cf
commit
b0f446c729
|
|
@ -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):
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
Loading…
Reference in New Issue