Skip to content

server: fix fail to list public ips of shared networks sometimes #8624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DaanHoogland merged 8 commits into from
Jun 4, 2024
Merged

server: fix fail to list public ips of shared networks sometimes #8624

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1a5f3e5
server: fix fail to list public ips of shared networks sometimes
weizhouapache Feb 7, 2024
c426a19
Update server/src/main/java/com/cloud/api/ApiResponseHelper.java
weizhouapache Feb 9, 2024
9855c1c
Update PR#8624: change return type of Nic.getInstanceId from long to …
weizhouapache Feb 12, 2024
89cb8a4
Update PR#8624: fix Nic is not a nic on VM
weizhouapache Apr 25, 2024
8a36740
Merge remote-tracking branch 'apache/4.19' into 4.19-fix-list-public-…
weizhouapache Apr 25, 2024
71efef6
Merge remote-tracking branch 'apache/4.19' into 4.19-fix-list-public-…
weizhouapache May 22, 2024
e9a02ef
Revert all changes
weizhouapache May 22, 2024
4f6ed22
Update 8624: new fix
weizhouapache May 22, 2024
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
6 changes: 6 additions & 0 deletions server/src/main/java/com/cloud/api/ApiResponseHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -992,6 +992,12 @@ private void addSystemVmInfoToIpResponse(NicVO nic, IPAddressResponse ipResponse
if (!isAdmin) {
return;
}
try {
nic.getInstanceId();
} catch (NullPointerException ex) {
return;
}

VirtualMachine vm = ApiDBUtils.findVMInstanceById(nic.getInstanceId());
if (vm == null) {
return;
Expand Down