Skip to content

Commit 5447950

Browse files
authored
Allow creation of Shared Networks without IP range if network offering has no services - specifyvlan = true (#10168)
1 parent fbb1ff7 commit 5447950

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import java.util.HashSet;
3535
import java.util.List;
3636
import java.util.Map;
37+
import java.util.Objects;
3738
import java.util.Set;
3839
import java.util.UUID;
3940

@@ -1634,6 +1635,10 @@ public Network createGuestNetwork(CreateNetworkCmd cmd) throws InsufficientCapac
16341635
throwInvalidIdException("Network offering with specified id doesn't support adding multiple ip ranges", ntwkOff.getUuid(), NETWORK_OFFERING_ID);
16351636
}
16361637

1638+
if (GuestType.Shared == ntwkOff.getGuestType() && !ntwkOff.isSpecifyVlan() && Objects.isNull(associatedNetworkId)) {
1639+
throw new CloudRuntimeException("Associated network must be provided when creating Shared networks when specifyVlan is false");
1640+
}
1641+
16371642
Pair<Integer, Integer> interfaceMTUs = validateMtuConfig(publicMtu, privateMtu, zone.getId());
16381643
mtuCheckForVpcNetwork(vpcId, interfaceMTUs, publicMtu, privateMtu);
16391644

0 commit comments

Comments
 (0)