summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--acl/acl-impl/pom.xml2
-rw-r--r--ioam/impl/pom.xml4
-rw-r--r--it/api-coverage/pom.xml2
-rw-r--r--it/jvpp-benchmark/pom.xml2
-rwxr-xr-xjvpp/common.sh2
-rwxr-xr-xjvpp/version2
-rw-r--r--nat/nat2vpp/pom.xml2
-rw-r--r--nsh/impl/pom.xml4
-rwxr-xr-xpackaging/deb/common/vpp_dependencies4
-rwxr-xr-xpackaging/rpm/vpp_dependencies4
-rw-r--r--release-notes/pom.xml12
-rw-r--r--v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceDataTranslator.java31
-rw-r--r--v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/l2/ArpTerminationTableEntryCustomizer.java19
-rw-r--r--v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2/ArpTerminationTableEntryCustomizerTest.java25
-rw-r--r--vpp-common/vpp-common-integration/pom.xml2
-rw-r--r--vpp-common/vpp-impl-parent/pom.xml2
-rw-r--r--vpp-integration/api-docs/core/pom.xml2
-rw-r--r--vpp-integration/api-docs/scripts/pom.xml2
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 @@
<version>1.19.01-SNAPSHOT</version>
<properties>
- <jvpp.acl.version>18.10-SNAPSHOT</jvpp.acl.version>
+ <jvpp.acl.version>19.01-SNAPSHOT</jvpp.acl.version>
</properties>
<dependencies>
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 @@
<packaging>bundle</packaging>
<properties>
- <ioam.version>18.10-SNAPSHOT</ioam.version>
- <jvpp.version>18.10-SNAPSHOT</jvpp.version>
+ <ioam.version>19.01-SNAPSHOT</ioam.version>
+ <jvpp.version>19.01-SNAPSHOT</jvpp.version>
</properties>
<dependencies>
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 @@
<name>${project.artifactId}</name>
<properties>
- <jvpp.version>18.10-SNAPSHOT</jvpp.version>
+ <jvpp.version>19.01-SNAPSHOT</jvpp.version>
</properties>
<dependencies>
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 @@
<properties>
<jmh.version>1.21</jmh.version>
- <jvpp.version>18.10-SNAPSHOT</jvpp.version>
+ <jvpp.version>19.01-SNAPSHOT</jvpp.version>
</properties>
<dependencies>
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 @@
<dependency>
<groupId>io.fd.vpp</groupId>
<artifactId>jvpp-nat</artifactId>
- <version>18.10-SNAPSHOT</version>
+ <version>19.01-SNAPSHOT</version>
</dependency>
<!-- Honeycomb infrastructure-->
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 @@
<dependency>
<groupId>io.fd.vpp</groupId>
<artifactId>jvpp-registry</artifactId>
- <version>18.10-SNAPSHOT</version>
+ <version>19.01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.fd.vpp</groupId>
<artifactId>jvpp-nsh</artifactId>
- <version>18.10-SNAPSHOT</version>
+ <version>19.01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.fd.hc2vpp.common</groupId>
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 @@
<project-version-in-jira>11601</project-version-in-jira>
<project-branch>master</project-branch>
<project-odl-version>oxygen</project-odl-version>
- <project-vpp-version>18.10</project-vpp-version>
+ <project-vpp-version>19.01</project-vpp-version>
<!-- TODO set snapshot version to project-vpp-version after VPP is released-->
- <!--<project-vpp-snapshot-version>18.10</project-vpp-snapshot-version>-->
- <project-vpp-snapshot-version>18.10-SNAPSHOT</project-vpp-snapshot-version>
- <project-nat-version>18.10</project-nat-version>
+ <!--<project-vpp-snapshot-version>19.01</project-vpp-snapshot-version>-->
+ <project-vpp-snapshot-version>19.01-SNAPSHOT</project-vpp-snapshot-version>
+ <project-nat-version>19.01</project-nat-version>
<!-- TODO set snapshot version to project-nat-version after VPP is released-->
- <!--<project-nat-snapshot-version>18.10</project-nat-snapshot-version>-->
- <project-nat-snapshot-version>18.10-SNAPSHOT</project-nat-snapshot-version>
+ <!--<project-nat-snapshot-version>19.01</project-nat-snapshot-version>-->
+ <project-nat-snapshot-version>19.01-SNAPSHOT</project-nat-snapshot-version>
<project-git-web>https://git.fd.io/cgit/hc2vpp/tree</project-git-web>
<project-infra-git-web>https://git.fd.io/cgit/honeycomb/tree</project-infra-git-web>
</attributes>
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<SwInterfaceDetails, ?, SwInterfaceDetails> 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<BdIpMacAddDel> 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 @@
<name>${project.artifactId}</name>
<properties>
- <jvpp.version>18.10-SNAPSHOT</jvpp.version>
+ <jvpp.version>19.01-SNAPSHOT</jvpp.version>
<hamcrest.version>1.3</hamcrest.version>
</properties>
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 @@
<packaging>pom</packaging>
<properties>
- <jvpp.version>18.10-SNAPSHOT</jvpp.version>
+ <jvpp.version>19.01-SNAPSHOT</jvpp.version>
</properties>
<dependencyManagement>
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 @@
<asm.version>5.2</asm.version>
<asciidoctorj.version>1.5.4</asciidoctorj.version>
<slf4j-simple.version>1.7.25</slf4j-simple.version>
- <jvpp.version>18.10-SNAPSHOT</jvpp.version>
+ <jvpp.version>19.01-SNAPSHOT</jvpp.version>
<guava.version>23.6-jre</guava.version>
<reflections.version>0.9.11</reflections.version>
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 @@
<groovy.eclipse.compiler.version>2.9.2-01</groovy.eclipse.compiler.version>
<groovy.eclipse.batch.version>2.4.3-01</groovy.eclipse.batch.version>
- <jvpp.version>18.10-SNAPSHOT</jvpp.version>
+ <jvpp.version>19.01-SNAPSHOT</jvpp.version>
<junit.version>4.11</junit.version>
<reflections.version>0.9.11</reflections.version>
<sonar.skip>true</sonar.skip>