cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From likit...@apache.org
Subject git commit: updated refs/heads/master-6-17-stable to c3d3c62
Date Thu, 20 Jun 2013 06:46:38 GMT
Updated Branches:
  refs/heads/master-6-17-stable fd77b60c5 -> c3d3c62a0


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

Branch: refs/heads/master-6-17-stable
Commit: c3d3c62a01eebac6a5fb4eb88b697882305b8dd2
Parents: fd77b60
Author: Likitha Shetty <likitha.shetty@citrix.com>
Authored: Thu Jun 20 11:53:41 2013 +0530
Committer: Likitha Shetty <likitha.shetty@citrix.com>
Committed: Thu Jun 20 12:12:26 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/c3d3c62a/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");
         }


Mime
View raw message