From 99db0d333b6e7b101fb55c759f5a4ac028ee0d0b Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Mon, 2 Jul 2018 13:09:26 +0200 Subject: HC2VPP-346: use fib-table-list-ref for VXLAN configuration User is required to explicitly configure FIB tables using vpp-fib-management module. The change does not require modification of RESTCONF and NETCONF requests. Change-Id: Ie3cbff61281ba1a7a9e14c0a26cbd9ce6e44587f Signed-off-by: Marek Gradzki --- .../main/java/io/fd/hc2vpp/v3po/interfaces/VxlanCustomizer.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/VxlanCustomizer.java') diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/VxlanCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/VxlanCustomizer.java index f21b0198f..97d300385 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/VxlanCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/VxlanCustomizer.java @@ -87,7 +87,9 @@ public class VxlanCustomizer extends AbstractInterfaceTypeCustomizer impl final InetAddress srcAddress = InetAddresses.forString(getAddressString(vxlan.getSrc())); final InetAddress dstAddress = InetAddresses.forString(getAddressString(vxlan.getDst())); - int encapVrfId = vxlan.getEncapVrfId().intValue(); + checkArgument(vxlan.getEncapVrfId() != null && vxlan.getEncapVrfId().getValue() != null, + "encap-vrf-id is mandatory but was not given"); + int encapVrfId = vxlan.getEncapVrfId().getValue().intValue(); int vni = vxlan.getVni().getValue().intValue(); int decapNext = -1; @@ -157,7 +159,9 @@ public class VxlanCustomizer extends AbstractInterfaceTypeCustomizer impl final InetAddress srcAddress = InetAddresses.forString(getAddressString(vxlan.getSrc())); final InetAddress dstAddress = InetAddresses.forString(getAddressString(vxlan.getDst())); - int encapVrfId = vxlan.getEncapVrfId().intValue(); + checkArgument(vxlan.getEncapVrfId() != null && vxlan.getEncapVrfId().getValue() != null, + "encap-vrf-id is mandatory but was not given"); + int encapVrfId = vxlan.getEncapVrfId().getValue().intValue(); int vni = vxlan.getVni().getValue().intValue(); int decapNext = -1; -- cgit 1.2.3-korg