From 1cbfa68433e3207bcc13f93f0af358ac3957636f Mon Sep 17 00:00:00 2001
From: Jan Srnicek <jsrnicek@cisco.com>
Date: Thu, 1 Jun 2017 07:57:49 +0200
Subject: HC2VPP-164 - Interface/SubInterface filtration

Filtration cannot be done by subId ,because 0 is allowed value

Change-Id: Ic89e30cb74943b6a4c9c995f032bd22567c5ad1e
Signed-off-by: Jan Srnicek <jsrnicek@cisco.com>
(cherry picked from commit c9052815f89fff314d8f6b67fcd62b707d827611)
---
 .../io/fd/hc2vpp/v3po/interfacesstate/InterfaceCustomizerTest.java     | 2 ++
 .../java/io/fd/hc2vpp/v3po/interfacesstate/RewriteCustomizerTest.java  | 2 ++
 .../io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceCustomizerTest.java  | 3 ++-
 3 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po')

diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceCustomizerTest.java
index 295805114..2f8a30b84 100644
--- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceCustomizerTest.java
@@ -155,9 +155,11 @@ public class InterfaceCustomizerTest extends ListReaderCustomizerTest<Interface,
 
         final SwInterfaceDetails swIf0 = new SwInterfaceDetails();
         swIf0.swIfIndex = 0;
+        swIf0.supSwIfIndex = 0;
         swIf0.interfaceName = IFACE0_NAME.getBytes();
         final SwInterfaceDetails swIf1 = new SwInterfaceDetails();
         swIf1.swIfIndex = 1;
+        swIf1.supSwIfIndex = 1;
         swIf1.interfaceName = IFACE1_NAME.getBytes();
         final SwInterfaceDetails swSubIf1 = new SwInterfaceDetails();
         swSubIf1.swIfIndex = 2;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/RewriteCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/RewriteCustomizerTest.java
index faee7322e..c9379a9cd 100644
--- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/RewriteCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/RewriteCustomizerTest.java
@@ -97,6 +97,8 @@ public class RewriteCustomizerTest extends ReaderCustomizerTest<Rewrite, Rewrite
         ifaceDetails.vtrTag1 = 123;
         ifaceDetails.vtrTag2 = 321;
         ifaceDetails.vtrPushDot1Q = 1;
+        ifaceDetails.swIfIndex= VLAN_IF_INDEX;
+        ifaceDetails.supSwIfIndex = 2;
         cachedInterfaceDump.put(VLAN_IF_INDEX, ifaceDetails);
         cache.put(InterfaceCustomizer.DUMPED_IFCS_CONTEXT_KEY, cachedInterfaceDump);
 
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceCustomizerTest.java
index 0493b7504..aee1616f3 100644
--- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceCustomizerTest.java
@@ -87,7 +87,8 @@ public class SubInterfaceCustomizerTest extends ListReaderCustomizerTest<SubInte
         final SwInterfaceDetails ifaceDetails = new SwInterfaceDetails();
         ifaceDetails.subId = VLAN_IF_ID;
         ifaceDetails.interfaceName = VLAN_IF_NAME.getBytes();
-        ifaceDetails.subDot1Ad = 1;
+        ifaceDetails.swIfIndex = 2;
+        ifaceDetails.supSwIfIndex = SUPER_IF_INDEX;
         defineMapping(mappingContext, SUPER_IF_NAME, SUPER_IF_INDEX, IFC_CTX_NAME);
         defineMapping(mappingContext, VLAN_IF_NAME, VLAN_IF_INDEX, IFC_CTX_NAME);
         ifaceDetails.subNumberOfTags = 2;
-- 
cgit 1.2.3-korg