You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/07/24 13:24:09 UTC
[1/4] git commit: updated refs/heads/4.2 to 8e30ee3
Updated Branches:
refs/heads/4.2 722266378 -> 8e30ee3f1
CLOUDSTACK-3594: Fix regression in Affinity Groups tests
One of the patches introduced a regression where account
and domainid parameters were changed. Therefore Affinity
Groups for those accounts were not found and tests failed.
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4a7f5d59
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4a7f5d59
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4a7f5d59
Branch: refs/heads/4.2
Commit: 4a7f5d59d6f77fdeb5623937f4efa2542f891573
Parents: 74ac857
Author: Girish Shilamkar <gi...@clogeny.com>
Authored: Wed Jul 24 16:13:35 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Wed Jul 24 16:52:45 2013 +0530
----------------------------------------------------------------------
tools/marvin/marvin/integration/lib/base.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4a7f5d59/tools/marvin/marvin/integration/lib/base.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base.py b/tools/marvin/marvin/integration/lib/base.py
index 6e49ae5..0f6fdc5 100755
--- a/tools/marvin/marvin/integration/lib/base.py
+++ b/tools/marvin/marvin/integration/lib/base.py
@@ -3020,9 +3020,9 @@ class AffinityGroup:
if name is not None:
cmd.name = name
if account is not None:
- cmd.accountname = account
+ cmd.account = account
if domainid is not None:
- cmd.domaindid = domainid
+ cmd.domainid = domainid
return apiclient.deleteAffinityGroup(cmd)
[4/4] git commit: updated refs/heads/4.2 to 8e30ee3
Posted by ts...@apache.org.
Revert "CLOUDSTACK-3696: Test case test_project_limits.TestResourceLimitsProject.test_06_volumes_per_project failed due to volume usage exceeded for project."
Despite the patch the test fails. Removing the patch applied for testing
locally.
This reverts commit 605a31eb70e8998b4476ffadf2514c969b83f7d7.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8e30ee3f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8e30ee3f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8e30ee3f
Branch: refs/heads/4.2
Commit: 8e30ee3f1a6de50c7ae6599d62e53c291d443103
Parents: 4a7f5d5
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Wed Jul 24 16:52:59 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Wed Jul 24 16:52:59 2013 +0530
----------------------------------------------------------------------
.../component/test_project_limits.py | 60 ++++++--------------
1 file changed, 18 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8e30ee3f/test/integration/component/test_project_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_project_limits.py b/test/integration/component/test_project_limits.py
index db49122..6e3f41d 100644
--- a/test/integration/component/test_project_limits.py
+++ b/test/integration/component/test_project_limits.py
@@ -149,15 +149,10 @@ class TestProjectLimits(cloudstackTestCase):
cls.services["user"],
domainid=cls.domain.id
)
- cls.disk_offering = DiskOffering.create(
- cls.api_client,
- cls.services["disk_offering"]
- )
cls._cleanup = [
cls.admin,
cls.user,
- cls.domain,
- cls.disk_offering
+ cls.domain
]
return
@@ -199,8 +194,8 @@ class TestProjectLimits(cloudstackTestCase):
# account resource limits
# 3. Increase Projects Resources limits above domains limit. Verify
# project can't have more resources than domain level limit allows.
- # 4. Create Resource more than its set limit for the parent domain.
- # Verify resource allocation should fail giving proper message
+ # 4. Create Resource more than its set limit for a project. Verify
+ # resource allocation should fail giving proper message
# Create project as a domain admin
project = Project.create(
@@ -314,41 +309,22 @@ class TestProjectLimits(cloudstackTestCase):
self.apiclient,
resource.resourcetype,
domainid=self.domain.id,
- max=1
+ max=2
+ )
+ with self.assertRaises(Exception):
+ max_value = 3
+ self.debug(
+ "Attempting to update project: %s resource limit to: %s" % (
+ project.id,
+ max_value
+ ))
+ # Update project resource limits to 3
+ update_resource_limit(
+ self.apiclient,
+ resource.resourcetype,
+ max=max_value,
+ projectid=project.id
)
- max_value = 2
- self.debug(
- "Attempting to update project: %s resource limit to: %s" % (
- project.id,
- max_value
- ))
- # Update project resource limits to 3
- update_resource_limit(
- self.apiclient,
- resource.resourcetype,
- max=max_value,
- projectid=project.id
- )
-
- # Verify project can't have more resources then limit set for domain by adding volumes.
- volume = Volume.create(
- self.apiclient,
- self.services["volume"],
- zoneid=self.zone.id,
- diskofferingid=self.disk_offering.id,
- projectid=project.id
- )
- # Exception should be raised for second volume
- with self.assertRaises(Exception):
- Volume.create(
- self.apiclient,
- self.services["volume"],
- zoneid=self.zone.id,
- diskofferingid=self.disk_offering.id,
- projectid=project.id
- )
- volume.delete(self.apiclient);
-
return
@attr(tags=["advanced", "basic", "sg", "eip", "advancedns", "simulator"])
[2/4] git commit: updated refs/heads/4.2 to 8e30ee3
Posted by ts...@apache.org.
CLOUDSTACK-3724: optimizing cleanup
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/74ac8575
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/74ac8575
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/74ac8575
Branch: refs/heads/4.2
Commit: 74ac8575b09427c7511272bdd6592df092b55112
Parents: 605a31e
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Wed Jul 24 14:10:36 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Wed Jul 24 16:52:45 2013 +0530
----------------------------------------------------------------------
test/integration/component/test_vpc_vms_deployment.py | 6 ------
1 file changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/74ac8575/test/integration/component/test_vpc_vms_deployment.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_vms_deployment.py b/test/integration/component/test_vpc_vms_deployment.py
index 194b406..bef5f45 100644
--- a/test/integration/component/test_vpc_vms_deployment.py
+++ b/test/integration/component/test_vpc_vms_deployment.py
@@ -153,7 +153,6 @@ class Services:
},
"ostype": 'CentOS 5.3 (64-bit)',
# Cent OS 5.3 (64 bit)
- "sleep": 60,
"timeout": 10,
"mode": 'advanced'
}
@@ -219,10 +218,6 @@ class TestVMDeployVPC(cloudstackTestCase):
try:
#Clean up, terminate the created network offerings
cleanup_resources(self.apiclient, self.cleanup)
- wait_for_cleanup(self.apiclient, [
- "network.gc.interval",
- "network.gc.wait"])
-
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
@@ -305,7 +300,6 @@ class TestVMDeployVPC(cloudstackTestCase):
self.services["vpc_offering"]
)
- self._cleanup.append(vpc_off)
self.validate_vpc_offering(vpc_off)
self.debug("Enabling the VPC offering created")
[3/4] git commit: updated refs/heads/4.2 to 8e30ee3
Posted by ts...@apache.org.
CLOUDSTACK-3696: Test case test_project_limits.TestResourceLimitsProject.test_06_volumes_per_project failed due to volume usage exceeded for project.
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/605a31eb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/605a31eb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/605a31eb
Branch: refs/heads/4.2
Commit: 605a31eb70e8998b4476ffadf2514c969b83f7d7
Parents: 7222663
Author: Sanjay Tripathi <sa...@citrix.com>
Authored: Wed Jul 24 10:21:44 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Wed Jul 24 16:52:45 2013 +0530
----------------------------------------------------------------------
.../component/test_project_limits.py | 60 ++++++++++++++------
1 file changed, 42 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/605a31eb/test/integration/component/test_project_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_project_limits.py b/test/integration/component/test_project_limits.py
index 6e3f41d..db49122 100644
--- a/test/integration/component/test_project_limits.py
+++ b/test/integration/component/test_project_limits.py
@@ -149,10 +149,15 @@ class TestProjectLimits(cloudstackTestCase):
cls.services["user"],
domainid=cls.domain.id
)
+ cls.disk_offering = DiskOffering.create(
+ cls.api_client,
+ cls.services["disk_offering"]
+ )
cls._cleanup = [
cls.admin,
cls.user,
- cls.domain
+ cls.domain,
+ cls.disk_offering
]
return
@@ -194,8 +199,8 @@ class TestProjectLimits(cloudstackTestCase):
# account resource limits
# 3. Increase Projects Resources limits above domains limit. Verify
# project can't have more resources than domain level limit allows.
- # 4. Create Resource more than its set limit for a project. Verify
- # resource allocation should fail giving proper message
+ # 4. Create Resource more than its set limit for the parent domain.
+ # Verify resource allocation should fail giving proper message
# Create project as a domain admin
project = Project.create(
@@ -309,22 +314,41 @@ class TestProjectLimits(cloudstackTestCase):
self.apiclient,
resource.resourcetype,
domainid=self.domain.id,
- max=2
- )
- with self.assertRaises(Exception):
- max_value = 3
- self.debug(
- "Attempting to update project: %s resource limit to: %s" % (
- project.id,
- max_value
- ))
- # Update project resource limits to 3
- update_resource_limit(
- self.apiclient,
- resource.resourcetype,
- max=max_value,
- projectid=project.id
+ max=1
)
+ max_value = 2
+ self.debug(
+ "Attempting to update project: %s resource limit to: %s" % (
+ project.id,
+ max_value
+ ))
+ # Update project resource limits to 3
+ update_resource_limit(
+ self.apiclient,
+ resource.resourcetype,
+ max=max_value,
+ projectid=project.id
+ )
+
+ # Verify project can't have more resources then limit set for domain by adding volumes.
+ volume = Volume.create(
+ self.apiclient,
+ self.services["volume"],
+ zoneid=self.zone.id,
+ diskofferingid=self.disk_offering.id,
+ projectid=project.id
+ )
+ # Exception should be raised for second volume
+ with self.assertRaises(Exception):
+ Volume.create(
+ self.apiclient,
+ self.services["volume"],
+ zoneid=self.zone.id,
+ diskofferingid=self.disk_offering.id,
+ projectid=project.id
+ )
+ volume.delete(self.apiclient);
+
return
@attr(tags=["advanced", "basic", "sg", "eip", "advancedns", "simulator"])