etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

server: fix NPE in travis and merge #6305 (#6303) 

* server: fix NPE in travis

* Fix travis test failures

Co-authored-by: Pearl Dsilva <pearl1594@gmail.com>
This commit is contained in:
Wei Zhou 2022-04-22 16:52:07 +02:00 committed by GitHub
parent 4525f8c8e7
commit 293517ad72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/main/java/com/cloud/api/ApiServer.java
View File

@ -668,7 +668,7 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer
private String getBaseAsyncResponse(final long jobId, final BaseAsyncCmd cmd) {
final AsyncJobResponse response = new AsyncJobResponse();
final AsyncJob job = entityMgr.findById(AsyncJob.class, jobId);
final AsyncJob job = entityMgr.findByIdIncludingRemoved(AsyncJob.class, jobId);
response.setJobId(job.getUuid());
response.setResponseName(cmd.getCommandName());
return ApiResponseSerializer.toSerializedString(response, cmd.getResponseType());
@ -676,7 +676,7 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer
private String getBaseAsyncCreateResponse(final long jobId, final BaseAsyncCreateCmd cmd, final String objectUuid) {
final CreateCmdResponse response = new CreateCmdResponse();
final AsyncJob job = entityMgr.findById(AsyncJob.class, jobId);
final AsyncJob job = entityMgr.findByIdIncludingRemoved(AsyncJob.class, jobId);
response.setJobId(job.getUuid());
response.setId(objectUuid);
response.setResponseName(cmd.getCommandName());

5
server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java
View File

@ -279,12 +279,15 @@ public class NetworkHelperImpl implements NetworkHelper {
}
final long dcid = router.getDataCenterId();
String routerVersion = CloudStackVersion.trimRouterVersion(router.getTemplateVersion());
String currentCheckSum = ChecksumUtil.calculateCurrentChecksum(router.getName(), "vms/cloud-scripts.tgz");
String routerChecksum = router.getScriptsVersion() == null ? "" : router.getScriptsVersion();
boolean routerVersionMatch = CloudStackVersion.compare(routerVersion, NetworkOrchestrationService.MinVRVersion.valueIn(dcid)) >= 0;
if (routerVersionMatch) {
return true;
}
if (HypervisorType.Simulator.equals(router.getHypervisorType())) {
return true;
}
String currentCheckSum = ChecksumUtil.calculateCurrentChecksum(router.getName(), "vms/cloud-scripts.tgz");
boolean routerCheckSumMatch = currentCheckSum.equals(routerChecksum);
return routerCheckSumMatch;
}