From 3c73defbc882b42de41b43ac2a3b35592e216157 Mon Sep 17 00:00:00 2001 From: Lorand Jakab Date: Thu, 4 Apr 2019 15:58:09 +0200 Subject: [PATCH] Bump mdsal to 4.0.0 This bumps references to mdsal-4.0.0, fixing up the fallout. Change-Id: I9d3ec25018d90df13e5d03eb7f50c1b290acd500 Signed-off-by: Lorand Jakab Signed-off-by: Robert Varga --- commons/parent/pom.xml | 2 +- features/odl-lispflowmapping-models/pom.xml | 2 +- features/odl-lispflowmapping-neutron/pom.xml | 2 +- mappingservice/api/pom.xml | 2 +- mappingservice/lisp-proto/pom.xml | 2 +- .../lisp/serializer/address/NoAddressSerializer.java | 5 +++-- .../lispflowmapping/lisp/util/LispAddressUtil.java | 3 ++- .../lisp/util/LispAddressStringifierTest.java | 3 ++- .../lispflowmapping/lisp/util/LispAddressUtilTest.java | 5 +++-- mappingservice/neutron/pom.xml | 4 ++-- mappingservice/pom.xml | 2 +- 11 files changed, 18 insertions(+), 14 deletions(-) diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml index 5193d849a..e3135dc0e 100644 --- a/commons/parent/pom.xml +++ b/commons/parent/pom.xml @@ -50,7 +50,7 @@ org.opendaylight.mdsal mdsal-artifacts - 3.0.6 + 4.0.0 pom import diff --git a/features/odl-lispflowmapping-models/pom.xml b/features/odl-lispflowmapping-models/pom.xml index f524d18bb..c1fb71d63 100644 --- a/features/odl-lispflowmapping-models/pom.xml +++ b/features/odl-lispflowmapping-models/pom.xml @@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal mdsal-artifacts - 3.0.6 + 4.0.0 pom import diff --git a/features/odl-lispflowmapping-neutron/pom.xml b/features/odl-lispflowmapping-neutron/pom.xml index 0c6111b17..44c0d317e 100644 --- a/features/odl-lispflowmapping-neutron/pom.xml +++ b/features/odl-lispflowmapping-neutron/pom.xml @@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal mdsal-artifacts - 3.0.6 + 4.0.0 pom import diff --git a/mappingservice/api/pom.xml b/mappingservice/api/pom.xml index 22e6a3eb1..c914ae758 100644 --- a/mappingservice/api/pom.xml +++ b/mappingservice/api/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.mdsal binding-parent - 3.0.6 + 4.0.0 diff --git a/mappingservice/lisp-proto/pom.xml b/mappingservice/lisp-proto/pom.xml index 26bc609b2..44d9def11 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 - 3.0.6 + 4.0.0 diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/NoAddressSerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/NoAddressSerializer.java index 19a6df6c7..39be7940a 100644 --- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/NoAddressSerializer.java +++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/NoAddressSerializer.java @@ -16,6 +16,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.ei import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.EidBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.rloc.container.Rloc; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.rloc.container.RlocBuilder; +import org.opendaylight.yangtools.yang.common.Empty; public final class NoAddressSerializer extends LispAddressSerializer { @@ -48,7 +49,7 @@ public final class NoAddressSerializer extends LispAddressSerializer { EidBuilder eb = new EidBuilder(); eb.setAddressType(NoAddressAfi.class); eb.setVirtualNetworkId(getVni(ctx)); - eb.setAddress(new NoAddressBuilder().setNoAddress(true).build()); + eb.setAddress(new NoAddressBuilder().setNoAddress(Empty.getInstance()).build()); return eb.build(); } @@ -57,7 +58,7 @@ public final class NoAddressSerializer extends LispAddressSerializer { RlocBuilder rb = new RlocBuilder(); rb.setAddressType(NoAddressAfi.class); rb.setVirtualNetworkId(null); - rb.setAddress(new NoAddressBuilder().setNoAddress(true).build()); + rb.setAddress(new NoAddressBuilder().setNoAddress(Empty.getInstance()).build()); return rb.build(); } 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 9d12413c4..7f7b6c250 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 @@ -85,6 +85,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.lo import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.locatorrecords.LocatorRecordBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.rloc.container.Rloc; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.rloc.container.RlocBuilder; +import org.opendaylight.yangtools.yang.common.Empty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -764,7 +765,7 @@ public final class LispAddressUtil { EidBuilder builder = new EidBuilder(); builder.setAddressType(NoAddressAfi.class); builder.setVirtualNetworkId(null); - builder.setAddress(new NoAddressBuilder().setNoAddress(true).build()); + builder.setAddress(new NoAddressBuilder().setNoAddress(Empty.getInstance()).build()); return builder.build(); } diff --git a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressStringifierTest.java b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressStringifierTest.java index 53db74be7..eb14c4599 100644 --- a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressStringifierTest.java +++ b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressStringifierTest.java @@ -70,6 +70,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.typ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address.address.Ipv6PrefixBinaryBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.XtrId; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.EidBuilder; +import org.opendaylight.yangtools.yang.common.Empty; public class LispAddressStringifierTest { @@ -150,7 +151,7 @@ public class LispAddressStringifierTest { private static final LispAddress LISP_AS_NUMBER = new EidBuilder().setAddress(AS_NUMBER_LISP_TYPE).build(); // NoAddress - private static final NoAddress NO_ADDRESS = new NoAddressBuilder().setNoAddress(true).build(); + private static final NoAddress NO_ADDRESS = new NoAddressBuilder().setNoAddress(Empty.getInstance()).build(); private static final LispAddress LISP_NO_ADDRESS = new EidBuilder().setAddress(NO_ADDRESS).build(); // AfiList 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 7feb3f810..8bf667a29 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 @@ -86,6 +86,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.ei import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.locatorrecords.LocatorRecord; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.rloc.container.Rloc; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.rloc.container.RlocBuilder; +import org.opendaylight.yangtools.yang.common.Empty; public class LispAddressUtilTest { @@ -1156,7 +1157,7 @@ public class LispAddressUtilTest { } /** - * Tests {@link LispAddressUtil#asSrcDstEid(String, String, int, int, int)} method. + * Tests {@link LispAddressUtil#asSrcDstEid(String, String, int, int, long)} method. */ @Test public void asSrcDstEid_addressesAsString() { @@ -1272,7 +1273,7 @@ public class LispAddressUtilTest { final Eid noAddressEid = LispAddressUtil.getNoAddressEid(); assertEquals(NoAddressAfi.class, noAddressEid.getAddressType()); assertNull(noAddressEid.getVirtualNetworkId()); - assertTrue(((NoAddress) noAddressEid.getAddress()).isNoAddress()); + assertEquals(((NoAddress) noAddressEid.getAddress()).getNoAddress(), Empty.getInstance()); } /** diff --git a/mappingservice/neutron/pom.xml b/mappingservice/neutron/pom.xml index 7be24d9e8..6a2912961 100644 --- a/mappingservice/neutron/pom.xml +++ b/mappingservice/neutron/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.mdsal binding-parent - 3.0.6 + 4.0.0 @@ -85,7 +85,7 @@ org.opendaylight.mdsal mdsal-singleton-common-api - 3.0.6 + 4.0.0 com.google.code.findbugs diff --git a/mappingservice/pom.xml b/mappingservice/pom.xml index 1b99bbe31..3b45c155d 100644 --- a/mappingservice/pom.xml +++ b/mappingservice/pom.xml @@ -39,7 +39,7 @@ org.opendaylight.mdsal mdsal-artifacts - 3.0.6 + 4.0.0 pom import -- 2.36.6