Skip to content

fixed inconsistency of IP on VR when VR is destroyed and recrea… #3825

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 3 commits into from
Jan 23, 2020
+4 −0
Merged

fixed inconsistency of IP on VR when VR is destroyed and recrea… #3825

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dbeb345
fixed inconsistency of IP on VR when VR is destroyed and recreated (s…
Jan 21, 2020
2f395ae
Update NetworkModelImpl.java
Pearl1594 Jan 21, 2020
a3946b2
removed training spaces
Jan 22, 2020
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
4 changes: 4 additions & 0 deletions server/src/main/java/com/cloud/network/NetworkModelImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2298,6 +2298,10 @@ public NicVO getPlaceholderNicForRouter(Network network, Long podId) {
} else {
ipv6 = _ipv6Dao.findByNetworkIdAndIp(network.getId(), nic.getIPv6Address());
}

if (vlans.isEmpty()) {
return nic;
}
//return nic only when its ip address belong to the pod range (for the Basic zone case)
for (Vlan vlan : vlans) {
if (ip != null && ip.getVlanId() == vlan.getId()) {
Expand Down