You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sa...@apache.org on 2013/05/31 09:49:04 UTC
[06/50] [abbrv] git commit: updated refs/heads/vmware-datamodel to
6a8c2bd
fixing unit tests to comply with bug "CLOUDSTACK-2477: [GSLB]
CloudStack currently allows admin to map LB rule of one account to GSLB
rule of a different account"
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cea9e391
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cea9e391
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cea9e391
Branch: refs/heads/vmware-datamodel
Commit: cea9e3919a613c71da5d95acf631355ab2b6d018
Parents: ee31728
Author: Murali Reddy <mu...@gmail.com>
Authored: Wed May 29 18:52:12 2013 +0530
Committer: Murali Reddy <mu...@gmail.com>
Committed: Wed May 29 18:54:36 2013 +0530
----------------------------------------------------------------------
.../GlobalLoadBalancingRulesServiceImplTest.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cea9e391/server/test/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImplTest.java
----------------------------------------------------------------------
diff --git a/server/test/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImplTest.java b/server/test/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImplTest.java
index 1c281a0..ab54534 100644
--- a/server/test/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImplTest.java
+++ b/server/test/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImplTest.java
@@ -577,8 +577,14 @@ public class GlobalLoadBalancingRulesServiceImplTest extends TestCase {
LoadBalancerVO lbRule1 = new LoadBalancerVO();
lbRule1.setState(FirewallRule.State.Active);
Field networkIdField1 = LoadBalancerVO.class.getSuperclass().getDeclaredField("networkId");
+ Field accountIdField1 = LoadBalancerVO.class.getSuperclass().getDeclaredField("accountId");
+ Field domainIdField1 = LoadBalancerVO.class.getSuperclass().getDeclaredField("domainId");
networkIdField1.setAccessible(true);
+ accountIdField1.setAccessible(true);
+ domainIdField1.setAccessible(true);
networkIdField1.set(lbRule1, new Long(1));
+ accountIdField1.set(lbRule1, new Long(3));
+ domainIdField1.set(lbRule1, new Long(1));
Field idField1 = LoadBalancerVO.class.getSuperclass().getDeclaredField("id");
idField1.setAccessible(true);
idField1.set(lbRule1, new Long(1));
@@ -586,8 +592,14 @@ public class GlobalLoadBalancingRulesServiceImplTest extends TestCase {
LoadBalancerVO lbRule2 = new LoadBalancerVO();
lbRule2.setState(FirewallRule.State.Active);
Field networkIdField2 = LoadBalancerVO.class.getSuperclass().getDeclaredField("networkId");
+ Field accountIdField2 = LoadBalancerVO.class.getSuperclass().getDeclaredField("accountId");
+ Field domainIdField2 = LoadBalancerVO.class.getSuperclass().getDeclaredField("domainId");
networkIdField2.setAccessible(true);
+ accountIdField2.setAccessible(true);
+ domainIdField2.setAccessible(true);
networkIdField2.set(lbRule2, new Long(1));
+ accountIdField2.set(lbRule2, new Long(3));
+ domainIdField2.set(lbRule2, new Long(1));
Field idField2 = LoadBalancerVO.class.getSuperclass().getDeclaredField("id");
idField2.setAccessible(true);
idField2.set(lbRule2, new Long(2));
@@ -611,6 +623,7 @@ public class GlobalLoadBalancingRulesServiceImplTest extends TestCase {
try {
gslbServiceImpl.assignToGlobalLoadBalancerRule(assignCmd);
} catch (InvalidParameterValueException e) {
+ s_logger.info(e.getMessage());
Assert.assertTrue(e.getMessage().contains("Load balancer rule specified should be in unique zone"));
}
}