From 4a99f1d24037d5b7947658b7360a8c53baeedbf6 Mon Sep 17 00:00:00 2001 From: Lori Jakab Date: Wed, 9 Oct 2019 15:12:26 +0200 Subject: [PATCH] Magnesium platform upgrade This patch prepares the lispflowmapping project for Magnesium: update odlparent to 6.0.0, mdsal to 5.0.3, and deal with the fallout, including, but not limited to, checkstyle and spotbugs being on by default, the uint changes in yangtools, etc. Change-Id: Id1b3bf0201755ef29678e17e8c60fa9adbf253a6 Signed-off-by: Lori Jakab Signed-off-by: Robert Varga --- artifacts/pom.xml | 2 +- commons/parent/pom.xml | 4 +- commons/unittest_tools/pom.xml | 5 ++ features/features-lispflowmapping/pom.xml | 2 +- .../odl-lispflowmapping-inmemorydb/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- features/odl-lispflowmapping-models/pom.xml | 4 +- features/odl-lispflowmapping-msmr/pom.xml | 2 +- features/odl-lispflowmapping-neutron/pom.xml | 4 +- .../odl-lispflowmapping-southbound/pom.xml | 2 +- .../src/main/feature/feature.xml | 4 +- features/pom.xml | 2 +- .../integrationtest/MultiSiteScenario.java | 18 ++++--- lispflowmapping-karaf/pom.xml | 2 +- mappingservice/api/pom.xml | 19 +------ .../lispflowmapping/config/ConfigIni.java | 8 +-- mappingservice/dsbackend/pom.xml | 4 ++ .../dsbackend/DataStoreBackEnd.java | 2 +- .../dsbackend/InstanceIdentifierUtil.java | 4 +- mappingservice/implementation/pom.xml | 4 ++ .../implementation/MappingSystem.java | 6 +-- .../implementation/lisp/MapResolver.java | 6 ++- .../implementation/util/MappingMergeUtil.java | 6 ++- .../util/MappingMergeUtilTest.java | 13 ++--- mappingservice/inmemorydb/pom.xml | 20 ++----- .../lispflowmapping/inmemorydb/HashMapDb.java | 42 ++++++++------- mappingservice/lisp-proto/pom.xml | 19 +------ .../serializer/LocatorRecordSerializer.java | 10 ++-- .../address/ApplicationDataSerializer.java | 14 ++--- .../address/ServicePathSerializer.java | 8 +-- .../lisp/util/LispAddressStringifier.java | 2 +- .../lisp/util/LispAddressUtil.java | 53 ++++++++++--------- .../lispflowmapping/lisp/util/MaskUtil.java | 12 ++--- .../lispflowmapping/lisp/util/NumberUtil.java | 9 ++++ .../lisp/util/LispAddressUtilTest.java | 36 +++++++------ .../lisp/util/MaskUtilTest.java | 23 ++++---- .../lispflowmapping/mapcache/AuthKeyDb.java | 2 +- .../mapcache/MultiTableMapCache.java | 2 +- .../mapcache/SimpleMapCache.java | 5 +- mappingservice/neutron/pom.xml | 8 ++- .../listener/VppEndpointListener.java | 4 +- .../neutron/PortDataProcessorTest.java | 2 +- mappingservice/pom.xml | 17 +----- .../lispflowmapping/shell/LispAddKey.java | 6 ++- .../lispflowmapping/shell/LispKeys.java | 10 ++-- .../lispflowmapping/shell/LispMappings.java | 10 ++-- mappingservice/southbound/pom.xml | 11 ++++ .../southbound/LispSouthboundPlugin.java | 2 +- .../lisp/LispSouthboundHandler.java | 12 +++-- 50 files changed, 242 insertions(+), 226 deletions(-) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 642c16215..1d05fa69d 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 5.0.2 + 6.0.0 diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml index 3ad968dcd..2e219554a 100644 --- a/commons/parent/pom.xml +++ b/commons/parent/pom.xml @@ -15,7 +15,7 @@ for plugin configuration etc. --> org.opendaylight.odlparent odlparent - 5.0.2 + 6.0.0 @@ -50,7 +50,7 @@ org.opendaylight.mdsal mdsal-artifacts - 4.0.6 + 5.0.3 pom import diff --git a/commons/unittest_tools/pom.xml b/commons/unittest_tools/pom.xml index 2fa3b560e..032f1d459 100644 --- a/commons/unittest_tools/pom.xml +++ b/commons/unittest_tools/pom.xml @@ -14,6 +14,11 @@ build failure. Please do not modify this unless you have a good reason. --> ODL :: lispflowmapping :: ${project.artifactId} + + false + false + + junit diff --git a/features/features-lispflowmapping/pom.xml b/features/features-lispflowmapping/pom.xml index 0240744cf..961637b4b 100644 --- a/features/features-lispflowmapping/pom.xml +++ b/features/features-lispflowmapping/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent feature-repo-parent - 5.0.2 + 6.0.0 diff --git a/features/odl-lispflowmapping-inmemorydb/pom.xml b/features/odl-lispflowmapping-inmemorydb/pom.xml index 2a99fccdb..38a54c499 100644 --- a/features/odl-lispflowmapping-inmemorydb/pom.xml +++ b/features/odl-lispflowmapping-inmemorydb/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features/odl-lispflowmapping-mappingservice-shell/pom.xml b/features/odl-lispflowmapping-mappingservice-shell/pom.xml index 496717f01..7190de2eb 100644 --- a/features/odl-lispflowmapping-mappingservice-shell/pom.xml +++ b/features/odl-lispflowmapping-mappingservice-shell/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features/odl-lispflowmapping-mappingservice/pom.xml b/features/odl-lispflowmapping-mappingservice/pom.xml index 8461706bb..6a48d2a24 100644 --- a/features/odl-lispflowmapping-mappingservice/pom.xml +++ b/features/odl-lispflowmapping-mappingservice/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features/odl-lispflowmapping-models/pom.xml b/features/odl-lispflowmapping-models/pom.xml index 539a7f176..6ca9b4e06 100644 --- a/features/odl-lispflowmapping-models/pom.xml +++ b/features/odl-lispflowmapping-models/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 @@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal mdsal-artifacts - 4.0.6 + 5.0.3 pom import diff --git a/features/odl-lispflowmapping-msmr/pom.xml b/features/odl-lispflowmapping-msmr/pom.xml index f7b64a0b8..70bef791e 100644 --- a/features/odl-lispflowmapping-msmr/pom.xml +++ b/features/odl-lispflowmapping-msmr/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features/odl-lispflowmapping-neutron/pom.xml b/features/odl-lispflowmapping-neutron/pom.xml index cfe207ecd..0607af7bd 100644 --- a/features/odl-lispflowmapping-neutron/pom.xml +++ b/features/odl-lispflowmapping-neutron/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 @@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal mdsal-artifacts - 4.0.6 + 5.0.3 pom import diff --git a/features/odl-lispflowmapping-southbound/pom.xml b/features/odl-lispflowmapping-southbound/pom.xml index cfbcacd23..42fd315a0 100644 --- a/features/odl-lispflowmapping-southbound/pom.xml +++ b/features/odl-lispflowmapping-southbound/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 5.0.2 + 6.0.0 diff --git a/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml b/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml index bbe014fca..26fdada85 100644 --- a/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml +++ b/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml @@ -8,7 +8,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL --> - odl-netty-4 - odl-guava + odl-netty-4 + odl-guava diff --git a/features/pom.xml b/features/pom.xml index d992085e0..4fce222ce 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 5.0.2 + 6.0.0 diff --git a/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MultiSiteScenario.java b/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MultiSiteScenario.java index b0afc0271..e7c4a79c9 100644 --- a/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MultiSiteScenario.java +++ b/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MultiSiteScenario.java @@ -14,6 +14,7 @@ import static org.junit.Assert.fail; import static org.opendaylight.lispflowmapping.integrationtest.MappingServiceIntegrationTest.ourAddress; import static org.opendaylight.lispflowmapping.integrationtest.MultiSiteScenarioUtil.SITE_A; import static org.opendaylight.lispflowmapping.integrationtest.MultiSiteScenarioUtil.SITE_D5; +import static org.opendaylight.yangtools.yang.common.UintConversions.fromJava; import com.google.common.net.InetAddresses; import java.nio.ByteBuffer; @@ -78,7 +79,7 @@ class MultiSiteScenario { private final Boolean DEFAULT_ROUTED = true; private final byte[] DEFAULT_SITE_ID = new byte[]{0, 0, 0, 0, 0, 0, 0, 0}; - private final MappingAuthkey NULL_AUTH_KEY = new MappingAuthkeyBuilder().setKeyType(0).build(); + private final MappingAuthkey NULL_AUTH_KEY = new MappingAuthkeyBuilder().setKeyType(fromJava(0)).build(); private final IMappingService mapService; private final IFlowMapping lms; @@ -261,10 +262,10 @@ class MultiSiteScenario { final LocatorRecordBuilder locatorRecordBuilder = new LocatorRecordBuilder(); locatorRecordBuilder.setRloc(rloc); locatorRecordBuilder.setLocatorId(rlocStr); - locatorRecordBuilder.setPriority(priority); - locatorRecordBuilder.setWeight(weight); - locatorRecordBuilder.setMulticastPriority(DEFAULT_MULTICAST_PRIORITY); - locatorRecordBuilder.setMulticastWeight(DEFAULT_MULTICAST_WEIGHT); + locatorRecordBuilder.setPriority(fromJava(priority)); + locatorRecordBuilder.setWeight(fromJava(weight)); + locatorRecordBuilder.setMulticastPriority(fromJava(DEFAULT_MULTICAST_PRIORITY)); + locatorRecordBuilder.setMulticastWeight(fromJava(DEFAULT_MULTICAST_WEIGHT)); locatorRecordBuilder.setLocalLocator(DEFAULT_LOCAL_LOCATOR); locatorRecordBuilder.setRlocProbed(DEFAULT_RLOC_PROBED); locatorRecordBuilder.setRouted(DEFAULT_ROUTED); @@ -345,14 +346,15 @@ class MultiSiteScenario { return true; } - final boolean isWeightEquals = expectedTargetSite.getWeight() == locatorRecord.getWeight(); + final boolean isWeightEquals = expectedTargetSite.getWeight() == locatorRecord.getWeight().toJava(); if (isPossibleAssertPingResultImmediately(expectedPingWorks, isWeightEquals, "Weight isn't equal." + "Expected value " + expectedTargetSite.getWeight() + ". Value from mapping" + locatorRecord.getWeight() + ".")) { return true; } - final boolean isPriorityEquals = expectedTargetSite.getPriority() == locatorRecord.getPriority(); + final boolean isPriorityEquals = + expectedTargetSite.getPriority() == locatorRecord.getPriority().toJava(); if (isPossibleAssertPingResultImmediately(expectedPingWorks, isPriorityEquals, "Priority isn't " + "equal. Expected value " + expectedTargetSite.getPriority() + ". Value from mapping" + locatorRecord.getPriority() + ".")) { @@ -449,7 +451,7 @@ class MultiSiteScenario { final Set eids = new HashSet<>(); for (String host : hosts) { eids.add(LispAddressUtil.asIpv4PrefixBinaryEid(host + "/" + IP_MASK, - new InstanceIdType(MultiSiteScenarioUtil.VNI2))); + new InstanceIdType(fromJava(MultiSiteScenarioUtil.VNI2)))); } return eids; } diff --git a/lispflowmapping-karaf/pom.xml b/lispflowmapping-karaf/pom.xml index c7dc4bd04..5a931132a 100644 --- a/lispflowmapping-karaf/pom.xml +++ b/lispflowmapping-karaf/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent karaf4-parent - 5.0.2 + 6.0.0 diff --git a/mappingservice/api/pom.xml b/mappingservice/api/pom.xml index 8a8f24e5f..b8361f600 100644 --- a/mappingservice/api/pom.xml +++ b/mappingservice/api/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.mdsal binding-parent - 4.0.6 + 5.0.3 @@ -19,6 +19,7 @@ true + false @@ -36,20 +37,4 @@ rfc6991-ietf-inet-types - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - true - checkstyle.violationSeverity=error - - - - - diff --git a/mappingservice/config/src/main/java/org/opendaylight/lispflowmapping/config/ConfigIni.java b/mappingservice/config/src/main/java/org/opendaylight/lispflowmapping/config/ConfigIni.java index bb9488da7..1e87312af 100644 --- a/mappingservice/config/src/main/java/org/opendaylight/lispflowmapping/config/ConfigIni.java +++ b/mappingservice/config/src/main/java/org/opendaylight/lispflowmapping/config/ConfigIni.java @@ -17,7 +17,7 @@ import org.slf4j.LoggerFactory; public final class ConfigIni { - protected static final Logger LOG = LoggerFactory.getLogger(ConfigIni.class); + private static final Logger LOG = LoggerFactory.getLogger(ConfigIni.class); private boolean mappingMerge; private boolean smr; private String elpPolicy; @@ -269,7 +269,7 @@ public final class ConfigIni { } try { - this.smrRetryCount = Integer.valueOf(str); + this.smrRetryCount = Integer.parseInt(str); LOG.debug("Setting configuration variable '{}' to '{}'", LISP_SMR_RETRY_COUNT, smrRetryCount); } catch (NumberFormatException e) { LOG.debug("Configuration variable '{}' was not set correctly. SMR retry count " @@ -297,7 +297,7 @@ public final class ConfigIni { } try { - this.smrTimeout = Long.valueOf(str); + this.smrTimeout = Long.parseLong(str); LOG.debug("Setting configuration variable '{}' to '{}'", LISP_SMR_TIMEOUT, smrTimeout); } catch (NumberFormatException e) { LOG.debug("Configuration variable '{}' was not set correctly. SMR timeout " @@ -351,7 +351,7 @@ public final class ConfigIni { } try { - this.negativeMappingTTL = Integer.valueOf(str); + this.negativeMappingTTL = Integer.parseInt(str); LOG.debug("Setting configuration variable '{}' to '{}'", LISP_NEGATIVE_MAPPING_TTL, negativeMappingTTL); } catch (NumberFormatException e) { LOG.debug("Configuration variable '{}' was not set correctly. Negative TTL " diff --git a/mappingservice/dsbackend/pom.xml b/mappingservice/dsbackend/pom.xml index 47d0474cb..e5e30658e 100644 --- a/mappingservice/dsbackend/pom.xml +++ b/mappingservice/dsbackend/pom.xml @@ -22,6 +22,10 @@ build failure. Please do not modify this unless you have a good reason. --> ODL :: lispflowmapping :: ${project.artifactId} + + false + + ${project.groupId} diff --git a/mappingservice/dsbackend/src/main/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEnd.java b/mappingservice/dsbackend/src/main/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEnd.java index 52aa77b81..2ce6aafdf 100644 --- a/mappingservice/dsbackend/src/main/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEnd.java +++ b/mappingservice/dsbackend/src/main/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEnd.java @@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory; * */ public class DataStoreBackEnd implements TransactionChainListener { - protected static final Logger LOG = LoggerFactory.getLogger(DataStoreBackEnd.class); + private static final Logger LOG = LoggerFactory.getLogger(DataStoreBackEnd.class); private static final InstanceIdentifier DATABASE_ROOT = InstanceIdentifier.create(MappingDatabase.class); private static final InstanceIdentifier LAST_UPDATED = diff --git a/mappingservice/dsbackend/src/main/java/org/opendaylight/lispflowmapping/dsbackend/InstanceIdentifierUtil.java b/mappingservice/dsbackend/src/main/java/org/opendaylight/lispflowmapping/dsbackend/InstanceIdentifierUtil.java index 30a781efe..cc84cb358 100644 --- a/mappingservice/dsbackend/src/main/java/org/opendaylight/lispflowmapping/dsbackend/InstanceIdentifierUtil.java +++ b/mappingservice/dsbackend/src/main/java/org/opendaylight/lispflowmapping/dsbackend/InstanceIdentifierUtil.java @@ -77,9 +77,9 @@ public final class InstanceIdentifierUtil { private static long getLispInstanceId(Eid eid) { Address address = eid.getAddress(); if (address instanceof InstanceId) { - return ((InstanceId) address).getInstanceId().getIid().getValue(); + return ((InstanceId) address).getInstanceId().getIid().getValue().toJava(); } else if (eid.getVirtualNetworkId() != null) { - return eid.getVirtualNetworkId().getValue(); + return eid.getVirtualNetworkId().getValue().toJava(); } return 0L; } diff --git a/mappingservice/implementation/pom.xml b/mappingservice/implementation/pom.xml index 06efeb04f..ca60e6072 100644 --- a/mappingservice/implementation/pom.xml +++ b/mappingservice/implementation/pom.xml @@ -14,6 +14,10 @@ build failure. Please do not modify this unless you have a good reason. --> ODL :: lispflowmapping :: ${project.artifactId} + + false + + org.osgi diff --git a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/MappingSystem.java b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/MappingSystem.java index 8ce1e77c2..1c9799d7c 100644 --- a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/MappingSystem.java +++ b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/MappingSystem.java @@ -367,7 +367,7 @@ public class MappingSystem implements IMappingSystem { } LocatorRecord locatorRecord = mappingData.getRecord().getLocatorRecord().get(0); - long serviceIndex = ((ServicePath) eid.getAddress()).getServicePath().getServiceIndex(); + long serviceIndex = ((ServicePath) eid.getAddress()).getServicePath().getServiceIndex().toJava(); int index = LispAddressUtil.STARTING_SERVICE_INDEX - (int) serviceIndex; Rloc rloc = locatorRecord.getRloc(); if (rloc.getAddress() instanceof Ipv4 || rloc.getAddress() instanceof Ipv6) { @@ -742,13 +742,13 @@ public class MappingSystem implements IMappingSystem { private static Eid getVirtualParent(Eid eid) { if (eid.getAddress() instanceof Ipv4PrefixBinary) { Ipv4PrefixBinary prefix = (Ipv4PrefixBinary) eid.getAddress(); - short parentPrefixLength = (short) (prefix.getIpv4MaskLength() - 1); + short parentPrefixLength = (short) (prefix.getIpv4MaskLength().toJava() - 1); byte[] parentPrefix = MaskUtil.normalizeByteArray(prefix.getIpv4AddressBinary().getValue(), parentPrefixLength); return LispAddressUtil.asIpv4PrefixBinaryEid(eid, parentPrefix, parentPrefixLength); } else if (eid.getAddress() instanceof Ipv6PrefixBinary) { Ipv6PrefixBinary prefix = (Ipv6PrefixBinary) eid.getAddress(); - short parentPrefixLength = (short) (prefix.getIpv6MaskLength() - 1); + short parentPrefixLength = (short) (prefix.getIpv6MaskLength().toJava() - 1); byte[] parentPrefix = MaskUtil.normalizeByteArray(prefix.getIpv6AddressBinary().getValue(), parentPrefixLength); return LispAddressUtil.asIpv6PrefixBinaryEid(eid, parentPrefix, parentPrefixLength); diff --git a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/lisp/MapResolver.java b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/lisp/MapResolver.java index 98cea8f77..9d410247f 100644 --- a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/lisp/MapResolver.java +++ b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/lisp/MapResolver.java @@ -8,6 +8,8 @@ package org.opendaylight.lispflowmapping.implementation.lisp; +import static org.opendaylight.yangtools.yang.common.UintConversions.fromJava; + import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import java.util.ArrayList; @@ -273,7 +275,7 @@ public class MapResolver implements IMapResolverAsync { ExplicitLocatorPath teAddress = ((ExplicitLocatorPath) container.getAddress()); SimpleAddress nextHop = getNextELPHop(teAddress, itrRlocs); if (nextHop != null) { - java.lang.Short priority = record.getPriority(); + java.lang.Short priority = record.getPriority().toJava(); if (elpPolicy.equalsIgnoreCase("both")) { recordBuilder.getLocatorRecord().add( new LocatorRecordBuilder().setLocalLocator(record.isLocalLocator()) @@ -294,7 +296,7 @@ public class MapResolver implements IMapResolverAsync { recordBuilder.getLocatorRecord().add( new LocatorRecordBuilder().setLocalLocator(record.isLocalLocator()) .setRlocProbed(record.isRlocProbed()).setWeight(record.getWeight()) - .setPriority(priority).setMulticastWeight(record.getMulticastWeight()) + .setPriority(fromJava(priority)).setMulticastWeight(record.getMulticastWeight()) .setMulticastPriority(record.getMulticastPriority()).setRouted(record.isRouted()) .setRloc(LispAddressUtil.toRloc(nextHop)) .setLocatorId(record.getLocatorId()).build()); diff --git a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/MappingMergeUtil.java b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/MappingMergeUtil.java index 75a59edfa..540d08a55 100644 --- a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/MappingMergeUtil.java +++ b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/MappingMergeUtil.java @@ -7,6 +7,8 @@ */ package org.opendaylight.lispflowmapping.implementation.util; +import static org.opendaylight.yangtools.yang.common.UintConversions.fromJava; + import com.google.common.base.Preconditions; import java.util.ArrayList; import java.util.Date; @@ -302,11 +304,11 @@ public final class MappingMergeUtil { if (sbLocatorMap.containsKey(nbRloc)) { // common locator found. use the NB record as the common locator. - if (sbLocatorMap.get(nbRloc).getPriority() == (short) 255) { + if (sbLocatorMap.get(nbRloc).getPriority().toJava() == (short) 255) { // if SB locator has p == 255 then common locator takes all NB fields except for p // which must be set to 255 LocatorRecordBuilder lrb = new LocatorRecordBuilder(nbLocator); - lrb.setPriority((short) 255); + lrb.setPriority(fromJava((short) 255)); commonLocators.add(lrb.build()); } else { commonLocators.add(nbLocator); diff --git a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/util/MappingMergeUtilTest.java b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/util/MappingMergeUtilTest.java index 386201000..71a5197cc 100644 --- a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/util/MappingMergeUtilTest.java +++ b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/util/MappingMergeUtilTest.java @@ -11,6 +11,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import static org.opendaylight.yangtools.yang.common.UintConversions.fromJava; import java.util.ArrayList; import java.util.Date; @@ -208,20 +209,20 @@ public class MappingMergeUtilTest { public void getCommonLocatorRecords_priorityCheck() { LocatorRecordBuilder nbLocatorRecordBuilder1 = new LocatorRecordBuilder() .setRloc(IPV4_RLOC_1) - .setPriority((short) 1) + .setPriority(fromJava((short) 1)) .setLocatorId("NB-locator-id"); LocatorRecordBuilder sbLocatorRecordBuilder1 = new LocatorRecordBuilder() .setRloc(IPV4_RLOC_1) - .setPriority((short) 255) + .setPriority(fromJava((short) 255)) .setLocatorId("SB-locator-id"); LocatorRecordBuilder nbLocatorRecordBuilder2 = new LocatorRecordBuilder() .setRloc(IPV4_RLOC_2) - .setPriority((short) 1) + .setPriority(fromJava((short) 1)) .setLocatorId("NB-locator-id"); LocatorRecordBuilder sbLocatorRecordBuilder2 = new LocatorRecordBuilder() .setRloc(IPV4_RLOC_2) - .setPriority((short) 254) + .setPriority(fromJava((short) 254)) .setLocatorId("SB-locator-id"); final MappingRecordBuilder nbMappingRecordBuilder = getDefaultMappingRecordBuilder(); @@ -245,11 +246,11 @@ public class MappingMergeUtilTest { assertEquals("NB-locator-id", resultLocator_1.getLocatorId()); // priority changed to 255 - assertEquals(255, (short) resultLocator_1.getPriority()); + assertEquals(255, (short) resultLocator_1.getPriority().toJava()); assertEquals("NB-locator-id", resultLocator_2.getLocatorId()); // priority remains original - assertEquals(1, (short) resultLocator_2.getPriority()); + assertEquals(1, (short) resultLocator_2.getPriority().toJava()); } private static MappingData getDefaultMappingData() { diff --git a/mappingservice/inmemorydb/pom.xml b/mappingservice/inmemorydb/pom.xml index dc8a9a296..c38ca571f 100644 --- a/mappingservice/inmemorydb/pom.xml +++ b/mappingservice/inmemorydb/pom.xml @@ -14,6 +14,10 @@ build failure. Please do not modify this unless you have a good reason. --> ODL :: lispflowmapping :: ${project.artifactId} + + false + + ${project.groupId} @@ -21,20 +25,4 @@ ${project.version} - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - true - checkstyle.violationSeverity=error - - - - - diff --git a/mappingservice/inmemorydb/src/main/java/org/opendaylight/lispflowmapping/inmemorydb/HashMapDb.java b/mappingservice/inmemorydb/src/main/java/org/opendaylight/lispflowmapping/inmemorydb/HashMapDb.java index 93f2b377b..8048cf807 100644 --- a/mappingservice/inmemorydb/src/main/java/org/opendaylight/lispflowmapping/inmemorydb/HashMapDb.java +++ b/mappingservice/inmemorydb/src/main/java/org/opendaylight/lispflowmapping/inmemorydb/HashMapDb.java @@ -49,10 +49,10 @@ public class HashMapDb implements ILispDAO, AutoCloseable { Eid eid = (Eid) key; if (eid.getAddress() instanceof Ipv4PrefixBinary) { Ipv4PrefixBinary prefix = (Ipv4PrefixBinary) eid.getAddress(); - ip4Trie.insert(prefix.getIpv4AddressBinary().getValue(), prefix.getIpv4MaskLength(), key); + ip4Trie.insert(prefix.getIpv4AddressBinary().getValue(), prefix.getIpv4MaskLength().toJava(), key); } else if (eid.getAddress() instanceof Ipv6PrefixBinary) { Ipv6PrefixBinary prefix = (Ipv6PrefixBinary) eid.getAddress(); - ip6Trie.insert(prefix.getIpv6AddressBinary().getValue(), prefix.getIpv6MaskLength(), key); + ip6Trie.insert(prefix.getIpv6AddressBinary().getValue(), prefix.getIpv6MaskLength().toJava(), key); } } } @@ -85,10 +85,10 @@ public class HashMapDb implements ILispDAO, AutoCloseable { private RadixTrie.TrieNode lookupBestNode(Eid eid) { if (eid.getAddress() instanceof Ipv4PrefixBinary) { Ipv4PrefixBinary prefix = (Ipv4PrefixBinary) eid.getAddress(); - return ip4Trie.lookupBest(prefix.getIpv4AddressBinary().getValue(), prefix.getIpv4MaskLength()); + return ip4Trie.lookupBest(prefix.getIpv4AddressBinary().getValue(), prefix.getIpv4MaskLength().toJava()); } else if (eid.getAddress() instanceof Ipv6PrefixBinary) { Ipv6PrefixBinary prefix = (Ipv6PrefixBinary) eid.getAddress(); - return ip6Trie.lookupBest(prefix.getIpv6AddressBinary().getValue(), prefix.getIpv6MaskLength()); + return ip6Trie.lookupBest(prefix.getIpv6AddressBinary().getValue(), prefix.getIpv6MaskLength().toJava()); } return null; } @@ -140,21 +140,23 @@ public class HashMapDb implements ILispDAO, AutoCloseable { switch (method) { case COVERING: node = ip4Trie.lookupCoveringLessSpecific(prefix.getIpv4AddressBinary().getValue(), - prefix.getIpv4MaskLength()); + prefix.getIpv4MaskLength().toJava()); break; case PARENT: - node = ip4Trie.lookupParent(prefix.getIpv4AddressBinary().getValue(), prefix.getIpv4MaskLength()); + node = ip4Trie.lookupParent(prefix.getIpv4AddressBinary().getValue(), + prefix.getIpv4MaskLength().toJava()); break; case SIBLING: - node = ip4Trie.lookupSibling(prefix.getIpv4AddressBinary().getValue(), prefix.getIpv4MaskLength()); + node = ip4Trie.lookupSibling(prefix.getIpv4AddressBinary().getValue(), + prefix.getIpv4MaskLength().toJava()); break; case VIRTUAL_PARENT_SIBLING: node = ip4Trie.lookupVirtualParentSibling(prefix.getIpv4AddressBinary().getValue(), - prefix.getIpv4MaskLength()); + prefix.getIpv4MaskLength().toJava()); break; case WIDEST_NEGATIVE: node = ip4Trie.lookupWidestNegative(prefix.getIpv4AddressBinary().getValue(), - prefix.getIpv4MaskLength()); + prefix.getIpv4MaskLength().toJava()); break; default: node = null; @@ -169,21 +171,23 @@ public class HashMapDb implements ILispDAO, AutoCloseable { switch (method) { case COVERING: node = ip6Trie.lookupCoveringLessSpecific(prefix.getIpv6AddressBinary().getValue(), - prefix.getIpv6MaskLength()); + prefix.getIpv6MaskLength().toJava()); break; case PARENT: - node = ip6Trie.lookupParent(prefix.getIpv6AddressBinary().getValue(), prefix.getIpv6MaskLength()); + node = ip6Trie.lookupParent(prefix.getIpv6AddressBinary().getValue(), + prefix.getIpv6MaskLength().toJava()); break; case SIBLING: - node = ip6Trie.lookupSibling(prefix.getIpv6AddressBinary().getValue(), prefix.getIpv6MaskLength()); + node = ip6Trie.lookupSibling(prefix.getIpv6AddressBinary().getValue(), + prefix.getIpv6MaskLength().toJava()); break; case VIRTUAL_PARENT_SIBLING: node = ip6Trie.lookupVirtualParentSibling(prefix.getIpv6AddressBinary().getValue(), - prefix.getIpv6MaskLength()); + prefix.getIpv6MaskLength().toJava()); break; case WIDEST_NEGATIVE: node = ip6Trie.lookupWidestNegative(prefix.getIpv6AddressBinary().getValue(), - prefix.getIpv6MaskLength()); + prefix.getIpv6MaskLength().toJava()); break; default: node = null; @@ -227,10 +231,12 @@ public class HashMapDb implements ILispDAO, AutoCloseable { Set.TrieNode> nodes = null; if (key.getAddress() instanceof Ipv4PrefixBinary) { Ipv4PrefixBinary prefix = (Ipv4PrefixBinary) key.getAddress(); - nodes = ip4Trie.lookupSubtree(prefix.getIpv4AddressBinary().getValue(), prefix.getIpv4MaskLength()); + nodes = ip4Trie.lookupSubtree(prefix.getIpv4AddressBinary().getValue(), + prefix.getIpv4MaskLength().toJava()); } else if (key.getAddress() instanceof Ipv6PrefixBinary) { Ipv6PrefixBinary prefix = (Ipv6PrefixBinary) key.getAddress(); - nodes = ip6Trie.lookupSubtree(prefix.getIpv6AddressBinary().getValue(), prefix.getIpv6MaskLength()); + nodes = ip6Trie.lookupSubtree(prefix.getIpv6AddressBinary().getValue(), + prefix.getIpv6MaskLength().toJava()); } return nodesToEids(key, nodes); } @@ -258,10 +264,10 @@ public class HashMapDb implements ILispDAO, AutoCloseable { Eid eid = (Eid) key; if (eid.getAddress() instanceof Ipv4PrefixBinary) { Ipv4PrefixBinary prefix = (Ipv4PrefixBinary) eid.getAddress(); - ip4Trie.remove(prefix.getIpv4AddressBinary().getValue(), prefix.getIpv4MaskLength()); + ip4Trie.remove(prefix.getIpv4AddressBinary().getValue(), prefix.getIpv4MaskLength().toJava()); } else if (eid.getAddress() instanceof Ipv6PrefixBinary) { Ipv6PrefixBinary prefix = (Ipv6PrefixBinary) eid.getAddress(); - ip6Trie.remove(prefix.getIpv6AddressBinary().getValue(), prefix.getIpv6MaskLength()); + ip6Trie.remove(prefix.getIpv6AddressBinary().getValue(), prefix.getIpv6MaskLength().toJava()); } } } diff --git a/mappingservice/lisp-proto/pom.xml b/mappingservice/lisp-proto/pom.xml index 83cdffe14..ed210b18c 100644 --- a/mappingservice/lisp-proto/pom.xml +++ b/mappingservice/lisp-proto/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 4.0.6 + 5.0.3 @@ -26,6 +26,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html true + false @@ -62,20 +63,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html test - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - true - checkstyle.violationSeverity=error - - - - - diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/LocatorRecordSerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/LocatorRecordSerializer.java index 391a0ac7d..8d736d8e4 100644 --- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/LocatorRecordSerializer.java +++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/LocatorRecordSerializer.java @@ -7,6 +7,8 @@ */ package org.opendaylight.lispflowmapping.lisp.serializer; +import static org.opendaylight.yangtools.yang.common.UintConversions.fromJava; + import java.nio.ByteBuffer; import org.apache.commons.lang3.BooleanUtils; @@ -32,10 +34,10 @@ public final class LocatorRecordSerializer { protected LocatorRecord deserialize(ByteBuffer buffer) { LocatorRecordBuilder builder = new LocatorRecordBuilder(); - builder.setPriority((short) ByteUtil.getUnsignedByte(buffer)); - builder.setWeight((short) ByteUtil.getUnsignedByte(buffer)); - builder.setMulticastPriority((short) ByteUtil.getUnsignedByte(buffer)); - builder.setMulticastWeight((short) ByteUtil.getUnsignedByte(buffer)); + builder.setPriority(fromJava((short) ByteUtil.getUnsignedByte(buffer))); + builder.setWeight(fromJava((short) ByteUtil.getUnsignedByte(buffer))); + builder.setMulticastPriority(fromJava((short) ByteUtil.getUnsignedByte(buffer))); + builder.setMulticastWeight(fromJava((short) ByteUtil.getUnsignedByte(buffer))); byte flags = (byte) buffer.getShort(); builder.setLocalLocator(ByteUtil.extractBit(flags, Flags.LOCAL_LOCATOR)); builder.setRlocProbed(ByteUtil.extractBit(flags, Flags.RLOC_PROBED)); diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/ApplicationDataSerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/ApplicationDataSerializer.java index e5c306a05..da276104c 100644 --- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/ApplicationDataSerializer.java +++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/ApplicationDataSerializer.java @@ -7,6 +7,8 @@ */ package org.opendaylight.lispflowmapping.lisp.serializer.address; +import static org.opendaylight.yangtools.yang.common.UintConversions.fromJava; + import java.nio.ByteBuffer; import org.opendaylight.lispflowmapping.lisp.type.LispCanonicalAddressFormatEnum; @@ -59,7 +61,7 @@ public final class ApplicationDataSerializer extends LcafSerializer { ApplicationData appData = ((org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types .rev151105.lisp.address.address.ApplicationData) lispAddress.getAddress()).getApplicationData(); buffer.put(ByteUtil.partialIntToByteArray(NumberUtil.asInt(appData.getIpTos()), Length.TOC)); - buffer.put((byte) NumberUtil.asShort(appData.getProtocol())); + buffer.put((byte) NumberUtil.asShort(appData.getProtocol().toJava())); if (appData.getLocalPortLow() != null) { buffer.putShort(NumberUtil.asShort(appData.getLocalPortLow().getValue().shortValue())); } else { @@ -107,11 +109,11 @@ public final class ApplicationDataSerializer extends LcafSerializer { byte[] rawIPTos = new byte[3]; buffer.get(rawIPTos); builder.setIpTos(ByteUtil.getPartialInt(rawIPTos)); - builder.setProtocol((short) ByteUtil.getUnsignedByte(buffer)); - builder.setLocalPortLow(new PortNumber(ByteUtil.asUnsignedShort(buffer.getShort()))); - builder.setLocalPortHigh(new PortNumber(ByteUtil.asUnsignedShort(buffer.getShort()))); - builder.setRemotePortLow(new PortNumber(ByteUtil.asUnsignedShort(buffer.getShort()))); - builder.setRemotePortHigh(new PortNumber(ByteUtil.asUnsignedShort(buffer.getShort()))); + builder.setProtocol(fromJava((short) ByteUtil.getUnsignedByte(buffer))); + builder.setLocalPortLow(new PortNumber(fromJava(ByteUtil.asUnsignedShort(buffer.getShort())))); + builder.setLocalPortHigh(new PortNumber(fromJava(ByteUtil.asUnsignedShort(buffer.getShort())))); + builder.setRemotePortLow(new PortNumber(fromJava(ByteUtil.asUnsignedShort(buffer.getShort())))); + builder.setRemotePortHigh(new PortNumber(fromJava(ByteUtil.asUnsignedShort(buffer.getShort())))); SimpleAddress address = SimpleAddressSerializer.getInstance().deserialize(buffer, ctx); builder.setAddress(address); return new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105 diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/ServicePathSerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/ServicePathSerializer.java index 175b23c41..7d933759f 100644 --- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/ServicePathSerializer.java +++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/ServicePathSerializer.java @@ -7,6 +7,8 @@ */ package org.opendaylight.lispflowmapping.lisp.serializer.address; +import static org.opendaylight.yangtools.yang.common.UintConversions.fromJava; + import java.nio.ByteBuffer; import org.opendaylight.lispflowmapping.lisp.type.LispCanonicalAddressFormatEnum; import org.opendaylight.lispflowmapping.lisp.util.ByteUtil; @@ -59,7 +61,7 @@ public final class ServicePathSerializer extends LcafSerializer { ServicePath sp = (ServicePath) lispAddress.getAddress(); buffer.put(ByteUtil.partialIntToByteArray(NumberUtil.asInt( sp.getServicePath().getServicePathId().getValue().intValue()), Length.SPI)); - buffer.put((byte) NumberUtil.asShort(sp.getServicePath().getServiceIndex())); + buffer.put((byte) NumberUtil.asShort(sp.getServicePath().getServiceIndex().toJava())); } @Override @@ -75,8 +77,8 @@ public final class ServicePathSerializer extends LcafSerializer { ServicePathBuilder spb = new ServicePathBuilder(); byte[] spi = new byte[3]; buffer.get(spi); - spb.setServicePathId(new ServicePathIdType((long) ByteUtil.getPartialInt(spi))); - spb.setServiceIndex((short) ByteUtil.getUnsignedByte(buffer)); + spb.setServicePathId(new ServicePathIdType(fromJava((long) ByteUtil.getPartialInt(spi)))); + spb.setServiceIndex(fromJava((short) ByteUtil.getUnsignedByte(buffer))); return new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105 .lisp.address.address.ServicePathBuilder().setServicePath(spb.build()).build(); } diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressStringifier.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressStringifier.java index 4362edc2c..29e240907 100644 --- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressStringifier.java +++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressStringifier.java @@ -138,7 +138,7 @@ public final class LispAddressStringifier { Long vni = null; if (lispAddress.getVirtualNetworkId() != null) { - vni = lispAddress.getVirtualNetworkId().getValue(); + vni = lispAddress.getVirtualNetworkId().getValue().toJava(); } return getAddrString(dst, addr, vni); diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressUtil.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressUtil.java index 7f7b6c250..f7fac320f 100644 --- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressUtil.java +++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressUtil.java @@ -7,6 +7,8 @@ */ package org.opendaylight.lispflowmapping.lisp.util; +import static org.opendaylight.yangtools.yang.common.UintConversions.fromJava; + import com.google.common.base.Preconditions; import com.google.common.net.InetAddresses; import java.net.Inet4Address; @@ -473,7 +475,7 @@ public final class LispAddressUtil { } public static Eid asIpv4PrefixBinaryEid(long vni, final String prefix) { - InstanceIdType iid = new InstanceIdType(vni); + InstanceIdType iid = new InstanceIdType(fromJava(vni)); return asIpv4PrefixBinaryEid(prefix, iid); } @@ -482,7 +484,7 @@ public final class LispAddressUtil { short mask = Short.valueOf(MaskUtil.getPrefixMask(prefix)); byte[] ipv4 = InetAddresses.forString(address).getAddress(); return toEid(new Ipv4PrefixBinaryBuilder().setIpv4AddressBinary(new Ipv4AddressBinary(ipv4)) - .setIpv4MaskLength(mask).build(), iiType); + .setIpv4MaskLength(fromJava(mask)).build(), iiType); } public static Eid asIpv4PrefixBinaryEid(Eid eid, byte[] address, short mask) { @@ -490,7 +492,7 @@ public final class LispAddressUtil { } public static Eid asIpv4PrefixBinaryEid(long vni, byte[] address, short mask) { - return asIpv4PrefixBinaryEid(new InstanceIdType(vni), address, mask); + return asIpv4PrefixBinaryEid(new InstanceIdType(fromJava(vni)), address, mask); } public static Eid asIpv4PrefixBinaryEid(InstanceIdType vni, byte[] address, short mask) { @@ -500,7 +502,7 @@ public final class LispAddressUtil { builder.setAddressType(Ipv4PrefixBinaryAfi.class); builder.setVirtualNetworkId(vni); builder.setAddress(new Ipv4PrefixBinaryBuilder().setIpv4AddressBinary(new Ipv4AddressBinary(address)) - .setIpv4MaskLength(mask).build()); + .setIpv4MaskLength(fromJava(mask)).build()); return builder.build(); } @@ -509,7 +511,8 @@ public final class LispAddressUtil { } public static Eid asIpv4Eid(String address, long vni) { - return toEid(new Ipv4AddressBinary(InetAddresses.forString(address).getAddress()), new InstanceIdType(vni)); + return toEid(new Ipv4AddressBinary(InetAddresses.forString(address).getAddress()), + new InstanceIdType(fromJava(vni))); } public static Eid asIpv6Eid(String address) { @@ -517,7 +520,8 @@ public final class LispAddressUtil { } public static Eid asIpv6Eid(String address, long vni) { - return toEid(new Ipv6AddressBinary(InetAddresses.forString(address).getAddress()), new InstanceIdType(vni)); + return toEid(new Ipv6AddressBinary(InetAddresses.forString(address).getAddress()), + new InstanceIdType(fromJava(vni))); } public static Eid asIpv6PrefixEid(String prefix) { @@ -542,7 +546,7 @@ public final class LispAddressUtil { } public static Eid asIpv6PrefixBinaryEid(long vni, final String prefix) { - InstanceIdType iid = new InstanceIdType(vni); + InstanceIdType iid = new InstanceIdType(fromJava(vni)); return asIpv6PrefixBinaryEid(prefix, iid); } @@ -551,7 +555,7 @@ public final class LispAddressUtil { short mask = Short.valueOf(MaskUtil.getPrefixMask(prefix)); byte[] ipv6 = InetAddresses.forString(address).getAddress(); return toEid(new Ipv6PrefixBinaryBuilder().setIpv6AddressBinary(new Ipv6AddressBinary(ipv6)) - .setIpv6MaskLength(mask).build(), iiType); + .setIpv6MaskLength(fromJava(mask)).build(), iiType); } public static Eid asIpv6PrefixBinaryEid(Eid eid, byte[] address, short mask) { @@ -559,7 +563,7 @@ public final class LispAddressUtil { } public static Eid asIpv6PrefixBinaryEid(long vni, byte[] address, short mask) { - return asIpv6PrefixBinaryEid(new InstanceIdType(vni), address, mask); + return asIpv6PrefixBinaryEid(new InstanceIdType(fromJava(vni)), address, mask); } public static Eid asIpv6PrefixBinaryEid(InstanceIdType vni, byte[] address, short mask) { @@ -569,7 +573,7 @@ public final class LispAddressUtil { builder.setAddressType(Ipv6PrefixBinaryAfi.class); builder.setVirtualNetworkId(vni); builder.setAddress(new Ipv6PrefixBinaryBuilder().setIpv6AddressBinary(new Ipv6AddressBinary(address)) - .setIpv6MaskLength(mask).build()); + .setIpv6MaskLength(fromJava(mask)).build()); return builder.build(); } @@ -639,19 +643,19 @@ public final class LispAddressUtil { EidBuilder eb = new EidBuilder(); eb.setAddressType(ServicePathLcaf.class); if (vni >= 0) { - eb.setVirtualNetworkId(new InstanceIdType(vni)); + eb.setVirtualNetworkId(new InstanceIdType(fromJava(vni))); } org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105 .lisp.address.address.service.path.ServicePathBuilder spb = new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105 .lisp.address.address.service.path.ServicePathBuilder(); - spb.setServicePathId(new ServicePathIdType(servicePathId)); - spb.setServiceIndex(serviceIndex); + spb.setServicePathId(new ServicePathIdType(fromJava(servicePathId))); + spb.setServiceIndex(fromJava(serviceIndex)); return eb.setAddress(addressFromServicePath(spb.build())).build(); } public static Eid asMacEid(String address, long vni) { - return toEid(new MacAddress(address), new InstanceIdType(vni)); + return toEid(new MacAddress(address), new InstanceIdType(fromJava(vni))); } public static Eid asMacEid(String address) { @@ -659,7 +663,7 @@ public final class LispAddressUtil { } public static Eid asDistinguishedNameEid(String address, long vni) { - return toEid(new MacAddress(address), new InstanceIdType(vni)); + return toEid(new MacAddress(address), new InstanceIdType(fromJava(vni))); } public static Eid asDistinguishedNameEid(String address) { @@ -708,7 +712,7 @@ public final class LispAddressUtil { public static Eid asSrcDstEid(String src, String dst, int smask, int dmask, long vni) { EidBuilder builder = new EidBuilder(); builder.setAddressType(SourceDestKeyLcaf.class); - builder.setVirtualNetworkId(new InstanceIdType(Long.valueOf(vni))); + builder.setVirtualNetworkId(new InstanceIdType(fromJava(Long.valueOf(vni)))); builder.setAddress( new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105 .lisp.address.address.SourceDestKeyBuilder() @@ -753,8 +757,9 @@ public final class LispAddressUtil { List locatorRecords = new ArrayList(); for (Rloc locator : locators) { LocatorRecordBuilder locatorBuilder = new LocatorRecordBuilder(); - locatorBuilder.setLocalLocator(false).setRlocProbed(false).setWeight((short) 1).setPriority((short) 1) - .setMulticastWeight((short) 1).setMulticastPriority((short) 1).setRouted(true) + locatorBuilder.setLocalLocator(false).setRlocProbed(false) + .setWeight(fromJava((short) 1)).setPriority(fromJava((short) 1)) + .setMulticastWeight(fromJava((short) 1)).setMulticastPriority(fromJava((short) 1)).setRouted(true) .setRloc(locator).setLocatorId("SFC_LISP").build(); locatorRecords.add(locatorBuilder.build()); } @@ -788,7 +793,7 @@ public final class LispAddressUtil { Ipv4PrefixBinaryBuilder pb = new Ipv4PrefixBinaryBuilder(); byte[] address = InetAddresses.forString(MaskUtil.getAddressStringForIpv4Prefix(prefix)).getAddress(); pb.setIpv4AddressBinary(new Ipv4AddressBinary(address)); - pb.setIpv4MaskLength(MaskUtil.getMaskForAddress(prefix)); + pb.setIpv4MaskLength(fromJava(MaskUtil.getMaskForAddress(prefix))); return pb.build(); } @@ -797,7 +802,7 @@ public final class LispAddressUtil { Ipv6PrefixBinaryBuilder pb = new Ipv6PrefixBinaryBuilder(); byte[] address = InetAddresses.forString(MaskUtil.getAddressStringForIpv6Prefix(prefix)).getAddress(); pb.setIpv6AddressBinary(new Ipv6AddressBinary(address)); - pb.setIpv6MaskLength(MaskUtil.getMaskForAddress(prefix)); + pb.setIpv6MaskLength(fromJava(MaskUtil.getMaskForAddress(prefix))); return pb.build(); } @@ -889,14 +894,14 @@ public final class LispAddressUtil { .lisp.address.address.Ipv4Prefix convertFromBinary(Ipv4PrefixBinary prefix) { return new Ipv4PrefixBuilder().setIpv4Prefix(IetfInetUtil.INSTANCE.ipv4PrefixFor( prefix.getIpv4AddressBinary().getValue(), - prefix.getIpv4MaskLength())).build(); + prefix.getIpv4MaskLength().toJava())).build(); } private static org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105 .lisp.address.address.Ipv6Prefix convertFromBinary(Ipv6PrefixBinary prefix) { return new Ipv6PrefixBuilder().setIpv6Prefix(IetfInetUtil.INSTANCE.ipv6PrefixFor( prefix.getIpv6AddressBinary().getValue(), - prefix.getIpv6MaskLength())).build(); + prefix.getIpv6MaskLength().toJava())).build(); } private static Ipv4 convertFromBinary(Ipv4Binary address) { @@ -999,9 +1004,9 @@ public final class LispAddressUtil { public static short getIpPrefixMask(Eid eid) { Address addr = eid.getAddress(); if (addr instanceof Ipv4PrefixBinary) { - return ((Ipv4PrefixBinary) addr).getIpv4MaskLength(); + return ((Ipv4PrefixBinary) addr).getIpv4MaskLength().toJava(); } else if (addr instanceof Ipv6PrefixBinary) { - return ((Ipv6PrefixBinary) addr).getIpv6MaskLength(); + return ((Ipv6PrefixBinary) addr).getIpv6MaskLength().toJava(); } return 0; } diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/MaskUtil.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/MaskUtil.java index 9be7e2bbe..b6cf1a9bf 100644 --- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/MaskUtil.java +++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/MaskUtil.java @@ -114,11 +114,11 @@ public final class MaskUtil { try { if (address instanceof Ipv4PrefixBinary) { byte[] addr = ((Ipv4PrefixBinary) address).getIpv4AddressBinary().getValue(); - short mask = ((Ipv4PrefixBinary) address).getIpv4MaskLength(); + short mask = ((Ipv4PrefixBinary) address).getIpv4MaskLength().toJava(); return LispAddressUtil.asIpv4PrefixBinaryEid(eid, normalizeByteArray(addr, mask), mask); } else if (address instanceof Ipv6PrefixBinary) { byte[] addr = ((Ipv6PrefixBinary) address).getIpv6AddressBinary().getValue(); - short mask = ((Ipv6PrefixBinary) address).getIpv6MaskLength(); + short mask = ((Ipv6PrefixBinary) address).getIpv6MaskLength().toJava(); return LispAddressUtil.asIpv6PrefixBinaryEid(eid, normalizeByteArray(addr, mask), mask); } else if (address instanceof Ipv4Prefix) { String[] v4prefix = splitPrefix(((Ipv4Prefix)address).getIpv4Prefix().getValue()); @@ -141,8 +141,8 @@ public final class MaskUtil { return normalizeSrcDst(eid); } else if (address instanceof ServicePath) { // Build new Service Path eid with service index set to 0 - long spi = ((ServicePath) address).getServicePath().getServicePathId().getValue(); - long vni = eid.getVirtualNetworkId() != null ? eid.getVirtualNetworkId().getValue() : -1; + long spi = ((ServicePath) address).getServicePath().getServicePathId().getValue().toJava(); + long vni = eid.getVirtualNetworkId() != null ? eid.getVirtualNetworkId().getValue().toJava() : -1; return LispAddressUtil.asServicePathEid(vni, spi, (short)0); } } catch (UnknownHostException e) { @@ -258,9 +258,9 @@ public final class MaskUtil { } else if (address instanceof InstanceId) { return getMaskForAddress(((InstanceId)address).getInstanceId().getAddress()); } else if (address instanceof Ipv4PrefixBinary) { - return ((Ipv4PrefixBinary) address).getIpv4MaskLength(); + return ((Ipv4PrefixBinary) address).getIpv4MaskLength().toJava(); } else if (address instanceof Ipv6PrefixBinary) { - return ((Ipv6PrefixBinary) address).getIpv6MaskLength(); + return ((Ipv6PrefixBinary) address).getIpv6MaskLength().toJava(); } return -1; } diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/NumberUtil.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/NumberUtil.java index 13b28559d..537ca6055 100644 --- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/NumberUtil.java +++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/NumberUtil.java @@ -7,6 +7,8 @@ */ package org.opendaylight.lispflowmapping.lisp.util; +import org.opendaylight.yangtools.yang.common.Uint8; + public final class NumberUtil { // Utility class, should not be instantiated private NumberUtil() { @@ -33,6 +35,13 @@ public final class NumberUtil { return 0; } + public static short asShort(Uint8 number) { + if (number != null) { + return number.toJava(); + } + return 0; + } + public static long asLong(Long number) { if (number != null) { return number; diff --git a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressUtilTest.java b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressUtilTest.java index c36e716ce..513c1d60b 100644 --- a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressUtilTest.java +++ b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressUtilTest.java @@ -13,6 +13,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import static org.opendaylight.yangtools.yang.common.UintConversions.fromJava; import com.google.common.net.InetAddresses; import java.net.Inet4Address; @@ -102,7 +103,8 @@ public class LispAddressUtilTest { private static final Long AS_NUMBER_TEST = 100L; private static final Long INSTANCE_ID_TYPE_VALUE_TEST = 121L; private static final Short INSTANCE_ID_TYPE_VALUE_SHORT_TEST = 122; - private static final InstanceIdType INSTANCE_ID_TYPE_TEST = new InstanceIdType(INSTANCE_ID_TYPE_VALUE_TEST); + private static final InstanceIdType INSTANCE_ID_TYPE_TEST = new InstanceIdType( + fromJava(INSTANCE_ID_TYPE_VALUE_TEST)); private static final String INCORRECT_IP_ADDRESS_TEST = "incorrect ip address"; private static final String MAC_ADDRESS_VALUE_TEST = "aa:bb:cc:dd:ee:ff"; @@ -124,10 +126,10 @@ public class LispAddressUtilTest { private static final Ipv4Prefix IPV4_ADDRESS_PREFIX_TEST = new Ipv4Prefix(IPV4_ADDRESS_PREFIX_VALUE_TEST); private static final Ipv4PrefixBinary IPV4_ADDRESS_PREFIX_BINARY_1 = new Ipv4PrefixBinaryBuilder() .setIpv4AddressBinary(new Ipv4AddressBinary(IPV4_ADDRESS_BYTES_A_TEST)) - .setIpv4MaskLength(MASK_OK_TEST).build(); + .setIpv4MaskLength(fromJava(MASK_OK_TEST)).build(); private static final Ipv4PrefixBinary IPV4_ADDRESS_PREFIX_BINARY_2 = new Ipv4PrefixBinaryBuilder() .setIpv4AddressBinary(new Ipv4AddressBinary(IPV4_ADDRESS_BYTES_A_TEST)) - .setIpv4MaskLength(MASK_OK_DEFAULT_IPV4_TEST).build(); + .setIpv4MaskLength(fromJava(MASK_OK_DEFAULT_IPV4_TEST)).build(); private static final IpPrefix IP_ADDRESS_PREFIX_WITH_IPV4_TEST = new IpPrefix(IPV4_ADDRESS_PREFIX_TEST); private static final org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp .address.address.Ipv4Prefix IPV4_PREFIX = new Ipv4PrefixBuilder() @@ -178,10 +180,10 @@ public class LispAddressUtilTest { private static final IpAddress IP_ADDRESS_IPV6_TEST = new IpAddress(IPV6_ADDRESS_TEST); private static final Ipv6PrefixBinary IPV6_ADDRESS_PREFIX_BINARY_1 = new Ipv6PrefixBinaryBuilder() .setIpv6AddressBinary(new Ipv6AddressBinary(IPV6_ADDRESS_BYTES_A_TEST)) - .setIpv6MaskLength(MASK_OK_TEST).build(); + .setIpv6MaskLength(fromJava(MASK_OK_TEST)).build(); private static final Ipv6PrefixBinary IPV6_ADDRESS_PREFIX_BINARY_2 = new Ipv6PrefixBinaryBuilder() .setIpv6AddressBinary(new Ipv6AddressBinary(IPV6_ADDRESS_BYTES_A_TEST)) - .setIpv6MaskLength(MASK_OK_DEFAULT_IPV6_TEST).build(); + .setIpv6MaskLength(fromJava(MASK_OK_DEFAULT_IPV6_TEST)).build(); private static final Eid IPV6_ADDRESS_PREFIX_BINARY_EID_1 = new EidBuilder() .setAddress(IPV6_ADDRESS_PREFIX_BINARY_1) .setAddressType(Ipv6PrefixBinaryAfi.class) @@ -289,7 +291,7 @@ public class LispAddressUtilTest { */ @Test public void addressFromSimpleAddressTest_asNumber() { - final SimpleAddress simpleAddress = new SimpleAddress(new AsNumber(NUMBER_TEST)); + final SimpleAddress simpleAddress = new SimpleAddress(new AsNumber(fromJava(NUMBER_TEST))); final Class addressClass = LispAddressUtil.addressTypeFromSimpleAddress( simpleAddress); assertEquals(AsNumberAfi.class, addressClass); @@ -533,8 +535,8 @@ public class LispAddressUtilTest { .address.service.path.ServicePathBuilder servicePathBuilder = new org.opendaylight.yang.gen.v1.urn.ietf .params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address .address.service.path.ServicePathBuilder(); - servicePathBuilder.setServiceIndex(SERVICE_INDEX_TEST); - servicePathBuilder.setServicePathId(new ServicePathIdType(DUMMY_SERVICE_PATH_ID_TYPE)); + servicePathBuilder.setServiceIndex(fromJava(SERVICE_INDEX_TEST)); + servicePathBuilder.setServicePathId(new ServicePathIdType(fromJava(DUMMY_SERVICE_PATH_ID_TYPE))); ServicePath expectedAddress = servicePathBuilder.build(); final Address testedAddress = LispAddressUtil.addressFromServicePath(expectedAddress); @@ -580,7 +582,7 @@ public class LispAddressUtilTest { */ @Test public void addressFromAsNumberTest_withAdNumber() { - final AsNumber expectedAddress = new AsNumber(AS_NUMBER_TEST); + final AsNumber expectedAddress = new AsNumber(fromJava(AS_NUMBER_TEST)); final Address testedAddress = LispAddressUtil.addressFromAsNumber(expectedAddress); assertTrue(testedAddress instanceof org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp .address.types.rev151105.lisp.address.address.AsNumber); @@ -862,7 +864,7 @@ public class LispAddressUtilTest { assertArrayEquals(IPV6_ADDRESS_BYTES_A_TEST, ((Ipv6PrefixBinary) eidFromIpv6PrefixBinary .getAddress()).getIpv6AddressBinary().getValue()); assertEquals(expectedMask, - (short) ((Ipv6PrefixBinary) eidFromIpv6PrefixBinary.getAddress()).getIpv6MaskLength()); + (short) ((Ipv6PrefixBinary) eidFromIpv6PrefixBinary.getAddress()).getIpv6MaskLength().toJava()); } private void verifyToEidWithIpv4(final Eid eidFromIpv4, final boolean isVniChecked) { @@ -930,7 +932,7 @@ public class LispAddressUtilTest { assertArrayEquals(IPV4_ADDRESS_BYTES_A_TEST, ((Ipv4PrefixBinary) eidFromIpv4PrefixBinary.getAddress()).getIpv4AddressBinary().getValue()); assertEquals(expectedMask, - (short) ((Ipv4PrefixBinary) eidFromIpv4PrefixBinary.getAddress()).getIpv4MaskLength()); + (short) ((Ipv4PrefixBinary) eidFromIpv4PrefixBinary.getAddress()).getIpv4MaskLength().toJava()); } private void verifyToEidWithIpv6Binary(final Eid eidFromIpv6, final boolean isVniChecked) { @@ -1248,10 +1250,10 @@ public class LispAddressUtilTest { assertFalse(locatorRecord.isLocalLocator()); assertFalse(locatorRecord.isRlocProbed()); assertTrue(locatorRecord.isRouted()); - assertTrue(1 == locatorRecord.getWeight()); - assertTrue(1 == locatorRecord.getPriority()); - assertTrue(1 == locatorRecord.getMulticastWeight()); - assertTrue(1 == locatorRecord.getMulticastPriority()); + assertTrue(1 == locatorRecord.getWeight().toJava()); + assertTrue(1 == locatorRecord.getPriority().toJava()); + assertTrue(1 == locatorRecord.getMulticastWeight().toJava()); + assertTrue(1 == locatorRecord.getMulticastPriority().toJava()); assertEquals("SFC_LISP", locatorRecord.getLocatorId()); } } @@ -1500,8 +1502,8 @@ public class LispAddressUtilTest { ServicePath servicePath = ((org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp .address.types.rev151105.lisp.address.address.ServicePath) eid.getAddress()).getServicePath(); assertNotNull(servicePath); - assertEquals(SERVICE_INDEX_TEST, servicePath.getServiceIndex()); - assertEquals(SERVICE_PATH_ID_TEST, servicePath.getServicePathId().getValue()); + assertEquals((short) SERVICE_INDEX_TEST, servicePath.getServiceIndex().toJava()); + assertEquals((long) SERVICE_PATH_ID_TEST, servicePath.getServicePathId().getValue().toJava()); } /** diff --git a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/util/MaskUtilTest.java b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/util/MaskUtilTest.java index d87912c6e..322f6b4d9 100644 --- a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/util/MaskUtilTest.java +++ b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/util/MaskUtilTest.java @@ -11,6 +11,7 @@ import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import static org.opendaylight.yangtools.yang.common.UintConversions.fromJava; import java.net.Inet4Address; import java.net.Inet6Address; @@ -87,9 +88,9 @@ public class MaskUtilTest { private static final Ipv4AddressBinary IPV4_ADDRESS_BINARY = new Ipv4AddressBinary(ipv4ByteAddress); private static final Ipv6AddressBinary IPV6_ADDRESS_BINARY = new Ipv6AddressBinary(ipv6ByteAddress); private static final Ipv4PrefixBinary IPV4_PREFIX_BINARY = new Ipv4PrefixBinaryBuilder() - .setIpv4AddressBinary(IPV4_ADDRESS_BINARY).setIpv4MaskLength((short) 32).build(); + .setIpv4AddressBinary(IPV4_ADDRESS_BINARY).setIpv4MaskLength(fromJava((short) 32)).build(); private static final Ipv6PrefixBinary IPV6_PREFIX_BINARY = new Ipv6PrefixBinaryBuilder() - .setIpv6AddressBinary(IPV6_ADDRESS_BINARY).setIpv6MaskLength((short) 128).build(); + .setIpv6AddressBinary(IPV6_ADDRESS_BINARY).setIpv6MaskLength(fromJava((short) 128)).build(); private static final Address ADDRESS_IPV4 = new Ipv4Builder().setIpv4(IPV4_ADDRESS).build(); private static final Address ADDRESS_IPV6 = new Ipv6Builder().setIpv6(new Ipv6Address(IPV6_STRING)).build(); @@ -146,7 +147,7 @@ public class MaskUtilTest { // expected result assertArrayEquals(ipv4ExpectedByteAddress, resultPrefix.getIpv4AddressBinary().getValue()); - assertEquals((short) 20, (short) resultPrefix.getIpv4MaskLength()); + assertEquals((short) 20, (short) resultPrefix.getIpv4MaskLength().toJava()); } /** @@ -160,7 +161,7 @@ public class MaskUtilTest { // expected result assertArrayEquals(ipv6ExpectedByteAddress, resultPrefix.getIpv6AddressBinary().getValue()); - assertEquals((short) 66, (short) resultPrefix.getIpv6MaskLength()); + assertEquals((short) 66, (short) resultPrefix.getIpv6MaskLength().toJava()); } /** @@ -224,7 +225,7 @@ public class MaskUtilTest { // expected result final byte[] expectedResult = Inet4Address.getByName("255.255.240.0").getAddress(); assertArrayEquals(expectedResult, resultPrefix.getIpv4AddressBinary().getValue()); - assertEquals((short) 20, (short) resultPrefix.getIpv4MaskLength()); + assertEquals((short) 20, (short) resultPrefix.getIpv4MaskLength().toJava()); } /** @@ -239,7 +240,7 @@ public class MaskUtilTest { // expected result final byte[] expectedResult = Inet6Address.getByName("1111:2222:3333:4444:4000::").getAddress(); assertArrayEquals(expectedResult, resultPrefix.getIpv6AddressBinary().getValue()); - assertEquals((short) 66, (short) resultPrefix.getIpv6MaskLength()); + assertEquals((short) 66, (short) resultPrefix.getIpv6MaskLength().toJava()); } /** @@ -427,9 +428,9 @@ public class MaskUtilTest { return new InstanceIdBuilder() .setInstanceId(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types .rev151105.lisp.address.address.instance.id.InstanceIdBuilder() - .setIid(new InstanceIdType(1L)) + .setIid(new InstanceIdType(fromJava(1L))) .setAddress(new SimpleAddress(new IpPrefix(IPV4_PREFIX))) - .setMaskLength((short) 32).build()) + .setMaskLength(fromJava((short) 32)).build()) .build(); } @@ -437,7 +438,7 @@ public class MaskUtilTest { return new InstanceIdBuilder() .setInstanceId(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types .rev151105.lisp.address.address.instance.id.InstanceIdBuilder() - .setIid(new InstanceIdType(1L)) + .setIid(new InstanceIdType(fromJava(1L))) .setAddress(new SimpleAddress(new IpAddress(new Ipv4Address(IPV4_STRING_1)))).build()) .build(); } @@ -448,8 +449,8 @@ public class MaskUtilTest { .xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.service.path.ServicePathBuilder(); return new ServicePathBuilder().setServicePath(servicePathBuilder - .setServiceIndex((short) 1) - .setServicePathId(new ServicePathIdType(1L)).build()) + .setServiceIndex(fromJava((short) 1)) + .setServicePathId(new ServicePathIdType(fromJava(1L))).build()) .build(); } } diff --git a/mappingservice/mapcache/src/main/java/org/opendaylight/lispflowmapping/mapcache/AuthKeyDb.java b/mappingservice/mapcache/src/main/java/org/opendaylight/lispflowmapping/mapcache/AuthKeyDb.java index 131da871f..2d29a9ede 100644 --- a/mappingservice/mapcache/src/main/java/org/opendaylight/lispflowmapping/mapcache/AuthKeyDb.java +++ b/mappingservice/mapcache/src/main/java/org/opendaylight/lispflowmapping/mapcache/AuthKeyDb.java @@ -39,7 +39,7 @@ public class AuthKeyDb implements IAuthKeyDb { if (eid.getVirtualNetworkId() == null) { return 0; } else { - return eid.getVirtualNetworkId().getValue(); + return eid.getVirtualNetworkId().getValue().toJava(); } } diff --git a/mappingservice/mapcache/src/main/java/org/opendaylight/lispflowmapping/mapcache/MultiTableMapCache.java b/mappingservice/mapcache/src/main/java/org/opendaylight/lispflowmapping/mapcache/MultiTableMapCache.java index 6f62f7216..90d0d8a6f 100644 --- a/mappingservice/mapcache/src/main/java/org/opendaylight/lispflowmapping/mapcache/MultiTableMapCache.java +++ b/mappingservice/mapcache/src/main/java/org/opendaylight/lispflowmapping/mapcache/MultiTableMapCache.java @@ -39,7 +39,7 @@ public class MultiTableMapCache implements IMapCache { if (eid.getVirtualNetworkId() == null) { return 0; } else { - return eid.getVirtualNetworkId().getValue(); + return eid.getVirtualNetworkId().getValue().toJava(); } } diff --git a/mappingservice/mapcache/src/main/java/org/opendaylight/lispflowmapping/mapcache/SimpleMapCache.java b/mappingservice/mapcache/src/main/java/org/opendaylight/lispflowmapping/mapcache/SimpleMapCache.java index 4310e35cb..7823d7fa3 100644 --- a/mappingservice/mapcache/src/main/java/org/opendaylight/lispflowmapping/mapcache/SimpleMapCache.java +++ b/mappingservice/mapcache/src/main/java/org/opendaylight/lispflowmapping/mapcache/SimpleMapCache.java @@ -45,7 +45,7 @@ public class SimpleMapCache implements ILispMapCache { if (eid.getVirtualNetworkId() == null) { return 0; } else { - return eid.getVirtualNetworkId().getValue(); + return eid.getVirtualNetworkId().getValue().toJava(); } } @@ -116,8 +116,7 @@ public class SimpleMapCache implements ILispMapCache { @Override public Object getMapping(Eid srcEid, Eid dstEid) { - final XtrId xtrId = null; - return getMapping(dstEid, xtrId); + return getMapping(dstEid, (XtrId) null); } @Override diff --git a/mappingservice/neutron/pom.xml b/mappingservice/neutron/pom.xml index bb35a5cc0..a0c124f9b 100644 --- a/mappingservice/neutron/pom.xml +++ b/mappingservice/neutron/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.mdsal binding-parent - 4.0.6 + 5.0.3 @@ -17,6 +17,10 @@ build failure. Please do not modify this unless you have a good reason. --> ODL :: lispflowmapping :: ${project.artifactId} + + false + + @@ -77,7 +81,7 @@ org.opendaylight.mdsal mdsal-singleton-common-api - 4.0.6 + 5.0.3 diff --git a/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/intenthandler/listener/VppEndpointListener.java b/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/intenthandler/listener/VppEndpointListener.java index 0c99a36d4..2dcb8d9c6 100644 --- a/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/intenthandler/listener/VppEndpointListener.java +++ b/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/intenthandler/listener/VppEndpointListener.java @@ -146,8 +146,8 @@ public class VppEndpointListener implements AutoCloseable, ClusteredDataTreeChan }); return Futures.transform(probeVppNodeForConnection, - vd -> nodeIdToKeyedInstanceIdentifierMap.get(newOrModifiedNode.getNodeId()).iterator().next(), - MoreExecutors.directExecutor()); + vd -> nodeIdToKeyedInstanceIdentifierMap.get(newOrModifiedNode.getNodeId()).iterator().next(), + MoreExecutors.directExecutor()); } private void processNodeOnConnection(final Node newOrModifiedNode) { diff --git a/mappingservice/neutron/src/test/java/org/opendaylight/lispflowmapping/neutron/PortDataProcessorTest.java b/mappingservice/neutron/src/test/java/org/opendaylight/lispflowmapping/neutron/PortDataProcessorTest.java index 9140c6638..e44e21626 100644 --- a/mappingservice/neutron/src/test/java/org/opendaylight/lispflowmapping/neutron/PortDataProcessorTest.java +++ b/mappingservice/neutron/src/test/java/org/opendaylight/lispflowmapping/neutron/PortDataProcessorTest.java @@ -73,7 +73,7 @@ public class PortDataProcessorTest { Field field = portDataProcessor.getClass().getDeclaredField("hostInformationManager"); field.setAccessible(true); field.set(portDataProcessor, hostInformationManager); - } catch (Exception e) { + } catch (NoSuchFieldException | IllegalAccessException e) { throw new RuntimeException("Unable to set hostInformationManager", e); } diff --git a/mappingservice/pom.xml b/mappingservice/pom.xml index be6a6ffd2..4a8fdf390 100644 --- a/mappingservice/pom.xml +++ b/mappingservice/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent odlparent - 5.0.2 + 6.0.0 @@ -39,7 +39,7 @@ org.opendaylight.mdsal mdsal-artifacts - 4.0.6 + 5.0.3 pom import @@ -66,19 +66,6 @@ - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - true - checkstyle.violationSeverity=error - - - - org.apache.felix diff --git a/mappingservice/shell/src/main/java/org/opendaylight/lispflowmapping/shell/LispAddKey.java b/mappingservice/shell/src/main/java/org/opendaylight/lispflowmapping/shell/LispAddKey.java index f47739a55..31aefc41b 100644 --- a/mappingservice/shell/src/main/java/org/opendaylight/lispflowmapping/shell/LispAddKey.java +++ b/mappingservice/shell/src/main/java/org/opendaylight/lispflowmapping/shell/LispAddKey.java @@ -24,8 +24,10 @@ public class LispAddKey extends OsgiCommandSupport { @Override protected Object doExecute() throws Exception { - mappingServiceShell.addDefaultKeyIPv4(); - mappingServiceShell.addDefaultKeyIPv6(); + if (mappingServiceShell != null) { + mappingServiceShell.addDefaultKeyIPv4(); + mappingServiceShell.addDefaultKeyIPv6(); + } return null; } diff --git a/mappingservice/shell/src/main/java/org/opendaylight/lispflowmapping/shell/LispKeys.java b/mappingservice/shell/src/main/java/org/opendaylight/lispflowmapping/shell/LispKeys.java index 2a684e981..f4952ba89 100644 --- a/mappingservice/shell/src/main/java/org/opendaylight/lispflowmapping/shell/LispKeys.java +++ b/mappingservice/shell/src/main/java/org/opendaylight/lispflowmapping/shell/LispKeys.java @@ -33,10 +33,12 @@ public class LispKeys extends OsgiCommandSupport { @Override @SuppressWarnings("checkstyle:RegexpSinglelineJava") protected Object doExecute() throws Exception { - if (debug) { - System.out.print(mappingServiceShell.printKeys()); - } else { - System.out.print(mappingServiceShell.prettyPrintKeys()); + if (mappingServiceShell != null) { + if (debug) { + System.out.print(mappingServiceShell.printKeys()); + } else { + System.out.print(mappingServiceShell.prettyPrintKeys()); + } } return null; } diff --git a/mappingservice/shell/src/main/java/org/opendaylight/lispflowmapping/shell/LispMappings.java b/mappingservice/shell/src/main/java/org/opendaylight/lispflowmapping/shell/LispMappings.java index 01a8de054..5fee82e83 100644 --- a/mappingservice/shell/src/main/java/org/opendaylight/lispflowmapping/shell/LispMappings.java +++ b/mappingservice/shell/src/main/java/org/opendaylight/lispflowmapping/shell/LispMappings.java @@ -29,10 +29,12 @@ public class LispMappings extends OsgiCommandSupport { @Override @SuppressWarnings("checkstyle:RegexpSinglelineJava") protected Object doExecute() throws Exception { - if (debug) { - System.out.print(mappingServiceShell.printMappings()); - } else { - System.out.print(mappingServiceShell.prettyPrintMappings()); + if (mappingServiceShell != null) { + if (debug) { + System.out.print(mappingServiceShell.printMappings()); + } else { + System.out.print(mappingServiceShell.prettyPrintMappings()); + } } return null; } diff --git a/mappingservice/southbound/pom.xml b/mappingservice/southbound/pom.xml index ca780ebe4..593d08820 100644 --- a/mappingservice/southbound/pom.xml +++ b/mappingservice/southbound/pom.xml @@ -14,6 +14,10 @@ build failure. Please do not modify this unless you have a good reason. --> ODL :: lispflowmapping :: ${project.artifactId} + + false + + org.osgi @@ -65,9 +69,16 @@ org.opendaylight.lispflowmapping common.unittest.tools + + org.mockito + mockito-core + 2.28.2 + test + org.mockito mockito-inline + 2.28.2 test diff --git a/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/LispSouthboundPlugin.java b/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/LispSouthboundPlugin.java index 289cd9f7c..6bc70e716 100644 --- a/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/LispSouthboundPlugin.java +++ b/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/LispSouthboundPlugin.java @@ -239,7 +239,7 @@ public class LispSouthboundPlugin implements IConfigLispSouthboundPlugin, AutoCl public void handleSerializedLispBuffer(TransportAddress address, ByteBuffer outBuffer, final MessageType packetType) { InetAddress ip = getInetAddress(address); - handleSerializedLispBuffer(ip, outBuffer, packetType, address.getPort().getValue(), null); + handleSerializedLispBuffer(ip, outBuffer, packetType, address.getPort().getValue().toJava(), null); } public void handleSerializedLispBuffer(InetAddress address, ByteBuffer outBuffer, diff --git a/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/lisp/LispSouthboundHandler.java b/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/lisp/LispSouthboundHandler.java index 6a9ae4250..b6972db6d 100644 --- a/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/lisp/LispSouthboundHandler.java +++ b/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/lisp/LispSouthboundHandler.java @@ -8,6 +8,8 @@ package org.opendaylight.lispflowmapping.southbound.lisp; +import static org.opendaylight.yangtools.yang.common.UintConversions.fromJava; + import io.netty.buffer.ByteBufUtil; import io.netty.channel.Channel; import io.netty.channel.ChannelHandler; @@ -130,7 +132,7 @@ public class LispSouthboundHandler extends SimpleChannelInboundHandler