Skip to content

Commit 50be9a4

Browse files
spark404spark404
committed
Apply proper license header and formatting to the new contrail tests #2 
1 parent 4e88197 commit 50be9a4

2 files changed

Lines changed: 70 additions & 95 deletions

File tree

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

Lines changed: 57 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,44 @@
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+
118
package org.apache.cloudstack.network.contrail.model;
2-
import java.util.UUID;
19+
20+
import static org.mockito.Matchers.anyLong;
21+
import static org.mockito.Mockito.mock;
22+
import static org.mockito.Mockito.when;
323

424
import java.io.IOException;
25+
import java.util.UUID;
526

6-
import org.apache.cloudstack.network.contrail.management.*;
7-
import org.apache.cloudstack.network.contrail.model.*;
27+
import junit.framework.TestCase;
28+
import net.juniper.contrail.api.ApiConnector;
29+
import net.juniper.contrail.api.ApiConnectorMock;
830

931
import org.apache.log4j.Logger;
10-
import org.junit.runner.RunWith;
32+
import org.junit.Test;
1133

12-
import static org.mockito.Mockito.*;
34+
import org.apache.cloudstack.network.contrail.management.ContrailManagerImpl;
35+
import org.apache.cloudstack.network.contrail.management.ModelDatabase;
1336

1437
import com.cloud.network.Network;
1538
import com.cloud.network.dao.NetworkVO;
1639
import com.cloud.vm.VMInstanceVO;
1740
import com.cloud.vm.VirtualMachine;
1841
import com.cloud.vm.dao.UserVmDao;
19-
import com.cloud.uservm.UserVm;
20-
21-
import net.juniper.contrail.api.ApiConnectorMock;
22-
import net.juniper.contrail.api.ApiConnectorFactory;
23-
import net.juniper.contrail.api.ApiObjectBase;
24-
import net.juniper.contrail.api.types.Domain;
25-
import net.juniper.contrail.api.types.InstanceIp;
26-
import net.juniper.contrail.api.types.NetworkIpam;
27-
import net.juniper.contrail.api.types.SubnetType;
28-
import net.juniper.contrail.api.types.VirtualMachineInterface;
29-
import net.juniper.contrail.api.types.VirtualNetwork;
30-
import net.juniper.contrail.api.types.VnSubnetsType;
31-
import net.juniper.contrail.api.types.NetworkPolicy;
32-
import net.juniper.contrail.api.types.Project;
33-
import net.juniper.contrail.api.types.FloatingIp;
34-
import net.juniper.contrail.api.types.VnSubnetsType;
35-
import net.juniper.contrail.api.types.ServiceInstance;
36-
import net.juniper.contrail.api.ApiConnector;
37-
38-
import org.junit.runner.RunWith;
39-
import org.junit.After;
40-
import org.junit.Before;
41-
import org.junit.BeforeClass;
42-
import org.junit.AfterClass;
43-
import org.junit.Ignore;
44-
import org.junit.Test;
45-
import junit.framework.TestCase;
4642

4743
public class VirtualMachineModelTest extends TestCase {
4844
private static final Logger s_logger =
@@ -78,49 +74,49 @@ public void testVirtualMachineDBLookup() {
7874
public void testCreateVirtualMachine() throws IOException {
7975

8076
String uuid = UUID.randomUUID().toString();
81-
ContrailManagerImpl contrailMgr = mock(ContrailManagerImpl.class);
82-
ModelController controller = mock(ModelController.class);
77+
ContrailManagerImpl contrailMgr = mock(ContrailManagerImpl.class);
78+
ModelController controller = mock(ModelController.class);
8379
ApiConnector api = new ApiConnectorMock(null, 0);
84-
when(controller.getManager()).thenReturn(contrailMgr);
85-
when(controller.getApiAccessor()).thenReturn(api);
80+
when(controller.getManager()).thenReturn(contrailMgr);
81+
when(controller.getApiAccessor()).thenReturn(api);
8682

87-
// Create Virtual-Network (VN)
83+
// Create Virtual-Network (VN)
8884
NetworkVO network = mock(NetworkVO.class);
89-
when(network.getName()).thenReturn("testnetwork");
90-
when(network.getState()).thenReturn(Network.State.Allocated);
91-
when(network.getGateway()).thenReturn("10.1.1.1");
92-
when(network.getCidr()).thenReturn("10.1.1.0/24");
93-
when(network.getPhysicalNetworkId()).thenReturn(42L);
94-
when(network.getDomainId()).thenReturn(10L);
95-
when(network.getAccountId()).thenReturn(42L);
96-
97-
when(contrailMgr.getCanonicalName(network)).thenReturn("testnetwork");
98-
when(contrailMgr.getProjectId(network.getDomainId(), network.getAccountId())).thenReturn("testProjectId");
99-
100-
// Create Virtual-Machine (VM)
85+
when(network.getName()).thenReturn("testnetwork");
86+
when(network.getState()).thenReturn(Network.State.Allocated);
87+
when(network.getGateway()).thenReturn("10.1.1.1");
88+
when(network.getCidr()).thenReturn("10.1.1.0/24");
89+
when(network.getPhysicalNetworkId()).thenReturn(42L);
90+
when(network.getDomainId()).thenReturn(10L);
91+
when(network.getAccountId()).thenReturn(42L);
92+
93+
when(contrailMgr.getCanonicalName(network)).thenReturn("testnetwork");
94+
when(contrailMgr.getProjectId(network.getDomainId(), network.getAccountId())).thenReturn("testProjectId");
95+
96+
// Create Virtual-Machine (VM)
10197
VMInstanceVO vm = mock(VMInstanceVO.class);
102-
when(vm.getInstanceName()).thenReturn("testVM1");
103-
when(vm.getState()).thenReturn(VirtualMachine.State.Starting);
104-
when(vm.getDomainId()).thenReturn(10L);
105-
when(vm.getAccountId()).thenReturn(42L);
98+
when(vm.getInstanceName()).thenReturn("testVM1");
99+
when(vm.getState()).thenReturn(VirtualMachine.State.Starting);
100+
when(vm.getDomainId()).thenReturn(10L);
101+
when(vm.getAccountId()).thenReturn(42L);
106102

107-
UserVmDao VmDao = mock(UserVmDao.class);
108-
when(VmDao.findById(anyLong())).thenReturn(null);
109-
when(controller.getVmDao()).thenReturn(VmDao);
103+
UserVmDao VmDao = mock(UserVmDao.class);
104+
when(VmDao.findById(anyLong())).thenReturn(null);
105+
when(controller.getVmDao()).thenReturn(VmDao);
110106

111107
VirtualMachineModel vmModel = new VirtualMachineModel(vm, uuid);
112108

113109
assertEquals(vmModel.getInstanceName(), "testVM1");
114110
assertEquals(vmModel.getUuid(), uuid);
115111

116112
vmModel.build(controller, vm);
117-
try {
113+
try {
118114
vmModel.update(controller);
119-
} catch (Exception ex) {
120-
fail("virtual-network update failed ");
121-
}
115+
} catch (Exception ex) {
116+
fail("virtual-network update failed ");
117+
}
122118

123-
//verify
119+
//verify
124120
assertTrue(vmModel.verify(controller));
125121

126122
}

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

Lines changed: 13 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -17,47 +17,26 @@
1717

1818
package org.apache.cloudstack.network.contrail.model;
1919

20-
import java.util.UUID;
21-
22-
import junit.framework.TestCase;
20+
import static org.mockito.Mockito.mock;
21+
import static org.mockito.Mockito.when;
2322

24-
import javax.inject.Inject;
2523
import java.io.IOException;
24+
import java.util.UUID;
2625

27-
import org.apache.cloudstack.network.contrail.management.*;
28-
import org.apache.log4j.Logger;
29-
30-
import net.juniper.contrail.api.ApiConnectorMock;
31-
import net.juniper.contrail.api.ApiConnectorFactory;
32-
import net.juniper.contrail.api.ApiObjectBase;
33-
import net.juniper.contrail.api.types.Domain;
34-
import net.juniper.contrail.api.types.InstanceIp;
35-
import net.juniper.contrail.api.types.NetworkIpam;
36-
import net.juniper.contrail.api.types.SubnetType;
37-
import net.juniper.contrail.api.types.VirtualMachine;
38-
import net.juniper.contrail.api.types.VirtualMachineInterface;
39-
import net.juniper.contrail.api.types.VirtualNetwork;
40-
import net.juniper.contrail.api.types.VnSubnetsType;
41-
import net.juniper.contrail.api.types.NetworkPolicy;
42-
import net.juniper.contrail.api.types.Project;
43-
import net.juniper.contrail.api.types.FloatingIp;
44-
import net.juniper.contrail.api.types.VnSubnetsType;
45-
import net.juniper.contrail.api.types.ServiceInstance;
26+
import junit.framework.TestCase;
4627
import net.juniper.contrail.api.ApiConnector;
28+
import net.juniper.contrail.api.ApiConnectorMock;
4729

48-
import org.junit.runner.RunWith;
49-
import org.junit.After;
50-
import org.junit.Before;
51-
import org.junit.BeforeClass;
52-
import org.junit.AfterClass;
53-
import org.junit.Ignore;
30+
import org.apache.log4j.Logger;
5431
import org.junit.Test;
5532

56-
import static org.mockito.Mockito.*;
57-
import com.cloud.network.Networks.TrafficType;
33+
import org.apache.cloudstack.network.contrail.management.ContrailManager;
34+
import org.apache.cloudstack.network.contrail.management.ContrailManagerImpl;
35+
import org.apache.cloudstack.network.contrail.management.ModelDatabase;
36+
5837
import com.cloud.network.Network.State;
38+
import com.cloud.network.Networks.TrafficType;
5939
import com.cloud.network.dao.NetworkVO;
60-
import com.cloud.utils.component.ComponentContext;
6140

6241
public class VirtualNetworkModelTest extends TestCase {
6342
private static final Logger s_logger = Logger.getLogger(VirtualNetworkModelTest.class);
@@ -89,7 +68,7 @@ public void testCreateVirtualNetwork() throws IOException {
8968
String uuid = UUID.randomUUID().toString();
9069
ContrailManagerImpl contrailMgr = mock(ContrailManagerImpl.class);
9170
ModelController controller = mock(ModelController.class);
92-
ApiConnector api = new ApiConnectorMock(null, 0);
71+
ApiConnector api = new ApiConnectorMock(null, 0);
9372
when(controller.getManager()).thenReturn(contrailMgr);
9473
when(controller.getApiAccessor()).thenReturn(api);
9574

@@ -118,6 +97,6 @@ public void testCreateVirtualNetwork() throws IOException {
11897
fail("virtual-network update failed ");
11998
}
12099
assertTrue(vnModel.verify(controller));
121-
}
100+
}
122101

123102
}

0 commit comments

Comments
 (0)