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 2014/01/29 17:30:25 UTC
git commit: updated refs/heads/4.3-forward to caf17c2
Updated Branches:
refs/heads/4.3-forward ae22d1990 -> caf17c2f4
CLOUDSTACK-5979 vlan parsing fixed
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/caf17c2f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/caf17c2f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/caf17c2f
Branch: refs/heads/4.3-forward
Commit: caf17c2f46bf317ec8966b08aaff728a73fda14a
Parents: ae22d19
Author: Daan Hoogland <dh...@schubergphilis.com>
Authored: Wed Jan 29 17:30:19 2014 +0100
Committer: Daan Hoogland <dh...@schubergphilis.com>
Committed: Wed Jan 29 17:30:19 2014 +0100
----------------------------------------------------------------------
.../com/cloud/network/element/NiciraNvpElement.java | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/caf17c2f/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java b/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
index 3e9e16a..c062abd 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
@@ -259,8 +259,20 @@ NiciraNvpElementService, ResourceStateAdapter, IpDeployer {
+ NetUtils.getCidrSize(sourceNatIp.getVlanNetmask());
String internalCidr = network.getGateway() + "/"
+ network.getCidr().split("/")[1];
- long vlanid = (Vlan.UNTAGGED.equals(sourceNatIp.getVlanTag())) ? 0
- : Long.parseLong(sourceNatIp.getVlanTag());
+ // assuming a vlan:
+ String vtag = sourceNatIp.getVlanTag();
+ BroadcastDomainType tiep = null;
+ try {
+ tiep = BroadcastDomainType.getTypeOf(vtag);
+ } catch (URISyntaxException use) {
+ throw new CloudRuntimeException("vlantag for sourceNatIp is not valid: " + vtag, use);
+ }
+ if (tiep == BroadcastDomainType.Vlan) {
+ vtag = BroadcastDomainType.Vlan.getValueFrom(BroadcastDomainType.fromString(vtag));
+ } else if (!(tiep == BroadcastDomainType.UnDecided || tiep == BroadcastDomainType.Native)) {
+ throw new CloudRuntimeException("only vlans are supported for sourceNatIp, at this moment: " + vtag);
+ }
+ long vlanid = (Vlan.UNTAGGED.equals(vtag)) ? 0 : Long.parseLong(vtag);
CreateLogicalRouterCommand cmd = new CreateLogicalRouterCommand(
niciraNvpHost.getDetail("l3gatewayserviceuuid"), vlanid,