cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject git commit: updated refs/heads/4.3 to aaf3979
Date Fri, 20 Dec 2013 12:32:46 GMT
Updated Branches:
  refs/heads/4.3 8f9396b36 -> aaf3979cf


CLOUDSTACK-5502: interpret vlan='untagged' as vlan == null


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

Branch: refs/heads/4.3
Commit: aaf3979cf92518d3dc5587ea0192f4b3ce1e7866
Parents: 8f9396b
Author: Daan Hoogland <daan@onecht.net>
Authored: Fri Dec 20 13:31:25 2013 +0100
Committer: Daan Hoogland <daan@onecht.net>
Committed: Fri Dec 20 13:31:25 2013 +0100

----------------------------------------------------------------------
 .../src/com/cloud/configuration/ConfigurationManagerImpl.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aaf3979c/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index fd0c2dd..5781102 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -36,8 +36,6 @@ import javax.ejb.Local;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
-import com.cloud.deploy.DeploymentClusterPlanner;
-import org.apache.cloudstack.framework.config.ConfigDepot;
 import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.acl.SecurityChecker;
@@ -71,6 +69,7 @@ import org.apache.cloudstack.config.Configuration;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
+import org.apache.cloudstack.framework.config.ConfigDepot;
 import org.apache.cloudstack.framework.config.ConfigKey;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
 import org.apache.cloudstack.framework.config.impl.ConfigurationVO;
@@ -119,7 +118,7 @@ import com.cloud.dc.dao.HostPodDao;
 import com.cloud.dc.dao.PodVlanMapDao;
 import com.cloud.dc.dao.VlanDao;
 import com.cloud.deploy.DataCenterDeployment;
-import com.cloud.deploy.DeploymentPlanner;
+import com.cloud.deploy.DeploymentClusterPlanner;
 import com.cloud.domain.Domain;
 import com.cloud.domain.DomainVO;
 import com.cloud.domain.dao.DomainDao;
@@ -2472,6 +2471,8 @@ ConfigurationManagerImpl extends ManagerBase implements ConfigurationManager,
Co
         String newVlanNetmask = cmd.getNetmask();
         String vlanId = cmd.getVlan();
         // TODO decide if we should be forgiving or demand a valid and complete URI
+        if(Vlan.UNTAGGED.equalsIgnoreCase(vlanId))
+            vlanId = null;
         if (!((vlanId == null)
                 || ("".equals(vlanId))
                 || vlanId.startsWith(BroadcastDomainType.Vlan.scheme())))


Mime
View raw message