cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [1/2] git commit: updated refs/heads/4.5 to abb7e3f
Date Mon, 30 Nov 2015 04:37:59 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.5 0da2736fb -> abb7e3fba


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/2e6c7ce4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2e6c7ce4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2e6c7ce4

Branch: refs/heads/4.5
Commit: 2e6c7ce4c8bc98c51d153a595d757bbcc886a2a6
Parents: e65446c
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:29:21 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/2e6c7ce4/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 093f113..f74a688 100755
--- 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 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