Skip to content
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

Allow creation of Shared Networks without IP range if network offering has no services - specifyvlan = true #10168

Merged
merged 5 commits into from
Jan 31, 2025
Merged

Allow creation of Shared Networks without IP range if network offering has no services - specifyvlan = true #10168

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
524fff4
Add checks if IP range is passed if Shared Network
Pearl1594 Jan 8, 2025
bf7ae51
Merge branch '4.19' of https://github.com/apache/cloudstack into add-…
Pearl1594 Jan 27, 2025
13a5ad8
fix missing import
Pearl1594 Jan 27, 2025
9ea0eb0
fix log statement
Pearl1594 Jan 27, 2025
665283a
Check if associated networkId is passed when specify vlan is false
Pearl1594 Jan 28, 2025
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
13 changes: 13 additions & 0 deletions server/src/main/java/com/cloud/network/NetworkServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.UUID;

Expand Down Expand Up @@ -1634,6 +1635,18 @@
throwInvalidIdException("Network offering with specified id doesn't support adding multiple ip ranges", ntwkOff.getUuid(), NETWORK_OFFERING_ID);
}

if (GuestType.Shared == ntwkOff.getGuestType()) {
if (!ntwkOff.isSpecifyIpRanges()) {
throw new CloudRuntimeException("The 'specifyipranges' parameter should be true for Shared Networks");

Check warning on line 1640 in server/src/main/java/com/cloud/network/NetworkServiceImpl.java

View check run for this annotation

Codecov / codecov/patch

server/src/main/java/com/cloud/network/NetworkServiceImpl.java#L1640 

Added line #L1640 was not covered by tests
}
if (ipv4 && Objects.isNull(startIP)) {
DaanHoogland marked this conversation as resolved.
Show resolved Hide resolved
throw new CloudRuntimeException("IPv4 address range needs to be provided");

Check warning on line 1643 in server/src/main/java/com/cloud/network/NetworkServiceImpl.java

View check run for this annotation

Codecov / codecov/patch

server/src/main/java/com/cloud/network/NetworkServiceImpl.java#L1643 

Added line #L1643 was not covered by tests
}
if (ipv6 && Objects.isNull(startIPv6)) {
throw new CloudRuntimeException("IPv6 address range needs to be provided");

Check warning on line 1646 in server/src/main/java/com/cloud/network/NetworkServiceImpl.java

View check run for this annotation

Codecov / codecov/patch

server/src/main/java/com/cloud/network/NetworkServiceImpl.java#L1646 

Added line #L1646 was not covered by tests
}
}

Pair<Integer, Integer> interfaceMTUs = validateMtuConfig(publicMtu, privateMtu, zone.getId());
mtuCheckForVpcNetwork(vpcId, interfaceMTUs, publicMtu, privateMtu);

Expand Down
Loading