incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h...@apache.org
Subject git commit: refs/heads/master - Prachi's commit 20a747601c2664b2b8128f7a180f7e94f6b0b1e1 introduced a new call to network.getPhysicalNetworkId() which wasn't mocked yet in the nvp plugin unittests.(cherry picked from commit aea5b268b4590775eff6291ddfbbd6
Date Thu, 21 Feb 2013 13:09:20 GMT
Updated Branches:
  refs/heads/master 82c2e3052 -> 368a5d5a9


Prachi's commit 20a747601c2664b2b8128f7a180f7e94f6b0b1e1 introduced a
new call to network.getPhysicalNetworkId() which wasn't mocked yet in
the nvp plugin unittests.(cherry picked from commit aea5b268b4590775eff6291ddfbbd6de777d1b63)

Signed-off-by: Hugo Trippaers <trippie@gmail.com>


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

Branch: refs/heads/master
Commit: 368a5d5a9a37d60988c15d2f3b9acde9904509cd
Parents: 82c2e30
Author: Hugo Trippaers <htrippaers@schubergphilis.com>
Authored: Thu Feb 21 12:27:18 2013 +0100
Committer: Hugo Trippaers <trippie@gmail.com>
Committed: Thu Feb 21 14:08:56 2013 +0100

----------------------------------------------------------------------
 .../guru/NiciraNvpGuestNetworkGuruTest.java        |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/368a5d5a/plugins/network-elements/nicira-nvp/test/com/cloud/network/guru/NiciraNvpGuestNetworkGuruTest.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/test/com/cloud/network/guru/NiciraNvpGuestNetworkGuruTest.java
b/plugins/network-elements/nicira-nvp/test/com/cloud/network/guru/NiciraNvpGuestNetworkGuruTest.java
index f86e705..0e4f8fd 100644
--- a/plugins/network-elements/nicira-nvp/test/com/cloud/network/guru/NiciraNvpGuestNetworkGuruTest.java
+++ b/plugins/network-elements/nicira-nvp/test/com/cloud/network/guru/NiciraNvpGuestNetworkGuruTest.java
@@ -252,6 +252,7 @@ public class NiciraNvpGuestNetworkGuruTest {
 		NetworkVO network = mock(NetworkVO.class);
 		when(network.getName()).thenReturn("testnetwork");
 		when(network.getState()).thenReturn(State.Implementing);
+		when(network.getPhysicalNetworkId()).thenReturn(42L);
 		
 		DeployDestination dest = mock(DeployDestination.class);
 		
@@ -308,7 +309,7 @@ public class NiciraNvpGuestNetworkGuruTest {
 		when(network.getState()).thenReturn(State.Implementing);
 		when(network.getGateway()).thenReturn("10.1.1.1");
 		when(network.getCidr()).thenReturn("10.1.1.0/24");
-		
+		when(network.getPhysicalNetworkId()).thenReturn(42L);
 		
 		DeployDestination dest = mock(DeployDestination.class);
 		
@@ -365,6 +366,7 @@ public class NiciraNvpGuestNetworkGuruTest {
 		NetworkVO network = mock(NetworkVO.class);
 		when(network.getName()).thenReturn("testnetwork");
 		when(network.getState()).thenReturn(State.Implementing);
+		when(network.getPhysicalNetworkId()).thenReturn(42L);
 		
 		DeployDestination dest = mock(DeployDestination.class);
 		


Mime
View raw message