Merge pull request apache#1117 from shapeblue/4.5-9064

rohityadavcloud · rohityadavcloud · commit abb7e3fba308 · 2015-11-30T10:07:45.000+05:30
CLOUDSTACK-9064: The users should be able to create multiple Guest Sh https://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/1117: 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: Rohit Yadav <rohit.yadav@shapeblue.com>
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
@@ -1944,7 +1944,7 @@ public Network createGuestNetwork(long networkOfferingId, final String name, fin
             } else {
                 // don't allow to creating shared network with given Vlan ID, if there already exists a isolated network or
                 // shared network with same Vlan ID in the zone
-                if (_networksDao.countByZoneUriAndGuestType(zoneId, uri, GuestType.Isolated) > 0 || _networksDao.countByZoneUriAndGuestType(zoneId, uri, GuestType.Shared) > 0) {
+                if (_networksDao.countByZoneUriAndGuestType(zoneId, uri, GuestType.Isolated) > 0 ) {
                     throw new InvalidParameterValueException("There is a isolated/shared network with vlan id: " + vlanId + " already exists " + "in zone " + zoneId);
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -1944,7 +1944,7 @@ public Network createGuestNetwork(long networkOfferingId, final String name, fin`
`1944`	`1944`	`} else {`
`1945`	`1945`	`// don't allow to creating shared network with given Vlan ID, if there already exists a isolated network or`
`1946`	`1946`	`// shared network with same Vlan ID in the zone`
`1947`		`- if (_networksDao.countByZoneUriAndGuestType(zoneId, uri, GuestType.Isolated) > 0 \|\| _networksDao.countByZoneUriAndGuestType(zoneId, uri, GuestType.Shared) > 0) {`
	`1947`	`+ if (_networksDao.countByZoneUriAndGuestType(zoneId, uri, GuestType.Isolated) > 0 ) {`
`1948`	`1948`	`throw new InvalidParameterValueException("There is a isolated/shared network with vlan id: " + vlanId + " already exists " + "in zone " + zoneId);`
`1949`	`1949`	`}`
`1950`	`1950`	`}`