From f9acfac8b701f9903a28edc98db127c36d73384f Mon Sep 17 00:00:00 2001 From: Michal Cmarada Date: Mon, 12 Nov 2018 13:35:06 +0100 Subject: Bump jvpp version to 19.01-SNAPSHOT Also sets version of VPP package dependencies to 19.01. - fixes several changes made in VPP API Change-Id: Icca406f414bce30745026573c78a69eea09dc566 Signed-off-by: Michal Cmarada --- acl/acl-impl/pom.xml | 2 +- ioam/impl/pom.xml | 4 +-- it/api-coverage/pom.xml | 2 +- it/jvpp-benchmark/pom.xml | 2 +- jvpp/common.sh | 2 +- jvpp/version | 2 +- nat/nat2vpp/pom.xml | 2 +- nsh/impl/pom.xml | 4 +-- packaging/deb/common/vpp_dependencies | 4 +-- packaging/rpm/vpp_dependencies | 4 +-- release-notes/pom.xml | 12 ++++----- .../interfacesstate/InterfaceDataTranslator.java | 31 +++------------------- .../l2/ArpTerminationTableEntryCustomizer.java | 19 +++++++++---- .../l2/ArpTerminationTableEntryCustomizerTest.java | 25 ++++++++++++----- vpp-common/vpp-common-integration/pom.xml | 2 +- vpp-common/vpp-impl-parent/pom.xml | 2 +- vpp-integration/api-docs/core/pom.xml | 2 +- vpp-integration/api-docs/scripts/pom.xml | 2 +- 18 files changed, 61 insertions(+), 62 deletions(-) diff --git a/acl/acl-impl/pom.xml b/acl/acl-impl/pom.xml index 4a742b1e5..6eaccbbc0 100644 --- a/acl/acl-impl/pom.xml +++ b/acl/acl-impl/pom.xml @@ -30,7 +30,7 @@ 1.19.01-SNAPSHOT - 18.10-SNAPSHOT + 19.01-SNAPSHOT diff --git a/ioam/impl/pom.xml b/ioam/impl/pom.xml index 5186c1454..21e7728c1 100644 --- a/ioam/impl/pom.xml +++ b/ioam/impl/pom.xml @@ -30,8 +30,8 @@ bundle - 18.10-SNAPSHOT - 18.10-SNAPSHOT + 19.01-SNAPSHOT + 19.01-SNAPSHOT diff --git a/it/api-coverage/pom.xml b/it/api-coverage/pom.xml index e24e85b36..2538d13ed 100644 --- a/it/api-coverage/pom.xml +++ b/it/api-coverage/pom.xml @@ -32,7 +32,7 @@ ${project.artifactId} - 18.10-SNAPSHOT + 19.01-SNAPSHOT diff --git a/it/jvpp-benchmark/pom.xml b/it/jvpp-benchmark/pom.xml index 0bee9c180..46cf29c50 100644 --- a/it/jvpp-benchmark/pom.xml +++ b/it/jvpp-benchmark/pom.xml @@ -33,7 +33,7 @@ 1.21 - 18.10-SNAPSHOT + 19.01-SNAPSHOT diff --git a/jvpp/common.sh b/jvpp/common.sh index 1f883b161..e71f867fc 100755 --- a/jvpp/common.sh +++ b/jvpp/common.sh @@ -9,7 +9,7 @@ function install_jvpp_jar { jarfile=$1 version=$2 - # Filename (includes version suffix), e.g. jvpp-core-18.10 + # Filename (includes version suffix), e.g. jvpp-core-19.01 basefile=$(basename -s .jar "$jarfile") # Remove version suffix diff --git a/jvpp/version b/jvpp/version index bb00bdef6..12d5e4b0f 100755 --- a/jvpp/version +++ b/jvpp/version @@ -5,4 +5,4 @@ # # Version should match the one used in pom files. # -echo 18.10-SNAPSHOT +echo 19.01-SNAPSHOT diff --git a/nat/nat2vpp/pom.xml b/nat/nat2vpp/pom.xml index 7e417a0e3..aeb31d41d 100644 --- a/nat/nat2vpp/pom.xml +++ b/nat/nat2vpp/pom.xml @@ -53,7 +53,7 @@ io.fd.vpp jvpp-nat - 18.10-SNAPSHOT + 19.01-SNAPSHOT diff --git a/nsh/impl/pom.xml b/nsh/impl/pom.xml index fe0587acc..ec0c19f7b 100644 --- a/nsh/impl/pom.xml +++ b/nsh/impl/pom.xml @@ -81,12 +81,12 @@ io.fd.vpp jvpp-registry - 18.10-SNAPSHOT + 19.01-SNAPSHOT io.fd.vpp jvpp-nsh - 18.10-SNAPSHOT + 19.01-SNAPSHOT io.fd.hc2vpp.common diff --git a/packaging/deb/common/vpp_dependencies b/packaging/deb/common/vpp_dependencies index bb2e3c755..2f599258d 100755 --- a/packaging/deb/common/vpp_dependencies +++ b/packaging/deb/common/vpp_dependencies @@ -1,6 +1,6 @@ #!/bin/bash # defines vpp and vpp-plugins dependencies for debian packages # using range -echo "vpp (>= 18.10), vpp (<< 18.11), vpp-plugins (>= 18.10), vpp-plugins (<< 18.11)" +echo "vpp (>= 19.01), vpp (<< 19.02), vpp-plugins (>= 19.01), vpp-plugins (<< 19.02)" # or specific vpp version -#echo "vpp (= 18.10-rc1), vpp-plugins (= 18.10-rc1)" +#echo "vpp (= 19.01-rc1), vpp-plugins (= 19.01-rc1)" diff --git a/packaging/rpm/vpp_dependencies b/packaging/rpm/vpp_dependencies index 83421efc3..dda10e94a 100755 --- a/packaging/rpm/vpp_dependencies +++ b/packaging/rpm/vpp_dependencies @@ -1,6 +1,6 @@ #!/bin/bash # defines vpp and vpp-plugins dependencies for rpm packages # using range -echo "vpp >= 18.10, vpp < 18.11, vpp-plugins >= 18.10, vpp-plugins < 18.11" +echo "vpp >= 19.01, vpp < 19.02, vpp-plugins >= 19.01, vpp-plugins < 19.02" # or specific vpp version -#echo "vpp = 18.10-rc1, vpp-plugins = 18.10-rc1" +#echo "vpp = 19.01-rc1, vpp-plugins = 19.01-rc1" diff --git a/release-notes/pom.xml b/release-notes/pom.xml index 460356df6..467daa0e4 100644 --- a/release-notes/pom.xml +++ b/release-notes/pom.xml @@ -111,14 +111,14 @@ 11601 master oxygen - 18.10 + 19.01 - - 18.10-SNAPSHOT - 18.10 + + 19.01-SNAPSHOT + 19.01 - - 18.10-SNAPSHOT + + 19.01-SNAPSHOT https://git.fd.io/cgit/hc2vpp/tree https://git.fd.io/cgit/honeycomb/tree diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceDataTranslator.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceDataTranslator.java index 188f83d0f..666fa31fa 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceDataTranslator.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceDataTranslator.java @@ -49,42 +49,19 @@ public interface InterfaceDataTranslator extends ByteDataTranslator, JvppReplyCo InterfaceDataTranslator INSTANCE = new InterfaceDataTranslator() { }; - Gauge64 vppLinkSpeed0 = new Gauge64(BigInteger.ZERO); - Gauge64 vppLinkSpeed1 = new Gauge64(BigInteger.valueOf(10L * 1000000)); - Gauge64 vppLinkSpeed2 = new Gauge64(BigInteger.valueOf(100L * 1000000)); - Gauge64 vppLinkSpeed4 = new Gauge64(BigInteger.valueOf(1000L * 1000000)); - Gauge64 vppLinkSpeed8 = new Gauge64(BigInteger.valueOf(10000L * 1000000)); - Gauge64 vppLinkSpeed16 = new Gauge64(BigInteger.valueOf(40000L * 1000000)); - Gauge64 vppLinkSpeed32 = new Gauge64(BigInteger.valueOf(100000L * 1000000)); - int PHYSICAL_ADDRESS_LENGTH = 6; Collector SINGLE_ITEM_COLLECTOR = RWUtils.singleItemCollector(); /** - * Convert VPP's link speed bitmask to Yang type. 1 = 10M, 2 = 100M, 4 = 1G, 8 = 10G, 16 = 40G, 32 = 100G + * Convert VPP's link speed in kbits per second to Yang type. * - * @param vppLinkSpeed Link speed in bitmask format from VPP. + * @param vppLinkSpeed Link speed in kbits per second from VPP. * @return Converted value from VPP link speed */ - default Gauge64 vppInterfaceSpeedToYang(byte vppLinkSpeed) { - switch (vppLinkSpeed) { - case 1: - return vppLinkSpeed1; - case 2: - return vppLinkSpeed2; - case 4: - return vppLinkSpeed4; - case 8: - return vppLinkSpeed8; - case 16: - return vppLinkSpeed16; - case 32: - return vppLinkSpeed32; - default: - return vppLinkSpeed0; - } + default Gauge64 vppInterfaceSpeedToYang(int vppLinkSpeed) { + return new Gauge64(BigInteger.valueOf(Integer.toUnsignedLong(vppLinkSpeed) * 1000)); } /** diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/l2/ArpTerminationTableEntryCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/l2/ArpTerminationTableEntryCustomizer.java index fc0aba36d..2e13ecc01 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/l2/ArpTerminationTableEntryCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/l2/ArpTerminationTableEntryCustomizer.java @@ -28,6 +28,11 @@ import io.fd.honeycomb.translate.write.WriteFailedException; import io.fd.vpp.jvpp.core.dto.BdIpMacAddDel; import io.fd.vpp.jvpp.core.dto.BdIpMacAddDelReply; import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.vpp.jvpp.core.types.Address; +import io.fd.vpp.jvpp.core.types.AddressFamily; +import io.fd.vpp.jvpp.core.types.AddressUnion; +import io.fd.vpp.jvpp.core.types.Ip4Address; +import io.fd.vpp.jvpp.core.types.MacAddress; import java.util.concurrent.CompletionStage; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressNoZone; @@ -94,12 +99,16 @@ public class ArpTerminationTableEntryCustomizer extends FutureJVppCustomizer final BdIpMacAddDel request = new BdIpMacAddDel(); request.bdId = bdId; request.isAdd = booleanToByte(isAdd); - request.macAddress = parseMac(entry.getPhysAddress().getValue()); - + MacAddress macAddress = new MacAddress(); + macAddress.bytes = parseMac(entry.getPhysAddress().getValue()); + request.mac = macAddress; final IpAddressNoZone ipAddress = entry.getIpAddress(); - - request.ipAddress = ipAddressToArray(ipAddress); - request.isIpv6 = booleanToByte(isIpv6(ipAddress)); + Ip4Address ip4Address = new Ip4Address(); + ip4Address.address = ipAddressToArray(ipAddress); + Address address = new Address(); + address.af = AddressFamily.ADDRESS_IP4; + address.un = new AddressUnion(ip4Address); + request.ip = address; return request; } diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2/ArpTerminationTableEntryCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2/ArpTerminationTableEntryCustomizerTest.java index 86604b465..aba48fd58 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2/ArpTerminationTableEntryCustomizerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2/ArpTerminationTableEntryCustomizerTest.java @@ -32,6 +32,11 @@ import io.fd.vpp.jvpp.VppBaseCallException; import io.fd.vpp.jvpp.VppInvocationException; import io.fd.vpp.jvpp.core.dto.BdIpMacAddDel; import io.fd.vpp.jvpp.core.dto.BdIpMacAddDelReply; +import io.fd.vpp.jvpp.core.types.Address; +import io.fd.vpp.jvpp.core.types.AddressFamily; +import io.fd.vpp.jvpp.core.types.AddressUnion; +import io.fd.vpp.jvpp.core.types.Ip4Address; +import io.fd.vpp.jvpp.core.types.MacAddress; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressNoZone; @@ -83,7 +88,8 @@ public class ArpTerminationTableEntryCustomizerTest extends WriterCustomizerTest physAddress = new PhysAddress("01:02:03:04:05:06"); ipAddress = new IpAddressNoZone(Ipv4AddressNoZone.getDefaultInstance("1.2.3.4")); - ip6Address = new IpAddressNoZone(Ipv6AddressNoZone.getDefaultInstance("2001:0db8:0a0b:12f0:0000:0000:0000:0001")); + ip6Address = + new IpAddressNoZone(Ipv6AddressNoZone.getDefaultInstance("2001:0db8:0a0b:12f0:0000:0000:0000:0001")); entry = generateArpEntry(ipAddress, physAddress); ip6entry = generateArpEntry(ip6Address, physAddress); id = getArpEntryId(ipAddress, physAddress); @@ -103,8 +109,15 @@ public class ArpTerminationTableEntryCustomizerTest extends WriterCustomizerTest private BdIpMacAddDel generateBdIpMacAddDelRequest(final byte[] ipAddress, final byte[] macAddress, final byte isAdd) { final BdIpMacAddDel request = new BdIpMacAddDel(); - request.ipAddress = ipAddress; - request.macAddress = macAddress; + Address address = new Address(); + address.af = AddressFamily.ADDRESS_IP4; + Ip4Address ip4Address = new Ip4Address(); + ip4Address.address = ipAddress; + address.un = new AddressUnion(ip4Address); + request.ip = address; + MacAddress macAddr = new MacAddress(); + macAddr.bytes = macAddress; + request.mac = macAddr; request.bdId = BD_ID; request.isAdd = isAdd; return request; @@ -123,8 +136,8 @@ public class ArpTerminationTableEntryCustomizerTest extends WriterCustomizerTest ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(BdIpMacAddDel.class); verify(api).bdIpMacAddDel(argumentCaptor.capture()); final BdIpMacAddDel actual = argumentCaptor.getValue(); - assertArrayEquals(expected.macAddress, actual.macAddress); - assertArrayEquals(expected.ipAddress, actual.ipAddress); + assertArrayEquals(expected.mac.bytes, actual.mac.bytes); + assertArrayEquals(expected.ip.un.getIp4().address, actual.ip.un.getIp4().address); assertEquals(expected.bdId, actual.bdId); assertEquals(expected.isAdd, actual.isAdd); } @@ -189,4 +202,4 @@ public class ArpTerminationTableEntryCustomizerTest extends WriterCustomizerTest } fail("WriteFailedException.DeleteFailedException was expected"); } -} \ No newline at end of file +} diff --git a/vpp-common/vpp-common-integration/pom.xml b/vpp-common/vpp-common-integration/pom.xml index b264f3910..54f9f57b9 100644 --- a/vpp-common/vpp-common-integration/pom.xml +++ b/vpp-common/vpp-common-integration/pom.xml @@ -30,7 +30,7 @@ ${project.artifactId} - 18.10-SNAPSHOT + 19.01-SNAPSHOT 1.3 diff --git a/vpp-common/vpp-impl-parent/pom.xml b/vpp-common/vpp-impl-parent/pom.xml index da76c9acb..06473fe59 100644 --- a/vpp-common/vpp-impl-parent/pom.xml +++ b/vpp-common/vpp-impl-parent/pom.xml @@ -31,7 +31,7 @@ pom - 18.10-SNAPSHOT + 19.01-SNAPSHOT diff --git a/vpp-integration/api-docs/core/pom.xml b/vpp-integration/api-docs/core/pom.xml index 6faad949a..2bcbe5bc6 100644 --- a/vpp-integration/api-docs/core/pom.xml +++ b/vpp-integration/api-docs/core/pom.xml @@ -37,7 +37,7 @@ 5.2 1.5.4 1.7.25 - 18.10-SNAPSHOT + 19.01-SNAPSHOT 23.6-jre 0.9.11 diff --git a/vpp-integration/api-docs/scripts/pom.xml b/vpp-integration/api-docs/scripts/pom.xml index 202764fe8..190835e52 100644 --- a/vpp-integration/api-docs/scripts/pom.xml +++ b/vpp-integration/api-docs/scripts/pom.xml @@ -30,7 +30,7 @@ 2.9.2-01 2.4.3-01 - 18.10-SNAPSHOT + 19.01-SNAPSHOT 4.11 0.9.11 true -- cgit 1.2.3-korg