Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -171,17 +171,31 @@ protected OvsTunnelInterfaceVO createInterfaceRecord(String ip,
}

private String handleFetchInterfaceAnswer(Answer[] answers, Long hostId) {
OvsFetchInterfaceAnswer ans = (OvsFetchInterfaceAnswer)answers[0];
if (answers == null || answers.length == 0 || answers[0] == null) {
logger.warn("No answer returned for OvsFetchInterfaceCommand from host " + hostId);
return null;
}

Answer answer = answers[0];

if (!(answer instanceof OvsFetchInterfaceAnswer)) {
logger.warn("Expected OvsFetchInterfaceAnswer from host " + hostId +
" but got " + answer.getClass().getSimpleName() +
" with details: " + answer.getDetails());
return null;
}

OvsFetchInterfaceAnswer ans = (OvsFetchInterfaceAnswer) answer;

if (ans.getResult()) {
if (ans.getIp() != null && !("".equals(ans.getIp()))) {
if (ans.getIp() != null && !ans.getIp().isEmpty()) {
OvsTunnelInterfaceVO ti = createInterfaceRecord(ans.getIp(),
ans.getNetmask(), ans.getMac(), hostId, ans.getLabel());
ans.getNetmask(), ans.getMac(), hostId, ans.getLabel());
return ti.getIp();
}
}
// Fetch interface failed!
logger.warn("Unable to fetch the IP address for the GRE tunnel endpoint"
+ ans.getDetails());

logger.warn("Unable to fetch the IP address for the GRE tunnel endpoint: " + ans.getDetails());
return null;
}

Expand Down
Loading