Skip to content

Commit 2f97e3b

Browse files
gzhao9DaanHoogland
gzhao9
and
DaanHoogland
authored
refactor MockNetworkVO (#8137)
* refactor MockNetworkVO * Apply suggestions from code review Co-authored-by: dahn <[email protected]> * adding static adding a static method to the MockNetworkVO class that generates a MockNetworkVO rather than using new everytime. --------- Co-authored-by: dahn <[email protected]>
1 parent 39c0706 commit 2f97e3b

File tree

5 files changed

+72
-69
lines changed

5 files changed

+72
-69
lines changed

‎plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/model/InstanceIpModelTest.java‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
// under the License.
1717

1818
package org.apache.cloudstack.network.contrail.model;
19+
1920
import static org.mockito.Matchers.anyInt;
2021
import static org.mockito.Matchers.anyLong;
2122
import static org.mockito.Matchers.anyString;
@@ -44,26 +45,19 @@
4445

4546
public class InstanceIpModelTest extends TestCase {
4647
private static final Logger s_logger =
47-
Logger.getLogger(InstanceIpModelTest.class);
48+
Logger.getLogger(InstanceIpModelTest.class);
4849

4950
@Test
5051
public void testCreateInstanceIp() throws IOException {
5152

5253
ContrailManagerImpl contrailMgr = mock(ContrailManagerImpl.class);
53-
ModelController controller = mock(ModelController.class);
54+
ModelController controller = mock(ModelController.class);
5455
ApiConnector api = new ApiConnectorMock(null, 0);
5556
when(controller.getApiAccessor()).thenReturn(api);
5657
when(controller.getManager()).thenReturn(contrailMgr);
5758

5859
// Create Virtual-Network (VN)
59-
NetworkVO network = mock(NetworkVO.class);
60-
when(network.getName()).thenReturn("testnetwork");
61-
when(network.getState()).thenReturn(Network.State.Implemented);
62-
when(network.getGateway()).thenReturn("10.1.1.1");
63-
when(network.getCidr()).thenReturn("10.1.1.0/24");
64-
when(network.getPhysicalNetworkId()).thenReturn(42L);
65-
when(network.getDomainId()).thenReturn(10L);
66-
when(network.getAccountId()).thenReturn(42L);
60+
NetworkVO network = MockNetworkVO.getNetwork(Network.State.Implemented);
6761
NetworkDao networkDao = mock(NetworkDao.class);
6862
when(networkDao.findById(anyLong())).thenReturn(network);
6963
when(controller.getNetworkDao()).thenReturn(networkDao);
@@ -86,7 +80,7 @@ public void testCreateInstanceIp() throws IOException {
8680
when(vm.getState()).thenReturn(VirtualMachine.State.Running);
8781
when(vm.getDomainId()).thenReturn(10L);
8882
when(vm.getAccountId()).thenReturn(42L);
89-
UserVmDao VmDao = mock(UserVmDao.class);
83+
UserVmDao VmDao = mock(UserVmDao.class);
9084
when(VmDao.findById(anyLong())).thenReturn(null);
9185
when(controller.getVmDao()).thenReturn(VmDao);
9286

‎plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/model/MockNetworkVO.java‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
// Licensed to the Apache Software Foundation (ASF) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The ASF licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
17+
18+
package org.apache.cloudstack.network.contrail.model;
19+
20+
import com.cloud.network.Network;
21+
import com.cloud.network.dao.NetworkVO;
22+
23+
import static org.mockito.Mockito.mock;
24+
import static org.mockito.Mockito.when;
25+
26+
public class MockNetworkVO {
27+
28+
private NetworkVO network;
29+
30+
MockNetworkVO(Network.State state) {
31+
network = mock(NetworkVO.class);
32+
when(network.getName()).thenReturn("testnetwork");
33+
when(network.getState()).thenReturn(state);
34+
when(network.getGateway()).thenReturn("10.1.1.1");
35+
when(network.getCidr()).thenReturn("10.1.1.0/24");
36+
when(network.getPhysicalNetworkId()).thenReturn(42L);
37+
when(network.getDomainId()).thenReturn(10L);
38+
when(network.getAccountId()).thenReturn(42L);
39+
}
40+
41+
public NetworkVO getNetwork() {
42+
return network;
43+
}
44+
45+
public static NetworkVO getNetwork(Network.State state) {
46+
MockNetworkVO mockNetwork = new MockNetworkVO(state);
47+
return mockNetwork.getNetwork();
48+
}
49+
50+
}

‎plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/model/VMInterfaceModelTest.java‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
// under the License.
1717

1818
package org.apache.cloudstack.network.contrail.model;
19+
1920
import static org.mockito.Matchers.anyInt;
2021
import static org.mockito.Matchers.anyLong;
2122
import static org.mockito.Matchers.anyString;
@@ -45,27 +46,20 @@
4546

4647
public class VMInterfaceModelTest extends TestCase {
4748
private static final Logger s_logger =
48-
Logger.getLogger(VMInterfaceModelTest.class);
49+
Logger.getLogger(VMInterfaceModelTest.class);
4950

5051
@Test
5152
public void testCreateVMInterface() throws IOException {
5253

5354
String uuid;
5455
ContrailManagerImpl contrailMgr = mock(ContrailManagerImpl.class);
55-
ModelController controller = mock(ModelController.class);
56+
ModelController controller = mock(ModelController.class);
5657
ApiConnector api = new ApiConnectorMock(null, 0);
5758
when(controller.getManager()).thenReturn(contrailMgr);
5859
when(controller.getApiAccessor()).thenReturn(api);
5960

6061
// Create Virtual-Network (VN)
61-
NetworkVO network = mock(NetworkVO.class);
62-
when(network.getName()).thenReturn("testnetwork");
63-
when(network.getState()).thenReturn(Network.State.Implemented);
64-
when(network.getGateway()).thenReturn("10.1.1.1");
65-
when(network.getCidr()).thenReturn("10.1.1.0/24");
66-
when(network.getPhysicalNetworkId()).thenReturn(42L);
67-
when(network.getDomainId()).thenReturn(10L);
68-
when(network.getAccountId()).thenReturn(42L);
62+
NetworkVO network = MockNetworkVO.getNetwork(Network.State.Implemented);
6963
NetworkDao networkDao = mock(NetworkDao.class);
7064
when(networkDao.findById(anyLong())).thenReturn(network);
7165
when(controller.getNetworkDao()).thenReturn(networkDao);
@@ -88,7 +82,7 @@ public void testCreateVMInterface() throws IOException {
8882
when(vm.getState()).thenReturn(VirtualMachine.State.Running);
8983
when(vm.getDomainId()).thenReturn(10L);
9084
when(vm.getAccountId()).thenReturn(42L);
91-
UserVmDao VmDao = mock(UserVmDao.class);
85+
UserVmDao VmDao = mock(UserVmDao.class);
9286
when(VmDao.findById(anyLong())).thenReturn(null);
9387
when(controller.getVmDao()).thenReturn(VmDao);
9488

‎plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/model/VirtualMachineModelTest.java‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -46,18 +46,18 @@ public class VirtualMachineModelTest extends TestCase {
4646
@Test
4747
public void testVirtualMachineDBLookup() {
4848
ModelDatabase db = new ModelDatabase();
49-
VMInstanceVO vm = mock(VMInstanceVO.class);
49+
VMInstanceVO vm = mock(VMInstanceVO.class);
5050

5151
// Create 3 dummy Virtual Machine model objects
5252
// Add these models to database.
5353
// Each VM is identified by unique UUId.
54-
VirtualMachineModel vm0 = new VirtualMachineModel(vm, "fbc1f8fa-4b78-45ee-bba0-b551dbf72353");
54+
VirtualMachineModel vm0 = new VirtualMachineModel(vm, "fbc1f8fa-4b78-45ee-bba0-b551dbf72353");
5555
db.getVirtualMachines().add(vm0);
5656

57-
VirtualMachineModel vm1 = new VirtualMachineModel(vm, "fbc1f8fa-4b78-45ee-bba0-b551dbf83464");
57+
VirtualMachineModel vm1 = new VirtualMachineModel(vm, "fbc1f8fa-4b78-45ee-bba0-b551dbf83464");
5858
db.getVirtualMachines().add(vm1);
5959

60-
VirtualMachineModel vm2 = new VirtualMachineModel(vm, "fbc1f8fa-4b78-45ee-bba0-b551dbf94575");
60+
VirtualMachineModel vm2 = new VirtualMachineModel(vm, "fbc1f8fa-4b78-45ee-bba0-b551dbf94575");
6161
db.getVirtualMachines().add(vm2);
6262

6363
s_logger.debug("No of Vitual Machines added to database : " + db.getVirtualMachines().size());
@@ -74,20 +74,13 @@ public void testCreateVirtualMachine() throws IOException {
7474

7575
String uuid = UUID.randomUUID().toString();
7676
ContrailManagerImpl contrailMgr = mock(ContrailManagerImpl.class);
77-
ModelController controller = mock(ModelController.class);
77+
ModelController controller = mock(ModelController.class);
7878
ApiConnector api = new ApiConnectorMock(null, 0);
7979
when(controller.getManager()).thenReturn(contrailMgr);
8080
when(controller.getApiAccessor()).thenReturn(api);
8181

8282
// Create Virtual-Network (VN)
83-
NetworkVO network = mock(NetworkVO.class);
84-
when(network.getName()).thenReturn("testnetwork");
85-
when(network.getState()).thenReturn(Network.State.Allocated);
86-
when(network.getGateway()).thenReturn("10.1.1.1");
87-
when(network.getCidr()).thenReturn("10.1.1.0/24");
88-
when(network.getPhysicalNetworkId()).thenReturn(42L);
89-
when(network.getDomainId()).thenReturn(10L);
90-
when(network.getAccountId()).thenReturn(42L);
83+
NetworkVO network = MockNetworkVO.getNetwork(Network.State.Allocated);
9184

9285
when(contrailMgr.getCanonicalName(network)).thenReturn("testnetwork");
9386
when(contrailMgr.getProjectId(network.getDomainId(), network.getAccountId())).thenReturn("testProjectId");
@@ -99,7 +92,7 @@ public void testCreateVirtualMachine() throws IOException {
9992
when(vm.getDomainId()).thenReturn(10L);
10093
when(vm.getAccountId()).thenReturn(42L);
10194

102-
UserVmDao VmDao = mock(UserVmDao.class);
95+
UserVmDao VmDao = mock(UserVmDao.class);
10396
when(VmDao.findById(anyLong())).thenReturn(null);
10497
when(controller.getVmDao()).thenReturn(VmDao);
10598

‎plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/model/VirtualNetworkModelTest.java‎

Lines changed: 5 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -115,34 +115,13 @@ public void setUp() throws IOException {
115115
when(vn3.getNetworkPolicy()).thenReturn(policyRefs3);
116116

117117
//Virtual-Network 1
118-
NetworkVO network1 = mock(NetworkVO.class);
119-
when(network1.getName()).thenReturn("testnetwork");
120-
when(network1.getState()).thenReturn(State.Allocated);
121-
when(network1.getGateway()).thenReturn("10.1.1.1");
122-
when(network1.getCidr()).thenReturn("10.1.1.0/24");
123-
when(network1.getPhysicalNetworkId()).thenReturn(42L);
124-
when(network1.getDomainId()).thenReturn(10L);
125-
when(network1.getAccountId()).thenReturn(42L);
118+
NetworkVO network1 = MockNetworkVO.getNetwork(State.Allocated);
126119

127120
//Virtual-Network 2
128-
NetworkVO network2 = mock(NetworkVO.class);
129-
when(network2.getName()).thenReturn("Testnetwork");
130-
when(network2.getState()).thenReturn(State.Allocated);
131-
when(network2.getGateway()).thenReturn("10.1.1.1");
132-
when(network2.getCidr()).thenReturn("10.1.1.0/24");
133-
when(network2.getPhysicalNetworkId()).thenReturn(42L);
134-
when(network2.getDomainId()).thenReturn(10L);
135-
when(network2.getAccountId()).thenReturn(42L);
121+
NetworkVO network2 = MockNetworkVO.getNetwork(State.Allocated);
136122

137123
//Virtual-Network 3
138-
NetworkVO network3 = mock(NetworkVO.class);
139-
when(network3.getName()).thenReturn("Testnetwork");
140-
when(network3.getState()).thenReturn(State.Allocated);
141-
when(network3.getGateway()).thenReturn("10.1.1.1");
142-
when(network3.getCidr()).thenReturn("10.1.1.0/24");
143-
when(network3.getPhysicalNetworkId()).thenReturn(42L);
144-
when(network3.getDomainId()).thenReturn(10L);
145-
when(network3.getAccountId()).thenReturn(42L);
124+
NetworkVO network3 = MockNetworkVO.getNetwork(State.Allocated);
146125

147126
when(contrailMgr.getCanonicalName(network1)).thenReturn("testnetwork");
148127
when(contrailMgr.getProjectId(network1.getDomainId(), network1.getAccountId())).thenReturn("testProjectId");
@@ -179,20 +158,13 @@ public void testCreateVirtualNetwork() throws IOException {
179158

180159
String uuid = UUID.randomUUID().toString();
181160
ContrailManagerImpl contrailMgr = mock(ContrailManagerImpl.class);
182-
ModelController controller = mock(ModelController.class);
161+
ModelController controller = mock(ModelController.class);
183162
ApiConnector api = new ApiConnectorMock(null, 0);
184163
when(controller.getManager()).thenReturn(contrailMgr);
185164
when(controller.getApiAccessor()).thenReturn(api);
186165

187166
// Create Virtual-Network (VN)
188-
NetworkVO network = mock(NetworkVO.class);
189-
when(network.getName()).thenReturn("testnetwork");
190-
when(network.getState()).thenReturn(State.Allocated);
191-
when(network.getGateway()).thenReturn("10.1.1.1");
192-
when(network.getCidr()).thenReturn("10.1.1.0/24");
193-
when(network.getPhysicalNetworkId()).thenReturn(42L);
194-
when(network.getDomainId()).thenReturn(10L);
195-
when(network.getAccountId()).thenReturn(42L);
167+
NetworkVO network = MockNetworkVO.getNetwork(State.Allocated);
196168

197169
when(contrailMgr.getCanonicalName(network)).thenReturn("testnetwork");
198170
when(contrailMgr.getProjectId(network.getDomainId(), network.getAccountId())).thenReturn("testProjectId");

0 commit comments

Comments
 (0)