Fix compilation issues related to IpAddress

Use IpAddress containing Ipv4/Ipv6, instead
of the IpAddress containing *nozone generated by
IetfInetUtil.

Change-Id: I4537b31e9561cb645881400358d54bfecd643bc1
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Signed-off-by: Claudio D. Gasparini <claudio.gasparini@pantheon.tech>

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractBGPSessionNegotiator.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractBGPSessionNegotiator.java
index 7cbb6f4d04a1cc9537f39d9c3ab7d5d74c123f21..4fb21f22d67966e892634bc3dbbd8c42563b49b0 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractBGPSessionNegotiator.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractBGPSessionNegotiator.java
@@ -101,7 +101,8 @@ abstract class AbstractBGPSessionNegotiator extends ChannelInboundHandlerAdapter
             // Check if peer is configured in registry before retrieving preferences
             if (!this.registry.isPeerConfigured(remoteIp)) {
                 final BGPDocumentedException cause = new BGPDocumentedException(
-                    String.format("BGP peer with ip: %s not configured, check configured peers in : %s", remoteIp, this.registry), BGPError.CONNECTION_REJECTED);
+                    String.format("BGP peer with ip: %s not configured, check configured peers in : %s",
+                            remoteIp, this.registry), BGPError.CONNECTION_REJECTED);
                 negotiationFailed(cause);
                 return;
             }
@@ -140,7 +141,7 @@ abstract class AbstractBGPSessionNegotiator extends ChannelInboundHandlerAdapter
         if (remoteIp.getIpv6Address() != null) {
             return new IpAddress(Ipv6Util.getFullForm(remoteIp.getIpv6Address()));
         }
-        return remoteIp;
+        return new IpAddress(new Ipv4Address(remoteIp.getIpv4Address()));
     }
 
     protected synchronized void handleMessage(final Notification msg) {

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistry.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistry.java
index 332d4768efb330ef18b56bb37491e21703b6f295..b9c8afe5973a50e0c59e4ffb268fa881b4b1a424 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistry.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistry.java
@@ -100,7 +100,7 @@ public final class StrictBGPPeerRegistry implements BGPPeerRegistry {
         if (ip.getIpv6Address() != null) {
             return new IpAddress(Ipv6Util.getFullForm(ip.getIpv6Address()));
         }
-        return ip;
+        return new IpAddress(new Ipv4Address(ip.getIpv4Address()));
     }
 
     @Override

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AddPathAllPathsTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AddPathAllPathsTest.java
index 13a7dfd50da7bbfbb0f6c208e73b33daf3c37b26..949c44a6c56c2dadf3087b22f04b34963dbdf068 100644 (file)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AddPathAllPathsTest.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AddPathAllPathsTest.java
@@ -154,7 +154,7 @@ public class AddPathAllPathsTest extends AbstractAddPathTest {
 
         final BGPTransportState transportStatePeer1 = peer1State.getBGPTransportState();
         assertEquals(new PortNumber(PORT), transportStatePeer1.getLocalPort());
-        assertEquals(new IpAddress(PEER1), transportStatePeer1.getRemoteAddress());
+        assertEquals(PEER1.getValue(), transportStatePeer1.getRemoteAddress().getIpv4Address().getValue());
 
         assertEquals(State.UP, peer1State.getBGPSessionState().getSessionState());
         checkEquals(()-> assertEquals(1L, peer1State.getBGPPeerMessagesState().getUpdateMessagesReceivedCount()));
@@ -225,7 +225,7 @@ public class AddPathAllPathsTest extends AbstractAddPathTest {
 
         final BGPTransportState transportState = peer4State.getBGPTransportState();
         assertEquals(new PortNumber(PORT), transportState.getLocalPort());
-        assertEquals(new IpAddress(PEER4), transportState.getRemoteAddress());
+        assertEquals(PEER4.getValue(), transportState.getRemoteAddress().getIpv4Address().getValue());
 
         final BGPPeerMessagesState peerMessagesState = peer4State.getBGPPeerMessagesState();
         assertEquals(0L, peerMessagesState.getNotificationMessagesReceivedCount());

diff --git a/util/src/main/java/org/opendaylight/protocol/util/Ipv4Util.java b/util/src/main/java/org/opendaylight/protocol/util/Ipv4Util.java
index 97711cc5f6476389f62db2ac89ff6a1739263a51..660ad61b156e6a734a8f4de41f492c6c82bf7631 100644 (file)
--- a/util/src/main/java/org/opendaylight/protocol/util/Ipv4Util.java
+++ b/util/src/main/java/org/opendaylight/protocol/util/Ipv4Util.java
@@ -22,6 +22,7 @@ import java.util.Map;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
 
@@ -44,7 +45,7 @@ public final class Ipv4Util {
      * @return Ipv4Address
      */
     public static Ipv4Address addressForByteBuf(final ByteBuf buffer) {
-        return IetfInetUtil.INSTANCE.ipv4AddressFor(ByteArray.readBytes(buffer, IP4_LENGTH));
+        return new Ipv4Address(IetfInetUtil.INSTANCE.ipv4AddressFor(ByteArray.readBytes(buffer, IP4_LENGTH)));
     }
 
     /**
@@ -214,7 +215,7 @@ public final class Ipv4Util {
     }
 
     public static Ipv4Prefix incrementIpv4Prefix(final Ipv4Prefix ipv4Prefix) {
-        final Map.Entry<Ipv4Address, Integer> splitIpv4Prefix = IetfInetUtil.INSTANCE.splitIpv4Prefix(ipv4Prefix);
+        final Map.Entry<Ipv4AddressNoZone, Integer> splitIpv4Prefix = IetfInetUtil.INSTANCE.splitIpv4Prefix(ipv4Prefix);
         return IetfInetUtil.INSTANCE.ipv4PrefixFor(incrementIpv4Address(splitIpv4Prefix.getKey()),
                 splitIpv4Prefix.getValue());
     }

diff --git a/util/src/main/java/org/opendaylight/protocol/util/Ipv6Util.java b/util/src/main/java/org/opendaylight/protocol/util/Ipv6Util.java
index 69916831699d53abfe0588500e536c1450c587d8..b5c53ae484a64d492955f70fa69af0120ca3340e 100644 (file)
--- a/util/src/main/java/org/opendaylight/protocol/util/Ipv6Util.java
+++ b/util/src/main/java/org/opendaylight/protocol/util/Ipv6Util.java
@@ -49,7 +49,7 @@ public final class Ipv6Util {
      * @return Ipv6Address
      */
     public static Ipv6Address addressForByteBuf(final ByteBuf buffer) {
-        return IetfInetUtil.INSTANCE.ipv6AddressFor(ByteArray.readBytes(buffer, IPV6_LENGTH));
+        return new Ipv6Address(IetfInetUtil.INSTANCE.ipv6AddressFor(ByteArray.readBytes(buffer, IPV6_LENGTH)));
     }
 
     /**

diff --git a/util/src/test/java/org/opendaylight/protocol/util/IPAddressesAndPrefixesTest.java b/util/src/test/java/org/opendaylight/protocol/util/IPAddressesAndPrefixesTest.java
index 20ac50c6e3c2c43fc9270a1831b14c239590785c..9c8f4f66e5f3c9c21e7db273e649abc95424b6e8 100644 (file)
--- a/util/src/test/java/org/opendaylight/protocol/util/IPAddressesAndPrefixesTest.java
+++ b/util/src/test/java/org/opendaylight/protocol/util/IPAddressesAndPrefixesTest.java
@@ -26,8 +26,10 @@ import org.junit.Test;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpPrefix;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6AddressNoZone;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
 
@@ -193,11 +195,11 @@ public class IPAddressesAndPrefixesTest {
     public void testInetAddressToIpAddress() {
         final IpAddress ipAddress = Ipv4Util.getIpAddress(InetAddresses.forString("123.42.13.8"));
         Assert.assertNotNull(ipAddress.getIpv4Address());
-        Assert.assertEquals(new Ipv4Address("123.42.13.8"), ipAddress.getIpv4Address());
+        Assert.assertEquals(new Ipv4AddressNoZone("123.42.13.8"), ipAddress.getIpv4Address());
 
         final IpAddress ipAddress2 = Ipv4Util.getIpAddress(InetAddresses.forString("2001:db8:1:2::"));
         Assert.assertNotNull(ipAddress2.getIpv6Address());
-        Assert.assertEquals(new Ipv6Address("2001:db8:1:2::"), ipAddress2.getIpv6Address());
+        Assert.assertEquals(new Ipv6AddressNoZone("2001:db8:1:2::"), ipAddress2.getIpv6Address());
     }
 
     @Test