You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2013/12/20 13:48:05 UTC
git commit: updated refs/heads/master to 7b0c85d
Updated Branches:
refs/heads/master 50a428c3a -> 7b0c85da3
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/7b0c85da
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7b0c85da
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7b0c85da
Branch: refs/heads/master
Commit: 7b0c85da3c30c3111f55cda0582e1e2e3ab7a86e
Parents: 50a428c
Author: Daan Hoogland <da...@onecht.net>
Authored: Fri Dec 20 13:31:25 2013 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Fri Dec 20 13:46:58 2013 +0100
----------------------------------------------------------------------
server/src/com/cloud/configuration/ConfigurationManagerImpl.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b0c85da/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 2f5704b..645c31a 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -2378,6 +2378,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
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())))
vlanId = BroadcastDomainType.Vlan.toUri(vlanId).toString();
Boolean forVirtualNetwork = cmd.isForVirtualNetwork();