check for BroadcastDomainTypes on sourceNatIp

DaanHoogland · DaanHoogland · commit 6d0dbf59683e · 2014-01-06T22:13:51.000+01:00
diff --git a/api/test/com/cloud/network/NetworksTest.java b/api/test/com/cloud/network/NetworksTest.java
@@ -22,6 +22,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
+import com.cloud.dc.Vlan;
 import com.cloud.network.Networks.BroadcastDomainType;
 import com.cloud.network.Networks.IsolationType;
 import com.cloud.utils.exception.CloudRuntimeException;
@@ -55,6 +56,20 @@ public void vlanBroadcastDomainTypeTest() throws URISyntaxException {
         Assert.assertEquals("id2 should be \"2\"", "2", id2);
     }
 
+    @Test
+    public void vlanValueTest() throws URISyntaxException {
+        String uri1 = "vlan://1";
+        String uri2 = "1";
+        String vtag = BroadcastDomainType.Vlan.getValueFrom(BroadcastDomainType.fromString(uri1));
+        Assert.assertEquals("vtag should be \"1\"", "1", vtag);
+        BroadcastDomainType tiep1 = BroadcastDomainType.getTypeOf(uri1);
+        Assert.assertEquals("the type of uri1 should be 'Vlan'", BroadcastDomainType.Vlan, tiep1);
+        BroadcastDomainType tiep2 = BroadcastDomainType.getTypeOf(uri2);
+        Assert.assertEquals("the type of uri1 should be 'Undecided'", BroadcastDomainType.UnDecided, tiep2);
+        BroadcastDomainType tiep3 = BroadcastDomainType.getTypeOf(Vlan.UNTAGGED);
+        Assert.assertEquals("the type of uri1 should be 'vlan'", BroadcastDomainType.Native, tiep3);
+    }
+
     @Test
     public void vlanIsolationTypeTest() throws URISyntaxException {
         String uri1 = "vlan://1";
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
@@ -16,6 +16,7 @@
 // under the License.
 package com.cloud.network.element;
 
+import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -247,13 +248,18 @@ public boolean implement(Network network, NetworkOffering offering, DeployDestin
             String internalCidr = network.getGateway() + "/" + network.getCidr().split("/")[1];
             // assuming a vlan:
             String vtag = sourceNatIp.getVlanTag();
-            BroadcastDomainType tiep = BroadcastDomainType.toEnumValue(vtag);
+            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) {
+            } 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(sourceNatIp.getVlanTag())) ? 0 : Long.parseLong(vtag);
+            long vlanid = (Vlan.UNTAGGED.equals(vtag)) ? 0 : Long.parseLong(vtag);
 
             CreateLogicalRouterCommand cmd =
                 new CreateLogicalRouterCommand(niciraNvpHost.getDetail("l3gatewayserviceuuid"), vlanid, BroadcastDomainType.getValue(network.getBroadcastUri()),
