Skip to content

Commit 11067b5

Browse files
author
Daan Hoogland
committed
extract method/duplicate code
1 parent bd14f4f commit 11067b5

File tree

1 file changed

+12
-16
lines changed
  • plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management

1 file changed

+12
-16
lines changed

plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/ManagementServerMock.java

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -221,13 +221,7 @@ public Object answer(InvocationOnMock invocation) {
221221
return null;
222222
}
223223
};
224-
try {
225-
Mockito.when(_agentMgr.send(ArgumentMatchers.anyLong(), ArgumentMatchers.any(Commands.class))).thenAnswer(callback);
226-
} catch (AgentUnavailableException e) {
227-
logger.warn("no agent running", e);
228-
} catch (OperationTimedoutException e) {
229-
logger.warn("agent not responding (in time)", e);
230-
}
224+
sendCommands(callback);
231225
long id = _userVmDao.getNextInSequence(Long.class, "id");
232226
UserVmVO vm =
233227
new UserVmVO(id, name, name, tmpl.getId(), HypervisorType.XenServer, tmpl.getGuestOSId(), false, false, _zone.getDomainId(), Account.ACCOUNT_ID_SYSTEM,
@@ -246,6 +240,16 @@ public Object answer(InvocationOnMock invocation) {
246240
return vm;
247241
}
248242

243+
private void sendCommands(Answer<?> callback) {
244+
try {
245+
Mockito.when(_agentMgr.send(ArgumentMatchers.anyLong(), ArgumentMatchers.any(Commands.class))).thenAnswer(callback);
246+
} catch (AgentUnavailableException e) {
247+
logger.warn("no agent running", e);
248+
} catch (OperationTimedoutException e) {
249+
logger.warn("agent not responding (in time)", e);
250+
}
251+
}
252+
249253
private void deleteHost() {
250254
_hostDao.remove(_hostId);
251255

@@ -266,15 +270,7 @@ public Object answer(InvocationOnMock invocation) {
266270
return null;
267271
}
268272
};
269-
270-
try {
271-
Mockito.when(_agentMgr.send(ArgumentMatchers.anyLong(), ArgumentMatchers.any(Commands.class))).thenAnswer(callback);
272-
} catch (AgentUnavailableException e) {
273-
e.printStackTrace();
274-
} catch (OperationTimedoutException e) {
275-
e.printStackTrace();
276-
}
277-
273+
sendCommands(callback);
278274
_userVmDao.remove(vm.getId());
279275
}
280276

0 commit comments

Comments
 (0)