cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From likit...@apache.org
Subject git commit: updated refs/heads/dedicate-guest-vlan-ranges_2 to 16293cc
Date Thu, 02 May 2013 10:24:43 GMT
Updated Branches:
  refs/heads/dedicate-guest-vlan-ranges_2 579030a2f -> 16293cc82


Fix unit test to include the isolation type check of the physical network


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/16293cc8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/16293cc8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/16293cc8

Branch: refs/heads/dedicate-guest-vlan-ranges_2
Commit: 16293cc825a4483a3be7ea0269bc598bd0bd0cdd
Parents: 579030a
Author: Likitha Shetty <likitha.shetty@citrix.com>
Authored: Thu May 2 15:50:25 2013 +0530
Committer: Likitha Shetty <likitha.shetty@citrix.com>
Committed: Thu May 2 15:50:25 2013 +0530

----------------------------------------------------------------------
 .../cloud/network/DedicateGuestVlanRangesTest.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/16293cc8/server/test/com/cloud/network/DedicateGuestVlanRangesTest.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/network/DedicateGuestVlanRangesTest.java b/server/test/com/cloud/network/DedicateGuestVlanRangesTest.java
index ca47a83..e81d722 100644
--- a/server/test/com/cloud/network/DedicateGuestVlanRangesTest.java
+++ b/server/test/com/cloud/network/DedicateGuestVlanRangesTest.java
@@ -172,6 +172,7 @@ public class DedicateGuestVlanRangesTest {
         dedicateVlanField.set(dedicateGuestVlanRangesCmd, "2-5");
 
         PhysicalNetworkVO physicalNetwork = new PhysicalNetworkVO(1L, 1L, "2-5", "200", 1L,
null, "testphysicalnetwork");
+        physicalNetwork.addIsolationMethod("VLAN");
         AccountGuestVlanMapVO accountGuestVlanMapVO = new AccountGuestVlanMapVO(1L,1L);
 
         when(networkService._physicalNetworkDao.findById(anyLong())).thenReturn(physicalNetwork);
@@ -207,6 +208,7 @@ public class DedicateGuestVlanRangesTest {
         dedicateVlanField.set(dedicateGuestVlanRangesCmd, "2");
 
         PhysicalNetworkVO physicalNetwork = new PhysicalNetworkVO(1L, 1L, "2-5", "200", 1L,
null, "testphysicalnetwork");
+        physicalNetwork.addIsolationMethod("VLAN");
 
         when(networkService._physicalNetworkDao.findById(anyLong())).thenReturn(physicalNetwork);
 
@@ -227,6 +229,7 @@ public class DedicateGuestVlanRangesTest {
         dedicateVlanField.set(dedicateGuestVlanRangesCmd, "2-5");
         
         PhysicalNetworkVO physicalNetwork = new PhysicalNetworkVO(1L, 1L, "6-10", "200",
1L, null, "testphysicalnetwork");
+        physicalNetwork.addIsolationMethod("VLAN");
 
         when(networkService._physicalNetworkDao.findById(anyLong())).thenReturn(physicalNetwork);
 
@@ -247,6 +250,7 @@ public class DedicateGuestVlanRangesTest {
         dedicateVlanField.set(dedicateGuestVlanRangesCmd, "2-5");
 
         PhysicalNetworkVO physicalNetwork = new PhysicalNetworkVO(1L, 1L, "2-5", "200", 1L,
null, "testphysicalnetwork");
+        physicalNetwork.addIsolationMethod("VLAN");
         when(networkService._physicalNetworkDao.findById(anyLong())).thenReturn(physicalNetwork);
 
         List<DataCenterVnetVO> dataCenterList = new ArrayList<DataCenterVnetVO>();
@@ -271,7 +275,8 @@ public class DedicateGuestVlanRangesTest {
         dedicateVlanField.setAccessible(true);
         dedicateVlanField.set(dedicateGuestVlanRangesCmd, "2-5");
 
-        PhysicalNetworkVO physicalNetwork = new PhysicalNetworkVO(1L, 1L, "2-5", "200", 1L,
null, "testphysicalnetwork");;
+        PhysicalNetworkVO physicalNetwork = new PhysicalNetworkVO(1L, 1L, "2-5", "200", 1L,
null, "testphysicalnetwork");
+        physicalNetwork.addIsolationMethod("VLAN");
 
         when(networkService._physicalNetworkDao.findById(anyLong())).thenReturn(physicalNetwork);
 
@@ -300,6 +305,7 @@ public class DedicateGuestVlanRangesTest {
         dedicateVlanField.set(dedicateGuestVlanRangesCmd, "2-5");
 
         PhysicalNetworkVO physicalNetwork = new PhysicalNetworkVO(1L, 1L, "2-5", "200", 1L,
null, "testphysicalnetwork");
+        physicalNetwork.addIsolationMethod("VLAN");
 
         when(networkService._physicalNetworkDao.findById(anyLong())).thenReturn(physicalNetwork);
 


Mime
View raw message