Updated Branches: refs/heads/4.1 8b2aabe68 -> aea5b268b
Prachi's commit 20a747601c2664b2b8128f7a180f7e94f6b0b1e1 introduced a new call to network.getPhysicalNetworkId() which wasn't mocked yet in the nvp plugin unittests. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/aea5b268 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/aea5b268 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/aea5b268 Branch: refs/heads/4.1 Commit: aea5b268b4590775eff6291ddfbbd6de777d1b63 Parents: 8b2aabe Author: Hugo Trippaers <[email protected]> Authored: Thu Feb 21 12:27:18 2013 +0100 Committer: Hugo Trippaers <[email protected]> Committed: Thu Feb 21 12:27:53 2013 +0100 ---------------------------------------------------------------------- .../guru/NiciraNvpGuestNetworkGuruTest.java | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aea5b268/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);
