You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ta...@apache.org on 2014/05/20 08:12:22 UTC
git commit: updated refs/heads/4.4-forward to f278c53
Repository: cloudstack
Updated Branches:
refs/heads/4.4-forward 45f6bac72 -> f278c537d
Removing tests related to sparse and fat volume provisioning from 4.4-forward. This feature is not part of 4.4 release.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f278c537
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f278c537
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f278c537
Branch: refs/heads/4.4-forward
Commit: f278c537d527aa0a9cf0e20cf80dd48e1d85ec82
Parents: 45f6bac
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Mon May 19 21:48:17 2014 -0700
Committer: SrikanteswaraRao Talluri <ta...@apache.org>
Committed: Tue May 20 11:41:56 2014 +0530
----------------------------------------------------------------------
test/integration/smoke/test_disk_offerings.py | 81 ----------------------
test/integration/smoke/test_volumes.py | 16 -----
2 files changed, 97 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f278c537/test/integration/smoke/test_disk_offerings.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_disk_offerings.py b/test/integration/smoke/test_disk_offerings.py
index 780c154..45f438f 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):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f278c537/test/integration/smoke/test_volumes.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_volumes.py b/test/integration/smoke/test_volumes.py
index a151df9..c8fc26b 100644
--- a/test/integration/smoke/test_volumes.py
+++ b/test/integration/smoke/test_volumes.py
@@ -58,10 +58,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"],
@@ -133,18 +129,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,