summaryrefslogtreecommitdiffstats
path: root/v3po
diff options
context:
space:
mode:
authorHongjun Ni <hongjun.ni@intel.com>2016-06-12 19:03:40 +0800
committerMaros Marsalek <mmarsale@cisco.com>2016-06-14 08:08:58 +0000
commit200f683edd581b3dc980ed09af824b716a49bb67 (patch)
treee0c8c65c5a6e88da4703de41f5d82406cffd2662 /v3po
parenta4f9e9186c7399360c8abe9cabe0e0d110f22138 (diff)
Fix Vxlan-gpe interface state from VPP
PatchSet 2: consolidate review comments. Change-Id: I50e0dc1c8acff0f22dad80ed5aa547e95728081a Signed-off-by: Hongjun Ni <hongjun.ni@intel.com>
Diffstat (limited to 'v3po')
-rw-r--r--v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/InterfaceUtils.java2
-rw-r--r--v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/InterfaceUtilsTest.java2
-rw-r--r--v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/VxlanGpeCustomizerTest.java4
3 files changed, 4 insertions, 4 deletions
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 24a1b4ab5..a2c14fe04 100644
--- 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 cdcab8da4..0f45f1c83 100644
--- 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 7c96a03e9..863951fad 100644
--- 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);