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 <lojakab@cisco.com>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 5193d849afa4f3cb82a62915a028b81627d1e567..e3135dc0ebda37e400089a332c187031112a6c62 100644 (file)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -50,7 +50,7 @@
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>3.0.6</version>
+        <version>4.0.0</version>
         <type>pom</type>
        <scope>import</scope>
       </dependency>

diff --git a/features/odl-lispflowmapping-models/pom.xml b/features/odl-lispflowmapping-models/pom.xml
index f524d18bb18a60c9bb6e7d1a64331ce20ecd7d44..c1fb71d634f1c545a45867cef1cfff6e7d996959 100644 (file)
--- 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
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>3.0.6</version>
+        <version>4.0.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/features/odl-lispflowmapping-neutron/pom.xml b/features/odl-lispflowmapping-neutron/pom.xml
index 0c6111b17fee1e08d2c6b885517e7276bc6528e4..44c0d317e0d7ab204f6adf2575c2c5236e2cfb24 100644 (file)
--- 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
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>3.0.6</version>
+        <version>4.0.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/mappingservice/api/pom.xml b/mappingservice/api/pom.xml
index 22e6a3eb1d3d0e1485256a6ce888a60f779cff6e..c914ae758a12ec376ca6c15d29d0f275de528d31 100644 (file)
--- a/mappingservice/api/pom.xml
+++ b/mappingservice/api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>3.0.6</version>
+    <version>4.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/mappingservice/lisp-proto/pom.xml b/mappingservice/lisp-proto/pom.xml
index 26bc609b2e956089e8a70b44bc5dd5e667532c06..44d9def11c14b51cb68e747f843cf0ecbf768c19 100644 (file)
--- 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
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>3.0.6</version>
+    <version>4.0.0</version>
     <relativePath/>
   </parent>
 

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 19a6df6c767a60b4459f9bf9c3586640a1505614..39be7940a3503eeaf0677a290fa3d45ef4cfb864 100644 (file)
--- 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 9d12413c4257be0e59d00f77dace9174d70ab9fd..7f7b6c2505e0a4680e5faa7a46abad21d1f5cbd1 100644 (file)
--- 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 53db74be75dc3862b581adfd5bd20133ec31f040..eb14c4599ecf7f7ca238cfecd87a7a85f8a1da80 100644 (file)
--- 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 7feb3f8100aec64aafbd2766e5e327937150e51f..8bf667a29df5db3a01886e08afea458c3b7f6b73 100644 (file)
--- 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 7be24d9e8ce73fa097c9ecda78c8221481b5e96b..6a29129618eaf84c6abf50d2fcb2887439ddf582 100644 (file)
--- a/mappingservice/neutron/pom.xml
+++ b/mappingservice/neutron/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>3.0.6</version>
+    <version>4.0.0</version>
     <relativePath/>
   </parent>
 
@@ -85,7 +85,7 @@
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>mdsal-singleton-common-api</artifactId>
-      <version>3.0.6</version>
+      <version>4.0.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.findbugs</groupId>

diff --git a/mappingservice/pom.xml b/mappingservice/pom.xml
index 1b99bbe3194a071612bc0eb246b1f1c153afecc0..3b45c155dfddce7e095337bae7eec38a9321761a 100644 (file)
--- a/mappingservice/pom.xml
+++ b/mappingservice/pom.xml
@@ -39,7 +39,7 @@
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>3.0.6</version>
+        <version>4.0.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>