diff options
author | Michal Cmarada <mcmarada@cisco.com> | 2018-09-28 10:54:43 +0200 |
---|---|---|
committer | Michal Cmarada <mcmarada@cisco.com> | 2018-09-28 09:12:43 +0000 |
commit | 9b0967210e3e50d0b52475cfc02e636dbfa28421 (patch) | |
tree | 48d72d6c706ccbd6a869e511d5af6912419d5dbe /v3po/v3po2vpp/src/test | |
parent | e57a01e46900614558c869dd21f810fab9877982 (diff) |
Fix v3po interface type
VPP introduced new flag for interfaces: portType
(see https://gerrit.fd.io/r/#/c/14689/)
This caused API changes and introduced new port types:
- Normal
- BVI
- Unknown unicast (not supported by HC2VPP yet - HC2VPP-389)
This patch fixes the current implementation for normal and BVI interface.
Change-Id: I271aaab9887e3759fa90d9056bafe550c867761d
Signed-off-by: Michal Cmarada <mcmarada@cisco.com>
Diffstat (limited to 'v3po/v3po2vpp/src/test')
-rw-r--r-- | v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/L2CustomizerTest.java | 3 | ||||
-rw-r--r-- | v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceL2CustomizerTest.java | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/L2CustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/L2CustomizerTest.java index c37341c19..bd7ced739 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/L2CustomizerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/L2CustomizerTest.java @@ -31,6 +31,7 @@ import io.fd.vpp.jvpp.core.dto.SwInterfaceSetL2Bridge; import io.fd.vpp.jvpp.core.dto.SwInterfaceSetL2BridgeReply; import io.fd.vpp.jvpp.core.dto.SwInterfaceSetL2Xconnect; import io.fd.vpp.jvpp.core.dto.SwInterfaceSetL2XconnectReply; +import io.fd.vpp.jvpp.core.types.L2PortType; import org.junit.Test; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface; @@ -137,7 +138,7 @@ public class L2CustomizerTest extends WriterCustomizerTest implements ByteDataTr final SwInterfaceSetL2Bridge request = new SwInterfaceSetL2Bridge(); request.bdId = BD_INDEX; request.rxSwIfIndex = IF1_INDEX; - request.bvi = booleanToByte(bvi); + request.portType = bvi ? L2PortType.L2_API_PORT_TYPE_BVI : L2PortType.L2_API_PORT_TYPE_NORMAL; request.enable = booleanToByte(enable); request.shg = 123; return request; diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceL2CustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceL2CustomizerTest.java index 7c5caefa1..31567e04d 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceL2CustomizerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceL2CustomizerTest.java @@ -26,6 +26,7 @@ import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteFailedException; import io.fd.vpp.jvpp.core.dto.SwInterfaceSetL2Bridge; import io.fd.vpp.jvpp.core.dto.SwInterfaceSetL2BridgeReply; +import io.fd.vpp.jvpp.core.types.L2PortType; import org.junit.Test; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface; @@ -101,7 +102,7 @@ public class SubInterfaceL2CustomizerTest extends WriterCustomizerTest implement final SwInterfaceSetL2Bridge request = new SwInterfaceSetL2Bridge(); request.bdId = BD_INDEX; request.rxSwIfIndex = SUBIF_INDEX; - request.bvi = booleanToByte(bvi); + request.portType = bvi ? L2PortType.L2_API_PORT_TYPE_BVI : L2PortType.L2_API_PORT_TYPE_NORMAL; request.enable = booleanToByte(enable); request.shg = 123; return request; |