Skip to content

server: fix cannot get systemvm ips in dedicated ranges #7144

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
weizhouapache merged 5 commits into from
Aug 25, 2023
Merged

server: fix cannot get systemvm ips in dedicated ranges #7144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
44ef7ec
server: fix cannot get systemvm ips in dedicated ranges (Issue 6698)
weizhouapache Jan 30, 2023
37d28d4
server: refactoring fetchNewPublicIp and listAvailablePublicIps (issu…
weizhouapache Jan 30, 2023
b15b539
Update 7144: fix test_public_ip_range.py
weizhouapache Jan 30, 2023
ec58f78
Update 7144: fix ip allocation in shared networks
weizhouapache Jan 31, 2023
43cd1c4
server: dedicated systemvm ip range to ROOT domain should fail
weizhouapache Jan 31, 2023
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
2 changes: 1 addition & 1 deletion 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 @@ -855,7 +855,7 @@ public VlanIpRangeResponse createVlanIpRangeResponse(Class<? extends VlanIpRange
Long networkId = vlan.getNetworkId();
if (networkId != null) {
Network network = _ntwkModel.getNetwork(networkId);
if (network != null) {
if (network != null && TrafficType.Guest.equals(network.getTrafficType())) {
Long accountId = network.getAccountId();
populateAccount(vlanResponse, accountId);
populateDomain(vlanResponse, ApiDBUtils.findAccountById(accountId).getDomainId());
Expand Down
8 changes: 4 additions & 4 deletions server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5318,10 +5318,11 @@ public Vlan dedicatePublicIpRange(final DedicatePublicIpRangeCmd cmd) throws Res

// Check if any of the Public IP addresses is allocated to another
// account
boolean forSystemVms = false;
final List<IPAddressVO> ips = _publicIpAddressDao.listByVlanId(vlanDbId);
for (final IPAddressVO ip : ips) {
forSystemVms = ip.isForSystemVms();
if (ip.isForSystemVms()) {
throw new InvalidParameterValueException(ip.getAddress() + " Public IP address in range is dedicated to system vms ");
}
final Long allocatedToAccountId = ip.getAllocatedToAccountId();
if (allocatedToAccountId != null) {
if (vlanOwner != null && allocatedToAccountId != vlanOwner.getId()) {
Expand All @@ -5346,7 +5347,7 @@ public Vlan dedicatePublicIpRange(final DedicatePublicIpRangeCmd cmd) throws Res
UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NET_IP_ASSIGN, vlanOwner.getId(), ip.getDataCenterId(), ip.getId(), ip.getAddress().toString(), ip.isSourceNat(),
vlan.getVlanType().toString(), ip.getSystem(), usageHidden, ip.getClass().getName(), ip.getUuid());
}
} else if (domain != null && !forSystemVms) {
} else if (domain != null) {
// Create an DomainVlanMapVO entry
DomainVlanMapVO domainVlanMapVO = new DomainVlanMapVO(domain.getId(), vlan.getId());
_domainVlanMapDao.persist(domainVlanMapVO);
Expand Down Expand Up @@ -7164,7 +7165,6 @@ public Account getVlanAccount(final long vlanId) {
@Override
public Domain getVlanDomain(long vlanId) {
Vlan vlan = _vlanDao.findById(vlanId);
Long domainId = null;

// if vlan is Virtual Domain specific, get vlan information from the
// accountVlanMap; otherwise get account information
Expand Down
Loading