cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [04/10] git commit: updated refs/heads/master to 7e64c12
Date Sun, 29 Nov 2015 21:07:39 GMT
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.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d0989855
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d0989855
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d0989855

Branch: refs/heads/master
Commit: d09898553e8a7722f82866367923bc8cedc62829
Parents: 3f7a86d
Author: Abhinandan Prateek <abhinandan.prateek@shapeblue.com>
Authored: Tue Nov 24 13:29:59 2015 +0530
Committer: Abhinandan Prateek <abhinandan.prateek@shapeblue.com>
Committed: Wed Nov 25 10:22:24 2015 +0530

----------------------------------------------------------------------
 .../cloudstack/engine/orchestration/NetworkOrchestrator.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d0989855/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
index e60e346..a3ae526 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
@@ -1949,7 +1949,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
             } 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);
                 }
             }


Mime
View raw message