You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by li...@apache.org on 2013/06/20 08:45:01 UTC
git commit: updated refs/heads/master to 4a26067
Updated Branches:
refs/heads/master d3d635021 -> 4a260672e
CLOUDSTACK-3078. Since no default value is set for the isolation type during the physical network creation,
modify guest vlan range dedication to check if the isolation type is VLAN only when an isolation type has been set
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4a260672
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4a260672
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4a260672
Branch: refs/heads/master
Commit: 4a260672e02e3d045da89191691b84b77539e7f9
Parents: d3d6350
Author: Likitha Shetty <li...@citrix.com>
Authored: Thu Jun 20 11:53:41 2013 +0530
Committer: Likitha Shetty <li...@citrix.com>
Committed: Thu Jun 20 12:09:32 2013 +0530
----------------------------------------------------------------------
server/src/com/cloud/network/NetworkServiceImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4a260672/server/src/com/cloud/network/NetworkServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java
index 6796adc..791b288 100755
--- a/server/src/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/com/cloud/network/NetworkServiceImpl.java
@@ -2978,7 +2978,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService {
PhysicalNetworkVO physicalNetwork = _physicalNetworkDao.findById(physicalNetworkId);
if (physicalNetwork == null ) {
throw new InvalidParameterValueException("Unable to find physical network by id " + physicalNetworkId);
- } else if (physicalNetwork.getIsolationMethods() == null || !physicalNetwork.getIsolationMethods().contains("VLAN")) {
+ } else if (physicalNetwork.getIsolationMethods() != null && !physicalNetwork.getIsolationMethods().contains("VLAN")) {
throw new InvalidParameterValueException("Cannot dedicate guest vlan range. " +
"Physical isolation type of network " + physicalNetworkId + " is not VLAN");
}