Fix Vxlan-gpe interface state from VPP

PatchSet 2: consolidate review comments.

Change-Id: I50e0dc1c8acff0f22dad80ed5aa547e95728081a
Signed-off-by: Hongjun Ni <hongjun.ni@intel.com>

diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/InterfaceUtils.java b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/InterfaceUtils.java
index 24a1b4a..a2c14fe 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/InterfaceUtils.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/InterfaceUtils.java
@@ -233,7 +233,7 @@ public final class InterfaceUtils {
             return Tap.class;
         }
 
-        if (interfaceName.startsWith("vxlanGpe")) {
+        if (interfaceName.startsWith("vxlan_gpe")) {
             return VxlanGpeTunnel.class;
         }
 

diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/InterfaceUtilsTest.java b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/InterfaceUtilsTest.java
index cdcab8d..0f45f1c 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/InterfaceUtilsTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/InterfaceUtilsTest.java
@@ -47,7 +47,7 @@ public class InterfaceUtilsTest {
     public void testGetInterfaceType() {
         assertEquals(Tap.class, InterfaceUtils.getInterfaceType("tap0"));
         assertEquals(VxlanTunnel.class, InterfaceUtils.getInterfaceType("vxlan0"));
-        assertEquals(VxlanGpeTunnel.class, InterfaceUtils.getInterfaceType("vxlanGpe0"));
+        assertEquals(VxlanGpeTunnel.class, InterfaceUtils.getInterfaceType("vxlan_gpe0"));
         assertEquals(VhostUser.class, InterfaceUtils.getInterfaceType("VirtualEthernet0/0/0"));
         assertEquals(EthernetCsmacd.class, InterfaceUtils.getInterfaceType("eth0.0"));
         assertEquals(EthernetCsmacd.class, InterfaceUtils.getInterfaceType("local0"));

diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/VxlanGpeCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/VxlanGpeCustomizerTest.java
index 7c96a03..863951f 100644 (file)
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/VxlanGpeCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/VxlanGpeCustomizerTest.java
@@ -62,11 +62,11 @@ public class VxlanGpeCustomizerTest extends ChildReaderCustomizerTest<VxlanGpe,
 
     @Override
     public void setUpBefore() {
-        interfacesContext = new NamingContext("vxlanGpe-tunnel", "test-instance");
+        interfacesContext = new NamingContext("vxlan_gpe_inf", "test-instance");
         doReturn(getMapping("ifc2", 0)).when(mappingContext).read(getMappingIid("ifc2", "test-instance"));
 
         final SwInterfaceDetails v = new SwInterfaceDetails();
-        v.interfaceName = "vxlanGpe-tunnel2".getBytes();
+        v.interfaceName = "vxlan_gpe_inf2".getBytes();
         final Map<Integer, SwInterfaceDetails> map = new HashMap<>();
         map.put(0, v);
         cache.put(InterfaceCustomizer.DUMPED_IFCS_CONTEXT_KEY, map);