diff options
author | Jan Srnicek <jsrnicek@cisco.com> | 2017-06-01 07:57:49 +0200 |
---|---|---|
committer | Marek Gradzki <mgradzki@cisco.com> | 2017-06-08 06:22:41 +0000 |
commit | 1cbfa68433e3207bcc13f93f0af358ac3957636f (patch) | |
tree | c40a5de26fc1001b7e6f4033fc1d4e71a239899f /v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceCustomizer.java | |
parent | d0fe32e6acaab61b9d21406eaaa8b92db2b86b9e (diff) |
HC2VPP-164 - Interface/SubInterface filtrationstable/1704
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)
Diffstat (limited to 'v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceCustomizer.java')
-rw-r--r-- | v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceCustomizer.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceCustomizer.java index 5a89ab78f..8a6dd667f 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/SubInterfaceCustomizer.java @@ -144,7 +144,7 @@ public class SubInterfaceCustomizer extends FutureJVppCustomizer final List<SubInterfaceKey> interfacesKeys = ifaces.swInterfaceDetails.stream() .filter(elt -> elt != null) // accept only sub-interfaces for current iface: - .filter(elt -> elt.subId != 0 && elt.supSwIfIndex == ifaceId) + .filter(elt -> isSubInterface(elt) && elt.supSwIfIndex == ifaceId) .map(details -> new SubInterfaceKey(new Long(details.subId))) .collect(Collectors.toList()); @@ -175,9 +175,9 @@ public class SubInterfaceCustomizer extends FutureJVppCustomizer interfaceContext.getIndex(subInterfaceName, ctx.getMappingContext()), ctx.getModificationCache(), LOG); LOG.debug("VPP sub-interface details: {}", iface); - checkState(iface.subId != 0, "Interface returned by the VPP is not a sub-interface"); + checkState(isSubInterface(iface), "Interface returned by the VPP is not a sub-interface"); - builder.setIdentifier(Long.valueOf(iface.subId)); + builder.setIdentifier((long) iface.subId); builder.setKey(new SubInterfaceKey(builder.getIdentifier())); // sub-interface-base-attributes: |