Skip to content

Commit fe0dc3f

Browse files
remibergsmaremibergsma
committed
Merge pull request apache#1116 from shapeblue/4.6-9064
CLOUDSTACK-9064: The users should be able to create multiple Guest Shhttps://issues.apache.org/jira/browse/CLOUDSTACK-9064 CLOUDSTACK-9064: The users should be able to create multiple Guest Shared Networks in same Vlan ID, same Physical Network and same network, just with a different IP ranges. * pr/1116: CLOUDSTACK-9064: The users should be able to create multiple Guest Shared Networks in same Vlan ID, same Physical Network and same network, just with a different IP ranges. Signed-off-by: Remi Bergsma <[email protected]>
2 parents a44e0b7 + d098985 commit fe0dc3f

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

‎engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1949,7 +1949,7 @@ public Network createGuestNetwork(long networkOfferingId, final String name, fin
19491949
} else {
19501950
// don't allow to creating shared network with given Vlan ID, if there already exists a isolated network or
19511951
// shared network with same Vlan ID in the zone
1952-
if (_networksDao.countByZoneUriAndGuestType(zoneId, uri, GuestType.Isolated) > 0 || _networksDao.countByZoneUriAndGuestType(zoneId, uri, GuestType.Shared) > 0) {
1952+
if (_networksDao.countByZoneUriAndGuestType(zoneId, uri, GuestType.Isolated) > 0 ) {
19531953
throw new InvalidParameterValueException("There is a isolated/shared network with vlan id: " + vlanId + " already exists " + "in zone " + zoneId);
19541954
}
19551955
}

0 commit comments

Comments
 (0)