Skip to content

Commit ddbcd01

Browse files
author
Alex Huang
committed
fixed up unit test
1 parent 9ca379f commit ddbcd01

6 files changed

Lines changed: 117 additions & 101 deletions

File tree

‎server/test/com/cloud/agent/MockAgentManagerImpl.java‎

Lines changed: 28 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package com.cloud.agent;
22

3-
import java.util.List;
43
import java.util.Map;
5-
import java.util.Set;
64

75
import javax.ejb.Local;
86
import javax.naming.ConfigurationException;
@@ -12,24 +10,13 @@
1210
import com.cloud.agent.api.StartupCommand;
1311
import com.cloud.agent.manager.AgentAttache;
1412
import com.cloud.agent.manager.Commands;
15-
import com.cloud.api.commands.UpdateHostPasswordCmd;
16-
import com.cloud.dc.DataCenterVO;
17-
import com.cloud.dc.HostPodVO;
18-
import com.cloud.dc.PodCluster;
1913
import com.cloud.exception.AgentUnavailableException;
2014
import com.cloud.exception.ConnectionException;
2115
import com.cloud.exception.OperationTimedoutException;
22-
import com.cloud.host.Host;
23-
import com.cloud.host.Host.Type;
24-
import com.cloud.host.HostStats;
2516
import com.cloud.host.HostVO;
2617
import com.cloud.host.Status.Event;
2718
import com.cloud.hypervisor.Hypervisor.HypervisorType;
2819
import com.cloud.resource.ServerResource;
29-
import com.cloud.service.ServiceOfferingVO;
30-
import com.cloud.template.VirtualMachineTemplate;
31-
import com.cloud.user.User;
32-
import com.cloud.utils.Pair;
3320

3421
@Local(value = { AgentManager.class })
3522
public class MockAgentManagerImpl implements AgentManager {
@@ -102,7 +89,7 @@ public int registerForInitialConnects(StartupCommandProcessor creator, boolean p
10289
@Override
10390
public void unregisterForHostEvents(int id) {
10491
// TODO Auto-generated method stub
105-
92+
10693
}
10794

10895
@Override
@@ -133,46 +120,52 @@ public Answer sendToSecStorage(HostVO ssHost, Command cmd) {
133120
return null;
134121
}
135122

136-
@Override
123+
@Override
137124
public boolean tapLoadingAgents(Long hostId, TapAgentsAction action) {
138-
// TODO Auto-generated method stub
139-
return false;
125+
// TODO Auto-generated method stub
126+
return false;
140127
}
141128

142-
@Override
129+
@Override
143130
public AgentAttache handleDirectConnectAgent(HostVO host, StartupCommand[] cmds, ServerResource resource, boolean forRebalance) throws ConnectionException {
144-
// TODO Auto-generated method stub
145-
return null;
131+
// TODO Auto-generated method stub
132+
return null;
146133
}
147134

148-
@Override
135+
@Override
149136
public boolean agentStatusTransitTo(HostVO host, Event e, long msId) {
150-
// TODO Auto-generated method stub
151-
return false;
137+
// TODO Auto-generated method stub
138+
return false;
152139
}
153140

154-
@Override
141+
@Override
155142
public AgentAttache findAttache(long hostId) {
156-
// TODO Auto-generated method stub
157-
return null;
143+
// TODO Auto-generated method stub
144+
return null;
158145
}
159146

160-
@Override
147+
@Override
161148
public void pullAgentToMaintenance(long hostId) {
162-
// TODO Auto-generated method stub
163-
149+
// TODO Auto-generated method stub
150+
164151
}
165152

166-
@Override
153+
@Override
167154
public void disconnectWithoutInvestigation(long hostId, Event event) {
168-
// TODO Auto-generated method stub
169-
155+
// TODO Auto-generated method stub
156+
170157
}
171158

172-
@Override
159+
@Override
173160
public void pullAgentOutMaintenance(long hostId) {
174-
// TODO Auto-generated method stub
175-
161+
// TODO Auto-generated method stub
162+
163+
}
164+
165+
@Override
166+
public Answer sendToSSVM(Long dcId, Command cmd) {
167+
// TODO Auto-generated method stub
168+
return null;
176169
}
177170

178171
}

‎server/test/com/cloud/network/MockNetworkManagerImpl.java‎

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ public String getName() {
168168
return null;
169169
}
170170

171-
171+
172172

173173
@Override
174174
public PublicIp assignSourceNatIpAddress(Account owner, Network network, long callerId) throws ConcurrentOperationException, InsufficientAddressCapacityException {
@@ -216,7 +216,7 @@ public void allocate(VirtualMachineProfile<? extends VMInstanceVO> vm, List<Pair
216216

217217
@Override
218218
public void prepare(VirtualMachineProfile<? extends VMInstanceVO> profile, DeployDestination dest, ReservationContext context) throws InsufficientCapacityException, ConcurrentOperationException,
219-
ResourceUnavailableException {
219+
ResourceUnavailableException {
220220
// TODO Auto-generated method stub
221221

222222
}
@@ -277,7 +277,7 @@ public List<? extends Vlan> listPodVlans(long podId) {
277277

278278
@Override
279279
public Pair<NetworkGuru, NetworkVO> implementNetwork(long networkId, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException,
280-
InsufficientCapacityException {
280+
InsufficientCapacityException {
281281
// TODO Auto-generated method stub
282282
return null;
283283
}
@@ -315,7 +315,7 @@ public Network createNetwork(long networkOfferingId, String name, String display
315315

316316
@Override
317317
public boolean associateIpAddressListToAccount(long userId, long accountId, long zoneId, Long vlanId, Network networkToAssociateWith) throws InsufficientCapacityException,
318-
ConcurrentOperationException, ResourceUnavailableException {
318+
ConcurrentOperationException, ResourceUnavailableException {
319319
// TODO Auto-generated method stub
320320
return false;
321321
}
@@ -433,12 +433,12 @@ public Network updateNetwork(long networkId, String name, String displayText, Ac
433433
// TODO Auto-generated method stub
434434
return null;
435435
}
436-
436+
437437
@Override
438438
public Map<String, Set<String>> listNetworkOfferingServices(long networkOfferingId) {
439439
return null;
440440
}
441-
441+
442442
@Override
443443
public List<? extends RemoteAccessVPNServiceProvider> getRemoteAccessVpnElements() {
444444
return null;
@@ -570,17 +570,17 @@ public Network getExclusiveGuestNetwork(long zoneId) {
570570
return null;
571571
}
572572

573-
@Override
573+
@Override
574574
public boolean restartNetwork(RestartNetworkCmd cmd, boolean cleanup) throws ConcurrentOperationException, ResourceUnavailableException,
575-
InsufficientCapacityException {
576-
// TODO Auto-generated method stub
577-
return false;
575+
InsufficientCapacityException {
576+
// TODO Auto-generated method stub
577+
return false;
578578
}
579579

580-
@Override
580+
@Override
581581
public Long getPodIdForVlan(long vlanDbId) {
582-
// TODO Auto-generated method stub
583-
return null;
582+
// TODO Auto-generated method stub
583+
return null;
584584
}
585585

586586
@Override
@@ -708,4 +708,10 @@ public boolean reallocate(VirtualMachineProfile<? extends VMInstanceVO> vm, Data
708708
// TODO Auto-generated method stub
709709
return false;
710710
}
711+
712+
@Override
713+
public Long getPhysicalNetworkId(Network network) {
714+
// TODO Auto-generated method stub
715+
return null;
716+
}
711717
}

‎server/test/com/cloud/user/MockAccountManagerImpl.java‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,6 @@
2323
@Local(value = { AccountManager.class, AccountService.class })
2424
public class MockAccountManagerImpl implements Manager, AccountManager {
2525

26-
@Override
27-
public UserAccount createUserAccount(String userName, String password, String firstName, String lastName, String email, String timezone, String accountName, short accountType, Long domainId, String networkDomain) {
28-
// TODO Auto-generated method stub
29-
return null;
30-
}
31-
3226
@Override
3327
public boolean deleteUserAccount(long accountId) {
3428
// TODO Auto-generated method stub
@@ -229,45 +223,53 @@ public String getName() {
229223
public void checkAccess(Account account, AccessType accessType, ControlledEntity... entities) throws PermissionDeniedException {
230224
// TODO Auto-generated method stub
231225
}
232-
226+
233227
@Override
234228
public void logoutUser(Long userId) {
235-
// TODO Auto-generated method stub
229+
// TODO Auto-generated method stub
236230
}
237-
231+
238232
@Override
239233
public UserAccount getUserAccount(String username, Long domainId) {
240234
return null;
241235
}
242-
236+
243237
@Override
244238
public UserAccount authenticateUser(String username, String password, Long domainId, Map<String, Object[]> requestParameters) {
245239
return null;
246240
}
247-
241+
248242
@Override
249243
public Pair<User, Account> findUserByApiKey(String apiKey) {
250244
return null;
251245
}
252-
246+
253247
@Override
254248
public UserVO createUser(long accountId, String userName, String password, String firstName, String lastName, String email, String timezone) {
255249
return null;
256250
}
257-
258-
@Override
259-
public Account createAccount(String accountName, short accountType, Long domainId, String networkDomain) {
260-
return null;
261-
}
262-
251+
263252
@Override
264253
public String[] createApiKeyAndSecretKey(RegisterCmd cmd) {
265254
return null;
266255
}
267-
256+
268257
@Override
269258
public boolean lockAccount(long accountId) {
270259
return true;
271260
}
272261

262+
@Override
263+
public UserAccount createUserAccount(String userName, String password, String firstName, String lastName, String email, String timezone, String accountName, short accountType, Long domainId, String networkDomain,
264+
Map details) {
265+
// TODO Auto-generated method stub
266+
return null;
267+
}
268+
269+
@Override
270+
public Account createAccount(String accountName, short accountType, Long domainId, String networkDomain, Map details) {
271+
// TODO Auto-generated method stub
272+
return null;
273+
}
274+
273275
}

‎server/test/com/cloud/vm/MockUserVmManagerImpl.java‎

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import com.cloud.agent.api.StopAnswer;
1111
import com.cloud.agent.api.VmStatsEntry;
1212
import com.cloud.agent.manager.Commands;
13+
import com.cloud.api.commands.AssignVMCmd;
1314
import com.cloud.api.commands.AttachVolumeCmd;
1415
import com.cloud.api.commands.CreateTemplateCmd;
1516
import com.cloud.api.commands.CreateVMGroupCmd;
@@ -18,10 +19,10 @@
1819
import com.cloud.api.commands.DestroyVMCmd;
1920
import com.cloud.api.commands.DetachVolumeCmd;
2021
import com.cloud.api.commands.ListVMsCmd;
21-
import com.cloud.api.commands.MoveUserVMCmd;
2222
import com.cloud.api.commands.RebootVMCmd;
2323
import com.cloud.api.commands.RecoverVMCmd;
2424
import com.cloud.api.commands.ResetVMPasswordCmd;
25+
import com.cloud.api.commands.RestoreVMCmd;
2526
import com.cloud.api.commands.StartVMCmd;
2627
import com.cloud.api.commands.UpdateVMCmd;
2728
import com.cloud.api.commands.UpgradeVMCmd;
@@ -38,6 +39,7 @@
3839
import com.cloud.hypervisor.Hypervisor.HypervisorType;
3940
import com.cloud.offering.ServiceOffering;
4041
import com.cloud.server.Criteria;
42+
import com.cloud.storage.StoragePool;
4143
import com.cloud.storage.Volume;
4244
import com.cloud.template.VirtualMachineTemplate;
4345
import com.cloud.user.Account;
@@ -234,7 +236,7 @@ public Volume detachVolumeFromVM(DetachVolumeCmd cmmd) {
234236

235237
@Override
236238
public UserVm startVirtualMachine(StartVMCmd cmd) throws StorageUnavailableException, ExecutionException, ConcurrentOperationException, ResourceUnavailableException,
237-
InsufficientCapacityException, ResourceAllocationException {
239+
InsufficientCapacityException, ResourceAllocationException {
238240
// TODO Auto-generated method stub
239241
return null;
240242
}
@@ -269,7 +271,7 @@ public VirtualMachineTemplate createPrivateTemplate(CreateTemplateCmd cmd) {
269271
return null;
270272
}
271273

272-
274+
273275

274276
@Override
275277
public UserVm startVirtualMachine(DeployVMCmd cmd) throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException {
@@ -310,7 +312,7 @@ public UserVm startVirtualMachine(long vmId) throws ConcurrentOperationException
310312
@Override
311313
public void deletePrivateTemplateRecord(Long templateId) {
312314
// TODO Auto-generated method stub
313-
315+
314316
}
315317

316318
@Override
@@ -327,7 +329,7 @@ public HypervisorType getHypervisorTypeOfUserVM(long vmid) {
327329

328330
@Override
329331
public UserVm createVirtualMachine(DeployVMCmd cmd) throws InsufficientCapacityException, ResourceUnavailableException, ConcurrentOperationException, StorageUnavailableException,
330-
ResourceAllocationException {
332+
ResourceAllocationException {
331333
// TODO Auto-generated method stub
332334
return null;
333335
}
@@ -365,14 +367,26 @@ public UserVm createAdvancedVirtualMachine(DataCenter zone, ServiceOffering serv
365367
}
366368

367369
@Override
368-
public UserVm moveVMToUser(MoveUserVMCmd moveUserVMCmd) throws ResourceAllocationException, ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException {
370+
public VirtualMachine migrateVirtualMachine(Long vmId, Host destinationHost) throws ResourceUnavailableException, ConcurrentOperationException, ManagementServerException,
371+
VirtualMachineMigrationException {
369372
// TODO Auto-generated method stub
370373
return null;
371374
}
372375

373376
@Override
374-
public VirtualMachine migrateVirtualMachine(Long vmId, Host destinationHost) throws ResourceUnavailableException, ConcurrentOperationException, ManagementServerException,
375-
VirtualMachineMigrationException {
377+
public UserVm moveVMToUser(AssignVMCmd moveUserVMCmd) throws ResourceAllocationException, ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException {
378+
// TODO Auto-generated method stub
379+
return null;
380+
}
381+
382+
@Override
383+
public VirtualMachine vmStorageMigration(Long vmId, StoragePool destPool) {
384+
// TODO Auto-generated method stub
385+
return null;
386+
}
387+
388+
@Override
389+
public UserVm restoreVM(RestoreVMCmd cmd) {
376390
// TODO Auto-generated method stub
377391
return null;
378392
}

0 commit comments

Comments
 (0)