Mass-convert all compontents to use -no-zone addresses

Rather than taking a step-by-step approach, this patch mass converts
all utilities and ODL models to use -no-zone addresses and fixes up
the fallout from that.

JIRA: BGPCEP-790
Change-Id: Iaa2a8e207aeffd40aa10a4d438587263d053629c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/bgp/benchmark-app/src/main/java/org/opendaylight/protocol/bgp/benchmark/app/AppPeerBenchmark.java b/bgp/benchmark-app/src/main/java/org/opendaylight/protocol/bgp/benchmark/app/AppPeerBenchmark.java
index bfd7949833333a5ee505866062de121861765e77..b7c5b7acc58e503df540cb37b03397308d7c7f34 100644 (file)
--- a/bgp/benchmark-app/src/main/java/org/opendaylight/protocol/bgp/benchmark/app/AppPeerBenchmark.java
+++ b/bgp/benchmark-app/src/main/java/org/opendaylight/protocol/bgp/benchmark/app/AppPeerBenchmark.java
@@ -28,7 +28,7 @@ import org.opendaylight.mdsal.binding.api.TransactionChainListener;
 import org.opendaylight.mdsal.binding.api.WriteTransaction;
 import org.opendaylight.mdsal.common.api.CommitInfo;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.mdsal.binding.api.WriteTransaction;
 import org.opendaylight.mdsal.common.api.CommitInfo;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;

-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.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.application.rib.tables.routes.Ipv4RoutesCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.bgp.rib.rib.loc.rib.tables.routes.Ipv4RoutesCase;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.application.rib.tables.routes.Ipv4RoutesCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.bgp.rib.rib.loc.rib.tables.routes.Ipv4RoutesCase;


@@ -188,17 +188,17 @@ public class AppPeerBenchmark implements OdlBgpAppPeerBenchmarkService, Transact
         return this.routesIId;
     }
 
         return this.routesIId;
     }
 

-    private long addRoute(final Ipv4Prefix ipv4Prefix, final Ipv4Address nextHop, final Uint32 count,
+    private long addRoute(final Ipv4Prefix ipv4Prefix, final Ipv4AddressNoZone nextHop, final Uint32 count,

             final Uint32 batch) {
             final Uint32 batch) {

-        final AttributesBuilder attributesBuilder = new AttributesBuilder();
-        attributesBuilder.setCNextHop(new Ipv4NextHopCaseBuilder().setIpv4NextHop(
-                new Ipv4NextHopBuilder().setGlobal(new Ipv4Address(nextHop)).build()).build());
-        attributesBuilder.setMultiExitDisc(MED);
-        attributesBuilder.setLocalPref(LOC_PREF);
-        attributesBuilder.setOrigin(ORIGIN);
-        attributesBuilder.setAsPath(AS_PATH);
-        final Attributes attributes = attributesBuilder.build();
-        return processRoutes(ipv4Prefix, count, batch, attributes);
+        return processRoutes(ipv4Prefix, count, batch, new AttributesBuilder()
+            .setCNextHop(new Ipv4NextHopCaseBuilder()
+                .setIpv4NextHop(new Ipv4NextHopBuilder().setGlobal(nextHop).build())
+                .build())
+            .setMultiExitDisc(MED)
+            .setLocalPref(LOC_PREF)
+            .setOrigin(ORIGIN)
+            .setAsPath(AS_PATH)
+            .build());

     }
 
     private long deleteRoute(final Ipv4Prefix ipv4Prefix, final Uint32 count, final Uint32 batch) {
     }
 
     private long deleteRoute(final Ipv4Prefix ipv4Prefix, final Uint32 count, final Uint32 batch) {

diff --git a/bgp/benchmark-app/src/main/yang/odl-bgp-app-peer-benchmark.yang b/bgp/benchmark-app/src/main/yang/odl-bgp-app-peer-benchmark.yang
index 91cefd00535921fd7ad82a994085d93a6b961356..07dcf0a15819f7f2b42658776c39c0736da020c6 100644 (file)
--- a/bgp/benchmark-app/src/main/yang/odl-bgp-app-peer-benchmark.yang
+++ b/bgp/benchmark-app/src/main/yang/odl-bgp-app-peer-benchmark.yang
@@ -70,7 +70,7 @@ module odl-bgp-app-peer-benchmark {
             uses input;
             leaf nexthop {
                 mandatory true;
             uses input;
             leaf nexthop {
                 mandatory true;

-                type inet:ipv4-address;
+                type inet:ipv4-address-no-zone;

                 description
                     "nexthop";
             }
                 description
                     "nexthop";
             }


@@ -94,4 +94,4 @@ module odl-bgp-app-peer-benchmark {
         }
     }
 
         }
     }
 

-}
\ No newline at end of file
+}

diff --git a/bgp/benchmark-app/src/test/java/org/opendaylight/protocol/bgp/benchmark/app/AppPeerBenchmarkTest.java b/bgp/benchmark-app/src/test/java/org/opendaylight/protocol/bgp/benchmark/app/AppPeerBenchmarkTest.java
index e0bce080ff627a3e36999c5f7cd59ce726ae591c..80a2cdeede82d4b39762bfdcd391895677a3d737 100644 (file)
--- a/bgp/benchmark-app/src/test/java/org/opendaylight/protocol/bgp/benchmark/app/AppPeerBenchmarkTest.java
+++ b/bgp/benchmark-app/src/test/java/org/opendaylight/protocol/bgp/benchmark/app/AppPeerBenchmarkTest.java
@@ -22,7 +22,7 @@ import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.opendaylight.mdsal.binding.api.RpcProviderService;
 import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractConcurrentDataBrokerTest;
 import org.mockito.MockitoAnnotations;
 import org.opendaylight.mdsal.binding.api.RpcProviderService;
 import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractConcurrentDataBrokerTest;

-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.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv4.routes.Ipv4Routes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.odl.bgp.app.peer.benchmark.rev160309.AddPrefixInput;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv4.routes.Ipv4Routes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.odl.bgp.app.peer.benchmark.rev160309.AddPrefixInput;


@@ -64,7 +64,7 @@ public class AppPeerBenchmarkTest extends AbstractConcurrentDataBrokerTest {
         final InstanceIdentifier<Ipv4Routes> routesIID = appPeerBenchmark.getIpv4RoutesIID();
 
         final AddPrefixInput addPrefix = new AddPrefixInputBuilder().setBatchsize(Uint32.ONE).setCount(Uint32.ONE)
         final InstanceIdentifier<Ipv4Routes> routesIID = appPeerBenchmark.getIpv4RoutesIID();
 
         final AddPrefixInput addPrefix = new AddPrefixInputBuilder().setBatchsize(Uint32.ONE).setCount(Uint32.ONE)

-                .setNexthop(new Ipv4Address(NH)).setPrefix(new Ipv4Prefix(PREFIX)).build();
+                .setNexthop(new Ipv4AddressNoZone(NH)).setPrefix(new Ipv4Prefix(PREFIX)).build();

 
         final RpcResult<AddPrefixOutput> addRpcResult = appPeerBenchmark.addPrefix(addPrefix).get();
         final Result addResult = addRpcResult.getResult().getResult();
 
         final RpcResult<AddPrefixOutput> addRpcResult = appPeerBenchmark.addPrefix(addPrefix).get();
         final Result addResult = addRpcResult.getResult().getResult();

diff --git a/bgp/cli/pom.xml b/bgp/cli/pom.xml
index 59ff80b95a21c1caf9c32ee10b289cb82e3e4d7e..238eafa343b310cb8138a438c5e724a726b6d1ca 100644 (file)
--- a/bgp/cli/pom.xml
+++ b/bgp/cli/pom.xml
@@ -29,10 +29,6 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>bgp-openconfig-api</artifactId>
         </dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>bgp-openconfig-api</artifactId>
         </dependency>

-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>util</artifactId>
-        </dependency>

         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>

diff --git a/bgp/cli/src/main/java/org/opendaylight/protocol/bgp/cli/utils/BGPOperationalStateUtils.java b/bgp/cli/src/main/java/org/opendaylight/protocol/bgp/cli/utils/BGPOperationalStateUtils.java
index 20627c84e4dbee33fa5825f0eb20a09dd1c1ff1c..3007201c4e70a39637446e5a26ec48a95ad5f1e0 100644 (file)
--- a/bgp/cli/src/main/java/org/opendaylight/protocol/bgp/cli/utils/BGPOperationalStateUtils.java
+++ b/bgp/cli/src/main/java/org/opendaylight/protocol/bgp/cli/utils/BGPOperationalStateUtils.java
@@ -18,7 +18,6 @@ import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.ReadTransaction;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.ReadTransaction;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;

-import org.opendaylight.protocol.util.Ipv4Util;

 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.top.Bgp;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.network.instance.rev151018.network.instance.top.NetworkInstances;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.network.instance.rev151018.network.instance.top.network.instances.NetworkInstance;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.top.Bgp;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.network.instance.rev151018.network.instance.top.NetworkInstances;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.network.instance.rev151018.network.instance.top.network.instances.NetworkInstance;


@@ -27,6 +26,7 @@ import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.network.instance.re
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.network.instance.rev151018.network.instance.top.network.instances.network.instance.protocols.Protocol;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.network.instance.rev151018.network.instance.top.network.instances.network.instance.protocols.ProtocolKey;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.policy.types.rev151009.BGP;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.network.instance.rev151018.network.instance.top.network.instances.network.instance.protocols.Protocol;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.network.instance.rev151018.network.instance.top.network.instances.network.instance.protocols.ProtocolKey;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.policy.types.rev151009.BGP;

+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.NetworkInstanceProtocol;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.NetworkInstanceProtocol;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;


@@ -67,14 +67,20 @@ public final class BGPOperationalStateUtils {
         } else {
             if (neighbor != null) {
                 globalBgp.getNeighbors().getNeighbor().stream()
         } else {
             if (neighbor != null) {
                 globalBgp.getNeighbors().getNeighbor().stream()

-                        .filter(neig -> Ipv4Util.toStringIP(neig.key().getNeighborAddress()).matches(neighbor))
+                        .filter(neig -> toString(neig.key().getNeighborAddress()).matches(neighbor))

                         .findFirst()
                         .ifPresent(neighbor1 -> displayNeighborOperationalState(neighbor, neighbor1, stream));
             } else {
                 displayPeerOperationalState(globalBgp.getPeerGroups().getPeerGroup(), stream);
             }
         }
                         .findFirst()
                         .ifPresent(neighbor1 -> displayNeighborOperationalState(neighbor, neighbor1, stream));
             } else {
                 displayPeerOperationalState(globalBgp.getPeerGroups().getPeerGroup(), stream);
             }
         }

+    }

 
 

+    private static String toString(final IpAddress addr) {
+        if (addr.getIpv4Address() != null) {
+            return addr.getIpv4Address().getValue();
+        }
+        return addr.getIpv6Address().getValue();

     }
 
     private static Bgp readGlobalFromDataStore(final DataBroker dataBroker, final String ribId) {
     }
 
     private static Bgp readGlobalFromDataStore(final DataBroker dataBroker, final String ribId) {

diff --git a/bgp/concepts/src/main/java/org/opendaylight/bgp/concepts/IpAddressUtil.java b/bgp/concepts/src/main/java/org/opendaylight/bgp/concepts/IpAddressUtil.java
index 38137cc77ca225e2a58582672a2a54f471fbc54d..d71adfae7f38b16298e532c667f2e3e1eddf1e32 100644 (file)
--- a/bgp/concepts/src/main/java/org/opendaylight/bgp/concepts/IpAddressUtil.java
+++ b/bgp/concepts/src/main/java/org/opendaylight/bgp/concepts/IpAddressUtil.java
@@ -12,8 +12,8 @@ import io.netty.buffer.Unpooled;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.protocol.util.Ipv4Util;
 import org.opendaylight.protocol.util.Ipv6Util;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.protocol.util.Ipv4Util;
 import org.opendaylight.protocol.util.Ipv6Util;

-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.IpAddressBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressNoZone;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressNoZoneBuilder;

 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.DataContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.DataContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;


@@ -33,14 +33,14 @@ public final class IpAddressUtil {
      * Returns IpAddress from byte array containing ipAddress lenght + ipAddress.
      *
      * @param buffer containing ip address
      * Returns IpAddress from byte array containing ipAddress lenght + ipAddress.
      *
      * @param buffer containing ip address

-     * @return IpAddress
+     * @return IpAddressNoZone

      */
      */

-    public static @NonNull IpAddress addressForByteBuf(final ByteBuf buffer) {
+    public static @NonNull IpAddressNoZone addressForByteBuf(final ByteBuf buffer) {

         final int ipLength = buffer.readUnsignedByte();
         if (ipLength == Ipv6Util.IPV6_BITS_LENGTH) {
         final int ipLength = buffer.readUnsignedByte();
         if (ipLength == Ipv6Util.IPV6_BITS_LENGTH) {

-            return new IpAddress(Ipv6Util.addressForByteBuf(buffer));
+            return new IpAddressNoZone(Ipv6Util.addressForByteBuf(buffer));

         } else if (ipLength == Ipv4Util.IP4_BITS_LENGTH) {
         } else if (ipLength == Ipv4Util.IP4_BITS_LENGTH) {

-            return new IpAddress(Ipv4Util.addressForByteBuf(buffer));
+            return new IpAddressNoZone(Ipv4Util.addressForByteBuf(buffer));

         }
         throw new IllegalStateException("Unexpected size");
     }
         }
         throw new IllegalStateException("Unexpected size");
     }


@@ -49,14 +49,14 @@ public final class IpAddressUtil {
      * Returns IpAddress from byte array containing ipAddress based on ByteArray length.
      *
      * @param buffer containing ip address
      * Returns IpAddress from byte array containing ipAddress based on ByteArray length.
      *
      * @param buffer containing ip address

-     * @return IpAddress
+     * @return IpAddressNoZone

      */
      */

-    public static @NonNull IpAddress addressForByteBufWOLength(final ByteBuf buffer) {
+    public static @NonNull IpAddressNoZone addressForByteBufWOLength(final ByteBuf buffer) {

         final int ipLength = buffer.readableBytes();
         if (ipLength == Ipv6Util.IPV6_LENGTH) {
         final int ipLength = buffer.readableBytes();
         if (ipLength == Ipv6Util.IPV6_LENGTH) {

-            return new IpAddress(Ipv6Util.addressForByteBuf(buffer));
+            return new IpAddressNoZone(Ipv6Util.addressForByteBuf(buffer));

         } else if (ipLength == Ipv4Util.IP4_LENGTH) {
         } else if (ipLength == Ipv4Util.IP4_LENGTH) {

-            return new IpAddress(Ipv4Util.addressForByteBuf(buffer));
+            return new IpAddressNoZone(Ipv4Util.addressForByteBuf(buffer));

         }
         throw new IllegalStateException("Unexpected size");
     }
         }
         throw new IllegalStateException("Unexpected size");
     }


@@ -67,14 +67,14 @@ public final class IpAddressUtil {
      * @param address containing ipv4 or ipv6 address
      * @return byte array
      */
      * @param address containing ipv4 or ipv6 address
      * @return byte array
      */

-    public static @NonNull ByteBuf bytesFor(final IpAddress address) {
+    public static @NonNull ByteBuf bytesFor(final IpAddressNoZone address) {

         final ByteBuf body = Unpooled.buffer();
         final ByteBuf body = Unpooled.buffer();

-        if (address.getIpv4Address() != null) {
+        if (address.getIpv4AddressNoZone() != null) {

             body.writeByte(Ipv4Util.IP4_BITS_LENGTH);
             body.writeByte(Ipv4Util.IP4_BITS_LENGTH);

-            body.writeBytes(Ipv4Util.bytesForAddress(address.getIpv4Address()));
-        } else if (address.getIpv6Address() != null) {
+            body.writeBytes(Ipv4Util.bytesForAddress(address.getIpv4AddressNoZone()));
+        } else if (address.getIpv6AddressNoZone() != null) {

             body.writeByte(Ipv6Util.IPV6_BITS_LENGTH);
             body.writeByte(Ipv6Util.IPV6_BITS_LENGTH);

-            body.writeBytes(Ipv6Util.bytesForAddress(address.getIpv6Address()));
+            body.writeBytes(Ipv6Util.bytesForAddress(address.getIpv6AddressNoZone()));

         } else {
             body.writeByte(0);
         }
         } else {
             body.writeByte(0);
         }


@@ -87,22 +87,22 @@ public final class IpAddressUtil {
      * @param address containing ipv4 or ipv6 address
      * @return byte array
      */
      * @param address containing ipv4 or ipv6 address
      * @return byte array
      */

-    public static @NonNull ByteBuf bytesWOLengthFor(final IpAddress address) {
+    public static @NonNull ByteBuf bytesWOLengthFor(final IpAddressNoZone address) {

         final ByteBuf body = Unpooled.buffer();
         final ByteBuf body = Unpooled.buffer();

-        if (address.getIpv4Address() != null) {
-            body.writeBytes(Ipv4Util.bytesForAddress(address.getIpv4Address()));
-        } else if (address.getIpv6Address() != null) {
-            body.writeBytes(Ipv6Util.bytesForAddress(address.getIpv6Address()));
+        if (address.getIpv4AddressNoZone() != null) {
+            body.writeBytes(Ipv4Util.bytesForAddress(address.getIpv4AddressNoZone()));
+        } else if (address.getIpv6AddressNoZone() != null) {
+            body.writeBytes(Ipv6Util.bytesForAddress(address.getIpv6AddressNoZone()));

         } else {
             body.writeByte(0);
         }
         return body;
     }
 
         } else {
             body.writeByte(0);
         }
         return body;
     }
 

-    public static IpAddress extractIpAddress(final DataContainerNode<?> route, final NodeIdentifier rdNid) {
+    public static IpAddressNoZone extractIpAddress(final DataContainerNode<?> route, final NodeIdentifier rdNid) {

         final NormalizedNode<?, ?> rdNode = NormalizedNodes.findNode(route, rdNid).orElse(null);
         if (rdNode != null) {
         final NormalizedNode<?, ?> rdNode = NormalizedNodes.findNode(route, rdNid).orElse(null);
         if (rdNode != null) {

-            return IpAddressBuilder.getDefaultInstance((String) rdNode.getValue());
+            return IpAddressNoZoneBuilder.getDefaultInstance((String) rdNode.getValue());

         }
         return null;
     }
         }
         return null;
     }

diff --git a/bgp/concepts/src/main/java/org/opendaylight/bgp/concepts/RouteDistinguisherUtil.java b/bgp/concepts/src/main/java/org/opendaylight/bgp/concepts/RouteDistinguisherUtil.java
index f7437a641335265bac34918c66773f57174b684b..f973e131b0c3fb2936904e716053a22a1b0550e1 100644 (file)
--- a/bgp/concepts/src/main/java/org/opendaylight/bgp/concepts/RouteDistinguisherUtil.java
+++ b/bgp/concepts/src/main/java/org/opendaylight/bgp/concepts/RouteDistinguisherUtil.java
@@ -14,7 +14,7 @@ import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
 import org.opendaylight.protocol.util.Ipv4Util;
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
 import org.opendaylight.protocol.util.Ipv4Util;

-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.opendaylight.params.xml.ns.yang.bgp.types.rev180329.RdAs;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.RdIpv4;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.RdTwoOctetAs;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.RdAs;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.RdIpv4;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.RdTwoOctetAs;


@@ -88,7 +88,7 @@ public final class RouteDistinguisherUtil {
         checkNoColon(value, first);
 
         buf.writeShort(RDType.IPV4.value);
         checkNoColon(value, first);
 
         buf.writeShort(RDType.IPV4.value);

-        buf.writeBytes(Ipv4Util.bytesForAddress(new Ipv4Address(value.substring(0, first))));
+        buf.writeBytes(Ipv4Util.bytesForAddress(new Ipv4AddressNoZone(value.substring(0, first))));

         buf.writeShort(Integer.parseUnsignedInt(value.substring(first + 1)));
     }
 
         buf.writeShort(Integer.parseUnsignedInt(value.substring(first + 1)));
     }
 

diff --git a/bgp/concepts/src/main/yang/bgp-types.yang b/bgp/concepts/src/main/yang/bgp-types.yang
index 89c6e8b11efac7256f1a5fb5b6e23b4f405bf589..f3204dfeb4d160c4b651ef3ae824daeb6cea6efb 100644 (file)
--- a/bgp/concepts/src/main/yang/bgp-types.yang
+++ b/bgp/concepts/src/main/yang/bgp-types.yang
@@ -48,7 +48,7 @@ module bgp-types {
 
     typedef bgp-id {
         description "BGP identifier";
 
     typedef bgp-id {
         description "BGP identifier";

-        type inet:ipv4-address;
+        type inet:ipv4-address-no-zone;

     }
 
     identity address-family {
     }
 
     identity address-family {


@@ -81,7 +81,7 @@ module bgp-types {
 
     typedef cluster-identifier {
         reference "http://tools.ietf.org/html/rfc4456#section-8";
 
     typedef cluster-identifier {
         reference "http://tools.ietf.org/html/rfc4456#section-8";

-        type inet:ipv4-address;
+        type inet:ipv4-address-no-zone;

     }
 
     typedef short-as-number {
     }
 
     typedef short-as-number {


@@ -204,7 +204,7 @@ module bgp-types {
             type inet:as-number;
         }
         leaf network-address {
             type inet:as-number;
         }
         leaf network-address {

-            type inet:ipv4-address;
+            type inet:ipv4-address-no-zone;

         }
     }
 
         }
     }
 


@@ -222,7 +222,7 @@ module bgp-types {
     grouping route-ipv4-extended-community {
         reference "http://tools.ietf.org/html/rfc4360";
         leaf global-administrator {
     grouping route-ipv4-extended-community {
         reference "http://tools.ietf.org/html/rfc4360";
         leaf global-administrator {

-            type inet:ipv4-address;
+            type inet:ipv4-address-no-zone;

         }
         leaf local-administrator {
             type uint16;
         }
         leaf local-administrator {
             type uint16;


@@ -273,7 +273,7 @@ module bgp-types {
     grouping inet4-specific-extended-community-common {
         container inet4-specific-extended-community-common {
             leaf global-administrator {
     grouping inet4-specific-extended-community-common {
         container inet4-specific-extended-community-common {
             leaf global-administrator {

-                type inet:ipv4-address;
+                type inet:ipv4-address-no-zone;

             }
             leaf local-administrator {
                 type binary {
             }
             leaf local-administrator {
                 type binary {


@@ -371,7 +371,7 @@ module bgp-types {
                     uses inet4-specific-extended-community-common;
                     leaf global-administrator {
                         status deprecated;
                     uses inet4-specific-extended-community-common;
                     leaf global-administrator {
                         status deprecated;

-                        type inet:ipv4-address;
+                        type inet:ipv4-address-no-zone;

                     }
                     leaf local-administrator {
                         status deprecated;
                     }
                     leaf local-administrator {
                         status deprecated;


@@ -465,7 +465,7 @@ module bgp-types {
                 container ipv4-next-hop {
                     reference "http://tools.ietf.org/html/rfc4271#section-5.1.3";
                     leaf global {
                 container ipv4-next-hop {
                     reference "http://tools.ietf.org/html/rfc4271#section-5.1.3";
                     leaf global {

-                        type inet:ipv4-address;
+                        type inet:ipv4-address-no-zone;

                         mandatory true;
                     }
                 }
                         mandatory true;
                     }
                 }


@@ -474,11 +474,11 @@ module bgp-types {
                 container ipv6-next-hop {
                     reference "http://tools.ietf.org/html/rfc4760#section-3";
                     leaf global {
                 container ipv6-next-hop {
                     reference "http://tools.ietf.org/html/rfc4760#section-3";
                     leaf global {

-                        type inet:ipv6-address;
+                        type inet:ipv6-address-no-zone;

                         mandatory true;
                     }
                     leaf link-local {
                         mandatory true;
                     }
                     leaf link-local {

-                        type inet:ipv6-address;
+                        type inet:ipv6-address-no-zone;

                     }
                 }
             }
                     }
                 }
             }


@@ -511,7 +511,7 @@ module bgp-types {
 
     grouping orig-route-ip-grouping {
         leaf orig-route-ip {
 
     grouping orig-route-ip-grouping {
         leaf orig-route-ip {

-            type inet:ip-address;
+            type inet:ip-address-no-zone;

             mandatory true;
         }
     }
             mandatory true;
         }
     }

diff --git a/bgp/concepts/src/test/java/org/opendaylight/bgp/concepts/NextHopUtilTest.java b/bgp/concepts/src/test/java/org/opendaylight/bgp/concepts/NextHopUtilTest.java
index 68711bf0da523cc5b9c0a86b07aed56347f9a44f..bfbd579be808b1a398c82562c8e1bb8ef5103e96 100644 (file)
--- a/bgp/concepts/src/test/java/org/opendaylight/bgp/concepts/NextHopUtilTest.java
+++ b/bgp/concepts/src/test/java/org/opendaylight/bgp/concepts/NextHopUtilTest.java
@@ -16,8 +16,8 @@ import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import org.junit.Test;
 import org.opendaylight.protocol.util.ByteArray;
 import io.netty.buffer.Unpooled;
 import org.junit.Test;
 import org.opendaylight.protocol.util.ByteArray;

-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.Ipv6Address;
+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.Ipv6AddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.CNextHop;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.Ipv4NextHopCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.Ipv4NextHopCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.CNextHop;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.Ipv4NextHopCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.Ipv4NextHopCaseBuilder;


@@ -33,9 +33,9 @@ public class NextHopUtilTest {
     private static final byte[] IPV6LB = {0x20, 1, 0x0d, (byte) 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         1, (byte) 0xfe, (byte) 0x80, 0, 0, 0, 0, 0, 0, (byte) 0xc0, 1, 0x0b, (byte) 0xff, (byte) 0xfe, 0x7e, 0, 0};
 
     private static final byte[] IPV6LB = {0x20, 1, 0x0d, (byte) 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         1, (byte) 0xfe, (byte) 0x80, 0, 0, 0, 0, 0, 0, (byte) 0xc0, 1, 0x0b, (byte) 0xff, (byte) 0xfe, 0x7e, 0, 0};
 

-    private static final Ipv4Address IPV4 = new Ipv4Address("42.42.42.42");
-    private static final Ipv6Address IPV6 = new Ipv6Address("2001:db8::1");
-    private static final Ipv6Address IPV6L = new Ipv6Address("fe80::c001:bff:fe7e:0");
+    private static final Ipv4AddressNoZone IPV4 = new Ipv4AddressNoZone("42.42.42.42");
+    private static final Ipv6AddressNoZone IPV6 = new Ipv6AddressNoZone("2001:db8::1");
+    private static final Ipv6AddressNoZone IPV6L = new Ipv6AddressNoZone("fe80::c001:bff:fe7e:0");

 
     @Test
     public void testSerializeNextHop() {
 
     @Test
     public void testSerializeNextHop() {

diff --git a/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/esi/types/EsiModelUtil.java b/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/esi/types/EsiModelUtil.java
index a222273c6a2eccfc0e99033712e9d4264d73bd1a..fbe6c249ea8bc1660e19a3eb339dbca07ca42d0c 100644 (file)
--- a/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/esi/types/EsiModelUtil.java
+++ b/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/esi/types/EsiModelUtil.java
@@ -9,7 +9,7 @@ package org.opendaylight.protocol.bgp.evpn.impl.esi.types;
 
 import com.google.common.base.Preconditions;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 
 import com.google.common.base.Preconditions;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;

-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.yang.types.rev130715.MacAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev180329.esi.esi.arbitrary._case.Arbitrary;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev180329.esi.esi.arbitrary._case.ArbitraryBuilder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev180329.esi.esi.arbitrary._case.Arbitrary;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev180329.esi.esi.arbitrary._case.ArbitraryBuilder;


@@ -85,7 +85,7 @@ final class EsiModelUtil {
         return new MacAddress((String) macGEn.getChild(SYSTEM_MAC_NID).get().getValue());
     }
 
         return new MacAddress((String) macGEn.getChild(SYSTEM_MAC_NID).get().getValue());
     }
 

-    static Ipv4Address extractRD(final ContainerNode t4) {
-        return new Ipv4Address((String) t4.getChild(RD_NID).get().getValue());
+    static Ipv4AddressNoZone extractRD(final ContainerNode t4) {
+        return new Ipv4AddressNoZone((String) t4.getChild(RD_NID).get().getValue());

     }
 }
     }
 }

diff --git a/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/EthSegRParser.java b/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/EthSegRParser.java
index 063f8cb00993eac49117fa7bc2bc4bf399d315c8..eb805d7815e076596c55f64531769ead1c7dbb1e 100644 (file)
--- a/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/EthSegRParser.java
+++ b/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/EthSegRParser.java
@@ -5,17 +5,16 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */

-

 package org.opendaylight.protocol.bgp.evpn.impl.nlri;
 
 package org.opendaylight.protocol.bgp.evpn.impl.nlri;
 

+import static com.google.common.base.Preconditions.checkArgument;

 import static org.opendaylight.protocol.bgp.evpn.impl.nlri.NlriModelUtil.extractOrigRouteIp;
 
 import static org.opendaylight.protocol.bgp.evpn.impl.nlri.NlriModelUtil.extractOrigRouteIp;
 

-import com.google.common.base.Preconditions;

 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import org.opendaylight.bgp.concepts.IpAddressUtil;
 import org.opendaylight.protocol.bgp.evpn.spi.pojo.SimpleEsiTypeRegistry;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import org.opendaylight.bgp.concepts.IpAddressUtil;
 import org.opendaylight.protocol.bgp.evpn.spi.pojo.SimpleEsiTypeRegistry;

-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.IpAddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev180329.NlriType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev180329.es.route.EsRoute;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev180329.es.route.EsRouteBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev180329.NlriType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev180329.es.route.EsRoute;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev180329.es.route.EsRouteBuilder;


@@ -33,12 +32,11 @@ final class EthSegRParser extends AbstractEvpnNlri {
 
     @Override
     public EvpnChoice parseEvpn(final ByteBuf buffer) {
 
     @Override
     public EvpnChoice parseEvpn(final ByteBuf buffer) {

-        Preconditions.checkArgument(buffer.readableBytes() == CONTENT_LENGTH
-                        || buffer.readableBytes() == CONTENT_LENGTH2,
+        checkArgument(buffer.readableBytes() == CONTENT_LENGTH || buffer.readableBytes() == CONTENT_LENGTH2,

             "Wrong length of array of bytes. Passed: %s ;", buffer);
 
         final Esi esi = SimpleEsiTypeRegistry.getInstance().parseEsi(buffer.readSlice(ESI_SIZE));
             "Wrong length of array of bytes. Passed: %s ;", buffer);
 
         final Esi esi = SimpleEsiTypeRegistry.getInstance().parseEsi(buffer.readSlice(ESI_SIZE));

-        final IpAddress ip = IpAddressUtil.addressForByteBuf(buffer);
+        final IpAddressNoZone ip = IpAddressUtil.addressForByteBuf(buffer);

 
         final EsRouteBuilder builder = new EsRouteBuilder().setEsi(esi).setOrigRouteIp(ip);
         return new EsRouteCaseBuilder().setEsRoute(builder.build()).build();
 
         final EsRouteBuilder builder = new EsRouteBuilder().setEsi(esi).setOrigRouteIp(ip);
         return new EsRouteCaseBuilder().setEsRoute(builder.build()).build();


@@ -51,13 +49,13 @@ final class EthSegRParser extends AbstractEvpnNlri {
 
     @Override
     public ByteBuf serializeBody(final EvpnChoice evpnInput) {
 
     @Override
     public ByteBuf serializeBody(final EvpnChoice evpnInput) {

-        Preconditions.checkArgument(evpnInput instanceof EsRouteCase,
-                "Unknown evpn instance. Passed %s. Needed EsRouteCase.", evpnInput.getClass());
+        checkArgument(evpnInput instanceof EsRouteCase, "Unknown evpn instance. Passed %s. Needed EsRouteCase.",
+            evpnInput.getClass());

         final EsRoute evpn = ((EsRouteCase) evpnInput).getEsRoute();
         final ByteBuf body = Unpooled.buffer();
         SimpleEsiTypeRegistry.getInstance().serializeEsi(evpn.getEsi(), body);
         final ByteBuf orig = IpAddressUtil.bytesFor(evpn.getOrigRouteIp());
         final EsRoute evpn = ((EsRouteCase) evpnInput).getEsRoute();
         final ByteBuf body = Unpooled.buffer();
         SimpleEsiTypeRegistry.getInstance().serializeEsi(evpn.getEsi(), body);
         final ByteBuf orig = IpAddressUtil.bytesFor(evpn.getOrigRouteIp());

-        Preconditions.checkArgument(orig.readableBytes() > 0);
+        checkArgument(orig.readableBytes() > 0);

         body.writeBytes(orig);
         return body;
     }
         body.writeBytes(orig);
         return body;
     }

diff --git a/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/IncMultEthTagRParser.java b/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/IncMultEthTagRParser.java
index 0adef2f87c332f9234c77627809b5df383de31f6..503bd2161c9381a7d11a6e80ece4a93b9ea49517 100644 (file)
--- a/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/IncMultEthTagRParser.java
+++ b/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/IncMultEthTagRParser.java
@@ -14,7 +14,7 @@ import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import org.opendaylight.bgp.concepts.IpAddressUtil;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import org.opendaylight.bgp.concepts.IpAddressUtil;

-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.IpAddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev180329.NlriType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev180329.ethernet.tag.id.EthernetTagId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev180329.ethernet.tag.id.EthernetTagIdBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev180329.NlriType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev180329.ethernet.tag.id.EthernetTagId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev180329.ethernet.tag.id.EthernetTagIdBuilder;


@@ -46,7 +46,7 @@ final class IncMultEthTagRParser extends AbstractEvpnNlri {
                 "Wrong length of array of bytes. Passed: %s ;", buffer);
 
         final EthernetTagId eti = new EthernetTagIdBuilder().setVlanId(ByteBufUtils.readUint32(buffer)).build();
                 "Wrong length of array of bytes. Passed: %s ;", buffer);
 
         final EthernetTagId eti = new EthernetTagIdBuilder().setVlanId(ByteBufUtils.readUint32(buffer)).build();

-        IpAddress ip = IpAddressUtil.addressForByteBuf(buffer);
+        final IpAddressNoZone ip = IpAddressUtil.addressForByteBuf(buffer);

         final IncMultiEthernetTagResBuilder builder = new IncMultiEthernetTagResBuilder()
                 .setEthernetTagId(eti).setOrigRouteIp(ip);
         return new IncMultiEthernetTagResCaseBuilder().setIncMultiEthernetTagRes(builder.build()).build();
         final IncMultiEthernetTagResBuilder builder = new IncMultiEthernetTagResBuilder()
                 .setEthernetTagId(eti).setOrigRouteIp(ip);
         return new IncMultiEthernetTagResCaseBuilder().setIncMultiEthernetTagRes(builder.build()).build();

diff --git a/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/MACIpAdvRParser.java b/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/MACIpAdvRParser.java
index 092fbcabdcd22f7cdef35bfdf3cdf25f87ea49d3..e18d218663e43e5d6354f1ab6edfb199d85664f6 100644 (file)
--- a/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/MACIpAdvRParser.java
+++ b/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/MACIpAdvRParser.java
@@ -23,7 +23,7 @@ import org.opendaylight.protocol.bgp.evpn.spi.pojo.SimpleEsiTypeRegistry;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.protocol.util.Ipv4Util;
 import org.opendaylight.protocol.util.Ipv6Util;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.protocol.util.Ipv4Util;
 import org.opendaylight.protocol.util.Ipv6Util;

-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.IpAddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.IetfYangUtil;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev180329.NlriType;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.IetfYangUtil;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev180329.NlriType;


@@ -50,7 +50,7 @@ final class MACIpAdvRParser extends AbstractEvpnNlri {
         final EthernetTagId eti = new EthernetTagIdBuilder().setVlanId(ByteBufUtils.readUint32(buffer)).build();
         buffer.skipBytes(1);
         final MacAddress mac = IetfYangUtil.INSTANCE.macAddressFor(ByteArray.readBytes(buffer, MAC_ADDRESS_LENGTH));
         final EthernetTagId eti = new EthernetTagIdBuilder().setVlanId(ByteBufUtils.readUint32(buffer)).build();
         buffer.skipBytes(1);
         final MacAddress mac = IetfYangUtil.INSTANCE.macAddressFor(ByteArray.readBytes(buffer, MAC_ADDRESS_LENGTH));

-        final IpAddress ip = parseIp(buffer);
+        final IpAddressNoZone ip = parseIp(buffer);

         final MplsLabel label1 = mplsLabelForByteBuf(buffer);
         MplsLabel label2;
         if (buffer.readableBytes() > 0) {
         final MplsLabel label1 = mplsLabelForByteBuf(buffer);
         MplsLabel label2;
         if (buffer.readableBytes() > 0) {


@@ -121,15 +121,15 @@ final class MACIpAdvRParser extends AbstractEvpnNlri {
         return builder;
     }
 
         return builder;
     }
 

-    private static ByteBuf serializeIp(final IpAddress ipAddress) {
+    private static ByteBuf serializeIp(final IpAddressNoZone ipAddress) {

         final ByteBuf body = Unpooled.buffer();
         if (ipAddress != null) {
         final ByteBuf body = Unpooled.buffer();
         if (ipAddress != null) {

-            if (ipAddress.getIpv4Address() != null) {
+            if (ipAddress.getIpv4AddressNoZone() != null) {

                 body.writeByte(Ipv4Util.IP4_BITS_LENGTH);
                 body.writeByte(Ipv4Util.IP4_BITS_LENGTH);

-                body.writeBytes(Ipv4Util.bytesForAddress(ipAddress.getIpv4Address()));
-            } else if (ipAddress.getIpv6Address() != null) {
+                body.writeBytes(Ipv4Util.bytesForAddress(ipAddress.getIpv4AddressNoZone()));
+            } else if (ipAddress.getIpv6AddressNoZone() != null) {

                 body.writeByte(Ipv6Util.IPV6_BITS_LENGTH);
                 body.writeByte(Ipv6Util.IPV6_BITS_LENGTH);

-                body.writeBytes(Ipv6Util.bytesForAddress(ipAddress.getIpv6Address()));
+                body.writeBytes(Ipv6Util.bytesForAddress(ipAddress.getIpv6AddressNoZone()));

             } else {
                 body.writeByte(0);
             }
             } else {
                 body.writeByte(0);
             }


@@ -139,12 +139,12 @@ final class MACIpAdvRParser extends AbstractEvpnNlri {
         return body;
     }
 
         return body;
     }
 

-    private static IpAddress parseIp(final ByteBuf buffer) {
+    private static IpAddressNoZone parseIp(final ByteBuf buffer) {

         final int ipLength = buffer.readUnsignedByte();
         if (ipLength == Ipv6Util.IPV6_BITS_LENGTH) {
         final int ipLength = buffer.readUnsignedByte();
         if (ipLength == Ipv6Util.IPV6_BITS_LENGTH) {

-            return new IpAddress(Ipv6Util.addressForByteBuf(buffer));
+            return new IpAddressNoZone(Ipv6Util.addressForByteBuf(buffer));

         } else if (ipLength == Ipv4Util.IP4_BITS_LENGTH) {
         } else if (ipLength == Ipv4Util.IP4_BITS_LENGTH) {

-            return new IpAddress(Ipv4Util.addressForByteBuf(buffer));
+            return new IpAddressNoZone(Ipv4Util.addressForByteBuf(buffer));

         }
         return null;
     }
         }
         return null;
     }

diff --git a/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/NlriModelUtil.java b/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/NlriModelUtil.java
index 1db73f376926e0efc728f6923cf9de53d17285c9..74f198d52fb302d2401d3ed8dd97702fdab35e13 100644 (file)
--- a/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/NlriModelUtil.java
+++ b/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/NlriModelUtil.java
@@ -7,8 +7,8 @@
  */
 package org.opendaylight.protocol.bgp.evpn.impl.nlri;
 
  */
 package org.opendaylight.protocol.bgp.evpn.impl.nlri;
 

-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.IpAddressBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressNoZone;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressNoZoneBuilder;

 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev180329.ethernet.tag.id.EthernetTagId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev180329.ethernet.tag.id.EthernetTagIdBuilder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev180329.ethernet.tag.id.EthernetTagId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev180329.ethernet.tag.id.EthernetTagIdBuilder;


@@ -51,11 +51,10 @@ final class NlriModelUtil {
         return RouteDistinguisherBuilder.getDefaultInstance((String) evpn.getChild(RD_NID).get().getValue());
     }
 
         return RouteDistinguisherBuilder.getDefaultInstance((String) evpn.getChild(RD_NID).get().getValue());
     }
 

-    static IpAddress extractOrigRouteIp(final DataContainerNode<? extends PathArgument> evpn) {
-        return IpAddressBuilder.getDefaultInstance((String) evpn.getChild(ORI_NID).get().getValue());
+    static IpAddressNoZone extractOrigRouteIp(final DataContainerNode<? extends PathArgument> evpn) {
+        return IpAddressNoZoneBuilder.getDefaultInstance((String) evpn.getChild(ORI_NID).get().getValue());

     }
 
     }
 

-

     static EthernetTagId extractETI(final ContainerNode evpn) {
         final ContainerNode eti = (ContainerNode) evpn.getChild(ETI_NID).get();
         return new EthernetTagIdBuilder().setVlanId((Uint32) eti.getChild(VLAN_NID).get().getValue()).build();
     static EthernetTagId extractETI(final ContainerNode evpn) {
         final ContainerNode eti = (ContainerNode) evpn.getChild(ETI_NID).get();
         return new EthernetTagIdBuilder().setVlanId((Uint32) eti.getChild(VLAN_NID).get().getValue()).build();


@@ -65,19 +64,13 @@ final class NlriModelUtil {
         return new MacAddress((String) evpn.getChild(MAC_NID).get().getValue());
     }
 
         return new MacAddress((String) evpn.getChild(MAC_NID).get().getValue());
     }
 

-
-    static IpAddress extractIp(final DataContainerNode<? extends PathArgument> evpn) {
-        if (evpn.getChild(IP_NID).isPresent()) {
-            return IpAddressBuilder.getDefaultInstance((String) evpn.getChild(IP_NID).get().getValue());
-        }
-        return null;
+    static IpAddressNoZone extractIp(final DataContainerNode<? extends PathArgument> evpn) {
+        return evpn.getChild(IP_NID).map(child -> IpAddressNoZoneBuilder.getDefaultInstance((String) child.getValue()))
+            .orElse(null);

     }
 
     static MplsLabel extractMplsLabel(final DataContainerNode<? extends PathArgument> evpn,
             final NodeIdentifier mplsNid) {
     }
 
     static MplsLabel extractMplsLabel(final DataContainerNode<? extends PathArgument> evpn,
             final NodeIdentifier mplsNid) {

-        if (evpn.getChild(mplsNid).isPresent()) {
-            return new MplsLabel((Uint32) evpn.getChild(mplsNid).get().getValue());
-        }
-        return null;
+        return evpn.getChild(mplsNid).map(child -> new MplsLabel((Uint32) child.getValue())).orElse(null);

     }
 }
     }
 }

diff --git a/bgp/extensions/evpn/src/main/yang/odl-bgp-evpn.yang b/bgp/extensions/evpn/src/main/yang/odl-bgp-evpn.yang
index a50a50e4330d39c478862b6c8b2688d8d8be5a49..c2e164422d119e7b4850bcfdff8809995c391881 100644 (file)
--- a/bgp/extensions/evpn/src/main/yang/odl-bgp-evpn.yang
+++ b/bgp/extensions/evpn/src/main/yang/odl-bgp-evpn.yang
@@ -194,7 +194,7 @@ module odl-bgp-evpn {
                      can be auto-generated or configured by the operator";
 
                     leaf router-id {
                      can be auto-generated or configured by the operator";
 
                     leaf router-id {

-                        type inet:ipv4-address;
+                        type inet:ipv4-address-no-zone;

                         mandatory true;
                     }
                     uses local-discriminator;
                         mandatory true;
                     }
                     uses local-discriminator;


@@ -241,7 +241,7 @@ module odl-bgp-evpn {
                 mandatory true;
             }
             leaf ip-address {
                 mandatory true;
             }
             leaf ip-address {

-                type inet:ip-address;
+                type inet:ip-address-no-zone;

             }
             leaf mpls-label1 {
                 type netc:mpls-label;
             }
             leaf mpls-label1 {
                 type netc:mpls-label;

diff --git a/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/EvpnTestUtil.java b/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/EvpnTestUtil.java
index 80b2fa28cbf3d0435adce4f7753f45267c704574..3946e680186c815f836099724c74409f8423389d 100644 (file)
--- a/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/EvpnTestUtil.java
+++ b/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/EvpnTestUtil.java
@@ -8,9 +8,9 @@
 package org.opendaylight.protocol.bgp.evpn.impl;
 
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 package org.opendaylight.protocol.bgp.evpn.impl;
 
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;

-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.Ipv6Address;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressNoZone;
+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.Ipv6AddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.RouteDistinguisher;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.RouteDistinguisherBuilder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.RouteDistinguisher;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.RouteDistinguisherBuilder;


@@ -36,9 +36,9 @@ public final class EvpnTestUtil {
     public static final int COMMUNITY_VALUE_SIZE = 6;
     public static final Uint32 VLAN = Uint32.TEN;
     public static final String IP_MODEL = "127.0.0.1";
     public static final int COMMUNITY_VALUE_SIZE = 6;
     public static final Uint32 VLAN = Uint32.TEN;
     public static final String IP_MODEL = "127.0.0.1";

-    public static final IpAddress IP = new IpAddress(new Ipv4Address(IP_MODEL));
+    public static final IpAddressNoZone IP = new IpAddressNoZone(new Ipv4AddressNoZone(IP_MODEL));

     public static final String IPV6_MODEL = "2001::1";
     public static final String IPV6_MODEL = "2001::1";

-    public static final IpAddress IPV6 = new IpAddress(new Ipv6Address(IPV6_MODEL));
+    public static final IpAddressNoZone IPV6 = new IpAddressNoZone(new Ipv6AddressNoZone(IPV6_MODEL));

     public static final Uint32 MPLS_LABEL2_MODEL = Uint32.valueOf(24002L);
     public static final MplsLabel MPLS_LABEL2 = new MplsLabel(MPLS_LABEL2_MODEL);
     public static final String RD_MODEL = "1.2.3.4:258";
     public static final Uint32 MPLS_LABEL2_MODEL = Uint32.valueOf(24002L);
     public static final MplsLabel MPLS_LABEL2 = new MplsLabel(MPLS_LABEL2_MODEL);
     public static final String RD_MODEL = "1.2.3.4:258";

diff --git a/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/esi/types/RouterIdParserTest.java b/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/esi/types/RouterIdParserTest.java
index ff55677b19b4c010f00a06152cda806719f1796f..ccd0e1165cdfd3bf4307c424e754fe9a366b7d48 100644 (file)
--- a/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/esi/types/RouterIdParserTest.java
+++ b/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/esi/types/RouterIdParserTest.java
@@ -21,7 +21,7 @@ import io.netty.buffer.Unpooled;
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.protocol.util.ByteArray;
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.protocol.util.ByteArray;

-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.opendaylight.params.xml.ns.yang.bgp.evpn.rev180329.esi.Esi;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev180329.esi.esi.ArbitraryCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev180329.esi.esi.RouterIdGeneratedCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev180329.esi.Esi;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev180329.esi.esi.ArbitraryCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev180329.esi.esi.RouterIdGeneratedCase;


@@ -39,7 +39,7 @@ public class RouterIdParserTest {
         (byte) 0x02, (byte) 0x02, (byte) 0x02, (byte) 0x00};
     private static final byte[] VALUE = {(byte) 0x2A, (byte) 0x2A, (byte) 0x2A, (byte) 0x2A, (byte) 0x02, (byte) 0x02,
         (byte) 0x02, (byte) 0x02, (byte) 0x00};
         (byte) 0x02, (byte) 0x02, (byte) 0x02, (byte) 0x00};
     private static final byte[] VALUE = {(byte) 0x2A, (byte) 0x2A, (byte) 0x2A, (byte) 0x2A, (byte) 0x02, (byte) 0x02,
         (byte) 0x02, (byte) 0x02, (byte) 0x00};

-    private static final Ipv4Address ROUTE_ID = new Ipv4Address("42.42.42.42");
+    private static final Ipv4AddressNoZone ROUTE_ID = new Ipv4AddressNoZone("42.42.42.42");

     public static final RouterIdGeneratedCase ROUTE_ID_CASE = new RouterIdGeneratedCaseBuilder()
             .setRouterIdGenerated(new RouterIdGeneratedBuilder()
                     .setLocalDiscriminator(LD).setRouterId(ROUTE_ID).build()).build();
     public static final RouterIdGeneratedCase ROUTE_ID_CASE = new RouterIdGeneratedCaseBuilder()
             .setRouterIdGenerated(new RouterIdGeneratedBuilder()
                     .setLocalDiscriminator(LD).setRouterId(ROUTE_ID).build()).build();

diff --git a/bgp/extensions/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/extended/communities/RedirectIpNextHopEcHandler.java b/bgp/extensions/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/extended/communities/RedirectIpNextHopEcHandler.java
index bcb643d51457d931ae5c84153d23b431fd50d80d..0ef3e2bcbe9f553e03534650af4b40b9eb17272c 100644 (file)
--- a/bgp/extensions/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/extended/communities/RedirectIpNextHopEcHandler.java
+++ b/bgp/extensions/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/extended/communities/RedirectIpNextHopEcHandler.java
@@ -14,7 +14,7 @@ import org.opendaylight.protocol.bgp.parser.spi.extended.community.ExtendedCommu
 import org.opendaylight.protocol.bgp.parser.spi.extended.community.ExtendedCommunitySerializer;
 import org.opendaylight.protocol.util.Ipv4Util;
 import org.opendaylight.protocol.util.Ipv6Util;
 import org.opendaylight.protocol.bgp.parser.spi.extended.community.ExtendedCommunitySerializer;
 import org.opendaylight.protocol.util.Ipv4Util;
 import org.opendaylight.protocol.util.Ipv6Util;

-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.IpAddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev180329.redirect.ip.nh.extended.community.RedirectIpNhExtendedCommunity;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev180329.redirect.ip.nh.extended.community.RedirectIpNhExtendedCommunityBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev180329.update.attributes.extended.communities.extended.community.RedirectIpNhExtendedCommunityCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev180329.redirect.ip.nh.extended.community.RedirectIpNhExtendedCommunity;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev180329.redirect.ip.nh.extended.community.RedirectIpNhExtendedCommunityBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev180329.update.attributes.extended.communities.extended.community.RedirectIpNhExtendedCommunityCaseBuilder;


@@ -34,11 +34,11 @@ public class RedirectIpNextHopEcHandler implements ExtendedCommunityParser, Exte
         final RedirectIpNhExtendedCommunity redirect = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns
                 .yang.bgp.flowspec.rev180329.RedirectIpNhExtendedCommunity) extendedCommunity)
                 .getRedirectIpNhExtendedCommunity();
         final RedirectIpNhExtendedCommunity redirect = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns
                 .yang.bgp.flowspec.rev180329.RedirectIpNhExtendedCommunity) extendedCommunity)
                 .getRedirectIpNhExtendedCommunity();

-        final IpAddress nextHopAddress = redirect.getNextHopAddress();
-        if (nextHopAddress.getIpv4Address() != null) {
-            Ipv4Util.writeIpv4Address(nextHopAddress.getIpv4Address(), byteAggregator);
+        final IpAddressNoZone nextHopAddress = redirect.getNextHopAddress();
+        if (nextHopAddress.getIpv4AddressNoZone() != null) {
+            Ipv4Util.writeIpv4Address(nextHopAddress.getIpv4AddressNoZone(), byteAggregator);

         } else {
         } else {

-            Ipv6Util.writeIpv6Address(nextHopAddress.getIpv6Address(), byteAggregator);
+            Ipv6Util.writeIpv6Address(nextHopAddress.getIpv6AddressNoZone(), byteAggregator);

         }
         byteAggregator.writeShort(Boolean.TRUE.equals(redirect.isCopy()) ? 1 : 0);
     }
         }
         byteAggregator.writeShort(Boolean.TRUE.equals(redirect.isCopy()) ? 1 : 0);
     }


@@ -47,9 +47,9 @@ public class RedirectIpNextHopEcHandler implements ExtendedCommunityParser, Exte
     public ExtendedCommunity parseExtendedCommunity(final ByteBuf buffer) {
         final RedirectIpNhExtendedCommunityBuilder builder = new RedirectIpNhExtendedCommunityBuilder();
         if (buffer.readableBytes() > Ipv6Util.IPV6_LENGTH) {
     public ExtendedCommunity parseExtendedCommunity(final ByteBuf buffer) {
         final RedirectIpNhExtendedCommunityBuilder builder = new RedirectIpNhExtendedCommunityBuilder();
         if (buffer.readableBytes() > Ipv6Util.IPV6_LENGTH) {

-            builder.setNextHopAddress(new IpAddress(Ipv6Util.addressForByteBuf(buffer)));
+            builder.setNextHopAddress(new IpAddressNoZone(Ipv6Util.addressForByteBuf(buffer)));

         } else {
         } else {

-            builder.setNextHopAddress(new IpAddress(Ipv4Util.addressForByteBuf(buffer)));
+            builder.setNextHopAddress(new IpAddressNoZone(Ipv4Util.addressForByteBuf(buffer)));

         }
         builder.setCopy((buffer.readUnsignedShort() & COPY) == 1);
         return new RedirectIpNhExtendedCommunityCaseBuilder().setRedirectIpNhExtendedCommunity(builder.build()).build();
         }
         builder.setCopy((buffer.readUnsignedShort() & COPY) == 1);
         return new RedirectIpNhExtendedCommunityCaseBuilder().setRedirectIpNhExtendedCommunity(builder.build()).build();

diff --git a/bgp/extensions/flowspec/src/main/yang/bgp-flowspec.yang b/bgp/extensions/flowspec/src/main/yang/bgp-flowspec.yang
index 5324aaaa8b981c046135094b01c3f878795ce3f0..75f208309654576492c979b3cc891bb2184d83c5 100644 (file)
--- a/bgp/extensions/flowspec/src/main/yang/bgp-flowspec.yang
+++ b/bgp/extensions/flowspec/src/main/yang/bgp-flowspec.yang
@@ -394,7 +394,7 @@ module bgp-flowspec {
     grouping redirect-ipv6-extended-community {
         container redirect-ipv6 {
             leaf global-administrator {
     grouping redirect-ipv6-extended-community {
         container redirect-ipv6 {
             leaf global-administrator {

-                type inet:ipv6-address;
+                type inet:ipv6-address-no-zone;

             }
             leaf local-administrator {
                 type uint16;
             }
             leaf local-administrator {
                 type uint16;


@@ -426,7 +426,7 @@ module bgp-flowspec {
         reference "https://tools.ietf.org/html/draft-ietf-idr-flowspec-redirect-ip-02";
         container redirect-ip-nh-extended-community {
             leaf next-hop-address {
         reference "https://tools.ietf.org/html/draft-ietf-idr-flowspec-redirect-ip-02";
         container redirect-ip-nh-extended-community {
             leaf next-hop-address {

-                type inet:ip-address;
+                type inet:ip-address-no-zone;

             }
             leaf copy {
                 type boolean;
             }
             leaf copy {
                 type boolean;

diff --git a/bgp/extensions/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/extended/communities/FSExtendedCommunitiesTest.java b/bgp/extensions/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/extended/communities/FSExtendedCommunitiesTest.java
index 2d3229b24b86768a4325dfe70695a27eaad1f305..fa8d4ae572538faed5a3ba687befd058ec4d26b0 100644 (file)
--- a/bgp/extensions/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/extended/communities/FSExtendedCommunitiesTest.java
+++ b/bgp/extensions/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/extended/communities/FSExtendedCommunitiesTest.java
@@ -23,9 +23,9 @@ import org.opendaylight.protocol.bgp.parser.spi.BGPExtensionProviderContext;
 import org.opendaylight.protocol.bgp.parser.spi.extended.community.ExtendedCommunityRegistry;
 import org.opendaylight.protocol.bgp.parser.spi.pojo.SimpleBGPExtensionProviderContext;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 import org.opendaylight.protocol.bgp.parser.spi.extended.community.ExtendedCommunityRegistry;
 import org.opendaylight.protocol.bgp.parser.spi.pojo.SimpleBGPExtensionProviderContext;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;

-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.Ipv6Address;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressNoZone;
+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.Ipv6AddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev180329.Dscp;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev180329.redirect.as4.extended.community.RedirectAs4Builder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev180329.redirect.extended.community.RedirectExtendedCommunityBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev180329.Dscp;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev180329.redirect.as4.extended.community.RedirectAs4Builder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev180329.redirect.extended.community.RedirectExtendedCommunityBuilder;


@@ -41,9 +41,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flow
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev180329.update.attributes.extended.communities.extended.community.RedirectExtendedCommunityCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev180329.update.attributes.extended.communities.extended.community.RedirectIpNhExtendedCommunityCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev180329.update.attributes.extended.communities.extended.community.RedirectIpNhExtendedCommunityCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev180329.update.attributes.extended.communities.extended.community.RedirectExtendedCommunityCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev180329.update.attributes.extended.communities.extended.community.RedirectIpNhExtendedCommunityCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev180329.update.attributes.extended.communities.extended.community.RedirectIpNhExtendedCommunityCaseBuilder;

-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev180329.update.attributes.extended.communities.extended.community.RedirectIpv4ExtendedCommunityCase;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev180329.update.attributes.extended.communities.extended.community.RedirectIpv4ExtendedCommunityCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev180329.update.attributes.extended.communities.extended.community.RedirectIpv4ExtendedCommunityCaseBuilder;

-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev180329.update.attributes.extended.communities.extended.community.RedirectIpv6ExtendedCommunityCase;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev180329.update.attributes.extended.communities.extended.community.RedirectIpv6ExtendedCommunityCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev180329.update.attributes.extended.communities.extended.community.TrafficActionExtendedCommunityCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev180329.update.attributes.extended.communities.extended.community.TrafficActionExtendedCommunityCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev180329.update.attributes.extended.communities.extended.community.RedirectIpv6ExtendedCommunityCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev180329.update.attributes.extended.communities.extended.community.TrafficActionExtendedCommunityCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev180329.update.attributes.extended.communities.extended.community.TrafficActionExtendedCommunityCaseBuilder;


@@ -221,12 +219,15 @@ public class FSExtendedCommunitiesTest {
 
     @Test
     public void testRedirectIpv6Parser() throws BGPDocumentedException, BGPParsingException {
 
     @Test
     public void testRedirectIpv6Parser() throws BGPDocumentedException, BGPParsingException {

-        final RedirectIpv6ExtendedCommunityCase redirect = new RedirectIpv6ExtendedCommunityCaseBuilder()
-                .setRedirectIpv6(new RedirectIpv6Builder()
-                        .setGlobalAdministrator(new Ipv6Address("102:304:506:708:90a:b0c:d0e:f10"))
-                        .setLocalAdministrator(Uint16.valueOf(258)).build()).build();
-        final ExtendedCommunities expected = new ExtendedCommunitiesBuilder().setExtendedCommunity(redirect)
-                .setTransitive(true).build();
+        final ExtendedCommunities expected = new ExtendedCommunitiesBuilder()
+                .setExtendedCommunity(new RedirectIpv6ExtendedCommunityCaseBuilder()
+                    .setRedirectIpv6(new RedirectIpv6Builder()
+                        .setGlobalAdministrator(new Ipv6AddressNoZone("102:304:506:708:90a:b0c:d0e:f10"))
+                        .setLocalAdministrator(Uint16.valueOf(258))
+                        .build())
+                    .build())
+                .setTransitive(true)
+                .build();

 
         final ExtendedCommunities parsed = this.registry.parseExtendedCommunity(Unpooled.copiedBuffer(REDIRECT_IPV6));
         Assert.assertEquals(expected, parsed);
 
         final ExtendedCommunities parsed = this.registry.parseExtendedCommunity(Unpooled.copiedBuffer(REDIRECT_IPV6));
         Assert.assertEquals(expected, parsed);


@@ -239,7 +240,7 @@ public class FSExtendedCommunitiesTest {
                 new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev180329.bgp.rib
                     .route.attributes.extended.communities.extended.community.RedirectIpv6ExtendedCommunityCaseBuilder()
                     .setRedirectIpv6(new RedirectIpv6Builder()
                 new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev180329.bgp.rib
                     .route.attributes.extended.communities.extended.community.RedirectIpv6ExtendedCommunityCaseBuilder()
                     .setRedirectIpv6(new RedirectIpv6Builder()

-                        .setGlobalAdministrator(new Ipv6Address("102:304:506:708:90a:b0c:d0e:f10"))
+                        .setGlobalAdministrator(new Ipv6AddressNoZone("102:304:506:708:90a:b0c:d0e:f10"))

                         .setLocalAdministrator(Uint16.valueOf(258)).build()).build();
         final ExtendedCommunities expected = new ExtendedCommunitiesBuilder().setExtendedCommunity(redirect)
                 .setTransitive(true).build();
                         .setLocalAdministrator(Uint16.valueOf(258)).build()).build();
         final ExtendedCommunities expected = new ExtendedCommunitiesBuilder().setExtendedCommunity(redirect)
                 .setTransitive(true).build();


@@ -285,12 +286,15 @@ public class FSExtendedCommunitiesTest {
 
     @Test
     public void testRedirectIpv4Parser() throws BGPDocumentedException, BGPParsingException {
 
     @Test
     public void testRedirectIpv4Parser() throws BGPDocumentedException, BGPParsingException {

-        final RedirectIpv4ExtendedCommunityCase redirect = new RedirectIpv4ExtendedCommunityCaseBuilder()
-                .setRedirectIpv4(new RedirectIpv4Builder().setGlobalAdministrator(new Ipv4Address("127.0.0.1"))
-                    .setLocalAdministrator(Uint16.valueOf(126)).build()).build();
-
-        final ExtendedCommunities expected = new ExtendedCommunitiesBuilder().setExtendedCommunity(redirect)
-                .setTransitive(true).build();
+        final ExtendedCommunities expected = new ExtendedCommunitiesBuilder()
+                .setExtendedCommunity(new RedirectIpv4ExtendedCommunityCaseBuilder()
+                    .setRedirectIpv4(new RedirectIpv4Builder()
+                        .setGlobalAdministrator(new Ipv4AddressNoZone("127.0.0.1"))
+                        .setLocalAdministrator(Uint16.valueOf(126))
+                        .build())
+                    .build())
+                .setTransitive(true)
+                .build();

 
         final ExtendedCommunities parsed = this.registry.parseExtendedCommunity(Unpooled.copiedBuffer(REDIRECT_IPV4));
         Assert.assertEquals(expected, parsed);
 
         final ExtendedCommunities parsed = this.registry.parseExtendedCommunity(Unpooled.copiedBuffer(REDIRECT_IPV4));
         Assert.assertEquals(expected, parsed);


@@ -298,15 +302,17 @@ public class FSExtendedCommunitiesTest {
 
     @Test
     public void testredirectIpv4Serializer() throws BGPDocumentedException, BGPParsingException {
 
     @Test
     public void testredirectIpv4Serializer() throws BGPDocumentedException, BGPParsingException {

-        final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev180329.bgp.rib.route
-            .attributes.extended.communities.extended.community.RedirectIpv4ExtendedCommunityCase redirect =
-                new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev180329.bgp.rib
-                    .route.attributes.extended.communities.extended.community.RedirectIpv4ExtendedCommunityCaseBuilder()
-                        .setRedirectIpv4(new RedirectIpv4Builder().setGlobalAdministrator(new Ipv4Address("127.0.0.1"))
-                            .setLocalAdministrator(Uint16.valueOf(126)).build()).build();
-
-        final ExtendedCommunities expected = new ExtendedCommunitiesBuilder().setExtendedCommunity(redirect)
-                .setTransitive(true).build();
+        final ExtendedCommunities expected = new ExtendedCommunitiesBuilder()
+                .setExtendedCommunity(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec
+                    .rev180329.bgp.rib.route.attributes.extended.communities.extended.community
+                    .RedirectIpv4ExtendedCommunityCaseBuilder()
+                    .setRedirectIpv4(new RedirectIpv4Builder()
+                        .setGlobalAdministrator(new Ipv4AddressNoZone("127.0.0.1"))
+                        .setLocalAdministrator(Uint16.valueOf(126))
+                        .build())
+                    .build())
+                .setTransitive(true)
+                .build();

 
         final ByteBuf output = Unpooled.buffer(REDIRECT_IPV4.length);
         this.registry.serializeExtendedCommunity(expected, output);
 
         final ByteBuf output = Unpooled.buffer(REDIRECT_IPV4.length);
         this.registry.serializeExtendedCommunity(expected, output);


@@ -315,12 +321,15 @@ public class FSExtendedCommunitiesTest {
 
     @Test
     public void testRedirectIpv4NhParser() throws BGPDocumentedException, BGPParsingException {
 
     @Test
     public void testRedirectIpv4NhParser() throws BGPDocumentedException, BGPParsingException {

-        final RedirectIpNhExtendedCommunityCase redirect = new RedirectIpNhExtendedCommunityCaseBuilder()
-                .setRedirectIpNhExtendedCommunity(new RedirectIpNhExtendedCommunityBuilder()
-                    .setNextHopAddress(new IpAddress(new Ipv4Address("127.0.0.1"))).setCopy(true).build()).build();
-
-        final ExtendedCommunities expected = new ExtendedCommunitiesBuilder().setExtendedCommunity(redirect)
-                .setTransitive(true).build();
+        final ExtendedCommunities expected = new ExtendedCommunitiesBuilder()
+                .setExtendedCommunity(new RedirectIpNhExtendedCommunityCaseBuilder()
+                    .setRedirectIpNhExtendedCommunity(new RedirectIpNhExtendedCommunityBuilder()
+                        .setNextHopAddress(new IpAddressNoZone(new Ipv4AddressNoZone("127.0.0.1")))
+                        .setCopy(true)
+                        .build())
+                    .build())
+                .setTransitive(true)
+                .build();

 
         final ExtendedCommunities parsed = this.registry.parseExtendedCommunity(
             Unpooled.copiedBuffer(REDIRECT_NH_IPV4));
 
         final ExtendedCommunities parsed = this.registry.parseExtendedCommunity(
             Unpooled.copiedBuffer(REDIRECT_NH_IPV4));


@@ -334,7 +343,10 @@ public class FSExtendedCommunitiesTest {
                 new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev180329.bgp.rib
                     .route.attributes.extended.communities.extended.community.RedirectIpNhExtendedCommunityCaseBuilder()
                     .setRedirectIpNhExtendedCommunity(new RedirectIpNhExtendedCommunityBuilder()
                 new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev180329.bgp.rib
                     .route.attributes.extended.communities.extended.community.RedirectIpNhExtendedCommunityCaseBuilder()
                     .setRedirectIpNhExtendedCommunity(new RedirectIpNhExtendedCommunityBuilder()

-                        .setNextHopAddress(new IpAddress(new Ipv4Address("127.0.0.1"))).setCopy(true).build()).build();
+                        .setNextHopAddress(new IpAddressNoZone(new Ipv4AddressNoZone("127.0.0.1")))
+                        .setCopy(true)
+                        .build())
+                    .build();

 
         final ExtendedCommunities expected = new ExtendedCommunitiesBuilder().setExtendedCommunity(redirect)
                 .setTransitive(true).build();
 
         final ExtendedCommunities expected = new ExtendedCommunitiesBuilder().setExtendedCommunity(redirect)
                 .setTransitive(true).build();


@@ -348,7 +360,10 @@ public class FSExtendedCommunitiesTest {
     public void testRedirectIpv6NhParser() throws BGPDocumentedException, BGPParsingException {
         final RedirectIpNhExtendedCommunityCase redirect = new RedirectIpNhExtendedCommunityCaseBuilder()
                 .setRedirectIpNhExtendedCommunity(new RedirectIpNhExtendedCommunityBuilder()
     public void testRedirectIpv6NhParser() throws BGPDocumentedException, BGPParsingException {
         final RedirectIpNhExtendedCommunityCase redirect = new RedirectIpNhExtendedCommunityCaseBuilder()
                 .setRedirectIpNhExtendedCommunity(new RedirectIpNhExtendedCommunityBuilder()

-                    .setNextHopAddress(new IpAddress(new Ipv6Address("2001::1"))).setCopy(false).build()).build();
+                    .setNextHopAddress(new IpAddressNoZone(new Ipv6AddressNoZone("2001::1")))
+                    .setCopy(false)
+                    .build())
+                .build();

 
         final ExtendedCommunities expected = new ExtendedCommunitiesBuilder().setExtendedCommunity(redirect)
                 .setTransitive(true).build();
 
         final ExtendedCommunities expected = new ExtendedCommunitiesBuilder().setExtendedCommunity(redirect)
                 .setTransitive(true).build();


@@ -365,7 +380,7 @@ public class FSExtendedCommunitiesTest {
                 new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev180329.bgp.rib
                     .route.attributes.extended.communities.extended.community.RedirectIpNhExtendedCommunityCaseBuilder()
                     .setRedirectIpNhExtendedCommunity(new RedirectIpNhExtendedCommunityBuilder()
                 new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev180329.bgp.rib
                     .route.attributes.extended.communities.extended.community.RedirectIpNhExtendedCommunityCaseBuilder()
                     .setRedirectIpNhExtendedCommunity(new RedirectIpNhExtendedCommunityBuilder()

-                        .setNextHopAddress(new IpAddress(new Ipv6Address("2001::1"))).build()).build();
+                        .setNextHopAddress(new IpAddressNoZone(new Ipv6AddressNoZone("2001::1"))).build()).build();

 
         final ExtendedCommunities expected = new ExtendedCommunitiesBuilder().setExtendedCommunity(redirect)
                 .setTransitive(true).build();
 
         final ExtendedCommunities expected = new ExtendedCommunitiesBuilder().setExtendedCommunity(redirect)
                 .setTransitive(true).build();

diff --git a/bgp/extensions/inet/src/test/java/org/opendaylight/protocol/bgp/inet/codec/BGPParserTest.java b/bgp/extensions/inet/src/test/java/org/opendaylight/protocol/bgp/inet/codec/BGPParserTest.java
index 2bddc37642478258b7106df42fbe9bdaf9bae262..433515b058e86b3bafd64102a2f9eea8e99afb70 100644 (file)
--- a/bgp/extensions/inet/src/test/java/org/opendaylight/protocol/bgp/inet/codec/BGPParserTest.java
+++ b/bgp/extensions/inet/src/test/java/org/opendaylight/protocol/bgp/inet/codec/BGPParserTest.java
@@ -31,8 +31,8 @@ import org.opendaylight.protocol.bgp.parser.spi.pojo.RevisedErrorHandlingSupport
 import org.opendaylight.protocol.bgp.parser.spi.pojo.ServiceLoaderBGPExtensionProviderContext;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 import org.opendaylight.protocol.bgp.parser.spi.pojo.ServiceLoaderBGPExtensionProviderContext;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;

-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.Ipv6Address;
+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.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.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv6.prefixes.DestinationIpv6Builder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv6.prefixes.destination.ipv6.Ipv6Prefixes;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv6.prefixes.DestinationIpv6Builder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv6.prefixes.destination.ipv6.Ipv6Prefixes;


@@ -176,11 +176,12 @@ public class BGPParserTest {
         asPath.add(new SegmentsBuilder().setAsSequence(asNumbers).build());
 
         final Ipv6NextHopCase nextHop = new Ipv6NextHopCaseBuilder().setIpv6NextHop(
         asPath.add(new SegmentsBuilder().setAsSequence(asNumbers).build());
 
         final Ipv6NextHopCase nextHop = new Ipv6NextHopCaseBuilder().setIpv6NextHop(

-                new Ipv6NextHopBuilder().setGlobal(new Ipv6Address("2001:db8::1"))
-                        .setLinkLocal(new Ipv6Address("fe80::c001:bff:fe7e:0")).build()).build();
+                new Ipv6NextHopBuilder().setGlobal(new Ipv6AddressNoZone("2001:db8::1"))
+                        .setLinkLocal(new Ipv6AddressNoZone("fe80::c001:bff:fe7e:0")).build()).build();

 
 

-        final List<ClusterIdentifier> clusters = Lists.newArrayList(new ClusterIdentifier(new Ipv4Address("1.2.3.4")),
-                new ClusterIdentifier(new Ipv4Address("5.6.7.8")));
+        final List<ClusterIdentifier> clusters = Lists.newArrayList(
+            new ClusterIdentifier(new Ipv4AddressNoZone("1.2.3.4")),
+                new ClusterIdentifier(new Ipv4AddressNoZone("5.6.7.8")));

 
         // check path attributes
 
 
         // check path attributes
 


@@ -197,7 +198,7 @@ public class BGPParserTest {
         paBuilder.setMultiExitDisc(new MultiExitDiscBuilder().setMed(Uint32.ZERO).build());
         assertEquals(paBuilder.getMultiExitDisc(), attrs.getMultiExitDisc());
 
         paBuilder.setMultiExitDisc(new MultiExitDiscBuilder().setMed(Uint32.ZERO).build());
         assertEquals(paBuilder.getMultiExitDisc(), attrs.getMultiExitDisc());
 

-        paBuilder.setOriginatorId(new OriginatorIdBuilder().setOriginator(new Ipv4Address("127.0.0.1")).build());
+        paBuilder.setOriginatorId(new OriginatorIdBuilder().setOriginator(new Ipv4AddressNoZone("127.0.0.1")).build());

         assertEquals(paBuilder.getOriginatorId(), attrs.getOriginatorId());
 
         paBuilder.setClusterId(new ClusterIdBuilder().setCluster(clusters).build());
         assertEquals(paBuilder.getOriginatorId(), attrs.getOriginatorId());
 
         paBuilder.setClusterId(new ClusterIdBuilder().setCluster(clusters).build());

diff --git a/bgp/extensions/inet/src/test/java/org/opendaylight/protocol/bgp/inet/codec/nexthop/NextHopParserSerializerTest.java b/bgp/extensions/inet/src/test/java/org/opendaylight/protocol/bgp/inet/codec/nexthop/NextHopParserSerializerTest.java
index 8f03fac2116bd63b4d5f6f0ff018929f9af32aeb..bcf2380e8db3eb0d0020b0f4c1264febef8e9bff 100644 (file)
--- a/bgp/extensions/inet/src/test/java/org/opendaylight/protocol/bgp/inet/codec/nexthop/NextHopParserSerializerTest.java
+++ b/bgp/extensions/inet/src/test/java/org/opendaylight/protocol/bgp/inet/codec/nexthop/NextHopParserSerializerTest.java
@@ -5,7 +5,6 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */

-

 package org.opendaylight.protocol.bgp.inet.codec.nexthop;
 
 import static org.junit.Assert.assertArrayEquals;
 package org.opendaylight.protocol.bgp.inet.codec.nexthop;
 
 import static org.junit.Assert.assertArrayEquals;


@@ -18,8 +17,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.protocol.bgp.parser.BGPParsingException;
 import org.opendaylight.protocol.util.ByteArray;
 import org.junit.Test;
 import org.opendaylight.protocol.bgp.parser.BGPParsingException;
 import org.opendaylight.protocol.util.ByteArray;

-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.Ipv6Address;
+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.Ipv6AddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.CNextHop;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.Ipv4NextHopCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.Ipv4NextHopCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.CNextHop;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.Ipv4NextHopCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.Ipv4NextHopCaseBuilder;


@@ -33,8 +32,8 @@ public class NextHopParserSerializerTest {
     private static final byte[] IPV6LB = {0x20, 1, 0x0d, (byte) 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         1, (byte) 0xfe, (byte) 0x80, 0, 0, 0, 0, 0, 0, (byte) 0xc0, 1, 0x0b, (byte) 0xff, (byte) 0xfe, 0x7e, 0, 0};
 
     private static final byte[] IPV6LB = {0x20, 1, 0x0d, (byte) 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         1, (byte) 0xfe, (byte) 0x80, 0, 0, 0, 0, 0, 0, (byte) 0xc0, 1, 0x0b, (byte) 0xff, (byte) 0xfe, 0x7e, 0, 0};
 

-    private static final Ipv6Address IPV6 = new Ipv6Address("2001:db8::1");
-    private static final Ipv6Address IPV6L = new Ipv6Address("fe80::c001:bff:fe7e:0");
+    private static final Ipv6AddressNoZone IPV6 = new Ipv6AddressNoZone("2001:db8::1");
+    private static final Ipv6AddressNoZone IPV6L = new Ipv6AddressNoZone("fe80::c001:bff:fe7e:0");

 
     private Ipv4NextHopParserSerializer ipv4NextHopParserSerializer;
     private Ipv6NextHopParserSerializer ipv6NextHopParserSerializer;
 
     private Ipv4NextHopParserSerializer ipv4NextHopParserSerializer;
     private Ipv6NextHopParserSerializer ipv6NextHopParserSerializer;


@@ -52,7 +51,7 @@ public class NextHopParserSerializerTest {
     public void testSerializeIpv4NextHopCase() throws BGPParsingException {
         final byte[] ipv4B = {42, 42, 42, 42};
         this.hop = new Ipv4NextHopCaseBuilder().setIpv4NextHop(new Ipv4NextHopBuilder()
     public void testSerializeIpv4NextHopCase() throws BGPParsingException {
         final byte[] ipv4B = {42, 42, 42, 42};
         this.hop = new Ipv4NextHopCaseBuilder().setIpv4NextHop(new Ipv4NextHopBuilder()

-            .setGlobal(new Ipv4Address("42.42.42.42")).build()).build();
+            .setGlobal(new Ipv4AddressNoZone("42.42.42.42")).build()).build();

 
         this.ipv4NextHopParserSerializer.serializeNextHop(this.hop, this.buffer);
         assertArrayEquals(ipv4B, ByteArray.readAllBytes(this.buffer));
 
         this.ipv4NextHopParserSerializer.serializeNextHop(this.hop, this.buffer);
         assertArrayEquals(ipv4B, ByteArray.readAllBytes(this.buffer));

diff --git a/bgp/extensions/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv4/VpnIpv4NextHopTest.java b/bgp/extensions/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv4/VpnIpv4NextHopTest.java
index bbca25f0594bf9937a3eef5e9b464d7c7a3a6f6d..bd2f9a5f60b9e9fa72425ec9b51edc00a1e69e66 100644 (file)
--- a/bgp/extensions/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv4/VpnIpv4NextHopTest.java
+++ b/bgp/extensions/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv4/VpnIpv4NextHopTest.java
@@ -16,7 +16,7 @@ import io.netty.buffer.Unpooled;
 import org.junit.Test;
 import org.opendaylight.protocol.bgp.parser.BGPParsingException;
 import org.opendaylight.protocol.util.ByteArray;
 import org.junit.Test;
 import org.opendaylight.protocol.bgp.parser.BGPParsingException;
 import org.opendaylight.protocol.util.ByteArray;

-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.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.CNextHop;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.Ipv4NextHopCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.Ipv4NextHopCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.CNextHop;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.Ipv4NextHopCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.Ipv4NextHopCaseBuilder;


@@ -31,7 +31,7 @@ public class VpnIpv4NextHopTest {
         final ByteBuf buffer = Unpooled.buffer();
         final byte[] nextHop = {0, 0, 0, 0, 0, 0, 0, 0, 42, 42, 42, 42};
         final CNextHop hop = new Ipv4NextHopCaseBuilder().setIpv4NextHop(new Ipv4NextHopBuilder()
         final ByteBuf buffer = Unpooled.buffer();
         final byte[] nextHop = {0, 0, 0, 0, 0, 0, 0, 0, 42, 42, 42, 42};
         final CNextHop hop = new Ipv4NextHopCaseBuilder().setIpv4NextHop(new Ipv4NextHopBuilder()

-                .setGlobal(new Ipv4Address("42.42.42.42")).build()).build();
+                .setGlobal(new Ipv4AddressNoZone("42.42.42.42")).build()).build();

 
         HANDLER.serializeNextHop(hop, buffer);
         assertArrayEquals(nextHop, ByteArray.readAllBytes(buffer));
 
         HANDLER.serializeNextHop(hop, buffer);
         assertArrayEquals(nextHop, ByteArray.readAllBytes(buffer));

diff --git a/bgp/extensions/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv6/VpnIpv6NextHopTest.java b/bgp/extensions/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv6/VpnIpv6NextHopTest.java
index 2d9217a1bb13f599ad7cfcf144fab26491394e1d..ad87f6ba7e81fd77b6ee56725c4614c8ff0ce870 100644 (file)
--- a/bgp/extensions/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv6/VpnIpv6NextHopTest.java
+++ b/bgp/extensions/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv6/VpnIpv6NextHopTest.java
@@ -18,7 +18,7 @@ import org.junit.Test;
 import org.opendaylight.bgp.concepts.RouteDistinguisherUtil;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.protocol.util.Ipv6Util;
 import org.opendaylight.bgp.concepts.RouteDistinguisherUtil;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.protocol.util.Ipv6Util;

-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.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.CNextHop;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.Ipv6NextHopCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.Ipv6NextHopCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.CNextHop;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.Ipv6NextHopCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.Ipv6NextHopCaseBuilder;


@@ -38,7 +38,7 @@ public class VpnIpv6NextHopTest {
         System.arraycopy(Inet6Address.getByName(TEST_IPV6).getAddress(), 0, nextHop,
                 RouteDistinguisherUtil.RD_LENGTH, Ipv6Util.IPV6_LENGTH);
         final CNextHop hop = new Ipv6NextHopCaseBuilder().setIpv6NextHop(new Ipv6NextHopBuilder()
         System.arraycopy(Inet6Address.getByName(TEST_IPV6).getAddress(), 0, nextHop,
                 RouteDistinguisherUtil.RD_LENGTH, Ipv6Util.IPV6_LENGTH);
         final CNextHop hop = new Ipv6NextHopCaseBuilder().setIpv6NextHop(new Ipv6NextHopBuilder()

-                .setGlobal(new Ipv6Address(TEST_IPV6)).build()).build();
+                .setGlobal(new Ipv6AddressNoZone(TEST_IPV6)).build()).build();

 
         HANDLER.serializeNextHop(hop, buffer);
         assertArrayEquals(nextHop, ByteArray.readAllBytes(buffer));
 
         HANDLER.serializeNextHop(hop, buffer);
         assertArrayEquals(nextHop, ByteArray.readAllBytes(buffer));

diff --git a/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/LinkAttributesParser.java b/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/LinkAttributesParser.java
index 445062968631bdbd0a431c3c682548081aaf3b4b..89ee744d8d5f476d27a1c8eadb864098725c0c89 100644 (file)
--- a/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/LinkAttributesParser.java
+++ b/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/LinkAttributesParser.java
@@ -22,8 +22,8 @@ import org.opendaylight.protocol.util.BitArray;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.protocol.util.Ipv4Util;
 import org.opendaylight.protocol.util.Ipv6Util;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.protocol.util.Ipv4Util;
 import org.opendaylight.protocol.util.Ipv6Util;

-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.Ipv6Address;
+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.Ipv6AddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.AdministrativeGroup;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.Delay;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.Ipv4RouterIdentifier;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.AdministrativeGroup;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.Delay;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.Ipv4RouterIdentifier;


@@ -290,13 +290,13 @@ public final class LinkAttributesParser {
         final LinkAttributes linkAttributes = linkAttributesCase.getLinkAttributes();
         LOG.trace("Started serializing Link Attributes");
         ifPresentApply(linkAttributes.getLocalIpv4RouterId(), value -> TlvUtil.writeTLV(TlvUtil.LOCAL_IPV4_ROUTER_ID,
         final LinkAttributes linkAttributes = linkAttributesCase.getLinkAttributes();
         LOG.trace("Started serializing Link Attributes");
         ifPresentApply(linkAttributes.getLocalIpv4RouterId(), value -> TlvUtil.writeTLV(TlvUtil.LOCAL_IPV4_ROUTER_ID,

-            Ipv4Util.byteBufForAddress((Ipv4Address) value), output));
+            Ipv4Util.byteBufForAddress((Ipv4AddressNoZone) value), output));

         ifPresentApply(linkAttributes.getLocalIpv6RouterId(), value -> TlvUtil.writeTLV(TlvUtil.LOCAL_IPV6_ROUTER_ID,
         ifPresentApply(linkAttributes.getLocalIpv6RouterId(), value -> TlvUtil.writeTLV(TlvUtil.LOCAL_IPV6_ROUTER_ID,

-            Ipv6Util.byteBufForAddress((Ipv6Address) value), output));
+            Ipv6Util.byteBufForAddress((Ipv6AddressNoZone) value), output));

         ifPresentApply(linkAttributes.getRemoteIpv4RouterId(), value -> TlvUtil.writeTLV(REMOTE_IPV4_ROUTER_ID,
         ifPresentApply(linkAttributes.getRemoteIpv4RouterId(), value -> TlvUtil.writeTLV(REMOTE_IPV4_ROUTER_ID,

-            Ipv4Util.byteBufForAddress((Ipv4Address) value), output));
+            Ipv4Util.byteBufForAddress((Ipv4AddressNoZone) value), output));

         ifPresentApply(linkAttributes.getRemoteIpv6RouterId(), value -> TlvUtil.writeTLV(REMOTE_IPV6_ROUTER_ID,
         ifPresentApply(linkAttributes.getRemoteIpv6RouterId(), value -> TlvUtil.writeTLV(REMOTE_IPV6_ROUTER_ID,

-            Ipv6Util.byteBufForAddress((Ipv6Address) value), output));
+            Ipv6Util.byteBufForAddress((Ipv6AddressNoZone) value), output));

         ifPresentApply(linkAttributes.getAdminGroup(), value -> TlvUtil.writeTLV(ADMIN_GROUP,
             Unpooled.copyInt(((AdministrativeGroup) value).getValue().intValue()), output));
         ifPresentApply(linkAttributes.getMaxLinkBandwidth(), value -> TlvUtil.writeTLV(MAX_BANDWIDTH,
         ifPresentApply(linkAttributes.getAdminGroup(), value -> TlvUtil.writeTLV(ADMIN_GROUP,
             Unpooled.copyInt(((AdministrativeGroup) value).getValue().intValue()), output));
         ifPresentApply(linkAttributes.getMaxLinkBandwidth(), value -> TlvUtil.writeTLV(MAX_BANDWIDTH,

diff --git a/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/PrefixAttributesParser.java b/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/PrefixAttributesParser.java
index ee70b48500363dac88430bb39c320c1df7d92287..ec3988c784b05da2c3c3c0c62be9270df5a08d07 100644 (file)
--- a/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/PrefixAttributesParser.java
+++ b/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/PrefixAttributesParser.java
@@ -27,7 +27,7 @@ import org.opendaylight.protocol.util.BitArray;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.protocol.util.Ipv4Util;
 import org.opendaylight.protocol.util.Ipv6Util;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.protocol.util.Ipv4Util;
 import org.opendaylight.protocol.util.Ipv6Util;

-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.IpAddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.ExtendedRouteTag;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.IgpBits.UpDown;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.ProtocolId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.ExtendedRouteTag;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.IgpBits.UpDown;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.ProtocolId;


@@ -117,7 +117,7 @@ public final class PrefixAttributesParser {
                 LOG.debug("Parsed Metric: {}", metric);
                 break;
             case FORWARDING_ADDRESS:
                 LOG.debug("Parsed Metric: {}", metric);
                 break;
             case FORWARDING_ADDRESS:

-                final IpAddress fwdAddress = parseForwardingAddress(value);
+                final IpAddressNoZone fwdAddress = parseForwardingAddress(value);

                 builder.setOspfForwardingAddress(fwdAddress);
                 LOG.debug("Parsed FWD Address: {}", fwdAddress);
                 break;
                 builder.setOspfForwardingAddress(fwdAddress);
                 LOG.debug("Parsed FWD Address: {}", fwdAddress);
                 break;


@@ -190,12 +190,12 @@ public final class PrefixAttributesParser {
         }
     }
 
         }
     }
 

-    private static IpAddress parseForwardingAddress(final ByteBuf value) {
+    private static IpAddressNoZone parseForwardingAddress(final ByteBuf value) {

         switch (value.readableBytes()) {
             case Ipv4Util.IP4_LENGTH:
         switch (value.readableBytes()) {
             case Ipv4Util.IP4_LENGTH:

-                return new IpAddress(Ipv4Util.addressForByteBuf(value));
+                return new IpAddressNoZone(Ipv4Util.addressForByteBuf(value));

             case Ipv6Util.IPV6_LENGTH:
             case Ipv6Util.IPV6_LENGTH:

-                return new IpAddress(Ipv6Util.addressForByteBuf(value));
+                return new IpAddressNoZone(Ipv6Util.addressForByteBuf(value));

             default:
                 LOG.debug("Ignoring unsupported forwarding address length {}", value.readableBytes());
                 return null;
             default:
                 LOG.debug("Ignoring unsupported forwarding address length {}", value.readableBytes());
                 return null;


@@ -287,13 +287,14 @@ public final class PrefixAttributesParser {
         }
     }
 
         }
     }
 

-    private static void serializeForwardingAddress(final IpAddress forwardingAddress, final ByteBuf byteAggregator) {
+    private static void serializeForwardingAddress(final IpAddressNoZone forwardingAddress,
+            final ByteBuf byteAggregator) {

         if (forwardingAddress != null) {
             final ByteBuf ospfBuf = Unpooled.buffer();
         if (forwardingAddress != null) {
             final ByteBuf ospfBuf = Unpooled.buffer();

-            if (forwardingAddress.getIpv4Address() != null) {
-                ospfBuf.writeBytes(Ipv4Util.bytesForAddress(forwardingAddress.getIpv4Address()));
-            } else if (forwardingAddress.getIpv6Address() != null) {
-                ospfBuf.writeBytes(Ipv6Util.bytesForAddress(forwardingAddress.getIpv6Address()));
+            if (forwardingAddress.getIpv4AddressNoZone() != null) {
+                ospfBuf.writeBytes(Ipv4Util.bytesForAddress(forwardingAddress.getIpv4AddressNoZone()));
+            } else if (forwardingAddress.getIpv6AddressNoZone() != null) {
+                ospfBuf.writeBytes(Ipv6Util.bytesForAddress(forwardingAddress.getIpv6AddressNoZone()));

             }
             TlvUtil.writeTLV(FORWARDING_ADDRESS, ospfBuf, byteAggregator);
         }
             }
             TlvUtil.writeTLV(FORWARDING_ADDRESS, ospfBuf, byteAggregator);
         }

diff --git a/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/sr/binding/sid/sub/tlvs/Ipv4EroParser.java b/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/sr/binding/sid/sub/tlvs/Ipv4EroParser.java
index b29c9d3ce6a2302a54b59b4be6457f1890dfe54a..65cc2c5f45d95abbb49eb54af4d43af2dc140cf6 100644 (file)
--- a/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/sr/binding/sid/sub/tlvs/Ipv4EroParser.java
+++ b/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/sr/binding/sid/sub/tlvs/Ipv4EroParser.java
@@ -16,7 +16,7 @@ import org.opendaylight.protocol.bgp.linkstate.spi.BindingSubTlvsSerializer;
 import org.opendaylight.protocol.bgp.linkstate.spi.TlvUtil;
 import org.opendaylight.protocol.util.BitArray;
 import org.opendaylight.protocol.util.Ipv4Util;
 import org.opendaylight.protocol.bgp.linkstate.spi.TlvUtil;
 import org.opendaylight.protocol.util.BitArray;
 import org.opendaylight.protocol.util.Ipv4Util;

-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.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.ProtocolId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.segment.routing.ext.rev151014.binding.sub.tlvs.BindingSubTlv;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.segment.routing.ext.rev151014.binding.sub.tlvs.binding.sub.tlv.Ipv4EroBackupCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.ProtocolId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.segment.routing.ext.rev151014.binding.sub.tlvs.BindingSubTlv;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.segment.routing.ext.rev151014.binding.sub.tlvs.binding.sub.tlv.Ipv4EroBackupCase;


@@ -69,7 +69,7 @@ public final class Ipv4EroParser implements BindingSubTlvsParser, BindingSubTlvs
         return new Ipv4EroBackupCaseBuilder().setIpv4EroBackup(builder.build()).build();
     }
 
         return new Ipv4EroBackupCaseBuilder().setIpv4EroBackup(builder.build()).build();
     }
 

-    static ByteBuf serializeIpv4EroCase(final Boolean loose, final Ipv4Address address) {
+    static ByteBuf serializeIpv4EroCase(final Boolean loose, final Ipv4AddressNoZone address) {

         final ByteBuf buffer = Unpooled.buffer();
         serializeEroFlags(buffer, loose);
         buffer.writeBytes(Ipv4Util.byteBufForAddress(address));
         final ByteBuf buffer = Unpooled.buffer();
         serializeEroFlags(buffer, loose);
         buffer.writeBytes(Ipv4Util.byteBufForAddress(address));

diff --git a/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/sr/binding/sid/sub/tlvs/Ipv6EroParser.java b/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/sr/binding/sid/sub/tlvs/Ipv6EroParser.java
index 706b52bafa4b202a7214534ad4c9e2a03035154f..fccab6ac57700a0586a395b538630a165ac3e6e9 100644 (file)
--- a/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/sr/binding/sid/sub/tlvs/Ipv6EroParser.java
+++ b/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/sr/binding/sid/sub/tlvs/Ipv6EroParser.java
@@ -16,7 +16,7 @@ import org.opendaylight.protocol.bgp.linkstate.spi.BindingSubTlvsSerializer;
 import org.opendaylight.protocol.bgp.linkstate.spi.TlvUtil;
 import org.opendaylight.protocol.util.BitArray;
 import org.opendaylight.protocol.util.Ipv6Util;
 import org.opendaylight.protocol.bgp.linkstate.spi.TlvUtil;
 import org.opendaylight.protocol.util.BitArray;
 import org.opendaylight.protocol.util.Ipv6Util;

-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.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.ProtocolId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.segment.routing.ext.rev151014.binding.sub.tlvs.BindingSubTlv;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.segment.routing.ext.rev151014.binding.sub.tlvs.binding.sub.tlv.Ipv6EroBackupCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.ProtocolId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.segment.routing.ext.rev151014.binding.sub.tlvs.BindingSubTlv;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.segment.routing.ext.rev151014.binding.sub.tlvs.binding.sub.tlv.Ipv6EroBackupCase;


@@ -66,7 +66,7 @@ public final class Ipv6EroParser implements BindingSubTlvsParser, BindingSubTlvs
         return new Ipv6EroBackupCaseBuilder().setIpv6EroBackup(builder.build()).build();
     }
 
         return new Ipv6EroBackupCaseBuilder().setIpv6EroBackup(builder.build()).build();
     }
 

-    static ByteBuf serializeIpv6EroCase(final Boolean loose, final Ipv6Address address) {
+    static ByteBuf serializeIpv6EroCase(final Boolean loose, final Ipv6AddressNoZone address) {

         final ByteBuf buffer = Unpooled.buffer();
         Ipv4EroParser.serializeEroFlags(buffer, loose);
         buffer.writeBytes(Ipv6Util.byteBufForAddress(address));
         final ByteBuf buffer = Unpooled.buffer();
         Ipv4EroParser.serializeEroFlags(buffer, loose);
         buffer.writeBytes(Ipv6Util.byteBufForAddress(address));

diff --git a/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/nlri/NodeNlriParser.java b/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/nlri/NodeNlriParser.java
index 152c260e5b1f612be7d7d2d609286fb0b404787d..410f56f42f098565e7e95bc386ab0ac7934136e7 100644 (file)
--- a/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/nlri/NodeNlriParser.java
+++ b/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/nlri/NodeNlriParser.java
@@ -18,7 +18,7 @@ import org.opendaylight.protocol.bgp.linkstate.impl.tlvs.MemAsNumTlvParser;
 import org.opendaylight.protocol.bgp.linkstate.spi.AbstractNlriTypeCodec;
 import org.opendaylight.protocol.bgp.linkstate.spi.pojo.SimpleNlriTypeRegistry;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 import org.opendaylight.protocol.bgp.linkstate.spi.AbstractNlriTypeCodec;
 import org.opendaylight.protocol.bgp.linkstate.spi.pojo.SimpleNlriTypeRegistry;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;

-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.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.AreaIdentifier;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.DomainIdentifier;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.NlriType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.AreaIdentifier;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.DomainIdentifier;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.NlriType;


@@ -208,9 +208,9 @@ public final class NodeNlriParser extends AbstractNlriTypeCodec {
             dataContainerChild -> new AreaIdentifier((Uint32) dataContainerChild.getValue())).orElse(null);
     }
 
             dataContainerChild -> new AreaIdentifier((Uint32) dataContainerChild.getValue())).orElse(null);
     }
 

-    private static Ipv4Address serializeBgpRouterId(final ContainerNode descriptorsData) {
+    private static Ipv4AddressNoZone serializeBgpRouterId(final ContainerNode descriptorsData) {

         return descriptorsData.getChild(BGP_ROUTER_NID).map(
         return descriptorsData.getChild(BGP_ROUTER_NID).map(

-            dataContainerChild -> new Ipv4Address((String) dataContainerChild.getValue())).orElse(null);
+            dataContainerChild -> new Ipv4AddressNoZone((String) dataContainerChild.getValue())).orElse(null);

     }
 
     private static AsNumber serializeMemberAsn(final ContainerNode descriptorsData) {
     }
 
     private static AsNumber serializeMemberAsn(final ContainerNode descriptorsData) {

diff --git a/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/tlvs/AbstractLocalNodeDescriptorTlvCodec.java b/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/tlvs/AbstractLocalNodeDescriptorTlvCodec.java
index caef4ae722cf4b70a5aca22344cf8948da05d91f..4b790221042b33c9496b45d44f55ca09ba035287 100644 (file)
--- a/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/tlvs/AbstractLocalNodeDescriptorTlvCodec.java
+++ b/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/tlvs/AbstractLocalNodeDescriptorTlvCodec.java
@@ -12,7 +12,7 @@ import java.util.HashMap;
 import java.util.Map;
 import org.opendaylight.protocol.bgp.linkstate.spi.LinkstateTlvParser;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 import java.util.Map;
 import org.opendaylight.protocol.bgp.linkstate.spi.LinkstateTlvParser;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;

-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.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.NodeIdentifier;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.linkstate.object.type.link._case.LocalNodeDescriptors;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.linkstate.object.type.link._case.LocalNodeDescriptorsBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.NodeIdentifier;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.linkstate.object.type.link._case.LocalNodeDescriptors;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.linkstate.object.type.link._case.LocalNodeDescriptorsBuilder;


@@ -29,7 +29,7 @@ public abstract class AbstractLocalNodeDescriptorTlvCodec<T extends NodeIdentifi
         final Map<QName, Object> parsedSubTlvs = new HashMap<>();
         final LocalNodeDescriptorsBuilder builder = new LocalNodeDescriptorsBuilder(
             parseNodeDescriptor(value, parsedSubTlvs));
         final Map<QName, Object> parsedSubTlvs = new HashMap<>();
         final LocalNodeDescriptorsBuilder builder = new LocalNodeDescriptorsBuilder(
             parseNodeDescriptor(value, parsedSubTlvs));

-        builder.setBgpRouterId((Ipv4Address) parsedSubTlvs.get(BgpRouterIdTlvParser.BGP_ROUTER_ID_QNAME));
+        builder.setBgpRouterId((Ipv4AddressNoZone) parsedSubTlvs.get(BgpRouterIdTlvParser.BGP_ROUTER_ID_QNAME));

         builder.setMemberAsn((AsNumber) parsedSubTlvs.get(MemAsNumTlvParser.MEMBER_AS_NUMBER_QNAME));
         return builder.build();
     }
         builder.setMemberAsn((AsNumber) parsedSubTlvs.get(MemAsNumTlvParser.MEMBER_AS_NUMBER_QNAME));
         return builder.build();
     }

diff --git a/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/tlvs/BgpRouterIdTlvParser.java b/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/tlvs/BgpRouterIdTlvParser.java
index fd4f76b8a0efcfb4b4c289eab6c6ee3b7e580ca7..1ff83c31b5a499dabf85c61fb3ea8ba883745b55 100644 (file)
--- a/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/tlvs/BgpRouterIdTlvParser.java
+++ b/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/tlvs/BgpRouterIdTlvParser.java
@@ -10,23 +10,23 @@ package org.opendaylight.protocol.bgp.linkstate.impl.tlvs;
 import io.netty.buffer.ByteBuf;
 import org.opendaylight.protocol.bgp.linkstate.spi.LinkstateTlvParser;
 import org.opendaylight.protocol.util.Ipv4Util;
 import io.netty.buffer.ByteBuf;
 import org.opendaylight.protocol.bgp.linkstate.spi.LinkstateTlvParser;
 import org.opendaylight.protocol.util.Ipv4Util;

-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.opendaylight.params.xml.ns.yang.bgp.epe.rev150622.EpeNodeDescriptors;
 import org.opendaylight.yangtools.yang.common.QName;
 
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.epe.rev150622.EpeNodeDescriptors;
 import org.opendaylight.yangtools.yang.common.QName;
 

-public final class BgpRouterIdTlvParser implements LinkstateTlvParser<Ipv4Address>,
-        LinkstateTlvParser.LinkstateTlvSerializer<Ipv4Address> {
+public final class BgpRouterIdTlvParser implements LinkstateTlvParser<Ipv4AddressNoZone>,
+        LinkstateTlvParser.LinkstateTlvSerializer<Ipv4AddressNoZone> {

     private static final int BGP_ROUTER_ID = 516;
 
     public static final QName BGP_ROUTER_ID_QNAME = QName.create(EpeNodeDescriptors.QNAME, "bgp-router-id").intern();
 
     @Override
     private static final int BGP_ROUTER_ID = 516;
 
     public static final QName BGP_ROUTER_ID_QNAME = QName.create(EpeNodeDescriptors.QNAME, "bgp-router-id").intern();
 
     @Override

-    public void serializeTlvBody(final Ipv4Address tlv, final ByteBuf body) {
+    public void serializeTlvBody(final Ipv4AddressNoZone tlv, final ByteBuf body) {

         Ipv4Util.writeIpv4Address(tlv, body);
     }
 
     @Override
         Ipv4Util.writeIpv4Address(tlv, body);
     }
 
     @Override

-    public Ipv4Address parseTlvBody(final ByteBuf value) {
+    public Ipv4AddressNoZone parseTlvBody(final ByteBuf value) {

         return Ipv4Util.addressForByteBuf(value);
     }
 
         return Ipv4Util.addressForByteBuf(value);
     }
 

diff --git a/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/tlvs/RemoteNodeDescriptorTlvParser.java b/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/tlvs/RemoteNodeDescriptorTlvParser.java
index 0d89c814721c6750e4db07f777cfbcf5fb2f9740..f975e0a2fb2024efe54b944f759a9bbb701d6b7e 100644 (file)
--- a/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/tlvs/RemoteNodeDescriptorTlvParser.java
+++ b/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/tlvs/RemoteNodeDescriptorTlvParser.java
@@ -13,7 +13,7 @@ import java.util.Map;
 import org.opendaylight.protocol.bgp.linkstate.spi.LinkstateTlvParser;
 import org.opendaylight.protocol.bgp.linkstate.spi.pojo.SimpleNlriTypeRegistry;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 import org.opendaylight.protocol.bgp.linkstate.spi.LinkstateTlvParser;
 import org.opendaylight.protocol.bgp.linkstate.spi.pojo.SimpleNlriTypeRegistry;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;

-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.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.linkstate.object.type.link._case.RemoteNodeDescriptors;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.linkstate.object.type.link._case.RemoteNodeDescriptorsBuilder;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.linkstate.object.type.link._case.RemoteNodeDescriptors;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.linkstate.object.type.link._case.RemoteNodeDescriptorsBuilder;
 import org.opendaylight.yangtools.yang.common.QName;


@@ -36,7 +36,7 @@ public final class RemoteNodeDescriptorTlvParser extends AbstractNodeDescriptorT
         final Map<QName, Object> parsedSubTlvs = new HashMap<>();
         final RemoteNodeDescriptorsBuilder builder = new RemoteNodeDescriptorsBuilder(
             parseNodeDescriptor(value, parsedSubTlvs));
         final Map<QName, Object> parsedSubTlvs = new HashMap<>();
         final RemoteNodeDescriptorsBuilder builder = new RemoteNodeDescriptorsBuilder(
             parseNodeDescriptor(value, parsedSubTlvs));

-        builder.setBgpRouterId((Ipv4Address) parsedSubTlvs.get(BgpRouterIdTlvParser.BGP_ROUTER_ID_QNAME));
+        builder.setBgpRouterId((Ipv4AddressNoZone) parsedSubTlvs.get(BgpRouterIdTlvParser.BGP_ROUTER_ID_QNAME));

         builder.setMemberAsn((AsNumber) parsedSubTlvs.get(MemAsNumTlvParser.MEMBER_AS_NUMBER_QNAME));
         return builder.build();
     }
         builder.setMemberAsn((AsNumber) parsedSubTlvs.get(MemAsNumTlvParser.MEMBER_AS_NUMBER_QNAME));
         return builder.build();
     }

diff --git a/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/spi/AbstractTeLspNlriCodec.java b/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/spi/AbstractTeLspNlriCodec.java
index 58cfd5d90457087321cfbcdb5c0f2c1d4f78f756..7152f4d66378204ed84623811581440f52acf8c9 100644 (file)
--- a/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/spi/AbstractTeLspNlriCodec.java
+++ b/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/spi/AbstractTeLspNlriCodec.java
@@ -13,8 +13,8 @@ import com.google.common.annotations.VisibleForTesting;
 import io.netty.buffer.ByteBuf;
 import org.opendaylight.protocol.util.Ipv4Util;
 import org.opendaylight.protocol.util.Ipv6Util;
 import io.netty.buffer.ByteBuf;
 import org.opendaylight.protocol.util.Ipv4Util;
 import org.opendaylight.protocol.util.Ipv6Util;

-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.Ipv6Address;
+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.Ipv6AddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.linkstate.ObjectType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.linkstate.destination.CLinkstateDestination;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.linkstate.object.type.TeLspCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.linkstate.ObjectType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.linkstate.destination.CLinkstateDestination;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.linkstate.object.type.TeLspCase;


@@ -74,18 +74,18 @@ public abstract class AbstractTeLspNlriCodec extends AbstractNlriTypeCodec {
     private static AddressFamily serializeAddressFamily(final ChoiceNode addressFamily, final boolean ipv4Case) {
         if (ipv4Case) {
             return new Ipv4CaseBuilder()
     private static AddressFamily serializeAddressFamily(final ChoiceNode addressFamily, final boolean ipv4Case) {
         if (ipv4Case) {
             return new Ipv4CaseBuilder()

-                .setIpv4TunnelSenderAddress(
-                    new Ipv4Address((String) addressFamily.getChild(IPV4_TUNNEL_SENDER_ADDRESS).get().getValue()))
-                .setIpv4TunnelEndpointAddress(
-                    new Ipv4Address((String) addressFamily.getChild(IPV4_TUNNEL_ENDPOINT_ADDRESS).get().getValue()))
+                .setIpv4TunnelSenderAddress(new Ipv4AddressNoZone(
+                    (String) addressFamily.getChild(IPV4_TUNNEL_SENDER_ADDRESS).get().getValue()))
+                .setIpv4TunnelEndpointAddress(new Ipv4AddressNoZone(
+                    (String) addressFamily.getChild(IPV4_TUNNEL_ENDPOINT_ADDRESS).get().getValue()))

                 .build();
         }
 
         return new Ipv6CaseBuilder()
             .setIpv6TunnelSenderAddress(
                 .build();
         }
 
         return new Ipv6CaseBuilder()
             .setIpv6TunnelSenderAddress(

-                new Ipv6Address((String) addressFamily.getChild(IPV6_TUNNEL_SENDER_ADDRESS).get().getValue()))
+                new Ipv6AddressNoZone((String) addressFamily.getChild(IPV6_TUNNEL_SENDER_ADDRESS).get().getValue()))

             .setIpv6TunnelEndpointAddress(
             .setIpv6TunnelEndpointAddress(

-                new Ipv6Address((String) addressFamily.getChild(IPV6_TUNNEL_ENDPOINT_ADDRESS).get().getValue()))
+                new Ipv6AddressNoZone((String) addressFamily.getChild(IPV6_TUNNEL_ENDPOINT_ADDRESS).get().getValue()))

             .build();
     }
 
             .build();
     }
 

diff --git a/bgp/extensions/linkstate/src/main/yang/bgp-epe.yang b/bgp/extensions/linkstate/src/main/yang/bgp-epe.yang
index 2689c1f6fabcfb1a560dd210a1808e4d184f99e8..e04435742b7b1aae18e168825ead5d633dfd9aa5 100644 (file)
--- a/bgp/extensions/linkstate/src/main/yang/bgp-epe.yang
+++ b/bgp/extensions/linkstate/src/main/yang/bgp-epe.yang
@@ -28,7 +28,7 @@ module bgp-epe {
         reference "https://tools.ietf.org/html/draft-ietf-idr-bgpls-segment-routing-epe-05#section-4.1";
         leaf bgp-router-id {
             description "BGP Router Identifier.";
         reference "https://tools.ietf.org/html/draft-ietf-idr-bgpls-segment-routing-epe-05#section-4.1";
         leaf bgp-router-id {
             description "BGP Router Identifier.";

-            type inet:ipv4-address;
+            type inet:ipv4-address-no-zone;

         }
 
         leaf member-asn {
         }
 
         leaf member-asn {


@@ -36,4 +36,4 @@ module bgp-epe {
             type inet:as-number;
         }
     }
             type inet:as-number;
         }
     }

-}
\ No newline at end of file
+}

diff --git a/bgp/extensions/linkstate/src/main/yang/bgp-linkstate.yang b/bgp/extensions/linkstate/src/main/yang/bgp-linkstate.yang
index 44d2a205213a1d891e0e5bcaebd6813c3517f923..3dc868fead3a0164129314b8bc5aab42c117f1f1 100644 (file)
--- a/bgp/extensions/linkstate/src/main/yang/bgp-linkstate.yang
+++ b/bgp/extensions/linkstate/src/main/yang/bgp-linkstate.yang
@@ -174,12 +174,12 @@ module bgp-linkstate {
 
     typedef ipv4-interface-identifier {
         reference "http://tools.ietf.org/html/rfc5305#section-3.2";
 
     typedef ipv4-interface-identifier {
         reference "http://tools.ietf.org/html/rfc5305#section-3.2";

-        type inet:ipv4-address;
+        type inet:ipv4-address-no-zone;

     }
 
     typedef ipv6-interface-identifier {
         reference "http://tools.ietf.org/html/rfc6119#section-4.2";
     }
 
     typedef ipv6-interface-identifier {
         reference "http://tools.ietf.org/html/rfc6119#section-4.2";

-        type inet:ipv6-address;
+        type inet:ipv6-address-no-zone;

     }
 
     typedef ospf-interface-identifier {
     }
 
     typedef ospf-interface-identifier {


@@ -363,21 +363,21 @@ module bgp-linkstate {
                 choice address-family {
                     case ipv4-case {
                         leaf ipv4-tunnel-sender-address {
                 choice address-family {
                     case ipv4-case {
                         leaf ipv4-tunnel-sender-address {

-                            type inet:ipv4-address;
+                            type inet:ipv4-address-no-zone;

                             mandatory true;
                         }
                         leaf ipv4-tunnel-endpoint-address {
                             mandatory true;
                         }
                         leaf ipv4-tunnel-endpoint-address {

-                            type inet:ipv4-address;
+                            type inet:ipv4-address-no-zone;

                             mandatory true;
                         }
                     }
                     case ipv6-case {
                         leaf ipv6-tunnel-sender-address {
                             mandatory true;
                         }
                     }
                     case ipv6-case {
                         leaf ipv6-tunnel-sender-address {

-                            type inet:ipv6-address;
+                            type inet:ipv6-address-no-zone;

                             mandatory true;
                         }
                         leaf ipv6-tunnel-endpoint-address {
                             mandatory true;
                         }
                         leaf ipv6-tunnel-endpoint-address {

-                            type inet:ipv6-address;
+                            type inet:ipv6-address-no-zone;

                             mandatory true;
                         }
                     }
                             mandatory true;
                         }
                     }


@@ -448,12 +448,12 @@ module bgp-linkstate {
 
     typedef ipv4-router-identifier {
         reference "https://tools.ietf.org/html/rfc7752#section-3.3.1.4";
 
     typedef ipv4-router-identifier {
         reference "https://tools.ietf.org/html/rfc7752#section-3.3.1.4";

-        type inet:ipv4-address;
+        type inet:ipv4-address-no-zone;

     }
 
     typedef ipv6-router-identifier {
         reference "https://tools.ietf.org/html/rfc7752#section-3.3.1.4";
     }
 
     typedef ipv6-router-identifier {
         reference "https://tools.ietf.org/html/rfc7752#section-3.3.1.4";

-        type inet:ipv6-address;
+        type inet:ipv6-address-no-zone;

     }
 
     grouping node-state {
     }
 
     grouping node-state {


@@ -721,7 +721,7 @@ module bgp-linkstate {
             type netc:igp-metric;
         }
         leaf ospf-forwarding-address {
             type netc:igp-metric;
         }
         leaf ospf-forwarding-address {

-            type inet:ip-address;
+            type inet:ip-address-no-zone;

         }
         container sr-prefix {
             uses bgp-sr:prefix-sid-tlv;
         }
         container sr-prefix {
             uses bgp-sr:prefix-sid-tlv;

diff --git a/bgp/extensions/linkstate/src/main/yang/bgp-segment-routing.yang b/bgp/extensions/linkstate/src/main/yang/bgp-segment-routing.yang
index 9d226a14baf9744c8ca052eab168eb3d6912d29e..b85806f684d06b3937af77300b62de76926c8c49 100644 (file)
--- a/bgp/extensions/linkstate/src/main/yang/bgp-segment-routing.yang
+++ b/bgp/extensions/linkstate/src/main/yang/bgp-segment-routing.yang
@@ -53,7 +53,7 @@ module bgp-segment-routing {
             }
             case ipv6-address-case {
                 leaf ipv6-address {
             }
             case ipv6-address-case {
                 leaf ipv6-address {

-                    type inet:ipv6-address;
+                    type inet:ipv6-address-no-zone;

                 }
             }
             case sid-case {
                 }
             }
             case sid-case {


@@ -139,7 +139,7 @@ module bgp-segment-routing {
             type netc:iso-system-identifier;
         }
         leaf neighbor-id {
             type netc:iso-system-identifier;
         }
         leaf neighbor-id {

-            type inet:ipv4-address;
+            type inet:ipv4-address-no-zone;

         }
         uses sid-label-index;
     }
         }
         uses sid-label-index;
     }


@@ -200,7 +200,7 @@ module bgp-segment-routing {
     grouping ero-ipv4-address {
         uses ero-flags;
         leaf address {
     grouping ero-ipv4-address {
         uses ero-flags;
         leaf address {

-            type inet:ipv4-address;
+            type inet:ipv4-address-no-zone;

             mandatory true;
         }
     }
             mandatory true;
         }
     }


@@ -208,7 +208,7 @@ module bgp-segment-routing {
     grouping ero-ipv6-address {
         uses ero-flags;
         leaf address {
     grouping ero-ipv6-address {
         uses ero-flags;
         leaf address {

-            type inet:ipv6-address;
+            type inet:ipv6-address-no-zone;

             mandatory true;
         }
     }
             mandatory true;
         }
     }

diff --git a/bgp/extensions/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAttributeParserTest.java b/bgp/extensions/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAttributeParserTest.java
index c50697230738408dd87d494178ebaa36248ac86a..4ac945e582a3c5c1a8fdfce7c703b822010bdc55 100644 (file)
--- a/bgp/extensions/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAttributeParserTest.java
+++ b/bgp/extensions/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAttributeParserTest.java
@@ -343,7 +343,7 @@ public class LinkstateAttributeParserTest {
             (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78, (byte) 0x10, (byte) 0x30, (byte) 0x50, (byte) 0x70
         }, ls.getExtendedTags().get(0).getValue());
         assertEquals(10, ls.getPrefixMetric().getValue().intValue());
             (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78, (byte) 0x10, (byte) 0x30, (byte) 0x50, (byte) 0x70
         }, ls.getExtendedTags().get(0).getValue());
         assertEquals(10, ls.getPrefixMetric().getValue().intValue());

-        assertEquals("10.25.2.27", ls.getOspfForwardingAddress().getIpv4Address().getValue());
+        assertEquals("10.25.2.27", ls.getOspfForwardingAddress().getIpv4AddressNoZone().getValue());

 
         //serialization
         final ByteBuf buff = Unpooled.buffer();
 
         //serialization
         final ByteBuf buff = Unpooled.buffer();


@@ -375,7 +375,7 @@ public class LinkstateAttributeParserTest {
 
         final AssociationObject associationObject = teLspAttributes.getAssociationObject();
         assertEquals(AssociationType.Recovery, associationObject.getAssociationType());
 
         final AssociationObject associationObject = teLspAttributes.getAssociationObject();
         assertEquals(AssociationType.Recovery, associationObject.getAssociationType());

-        final IpAddressNoZone ipv4 = new IpAddressNoZone(Ipv4Util.noZoneAddressForByteBuf(Unpooled.copiedBuffer(
+        final IpAddressNoZone ipv4 = new IpAddressNoZone(Ipv4Util.addressForByteBuf(Unpooled.copiedBuffer(

             new byte[]{0x01, 0x02, 0x03, 0x04})));
         assertEquals(ipv4, associationObject.getIpAddress());
         final short associationId = 2;
             new byte[]{0x01, 0x02, 0x03, 0x04})));
         assertEquals(ipv4, associationObject.getIpAddress());
         final short associationId = 2;

diff --git a/bgp/extensions/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/ParserTest.java b/bgp/extensions/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/ParserTest.java
index 05d2720795ce99f54a8f970f32b7b6aae3654911..4726d79222520c682be1ae8312990d80357d37d4 100644 (file)
--- a/bgp/extensions/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/ParserTest.java
+++ b/bgp/extensions/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/ParserTest.java
@@ -33,7 +33,7 @@ import org.opendaylight.protocol.bgp.parser.spi.NlriRegistry;
 import org.opendaylight.protocol.bgp.parser.spi.pojo.ServiceLoaderBGPExtensionProviderContext;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 import org.opendaylight.protocol.bgp.parser.spi.pojo.ServiceLoaderBGPExtensionProviderContext;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;

-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.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.AreaIdentifier;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.DomainIdentifier;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.Identifier;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.AreaIdentifier;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.DomainIdentifier;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.Identifier;


@@ -335,7 +335,7 @@ public class ParserTest {
         assertNull(message.getWithdrawnRoutes());
 
         final Ipv4NextHopCase nextHop = new Ipv4NextHopCaseBuilder().setIpv4NextHop(
         assertNull(message.getWithdrawnRoutes());
 
         final Ipv4NextHopCase nextHop = new Ipv4NextHopCaseBuilder().setIpv4NextHop(

-            new Ipv4NextHopBuilder().setGlobal(new Ipv4Address("25.25.25.1")).build()).build();
+            new Ipv4NextHopBuilder().setGlobal(new Ipv4AddressNoZone("25.25.25.1")).build()).build();

 
         final LocalNodeDescriptorsBuilder ndBuilder = new LocalNodeDescriptorsBuilder()
             .setAsNumber(new AsNumber(Uint32.valueOf(100))).setDomainId(
 
         final LocalNodeDescriptorsBuilder ndBuilder = new LocalNodeDescriptorsBuilder()
             .setAsNumber(new AsNumber(Uint32.valueOf(100))).setDomainId(


@@ -366,14 +366,14 @@ public class ParserTest {
             new OspfNodeCaseBuilder().setOspfNode(new OspfNodeBuilder()
                 .setOspfRouterId(Uint32.valueOf(0x03030304L)).build()).build()).build());
         lCase.setLinkDescriptors(new LinkDescriptorsBuilder().setIpv4InterfaceAddress(
             new OspfNodeCaseBuilder().setOspfNode(new OspfNodeBuilder()
                 .setOspfRouterId(Uint32.valueOf(0x03030304L)).build()).build()).build());
         lCase.setLinkDescriptors(new LinkDescriptorsBuilder().setIpv4InterfaceAddress(

-            new Ipv4InterfaceIdentifier(new Ipv4Address("11.11.11.3"))).build());
+            new Ipv4InterfaceIdentifier(new Ipv4AddressNoZone("11.11.11.3"))).build());

         linkstates.add(clBuilder.setObjectType(lCase.build()).build());
 
         lCase.setRemoteNodeDescriptors(rdBuilder.setCRouterIdentifier(
             new OspfNodeCaseBuilder().setOspfNode(new OspfNodeBuilder()
                 .setOspfRouterId(Uint32.valueOf(0x01010102L)).build()).build()).build());
         lCase.setLinkDescriptors(new LinkDescriptorsBuilder().setIpv4InterfaceAddress(
         linkstates.add(clBuilder.setObjectType(lCase.build()).build());
 
         lCase.setRemoteNodeDescriptors(rdBuilder.setCRouterIdentifier(
             new OspfNodeCaseBuilder().setOspfNode(new OspfNodeBuilder()
                 .setOspfRouterId(Uint32.valueOf(0x01010102L)).build()).build()).build());
         lCase.setLinkDescriptors(new LinkDescriptorsBuilder().setIpv4InterfaceAddress(

-            new Ipv4InterfaceIdentifier(new Ipv4Address("11.11.11.1"))).build());
+            new Ipv4InterfaceIdentifier(new Ipv4AddressNoZone("11.11.11.1"))).build());

         linkstates.add(clBuilder.setObjectType(lCase.build()).build());
 
         lCase.setLocalNodeDescriptors(ndBuilder.setCRouterIdentifier(
         linkstates.add(clBuilder.setObjectType(lCase.build()).build());
 
         lCase.setLocalNodeDescriptors(ndBuilder.setCRouterIdentifier(


@@ -547,7 +547,7 @@ public class ParserTest {
         // attributes
 
         final Ipv4NextHopCase nextHop = new Ipv4NextHopCaseBuilder().setIpv4NextHop(
         // attributes
 
         final Ipv4NextHopCase nextHop = new Ipv4NextHopCaseBuilder().setIpv4NextHop(

-            new Ipv4NextHopBuilder().setGlobal(new Ipv4Address("25.25.25.1")).build()).build();
+            new Ipv4NextHopBuilder().setGlobal(new Ipv4AddressNoZone("25.25.25.1")).build()).build();

 
         final CLinkstateDestinationBuilder clBuilder = new CLinkstateDestinationBuilder();
         clBuilder.setIdentifier(new Identifier(Uint64.ONE));
 
         final CLinkstateDestinationBuilder clBuilder = new CLinkstateDestinationBuilder();
         clBuilder.setIdentifier(new Identifier(Uint64.ONE));

diff --git a/bgp/extensions/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/SrAttributeParserTest.java b/bgp/extensions/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/SrAttributeParserTest.java
index 50866d74c72d16f7978dc24f6edbfd47704c35cb..1489eebd75440cfa4a9e46b7a074aae90cea2635 100644 (file)
--- a/bgp/extensions/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/SrAttributeParserTest.java
+++ b/bgp/extensions/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/SrAttributeParserTest.java
@@ -30,8 +30,9 @@ import org.opendaylight.protocol.bgp.parser.spi.pojo.SimpleBGPExtensionProviderC
 import org.opendaylight.protocol.rsvp.parser.spi.pojo.ServiceLoaderRSVPExtensionProviderContext;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.protocol.util.Ipv6Util;
 import org.opendaylight.protocol.rsvp.parser.spi.pojo.ServiceLoaderRSVPExtensionProviderContext;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.protocol.util.Ipv6Util;

-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.Ipv6Address;
 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.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.ProtocolId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.linkstate.attribute.SrAdjIds;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.linkstate.attribute.SrAdjIdsBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.ProtocolId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.linkstate.attribute.SrAdjIds;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.linkstate.attribute.SrAdjIdsBuilder;


@@ -312,7 +313,10 @@ public class SrAttributeParserTest {
             new EroMetricCaseBuilder().setEroMetric(new TeMetric(Uint32.valueOf(6))).build()).build());
         bindingSubTlvs.add(new BindingSubTlvsBuilder()
             .setBindingSubTlv(new Ipv4EroCaseBuilder()
             new EroMetricCaseBuilder().setEroMetric(new TeMetric(Uint32.valueOf(6))).build()).build());
         bindingSubTlvs.add(new BindingSubTlvsBuilder()
             .setBindingSubTlv(new Ipv4EroCaseBuilder()

-                .setIpv4Ero(new Ipv4EroBuilder().setLoose(Boolean.FALSE).setAddress(new Ipv4Address("9.8.7.6")).build())
+                .setIpv4Ero(new Ipv4EroBuilder()
+                    .setLoose(Boolean.FALSE)
+                    .setAddress(new Ipv4AddressNoZone("9.8.7.6"))
+                    .build())

                 .build())
             .build());
         bindingSubTlvs.add(new BindingSubTlvsBuilder()
                 .build())
             .build());
         bindingSubTlvs.add(new BindingSubTlvsBuilder()


@@ -327,7 +331,7 @@ public class SrAttributeParserTest {
         bindingSubTlvs.add(new BindingSubTlvsBuilder()
             .setBindingSubTlv(new Ipv4EroBackupCaseBuilder()
                 .setIpv4EroBackup(new Ipv4EroBackupBuilder()
         bindingSubTlvs.add(new BindingSubTlvsBuilder()
             .setBindingSubTlv(new Ipv4EroBackupCaseBuilder()
                 .setIpv4EroBackup(new Ipv4EroBackupBuilder()

-                    .setLoose(Boolean.FALSE).setAddress(new Ipv4Address("3.4.5.6"))
+                    .setLoose(Boolean.FALSE).setAddress(new Ipv4AddressNoZone("3.4.5.6"))

                     .build())
                 .build())
             .build());
                     .build())
                 .build())
             .build());


@@ -359,14 +363,14 @@ public class SrAttributeParserTest {
         bindingSubTlvs.add(new BindingSubTlvsBuilder()
             .setBindingSubTlv(new Ipv6EroCaseBuilder()
                 .setIpv6Ero(new Ipv6EroBuilder()
         bindingSubTlvs.add(new BindingSubTlvsBuilder()
             .setBindingSubTlv(new Ipv6EroCaseBuilder()
                 .setIpv6Ero(new Ipv6EroBuilder()

-                    .setLoose(Boolean.FALSE).setAddress(new Ipv6Address(IPV6_A))
+                    .setLoose(Boolean.FALSE).setAddress(new Ipv6AddressNoZone(IPV6_A))

                     .build())
                 .build())
             .build());
         bindingSubTlvs.add(new BindingSubTlvsBuilder()
             .setBindingSubTlv(new Ipv6EroBackupCaseBuilder()
                 .setIpv6EroBackup(new Ipv6EroBackupBuilder()
                     .build())
                 .build())
             .build());
         bindingSubTlvs.add(new BindingSubTlvsBuilder()
             .setBindingSubTlv(new Ipv6EroBackupCaseBuilder()
                 .setIpv6EroBackup(new Ipv6EroBackupBuilder()

-                    .setLoose(Boolean.FALSE).setAddress(new Ipv6Address(IPV6_B))
+                    .setLoose(Boolean.FALSE).setAddress(new Ipv6AddressNoZone(IPV6_B))

                     .build())
                 .build())
             .build());
                     .build())
                 .build())
             .build());


@@ -418,7 +422,7 @@ public class SrAttributeParserTest {
         final SrLanAdjIds srLanAdjId = new SrLanAdjIdsBuilder()
             .setFlags(OSPF_LAN_ADJ_FLAGS)
             .setWeight(new Weight(Uint8.TEN))
         final SrLanAdjIds srLanAdjId = new SrLanAdjIdsBuilder()
             .setFlags(OSPF_LAN_ADJ_FLAGS)
             .setWeight(new Weight(Uint8.TEN))

-            .setNeighborId(new Ipv4Address("1.2.3.4"))
+            .setNeighborId(new Ipv4AddressNoZone("1.2.3.4"))

             .setSidLabelIndex(new LocalLabelCaseBuilder()
                 .setLocalLabel(new MplsLabel(Uint32.valueOf(24000L)))
                 .build())
             .setSidLabelIndex(new LocalLabelCaseBuilder()
                 .setLocalLabel(new MplsLabel(Uint32.valueOf(24000L)))
                 .build())

diff --git a/bgp/extensions/mvpn/src/main/java/org/opendaylight/protocol/bgp/mvpn/impl/attributes/PEDistinguisherLabelsAttributeHandler.java b/bgp/extensions/mvpn/src/main/java/org/opendaylight/protocol/bgp/mvpn/impl/attributes/PEDistinguisherLabelsAttributeHandler.java
index 034f3fe05abcf759fa6eea56a9f16b0e4515e118..53fd3e1f65a814a2bf3eacb722941ba29b91a5d0 100644 (file)
--- a/bgp/extensions/mvpn/src/main/java/org/opendaylight/protocol/bgp/mvpn/impl/attributes/PEDistinguisherLabelsAttributeHandler.java
+++ b/bgp/extensions/mvpn/src/main/java/org/opendaylight/protocol/bgp/mvpn/impl/attributes/PEDistinguisherLabelsAttributeHandler.java
@@ -23,7 +23,7 @@ import org.opendaylight.protocol.bgp.parser.spi.RevisedErrorHandling;
 import org.opendaylight.protocol.util.Ipv4Util;
 import org.opendaylight.protocol.util.Ipv6Util;
 import org.opendaylight.protocol.util.MplsLabelUtil;
 import org.opendaylight.protocol.util.Ipv4Util;
 import org.opendaylight.protocol.util.Ipv6Util;
 import org.opendaylight.protocol.util.MplsLabelUtil;

-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.IpAddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.Attributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.AttributesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.bgp.rib.route.PeDistinguisherLabelsAttributeAugmentation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.Attributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.AttributesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.bgp.rib.route.PeDistinguisherLabelsAttributeAugmentation;


@@ -79,9 +79,9 @@ public final class PEDistinguisherLabelsAttributeHandler extends AbstractAttribu
         for (int i = 0; i < count; ++i) {
             final PeDistinguisherLabelAttributeBuilder attribute = new PeDistinguisherLabelAttributeBuilder();
             if (isIpv4) {
         for (int i = 0; i < count; ++i) {
             final PeDistinguisherLabelAttributeBuilder attribute = new PeDistinguisherLabelAttributeBuilder();
             if (isIpv4) {

-                attribute.setPeAddress(new IpAddress(Ipv4Util.addressForByteBuf(buffer)));
+                attribute.setPeAddress(new IpAddressNoZone(Ipv4Util.addressForByteBuf(buffer)));

             } else {
             } else {

-                attribute.setPeAddress(new IpAddress(Ipv6Util.addressForByteBuf(buffer)));
+                attribute.setPeAddress(new IpAddressNoZone(Ipv6Util.addressForByteBuf(buffer)));

             }
             attribute.setMplsLabel(MplsLabelUtil.mplsLabelForByteBuf(buffer));
             list.add(attribute.build());
             }
             attribute.setMplsLabel(MplsLabelUtil.mplsLabelForByteBuf(buffer));
             list.add(attribute.build());


@@ -106,10 +106,10 @@ public final class PEDistinguisherLabelsAttributeHandler extends AbstractAttribu
                 = att.getPeDistinguisherLabelsAttribute().getPeDistinguisherLabelAttribute();
         final ByteBuf buffer = Unpooled.buffer();
         for (final PeDistinguisherLabelAttribute peDist : distinguishers) {
                 = att.getPeDistinguisherLabelsAttribute().getPeDistinguisherLabelAttribute();
         final ByteBuf buffer = Unpooled.buffer();
         for (final PeDistinguisherLabelAttribute peDist : distinguishers) {

-            if (peDist.getPeAddress().getIpv4Address() != null) {
-                buffer.writeBytes(Ipv4Util.bytesForAddress(peDist.getPeAddress().getIpv4Address()));
+            if (peDist.getPeAddress().getIpv4AddressNoZone() != null) {
+                buffer.writeBytes(Ipv4Util.bytesForAddress(peDist.getPeAddress().getIpv4AddressNoZone()));

             } else {
             } else {

-                buffer.writeBytes(Ipv6Util.bytesForAddress(peDist.getPeAddress().getIpv6Address()));
+                buffer.writeBytes(Ipv6Util.bytesForAddress(peDist.getPeAddress().getIpv6AddressNoZone()));

             }
             buffer.writeBytes(MplsLabelUtil.byteBufForMplsLabel(peDist.getMplsLabel()));
         }
             }
             buffer.writeBytes(MplsLabelUtil.byteBufForMplsLabel(peDist.getMplsLabel()));
         }

diff --git a/bgp/extensions/mvpn/src/main/java/org/opendaylight/protocol/bgp/mvpn/impl/attributes/tunnel/identifier/MldpP2mpLspParser.java b/bgp/extensions/mvpn/src/main/java/org/opendaylight/protocol/bgp/mvpn/impl/attributes/tunnel/identifier/MldpP2mpLspParser.java
index 7edbd760ee6c944cc779cf3cab3412ff85f615e2..95234873547d878b819816d57a99da6c7992d799 100644 (file)
--- a/bgp/extensions/mvpn/src/main/java/org/opendaylight/protocol/bgp/mvpn/impl/attributes/tunnel/identifier/MldpP2mpLspParser.java
+++ b/bgp/extensions/mvpn/src/main/java/org/opendaylight/protocol/bgp/mvpn/impl/attributes/tunnel/identifier/MldpP2mpLspParser.java
@@ -20,7 +20,7 @@ import org.opendaylight.protocol.bgp.mvpn.spi.attributes.tunnel.identifier.Abstr
 import org.opendaylight.protocol.bgp.parser.spi.AddressFamilyRegistry;
 import org.opendaylight.protocol.util.Ipv4Util;
 import org.opendaylight.protocol.util.Ipv6Util;
 import org.opendaylight.protocol.bgp.parser.spi.AddressFamilyRegistry;
 import org.opendaylight.protocol.util.Ipv4Util;
 import org.opendaylight.protocol.util.Ipv6Util;

-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.IpAddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.AddressFamily;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pmsi.tunnel.rev180329.PmsiTunnelType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pmsi.tunnel.rev180329.pmsi.tunnel.pmsi.tunnel.TunnelIdentifier;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.AddressFamily;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pmsi.tunnel.rev180329.PmsiTunnelType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pmsi.tunnel.rev180329.pmsi.tunnel.pmsi.tunnel.TunnelIdentifier;


@@ -50,10 +50,10 @@ public final class MldpP2mpLspParser extends AbstractTunnelIdentifier<MldpP2mpLs
         if (!serializeOpaqueList(mldpP2mpLsp.getOpaqueValue(), opaqueValues) || addressFamily == 0) {
             return NO_TUNNEL_INFORMATION_PRESENT;
         }
         if (!serializeOpaqueList(mldpP2mpLsp.getOpaqueValue(), opaqueValues) || addressFamily == 0) {
             return NO_TUNNEL_INFORMATION_PRESENT;
         }

-        final IpAddress rootNode = mldpP2mpLsp.getRootNodeAddress();
+        final IpAddressNoZone rootNode = mldpP2mpLsp.getRootNodeAddress();

         buffer.writeByte(P2MP_TYPE);
         buffer.writeShort(addressFamily);
         buffer.writeByte(P2MP_TYPE);
         buffer.writeShort(addressFamily);

-        buffer.writeByte(rootNode.getIpv4Address() != null ? Ipv4Util.IP4_LENGTH : Ipv6Util.IPV6_LENGTH);
+        buffer.writeByte(rootNode.getIpv4AddressNoZone() != null ? Ipv4Util.IP4_LENGTH : Ipv6Util.IPV6_LENGTH);

         serializeIpAddress(rootNode, buffer);
 
         buffer.writeShort(opaqueValues.readableBytes());
         serializeIpAddress(rootNode, buffer);
 
         buffer.writeShort(opaqueValues.readableBytes());

diff --git a/bgp/extensions/mvpn/src/main/java/org/opendaylight/protocol/bgp/mvpn/impl/attributes/tunnel/identifier/PAddressPMulticastGroupUtil.java b/bgp/extensions/mvpn/src/main/java/org/opendaylight/protocol/bgp/mvpn/impl/attributes/tunnel/identifier/PAddressPMulticastGroupUtil.java
index fa2e4ac1f6d53b85cf0e7c8b69fb832b47ad5ed4..d0d8bb9c82a2aca037484798af3fd69b3fd45497 100644 (file)
--- a/bgp/extensions/mvpn/src/main/java/org/opendaylight/protocol/bgp/mvpn/impl/attributes/tunnel/identifier/PAddressPMulticastGroupUtil.java
+++ b/bgp/extensions/mvpn/src/main/java/org/opendaylight/protocol/bgp/mvpn/impl/attributes/tunnel/identifier/PAddressPMulticastGroupUtil.java
@@ -10,7 +10,7 @@ package org.opendaylight.protocol.bgp.mvpn.impl.attributes.tunnel.identifier;
 import io.netty.buffer.ByteBuf;
 import org.opendaylight.protocol.util.Ipv4Util;
 import org.opendaylight.protocol.util.Ipv6Util;
 import io.netty.buffer.ByteBuf;
 import org.opendaylight.protocol.util.Ipv4Util;
 import org.opendaylight.protocol.util.Ipv6Util;

-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.IpAddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pmsi.tunnel.rev180329.PAddressPMulticastGroup;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pmsi.tunnel.rev180329.pmsi.tunnel.pmsi.tunnel.tunnel.identifier.bidir.pim.tree.BidirPimTreeBuilder;
 
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pmsi.tunnel.rev180329.PAddressPMulticastGroup;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pmsi.tunnel.rev180329.pmsi.tunnel.pmsi.tunnel.tunnel.identifier.bidir.pim.tree.BidirPimTreeBuilder;
 


@@ -19,19 +19,19 @@ final class PAddressPMulticastGroupUtil {
         // Hidden on purpose
     }
 
         // Hidden on purpose
     }
 

-    static void serializeIpAddress(final IpAddress ipAddress, final ByteBuf byteBuf) {
-        if (ipAddress.getIpv4Address() != null) {
-            byteBuf.writeBytes(Ipv4Util.bytesForAddress(ipAddress.getIpv4Address()));
+    static void serializeIpAddress(final IpAddressNoZone ipAddress, final ByteBuf byteBuf) {
+        if (ipAddress.getIpv4AddressNoZone() != null) {
+            byteBuf.writeBytes(Ipv4Util.bytesForAddress(ipAddress.getIpv4AddressNoZone()));

         } else {
         } else {

-            byteBuf.writeBytes(Ipv6Util.bytesForAddress(ipAddress.getIpv6Address()));
+            byteBuf.writeBytes(Ipv6Util.bytesForAddress(ipAddress.getIpv6AddressNoZone()));

         }
     }
 
         }
     }
 

-    static IpAddress parseIpAddress(final int ipLength, final ByteBuf buffer) {
+    static IpAddressNoZone parseIpAddress(final int ipLength, final ByteBuf buffer) {

         if (ipLength == Ipv6Util.IPV6_LENGTH) {
         if (ipLength == Ipv6Util.IPV6_LENGTH) {

-            return new IpAddress(Ipv6Util.addressForByteBuf(buffer));
+            return new IpAddressNoZone(Ipv6Util.addressForByteBuf(buffer));

         } else if (ipLength == Ipv4Util.IP4_LENGTH) {
         } else if (ipLength == Ipv4Util.IP4_LENGTH) {

-            return new IpAddress(Ipv4Util.addressForByteBuf(buffer));
+            return new IpAddressNoZone(Ipv4Util.addressForByteBuf(buffer));

         }
         return null;
     }
         }
         return null;
     }


@@ -43,8 +43,8 @@ final class PAddressPMulticastGroupUtil {
 
     static PAddressPMulticastGroup parseSenderPMulticastGroup(final ByteBuf buffer) {
         final int ipLength = buffer.readableBytes() / 2;
 
     static PAddressPMulticastGroup parseSenderPMulticastGroup(final ByteBuf buffer) {
         final int ipLength = buffer.readableBytes() / 2;

-        final IpAddress pSenderAddress = parseIpAddress(ipLength, buffer);
-        final IpAddress pMulticastGroup = parseIpAddress(ipLength, buffer);
+        final IpAddressNoZone pSenderAddress = parseIpAddress(ipLength, buffer);
+        final IpAddressNoZone pMulticastGroup = parseIpAddress(ipLength, buffer);

         return new BidirPimTreeBuilder().setPAddress(pSenderAddress).setPMulticastGroup(pMulticastGroup).build();
     }
 }
         return new BidirPimTreeBuilder().setPAddress(pSenderAddress).setPMulticastGroup(pMulticastGroup).build();
     }
 }

diff --git a/bgp/extensions/mvpn/src/main/java/org/opendaylight/protocol/bgp/mvpn/impl/nlri/AbstractMvpnNlri.java b/bgp/extensions/mvpn/src/main/java/org/opendaylight/protocol/bgp/mvpn/impl/nlri/AbstractMvpnNlri.java
index 9c8b054469e45617ab92ff8d62185c537e20ac2f..c8faf968aacf669329c332a7a22d8346b541d209 100644 (file)
--- a/bgp/extensions/mvpn/src/main/java/org/opendaylight/protocol/bgp/mvpn/impl/nlri/AbstractMvpnNlri.java
+++ b/bgp/extensions/mvpn/src/main/java/org/opendaylight/protocol/bgp/mvpn/impl/nlri/AbstractMvpnNlri.java
@@ -14,7 +14,7 @@ import org.opendaylight.bgp.concepts.IpAddressUtil;
 import org.opendaylight.bgp.concepts.RouteDistinguisherUtil;
 import org.opendaylight.protocol.bgp.mvpn.spi.nlri.MvpnParser;
 import org.opendaylight.protocol.bgp.mvpn.spi.nlri.MvpnSerializer;
 import org.opendaylight.bgp.concepts.RouteDistinguisherUtil;
 import org.opendaylight.protocol.bgp.mvpn.spi.nlri.MvpnParser;
 import org.opendaylight.protocol.bgp.mvpn.spi.nlri.MvpnSerializer;

-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.IpAddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.MulticastSourceRdGrouping;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.mvpn.MvpnChoice;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.s.pmsi.a.d.grouping.SPmsiADBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.MulticastSourceRdGrouping;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.mvpn.MvpnChoice;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.s.pmsi.a.d.grouping.SPmsiADBuilder;


@@ -28,7 +28,7 @@ abstract class AbstractMvpnNlri<T extends MvpnChoice> implements MvpnSerializer<
     static MulticastSourceRdGrouping parseRDMulticastSource(final ByteBuf buffer) {
         final SPmsiADBuilder builder = new SPmsiADBuilder();
         builder.setRouteDistinguisher(RouteDistinguisherUtil.parseRouteDistinguisher(buffer));
     static MulticastSourceRdGrouping parseRDMulticastSource(final ByteBuf buffer) {
         final SPmsiADBuilder builder = new SPmsiADBuilder();
         builder.setRouteDistinguisher(RouteDistinguisherUtil.parseRouteDistinguisher(buffer));

-        final IpAddress address = IpAddressUtil.addressForByteBuf(buffer);
+        final IpAddressNoZone address = IpAddressUtil.addressForByteBuf(buffer);

         builder.setMulticastSource(address);
         return builder.build();
     }
         builder.setMulticastSource(address);
         return builder.build();
     }

diff --git a/bgp/extensions/mvpn/src/main/java/org/opendaylight/protocol/bgp/mvpn/impl/nlri/MulticastGroupOpaqueUtil.java b/bgp/extensions/mvpn/src/main/java/org/opendaylight/protocol/bgp/mvpn/impl/nlri/MulticastGroupOpaqueUtil.java
index a72673bf2c01272e5c8ccef5f4f98063510dd941..715c7056e898f24b24d58f66f8a297719050e830 100644 (file)
--- a/bgp/extensions/mvpn/src/main/java/org/opendaylight/protocol/bgp/mvpn/impl/nlri/MulticastGroupOpaqueUtil.java
+++ b/bgp/extensions/mvpn/src/main/java/org/opendaylight/protocol/bgp/mvpn/impl/nlri/MulticastGroupOpaqueUtil.java
@@ -13,7 +13,7 @@ import org.opendaylight.bgp.concepts.IpAddressUtil;
 import org.opendaylight.protocol.bgp.mvpn.impl.attributes.OpaqueUtil;
 import org.opendaylight.protocol.util.Ipv4Util;
 import org.opendaylight.protocol.util.Ipv6Util;
 import org.opendaylight.protocol.bgp.mvpn.impl.attributes.OpaqueUtil;
 import org.opendaylight.protocol.util.Ipv4Util;
 import org.opendaylight.protocol.util.Ipv6Util;

-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.IpAddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.multicast.group.opaque.grouping.MulticastGroup;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.multicast.group.opaque.grouping.multicast.group.CGAddressCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.multicast.group.opaque.grouping.multicast.group.CGAddressCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.multicast.group.opaque.grouping.MulticastGroup;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.multicast.group.opaque.grouping.multicast.group.CGAddressCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.multicast.group.opaque.grouping.multicast.group.CGAddressCaseBuilder;


@@ -36,10 +36,10 @@ final class MulticastGroupOpaqueUtil {
         switch (multicastGroupLength) {
             case Ipv4Util.IP4_BITS_LENGTH:
                 return new CGAddressCaseBuilder()
         switch (multicastGroupLength) {
             case Ipv4Util.IP4_BITS_LENGTH:
                 return new CGAddressCaseBuilder()

-                    .setCGAddress(new IpAddress(Ipv4Util.addressForByteBuf(buffer))).build();
+                    .setCGAddress(new IpAddressNoZone(Ipv4Util.addressForByteBuf(buffer))).build();

             case Ipv6Util.IPV6_BITS_LENGTH:
                 return new CGAddressCaseBuilder()
             case Ipv6Util.IPV6_BITS_LENGTH:
                 return new CGAddressCaseBuilder()

-                    .setCGAddress(new IpAddress(Ipv6Util.addressForByteBuf(buffer))).build();
+                    .setCGAddress(new IpAddressNoZone(Ipv6Util.addressForByteBuf(buffer))).build();

             default:
                 return new LdpMpOpaqueValueCaseBuilder()
                     .setLdpMpOpaqueValue(new LdpMpOpaqueValueBuilder(OpaqueUtil.parseOpaque(buffer)).build()).build();
             default:
                 return new LdpMpOpaqueValueCaseBuilder()
                     .setLdpMpOpaqueValue(new LdpMpOpaqueValueBuilder(OpaqueUtil.parseOpaque(buffer)).build()).build();

diff --git a/bgp/extensions/mvpn/src/main/yang/bgp-mvpn.yang b/bgp/extensions/mvpn/src/main/yang/bgp-mvpn.yang
index 78b2afcb7c2a5d204ef50bdf6c580c427022a050..6a7a4a4df31dc48f95bc28ff467fcef05ae7ea35 100644 (file)
--- a/bgp/extensions/mvpn/src/main/yang/bgp-mvpn.yang
+++ b/bgp/extensions/mvpn/src/main/yang/bgp-mvpn.yang
@@ -73,7 +73,7 @@ module bgp-mvpn {
         uses bgp-t:route-distinguisher-grouping;
 
         leaf multicast-source {
         uses bgp-t:route-distinguisher-grouping;
 
         leaf multicast-source {

-            type inet:ip-address;
+            type inet:ip-address-no-zone;

             mandatory true;
         }
     }
             mandatory true;
         }
     }


@@ -82,7 +82,7 @@ module bgp-mvpn {
         choice multicast-group {
             case c-g-address-case {
                 leaf c-g-address {
         choice multicast-group {
             case c-g-address-case {
                 leaf c-g-address {

-                    type inet:ip-address;
+                    type inet:ip-address-no-zone;

                 }
             }
 
                 }
             }
 


@@ -146,7 +146,7 @@ module bgp-mvpn {
 
             uses multicast-source-rd-grouping;
             leaf multicast-group {
 
             uses multicast-source-rd-grouping;
             leaf multicast-group {

-                type inet:ip-address;
+                type inet:ip-address-no-zone;

                 mandatory true;
             }
         }
                 mandatory true;
             }
         }


@@ -202,7 +202,7 @@ module bgp-mvpn {
         container pe-distinguisher-labels-attribute {
             list pe-distinguisher-label-attribute {
                 leaf pe-address  {
         container pe-distinguisher-labels-attribute {
             list pe-distinguisher-label-attribute {
                 leaf pe-address  {

-                    type inet:ip-address;
+                    type inet:ip-address-no-zone;

                     mandatory true;
                 }
                 leaf mpls-label {
                     mandatory true;
                 }
                 leaf mpls-label {

diff --git a/bgp/extensions/mvpn/src/main/yang/pmsi-tunnel.yang b/bgp/extensions/mvpn/src/main/yang/pmsi-tunnel.yang
index 261c8145c62dd07b7965b29ba11f42dace65385f..99ca2986466e94de71017da9c8452074454b596d 100644 (file)
--- a/bgp/extensions/mvpn/src/main/yang/pmsi-tunnel.yang
+++ b/bgp/extensions/mvpn/src/main/yang/pmsi-tunnel.yang
@@ -80,11 +80,11 @@ module pmsi-tunnel {
     grouping p-address-p-multicast-group {
         leaf p-address {
             mandatory true;
     grouping p-address-p-multicast-group {
         leaf p-address {
             mandatory true;

-            type inet:ip-address;
+            type inet:ip-address-no-zone;

         }
         leaf p-multicast-group {
             mandatory true;
         }
         leaf p-multicast-group {
             mandatory true;

-            type inet:ip-address;
+            type inet:ip-address-no-zone;

         }
     }
 
         }
     }
 


@@ -115,7 +115,7 @@ module pmsi-tunnel {
                         }
                         leaf extended-tunnel-id {
                             mandatory true;
                         }
                         leaf extended-tunnel-id {
                             mandatory true;

-                            type inet:ip-address;
+                            type inet:ip-address-no-zone;

                         }
                     }
                 }
                         }
                     }
                 }


@@ -130,7 +130,7 @@ module pmsi-tunnel {
                         }
                         leaf root-node-address {
                             mandatory true;
                         }
                         leaf root-node-address {
                             mandatory true;

-                            type inet:ip-address;
+                            type inet:ip-address-no-zone;

                         }
                         list opaque-value {
                             uses opaque;
                         }
                         list opaque-value {
                             uses opaque;


@@ -158,7 +158,7 @@ module pmsi-tunnel {
                 case ingress-replication {
                     container ingress-replication {
                         leaf receiving-endpoint-address {
                 case ingress-replication {
                     container ingress-replication {
                         leaf receiving-endpoint-address {

-                            type inet:ip-address;
+                            type inet:ip-address-no-zone;

                         }
                     }
                 }
                         }
                     }
                 }

diff --git a/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/impl/attributes/PEDistinguisherLabelsAttributeHandlerTest.java b/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/impl/attributes/PEDistinguisherLabelsAttributeHandlerTest.java
index 5687a52e6c4d630094ee460a52b65c37dc1b3868..3d27390c803a60fa53d39fd4cb426548471a27d5 100644 (file)
--- a/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/impl/attributes/PEDistinguisherLabelsAttributeHandlerTest.java
+++ b/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/impl/attributes/PEDistinguisherLabelsAttributeHandlerTest.java
@@ -22,8 +22,8 @@ import org.opendaylight.protocol.bgp.parser.spi.AttributeRegistry;
 import org.opendaylight.protocol.bgp.parser.spi.BGPExtensionProviderContext;
 import org.opendaylight.protocol.bgp.parser.spi.pojo.SimpleBGPExtensionProviderContext;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.protocol.bgp.parser.spi.BGPExtensionProviderContext;
 import org.opendaylight.protocol.bgp.parser.spi.pojo.SimpleBGPExtensionProviderContext;
 import org.opendaylight.protocol.util.ByteArray;

-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.IpAddressNoZone;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.Attributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.AttributesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.bgp.rib.route.PeDistinguisherLabelsAttributeAugmentation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.Attributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.AttributesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.bgp.rib.route.PeDistinguisherLabelsAttributeAugmentation;


@@ -76,11 +76,11 @@ public final class PEDistinguisherLabelsAttributeHandlerTest {
         final List<PeDistinguisherLabelAttribute> peAtt = new ArrayList<>(2);
 
         peAtt.add(new PeDistinguisherLabelAttributeBuilder()
         final List<PeDistinguisherLabelAttribute> peAtt = new ArrayList<>(2);
 
         peAtt.add(new PeDistinguisherLabelAttributeBuilder()

-                .setPeAddress(new IpAddress(new Ipv4Address("127.0.0.1")))
+                .setPeAddress(new IpAddressNoZone(new Ipv4AddressNoZone("127.0.0.1")))

                 .setMplsLabel(new MplsLabel(Uint32.ONE))
                 .build());
         peAtt.add(new PeDistinguisherLabelAttributeBuilder()
                 .setMplsLabel(new MplsLabel(Uint32.ONE))
                 .build());
         peAtt.add(new PeDistinguisherLabelAttributeBuilder()

-                .setPeAddress(new IpAddress(new Ipv4Address("127.0.0.2")))
+                .setPeAddress(new IpAddressNoZone(new Ipv4AddressNoZone("127.0.0.2")))

                 .setMplsLabel(new MplsLabel(Uint32.TWO))
                 .build());
         return new AttributesBuilder()
                 .setMplsLabel(new MplsLabel(Uint32.TWO))
                 .build());
         return new AttributesBuilder()

diff --git a/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/impl/attributes/PMSITunnelAttributeHandlerTestUtil.java b/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/impl/attributes/PMSITunnelAttributeHandlerTestUtil.java
index 38f703aacfe5d96f71a17acfac72a83058e9649c..3d5c6c9c6a9e047f94c6dd89bcc4eefa1b038342 100644 (file)
--- a/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/impl/attributes/PMSITunnelAttributeHandlerTestUtil.java
+++ b/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/impl/attributes/PMSITunnelAttributeHandlerTestUtil.java
@@ -12,9 +12,9 @@ import static java.util.Collections.singletonList;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;

-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.Ipv6Address;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressNoZone;
+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.Ipv6AddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.HexString;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.Attributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.AttributesBuilder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.HexString;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.Attributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.AttributesBuilder;


@@ -253,14 +253,14 @@ final class PMSITunnelAttributeHandlerTestUtil {
         (byte) 0xfc, (byte) 0x00, (byte) 0x03, // Opaque Type - Length
         (byte) 0xb5, (byte) 0xeb, (byte) 0x2d,  //Value
     };
         (byte) 0xfc, (byte) 0x00, (byte) 0x03, // Opaque Type - Length
         (byte) 0xb5, (byte) 0xeb, (byte) 0x2d,  //Value
     };

-    private static final IpAddress P_MULTICAST = new IpAddress(new Ipv4Address("23.1.1.1"));
-    private static final IpAddress IP_ADDRESS = new IpAddress(new Ipv4Address("1.1.1.1"));
+    private static final IpAddressNoZone P_MULTICAST = new IpAddressNoZone(new Ipv4AddressNoZone("23.1.1.1"));
+    private static final IpAddressNoZone IP_ADDRESS = new IpAddressNoZone(new Ipv4AddressNoZone("1.1.1.1"));

     private static final Uint8 NO_SUPPORTED_OPAQUE = Uint8.valueOf(200);
     private static final Uint8 GENERIC_LSP_IDENTIFIER = Uint8.ONE;
     private static final HexString OPAQUE_TEST = new HexString("07:00:0b:00:00:01:00:00:00:01:00:00:00:00");
     private static final HexString OPAQUE_TEST2
             = new HexString("07:00:0b:00:00:01:00:00:00:01:00:00:00:00:01:02");
     private static final Uint8 NO_SUPPORTED_OPAQUE = Uint8.valueOf(200);
     private static final Uint8 GENERIC_LSP_IDENTIFIER = Uint8.ONE;
     private static final HexString OPAQUE_TEST = new HexString("07:00:0b:00:00:01:00:00:00:01:00:00:00:00");
     private static final HexString OPAQUE_TEST2
             = new HexString("07:00:0b:00:00:01:00:00:00:01:00:00:00:00:01:02");

-    private static final IpAddress IPV6 = new IpAddress(new Ipv6Address("2001::1"));
+    private static final IpAddressNoZone IPV6 = new IpAddressNoZone(new Ipv6AddressNoZone("2001::1"));

     private static final Uint8 EXTENDED_TYPE = Uint8.MAX_VALUE;
 
     private PMSITunnelAttributeHandlerTestUtil() {
     private static final Uint8 EXTENDED_TYPE = Uint8.MAX_VALUE;
 
     private PMSITunnelAttributeHandlerTestUtil() {


@@ -348,7 +348,7 @@ final class PMSITunnelAttributeHandlerTestUtil {
         return buildAttribute(pmsiTunnelBuilder);
     }
 
         return buildAttribute(pmsiTunnelBuilder);
     }
 

-    private static TunnelIdentifier buildMldpP2mpLsp(final IpAddress ipAddress,
+    private static TunnelIdentifier buildMldpP2mpLsp(final IpAddressNoZone ipAddress,

             final Class<? extends AddressFamily> family, final List<OpaqueValue> opaqueList) {
         return new MldpP2mpLspBuilder()
                 .setMldpP2mpLsp(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pmsi.tunnel
             final Class<? extends AddressFamily> family, final List<OpaqueValue> opaqueList) {
         return new MldpP2mpLspBuilder()
                 .setMldpP2mpLsp(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pmsi.tunnel

diff --git a/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/impl/attributes/tunnel/identifier/PAddressPMulticastGroupUtilTest.java b/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/impl/attributes/tunnel/identifier/PAddressPMulticastGroupUtilTest.java
index 72266a957283f816daffe3d3b8ac0e6de08ec256..9973bcd8bb9dd5712c654b8b82c67bdc35d81b8b 100644 (file)
--- a/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/impl/attributes/tunnel/identifier/PAddressPMulticastGroupUtilTest.java
+++ b/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/impl/attributes/tunnel/identifier/PAddressPMulticastGroupUtilTest.java
@@ -5,7 +5,6 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */

-

 package org.opendaylight.protocol.bgp.mvpn.impl.attributes.tunnel.identifier;
 
 import static org.junit.Assert.assertArrayEquals;
 package org.opendaylight.protocol.bgp.mvpn.impl.attributes.tunnel.identifier;
 
 import static org.junit.Assert.assertArrayEquals;


@@ -18,14 +17,14 @@ import org.junit.Test;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.protocol.util.Ipv4Util;
 import org.opendaylight.protocol.util.Ipv6Util;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.protocol.util.Ipv4Util;
 import org.opendaylight.protocol.util.Ipv6Util;

-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.Ipv6Address;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressNoZone;
+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.Ipv6AddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pmsi.tunnel.rev180329.PAddressPMulticastGroup;
 
 public final class PAddressPMulticastGroupUtilTest {
     private static final String IPV6_MODEL = "2001::1";
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pmsi.tunnel.rev180329.PAddressPMulticastGroup;
 
 public final class PAddressPMulticastGroupUtilTest {
     private static final String IPV6_MODEL = "2001::1";

-    private static final IpAddress IPV6 = new IpAddress(new Ipv6Address(IPV6_MODEL));
+    private static final IpAddressNoZone IPV6 = new IpAddressNoZone(new Ipv6AddressNoZone(IPV6_MODEL));

     private static final byte[] IPV4_ADDRESS_EXPECTED = {(byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x01};
     private static final byte[] IPV6_ADDRESS_EXPECTED = {
         0x20, (byte) 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01
     private static final byte[] IPV4_ADDRESS_EXPECTED = {(byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x01};
     private static final byte[] IPV6_ADDRESS_EXPECTED = {
         0x20, (byte) 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01


@@ -33,8 +32,8 @@ public final class PAddressPMulticastGroupUtilTest {
     private static final byte[] SENDER_P_MULTICAST_GROUP_EXPECTED = {
         (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x17, (byte) 0x01, (byte) 0x01, (byte) 0x01
     };
     private static final byte[] SENDER_P_MULTICAST_GROUP_EXPECTED = {
         (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x17, (byte) 0x01, (byte) 0x01, (byte) 0x01
     };

-    private static final IpAddress IP_ADDRESS = new IpAddress(new Ipv4Address("1.1.1.1"));
-    private static final IpAddress P_MULTICAST = new IpAddress(new Ipv4Address("23.1.1.1"));
+    private static final IpAddressNoZone IP_ADDRESS = new IpAddressNoZone(new Ipv4AddressNoZone("1.1.1.1"));
+    private static final IpAddressNoZone P_MULTICAST = new IpAddressNoZone(new Ipv4AddressNoZone("23.1.1.1"));

 
     @Test
     public void parseIpAddress() {
 
     @Test
     public void parseIpAddress() {


@@ -68,12 +67,12 @@ public final class PAddressPMulticastGroupUtilTest {
 
     private static class MyPAddressPMulticastGroup implements PAddressPMulticastGroup {
         @Override
 
     private static class MyPAddressPMulticastGroup implements PAddressPMulticastGroup {
         @Override

-        public IpAddress getPAddress() {
+        public IpAddressNoZone getPAddress() {

             return IP_ADDRESS;
         }
 
         @Override
             return IP_ADDRESS;
         }
 
         @Override

-        public IpAddress getPMulticastGroup() {
+        public IpAddressNoZone getPMulticastGroup() {

             return P_MULTICAST;
         }
 
             return P_MULTICAST;
         }
 

diff --git a/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/impl/nlri/IntraAsIPmsiADHandlerTest.java b/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/impl/nlri/IntraAsIPmsiADHandlerTest.java
index c25d95f27b5bd9372b93bed713dc083c2eab0052..aa8d77e1f43e5feca73d278bc6c9d507ae6ad898 100644 (file)
--- a/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/impl/nlri/IntraAsIPmsiADHandlerTest.java
+++ b/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/impl/nlri/IntraAsIPmsiADHandlerTest.java
@@ -13,8 +13,8 @@ import static org.junit.Assert.assertEquals;
 import io.netty.buffer.Unpooled;
 import org.junit.Test;
 import org.opendaylight.protocol.util.ByteArray;
 import io.netty.buffer.Unpooled;
 import org.junit.Test;
 import org.opendaylight.protocol.util.ByteArray;

-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.IpAddressNoZone;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.NlriType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.intra.as.i.pmsi.a.d.grouping.IntraAsIPmsiADBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.mvpn.mvpn.choice.IntraAsIPmsiADCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.NlriType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.intra.as.i.pmsi.a.d.grouping.IntraAsIPmsiADBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.mvpn.mvpn.choice.IntraAsIPmsiADCase;


@@ -36,7 +36,7 @@ public class IntraAsIPmsiADHandlerTest {
     private final IntraAsIPmsiADCase expected = new IntraAsIPmsiADCaseBuilder()
             .setIntraAsIPmsiAD(new IntraAsIPmsiADBuilder()
                     .setRouteDistinguisher(new RouteDistinguisher(new RdIpv4("1.2.3.4:258")))
     private final IntraAsIPmsiADCase expected = new IntraAsIPmsiADCaseBuilder()
             .setIntraAsIPmsiAD(new IntraAsIPmsiADBuilder()
                     .setRouteDistinguisher(new RouteDistinguisher(new RdIpv4("1.2.3.4:258")))

-                    .setOrigRouteIp(new IpAddress(new Ipv4Address("1.0.0.1")))
+                    .setOrigRouteIp(new IpAddressNoZone(new Ipv4AddressNoZone("1.0.0.1")))

                     .build()).build();
     private final IntraAsIPmsiADHandler handler = new IntraAsIPmsiADHandler();
 
                     .build()).build();
     private final IntraAsIPmsiADHandler handler = new IntraAsIPmsiADHandler();
 

diff --git a/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/impl/nlri/LeafADHandlerTest.java b/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/impl/nlri/LeafADHandlerTest.java
index d36aff1dce1f2ada10cf6dfe19448c5de1724f70..acff4f145dbab5f4f8e8a8e390e98297acbaae7d 100644 (file)
--- a/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/impl/nlri/LeafADHandlerTest.java
+++ b/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/impl/nlri/LeafADHandlerTest.java
@@ -17,8 +17,8 @@ import org.junit.Test;
 import org.opendaylight.protocol.bgp.mvpn.impl.NlriActivator;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 import org.opendaylight.protocol.bgp.mvpn.impl.NlriActivator;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;

-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.IpAddressNoZone;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.NlriType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.inter.as.i.pmsi.a.d.grouping.InterAsIPmsiADBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.leaf.a.d.grouping.LeafADBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.NlriType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.inter.as.i.pmsi.a.d.grouping.InterAsIPmsiADBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.leaf.a.d.grouping.LeafADBuilder;


@@ -54,7 +54,7 @@ public class LeafADHandlerTest {
                                     .setRouteDistinguisher(new RouteDistinguisher(new RdIpv4("1.2.3.4:258")))
                                     .build()
                     ).build())
                                     .setRouteDistinguisher(new RouteDistinguisher(new RdIpv4("1.2.3.4:258")))
                                     .build()
                     ).build())

-            .setOrigRouteIp(new IpAddress(new Ipv4Address("1.0.0.1"))).build())
+            .setOrigRouteIp(new IpAddressNoZone(new Ipv4AddressNoZone("1.0.0.1"))).build())

             .build();
     private final LeafADHandler handler = new LeafADHandler();
 
             .build();
     private final LeafADHandler handler = new LeafADHandler();
 

diff --git a/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/impl/nlri/SPmsiADHandlerTest.java b/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/impl/nlri/SPmsiADHandlerTest.java
index 29acbd97e99cac05200dd7aa14d054a80669806f..6b1fcba1a6e570056d5b4befa331281b6ddcb3a1 100644 (file)
--- a/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/impl/nlri/SPmsiADHandlerTest.java
+++ b/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/impl/nlri/SPmsiADHandlerTest.java
@@ -5,7 +5,6 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */

-

 package org.opendaylight.protocol.bgp.mvpn.impl.nlri;
 
 import static org.junit.Assert.assertArrayEquals;
 package org.opendaylight.protocol.bgp.mvpn.impl.nlri;
 
 import static org.junit.Assert.assertArrayEquals;


@@ -14,8 +13,8 @@ import static org.junit.Assert.assertEquals;
 import io.netty.buffer.Unpooled;
 import org.junit.Test;
 import org.opendaylight.protocol.util.ByteArray;
 import io.netty.buffer.Unpooled;
 import org.junit.Test;
 import org.opendaylight.protocol.util.ByteArray;

-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.IpAddressNoZone;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.NlriType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.multicast.group.opaque.grouping.multicast.group.CGAddressCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.mvpn.mvpn.choice.SPmsiADCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.NlriType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.multicast.group.opaque.grouping.multicast.group.CGAddressCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.mvpn.mvpn.choice.SPmsiADCase;


@@ -42,10 +41,10 @@ public final class SPmsiADHandlerTest {
     private final SPmsiADCase expected = new SPmsiADCaseBuilder()
             .setSPmsiAD(new SPmsiADBuilder()
                     .setRouteDistinguisher(new RouteDistinguisher(new RdIpv4("1.2.3.4:258")))
     private final SPmsiADCase expected = new SPmsiADCaseBuilder()
             .setSPmsiAD(new SPmsiADBuilder()
                     .setRouteDistinguisher(new RouteDistinguisher(new RdIpv4("1.2.3.4:258")))

-                    .setMulticastSource(new IpAddress(new Ipv4Address("10.0.0.10")))
+                    .setMulticastSource(new IpAddressNoZone(new Ipv4AddressNoZone("10.0.0.10")))

                     .setMulticastGroup(new CGAddressCaseBuilder()
                     .setMulticastGroup(new CGAddressCaseBuilder()

-                            .setCGAddress(new IpAddress(new Ipv4Address("12.0.0.12"))).build())
-                    .setOrigRouteIp(new IpAddress(new Ipv4Address("1.0.0.1")))
+                            .setCGAddress(new IpAddressNoZone(new Ipv4AddressNoZone("12.0.0.12"))).build())
+                    .setOrigRouteIp(new IpAddressNoZone(new Ipv4AddressNoZone("1.0.0.1")))

                     .build()).build();
     private final SPmsiADHandler handler = new SPmsiADHandler();
 
                     .build()).build();
     private final SPmsiADHandler handler = new SPmsiADHandler();
 

diff --git a/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/impl/nlri/SharedTreeJoinHandlerTest.java b/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/impl/nlri/SharedTreeJoinHandlerTest.java
index 02af8f00ef4ca0dfb434c28a9fc5e60300129bb6..3b54e665350088d79e0bf37e98936fa007821fae 100644 (file)
--- a/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/impl/nlri/SharedTreeJoinHandlerTest.java
+++ b/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/impl/nlri/SharedTreeJoinHandlerTest.java
@@ -14,8 +14,8 @@ import io.netty.buffer.Unpooled;
 import org.junit.Test;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 import org.junit.Test;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;

-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.IpAddressNoZone;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.NlriType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.c.multicast.grouping.CMulticastBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.multicast.group.opaque.grouping.multicast.group.CGAddressCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.NlriType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.c.multicast.grouping.CMulticastBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.multicast.group.opaque.grouping.multicast.group.CGAddressCaseBuilder;


@@ -43,13 +43,13 @@ public final class SharedTreeJoinHandlerTest {
 
     private final SharedTreeJoinCase expected = new SharedTreeJoinCaseBuilder()
             .setSharedTreeJoin(new SharedTreeJoinBuilder()
 
     private final SharedTreeJoinCase expected = new SharedTreeJoinCaseBuilder()
             .setSharedTreeJoin(new SharedTreeJoinBuilder()

-                    .setCMulticast(new CMulticastBuilder()
-                            .setRouteDistinguisher(new RouteDistinguisher(new RdIpv4("1.2.3.4:258")))
-                            .setSourceAs(new AsNumber(Uint32.TEN))
-                            .setMulticastSource(new IpAddress(new Ipv4Address("1.0.0.1")))
-                            .setMulticastGroup(new CGAddressCaseBuilder()
-                                    .setCGAddress(new IpAddress(new Ipv4Address("2.0.0.2"))).build()).build())
-                    .build()).build();
+                .setCMulticast(new CMulticastBuilder()
+                    .setRouteDistinguisher(new RouteDistinguisher(new RdIpv4("1.2.3.4:258")))
+                    .setSourceAs(new AsNumber(Uint32.TEN))
+                    .setMulticastSource(new IpAddressNoZone(new Ipv4AddressNoZone("1.0.0.1")))
+                    .setMulticastGroup(new CGAddressCaseBuilder()
+                        .setCGAddress(new IpAddressNoZone(new Ipv4AddressNoZone("2.0.0.2"))).build()).build())
+                .build()).build();

     private final SharedTreeJoinHandler handler = new SharedTreeJoinHandler();
 
     @Test
     private final SharedTreeJoinHandler handler = new SharedTreeJoinHandler();
 
     @Test

diff --git a/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/impl/nlri/SourceActiveADHandlerTest.java b/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/impl/nlri/SourceActiveADHandlerTest.java
index 3f0d73d005cc52eefafa14c939e48bcafc62a875..ab4881175aa0157c2bf742af745cd7bfed5fcc9a 100644 (file)
--- a/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/impl/nlri/SourceActiveADHandlerTest.java
+++ b/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/impl/nlri/SourceActiveADHandlerTest.java
@@ -14,8 +14,8 @@ import static org.junit.Assert.assertEquals;
 import io.netty.buffer.Unpooled;
 import org.junit.Test;
 import org.opendaylight.protocol.util.ByteArray;
 import io.netty.buffer.Unpooled;
 import org.junit.Test;
 import org.opendaylight.protocol.util.ByteArray;

-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.IpAddressNoZone;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.NlriType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.mvpn.mvpn.choice.SourceActiveADCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.mvpn.mvpn.choice.SourceActiveADCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.NlriType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.mvpn.mvpn.choice.SourceActiveADCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.mvpn.mvpn.choice.SourceActiveADCaseBuilder;


@@ -39,8 +39,8 @@ public final class SourceActiveADHandlerTest {
     private final SourceActiveADCase expected = new SourceActiveADCaseBuilder()
             .setSourceActiveAD(new SourceActiveADBuilder()
                     .setRouteDistinguisher(new RouteDistinguisher(new RdIpv4("1.2.3.4:258")))
     private final SourceActiveADCase expected = new SourceActiveADCaseBuilder()
             .setSourceActiveAD(new SourceActiveADBuilder()
                     .setRouteDistinguisher(new RouteDistinguisher(new RdIpv4("1.2.3.4:258")))

-                    .setMulticastSource(new IpAddress(new Ipv4Address("1.0.0.1")))
-                    .setMulticastGroup(new IpAddress(new Ipv4Address("2.0.0.2")))
+                    .setMulticastSource(new IpAddressNoZone(new Ipv4AddressNoZone("1.0.0.1")))
+                    .setMulticastGroup(new IpAddressNoZone(new Ipv4AddressNoZone("2.0.0.2")))

                     .build())
             .build();
     private final SourceActiveADHandler handler = new SourceActiveADHandler();
                     .build())
             .build();
     private final SourceActiveADHandler handler = new SourceActiveADHandler();

diff --git a/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/impl/nlri/SourceTreeJoinHandlerTest.java b/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/impl/nlri/SourceTreeJoinHandlerTest.java
index 5aa191c5777cd51041d4a1c76dcf4ad8b7f90731..a86ee8d21cae3383e845f9fe63cfe0bd06605801 100644 (file)
--- a/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/impl/nlri/SourceTreeJoinHandlerTest.java
+++ b/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/impl/nlri/SourceTreeJoinHandlerTest.java
@@ -14,8 +14,8 @@ import io.netty.buffer.Unpooled;
 import org.junit.Test;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 import org.junit.Test;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;

-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.IpAddressNoZone;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.NlriType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.c.multicast.grouping.CMulticastBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.multicast.group.opaque.grouping.multicast.group.CGAddressCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.NlriType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.c.multicast.grouping.CMulticastBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.multicast.group.opaque.grouping.multicast.group.CGAddressCaseBuilder;


@@ -46,9 +46,9 @@ public final class SourceTreeJoinHandlerTest {
                     .setCMulticast(new CMulticastBuilder()
                             .setRouteDistinguisher(new RouteDistinguisher(new RdIpv4("1.2.3.4:258")))
                             .setSourceAs(new AsNumber(Uint32.TEN))
                     .setCMulticast(new CMulticastBuilder()
                             .setRouteDistinguisher(new RouteDistinguisher(new RdIpv4("1.2.3.4:258")))
                             .setSourceAs(new AsNumber(Uint32.TEN))

-                            .setMulticastSource(new IpAddress(new Ipv4Address("1.0.0.1")))
+                            .setMulticastSource(new IpAddressNoZone(new Ipv4AddressNoZone("1.0.0.1")))

                             .setMulticastGroup(new CGAddressCaseBuilder().setCGAddress(
                             .setMulticastGroup(new CGAddressCaseBuilder().setCGAddress(

-                                    new IpAddress(new Ipv4Address("2.0.0.2"))).build()).build())
+                                    new IpAddressNoZone(new Ipv4AddressNoZone("2.0.0.2"))).build()).build())

                     .build()).build();
     private final SourceTreeJoinHandler handler = new SourceTreeJoinHandler();
 
                     .build()).build();
     private final SourceTreeJoinHandler handler = new SourceTreeJoinHandler();
 

diff --git a/bgp/extensions/route-target/src/test/java/org/opendaylight/protocol/bgp/route/targetcontrain/impl/nlri/SimpleRouteTargetConstrainNlriRegistryTest.java b/bgp/extensions/route-target/src/test/java/org/opendaylight/protocol/bgp/route/targetcontrain/impl/nlri/SimpleRouteTargetConstrainNlriRegistryTest.java
index c46f6d67c5c435f6cea98229c7e3c4cafa6a1def..fcbd351bde5e81753494bc1fabb81b1e1b15cd8e 100644 (file)
--- a/bgp/extensions/route-target/src/test/java/org/opendaylight/protocol/bgp/route/targetcontrain/impl/nlri/SimpleRouteTargetConstrainNlriRegistryTest.java
+++ b/bgp/extensions/route-target/src/test/java/org/opendaylight/protocol/bgp/route/targetcontrain/impl/nlri/SimpleRouteTargetConstrainNlriRegistryTest.java
@@ -5,7 +5,6 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */

-

 package org.opendaylight.protocol.bgp.route.targetcontrain.impl.nlri;
 
 import static org.junit.Assert.assertArrayEquals;
 package org.opendaylight.protocol.bgp.route.targetcontrain.impl.nlri;
 
 import static org.junit.Assert.assertArrayEquals;


@@ -22,7 +21,7 @@ import org.junit.runners.Parameterized;
 import org.opendaylight.protocol.bgp.route.targetcontrain.impl.activators.NlriActivator;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 import org.opendaylight.protocol.bgp.route.targetcontrain.impl.activators.NlriActivator;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;

-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.opendaylight.params.xml.ns.yang.bgp.route.target.constrain.rev180618.route.target.constrain.RouteTargetConstrainChoice;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.route.target.constrain.rev180618.route.target.constrain.route.target.constrain.choice.RouteTargetConstrainAs4ExtendedCommunityCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.route.target.constrain.rev180618.route.target.constrain.route.target.constrain.choice.RouteTargetConstrainDefaultCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.route.target.constrain.rev180618.route.target.constrain.RouteTargetConstrainChoice;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.route.target.constrain.rev180618.route.target.constrain.route.target.constrain.choice.RouteTargetConstrainAs4ExtendedCommunityCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.route.target.constrain.rev180618.route.target.constrain.route.target.constrain.choice.RouteTargetConstrainDefaultCaseBuilder;


@@ -76,7 +75,7 @@ public class SimpleRouteTargetConstrainNlriRegistryTest {
                     .build()).build();
     private static RouteTargetConstrainChoice RT_IPV4 = new RouteTargetConstrainIpv4RouteCaseBuilder()
             .setRouteTargetIpv4(new RouteTargetIpv4Builder()
                     .build()).build();
     private static RouteTargetConstrainChoice RT_IPV4 = new RouteTargetConstrainIpv4RouteCaseBuilder()
             .setRouteTargetIpv4(new RouteTargetIpv4Builder()

-                    .setGlobalAdministrator(new Ipv4Address("12.51.2.5"))
+                    .setGlobalAdministrator(new Ipv4AddressNoZone("12.51.2.5"))

                     .setLocalAdministrator(Uint16.valueOf(5421))
                     .build()).build();
     private static RouteTargetConstrainChoice RT_AS_4_OCT = new RouteTargetConstrainAs4ExtendedCommunityCaseBuilder()
                     .setLocalAdministrator(Uint16.valueOf(5421))
                     .build()).build();
     private static RouteTargetConstrainChoice RT_AS_4_OCT = new RouteTargetConstrainAs4ExtendedCommunityCaseBuilder()

diff --git a/bgp/extensions/route-target/src/test/java/org/opendaylight/protocol/bgp/route/targetcontrain/impl/route/policy/ClientAttributePrependHandlerTest.java b/bgp/extensions/route-target/src/test/java/org/opendaylight/protocol/bgp/route/targetcontrain/impl/route/policy/ClientAttributePrependHandlerTest.java
index fbd25e137b5c612e4fee2a869890396f8c78c559..f3e79d281901ba5d66263294a080f8000c18807b 100644 (file)
--- a/bgp/extensions/route-target/src/test/java/org/opendaylight/protocol/bgp/route/targetcontrain/impl/route/policy/ClientAttributePrependHandlerTest.java
+++ b/bgp/extensions/route-target/src/test/java/org/opendaylight/protocol/bgp/route/targetcontrain/impl/route/policy/ClientAttributePrependHandlerTest.java
@@ -5,7 +5,6 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */

-

 package org.opendaylight.protocol.bgp.route.targetcontrain.impl.route.policy;
 
 import static org.junit.Assert.assertEquals;
 package org.opendaylight.protocol.bgp.route.targetcontrain.impl.route.policy;
 
 import static org.junit.Assert.assertEquals;


@@ -24,7 +23,7 @@ import org.opendaylight.protocol.bgp.rib.spi.policy.BGPRouteEntryExportParameter
 import org.opendaylight.protocol.bgp.route.targetcontrain.impl.activators.StatementActivator;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.types.rev151009.IPV4UNICAST;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.routing.policy.rev151009.routing.policy.top.routing.policy.policy.definitions.policy.definition.statements.Statement;
 import org.opendaylight.protocol.bgp.route.targetcontrain.impl.activators.StatementActivator;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.types.rev151009.IPV4UNICAST;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.routing.policy.rev151009.routing.policy.top.routing.policy.policy.definitions.policy.definition.statements.Statement;

-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.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.Attributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.AttributesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.Route;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.Attributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.AttributesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.Route;


@@ -73,7 +72,7 @@ public class ClientAttributePrependHandlerTest extends AbstractStatementRegistry
 
         final Attributes expected = new AttributesBuilder()
                 .setCNextHop(new Ipv4NextHopCaseBuilder().setIpv4NextHop(new Ipv4NextHopBuilder()
 
         final Attributes expected = new AttributesBuilder()
                 .setCNextHop(new Ipv4NextHopCaseBuilder().setIpv4NextHop(new Ipv4NextHopBuilder()

-                        .setGlobal(new Ipv4Address("2.2.2.2")).build()).build())
+                        .setGlobal(new Ipv4AddressNoZone("2.2.2.2")).build()).build())

                 .build();
         final String rk = "testRoute";
         final Route rtRoute = new RouteTargetConstrainRouteBuilder()
                 .build();
         final String rk = "testRoute";
         final Route rtRoute = new RouteTargetConstrainRouteBuilder()

diff --git a/bgp/openconfig-api/src/main/yang/odl-bgp-policy.yang b/bgp/openconfig-api/src/main/yang/odl-bgp-policy.yang
index ea43d2fd29d157996a52d09c4ccd60465cccd13f..10137c63850f5916a47c106a1b47ad8bd3bdef0d 100644 (file)
--- a/bgp/openconfig-api/src/main/yang/odl-bgp-policy.yang
+++ b/bgp/openconfig-api/src/main/yang/odl-bgp-policy.yang
@@ -164,7 +164,7 @@ module odl-bgp-policy {
             }
 
             leaf-list originator-id {
             }
 
             leaf-list originator-id {

-                type inet:ipv4-address;
+                type inet:ipv4-address-no-zone;

                 description
                 "List of role expressions that are part of the set";
             }
                 description
                 "List of role expressions that are part of the set";
             }


@@ -303,7 +303,7 @@ module odl-bgp-policy {
             description "action to prepend Originator Id if non Originator Id is present. If no Originator Id"
             + "is defined, local Originator Id is used.";
             leaf originator-id {
             description "action to prepend Originator Id if non Originator Id is present. If no Originator Id"
             + "is defined, local Originator Id is used.";
             leaf originator-id {

-                type inet:ipv4-address;
+                type inet:ipv4-address-no-zone;

                 description "Originator Id";
             }
         }
                 description "Originator Id";
             }
         }

diff --git a/bgp/openconfig-rp-impl/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/impl/BGPRibPolicyImpl.java b/bgp/openconfig-rp-impl/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/impl/BGPRibPolicyImpl.java
index 390a48dbd0096696776730143830c89a603e91b7..5835e71ac9252d1d6feb2714d4f5c92dfefd0ecb 100644 (file)
--- a/bgp/openconfig-rp-impl/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/impl/BGPRibPolicyImpl.java
+++ b/bgp/openconfig-rp-impl/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/impl/BGPRibPolicyImpl.java
@@ -37,7 +37,7 @@ import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.routing.policy.rev1
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.routing.policy.rev151009.routing.policy.top.routing.policy.policy.definitions.PolicyDefinitionKey;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.routing.policy.rev151009.routing.policy.top.routing.policy.policy.definitions.policy.definition.Statements;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.routing.policy.rev151009.routing.policy.top.routing.policy.policy.definitions.policy.definition.statements.Statement;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.routing.policy.rev151009.routing.policy.top.routing.policy.policy.definitions.PolicyDefinitionKey;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.routing.policy.rev151009.routing.policy.top.routing.policy.policy.definitions.policy.definition.Statements;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.routing.policy.rev151009.routing.policy.top.routing.policy.policy.definitions.policy.definition.statements.Statement;

-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.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.Attributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.ClusterIdentifier;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.Attributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.ClusterIdentifier;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;


@@ -63,7 +63,7 @@ final class BGPRibPolicyImpl implements BGPRibRoutingPolicy {
             });
 
     BGPRibPolicyImpl(final DataBroker databroker, final StatementRegistryConsumer policyRegistry,
             });
 
     BGPRibPolicyImpl(final DataBroker databroker, final StatementRegistryConsumer policyRegistry,

-            final long localAs, final Ipv4Address originatorId, final ClusterIdentifier clusterId,
+            final long localAs, final Ipv4AddressNoZone originatorId, final ClusterIdentifier clusterId,

             final Config policyConfig) {
         this.policyRegistry = requireNonNull(policyRegistry);
         this.databroker = requireNonNull(databroker);
             final Config policyConfig) {
         this.policyRegistry = requireNonNull(policyRegistry);
         this.databroker = requireNonNull(databroker);

diff --git a/bgp/openconfig-rp-impl/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/impl/BGPRibRoutingPolicyFactoryImpl.java b/bgp/openconfig-rp-impl/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/impl/BGPRibRoutingPolicyFactoryImpl.java
index 2a75459752239490a1d472e098e8fe105ff921d8..b3e03bca496c711e58b319b92d273c5765335cd4 100644 (file)
--- a/bgp/openconfig-rp-impl/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/impl/BGPRibRoutingPolicyFactoryImpl.java
+++ b/bgp/openconfig-rp-impl/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/impl/BGPRibRoutingPolicyFactoryImpl.java
@@ -15,7 +15,7 @@ import org.opendaylight.protocol.bgp.openconfig.routing.policy.spi.BGPRibRouting
 import org.opendaylight.protocol.bgp.openconfig.routing.policy.spi.registry.StatementRegistryConsumer;
 import org.opendaylight.protocol.bgp.rib.spi.policy.BGPRibRoutingPolicy;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.routing.policy.rev151009.apply.policy.group.apply.policy.Config;
 import org.opendaylight.protocol.bgp.openconfig.routing.policy.spi.registry.StatementRegistryConsumer;
 import org.opendaylight.protocol.bgp.rib.spi.policy.BGPRibRoutingPolicy;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.routing.policy.rev151009.apply.policy.group.apply.policy.Config;

-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.opendaylight.params.xml.ns.yang.bgp.types.rev180329.ClusterIdentifier;
 
 public final class BGPRibRoutingPolicyFactoryImpl implements BGPRibRoutingPolicyFactory {
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.ClusterIdentifier;
 
 public final class BGPRibRoutingPolicyFactoryImpl implements BGPRibRoutingPolicyFactory {


@@ -30,7 +30,7 @@ public final class BGPRibRoutingPolicyFactoryImpl implements BGPRibRoutingPolicy
     }
 
     @Override
     }
 
     @Override

-    public BGPRibRoutingPolicy buildBGPRibPolicy(final long localAs, final Ipv4Address bgpId,
+    public BGPRibRoutingPolicy buildBGPRibPolicy(final long localAs, final Ipv4AddressNoZone bgpId,

             final ClusterIdentifier clusterId, final Config policyConfig) {
         requireNonNull(policyConfig);
         return new BGPRibPolicyImpl(this.databroker, this.statementRegistryConsumer,
             final ClusterIdentifier clusterId, final Config policyConfig) {
         requireNonNull(policyConfig);
         return new BGPRibPolicyImpl(this.databroker, this.statementRegistryConsumer,

diff --git a/bgp/openconfig-rp-impl/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/impl/PolicyRIBBaseParametersImpl.java b/bgp/openconfig-rp-impl/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/impl/PolicyRIBBaseParametersImpl.java
index c59c9688ace44b3d4a7da2c935daa8350899c646..17993b12393b2dc82f3365f2f35784ac9f87d59d 100644 (file)
--- a/bgp/openconfig-rp-impl/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/impl/PolicyRIBBaseParametersImpl.java
+++ b/bgp/openconfig-rp-impl/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/impl/PolicyRIBBaseParametersImpl.java
@@ -5,21 +5,20 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */

-

 package org.opendaylight.protocol.bgp.openconfig.routing.policy.impl;
 
 import static java.util.Objects.requireNonNull;
 
 import org.opendaylight.protocol.bgp.openconfig.routing.policy.spi.RouteEntryBaseAttributes;
 package org.opendaylight.protocol.bgp.openconfig.routing.policy.impl;
 
 import static java.util.Objects.requireNonNull;
 
 import org.opendaylight.protocol.bgp.openconfig.routing.policy.spi.RouteEntryBaseAttributes;

-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.opendaylight.params.xml.ns.yang.bgp.types.rev180329.ClusterIdentifier;
 
 public final class PolicyRIBBaseParametersImpl implements RouteEntryBaseAttributes {
     private final Long localAs;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.ClusterIdentifier;
 
 public final class PolicyRIBBaseParametersImpl implements RouteEntryBaseAttributes {
     private final Long localAs;

-    private final Ipv4Address originatorId;
+    private final Ipv4AddressNoZone originatorId;

     private final ClusterIdentifier clusterId;
 
     private final ClusterIdentifier clusterId;
 

-    public PolicyRIBBaseParametersImpl(final long localAs, final Ipv4Address originatorId,
+    public PolicyRIBBaseParametersImpl(final long localAs, final Ipv4AddressNoZone originatorId,

             final ClusterIdentifier clusterId) {
         this.localAs = localAs;
         this.originatorId = requireNonNull(originatorId);
             final ClusterIdentifier clusterId) {
         this.localAs = localAs;
         this.originatorId = requireNonNull(originatorId);


@@ -32,7 +31,7 @@ public final class PolicyRIBBaseParametersImpl implements RouteEntryBaseAttribut
     }
 
     @Override
     }
 
     @Override

-    public Ipv4Address getOriginatorId() {
+    public Ipv4AddressNoZone getOriginatorId() {

         return this.originatorId;
     }
 
         return this.originatorId;
     }
 

diff --git a/bgp/openconfig-rp-spi/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/spi/BGPRibRoutingPolicyFactory.java b/bgp/openconfig-rp-spi/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/spi/BGPRibRoutingPolicyFactory.java
index 58dbbde754f86099f13c2879b16655e6553e40b9..9e337a4bae8c0c9b02b61caff5d7a3b40f972da7 100644 (file)
--- a/bgp/openconfig-rp-spi/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/spi/BGPRibRoutingPolicyFactory.java
+++ b/bgp/openconfig-rp-spi/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/spi/BGPRibRoutingPolicyFactory.java
@@ -10,7 +10,7 @@ package org.opendaylight.protocol.bgp.openconfig.routing.policy.spi;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.opendaylight.protocol.bgp.rib.spi.policy.BGPRibRoutingPolicy;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.routing.policy.rev151009.apply.policy.group.apply.policy.Config;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.opendaylight.protocol.bgp.rib.spi.policy.BGPRibRoutingPolicy;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.routing.policy.rev151009.apply.policy.group.apply.policy.Config;

-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.opendaylight.params.xml.ns.yang.bgp.types.rev180329.ClusterIdentifier;
 
 /**
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.ClusterIdentifier;
 
 /**


@@ -27,6 +27,6 @@ public interface BGPRibRoutingPolicyFactory {
      * @param policyConfig BGP Openconfig policy Configuration
      * @return BGPRIBRoutingPolicy
      */
      * @param policyConfig BGP Openconfig policy Configuration
      * @return BGPRIBRoutingPolicy
      */

-    BGPRibRoutingPolicy buildBGPRibPolicy(long localAs, Ipv4Address bgpId, ClusterIdentifier clusterId,
+    BGPRibRoutingPolicy buildBGPRibPolicy(long localAs, Ipv4AddressNoZone bgpId, ClusterIdentifier clusterId,

             Config policyConfig);
 }
             Config policyConfig);
 }

diff --git a/bgp/openconfig-rp-spi/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/spi/RouteEntryBaseAttributes.java b/bgp/openconfig-rp-spi/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/spi/RouteEntryBaseAttributes.java
index 5d6a9641824a71817f9b035171e2af6ac42686d1..bf04563434f04ad0cb04db181d32773c9ec8f4db 100644 (file)
--- a/bgp/openconfig-rp-spi/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/spi/RouteEntryBaseAttributes.java
+++ b/bgp/openconfig-rp-spi/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/spi/RouteEntryBaseAttributes.java
@@ -8,7 +8,7 @@
 package org.opendaylight.protocol.bgp.openconfig.routing.policy.spi;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 package org.opendaylight.protocol.bgp.openconfig.routing.policy.spi;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;

-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.opendaylight.params.xml.ns.yang.bgp.types.rev180329.ClusterIdentifier;
 
 /**
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.ClusterIdentifier;
 
 /**


@@ -29,7 +29,7 @@ public interface RouteEntryBaseAttributes {
      *
      * @return originator Id
      */
      *
      * @return originator Id
      */

-    Ipv4Address getOriginatorId();
+    Ipv4AddressNoZone getOriginatorId();

 
     /**
      * Returns cluster identifier.
 
     /**
      * Returns cluster identifier.

diff --git a/bgp/openconfig-rp-spi/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/spi/registry/ActionsRegistryImpl.java b/bgp/openconfig-rp-spi/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/spi/registry/ActionsRegistryImpl.java
index bb2fb9a8a9bc2cea8959105f46d3ae45bf79eaf0..1d3b9c8b9d7e2888c4efa1adbb8ae6eb3dbb9a39 100644 (file)
--- a/bgp/openconfig-rp-spi/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/spi/registry/ActionsRegistryImpl.java
+++ b/bgp/openconfig-rp-spi/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/spi/registry/ActionsRegistryImpl.java
@@ -30,6 +30,7 @@ import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.policy.rev15100
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.types.rev151009.BgpOriginAttrType;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.routing.policy.rev151009.generic.actions.route.disposition.RejectRoute;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.routing.policy.rev151009.routing.policy.top.routing.policy.policy.definitions.policy.definition.statements.statement.Actions;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.types.rev151009.BgpOriginAttrType;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.routing.policy.rev151009.generic.actions.route.disposition.RejectRoute;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.routing.policy.rev151009.routing.policy.top.routing.policy.policy.definitions.policy.definition.statements.statement.Actions;

+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.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.Attributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.AttributesBuilder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.Attributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.AttributesBuilder;


@@ -188,11 +189,17 @@ final class ActionsRegistryImpl {
                     CNextHop nhNew;
                     if (address != null) {
                         if (address.getIpv4Address() != null) {
                     CNextHop nhNew;
                     if (address != null) {
                         if (address.getIpv4Address() != null) {

-                            nhNew = new Ipv4NextHopCaseBuilder().setIpv4NextHop(new Ipv4NextHopBuilder()
-                                    .setGlobal(address.getIpv4Address()).build()).build();
+                            nhNew = new Ipv4NextHopCaseBuilder()
+                                    .setIpv4NextHop(new Ipv4NextHopBuilder()
+                                        .setGlobal(IetfInetUtil.INSTANCE.ipv4AddressNoZoneFor(address.getIpv4Address()))
+                                        .build())
+                                    .build();

                         } else {
                         } else {

-                            nhNew = new Ipv6NextHopCaseBuilder().setIpv6NextHop(new Ipv6NextHopBuilder()
-                                    .setGlobal(address.getIpv6Address()).build()).build();
+                            nhNew = new Ipv6NextHopCaseBuilder()
+                                    .setIpv6NextHop(new Ipv6NextHopBuilder()
+                                        .setGlobal(IetfInetUtil.INSTANCE.ipv6AddressNoZoneFor(address.getIpv6Address()))
+                                        .build())
+                                    .build();

                         }
 
                         attributesUpdatedBuilder.setCNextHop(nhNew);
                         }
 
                         attributesUpdatedBuilder.setCNextHop(nhNew);

diff --git a/bgp/openconfig-rp-spi/src/test/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/spi/AbstractStatementRegistryTest.java b/bgp/openconfig-rp-spi/src/test/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/spi/AbstractStatementRegistryTest.java
index 1cb64c34d5d5d9206cc75adcc8e1d42855230550..1fe6e4fc88e077d46cfb18be45900d2d91ba7937 100644 (file)
--- a/bgp/openconfig-rp-spi/src/test/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/spi/AbstractStatementRegistryTest.java
+++ b/bgp/openconfig-rp-spi/src/test/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/spi/AbstractStatementRegistryTest.java
@@ -20,12 +20,12 @@ import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.routing.policy.rev1
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.routing.policy.rev151009.routing.policy.top.routing.policy.policy.definitions.PolicyDefinition;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.routing.policy.rev151009.routing.policy.top.routing.policy.policy.definitions.PolicyDefinitionKey;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.routing.policy.rev151009.routing.policy.top.routing.policy.policy.definitions.policy.definition.statements.Statement;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.routing.policy.rev151009.routing.policy.top.routing.policy.policy.definitions.PolicyDefinition;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.routing.policy.rev151009.routing.policy.top.routing.policy.policy.definitions.PolicyDefinitionKey;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.routing.policy.rev151009.routing.policy.top.routing.policy.policy.definitions.policy.definition.statements.Statement;

-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.opendaylight.params.xml.ns.yang.bgp.types.rev180329.ClusterIdentifier;
 
 public class AbstractStatementRegistryTest extends AbstractOpenconfigRoutingPolicyLoaderTest {
     public static final long LOCAL_AS = 8;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.ClusterIdentifier;
 
 public class AbstractStatementRegistryTest extends AbstractOpenconfigRoutingPolicyLoaderTest {
     public static final long LOCAL_AS = 8;

-    public static final Ipv4Address IPV4 = new Ipv4Address("1.2.3.4");
+    public static final Ipv4AddressNoZone IPV4 = new Ipv4AddressNoZone("1.2.3.4");

     public static final ClusterIdentifier CLUSTER = new ClusterIdentifier(IPV4);
     protected StatementRegistry statementRegistry;
 
     public static final ClusterIdentifier CLUSTER = new ClusterIdentifier(IPV4);
     protected StatementRegistry statementRegistry;
 

diff --git a/bgp/openconfig-rp-spi/src/test/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/spi/AppendActionTest.java b/bgp/openconfig-rp-spi/src/test/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/spi/AppendActionTest.java
index f95520f8dd864aebf8687781d7c567cf2bf5b12e..f05eded00086dbb0a2f37e17542557f759c3bc5c 100644 (file)
--- a/bgp/openconfig-rp-spi/src/test/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/spi/AppendActionTest.java
+++ b/bgp/openconfig-rp-spi/src/test/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/spi/AppendActionTest.java
@@ -19,7 +19,7 @@ import org.opendaylight.protocol.bgp.openconfig.routing.policy.spi.registry.Rout
 import org.opendaylight.protocol.bgp.rib.spi.policy.BGPRouteEntryExportParameters;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.types.rev151009.IPV4UNICAST;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.routing.policy.rev151009.routing.policy.top.routing.policy.policy.definitions.policy.definition.statements.Statement;
 import org.opendaylight.protocol.bgp.rib.spi.policy.BGPRouteEntryExportParameters;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.types.rev151009.IPV4UNICAST;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.routing.policy.rev151009.routing.policy.top.routing.policy.policy.definitions.policy.definition.statements.Statement;

-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.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.Attributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.AttributesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.attributes.LocalPrefBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.Attributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.AttributesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.attributes.LocalPrefBuilder;


@@ -64,7 +64,7 @@ public class AppendActionTest extends AbstractStatementRegistryTest {
         final Attributes expected = new AttributesBuilder()
                 .setOrigin(new OriginBuilder().setValue(BgpOrigin.Igp).build())
                 .setCNextHop(new Ipv4NextHopCaseBuilder().setIpv4NextHop(new Ipv4NextHopBuilder()
         final Attributes expected = new AttributesBuilder()
                 .setOrigin(new OriginBuilder().setValue(BgpOrigin.Igp).build())
                 .setCNextHop(new Ipv4NextHopCaseBuilder().setIpv4NextHop(new Ipv4NextHopBuilder()

-                        .setGlobal(new Ipv4Address("4.5.6.7")).build()).build())
+                        .setGlobal(new Ipv4AddressNoZone("4.5.6.7")).build()).build())

                 .setLocalPref(new LocalPrefBuilder().setPref(Uint32.valueOf(100)).build())
                 .setMultiExitDisc(new MultiExitDiscBuilder().setMed(Uint32.valueOf(15)).build())
                 .build();
                 .setLocalPref(new LocalPrefBuilder().setPref(Uint32.valueOf(100)).build())
                 .setMultiExitDisc(new MultiExitDiscBuilder().setMed(Uint32.valueOf(15)).build())
                 .build();

diff --git a/bgp/openconfig-rp-spi/src/test/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/spi/AttributesEqualTests.java b/bgp/openconfig-rp-spi/src/test/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/spi/AttributesEqualTests.java
index 8b460483ef28ef283d1bf3dccf123188a13fbbac..e025e9bb6cc39e095e716aa88c11bb30af28b32c 100644 (file)
--- a/bgp/openconfig-rp-spi/src/test/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/spi/AttributesEqualTests.java
+++ b/bgp/openconfig-rp-spi/src/test/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/spi/AttributesEqualTests.java
@@ -21,8 +21,8 @@ import org.opendaylight.protocol.bgp.rib.spi.policy.BGPRouteEntryExportParameter
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.types.rev151009.IPV4UNICAST;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.types.rev151009.IPV6UNICAST;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.routing.policy.rev151009.routing.policy.top.routing.policy.policy.definitions.policy.definition.statements.Statement;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.types.rev151009.IPV4UNICAST;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.types.rev151009.IPV6UNICAST;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.routing.policy.rev151009.routing.policy.top.routing.policy.policy.definitions.policy.definition.statements.Statement;

-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.Ipv6Address;
+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.Ipv6AddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.AttributesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.attributes.LocalPrefBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.attributes.MultiExitDiscBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.AttributesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.attributes.LocalPrefBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.attributes.MultiExitDiscBuilder;


@@ -115,7 +115,7 @@ public class AttributesEqualTests extends AbstractStatementRegistryTest {
                 .filter(st -> st.getName().equals("nexthop-in-test")).findFirst().get();
         RouteAttributeContainer attributeContainer = routeAttributeContainerFalse(new AttributesBuilder()
                 .setCNextHop(new Ipv6NextHopCaseBuilder().setIpv6NextHop(new Ipv6NextHopBuilder()
                 .filter(st -> st.getName().equals("nexthop-in-test")).findFirst().get();
         RouteAttributeContainer attributeContainer = routeAttributeContainerFalse(new AttributesBuilder()
                 .setCNextHop(new Ipv6NextHopCaseBuilder().setIpv6NextHop(new Ipv6NextHopBuilder()

-                        .setGlobal(new Ipv6Address("2001:db8::1")).build()).build())
+                        .setGlobal(new Ipv6AddressNoZone("2001:db8::1")).build()).build())

                 .build());
 
         RouteAttributeContainer result = this.statementRegistry.applyExportStatement(
                 .build());
 
         RouteAttributeContainer result = this.statementRegistry.applyExportStatement(


@@ -129,7 +129,7 @@ public class AttributesEqualTests extends AbstractStatementRegistryTest {
 
         attributeContainer = routeAttributeContainerFalse(new AttributesBuilder()
                 .setCNextHop(new Ipv4NextHopCaseBuilder().setIpv4NextHop(new Ipv4NextHopBuilder()
 
         attributeContainer = routeAttributeContainerFalse(new AttributesBuilder()
                 .setCNextHop(new Ipv4NextHopCaseBuilder().setIpv4NextHop(new Ipv4NextHopBuilder()

-                        .setGlobal(new Ipv4Address("42.42.42.42")).build()).build())
+                        .setGlobal(new Ipv4AddressNoZone("42.42.42.42")).build()).build())

                 .build());
         result = this.statementRegistry.applyExportStatement(
                 this.baseAttributes,
                 .build());
         result = this.statementRegistry.applyExportStatement(
                 this.baseAttributes,

diff --git a/bgp/openconfig-rp-statement/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/actions/SetOriginatorIdPrependHandler.java b/bgp/openconfig-rp-statement/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/actions/SetOriginatorIdPrependHandler.java
index 8dcc73356c6e6f452d44ca9bb4e99e7833c1847f..afc91bedb713417620b7b08e476fa315e74e300f 100644 (file)
--- a/bgp/openconfig-rp-statement/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/actions/SetOriginatorIdPrependHandler.java
+++ b/bgp/openconfig-rp-statement/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/actions/SetOriginatorIdPrependHandler.java
@@ -5,14 +5,13 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */

-

 package org.opendaylight.protocol.bgp.openconfig.routing.policy.statement.actions;
 
 import org.opendaylight.protocol.bgp.openconfig.routing.policy.spi.RouteEntryBaseAttributes;
 import org.opendaylight.protocol.bgp.openconfig.routing.policy.spi.policy.action.BgpActionAugPolicy;
 import org.opendaylight.protocol.bgp.rib.spi.policy.BGPRouteEntryExportParameters;
 import org.opendaylight.protocol.bgp.rib.spi.policy.BGPRouteEntryImportParameters;
 package org.opendaylight.protocol.bgp.openconfig.routing.policy.statement.actions;
 
 import org.opendaylight.protocol.bgp.openconfig.routing.policy.spi.RouteEntryBaseAttributes;
 import org.opendaylight.protocol.bgp.openconfig.routing.policy.spi.policy.action.BgpActionAugPolicy;
 import org.opendaylight.protocol.bgp.rib.spi.policy.BGPRouteEntryExportParameters;
 import org.opendaylight.protocol.bgp.rib.spi.policy.BGPRouteEntryImportParameters;

-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.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.Attributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.AttributesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.attributes.OriginatorIdBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.Attributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.AttributesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.attributes.OriginatorIdBuilder;


@@ -39,12 +38,12 @@ public final class SetOriginatorIdPrependHandler implements BgpActionAugPolicy<S
             final Attributes attributes,
             final SetOriginatorIdPrepend bgpActions) {
 
             final Attributes attributes,
             final SetOriginatorIdPrepend bgpActions) {
 

-        final Ipv4Address defOri = bgpActions.getSetOriginatorIdPrepend().getOriginatorId();
+        final Ipv4AddressNoZone defOri = bgpActions.getSetOriginatorIdPrepend().getOriginatorId();

         return prependOriginatorId(attributes, defOri == null
                 ? routeEntryInfo.getOriginatorId() : defOri);
     }
 
         return prependOriginatorId(attributes, defOri == null
                 ? routeEntryInfo.getOriginatorId() : defOri);
     }
 

-    private static Attributes prependOriginatorId(final Attributes attributes, final Ipv4Address originatorId) {
+    private static Attributes prependOriginatorId(final Attributes attributes, final Ipv4AddressNoZone originatorId) {

         if (attributes.getOriginatorId() != null) {
             return attributes;
         }
         if (attributes.getOriginatorId() != null) {
             return attributes;
         }


@@ -58,7 +57,7 @@ public final class SetOriginatorIdPrependHandler implements BgpActionAugPolicy<S
             final BGPRouteEntryExportParameters routeEntryExportParameters,
             final Attributes attributes,
             final SetOriginatorIdPrepend bgpActions) {
             final BGPRouteEntryExportParameters routeEntryExportParameters,
             final Attributes attributes,
             final SetOriginatorIdPrepend bgpActions) {

-        final Ipv4Address defOri = bgpActions.getSetOriginatorIdPrepend().getOriginatorId();
+        final Ipv4AddressNoZone defOri = bgpActions.getSetOriginatorIdPrepend().getOriginatorId();

         return prependOriginatorId(attributes, defOri == null
                 ? routeEntryInfo.getOriginatorId() : defOri);
     }
         return prependOriginatorId(attributes, defOri == null
                 ? routeEntryInfo.getOriginatorId() : defOri);
     }

diff --git a/bgp/openconfig-rp-statement/src/test/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/ExportAttributeTestUtil.java b/bgp/openconfig-rp-statement/src/test/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/ExportAttributeTestUtil.java
index 729d956055fa3e130ff6bd5e3d37ba9a0cfc4592..f74a78b050fde32686806e4fc23b257ad9a25537 100644 (file)
--- a/bgp/openconfig-rp-statement/src/test/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/ExportAttributeTestUtil.java
+++ b/bgp/openconfig-rp-statement/src/test/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/ExportAttributeTestUtil.java
@@ -11,7 +11,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 import java.util.Collections;
 import java.util.List;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;

-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.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.Attributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.AttributesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.attributes.AsPathBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.Attributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.AttributesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.attributes.AsPathBuilder;


@@ -27,7 +27,7 @@ import org.opendaylight.yangtools.yang.common.Uint32;
 public final class ExportAttributeTestUtil {
     public static final Uint32 REMOTE_AS = Uint32.valueOf(8);
     public static final AsNumber LOCAL_AS = new AsNumber(Uint32.valueOf(65));
 public final class ExportAttributeTestUtil {
     public static final Uint32 REMOTE_AS = Uint32.valueOf(8);
     public static final AsNumber LOCAL_AS = new AsNumber(Uint32.valueOf(65));

-    public static final Ipv4Address IPV4 = new Ipv4Address("1.2.3.4");
+    public static final Ipv4AddressNoZone IPV4 = new Ipv4AddressNoZone("1.2.3.4");

     public static final ClusterIdentifier CLUSTER = new ClusterIdentifier(IPV4);
 
     private ExportAttributeTestUtil() {
     public static final ClusterIdentifier CLUSTER = new ClusterIdentifier(IPV4);
 
     private ExportAttributeTestUtil() {


@@ -56,14 +56,14 @@ public final class ExportAttributeTestUtil {
     }
 
     private static ClusterId createClusterId() {
     }
 
     private static ClusterId createClusterId() {

-        final ClusterIdentifier cluster1 = new ClusterIdentifier(new Ipv4Address("1.1.1.1"));
-        final ClusterIdentifier cluster2 = new ClusterIdentifier(new Ipv4Address("1.1.1.2"));
+        final ClusterIdentifier cluster1 = new ClusterIdentifier(new Ipv4AddressNoZone("1.1.1.1"));
+        final ClusterIdentifier cluster2 = new ClusterIdentifier(new Ipv4AddressNoZone("1.1.1.2"));

         return new ClusterIdBuilder().setCluster(Arrays.asList(CLUSTER, cluster1, cluster2)).build();
     }
 
     private static ClusterId createClusterIdInput() {
         return new ClusterIdBuilder().setCluster(Arrays.asList(CLUSTER, cluster1, cluster2)).build();
     }
 
     private static ClusterId createClusterIdInput() {

-        final ClusterIdentifier cluster1 = new ClusterIdentifier(new Ipv4Address("1.1.1.1"));
-        final ClusterIdentifier cluster2 = new ClusterIdentifier(new Ipv4Address("1.1.1.2"));
+        final ClusterIdentifier cluster1 = new ClusterIdentifier(new Ipv4AddressNoZone("1.1.1.1"));
+        final ClusterIdentifier cluster2 = new ClusterIdentifier(new Ipv4AddressNoZone("1.1.1.2"));

         return new ClusterIdBuilder().setCluster(Arrays.asList(cluster1, cluster2)).build();
     }
 
         return new ClusterIdBuilder().setCluster(Arrays.asList(cluster1, cluster2)).build();
     }
 

diff --git a/bgp/openconfig-rp-statement/src/test/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/ImportAttributeTestUtil.java b/bgp/openconfig-rp-statement/src/test/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/ImportAttributeTestUtil.java
index 67a06f6f7d37a1aa2d3d59d77cee0265a70eb47c..1fbce6a67f1d3c543d33b14b09b7275e5be4e4e5 100644 (file)
--- a/bgp/openconfig-rp-statement/src/test/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/ImportAttributeTestUtil.java
+++ b/bgp/openconfig-rp-statement/src/test/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/ImportAttributeTestUtil.java
@@ -9,7 +9,7 @@ package org.opendaylight.protocol.bgp.openconfig.routing.policy.statement;
 
 import java.util.Collections;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 
 import java.util.Collections;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;

-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.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.Attributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.AttributesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.attributes.AsPathBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.Attributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.AttributesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.attributes.AsPathBuilder;


@@ -48,7 +48,7 @@ public final class ImportAttributeTestUtil {
 
         // originator pref
         attBuilder.setOriginatorId(new OriginatorIdBuilder()
 
         // originator pref
         attBuilder.setOriginatorId(new OriginatorIdBuilder()

-                .setOriginator(new Ipv4Address("41.41.41.41")).build());
+                .setOriginator(new Ipv4AddressNoZone("41.41.41.41")).build());

 
         // origin pref
         attBuilder.setOrigin(createOrigin());
 
         // origin pref
         attBuilder.setOrigin(createOrigin());


@@ -79,6 +79,6 @@ public final class ImportAttributeTestUtil {
      */
     private static Ipv4NextHopCase createNexHop() {
         return new Ipv4NextHopCaseBuilder().setIpv4NextHop(new Ipv4NextHopBuilder()
      */
     private static Ipv4NextHopCase createNexHop() {
         return new Ipv4NextHopCaseBuilder().setIpv4NextHop(new Ipv4NextHopBuilder()

-                .setGlobal(new Ipv4Address("199.20.160.41")).build()).build();
+                .setGlobal(new Ipv4AddressNoZone("199.20.160.41")).build()).build();

     }
 }
     }
 }

diff --git a/bgp/openconfig-state/src/main/java/org/opendaylight/protocol/bgp/state/NeighborUtil.java b/bgp/openconfig-state/src/main/java/org/opendaylight/protocol/bgp/state/NeighborUtil.java
index af872cf43f3449f9bba2d3f4757c4589b4011a0e..58435d75bbe58b3b0925bb44deed6c352ff2d179 100644 (file)
--- a/bgp/openconfig-state/src/main/java/org/opendaylight/protocol/bgp/state/NeighborUtil.java
+++ b/bgp/openconfig-state/src/main/java/org/opendaylight/protocol/bgp/state/NeighborUtil.java
@@ -58,6 +58,9 @@ import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.types.rev151009
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.types.rev151009.GRACEFULRESTART;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.types.rev151009.MPBGP;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.types.rev151009.ROUTEREFRESH;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.types.rev151009.GRACEFULRESTART;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.types.rev151009.MPBGP;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.types.rev151009.ROUTEREFRESH;

+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.IpAddressNoZone;
+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.yang.types.rev130715.Timeticks;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.BgpNeighborStateAugmentation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.BgpNeighborStateAugmentationBuilder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Timeticks;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.BgpNeighborStateAugmentation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.BgpNeighborStateAugmentationBuilder;


@@ -121,7 +124,7 @@ public final class NeighborUtil {
     public static @NonNull Neighbor buildNeighbor(final @NonNull BGPPeerState neighbor,
             final @NonNull BGPTableTypeRegistryConsumer bgpTableTypeRegistry) {
         return new NeighborBuilder()
     public static @NonNull Neighbor buildNeighbor(final @NonNull BGPPeerState neighbor,
             final @NonNull BGPTableTypeRegistryConsumer bgpTableTypeRegistry) {
         return new NeighborBuilder()

-                .setNeighborAddress(neighbor.getNeighborAddress())
+                .setNeighborAddress(convertIpAddress(neighbor.getNeighborAddress()))

                 .setState(buildNeighborState(neighbor.getBGPSessionState(), neighbor.getBGPPeerMessagesState()))
                 .setTimers(buildTimer(neighbor.getBGPTimersState()))
                 .setTransport(buildTransport(neighbor.getBGPTransportState()))
                 .setState(buildNeighborState(neighbor.getBGPSessionState(), neighbor.getBGPPeerMessagesState()))
                 .setTimers(buildTimer(neighbor.getBGPTimersState()))
                 .setTransport(buildTransport(neighbor.getBGPTransportState()))


@@ -131,6 +134,17 @@ public final class NeighborUtil {
                 .build();
     }
 
                 .build();
     }
 

+    private static IpAddress convertIpAddress(final IpAddressNoZone addr) {
+        if (addr == null) {
+            return null;
+        }
+        final Ipv4AddressNoZone ipv4 = addr.getIpv4AddressNoZone();
+        if (ipv4 != null) {
+            return new IpAddress(ipv4);
+        }
+        return new IpAddress(addr.getIpv6AddressNoZone());
+    }
+

     /**
      * Builds Neighbor State from BGPPeerState counters.
      *
     /**
      * Builds Neighbor State from BGPPeerState counters.
      *


@@ -186,7 +200,7 @@ public final class NeighborUtil {
             return null;
         }
         final NeighborTransportStateAugmentation transportState = new NeighborTransportStateAugmentationBuilder()
             return null;
         }
         final NeighborTransportStateAugmentation transportState = new NeighborTransportStateAugmentationBuilder()

-                .setLocalPort(neighbor.getLocalPort()).setRemoteAddress(neighbor.getRemoteAddress())
+                .setLocalPort(neighbor.getLocalPort()).setRemoteAddress(convertIpAddress(neighbor.getRemoteAddress()))

                 .setRemotePort(neighbor.getRemotePort()).build();
 
         return new TransportBuilder().setState(new org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009
                 .setRemotePort(neighbor.getRemotePort()).build();
 
         return new TransportBuilder().setState(new org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009

diff --git a/bgp/openconfig-state/src/test/java/org/opendaylight/protocol/bgp/state/StateProviderImplTest.java b/bgp/openconfig-state/src/test/java/org/opendaylight/protocol/bgp/state/StateProviderImplTest.java
index 4616cef50d0d9c60e40630e18d8b29ef3dfae234..01c40bcee4cd9bfa71602e086aa3b1cca633333a 100644 (file)
--- a/bgp/openconfig-state/src/test/java/org/opendaylight/protocol/bgp/state/StateProviderImplTest.java
+++ b/bgp/openconfig-state/src/test/java/org/opendaylight/protocol/bgp/state/StateProviderImplTest.java
@@ -109,7 +109,9 @@ import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.network.instance.re
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.policy.types.rev151009.BGP;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.policy.types.rev151009.BGP;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 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.IpAddressNoZone;

 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.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.PortNumber;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Timeticks;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.BgpNeighborStateAugmentation;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Timeticks;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.BgpNeighborStateAugmentation;


@@ -165,7 +167,7 @@ public class StateProviderImplTest extends AbstractDataBrokerTest {
     static final TablesKey TABLES_KEY = new TablesKey(Ipv4AddressFamily.class, UnicastSubsequentAddressFamily.class);
     private final AsNumber as = new AsNumber(Uint32.valueOf(72));
     private final BgpId bgpId = new BgpId("127.0.0.1");
     static final TablesKey TABLES_KEY = new TablesKey(Ipv4AddressFamily.class, UnicastSubsequentAddressFamily.class);
     private final AsNumber as = new AsNumber(Uint32.valueOf(72));
     private final BgpId bgpId = new BgpId("127.0.0.1");

-    private final IpAddress neighborAddress = new IpAddress(new Ipv4Address("127.0.0.2"));
+    private final IpAddressNoZone neighborAddress = new IpAddressNoZone(new Ipv4AddressNoZone("127.0.0.2"));

     private final List<Class<? extends BgpCapability>> supportedCap = Arrays.asList(ASN32.class, ROUTEREFRESH.class,
             MPBGP.class, ADDPATHS.class, GRACEFULRESTART.class);
     @Mock
     private final List<Class<? extends BgpCapability>> supportedCap = Arrays.asList(ASN32.class, ROUTEREFRESH.class,
             MPBGP.class, ADDPATHS.class, GRACEFULRESTART.class);
     @Mock


@@ -361,7 +363,7 @@ public class StateProviderImplTest extends AbstractDataBrokerTest {
             Assert.assertNotNull(neighbors);
             assertEquals(peerGroupExpected, bgpRib.getPeerGroups().getPeerGroup().get(0));
             final Neighbor neighborResult = neighbors.getNeighbor().get(0);
             Assert.assertNotNull(neighbors);
             assertEquals(peerGroupExpected, bgpRib.getPeerGroups().getPeerGroup().get(0));
             final Neighbor neighborResult = neighbors.getNeighbor().get(0);

-            assertEquals(this.neighborAddress, neighborResult.getNeighborAddress());
+            assertEquals(new IpAddress(neighborAddress.getIpv4AddressNoZone()), neighborResult.getNeighborAddress());

             assertEquals(expectedAfiSafis, neighborResult.getAfiSafis());
             assertEquals(expectedErrorHandling, neighborResult.getErrorHandling());
             assertEquals(expectedGracefulRestart, neighborResult.getGracefulRestart());
             assertEquals(expectedAfiSafis, neighborResult.getAfiSafis());
             assertEquals(expectedErrorHandling, neighborResult.getErrorHandling());
             assertEquals(expectedGracefulRestart, neighborResult.getGracefulRestart());


@@ -542,7 +544,7 @@ public class StateProviderImplTest extends AbstractDataBrokerTest {
                 .addAugmentation(NeighborTransportStateAugmentation.class,
                         new NeighborTransportStateAugmentationBuilder().setLocalPort(this.localPort)
                                 .setRemotePort(this.remotePort)
                 .addAugmentation(NeighborTransportStateAugmentation.class,
                         new NeighborTransportStateAugmentationBuilder().setLocalPort(this.localPort)
                                 .setRemotePort(this.remotePort)

-                                .setRemoteAddress(this.neighborAddress).build())
+                                .setRemoteAddress(new IpAddress(neighborAddress.getIpv4AddressNoZone())).build())

                 .build()).build();
         return transport;
     }
                 .build()).build();
         return transport;
     }

diff --git a/bgp/parser-api/src/main/yang/bgp-message.yang b/bgp/parser-api/src/main/yang/bgp-message.yang
index 0b5592be562158a1f190a8d8ed31db1752ca6bb8..a065b73adbe938f21210042c391da8f9185592e0 100644 (file)
--- a/bgp/parser-api/src/main/yang/bgp-message.yang
+++ b/bgp/parser-api/src/main/yang/bgp-message.yang
@@ -63,7 +63,7 @@ module bgp-message {
 
     grouping originator-id {
         leaf originator {
 
     grouping originator-id {
         leaf originator {

-            type inet:ipv4-address;
+            type inet:ipv4-address-no-zone;

         }
     }
 
         }
     }
 


@@ -101,7 +101,7 @@ module bgp-message {
             mandatory true;
         }
         leaf bgp-identifier {
             mandatory true;
         }
         leaf bgp-identifier {

-            type inet:ipv4-address;
+            type inet:ipv4-address-no-zone;

             mandatory true;
         }
         list bgp-parameters {
             mandatory true;
         }
         list bgp-parameters {

diff --git a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/BGPOpenMessageParser.java b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/BGPOpenMessageParser.java
index af07832c45885992151edd64196affdc9876f43f..2bb4cc734cf0dbc9e9d11cfd6af68a01ccf373c8 100644 (file)
--- a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/BGPOpenMessageParser.java
+++ b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/BGPOpenMessageParser.java
@@ -35,7 +35,7 @@ import org.opendaylight.protocol.bgp.parser.spi.PeerSpecificParserConstraint;
 import org.opendaylight.protocol.util.Ipv4Util;
 import org.opendaylight.protocol.util.Values;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 import org.opendaylight.protocol.util.Ipv4Util;
 import org.opendaylight.protocol.util.Values;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;

-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.opendaylight.params.xml.ns.yang.bgp.message.rev180329.Open;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.OpenBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.open.message.BgpParameters;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.Open;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.OpenBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.open.message.BgpParameters;


@@ -193,7 +193,7 @@ public final class BGPOpenMessageParser implements MessageParser, MessageSeriali
         if (holdTime == 1 || holdTime == 2) {
             throw new BGPDocumentedException("Hold time value not acceptable.", BGPError.HOLD_TIME_NOT_ACC);
         }
         if (holdTime == 1 || holdTime == 2) {
             throw new BGPDocumentedException("Hold time value not acceptable.", BGPError.HOLD_TIME_NOT_ACC);
         }

-        Ipv4Address bgpId;
+        final Ipv4AddressNoZone bgpId;

         try {
             bgpId = Ipv4Util.addressForByteBuf(body);
         } catch (final IllegalArgumentException e) {
         try {
             bgpId = Ipv4Util.addressForByteBuf(body);
         } catch (final IllegalArgumentException e) {

diff --git a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/OriginatorIdAttributeParser.java b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/OriginatorIdAttributeParser.java
index 7aaf737f341a52b1a83f4ec698b594728fb56420..e7e76d806b7bb7db8455cb1024fede00371bedda 100644 (file)
--- a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/OriginatorIdAttributeParser.java
+++ b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/OriginatorIdAttributeParser.java
@@ -18,7 +18,7 @@ import org.opendaylight.protocol.bgp.parser.spi.AttributeUtil;
 import org.opendaylight.protocol.bgp.parser.spi.PeerSpecificParserConstraint;
 import org.opendaylight.protocol.bgp.parser.spi.RevisedErrorHandling;
 import org.opendaylight.protocol.util.Ipv4Util;
 import org.opendaylight.protocol.bgp.parser.spi.PeerSpecificParserConstraint;
 import org.opendaylight.protocol.bgp.parser.spi.RevisedErrorHandling;
 import org.opendaylight.protocol.util.Ipv4Util;

-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.opendaylight.params.xml.ns.yang.bgp.message.rev180329.OriginatorId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.Attributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.AttributesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.OriginatorId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.Attributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.AttributesBuilder;


@@ -53,7 +53,7 @@ public final class OriginatorIdAttributeParser extends AbstractAttributeParser i
     public void serializeAttribute(final Attributes attribute, final ByteBuf byteAggregator) {
         final OriginatorId originator = attribute.getOriginatorId();
         if (originator != null) {
     public void serializeAttribute(final Attributes attribute, final ByteBuf byteAggregator) {
         final OriginatorId originator = attribute.getOriginatorId();
         if (originator != null) {

-            final Ipv4Address address = originator.getOriginator();
+            final Ipv4AddressNoZone address = originator.getOriginator();

             if (address != null) {
                 AttributeUtil.formatAttribute(AttributeUtil.OPTIONAL, TYPE,
                     Unpooled.wrappedBuffer(Ipv4Util.bytesForAddress(address)), byteAggregator);
             if (address != null) {
                 AttributeUtil.formatAttribute(AttributeUtil.OPTIONAL, TYPE,
                     Unpooled.wrappedBuffer(Ipv4Util.bytesForAddress(address)), byteAggregator);

diff --git a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/BGPParserTest.java b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/BGPParserTest.java
index b88892b335eb6321bed97799d4edb70f2d9448d9..f6df39f743ad2c73f2189f0aa482c95696a9cc8c 100644 (file)
--- a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/BGPParserTest.java
+++ b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/BGPParserTest.java
@@ -41,7 +41,7 @@ import org.opendaylight.protocol.bgp.util.HexDumpBGPFileParser;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.protocol.util.NoopReferenceCache;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.protocol.util.NoopReferenceCache;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;

-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.opendaylight.params.xml.ns.yang.bgp.message.rev180329.PathId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.Update;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.PathId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.Update;


@@ -195,7 +195,7 @@ public class BGPParserTest {
         asPath.add(new SegmentsBuilder().setAsSequence(asNumbers).build());
 
         final Ipv4NextHopCase nextHop = new Ipv4NextHopCaseBuilder().setIpv4NextHop(
         asPath.add(new SegmentsBuilder().setAsSequence(asNumbers).build());
 
         final Ipv4NextHopCase nextHop = new Ipv4NextHopCaseBuilder().setIpv4NextHop(

-                new Ipv4NextHopBuilder().setGlobal(new Ipv4Address("10.0.0.2")).build()).build();
+                new Ipv4NextHopBuilder().setGlobal(new Ipv4AddressNoZone("10.0.0.2")).build()).build();

 
         final List<Communities> comms = new ArrayList<>();
         comms.add((Communities) CommunityUtil.NO_EXPORT);
 
         final List<Communities> comms = new ArrayList<>();
         comms.add((Communities) CommunityUtil.NO_EXPORT);


@@ -318,9 +318,9 @@ public class BGPParserTest {
         asPath.add(new SegmentsBuilder().setAsSet(asSet).build());
 
         final Aggregator aggregator = new AggregatorBuilder().setAsNumber(new AsNumber(Uint32.valueOf(30)))
         asPath.add(new SegmentsBuilder().setAsSet(asSet).build());
 
         final Aggregator aggregator = new AggregatorBuilder().setAsNumber(new AsNumber(Uint32.valueOf(30)))

-                .setNetworkAddress(new Ipv4Address("10.0.0.9")).build();
+                .setNetworkAddress(new Ipv4AddressNoZone("10.0.0.9")).build();

         final Ipv4NextHopCase nextHop = new Ipv4NextHopCaseBuilder().setIpv4NextHop(
         final Ipv4NextHopCase nextHop = new Ipv4NextHopCaseBuilder().setIpv4NextHop(

-                new Ipv4NextHopBuilder().setGlobal(new Ipv4Address("10.0.0.9")).build()).build();
+                new Ipv4NextHopBuilder().setGlobal(new Ipv4AddressNoZone("10.0.0.9")).build()).build();

 
         // check path attributes
         final Attributes attrs = message.getAttributes();
 
         // check path attributes
         final Attributes attrs = message.getAttributes();


@@ -415,14 +415,14 @@ public class BGPParserTest {
 
         // attributes
         final Ipv4NextHopCase nextHop = new Ipv4NextHopCaseBuilder().setIpv4NextHop(
 
         // attributes
         final Ipv4NextHopCase nextHop = new Ipv4NextHopCaseBuilder().setIpv4NextHop(

-                new Ipv4NextHopBuilder().setGlobal(new Ipv4Address("3.3.3.3")).build()).build();
+                new Ipv4NextHopBuilder().setGlobal(new Ipv4AddressNoZone("3.3.3.3")).build()).build();

 
         final List<ExtendedCommunities> comms = new ArrayList<>();
         comms.add(new ExtendedCommunitiesBuilder()
             .setTransitive(true)
             .setExtendedCommunity(new RouteTargetIpv4CaseBuilder()
                 .setRouteTargetIpv4(new RouteTargetIpv4Builder()
 
         final List<ExtendedCommunities> comms = new ArrayList<>();
         comms.add(new ExtendedCommunitiesBuilder()
             .setTransitive(true)
             .setExtendedCommunity(new RouteTargetIpv4CaseBuilder()
                 .setRouteTargetIpv4(new RouteTargetIpv4Builder()

-                    .setGlobalAdministrator(new Ipv4Address("192.168.1.0"))
+                    .setGlobalAdministrator(new Ipv4AddressNoZone("192.168.1.0"))

                     .setLocalAdministrator(Uint16.valueOf(4660))
                     .build())
                 .build())
                     .setLocalAdministrator(Uint16.valueOf(4660))
                     .build())
                 .build())


@@ -651,7 +651,7 @@ public class BGPParserTest {
         asPath.add(new SegmentsBuilder().setAsSequence(asNumbers).build());
 
         final Ipv4NextHopCase nextHop = new Ipv4NextHopCaseBuilder().setIpv4NextHop(
         asPath.add(new SegmentsBuilder().setAsSequence(asNumbers).build());
 
         final Ipv4NextHopCase nextHop = new Ipv4NextHopCaseBuilder().setIpv4NextHop(

-                new Ipv4NextHopBuilder().setGlobal(new Ipv4Address("10.0.0.2")).build()).build();
+                new Ipv4NextHopBuilder().setGlobal(new Ipv4AddressNoZone("10.0.0.2")).build()).build();

 
         final List<Communities> comms = new ArrayList<>();
         comms.add((Communities) CommunityUtil.NO_EXPORT);
 
         final List<Communities> comms = new ArrayList<>();
         comms.add((Communities) CommunityUtil.NO_EXPORT);

diff --git a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/ComplementaryTest.java b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/ComplementaryTest.java
index f0314b285ccdcb09128471925556949c4ad97298..8f761fdc83633aac8f10af43b45c0d8bef626442 100644 (file)
--- a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/ComplementaryTest.java
+++ b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/ComplementaryTest.java
@@ -16,7 +16,7 @@ import java.util.ArrayList;
 import java.util.List;
 import org.junit.Test;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 import java.util.List;
 import org.junit.Test;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;

-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.opendaylight.params.xml.ns.yang.bgp.message.rev180329.open.message.bgp.parameters.optional.capabilities.CParameters;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.open.message.bgp.parameters.optional.capabilities.CParametersBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.open.message.bgp.parameters.optional.capabilities.c.parameters.As4BytesCapabilityBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.open.message.bgp.parameters.optional.capabilities.CParameters;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.open.message.bgp.parameters.optional.capabilities.CParametersBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.open.message.bgp.parameters.optional.capabilities.c.parameters.As4BytesCapabilityBuilder;


@@ -89,11 +89,11 @@ public class ComplementaryTest {
     public void testBGPAggregatorImpl() {
         final BgpAggregator ipv4 = new AggregatorBuilder()
                 .setAsNumber(new AsNumber(Uint32.valueOf(5524)))
     public void testBGPAggregatorImpl() {
         final BgpAggregator ipv4 = new AggregatorBuilder()
                 .setAsNumber(new AsNumber(Uint32.valueOf(5524)))

-                .setNetworkAddress(new Ipv4Address("124.55.42.1"))
+                .setNetworkAddress(new Ipv4AddressNoZone("124.55.42.1"))

                 .build();
         final BgpAggregator ipv4i = new AggregatorBuilder()
                 .setAsNumber(new AsNumber(Uint32.valueOf(5525)))
                 .build();
         final BgpAggregator ipv4i = new AggregatorBuilder()
                 .setAsNumber(new AsNumber(Uint32.valueOf(5525)))

-                .setNetworkAddress(new Ipv4Address("124.55.42.1"))
+                .setNetworkAddress(new Ipv4AddressNoZone("124.55.42.1"))

                 .build();
 
         assertNotSame(ipv4.hashCode(), ipv4i.hashCode());
                 .build();
 
         assertNotSame(ipv4.hashCode(), ipv4i.hashCode());

diff --git a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/IPv4NextHopTest.java b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/IPv4NextHopTest.java
index 855ee2baf3a0c36cf59920539abc2184b0433b56..5f57c4561fad774326818f81b99937bb3a7bea0b 100644 (file)
--- a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/IPv4NextHopTest.java
+++ b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/IPv4NextHopTest.java
@@ -12,16 +12,16 @@ import static org.junit.Assert.assertEquals;
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
 import org.junit.Before;
 import org.junit.Test;
 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.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.ipv4.next.hop._case.Ipv4NextHop;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.ipv4.next.hop._case.Ipv4NextHopBuilder;
 
 public class IPv4NextHopTest {
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.ipv4.next.hop._case.Ipv4NextHop;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.ipv4.next.hop._case.Ipv4NextHopBuilder;
 
 public class IPv4NextHopTest {

-

     private Ipv4NextHop nextHop;
 
     @Before
     public void init() {
     private Ipv4NextHop nextHop;
 
     @Before
     public void init() {

-        this.nextHop = new Ipv4NextHopBuilder().setGlobal(new Ipv4Address("10.0.0.1")).build();
+        this.nextHop = new Ipv4NextHopBuilder().setGlobal(new Ipv4AddressNoZone("10.0.0.1")).build();

     }
 
     @Test
     }
 
     @Test

diff --git a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/IPv6NextHopTest.java b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/IPv6NextHopTest.java
index e4e3528888e290dabc9cfd16f3a98b85f9d235b4..27af9faddd9195705937996d561489063f8665ea 100644 (file)
--- a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/IPv6NextHopTest.java
+++ b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/IPv6NextHopTest.java
@@ -13,6 +13,7 @@ import static org.junit.Assert.assertNull;
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address;
 import org.junit.Before;
 import org.junit.Test;
 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.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.ipv6.next.hop._case.Ipv6NextHop;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.ipv6.next.hop._case.Ipv6NextHopBuilder;
 
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.ipv6.next.hop._case.Ipv6NextHop;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.ipv6.next.hop._case.Ipv6NextHopBuilder;
 


@@ -22,9 +23,10 @@ public class IPv6NextHopTest {
 
     @Before
     public void init() {
 
     @Before
     public void init() {

-        this.nextHopA = new Ipv6NextHopBuilder().setGlobal(new Ipv6Address("2001:db8:85a3:0:0:8a2e:370:7331")).build();
-        this.nextHopB = new Ipv6NextHopBuilder().setGlobal(new Ipv6Address("2001:db8:85a3:0:0:8a2e:370:7331"))
-                .setLinkLocal(new Ipv6Address("2001:db8:85a3:0:0:8a2e:370:0000")).build();
+        this.nextHopA = new Ipv6NextHopBuilder().setGlobal(new Ipv6AddressNoZone("2001:db8:85a3:0:0:8a2e:370:7331"))
+                .build();
+        this.nextHopB = new Ipv6NextHopBuilder().setGlobal(new Ipv6AddressNoZone("2001:db8:85a3:0:0:8a2e:370:7331"))
+                .setLinkLocal(new Ipv6AddressNoZone("2001:db8:85a3:0:0:8a2e:370:0000")).build();

     }
 
     @Test
     }
 
     @Test

diff --git a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/OpenTest.java b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/OpenTest.java
index ab9655890b75b14c2e434c175ea4d98a9e6efb53..5395b0ae04e79dfe56775fcca6d2c21de5f3f5c5 100644 (file)
--- a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/OpenTest.java
+++ b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/OpenTest.java
@@ -20,7 +20,7 @@ import org.opendaylight.protocol.bgp.parser.impl.message.BGPOpenMessageParser;
 import org.opendaylight.protocol.bgp.parser.spi.pojo.ServiceLoaderBGPExtensionProviderContext;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 import org.opendaylight.protocol.bgp.parser.spi.pojo.ServiceLoaderBGPExtensionProviderContext;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;

-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.opendaylight.params.xml.ns.yang.bgp.message.rev180329.Open;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.OpenBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.ProtocolVersion;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.Open;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.OpenBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.ProtocolVersion;


@@ -42,7 +42,7 @@ public class OpenTest {
     @Test
     public void testSerializeOpen() throws BGPDocumentedException {
         final Open open = new OpenBuilder()
     @Test
     public void testSerializeOpen() throws BGPDocumentedException {
         final Open open = new OpenBuilder()

-                .setBgpIdentifier(new Ipv4Address("127.0.0.1"))
+                .setBgpIdentifier(new Ipv4AddressNoZone("127.0.0.1"))

                 .setMyAsNumber(Uint16.valueOf(30))
                 .setHoldTimer(Uint16.valueOf(3))
                 .setVersion(new ProtocolVersion(Uint8.valueOf(4)))
                 .setMyAsNumber(Uint16.valueOf(30))
                 .setHoldTimer(Uint16.valueOf(3))
                 .setVersion(new ProtocolVersion(Uint8.valueOf(4)))


@@ -99,7 +99,7 @@ public class OpenTest {
         }
 
         final Open open = new OpenBuilder()
         }
 
         final Open open = new OpenBuilder()

-                .setBgpIdentifier(new Ipv4Address("127.0.0.1"))
+                .setBgpIdentifier(new Ipv4AddressNoZone("127.0.0.1"))

                 .setMyAsNumber(Uint16.valueOf(30))
                 .setHoldTimer(Uint16.valueOf(3))
                 .setVersion(new ProtocolVersion(Uint8.valueOf(4)))
                 .setMyAsNumber(Uint16.valueOf(30))
                 .setHoldTimer(Uint16.valueOf(3))
                 .setVersion(new ProtocolVersion(Uint8.valueOf(4)))

diff --git a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/ParserTest.java b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/ParserTest.java
index f1f5350fe82d990d8eacd3076ab7940a908034be..0e0f4bbf5641e6a8f7b0c2723be847ed1d3adee8 100644 (file)
--- a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/ParserTest.java
+++ b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/ParserTest.java
@@ -29,6 +29,7 @@ import org.opendaylight.protocol.bgp.parser.spi.MessageRegistry;
 import org.opendaylight.protocol.bgp.parser.spi.pojo.ServiceLoaderBGPExtensionProviderContext;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
 import org.opendaylight.protocol.bgp.parser.spi.pojo.ServiceLoaderBGPExtensionProviderContext;
 import org.opendaylight.protocol.util.ByteArray;
 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.opendaylight.params.xml.ns.yang.bgp.message.rev180329.Keepalive;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.KeepaliveBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.Notify;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.Keepalive;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.KeepaliveBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.Notify;


@@ -200,7 +201,7 @@ public class ParserTest {
         final Notification open = new OpenBuilder()
                 .setMyAsNumber(Uint16.valueOf(100))
                 .setHoldTimer(Uint16.valueOf(180))
         final Notification open = new OpenBuilder()
                 .setMyAsNumber(Uint16.valueOf(100))
                 .setHoldTimer(Uint16.valueOf(180))

-                .setBgpIdentifier(new Ipv4Address("20.20.20.20"))
+                .setBgpIdentifier(new Ipv4AddressNoZone("20.20.20.20"))

                 .setVersion(new ProtocolVersion(Uint8.valueOf(4)))
                 .build();
         final ByteBuf bytes = Unpooled.buffer();
                 .setVersion(new ProtocolVersion(Uint8.valueOf(4)))
                 .build();
         final ByteBuf bytes = Unpooled.buffer();

diff --git a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/AggregatorAttributeParserTest.java b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/AggregatorAttributeParserTest.java
index 2796ae22e7f105ccd71be23dc43f8897a6d116b4..cf9c5702cb1a59544542c2c79cb9362430022a11 100644 (file)
--- a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/AggregatorAttributeParserTest.java
+++ b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/AggregatorAttributeParserTest.java
@@ -18,7 +18,7 @@ import org.opendaylight.protocol.bgp.parser.BGPParsingException;
 import org.opendaylight.protocol.bgp.parser.spi.pojo.ServiceLoaderBGPExtensionProviderContext;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 import org.opendaylight.protocol.bgp.parser.spi.pojo.ServiceLoaderBGPExtensionProviderContext;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;

-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.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.Attributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.AttributesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.attributes.AggregatorBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.Attributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.AttributesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.attributes.AggregatorBuilder;


@@ -34,7 +34,7 @@ public class AggregatorAttributeParserTest {
     private static final Attributes RESULT = new AttributesBuilder()
             .setAggregator(new AggregatorBuilder()
                     .setAsNumber(new AsNumber(Uint32.ONE))
     private static final Attributes RESULT = new AttributesBuilder()
             .setAggregator(new AggregatorBuilder()
                     .setAsNumber(new AsNumber(Uint32.ONE))

-                    .setNetworkAddress(new Ipv4Address("255.255.255.1"))
+                    .setNetworkAddress(new Ipv4AddressNoZone("255.255.255.1"))

                     .build())
             .build();
 
                     .build())
             .build();
 

diff --git a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/ClusterIdAttributeParserTest.java b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/ClusterIdAttributeParserTest.java
index ea1266b4cc99971e44ff03ec8403023254ee7bf6..47a587c3192f1e47afa0abe7a52331898f97357e 100644 (file)
--- a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/ClusterIdAttributeParserTest.java
+++ b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/ClusterIdAttributeParserTest.java
@@ -17,7 +17,7 @@ import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.protocol.util.ByteArray;
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.protocol.util.ByteArray;

-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.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.Attributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.AttributesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.attributes.ClusterIdBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.Attributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.AttributesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.attributes.ClusterIdBuilder;


@@ -38,8 +38,8 @@ public class ClusterIdAttributeParserTest {
     @Test
     public void testParserAttribute() throws Exception {
         final List<ClusterIdentifier> list = new ArrayList<>();
     @Test
     public void testParserAttribute() throws Exception {
         final List<ClusterIdentifier> list = new ArrayList<>();

-        final Ipv4Address ip1 = new Ipv4Address("192.168.1.1");
-        final Ipv4Address ip2 = new Ipv4Address("192.168.1.2");
+        final Ipv4AddressNoZone ip1 = new Ipv4AddressNoZone("192.168.1.1");
+        final Ipv4AddressNoZone ip2 = new Ipv4AddressNoZone("192.168.1.2");

         list.add(new ClusterIdentifier(ip1));
         list.add(new ClusterIdentifier(ip2));
         final Attributes clusterId = new AttributesBuilder().setClusterId(new ClusterIdBuilder().setCluster(list)
         list.add(new ClusterIdentifier(ip1));
         list.add(new ClusterIdentifier(ip2));
         final Attributes clusterId = new AttributesBuilder().setClusterId(new ClusterIdBuilder().setCluster(list)

diff --git a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/NextHopAttributeParserTest.java b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/NextHopAttributeParserTest.java
index e666505928fe560dd25588ccf84b5e9fc82e708d..911df3830b8ca1fd935e52bc625dfa3ef35f4add 100644 (file)
--- a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/NextHopAttributeParserTest.java
+++ b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/NextHopAttributeParserTest.java
@@ -17,8 +17,8 @@ import org.opendaylight.protocol.bgp.parser.BGPDocumentedException;
 import org.opendaylight.protocol.bgp.parser.BGPParsingException;
 import org.opendaylight.protocol.bgp.parser.spi.pojo.ServiceLoaderBGPExtensionProviderContext;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.protocol.bgp.parser.BGPParsingException;
 import org.opendaylight.protocol.bgp.parser.spi.pojo.ServiceLoaderBGPExtensionProviderContext;
 import org.opendaylight.protocol.util.ByteArray;

-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.Ipv6Address;
+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.Ipv6AddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.Attributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.AttributesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.Ipv4NextHopCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.Attributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.AttributesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.Ipv4NextHopCaseBuilder;


@@ -41,12 +41,12 @@ public class NextHopAttributeParserTest {
 
     private static final Attributes IPV4_RESULT = new AttributesBuilder()
             .setCNextHop(new Ipv4NextHopCaseBuilder().setIpv4NextHop(new Ipv4NextHopBuilder()
 
     private static final Attributes IPV4_RESULT = new AttributesBuilder()
             .setCNextHop(new Ipv4NextHopCaseBuilder().setIpv4NextHop(new Ipv4NextHopBuilder()

-                    .setGlobal(new Ipv4Address("255.255.255.255"))
+                    .setGlobal(new Ipv4AddressNoZone("255.255.255.255"))

                     .build()).build()).build();
     private static final Attributes IPV6_RESULT = new AttributesBuilder()
             .setCNextHop(new Ipv6NextHopCaseBuilder().setIpv6NextHop(new Ipv6NextHopBuilder()
                     .build()).build()).build();
     private static final Attributes IPV6_RESULT = new AttributesBuilder()
             .setCNextHop(new Ipv6NextHopCaseBuilder().setIpv6NextHop(new Ipv6NextHopBuilder()

-                    .setGlobal(new Ipv6Address("ffff::1"))
-                    .setLinkLocal(new Ipv6Address("ffff::2"))
+                    .setGlobal(new Ipv6AddressNoZone("ffff::1"))
+                    .setLinkLocal(new Ipv6AddressNoZone("ffff::2"))

                     .build()).build()).build();
 
     @Test
                     .build()).build()).build();
 
     @Test

diff --git a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/OriginatorIdAttributeParserTest.java b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/OriginatorIdAttributeParserTest.java
index 921ab08289d4a95b536441717fde16aae5756e28..035be3d3799f824a9fc79265f940969dcbb35448 100644 (file)
--- a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/OriginatorIdAttributeParserTest.java
+++ b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/OriginatorIdAttributeParserTest.java
@@ -17,7 +17,7 @@ import org.opendaylight.protocol.bgp.parser.BGPDocumentedException;
 import org.opendaylight.protocol.bgp.parser.BGPParsingException;
 import org.opendaylight.protocol.bgp.parser.spi.pojo.ServiceLoaderBGPExtensionProviderContext;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.protocol.bgp.parser.BGPParsingException;
 import org.opendaylight.protocol.bgp.parser.spi.pojo.ServiceLoaderBGPExtensionProviderContext;
 import org.opendaylight.protocol.util.ByteArray;

-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.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.Attributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.AttributesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.attributes.OriginatorIdBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.Attributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.AttributesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.attributes.OriginatorIdBuilder;


@@ -30,7 +30,7 @@ public class OriginatorIdAttributeParserTest {
 
     private static final Attributes RESULT = new AttributesBuilder()
             .setOriginatorId(new OriginatorIdBuilder()
 
     private static final Attributes RESULT = new AttributesBuilder()
             .setOriginatorId(new OriginatorIdBuilder()

-                    .setOriginator(new Ipv4Address("255.255.255.255"))
+                    .setOriginator(new Ipv4AddressNoZone("255.255.255.255"))

                     .build())
             .build();
 
                     .build())
             .build();
 

diff --git a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/extended/communities/Ipv4SpecificEcHandlerTest.java b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/extended/communities/Ipv4SpecificEcHandlerTest.java
index 763389ec53044999e4e6adb6f91dd7fbcefb393c..d450580674cb92d67f8957978cc8d26502113d3b 100644 (file)
--- a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/extended/communities/Ipv4SpecificEcHandlerTest.java
+++ b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/extended/communities/Ipv4SpecificEcHandlerTest.java
@@ -5,7 +5,6 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */

-

 package org.opendaylight.protocol.bgp.parser.impl.message.update.extended.communities;
 
 import static org.junit.Assert.assertArrayEquals;
 package org.opendaylight.protocol.bgp.parser.impl.message.update.extended.communities;
 
 import static org.junit.Assert.assertArrayEquals;


@@ -14,7 +13,7 @@ import static org.junit.Assert.assertEquals;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import org.junit.Test;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import org.junit.Test;

-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.opendaylight.params.xml.ns.yang.bgp.types.rev180329.extended.community.ExtendedCommunity;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.extended.community.extended.community.Inet4SpecificExtendedCommunityCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.extended.community.extended.community.Inet4SpecificExtendedCommunityCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.extended.community.ExtendedCommunity;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.extended.community.extended.community.Inet4SpecificExtendedCommunityCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.extended.community.extended.community.Inet4SpecificExtendedCommunityCaseBuilder;


@@ -33,14 +32,14 @@ public class Ipv4SpecificEcHandlerTest {
         final Inet4SpecificExtendedCommunityCase input
                 = new Inet4SpecificExtendedCommunityCaseBuilder().setInet4SpecificExtendedCommunity(
                 new Inet4SpecificExtendedCommunityBuilder()
         final Inet4SpecificExtendedCommunityCase input
                 = new Inet4SpecificExtendedCommunityCaseBuilder().setInet4SpecificExtendedCommunity(
                 new Inet4SpecificExtendedCommunityBuilder()

-                        .setGlobalAdministrator(new Ipv4Address("12.51.2.5"))
+                        .setGlobalAdministrator(new Ipv4AddressNoZone("12.51.2.5"))

                         .setLocalAdministrator(new byte[]{21, 45}).build()).build();
 
         final Inet4SpecificExtendedCommunityCase expected
                 = new Inet4SpecificExtendedCommunityCaseBuilder().setInet4SpecificExtendedCommunity(
                 new Inet4SpecificExtendedCommunityBuilder()
                         .setInet4SpecificExtendedCommunityCommon(new Inet4SpecificExtendedCommunityCommonBuilder()
                         .setLocalAdministrator(new byte[]{21, 45}).build()).build();
 
         final Inet4SpecificExtendedCommunityCase expected
                 = new Inet4SpecificExtendedCommunityCaseBuilder().setInet4SpecificExtendedCommunity(
                 new Inet4SpecificExtendedCommunityBuilder()
                         .setInet4SpecificExtendedCommunityCommon(new Inet4SpecificExtendedCommunityCommonBuilder()

-                                .setGlobalAdministrator(new Ipv4Address("12.51.2.5"))
+                                .setGlobalAdministrator(new Ipv4AddressNoZone("12.51.2.5"))

                                 .setLocalAdministrator(new byte[]{21, 45}).build()).build())
                 .build();
         final ExtendedCommunity exComm = handler.parseExtendedCommunity(Unpooled.copiedBuffer(INPUT));
                                 .setLocalAdministrator(new byte[]{21, 45}).build()).build())
                 .build();
         final ExtendedCommunity exComm = handler.parseExtendedCommunity(Unpooled.copiedBuffer(INPUT));


@@ -58,7 +57,7 @@ public class Ipv4SpecificEcHandlerTest {
                 = new Inet4SpecificExtendedCommunityCaseBuilder().setInet4SpecificExtendedCommunity(
                 new Inet4SpecificExtendedCommunityBuilder()
                         .setInet4SpecificExtendedCommunityCommon(new Inet4SpecificExtendedCommunityCommonBuilder()
                 = new Inet4SpecificExtendedCommunityCaseBuilder().setInet4SpecificExtendedCommunity(
                 new Inet4SpecificExtendedCommunityBuilder()
                         .setInet4SpecificExtendedCommunityCommon(new Inet4SpecificExtendedCommunityCommonBuilder()

-                                .setGlobalAdministrator(new Ipv4Address("12.51.2.5"))
+                                .setGlobalAdministrator(new Ipv4AddressNoZone("12.51.2.5"))

                                 .setLocalAdministrator(new byte[]{21, 45}).build()).build())
                 .build();
 
                                 .setLocalAdministrator(new byte[]{21, 45}).build()).build())
                 .build();
 

diff --git a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/extended/communities/RouteOriginIpv4EcHandlerTest.java b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/extended/communities/RouteOriginIpv4EcHandlerTest.java
index 78310d0191fb8f73b62bb3592c5b146ff9731128..bc24169b10815a34ce1830231ede6969c7d497ba 100644 (file)
--- a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/extended/communities/RouteOriginIpv4EcHandlerTest.java
+++ b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/extended/communities/RouteOriginIpv4EcHandlerTest.java
@@ -5,16 +5,17 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */

-

 package org.opendaylight.protocol.bgp.parser.impl.message.update.extended.communities;
 
 package org.opendaylight.protocol.bgp.parser.impl.message.update.extended.communities;
 

+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+

 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;

-import org.junit.Assert;

 import org.junit.Test;
 import org.opendaylight.protocol.bgp.parser.BGPDocumentedException;
 import org.opendaylight.protocol.bgp.parser.BGPParsingException;
 import org.junit.Test;
 import org.opendaylight.protocol.bgp.parser.BGPDocumentedException;
 import org.opendaylight.protocol.bgp.parser.BGPParsingException;

-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.opendaylight.params.xml.ns.yang.bgp.types.rev180329.extended.community.ExtendedCommunity;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.extended.community.extended.community.RouteOriginIpv4Case;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.extended.community.extended.community.RouteOriginIpv4CaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.extended.community.ExtendedCommunity;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.extended.community.extended.community.RouteOriginIpv4Case;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.extended.community.extended.community.RouteOriginIpv4CaseBuilder;


@@ -22,7 +23,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.type
 import org.opendaylight.yangtools.yang.common.Uint16;
 
 public class RouteOriginIpv4EcHandlerTest {
 import org.opendaylight.yangtools.yang.common.Uint16;
 
 public class RouteOriginIpv4EcHandlerTest {

-

     private static final byte[] INPUT = {
         12, 51, 2, 5, 0x15, 0x2d
     };
     private static final byte[] INPUT = {
         12, 51, 2, 5, 0x15, 0x2d
     };


@@ -32,16 +32,15 @@ public class RouteOriginIpv4EcHandlerTest {
         final RouteOriginIpv4EcHandler handler = new RouteOriginIpv4EcHandler();
         final RouteOriginIpv4Case expected = new RouteOriginIpv4CaseBuilder().setRouteOriginIpv4(
                 new RouteOriginIpv4Builder()
         final RouteOriginIpv4EcHandler handler = new RouteOriginIpv4EcHandler();
         final RouteOriginIpv4Case expected = new RouteOriginIpv4CaseBuilder().setRouteOriginIpv4(
                 new RouteOriginIpv4Builder()

-                    .setGlobalAdministrator(new Ipv4Address("12.51.2.5"))
+                    .setGlobalAdministrator(new Ipv4AddressNoZone("12.51.2.5"))

                     .setLocalAdministrator(Uint16.valueOf(5421))
                     .build()).build();
 
         final ExtendedCommunity exComm = handler.parseExtendedCommunity(Unpooled.copiedBuffer(INPUT));
                     .setLocalAdministrator(Uint16.valueOf(5421))
                     .build()).build();
 
         final ExtendedCommunity exComm = handler.parseExtendedCommunity(Unpooled.copiedBuffer(INPUT));

-        Assert.assertEquals(expected, exComm);
+        assertEquals(expected, exComm);

 
         final ByteBuf output = Unpooled.buffer(INPUT.length);
         handler.serializeExtendedCommunity(expected, output);
 
         final ByteBuf output = Unpooled.buffer(INPUT.length);
         handler.serializeExtendedCommunity(expected, output);

-        Assert.assertArrayEquals(INPUT, output.array());
+        assertArrayEquals(INPUT, output.array());

     }
     }

-

 }
 }

diff --git a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/extended/communities/VrfRouteImportHandlerTest.java b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/extended/communities/VrfRouteImportHandlerTest.java
index af53bd61636aeec4946abab4e4a6ad982dfe870c..886133a09cef8eab4acfe67e6a5e4e59f5693f9b 100644 (file)
--- a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/extended/communities/VrfRouteImportHandlerTest.java
+++ b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/extended/communities/VrfRouteImportHandlerTest.java
@@ -14,7 +14,7 @@ import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import org.junit.Assert;
 import org.junit.Test;
 import io.netty.buffer.Unpooled;
 import org.junit.Assert;
 import org.junit.Test;

-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.opendaylight.params.xml.ns.yang.bgp.types.rev180329.extended.community.ExtendedCommunity;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.extended.community.extended.community.As4GenericSpecExtendedCommunityCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.extended.community.extended.community.VrfRouteImportExtendedCommunityCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.extended.community.ExtendedCommunity;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.extended.community.extended.community.As4GenericSpecExtendedCommunityCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.extended.community.extended.community.VrfRouteImportExtendedCommunityCase;


@@ -32,7 +32,7 @@ public class VrfRouteImportHandlerTest {
         final VrfRouteImportExtendedCommunityCase expected = new VrfRouteImportExtendedCommunityCaseBuilder()
                 .setVrfRouteImportExtendedCommunity(new VrfRouteImportExtendedCommunityBuilder()
                         .setInet4SpecificExtendedCommunityCommon(new Inet4SpecificExtendedCommunityCommonBuilder()
         final VrfRouteImportExtendedCommunityCase expected = new VrfRouteImportExtendedCommunityCaseBuilder()
                 .setVrfRouteImportExtendedCommunity(new VrfRouteImportExtendedCommunityBuilder()
                         .setInet4SpecificExtendedCommunityCommon(new Inet4SpecificExtendedCommunityCommonBuilder()

-                                .setGlobalAdministrator(new Ipv4Address("12.51.2.5"))
+                                .setGlobalAdministrator(new Ipv4AddressNoZone("12.51.2.5"))

                                 .setLocalAdministrator(new byte[]{21, 45}).build())
                         .build())
                 .build();
                                 .setLocalAdministrator(new byte[]{21, 45}).build())
                         .build())
                 .build();

diff --git a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/extended/communities/route/target/RouteTargetIpv4EcHandlerTest.java b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/extended/communities/route/target/RouteTargetIpv4EcHandlerTest.java
index 00852c00a190ef63785d165209e0f90a1538f17b..4b8449ae221652f966bfd1ae33131afe6159fd54 100644 (file)
--- a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/extended/communities/route/target/RouteTargetIpv4EcHandlerTest.java
+++ b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/extended/communities/route/target/RouteTargetIpv4EcHandlerTest.java
@@ -5,16 +5,17 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */

-

 package org.opendaylight.protocol.bgp.parser.impl.message.update.extended.communities.route.target;
 
 package org.opendaylight.protocol.bgp.parser.impl.message.update.extended.communities.route.target;
 

+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+

 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;

-import org.junit.Assert;

 import org.junit.Test;
 import org.opendaylight.protocol.bgp.parser.BGPDocumentedException;
 import org.opendaylight.protocol.bgp.parser.BGPParsingException;
 import org.junit.Test;
 import org.opendaylight.protocol.bgp.parser.BGPDocumentedException;
 import org.opendaylight.protocol.bgp.parser.BGPParsingException;

-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.opendaylight.params.xml.ns.yang.bgp.types.rev180329.extended.community.ExtendedCommunity;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.extended.community.extended.community.RouteTargetIpv4Case;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.extended.community.extended.community.RouteTargetIpv4CaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.extended.community.ExtendedCommunity;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.extended.community.extended.community.RouteTargetIpv4Case;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.extended.community.extended.community.RouteTargetIpv4CaseBuilder;


@@ -22,7 +23,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.type
 import org.opendaylight.yangtools.yang.common.Uint16;
 
 public class RouteTargetIpv4EcHandlerTest {
 import org.opendaylight.yangtools.yang.common.Uint16;
 
 public class RouteTargetIpv4EcHandlerTest {

-

     private static final byte[] INPUT = {
         12, 51, 2, 5, 0x15, 0x2d
     };
     private static final byte[] INPUT = {
         12, 51, 2, 5, 0x15, 0x2d
     };


@@ -32,16 +32,16 @@ public class RouteTargetIpv4EcHandlerTest {
         final RouteTargetIpv4EcHandler handler = new RouteTargetIpv4EcHandler();
         final RouteTargetIpv4Case expected = new RouteTargetIpv4CaseBuilder().setRouteTargetIpv4(
                 new RouteTargetIpv4Builder()
         final RouteTargetIpv4EcHandler handler = new RouteTargetIpv4EcHandler();
         final RouteTargetIpv4Case expected = new RouteTargetIpv4CaseBuilder().setRouteTargetIpv4(
                 new RouteTargetIpv4Builder()

-                        .setGlobalAdministrator(new Ipv4Address("12.51.2.5"))
+                        .setGlobalAdministrator(new Ipv4AddressNoZone("12.51.2.5"))

                         .setLocalAdministrator(Uint16.valueOf(5421))
                         .build()).build();
 
         final ExtendedCommunity exComm = handler.parseExtendedCommunity(Unpooled.copiedBuffer(INPUT));
                         .setLocalAdministrator(Uint16.valueOf(5421))
                         .build()).build();
 
         final ExtendedCommunity exComm = handler.parseExtendedCommunity(Unpooled.copiedBuffer(INPUT));

-        Assert.assertEquals(expected, exComm);
+        assertEquals(expected, exComm);

 
         final ByteBuf output = Unpooled.buffer(INPUT.length);
 
         final ByteBuf output = Unpooled.buffer(INPUT.length);

+

         handler.serializeExtendedCommunity(expected, output);
         handler.serializeExtendedCommunity(expected, output);

-        Assert.assertArrayEquals(INPUT, output.array());
+        assertArrayEquals(INPUT, output.array());

     }
     }

-

 }
 }

diff --git a/bgp/parser-mock/src/test/java/org/opendaylight/protocol/bgp/parser/mock/BGPMessageParserMockTest.java b/bgp/parser-mock/src/test/java/org/opendaylight/protocol/bgp/parser/mock/BGPMessageParserMockTest.java
index bcff065f65021b7cb3c6dd1f5dd22585be975a1c..6bdd9532a608b338481f1a3746c4dfc30d770a31 100644 (file)
--- a/bgp/parser-mock/src/test/java/org/opendaylight/protocol/bgp/parser/mock/BGPMessageParserMockTest.java
+++ b/bgp/parser-mock/src/test/java/org/opendaylight/protocol/bgp/parser/mock/BGPMessageParserMockTest.java
@@ -27,7 +27,7 @@ import org.opendaylight.protocol.bgp.parser.BGPDocumentedException;
 import org.opendaylight.protocol.bgp.parser.BGPParsingException;
 import org.opendaylight.protocol.bgp.parser.BgpTableTypeImpl;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 import org.opendaylight.protocol.bgp.parser.BGPParsingException;
 import org.opendaylight.protocol.bgp.parser.BgpTableTypeImpl;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;

-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.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv6.prefixes.DestinationIpv6Builder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv6.prefixes.destination.ipv6.Ipv6PrefixesBuilder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv6.prefixes.DestinationIpv6Builder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv6.prefixes.destination.ipv6.Ipv6PrefixesBuilder;


@@ -147,8 +147,8 @@ public class BGPMessageParserMockTest {
         final List<Segments> asPath = new ArrayList<>();
         asPath.add(new SegmentsBuilder().setAsSequence(Lists.newArrayList(new AsNumber(Uint32.valueOf(asn)))).build());
         final CNextHop nextHop = new Ipv6NextHopCaseBuilder().setIpv6NextHop(
         final List<Segments> asPath = new ArrayList<>();
         asPath.add(new SegmentsBuilder().setAsSequence(Lists.newArrayList(new AsNumber(Uint32.valueOf(asn)))).build());
         final CNextHop nextHop = new Ipv6NextHopCaseBuilder().setIpv6NextHop(

-                new Ipv6NextHopBuilder().setGlobal(new Ipv6Address("2001:db8::1"))
-                        .setLinkLocal(new Ipv6Address("fe80::c001:bff:fe7e:0")).build()).build();
+                new Ipv6NextHopBuilder().setGlobal(new Ipv6AddressNoZone("2001:db8::1"))
+                        .setLinkLocal(new Ipv6AddressNoZone("fe80::c001:bff:fe7e:0")).build()).build();

 
         final Ipv6Prefix pref1 = new Ipv6Prefix("2001:db8:1:2::/64");
         final Ipv6Prefix pref2 = new Ipv6Prefix("2001:db8:1:1::/64");
 
         final Ipv6Prefix pref1 = new Ipv6Prefix("2001:db8:1:2::/64");
         final Ipv6Prefix pref2 = new Ipv6Prefix("2001:db8:1:1::/64");

diff --git a/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/Inet4SpecificExtendedCommunityCommonUtilTest.java b/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/Inet4SpecificExtendedCommunityCommonUtilTest.java
index bc0edb6d090dbf055a39dafe260cdf656b347180..f9a6cad6d8ecfd495bc54762fc3194adf56a1d6f 100644 (file)
--- a/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/Inet4SpecificExtendedCommunityCommonUtilTest.java
+++ b/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/extended/community/Inet4SpecificExtendedCommunityCommonUtilTest.java
@@ -11,7 +11,7 @@ import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import org.junit.Assert;
 import org.junit.Test;
 import io.netty.buffer.Unpooled;
 import org.junit.Assert;
 import org.junit.Test;

-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.opendaylight.params.xml.ns.yang.bgp.types.rev180329.inet4.specific.extended.community.common.Inet4SpecificExtendedCommunityCommon;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.inet4.specific.extended.community.common.Inet4SpecificExtendedCommunityCommonBuilder;
 
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.inet4.specific.extended.community.common.Inet4SpecificExtendedCommunityCommon;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.inet4.specific.extended.community.common.Inet4SpecificExtendedCommunityCommonBuilder;
 


@@ -23,7 +23,7 @@ public class Inet4SpecificExtendedCommunityCommonUtilTest {
     @Test
     public void testHandle() {
         final Inet4SpecificExtendedCommunityCommon expected = new Inet4SpecificExtendedCommunityCommonBuilder()
     @Test
     public void testHandle() {
         final Inet4SpecificExtendedCommunityCommon expected = new Inet4SpecificExtendedCommunityCommonBuilder()

-                .setGlobalAdministrator(new Ipv4Address("12.51.2.5"))
+                .setGlobalAdministrator(new Ipv4AddressNoZone("12.51.2.5"))

                 .setLocalAdministrator(new byte[]{21, 45}).build();
 
         final Inet4SpecificExtendedCommunityCommon exComm = Inet4SpecificExtendedCommunityCommonUtil
                 .setLocalAdministrator(new byte[]{21, 45}).build();
 
         final Inet4SpecificExtendedCommunityCommon exComm = Inet4SpecificExtendedCommunityCommonUtil

diff --git a/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/BgpTestActivator.java b/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/BgpTestActivator.java
index f2466682efb244e49ee926f1d258aee946995a5c..636b70c64f5c241061985661c8e2218f7df64e49 100644 (file)
--- a/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/BgpTestActivator.java
+++ b/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/BgpTestActivator.java
@@ -41,7 +41,7 @@ import org.opendaylight.protocol.bgp.parser.spi.PeerSpecificParserConstraint;
 import org.opendaylight.protocol.bgp.parser.spi.RevisedErrorHandling;
 import org.opendaylight.protocol.bgp.parser.spi.extended.community.ExtendedCommunityParser;
 import org.opendaylight.protocol.bgp.parser.spi.extended.community.ExtendedCommunitySerializer;
 import org.opendaylight.protocol.bgp.parser.spi.RevisedErrorHandling;
 import org.opendaylight.protocol.bgp.parser.spi.extended.community.ExtendedCommunityParser;
 import org.opendaylight.protocol.bgp.parser.spi.extended.community.ExtendedCommunitySerializer;

-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.opendaylight.params.xml.ns.yang.bgp.message.rev180329.open.message.BgpParameters;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.open.message.bgp.parameters.optional.capabilities.CParameters;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.Attributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.open.message.BgpParameters;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.open.message.bgp.parameters.optional.capabilities.CParameters;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.Attributes;


@@ -131,7 +131,7 @@ public class BgpTestActivator extends AbstractBGPExtensionProviderActivator {
             @Override
             public CNextHop parseNextHop(final ByteBuf buffer) throws BGPParsingException {
                 return new Ipv4NextHopCaseBuilder().setIpv4NextHop(new Ipv4NextHopBuilder()
             @Override
             public CNextHop parseNextHop(final ByteBuf buffer) throws BGPParsingException {
                 return new Ipv4NextHopCaseBuilder().setIpv4NextHop(new Ipv4NextHopBuilder()

-                    .setGlobal(new Ipv4Address("127.0.0.1")).build()).build();
+                    .setGlobal(new Ipv4AddressNoZone("127.0.0.1")).build()).build();

             }
 
             @Override
             }
 
             @Override

diff --git a/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleRegistryTest.java b/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleRegistryTest.java
index b7e422c6a0c50c8502e49ac720a8278ef984adf8..8d1de68b4e658ac4ffa668989a1eda45467d69f0 100644 (file)
--- a/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleRegistryTest.java
+++ b/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleRegistryTest.java
@@ -38,7 +38,7 @@ import org.opendaylight.protocol.bgp.parser.spi.ParameterRegistry;
 import org.opendaylight.protocol.bgp.parser.spi.PeerSpecificParserConstraint;
 import org.opendaylight.protocol.bgp.parser.spi.RevisedErrorHandling;
 import org.opendaylight.protocol.bgp.parser.spi.SubsequentAddressFamilyRegistry;
 import org.opendaylight.protocol.bgp.parser.spi.PeerSpecificParserConstraint;
 import org.opendaylight.protocol.bgp.parser.spi.RevisedErrorHandling;
 import org.opendaylight.protocol.bgp.parser.spi.SubsequentAddressFamilyRegistry;

-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.opendaylight.params.xml.ns.yang.bgp.message.rev180329.open.message.BgpParameters;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.Attributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.AttributesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.open.message.BgpParameters;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.Attributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.AttributesBuilder;


@@ -180,7 +180,7 @@ public class SimpleRegistryTest {
             .setAfi(Ipv4AddressFamily.class)
             .setSafi(UnicastSubsequentAddressFamily.class)
             .setCNextHop(new Ipv4NextHopCaseBuilder().setIpv4NextHop(new Ipv4NextHopBuilder().setGlobal(
             .setAfi(Ipv4AddressFamily.class)
             .setSafi(UnicastSubsequentAddressFamily.class)
             .setCNextHop(new Ipv4NextHopCaseBuilder().setIpv4NextHop(new Ipv4NextHopBuilder().setGlobal(

-                new Ipv4Address("127.0.0.1")).build()).build())
+                new Ipv4AddressNoZone("127.0.0.1")).build()).build())

             .build();
         final ByteBuf buffer = Unpooled.buffer(mpReachBytes.length);
         nlriReg.serializeMpReach(mpReach, buffer);
             .build();
         final ByteBuf buffer = Unpooled.buffer(mpReachBytes.length);
         nlriReg.serializeMpReach(mpReach, buffer);

diff --git a/bgp/peer-acceptor/src/main/java/org/opendaylight/protocol/bgp/peer/acceptor/BGPPeerAcceptorImpl.java b/bgp/peer-acceptor/src/main/java/org/opendaylight/protocol/bgp/peer/acceptor/BGPPeerAcceptorImpl.java
index fc132dc69693352e7f025cf9f04f85e32075f3b5..540dc5ccb96bf69bc80dfef19739bd0718183641 100644 (file)
--- a/bgp/peer-acceptor/src/main/java/org/opendaylight/protocol/bgp/peer/acceptor/BGPPeerAcceptorImpl.java
+++ b/bgp/peer-acceptor/src/main/java/org/opendaylight/protocol/bgp/peer/acceptor/BGPPeerAcceptorImpl.java
@@ -26,7 +26,7 @@ import org.opendaylight.protocol.bgp.rib.impl.spi.BGPSessionPreferences;
 import org.opendaylight.protocol.bgp.rib.impl.spi.PeerRegistryListener;
 import org.opendaylight.protocol.concepts.KeyMapping;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil;
 import org.opendaylight.protocol.bgp.rib.impl.spi.PeerRegistryListener;
 import org.opendaylight.protocol.concepts.KeyMapping;
 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.IpAddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;


@@ -39,7 +39,7 @@ public final class BGPPeerAcceptorImpl implements AutoCloseable {
     private ChannelFuture futureChannel;
     private AutoCloseable listenerRegistration;
 
     private ChannelFuture futureChannel;
     private AutoCloseable listenerRegistration;
 

-    public BGPPeerAcceptorImpl(final IpAddress bindingAddress, final PortNumber portNumber,
+    public BGPPeerAcceptorImpl(final IpAddressNoZone bindingAddress, final PortNumber portNumber,

             final BGPDispatcher bgpDispatcher) {
         this.bgpDispatcher = requireNonNull(bgpDispatcher);
         this.address = getAddress(requireNonNull(bindingAddress), requireNonNull(portNumber));
             final BGPDispatcher bgpDispatcher) {
         this.bgpDispatcher = requireNonNull(bgpDispatcher);
         this.address = getAddress(requireNonNull(bindingAddress), requireNonNull(portNumber));


@@ -66,11 +66,11 @@ public final class BGPPeerAcceptorImpl implements AutoCloseable {
         });
     }
 
         });
     }
 

-    private static InetSocketAddress getAddress(final IpAddress ipAddress, final PortNumber portNumber) {
+    private static InetSocketAddress getAddress(final IpAddressNoZone ipAddress, final PortNumber portNumber) {

         final InetAddress inetAddr;
         try {
         final InetAddress inetAddr;
         try {

-            inetAddr = InetAddress.getByName(ipAddress.getIpv4Address() != null
-                    ? ipAddress.getIpv4Address().getValue() : ipAddress.getIpv6Address().getValue());
+            inetAddr = InetAddress.getByName(ipAddress.getIpv4AddressNoZone() != null
+                    ? ipAddress.getIpv4AddressNoZone().getValue() : ipAddress.getIpv6AddressNoZone().getValue());

         } catch (final UnknownHostException e) {
             throw new IllegalArgumentException("Illegal binding address " + ipAddress, e);
         }
         } catch (final UnknownHostException e) {
             throw new IllegalArgumentException("Illegal binding address " + ipAddress, e);
         }


@@ -100,16 +100,16 @@ public final class BGPPeerAcceptorImpl implements AutoCloseable {
         }
 
         @Override
         }
 
         @Override

-        public void onPeerAdded(final IpAddress ip, final BGPSessionPreferences prefs) {
+        public void onPeerAdded(final IpAddressNoZone ip, final BGPSessionPreferences prefs) {

             if (prefs.getMd5Password().isPresent()) {
             if (prefs.getMd5Password().isPresent()) {

-                this.keys.put(IetfInetUtil.INSTANCE.inetAddressFor(ip), prefs.getMd5Password().get());
+                this.keys.put(IetfInetUtil.INSTANCE.inetAddressForNoZone(ip), prefs.getMd5Password().get());

                 this.channelConfig.setOption(EpollChannelOption.TCP_MD5SIG, this.keys);
             }
         }
 
         @Override
                 this.channelConfig.setOption(EpollChannelOption.TCP_MD5SIG, this.keys);
             }
         }
 
         @Override

-        public void onPeerRemoved(final IpAddress ip) {
-            if (this.keys.remove(IetfInetUtil.INSTANCE.inetAddressFor(ip)) != null) {
+        public void onPeerRemoved(final IpAddressNoZone ip) {
+            if (this.keys.remove(IetfInetUtil.INSTANCE.inetAddressForNoZone(ip)) != null) {

                 this.channelConfig.setOption(EpollChannelOption.TCP_MD5SIG, this.keys);
             }
         }
                 this.channelConfig.setOption(EpollChannelOption.TCP_MD5SIG, this.keys);
             }
         }

diff --git a/bgp/peer-acceptor/src/main/yang/odl-bgp-peer-acceptor-config.yang b/bgp/peer-acceptor/src/main/yang/odl-bgp-peer-acceptor-config.yang
index ce76d8c6f83345e1c8a1b95523dc46fbed7439a2..99b985e07f1f07b60c1e8fcefaebba63d4eaeba8 100644 (file)
--- a/bgp/peer-acceptor/src/main/yang/odl-bgp-peer-acceptor-config.yang
+++ b/bgp/peer-acceptor/src/main/yang/odl-bgp-peer-acceptor-config.yang
@@ -28,7 +28,7 @@ module odl-bgp-peer-acceptor-config {
 
         leaf binding-address {
             description "IP address to bind to";
 
         leaf binding-address {
             description "IP address to bind to";

-            type inet:ip-address;
+            type inet:ip-address-no-zone;

             default "0.0.0.0";
         }
 
             default "0.0.0.0";
         }
 


@@ -38,4 +38,4 @@ module odl-bgp-peer-acceptor-config {
             default "179";
         }
     }
             default "179";
         }
     }

-}
\ No newline at end of file
+}

diff --git a/bgp/peer-acceptor/src/test/java/org/opendaylight/protocol/bgp/peer/acceptor/BGPPeerAcceptorImplTest.java b/bgp/peer-acceptor/src/test/java/org/opendaylight/protocol/bgp/peer/acceptor/BGPPeerAcceptorImplTest.java
index f353405f5a91421e1b79b8c4243c0fbd401de7c0..2fb08c1af2f6f7635360741ad3c138cbab542bb2 100644 (file)
--- a/bgp/peer-acceptor/src/test/java/org/opendaylight/protocol/bgp/peer/acceptor/BGPPeerAcceptorImplTest.java
+++ b/bgp/peer-acceptor/src/test/java/org/opendaylight/protocol/bgp/peer/acceptor/BGPPeerAcceptorImplTest.java
@@ -19,8 +19,8 @@ import org.opendaylight.protocol.bgp.rib.impl.AbstractBGPDispatcherTest;
 import org.opendaylight.protocol.bgp.rib.impl.BGPSessionImpl;
 import org.opendaylight.protocol.bgp.rib.spi.State;
 import org.opendaylight.protocol.util.InetSocketAddressUtil;
 import org.opendaylight.protocol.bgp.rib.impl.BGPSessionImpl;
 import org.opendaylight.protocol.bgp.rib.spi.State;
 import org.opendaylight.protocol.util.InetSocketAddressUtil;

-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.IpAddressNoZone;
+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.PortNumber;
 import org.opendaylight.yangtools.yang.common.Uint16;
 
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
 import org.opendaylight.yangtools.yang.common.Uint16;
 


@@ -28,7 +28,7 @@ public class BGPPeerAcceptorImplTest extends AbstractBGPDispatcherTest {
     @Test
     public void testBGPPeerAcceptorImpl() throws Exception {
         final InetSocketAddress inetServerAddress = InetSocketAddressUtil.getRandomLoopbackInetSocketAddress();
     @Test
     public void testBGPPeerAcceptorImpl() throws Exception {
         final InetSocketAddress inetServerAddress = InetSocketAddressUtil.getRandomLoopbackInetSocketAddress();

-        final IpAddress serverIpAddress = new IpAddress(new Ipv4Address(InetSocketAddressUtil
+        final IpAddressNoZone serverIpAddress = new IpAddressNoZone(new Ipv4AddressNoZone(InetSocketAddressUtil

                 .toHostAndPort(inetServerAddress).getHost()));
         final PortNumber portNumber = new PortNumber(Uint16.valueOf(
             InetSocketAddressUtil.toHostAndPort(inetServerAddress).getPort()));
                 .toHostAndPort(inetServerAddress).getHost()));
         final PortNumber portNumber = new PortNumber(Uint16.valueOf(
             InetSocketAddressUtil.toHostAndPort(inetServerAddress).getPort()));

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 a9ab4f49f5c37c0a1edba047ea9c4bcb0433b628..7c022d7b28f50e2567bcf6d899af9f8809430f7b 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
@@ -27,8 +27,8 @@ import org.opendaylight.protocol.bgp.rib.spi.BGPSessionListener;
 import org.opendaylight.protocol.bgp.rib.spi.SessionNegotiator;
 import org.opendaylight.protocol.util.Ipv6Util;
 import org.opendaylight.protocol.util.Values;
 import org.opendaylight.protocol.bgp.rib.spi.SessionNegotiator;
 import org.opendaylight.protocol.util.Ipv6Util;
 import org.opendaylight.protocol.util.Values;

-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.IpAddressNoZone;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.Keepalive;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.KeepaliveBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.Notify;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.Keepalive;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.KeepaliveBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.Notify;


@@ -96,7 +96,7 @@ abstract class AbstractBGPSessionNegotiator extends ChannelInboundHandlerAdapter
             return;
         }
         // Open can be sent first either from ODL (IDLE) or from peer (OPEN_CONFIRM)
             return;
         }
         // Open can be sent first either from ODL (IDLE) or from peer (OPEN_CONFIRM)

-        final IpAddress remoteIp = getRemoteIp();
+        final IpAddressNoZone remoteIp = getRemoteIp();

         try {
             // Check if peer is configured in registry before retrieving preferences
             if (!this.registry.isPeerConfigured(remoteIp)) {
         try {
             // Check if peer is configured in registry before retrieving preferences
             if (!this.registry.isPeerConfigured(remoteIp)) {


@@ -131,10 +131,10 @@ abstract class AbstractBGPSessionNegotiator extends ChannelInboundHandlerAdapter
         }
     }
 
         }
     }
 

-    private IpAddress getRemoteIp() {
-        final IpAddress remoteIp = StrictBGPPeerRegistry.getIpAddress(this.channel.remoteAddress());
-        if (remoteIp.getIpv6Address() != null) {
-            return new IpAddress(Ipv6Util.getFullForm(remoteIp.getIpv6Address()));
+    private IpAddressNoZone getRemoteIp() {
+        final IpAddressNoZone remoteIp = StrictBGPPeerRegistry.getIpAddress(this.channel.remoteAddress());
+        if (remoteIp.getIpv6AddressNoZone() != null) {
+            return new IpAddressNoZone(Ipv6Util.getFullForm(remoteIp.getIpv6AddressNoZone()));

         }
         return remoteIp;
     }
         }
         return remoteIp;
     }


@@ -197,7 +197,7 @@ abstract class AbstractBGPSessionNegotiator extends ChannelInboundHandlerAdapter
     }
 
     private synchronized void handleOpen(final Open openObj) {
     }
 
     private synchronized void handleOpen(final Open openObj) {

-        final IpAddress remoteIp = getRemoteIp();
+        final IpAddressNoZone remoteIp = getRemoteIp();

         final BGPSessionPreferences preferences = this.registry.getPeerPreferences(remoteIp);
         try {
             final BGPSessionListener peer = this.registry.getPeer(remoteIp, getSourceId(openObj, preferences),
         final BGPSessionPreferences preferences = this.registry.getPeerPreferences(remoteIp);
         try {
             final BGPSessionListener peer = this.registry.getPeer(remoteIp, getSourceId(openObj, preferences),


@@ -236,7 +236,7 @@ abstract class AbstractBGPSessionNegotiator extends ChannelInboundHandlerAdapter
      * @param preferences Local BGP speaker preferences
      * @return BGP Id of device that accepted the connection
      */
      * @param preferences Local BGP speaker preferences
      * @return BGP Id of device that accepted the connection
      */

-    protected abstract Ipv4Address getDestinationId(Open openMsg, BGPSessionPreferences preferences);
+    protected abstract Ipv4AddressNoZone getDestinationId(Open openMsg, BGPSessionPreferences preferences);

 
     /**
      * Get source identifier.
 
     /**
      * Get source identifier.


@@ -245,7 +245,7 @@ abstract class AbstractBGPSessionNegotiator extends ChannelInboundHandlerAdapter
      * @param preferences Local BGP speaker preferences
      * @return BGP Id of device that accepted the connection
      */
      * @param preferences Local BGP speaker preferences
      * @return BGP Id of device that accepted the connection
      */

-    protected abstract Ipv4Address getSourceId(Open openMsg, BGPSessionPreferences preferences);
+    protected abstract Ipv4AddressNoZone getSourceId(Open openMsg, BGPSessionPreferences preferences);

 
     public synchronized State getState() {
         return this.state;
 
     public synchronized State getState() {
         return this.state;

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractPeer.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractPeer.java
index b85ec93456d58b812dc617667f178da3c4f29d37..c0fc7fd219a2b0b6235a65694a3ad8fbf07ab371 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractPeer.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractPeer.java
@@ -49,7 +49,7 @@ import org.opendaylight.protocol.bgp.rib.spi.policy.BGPRouteEntryImportParameter
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPAfiSafiState;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPErrorHandlingState;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPAfiSafiState;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPErrorHandlingState;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;

-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.IpAddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.Attributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.PeerId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.PeerRole;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.Attributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.PeerId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.PeerRole;


@@ -94,7 +94,7 @@ abstract class AbstractPeer extends BGPPeerStateImpl implements BGPRouteEntryImp
             final PeerRole role,
             final @Nullable ClusterIdentifier clusterId,
             final @Nullable AsNumber localAs,
             final PeerRole role,
             final @Nullable ClusterIdentifier clusterId,
             final @Nullable AsNumber localAs,

-            final IpAddress neighborAddress,
+            final IpAddressNoZone neighborAddress,

             final Set<TablesKey> afiSafisAdvertized,
             final Set<TablesKey> afiSafisGracefulAdvertized,
             final Map<TablesKey, Integer> afiSafisLlGracefulAdvertized) {
             final Set<TablesKey> afiSafisAdvertized,
             final Set<TablesKey> afiSafisGracefulAdvertized,
             final Map<TablesKey, Integer> afiSafisLlGracefulAdvertized) {


@@ -113,7 +113,7 @@ abstract class AbstractPeer extends BGPPeerStateImpl implements BGPRouteEntryImp
             final String peerName,
             final String groupId,
             final PeerRole role,
             final String peerName,
             final String groupId,
             final PeerRole role,

-            final IpAddress neighborAddress,
+            final IpAddressNoZone neighborAddress,

             final Set<TablesKey> afiSafisGracefulAdvertized) {
         this(rib, peerName, groupId, role, null, null, neighborAddress,
                 rib.getLocalTablesKeys(), afiSafisGracefulAdvertized, Collections.emptyMap());
             final Set<TablesKey> afiSafisGracefulAdvertized) {
         this(rib, peerName, groupId, role, null, null, neighborAddress,
                 rib.getLocalTablesKeys(), afiSafisGracefulAdvertized, Collections.emptyMap());

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ApplicationPeer.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ApplicationPeer.java
index b3ee1750b69269cc9d76c47f5f8976f97f33e12f..0da33e1ab47dc86db57e532ddc13843a31bef636 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ApplicationPeer.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ApplicationPeer.java
@@ -47,8 +47,8 @@ import org.opendaylight.protocol.bgp.rib.spi.RouterIds;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPSessionState;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPTimersState;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPTransportState;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPSessionState;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPTimersState;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPTransportState;

-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.IpAddressNoZone;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.SendReceive;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.ApplicationRibId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.PeerRole;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.SendReceive;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.ApplicationRibId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.PeerRole;


@@ -127,9 +127,9 @@ public class ApplicationPeer extends AbstractPeer implements ClusteredDOMDataTre
 
     public ApplicationPeer(
             final BGPTableTypeRegistryConsumer tableTypeRegistry,
 
     public ApplicationPeer(
             final BGPTableTypeRegistryConsumer tableTypeRegistry,

-            final ApplicationRibId applicationRibId, final Ipv4Address ipAddress, final RIB rib) {
+            final ApplicationRibId applicationRibId, final Ipv4AddressNoZone ipAddress, final RIB rib) {

         super(rib, applicationRibId.getValue(), APP_PEER_GROUP, PeerRole.Internal,
         super(rib, applicationRibId.getValue(), APP_PEER_GROUP, PeerRole.Internal,

-                new IpAddress(ipAddress), Collections.emptySet());
+                new IpAddressNoZone(ipAddress), Collections.emptySet());

         this.tableTypeRegistry = requireNonNull(tableTypeRegistry);
         final RIB targetRib = requireNonNull(rib);
         this.rawIdentifier = InetAddresses.forString(ipAddress.getValue()).getAddress();
         this.tableTypeRegistry = requireNonNull(tableTypeRegistry);
         final RIB targetRib = requireNonNull(rib);
         this.rawIdentifier = InetAddresses.forString(ipAddress.getValue()).getAddress();

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPClientSessionNegotiator.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPClientSessionNegotiator.java
index b64c25b75b967a8f9d30179315f8abe4febd317e..74972e79428ef183641d02800530150e9d559b0e 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPClientSessionNegotiator.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPClientSessionNegotiator.java
@@ -11,7 +11,7 @@ import io.netty.channel.Channel;
 import io.netty.util.concurrent.Promise;
 import org.opendaylight.protocol.bgp.rib.impl.spi.BGPPeerRegistry;
 import org.opendaylight.protocol.bgp.rib.impl.spi.BGPSessionPreferences;
 import io.netty.util.concurrent.Promise;
 import org.opendaylight.protocol.bgp.rib.impl.spi.BGPPeerRegistry;
 import org.opendaylight.protocol.bgp.rib.impl.spi.BGPSessionPreferences;

-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.opendaylight.params.xml.ns.yang.bgp.message.rev180329.Open;
 
 /**
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.Open;
 
 /**


@@ -25,12 +25,12 @@ public final class BGPClientSessionNegotiator extends AbstractBGPSessionNegotiat
     }
 
     @Override
     }
 
     @Override

-    protected Ipv4Address getDestinationId(final Open openMsg, final BGPSessionPreferences preferences) {
+    protected Ipv4AddressNoZone getDestinationId(final Open openMsg, final BGPSessionPreferences preferences) {

         return preferences.getBgpId();
     }
 
     @Override
         return preferences.getBgpId();
     }
 
     @Override

-    protected Ipv4Address getSourceId(final Open openMsg, final BGPSessionPreferences preferences) {
+    protected Ipv4AddressNoZone getSourceId(final Open openMsg, final BGPSessionPreferences preferences) {

         return openMsg.getBgpIdentifier();
     }
 }
         return openMsg.getBgpIdentifier();
     }
 }

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPPeer.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPPeer.java
index 2993e3fa48ad87f23112fc384ace003a03890824..3510a2a8cf31c21b775600d658257b8738b6de2c 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPPeer.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPPeer.java
@@ -62,7 +62,7 @@ import org.opendaylight.protocol.bgp.rib.spi.state.BGPTimersState;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPTransportState;
 import org.opendaylight.protocol.util.Ipv4Util;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPTransportState;
 import org.opendaylight.protocol.util.Ipv4Util;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;

-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.IpAddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv4.prefixes.DestinationIpv4Builder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv4.prefixes.destination.ipv4.Ipv4Prefixes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv4.prefixes.destination.ipv4.Ipv4PrefixesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv4.prefixes.DestinationIpv4Builder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv4.prefixes.destination.ipv4.Ipv4Prefixes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv4.prefixes.destination.ipv4.Ipv4PrefixesBuilder;


@@ -152,7 +152,7 @@ public class BGPPeer extends AbstractPeer implements BGPSessionListener {
 
     public BGPPeer(
             final BGPTableTypeRegistryConsumer tableTypeRegistry,
 
     public BGPPeer(
             final BGPTableTypeRegistryConsumer tableTypeRegistry,

-            final IpAddress neighborAddress,
+            final IpAddressNoZone neighborAddress,

             final String peerGroupName,
             final RIB rib,
             final PeerRole role,
             final String peerGroupName,
             final RIB rib,
             final PeerRole role,

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPServerSessionNegotiator.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPServerSessionNegotiator.java
index 44a0d335ae2583c98917214d20983d61b7a52222..cb61edd2d5d58f9ca44c07bd2c819e848f3e6865 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPServerSessionNegotiator.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPServerSessionNegotiator.java
@@ -5,14 +5,13 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */

-

 package org.opendaylight.protocol.bgp.rib.impl;
 
 import io.netty.channel.Channel;
 import io.netty.util.concurrent.Promise;
 import org.opendaylight.protocol.bgp.rib.impl.spi.BGPPeerRegistry;
 import org.opendaylight.protocol.bgp.rib.impl.spi.BGPSessionPreferences;
 package org.opendaylight.protocol.bgp.rib.impl;
 
 import io.netty.channel.Channel;
 import io.netty.util.concurrent.Promise;
 import org.opendaylight.protocol.bgp.rib.impl.spi.BGPPeerRegistry;
 import org.opendaylight.protocol.bgp.rib.impl.spi.BGPSessionPreferences;

-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.opendaylight.params.xml.ns.yang.bgp.message.rev180329.Open;
 
 /**
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.Open;
 
 /**


@@ -26,12 +25,12 @@ public final class BGPServerSessionNegotiator extends AbstractBGPSessionNegotiat
     }
 
     @Override
     }
 
     @Override

-    protected Ipv4Address getSourceId(final Open openMsg, final BGPSessionPreferences preferences) {
+    protected Ipv4AddressNoZone getSourceId(final Open openMsg, final BGPSessionPreferences preferences) {

         return preferences.getBgpId();
     }
 
     @Override
         return preferences.getBgpId();
     }
 
     @Override

-    protected Ipv4Address getDestinationId(final Open openMsg, final BGPSessionPreferences preferences) {
+    protected Ipv4AddressNoZone getDestinationId(final Open openMsg, final BGPSessionPreferences preferences) {

         return openMsg.getBgpIdentifier();
     }
 }
         return openMsg.getBgpIdentifier();
     }
 }

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 94269215f23eda303b0e532aa4a09c7d900a8adb..d07abf6b7b85bf4d73f29f7419d038e3326823a4 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
@@ -40,9 +40,10 @@ import org.opendaylight.protocol.bgp.rib.spi.BGPSessionListener;
 import org.opendaylight.protocol.util.Ipv6Util;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil;
 import org.opendaylight.protocol.util.Ipv6Util;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 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.IpAddressNoZone;

 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.Ipv4Address;

-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.Ipv4AddressNoZone;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6AddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.Open;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.open.message.BgpParameters;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.open.message.bgp.parameters.OptionalCapabilities;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.Open;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.open.message.BgpParameters;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.open.message.bgp.parameters.OptionalCapabilities;


@@ -62,11 +63,11 @@ public final class StrictBGPPeerRegistry implements BGPPeerRegistry {
     private static final Logger LOG = LoggerFactory.getLogger(StrictBGPPeerRegistry.class);
 
     @GuardedBy("this")
     private static final Logger LOG = LoggerFactory.getLogger(StrictBGPPeerRegistry.class);
 
     @GuardedBy("this")

-    private final Map<IpAddress, BGPSessionListener> peers = new HashMap<>();
+    private final Map<IpAddressNoZone, BGPSessionListener> peers = new HashMap<>();

     @GuardedBy("this")
     @GuardedBy("this")

-    private final Map<IpAddress, BGPSessionId> sessionIds = new HashMap<>();
+    private final Map<IpAddressNoZone, BGPSessionId> sessionIds = new HashMap<>();

     @GuardedBy("this")
     @GuardedBy("this")

-    private final Map<IpAddress, BGPSessionPreferences> peerPreferences = new HashMap<>();
+    private final Map<IpAddressNoZone, BGPSessionPreferences> peerPreferences = new HashMap<>();

     private final Set<PeerRegistryListener> listeners = ConcurrentHashMap.newKeySet();
     private final Set<PeerRegistrySessionListener> sessionListeners = ConcurrentHashMap.newKeySet();
 
     private final Set<PeerRegistryListener> listeners = ConcurrentHashMap.newKeySet();
     private final Set<PeerRegistrySessionListener> sessionListeners = ConcurrentHashMap.newKeySet();
 


@@ -75,9 +76,9 @@ public final class StrictBGPPeerRegistry implements BGPPeerRegistry {
     }
 
     @Override
     }
 
     @Override

-    public synchronized void addPeer(final IpAddress oldIp, final BGPSessionListener peer,
+    public synchronized void addPeer(final IpAddressNoZone oldIp, final BGPSessionListener peer,

             final BGPSessionPreferences preferences) {
             final BGPSessionPreferences preferences) {

-        IpAddress fullIp = getFullIp(oldIp);
+        IpAddressNoZone fullIp = getFullIp(oldIp);

         Preconditions.checkArgument(!this.peers.containsKey(fullIp),
                 "Peer for %s already present", fullIp);
         this.peers.put(fullIp, requireNonNull(peer));
         Preconditions.checkArgument(!this.peers.containsKey(fullIp),
                 "Peer for %s already present", fullIp);
         this.peers.put(fullIp, requireNonNull(peer));


@@ -90,14 +91,14 @@ public final class StrictBGPPeerRegistry implements BGPPeerRegistry {
         }
     }
 
         }
     }
 

-    private static IpAddress getFullIp(final IpAddress ip) {
-        final Ipv6Address addr = ip.getIpv6Address();
-        return addr == null ? ip : new IpAddress(Ipv6Util.getFullForm(addr));
+    private static IpAddressNoZone getFullIp(final IpAddressNoZone ip) {
+        final Ipv6AddressNoZone addr = ip.getIpv6AddressNoZone();
+        return addr == null ? ip : new IpAddressNoZone(Ipv6Util.getFullForm(addr));

     }
 
     @Override
     }
 
     @Override

-    public synchronized void removePeer(final IpAddress oldIp) {
-        IpAddress fullIp = getFullIp(oldIp);
+    public synchronized void removePeer(final IpAddressNoZone oldIp) {
+        IpAddressNoZone fullIp = getFullIp(oldIp);

         this.peers.remove(fullIp);
         for (final PeerRegistryListener peerRegistryListener : this.listeners) {
             peerRegistryListener.onPeerRemoved(fullIp);
         this.peers.remove(fullIp);
         for (final PeerRegistryListener peerRegistryListener : this.listeners) {
             peerRegistryListener.onPeerRemoved(fullIp);


@@ -105,8 +106,8 @@ public final class StrictBGPPeerRegistry implements BGPPeerRegistry {
     }
 
     @Override
     }
 
     @Override

-    public synchronized void removePeerSession(final IpAddress oldIp) {
-        IpAddress fullIp = getFullIp(oldIp);
+    public synchronized void removePeerSession(final IpAddressNoZone oldIp) {
+        IpAddressNoZone fullIp = getFullIp(oldIp);

         this.sessionIds.remove(fullIp);
         for (final PeerRegistrySessionListener peerRegistrySessionListener : this.sessionListeners) {
             peerRegistrySessionListener.onSessionRemoved(fullIp);
         this.sessionIds.remove(fullIp);
         for (final PeerRegistrySessionListener peerRegistrySessionListener : this.sessionListeners) {
             peerRegistrySessionListener.onSessionRemoved(fullIp);


@@ -114,20 +115,20 @@ public final class StrictBGPPeerRegistry implements BGPPeerRegistry {
     }
 
     @Override
     }
 
     @Override

-    public boolean isPeerConfigured(final IpAddress oldIp) {
-        IpAddress fullIp = getFullIp(oldIp);
+    public boolean isPeerConfigured(final IpAddressNoZone oldIp) {
+        IpAddressNoZone fullIp = getFullIp(oldIp);

         return this.peers.containsKey(fullIp);
     }
 
         return this.peers.containsKey(fullIp);
     }
 

-    private void checkPeerConfigured(final IpAddress ip) {
+    private void checkPeerConfigured(final IpAddressNoZone ip) {

         Preconditions.checkState(isPeerConfigured(ip),
                 "BGP peer with ip: %s not configured, configured peers are: %s",
                 ip, this.peers.keySet());
     }
 
     @Override
         Preconditions.checkState(isPeerConfigured(ip),
                 "BGP peer with ip: %s not configured, configured peers are: %s",
                 ip, this.peers.keySet());
     }
 
     @Override

-    public synchronized BGPSessionListener getPeer(final IpAddress ip, final Ipv4Address sourceId,
-        final Ipv4Address remoteId, final Open openObj) throws BGPDocumentedException {
+    public synchronized BGPSessionListener getPeer(final IpAddressNoZone ip, final Ipv4AddressNoZone sourceId,
+            final Ipv4AddressNoZone remoteId, final Open openObj) throws BGPDocumentedException {

         requireNonNull(ip);
         requireNonNull(sourceId);
         requireNonNull(remoteId);
         requireNonNull(ip);
         requireNonNull(sourceId);
         requireNonNull(remoteId);


@@ -241,7 +242,7 @@ public final class StrictBGPPeerRegistry implements BGPPeerRegistry {
     }
 
     @Override
     }
 
     @Override

-    public BGPSessionPreferences getPeerPreferences(final IpAddress ip) {
+    public BGPSessionPreferences getPeerPreferences(final IpAddressNoZone ip) {

         requireNonNull(ip);
         checkPeerConfigured(ip);
         return this.peerPreferences.get(ip);
         requireNonNull(ip);
         checkPeerConfigured(ip);
         return this.peerPreferences.get(ip);


@@ -255,7 +256,7 @@ public final class StrictBGPPeerRegistry implements BGPPeerRegistry {
      * @return IpAddress equivalent to given socket address
      * @throws IllegalArgumentException if submitted socket address is not InetSocketAddress[ipv4 | ipv6]
      */
      * @return IpAddress equivalent to given socket address
      * @throws IllegalArgumentException if submitted socket address is not InetSocketAddress[ipv4 | ipv6]
      */

-    public static IpAddress getIpAddress(final SocketAddress socketAddress) {
+    public static IpAddressNoZone getIpAddress(final SocketAddress socketAddress) {

         requireNonNull(socketAddress);
         Preconditions.checkArgument(socketAddress instanceof InetSocketAddress,
                 "Expecting InetSocketAddress but was %s", socketAddress.getClass());
         requireNonNull(socketAddress);
         Preconditions.checkArgument(socketAddress instanceof InetSocketAddress,
                 "Expecting InetSocketAddress but was %s", socketAddress.getClass());


@@ -264,7 +265,7 @@ public final class StrictBGPPeerRegistry implements BGPPeerRegistry {
         Preconditions.checkArgument(inetAddress instanceof Inet4Address
                 || inetAddress instanceof Inet6Address, "Expecting %s or %s but was %s",
                 Inet4Address.class, Inet6Address.class, inetAddress.getClass());
         Preconditions.checkArgument(inetAddress instanceof Inet4Address
                 || inetAddress instanceof Inet6Address, "Expecting %s or %s but was %s",
                 Inet4Address.class, Inet6Address.class, inetAddress.getClass());

-        return IetfInetUtil.INSTANCE.ipAddressFor(inetAddress);
+        return IetfInetUtil.INSTANCE.ipAddressNoZoneFor(inetAddress);

     }
 
     @Override
     }
 
     @Override


@@ -356,7 +357,7 @@ public final class StrictBGPPeerRegistry implements BGPPeerRegistry {
     @Override
     public synchronized Registration registerPeerRegisterListener(final PeerRegistryListener listener) {
         this.listeners.add(listener);
     @Override
     public synchronized Registration registerPeerRegisterListener(final PeerRegistryListener listener) {
         this.listeners.add(listener);

-        for (final Entry<IpAddress, BGPSessionPreferences> entry : this.peerPreferences.entrySet()) {
+        for (final Entry<IpAddressNoZone, BGPSessionPreferences> entry : this.peerPreferences.entrySet()) {

             listener.onPeerAdded(entry.getKey(), entry.getValue());
         }
         return new AbstractRegistration() {
             listener.onPeerAdded(entry.getKey(), entry.getValue());
         }
         return new AbstractRegistration() {


@@ -370,7 +371,7 @@ public final class StrictBGPPeerRegistry implements BGPPeerRegistry {
     @Override
     public synchronized Registration registerPeerSessionListener(final PeerRegistrySessionListener listener) {
         this.sessionListeners.add(listener);
     @Override
     public synchronized Registration registerPeerSessionListener(final PeerRegistrySessionListener listener) {
         this.sessionListeners.add(listener);

-        for (final IpAddress ipAddress : this.sessionIds.keySet()) {
+        for (final IpAddressNoZone ipAddress : this.sessionIds.keySet()) {

             listener.onSessionCreated(ipAddress);
         }
         return new AbstractRegistration() {
             listener.onSessionCreated(ipAddress);
         }
         return new AbstractRegistration() {


@@ -382,7 +383,7 @@ public final class StrictBGPPeerRegistry implements BGPPeerRegistry {
     }
 
     @Override
     }
 
     @Override

-    public void updatePeerPreferences(final IpAddress address, final BGPSessionPreferences preferences) {
+    public void updatePeerPreferences(final IpAddressNoZone address, final BGPSessionPreferences preferences) {

         if (this.peerPreferences.containsKey(address)) {
             this.peerPreferences.put(address, preferences);
         }
         if (this.peerPreferences.containsKey(address)) {
             this.peerPreferences.put(address, preferences);
         }

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/AppPeer.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/AppPeer.java
index cb4568aa41c40822cbaaec057000b7deb87f4dc0..2dd3dcfc330035eb14751947a8aa1e4ba1f7004f 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/AppPeer.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/AppPeer.java
@@ -26,7 +26,8 @@ import org.opendaylight.protocol.bgp.rib.spi.state.BGPPeerStateConsumer;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.neighbor.group.Config;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.neighbors.Neighbor;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.top.Bgp;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.neighbor.group.Config;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.neighbors.Neighbor;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.top.Bgp;

-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.IetfInetUtil;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.ApplicationRib;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.ApplicationRibId;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.ApplicationRib;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.ApplicationRibId;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;


@@ -63,7 +64,8 @@ public final class AppPeer implements PeerBean, BGPPeerStateConsumer {
                 "Previous peer instance was not closed.");
         this.currentConfiguration = neighbor;
         this.bgpAppPeerSingletonService = new BgpAppPeerSingletonService(rib, createAppRibId(neighbor),
                 "Previous peer instance was not closed.");
         this.currentConfiguration = neighbor;
         this.bgpAppPeerSingletonService = new BgpAppPeerSingletonService(rib, createAppRibId(neighbor),

-                neighbor.getNeighborAddress().getIpv4Address(), tableTypeRegistry);
+            IetfInetUtil.INSTANCE.ipv4AddressNoZoneFor(neighbor.getNeighborAddress().getIpv4Address()),
+            tableTypeRegistry);

     }
 
     @Override
     }
 
     @Override


@@ -122,8 +124,8 @@ public final class AppPeer implements PeerBean, BGPPeerStateConsumer {
         @GuardedBy("this")
         private boolean isServiceInstantiated;
 
         @GuardedBy("this")
         private boolean isServiceInstantiated;
 

-        BgpAppPeerSingletonService(final RIB rib, final ApplicationRibId appRibId, final Ipv4Address neighborAddress,
-                final BGPTableTypeRegistryConsumer tableTypeRegistry) {
+        BgpAppPeerSingletonService(final RIB rib, final ApplicationRibId appRibId,
+                final Ipv4AddressNoZone neighborAddress, final BGPTableTypeRegistryConsumer tableTypeRegistry) {

             this.applicationPeer = new ApplicationPeer(tableTypeRegistry, appRibId, neighborAddress, rib);
             this.appRibId = appRibId;
             this.dataTreeChangeService = rib.getService();
             this.applicationPeer = new ApplicationPeer(tableTypeRegistry, appRibId, neighborAddress, rib);
             this.appRibId = appRibId;
             this.dataTreeChangeService = rib.getService();

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpPeer.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpPeer.java
index 38eb0e86ff69bec7bb9a229ec3e5553734e8d2f1..b2fb041d079da8f3e34cdbb5cea211218af5a220 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpPeer.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpPeer.java
@@ -48,7 +48,7 @@ import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.n
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.peer.group.PeerGroup;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.top.Bgp;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.peer.group.PeerGroup;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.top.Bgp;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;

-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.IpAddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.open.message.BgpParameters;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.open.message.bgp.parameters.OptionalCapabilities;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.open.message.BgpParameters;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.open.message.bgp.parameters.OptionalCapabilities;


@@ -220,8 +220,9 @@ public class BgpPeer implements PeerBean, BGPPeerStateConsumer {
     }
 
     synchronized void removePeer(final BGPPeerRegistry bgpPeerRegistry) {
     }
 
     synchronized void removePeer(final BGPPeerRegistry bgpPeerRegistry) {

-        if (BgpPeer.this.currentConfiguration != null) {
-            bgpPeerRegistry.removePeer(BgpPeer.this.currentConfiguration.getNeighborAddress());
+        if (this.currentConfiguration != null) {
+            bgpPeerRegistry.removePeer(OpenConfigMappingUtil.convertIpAddress(
+                this.currentConfiguration.getNeighborAddress()));

         }
     }
 
         }
     }
 


@@ -233,7 +234,7 @@ public class BgpPeer implements PeerBean, BGPPeerStateConsumer {
         private final KeyMapping keys;
         private final InetSocketAddress localAddress;
         private final BGPPeer bgpPeer;
         private final KeyMapping keys;
         private final InetSocketAddress localAddress;
         private final BGPPeer bgpPeer;

-        private final IpAddress neighborAddress;
+        private final IpAddressNoZone neighborAddress;

         private final BGPSessionPreferences prefs;
         private Future<Void> connection;
         private boolean isServiceInstantiated;
         private final BGPSessionPreferences prefs;
         private Future<Void> connection;
         private boolean isServiceInstantiated;


@@ -244,7 +245,7 @@ public class BgpPeer implements PeerBean, BGPPeerStateConsumer {
 
         private BgpPeerSingletonService(final RIB rib, final Neighbor neighbor, final InstanceIdentifier<Bgp> bgpIid,
                 final PeerGroupConfigLoader peerGroupLoader, final BGPTableTypeRegistryConsumer tableTypeRegistry) {
 
         private BgpPeerSingletonService(final RIB rib, final Neighbor neighbor, final InstanceIdentifier<Bgp> bgpIid,
                 final PeerGroupConfigLoader peerGroupLoader, final BGPTableTypeRegistryConsumer tableTypeRegistry) {

-            this.neighborAddress = neighbor.getNeighborAddress();
+            this.neighborAddress = OpenConfigMappingUtil.convertIpAddress(neighbor.getNeighborAddress());

 
             PeerGroup peerGroup = null;
             String peerGroupName = null;
 
             PeerGroup peerGroup = null;
             String peerGroupName = null;


@@ -279,7 +280,7 @@ public class BgpPeer implements PeerBean, BGPPeerStateConsumer {
             this.finalCapabilities = getBgpCapabilities(afisSafis, rib, tableTypeRegistry);
             final List<BgpParameters> bgpParameters = getInitialBgpParameters(gracefulTables, llGracefulTimers);
             final KeyMapping keyMapping = OpenConfigMappingUtil.getNeighborKey(neighbor);
             this.finalCapabilities = getBgpCapabilities(afisSafis, rib, tableTypeRegistry);
             final List<BgpParameters> bgpParameters = getInitialBgpParameters(gracefulTables, llGracefulTimers);
             final KeyMapping keyMapping = OpenConfigMappingUtil.getNeighborKey(neighbor);

-            final IpAddress neighborLocalAddress = OpenConfigMappingUtil.getLocalAddress(neighbor.getTransport());
+            final IpAddressNoZone neighborLocalAddress = OpenConfigMappingUtil.getLocalAddress(neighbor.getTransport());

             final AsNumber globalAs = rib.getLocalAs();
             final AsNumber neighborRemoteAs = OpenConfigMappingUtil
                     .getRemotePeerAs(neighbor.getConfig(), peerGroup, globalAs);
             final AsNumber globalAs = rib.getLocalAs();
             final AsNumber neighborRemoteAs = OpenConfigMappingUtil
                     .getRemotePeerAs(neighbor.getConfig(), peerGroup, globalAs);

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/OpenConfigMappingUtil.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/OpenConfigMappingUtil.java
index 97351d6b8ca89f85035fb665eba336ae10454314..e70f2b858caa5b856730e9988834d0f0c6f7e548 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/OpenConfigMappingUtil.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/OpenConfigMappingUtil.java
@@ -7,6 +7,7 @@
  */
 package org.opendaylight.protocol.bgp.rib.impl.config;
 
  */
 package org.opendaylight.protocol.bgp.rib.impl.config;
 

+import static com.google.common.base.Preconditions.checkState;

 import static org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil.INSTANCE;
 
 import com.google.common.collect.ImmutableList;
 import static org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil.INSTANCE;
 
 import com.google.common.collect.ImmutableList;


@@ -49,7 +50,11 @@ import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.types.rev151009
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.types.rev151009.PeerType;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.network.instance.rev151018.network.instance.top.network.instances.network.instance.protocols.Protocol;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.types.rev151009.PeerType;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.network.instance.rev151018.network.instance.top.network.instances.network.instance.protocols.Protocol;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;

+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.IpAddress;

+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressNoZone;
+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.Ipv6Address;

 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.BgpTableType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.SendReceive;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.BgpTableType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.SendReceive;


@@ -102,8 +107,21 @@ final class OpenConfigMappingUtil {
         return rootIdentifier.child(Neighbors.class).child(Neighbor.class, neighborKey);
     }
 
         return rootIdentifier.child(Neighbors.class).child(Neighbor.class, neighborKey);
     }
 

+    static IpAddressNoZone convertIpAddress(final IpAddress addr) {
+        if (addr == null) {
+            return null;
+        }
+        final Ipv4Address ipv4 = addr.getIpv4Address();
+        if (ipv4 != null) {
+            return new IpAddressNoZone(INSTANCE.ipv4AddressNoZoneFor(ipv4));
+        }
+        final Ipv6Address ipv6 = addr.getIpv6Address();
+        checkState(ipv6 != null, "Unexpected address %s", addr);
+        return new IpAddressNoZone(INSTANCE.ipv6AddressNoZoneFor(ipv6));
+    }
+

     static String getNeighborInstanceName(final InstanceIdentifier<?> rootIdentifier) {
     static String getNeighborInstanceName(final InstanceIdentifier<?> rootIdentifier) {

-        return Ipv4Util.toStringIP(rootIdentifier.firstKeyOf(Neighbor.class).getNeighborAddress());
+        return Ipv4Util.toStringIP(convertIpAddress(rootIdentifier.firstKeyOf(Neighbor.class).getNeighborAddress()));

     }
 
     //make sure IPv4 Unicast (RFC 4271) when required
     }
 
     //make sure IPv4 Unicast (RFC 4271) when required


@@ -130,10 +148,13 @@ final class OpenConfigMappingUtil {
             .yang.bgp.rev151009.bgp.global.base.Config globalConfig) {
         final GlobalConfigAugmentation globalConfigAugmentation
                 = globalConfig.augmentation(GlobalConfigAugmentation.class);
             .yang.bgp.rev151009.bgp.global.base.Config globalConfig) {
         final GlobalConfigAugmentation globalConfigAugmentation
                 = globalConfig.augmentation(GlobalConfigAugmentation.class);

+        final Ipv4Address addr;

         if (globalConfigAugmentation != null && globalConfigAugmentation.getRouteReflectorClusterId() != null) {
         if (globalConfigAugmentation != null && globalConfigAugmentation.getRouteReflectorClusterId() != null) {

-            return new ClusterIdentifier(globalConfigAugmentation.getRouteReflectorClusterId().getIpv4Address());
+            addr = globalConfigAugmentation.getRouteReflectorClusterId().getIpv4Address();
+        } else {
+            addr = globalConfig.getRouterId();

         }
         }

-        return new ClusterIdentifier(globalConfig.getRouterId());
+        return new ClusterIdentifier(IetfInetUtil.INSTANCE.ipv4AddressNoZoneFor(addr));

     }
 
     static @Nullable ClusterIdentifier getNeighborClusterIdentifier(
     }
 
     static @Nullable ClusterIdentifier getNeighborClusterIdentifier(


@@ -153,7 +174,8 @@ final class OpenConfigMappingUtil {
             final org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.neighbor.group.route
                     .reflector.Config config = routeReflector.getConfig();
             if (config != null && config.getRouteReflectorClusterId() != null) {
             final org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.neighbor.group.route
                     .reflector.Config config = routeReflector.getConfig();
             if (config != null && config.getRouteReflectorClusterId() != null) {

-                return new ClusterIdentifier(config.getRouteReflectorClusterId().getIpv4Address());
+                return new ClusterIdentifier(IetfInetUtil.INSTANCE.ipv4AddressNoZoneFor(
+                    config.getRouteReflectorClusterId().getIpv4Address()));

             }
         }
         return null;
             }
         }
         return null;


@@ -448,11 +470,11 @@ final class OpenConfigMappingUtil {
         return null;
     }
 
         return null;
     }
 

-    static @Nullable IpAddress getLocalAddress(@Nullable final Transport transport) {
+    static @Nullable IpAddressNoZone getLocalAddress(@Nullable final Transport transport) {

         if (transport != null && transport.getConfig() != null) {
             final BgpNeighborTransportConfig.LocalAddress localAddress = transport.getConfig().getLocalAddress();
             if (localAddress != null) {
         if (transport != null && transport.getConfig() != null) {
             final BgpNeighborTransportConfig.LocalAddress localAddress = transport.getConfig().getLocalAddress();
             if (localAddress != null) {

-                return localAddress.getIpAddress();
+                return convertIpAddress(localAddress.getIpAddress());

             }
         }
         return null;
             }
         }
         return null;

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/RibImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/RibImpl.java
index 0ed4c7dcda5d1ee608f88710be1ee0bbb46bb92f..7408c2274608f707d7a21d8882180a12b42580d2 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/RibImpl.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/RibImpl.java
@@ -45,7 +45,9 @@ import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.multiprotocol.r
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.global.base.Config;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.top.bgp.Global;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.global.base.Config;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.top.bgp.Global;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;

+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.Ipv4Address;
 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.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.BgpTableType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.PeerId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.RibId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.BgpTableType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.PeerId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.RibId;


@@ -77,7 +79,7 @@ public final class RibImpl implements RIB, BGPRibStateConsumer, AutoCloseable {
     private ListenerRegistration<SchemaContextListener> schemaContextRegistration;
     private List<AfiSafi> afiSafi;
     private AsNumber asNumber;
     private ListenerRegistration<SchemaContextListener> schemaContextRegistration;
     private List<AfiSafi> afiSafi;
     private AsNumber asNumber;

-    private Ipv4Address routerId;
+    private Ipv4AddressNoZone routerId;

 
     private ClusterIdentifier clusterId;
     private final DataBroker dataBroker;
 
     private ClusterIdentifier clusterId;
     private final DataBroker dataBroker;


@@ -247,7 +249,7 @@ public final class RibImpl implements RIB, BGPRibStateConsumer, AutoCloseable {
         this.afiSafi = getAfiSafiWithDefault(global.getAfiSafis(), true);
         final Config globalConfig = global.getConfig();
         this.asNumber = globalConfig.getAs();
         this.afiSafi = getAfiSafiWithDefault(global.getAfiSafis(), true);
         final Config globalConfig = global.getConfig();
         this.asNumber = globalConfig.getAs();

-        this.routerId = globalConfig.getRouterId();
+        this.routerId = IetfInetUtil.INSTANCE.ipv4AddressNoZoneFor(globalConfig.getRouterId());

         this.clusterId = getGlobalClusterIdentifier(globalConfig);
         final Map<TablesKey, PathSelectionMode> pathSelectionModes = OpenConfigMappingUtil
                 .toPathSelectionMode(this.afiSafi, tableTypeRegistry).entrySet()
         this.clusterId = getGlobalClusterIdentifier(globalConfig);
         final Map<TablesKey, PathSelectionMode> pathSelectionModes = OpenConfigMappingUtil
                 .toPathSelectionMode(this.afiSafi, tableTypeRegistry).entrySet()

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/protocol/BGPProtocolSessionPromise.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/protocol/BGPProtocolSessionPromise.java
index 83b4c40dd2615c2a0a263a82889584dc6e064953..12efb5e2b0d3f2e8dfbd832da87e5910e37ca4f3 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/protocol/BGPProtocolSessionPromise.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/protocol/BGPProtocolSessionPromise.java
@@ -26,7 +26,7 @@ import org.opendaylight.protocol.bgp.rib.impl.StrictBGPPeerRegistry;
 import org.opendaylight.protocol.bgp.rib.impl.spi.BGPPeerRegistry;
 import org.opendaylight.protocol.bgp.rib.impl.spi.PeerRegistrySessionListener;
 import org.opendaylight.protocol.bgp.rib.spi.BGPSession;
 import org.opendaylight.protocol.bgp.rib.impl.spi.BGPPeerRegistry;
 import org.opendaylight.protocol.bgp.rib.impl.spi.PeerRegistrySessionListener;
 import org.opendaylight.protocol.bgp.rib.spi.BGPSession;

-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.IpAddressNoZone;

 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 


@@ -162,14 +162,14 @@ public final class BGPProtocolSessionPromise<S extends BGPSession> extends Defau
     }
 
     private class PeerRegistrySessionListenerImpl implements PeerRegistrySessionListener {
     }
 
     private class PeerRegistrySessionListenerImpl implements PeerRegistrySessionListener {

-        private final IpAddress peerAddress;
+        private final IpAddressNoZone peerAddress;

 
 

-        PeerRegistrySessionListenerImpl(final IpAddress peerAddress) {
+        PeerRegistrySessionListenerImpl(final IpAddressNoZone peerAddress) {

             this.peerAddress = peerAddress;
         }
 
         @Override
             this.peerAddress = peerAddress;
         }
 
         @Override

-        public void onSessionCreated(final IpAddress ip) {
+        public void onSessionCreated(final IpAddressNoZone ip) {

             if (ip.equals(this.peerAddress)) {
                 LOG.debug("Callback for session creation with peer {} received", ip);
                 synchronized (BGPProtocolSessionPromise.this) {
             if (ip.equals(this.peerAddress)) {
                 LOG.debug("Callback for session creation with peer {} received", ip);
                 synchronized (BGPProtocolSessionPromise.this) {


@@ -179,7 +179,7 @@ public final class BGPProtocolSessionPromise<S extends BGPSession> extends Defau
         }
 
         @Override
         }
 
         @Override

-        public void onSessionRemoved(final IpAddress ip) {
+        public void onSessionRemoved(final IpAddressNoZone ip) {

             if (ip.equals(this.peerAddress)) {
                 LOG.debug("Callback for session removal with peer {} received", ip);
                 synchronized (BGPProtocolSessionPromise.this) {
             if (ip.equals(this.peerAddress)) {
                 LOG.debug("Callback for session removal with peer {} received", ip);
                 synchronized (BGPProtocolSessionPromise.this) {

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/BGPPeerRegistry.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/BGPPeerRegistry.java
index 30c717734c9271abd0377084557e19cc93363d09..b128480fa2678f9963bfe144bf0b7c395c4d6b29 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/BGPPeerRegistry.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/BGPPeerRegistry.java
@@ -10,8 +10,8 @@ package org.opendaylight.protocol.bgp.rib.impl.spi;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.protocol.bgp.parser.BGPDocumentedException;
 import org.opendaylight.protocol.bgp.rib.spi.BGPSessionListener;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.protocol.bgp.parser.BGPDocumentedException;
 import org.opendaylight.protocol.bgp.rib.spi.BGPSessionListener;

-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.IpAddressNoZone;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.Open;
 import org.opendaylight.yangtools.concepts.Registration;
 
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.Open;
 import org.opendaylight.yangtools.concepts.Registration;
 


@@ -28,21 +28,21 @@ public interface BGPPeerRegistry extends AutoCloseable {
      * @param peer configured peer as BGPSessionListener
      * @param prefs session preferences for configured peer
      */
      * @param peer configured peer as BGPSessionListener
      * @param prefs session preferences for configured peer
      */

-    void addPeer(IpAddress ip, BGPSessionListener peer, BGPSessionPreferences prefs);
+    void addPeer(IpAddressNoZone ip, BGPSessionListener peer, BGPSessionPreferences prefs);

 
     /**
      * Remove configured peer from registry.
      *
      * @param ip address of remote peer
      */
 
     /**
      * Remove configured peer from registry.
      *
      * @param ip address of remote peer
      */

-    void removePeer(@NonNull IpAddress ip);
+    void removePeer(@NonNull IpAddressNoZone ip);

 
     /**
      * Remove peer session from registry.
      *
      * @param ip address of remote peer
      */
 
     /**
      * Remove peer session from registry.
      *
      * @param ip address of remote peer
      */

-    void removePeerSession(@NonNull IpAddress ip);
+    void removePeerSession(@NonNull IpAddressNoZone ip);

 
     /**
      * Check whether peer on provided IP address is present in this registry.
 
     /**
      * Check whether peer on provided IP address is present in this registry.


@@ -50,7 +50,7 @@ public interface BGPPeerRegistry extends AutoCloseable {
      * @param ip address of remote peer
      * @return true if peer is present false otherwise
      */
      * @param ip address of remote peer
      * @return true if peer is present false otherwise
      */

-    boolean isPeerConfigured(@NonNull IpAddress ip);
+    boolean isPeerConfigured(@NonNull IpAddressNoZone ip);

 
     /**
      * Get configured peer after BGP session was successfully established. Called by negotiators.
 
     /**
      * Get configured peer after BGP session was successfully established. Called by negotiators.


@@ -64,7 +64,7 @@ public interface BGPPeerRegistry extends AutoCloseable {
      * @throws BGPDocumentedException if session establishment cannot be finished successfully
      * @throws java.lang.IllegalStateException if there is no peer configured for provided ip address
      */
      * @throws BGPDocumentedException if session establishment cannot be finished successfully
      * @throws java.lang.IllegalStateException if there is no peer configured for provided ip address
      */

-    BGPSessionListener getPeer(IpAddress ip, Ipv4Address sourceId, Ipv4Address remoteId, Open open)
+    BGPSessionListener getPeer(IpAddressNoZone ip, Ipv4AddressNoZone sourceId, Ipv4AddressNoZone remoteId, Open open)

             throws BGPDocumentedException;
 
     /**
             throws BGPDocumentedException;
 
     /**


@@ -74,7 +74,7 @@ public interface BGPPeerRegistry extends AutoCloseable {
      * @return BGP session preferences for configured peer
      * @throws IllegalStateException if there is no peer configured for provided ip address
      */
      * @return BGP session preferences for configured peer
      * @throws IllegalStateException if there is no peer configured for provided ip address
      */

-    BGPSessionPreferences getPeerPreferences(IpAddress ip);
+    BGPSessionPreferences getPeerPreferences(IpAddressNoZone ip);

 
     /**
      * Register PeerRegistryListener, which listens to the changes in peer
 
     /**
      * Register PeerRegistryListener, which listens to the changes in peer


@@ -106,5 +106,5 @@ public interface BGPPeerRegistry extends AutoCloseable {
      * @param ip of neighbor
      * @param preferences to send in OPEN message
      */
      * @param ip of neighbor
      * @param preferences to send in OPEN message
      */

-    void updatePeerPreferences(IpAddress ip, BGPSessionPreferences preferences);
+    void updatePeerPreferences(IpAddressNoZone ip, BGPSessionPreferences preferences);

 }
 }

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/PeerRegistryListener.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/PeerRegistryListener.java
index c2a58bd9e19fd6a0d3ecf6eef927dc047b8f0e4f..ba27d90dce49a7eb3d676298f022bef479132e18 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/PeerRegistryListener.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/PeerRegistryListener.java
@@ -8,7 +8,7 @@
 package org.opendaylight.protocol.bgp.rib.impl.spi;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 package org.opendaylight.protocol.bgp.rib.impl.spi;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;

-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.IpAddressNoZone;

 
 /**
  * Listens to the changes in a PeerRegisty.
 
 /**
  * Listens to the changes in a PeerRegisty.


@@ -21,12 +21,12 @@ public interface PeerRegistryListener {
      * @param ip The new peer's IP address.
      * @param prefs The new peer's preferences.
      */
      * @param ip The new peer's IP address.
      * @param prefs The new peer's preferences.
      */

-    void onPeerAdded(IpAddress ip, BGPSessionPreferences prefs);
+    void onPeerAdded(IpAddressNoZone ip, BGPSessionPreferences prefs);

 
     /**
      * Invoked when peer is removed from registry.
      * @param ip The removed peer's IP address.
      */
 
     /**
      * Invoked when peer is removed from registry.
      * @param ip The removed peer's IP address.
      */

-    void onPeerRemoved(IpAddress ip);
+    void onPeerRemoved(IpAddressNoZone ip);

 
 }
 
 }

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/PeerRegistrySessionListener.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/PeerRegistrySessionListener.java
index a0d93875582348bc34a57efbbcde3e1192928f0a..8dfeaa04515960175253f1fb494e2e0076a4b55e 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/PeerRegistrySessionListener.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/PeerRegistrySessionListener.java
@@ -8,7 +8,7 @@
 package org.opendaylight.protocol.bgp.rib.impl.spi;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 package org.opendaylight.protocol.bgp.rib.impl.spi;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;

-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.IpAddressNoZone;

 
 /**
  * Listens to the session changes for peers in a PeerRegisty.
 
 /**
  * Listens to the session changes for peers in a PeerRegisty.


@@ -21,12 +21,11 @@ public interface PeerRegistrySessionListener {
      * Invoked when new peer session is created.
      * @param ip The peer's IP address.
      */
      * Invoked when new peer session is created.
      * @param ip The peer's IP address.
      */

-    void onSessionCreated(IpAddress ip);
+    void onSessionCreated(IpAddressNoZone ip);

 
     /**
      * Invoked when peer session is removed.
      * @param ip The peer's IP address.
      */
 
     /**
      * Invoked when peer session is removed.
      * @param ip The peer's IP address.
      */

-    void onSessionRemoved(IpAddress ip);
-
+    void onSessionRemoved(IpAddressNoZone ip);

 }
 }

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/state/BGPPeerStateImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/state/BGPPeerStateImpl.java
index 66743f7ccb4437b4e69fd1eea58eccec652fe2ae..eb355824ed6495dea2cb78454a840dd9c79f0ae1 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/state/BGPPeerStateImpl.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/state/BGPPeerStateImpl.java
@@ -33,7 +33,7 @@ import org.opendaylight.protocol.bgp.rib.spi.state.BGPPeerMessagesState;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPPeerState;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPPeerStateConsumer;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.operational.rev151009.BgpAfiSafiGracefulRestartState.Mode;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPPeerState;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPPeerStateConsumer;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.operational.rev151009.BgpAfiSafiGracefulRestartState.Mode;

-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.IpAddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.Notify;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.Update;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.bgp.rib.Rib;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.Notify;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.Update;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.bgp.rib.Rib;


@@ -46,7 +46,7 @@ public abstract class BGPPeerStateImpl extends DefaultRibReference implements BG
         BGPGracelfulRestartState, BGPLlGracelfulRestartState,BGPErrorHandlingState, BGPPeerMessagesState,
         BGPPeerStateConsumer, BGPMessagesListener {
     private static final long NONE = 0L;
         BGPGracelfulRestartState, BGPLlGracelfulRestartState,BGPErrorHandlingState, BGPPeerMessagesState,
         BGPPeerStateConsumer, BGPMessagesListener {
     private static final long NONE = 0L;

-    private final IpAddress neighborAddress;
+    private final IpAddressNoZone neighborAddress;

     private final Set<TablesKey> afiSafisAdvertized;
     private final Set<TablesKey> afiSafisGracefulAdvertized;
     private final Set<TablesKey> afiSafisGracefulReceived = new HashSet<>();
     private final Set<TablesKey> afiSafisAdvertized;
     private final Set<TablesKey> afiSafisGracefulAdvertized;
     private final Set<TablesKey> afiSafisGracefulReceived = new HashSet<>();


@@ -75,7 +75,7 @@ public abstract class BGPPeerStateImpl extends DefaultRibReference implements BG
     private boolean peerRestarting;
 
     public BGPPeerStateImpl(final @NonNull KeyedInstanceIdentifier<Rib, RibKey> instanceIdentifier,
     private boolean peerRestarting;
 
     public BGPPeerStateImpl(final @NonNull KeyedInstanceIdentifier<Rib, RibKey> instanceIdentifier,

-            final @Nullable String groupId, final @NonNull IpAddress neighborAddress,
+            final @Nullable String groupId, final @NonNull IpAddressNoZone neighborAddress,

             final @NonNull Set<TablesKey> afiSafisAdvertized,
             final @NonNull Set<TablesKey> afiSafisGracefulAdvertized,
             final @NonNull Map<TablesKey, Integer> afiSafisLlGracefulAdvertized) {
             final @NonNull Set<TablesKey> afiSafisAdvertized,
             final @NonNull Set<TablesKey> afiSafisGracefulAdvertized,
             final @NonNull Map<TablesKey, Integer> afiSafisLlGracefulAdvertized) {


@@ -93,7 +93,7 @@ public abstract class BGPPeerStateImpl extends DefaultRibReference implements BG
     }
 
     @Override
     }
 
     @Override

-    public final IpAddress getNeighborAddress() {
+    public final IpAddressNoZone getNeighborAddress() {

         return this.neighborAddress;
     }
 
         return this.neighborAddress;
     }
 

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/state/BGPSessionStateImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/state/BGPSessionStateImpl.java
index f753a1a5e919836dd9c6d44c34aa03eafda8f7f2..b97faa321b76ce41d659fea18894c45dae7b82f0 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/state/BGPSessionStateImpl.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/state/BGPSessionStateImpl.java
@@ -21,7 +21,7 @@ import org.opendaylight.protocol.bgp.rib.spi.State;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPSessionState;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPTimersState;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPTransportState;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPSessionState;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPTimersState;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPTransportState;

-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.IpAddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.open.message.BgpParameters;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.open.message.bgp.parameters.OptionalCapabilities;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.open.message.BgpParameters;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.open.message.bgp.parameters.OptionalCapabilities;


@@ -38,7 +38,7 @@ public final class BGPSessionStateImpl implements BGPSessionState, BGPTimersStat
     private static final PortNumber NON_DEFINED_PORT = new PortNumber(Uint16.ZERO);
     private final Stopwatch sessionStopwatch;
     private int holdTimerValue;
     private static final PortNumber NON_DEFINED_PORT = new PortNumber(Uint16.ZERO);
     private final Stopwatch sessionStopwatch;
     private int holdTimerValue;

-    private IpAddress remoteAddress;
+    private IpAddressNoZone remoteAddress;

     private PortNumber remotePort = NON_DEFINED_PORT;
     private PortNumber localPort = NON_DEFINED_PORT;
     @GuardedBy("this")
     private PortNumber remotePort = NON_DEFINED_PORT;
     private PortNumber localPort = NON_DEFINED_PORT;
     @GuardedBy("this")


@@ -157,7 +157,7 @@ public final class BGPSessionStateImpl implements BGPSessionState, BGPTimersStat
     }
 
     @Override
     }
 
     @Override

-    public synchronized IpAddress getRemoteAddress() {
+    public synchronized IpAddressNoZone getRemoteAddress() {

         return this.remoteAddress;
     }
 
         return this.remoteAddress;
     }
 

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractAddPathTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractAddPathTest.java
index e6cf3a5fd0b49018136b402ff2a6fe7f657be9ff..f3b0adad52fcc189c1f23f0e27659fe79d64328a 100644 (file)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractAddPathTest.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractAddPathTest.java
@@ -47,8 +47,9 @@ import org.opendaylight.protocol.bgp.rib.spi.RIBExtensionProviderContext;
 import org.opendaylight.protocol.bgp.rib.spi.SimpleRIBExtensionProviderContext;
 import org.opendaylight.protocol.util.InetSocketAddressUtil;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 import org.opendaylight.protocol.bgp.rib.spi.SimpleRIBExtensionProviderContext;
 import org.opendaylight.protocol.util.InetSocketAddressUtil;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;

-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.IpAddressNoZone;

 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.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.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.bgp.rib.rib.loc.rib.tables.routes.Ipv4RoutesCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv4.prefixes.DestinationIpv4Builder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.bgp.rib.rib.loc.rib.tables.routes.Ipv4RoutesCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv4.prefixes.DestinationIpv4Builder;


@@ -97,18 +98,18 @@ public abstract class AbstractAddPathTest extends DefaultRibPoliciesMockTest {
     private static final int RETRY_TIMER = 10;
     static final String RIB_ID = "127.0.0.1";
     static final BgpId BGP_ID = new BgpId(RIB_ID);
     private static final int RETRY_TIMER = 10;
     static final String RIB_ID = "127.0.0.1";
     static final BgpId BGP_ID = new BgpId(RIB_ID);

-    static final Ipv4Address PEER1 = new Ipv4Address("127.0.0.2");
-    static final Ipv4Address PEER2 = new Ipv4Address("127.0.0.3");
-    static final Ipv4Address PEER3 = new Ipv4Address("127.0.0.4");
-    static final Ipv4Address PEER4 = new Ipv4Address("127.0.0.5");
-    static final Ipv4Address PEER5 = new Ipv4Address("127.0.0.6");
-    static final Ipv4Address PEER6 = new Ipv4Address("127.0.0.7");
+    static final Ipv4AddressNoZone PEER1 = new Ipv4AddressNoZone("127.0.0.2");
+    static final Ipv4AddressNoZone PEER2 = new Ipv4AddressNoZone("127.0.0.3");
+    static final Ipv4AddressNoZone PEER3 = new Ipv4AddressNoZone("127.0.0.4");
+    static final Ipv4AddressNoZone PEER4 = new Ipv4AddressNoZone("127.0.0.5");
+    static final Ipv4AddressNoZone PEER5 = new Ipv4AddressNoZone("127.0.0.6");
+    static final Ipv4AddressNoZone PEER6 = new Ipv4AddressNoZone("127.0.0.7");

     static final AsNumber AS_NUMBER = new AsNumber(Uint32.valueOf(AS));
     static final Uint16 PORT = Uint16.valueOf(InetSocketAddressUtil.getRandomPort());
     static final Ipv4Prefix PREFIX1 = new Ipv4Prefix("1.1.1.1/32");
     private static final ClusterIdentifier CLUSTER_ID = new ClusterIdentifier(RIB_ID);
     static final int HOLDTIMER = 2180;
     static final AsNumber AS_NUMBER = new AsNumber(Uint32.valueOf(AS));
     static final Uint16 PORT = Uint16.valueOf(InetSocketAddressUtil.getRandomPort());
     static final Ipv4Prefix PREFIX1 = new Ipv4Prefix("1.1.1.1/32");
     private static final ClusterIdentifier CLUSTER_ID = new ClusterIdentifier(RIB_ID);
     static final int HOLDTIMER = 2180;

-    private static final Ipv4Address NH1 = new Ipv4Address("2.2.2.2");
+    private static final Ipv4AddressNoZone NH1 = new Ipv4AddressNoZone("2.2.2.2");

     static final Update UPD_100 = createSimpleUpdate(PREFIX1, new PathId(Uint32.ONE), CLUSTER_ID, 100);
     static final Update UPD_50 = createSimpleUpdate(PREFIX1, new PathId(Uint32.TWO), CLUSTER_ID, 50);
     static final Update UPD_200 = createSimpleUpdate(PREFIX1, new PathId(Uint32.valueOf(3)), CLUSTER_ID, 200);
     static final Update UPD_100 = createSimpleUpdate(PREFIX1, new PathId(Uint32.ONE), CLUSTER_ID, 100);
     static final Update UPD_50 = createSimpleUpdate(PREFIX1, new PathId(Uint32.TWO), CLUSTER_ID, 50);
     static final Update UPD_200 = createSimpleUpdate(PREFIX1, new PathId(Uint32.valueOf(3)), CLUSTER_ID, 200);


@@ -203,7 +204,7 @@ public abstract class AbstractAddPathTest extends DefaultRibPoliciesMockTest {
     }
 
     void causeBGPError(final BGPSessionImpl session) {
     }
 
     void causeBGPError(final BGPSessionImpl session) {

-        final Open openObj = new OpenBuilder().setBgpIdentifier(new Ipv4Address("1.1.1.1"))
+        final Open openObj = new OpenBuilder().setBgpIdentifier(new Ipv4AddressNoZone("1.1.1.1"))

             .setHoldTimer(Uint16.valueOf(50)).setMyAsNumber(Uint16.valueOf(72)).build();
         waitFutureSuccess(session.writeAndFlush(openObj));
     }
             .setHoldTimer(Uint16.valueOf(50)).setMyAsNumber(Uint16.valueOf(72)).build();
         waitFutureSuccess(session.writeAndFlush(openObj));
     }


@@ -239,12 +240,12 @@ public abstract class AbstractAddPathTest extends DefaultRibPoliciesMockTest {
         });
     }
 
         });
     }
 

-    BGPSessionImpl createPeerSession(final Ipv4Address peer, final BgpParameters bgpParameters,
+    BGPSessionImpl createPeerSession(final Ipv4AddressNoZone peer, final BgpParameters bgpParameters,

         final SimpleSessionListener sessionListener) throws InterruptedException {
         return createPeerSession(peer, bgpParameters, sessionListener, AS_NUMBER);
     }
 
         final SimpleSessionListener sessionListener) throws InterruptedException {
         return createPeerSession(peer, bgpParameters, sessionListener, AS_NUMBER);
     }
 

-    BGPSessionImpl createPeerSession(final Ipv4Address peer, final BgpParameters bgpParameters,
+    BGPSessionImpl createPeerSession(final Ipv4AddressNoZone peer, final BgpParameters bgpParameters,

                                      final SimpleSessionListener sessionListener,
                                      final AsNumber remoteAsNumber) throws InterruptedException {
         final StrictBGPPeerRegistry clientRegistry = new StrictBGPPeerRegistry();
                                      final SimpleSessionListener sessionListener,
                                      final AsNumber remoteAsNumber) throws InterruptedException {
         final StrictBGPPeerRegistry clientRegistry = new StrictBGPPeerRegistry();


@@ -252,14 +253,14 @@ public abstract class AbstractAddPathTest extends DefaultRibPoliciesMockTest {
                 this.worker, clientRegistry);
 
         clientDispatchers.add(clientDispatcher);
                 this.worker, clientRegistry);
 
         clientDispatchers.add(clientDispatcher);

-        clientRegistry.addPeer(new IpAddress(new Ipv4Address(RIB_ID)), sessionListener,
+        clientRegistry.addPeer(new IpAddressNoZone(new Ipv4AddressNoZone(RIB_ID)), sessionListener,

                 new BGPSessionPreferences(remoteAsNumber, HOLDTIMER, new BgpId(peer),
                         AS_NUMBER, Lists.newArrayList(bgpParameters)));
 
         return connectPeer(peer, clientDispatcher);
     }
 
                 new BGPSessionPreferences(remoteAsNumber, HOLDTIMER, new BgpId(peer),
                         AS_NUMBER, Lists.newArrayList(bgpParameters)));
 
         return connectPeer(peer, clientDispatcher);
     }
 

-    static BGPPeer configurePeer(final BGPTableTypeRegistryConsumer tableRegistry, final Ipv4Address peerAddress,
+    static BGPPeer configurePeer(final BGPTableTypeRegistryConsumer tableRegistry, final Ipv4AddressNoZone peerAddress,

             final RIBImpl ribImpl, final BgpParameters bgpParameters, final PeerRole peerRole,
             final BGPPeerRegistry bgpPeerRegistry) {
         return configurePeer(tableRegistry, peerAddress, ribImpl, bgpParameters, peerRole, bgpPeerRegistry,
             final RIBImpl ribImpl, final BgpParameters bgpParameters, final PeerRole peerRole,
             final BGPPeerRegistry bgpPeerRegistry) {
         return configurePeer(tableRegistry, peerAddress, ribImpl, bgpParameters, peerRole, bgpPeerRegistry,


@@ -267,7 +268,7 @@ public abstract class AbstractAddPathTest extends DefaultRibPoliciesMockTest {
     }
 
     static BGPPeer configurePeer(final BGPTableTypeRegistryConsumer tableRegistry,
     }
 
     static BGPPeer configurePeer(final BGPTableTypeRegistryConsumer tableRegistry,

-            final Ipv4Address peerAddress, final RIBImpl ribImpl, final BgpParameters bgpParameters,
+            final Ipv4AddressNoZone peerAddress, final RIBImpl ribImpl, final BgpParameters bgpParameters,

             final PeerRole peerRole, final BGPPeerRegistry bgpPeerRegistry, final Set<TablesKey> afiSafiAdvertised,
             final Set<TablesKey> gracefulAfiSafiAdvertised) {
         final BgpPeer bgpPeer = Mockito.mock(BgpPeer.class);
             final PeerRole peerRole, final BGPPeerRegistry bgpPeerRegistry, final Set<TablesKey> afiSafiAdvertised,
             final Set<TablesKey> gracefulAfiSafiAdvertised) {
         final BgpPeer bgpPeer = Mockito.mock(BgpPeer.class);


@@ -276,14 +277,14 @@ public abstract class AbstractAddPathTest extends DefaultRibPoliciesMockTest {
                 afiSafiAdvertised, gracefulAfiSafiAdvertised, Collections.emptyMap(), bgpPeer);
     }
 
                 afiSafiAdvertised, gracefulAfiSafiAdvertised, Collections.emptyMap(), bgpPeer);
     }
 

-    static BGPPeer configurePeer(final BGPTableTypeRegistryConsumer tableRegistry, final Ipv4Address peerAddress,
+    static BGPPeer configurePeer(final BGPTableTypeRegistryConsumer tableRegistry, final Ipv4AddressNoZone peerAddress,

             final RIBImpl ribImpl, final BgpParameters bgpParameters, final PeerRole peerRole,
             final BGPPeerRegistry bgpPeerRegistry, final Set<TablesKey> afiSafiAdvertised,
             final Set<TablesKey> gracefulAfiSafiAdvertised, final Map<TablesKey, Integer> llGracefulTimersAdvertised,
             final BgpPeer peer) {
             final RIBImpl ribImpl, final BgpParameters bgpParameters, final PeerRole peerRole,
             final BGPPeerRegistry bgpPeerRegistry, final Set<TablesKey> afiSafiAdvertised,
             final Set<TablesKey> gracefulAfiSafiAdvertised, final Map<TablesKey, Integer> llGracefulTimersAdvertised,
             final BgpPeer peer) {

-        final IpAddress ipAddress = new IpAddress(peerAddress);
+        final IpAddressNoZone ipAddress = new IpAddressNoZone(peerAddress);

 
 

-        final BGPPeer bgpPeer = new BGPPeer(tableRegistry, new IpAddress(peerAddress), null, ribImpl, peerRole,
+        final BGPPeer bgpPeer = new BGPPeer(tableRegistry, new IpAddressNoZone(peerAddress), null, ribImpl, peerRole,

                 null, null, null, afiSafiAdvertised, gracefulAfiSafiAdvertised, llGracefulTimersAdvertised, peer);
         final List<BgpParameters> tlvs = Lists.newArrayList(bgpParameters);
         bgpPeerRegistry.addPeer(ipAddress, bgpPeer,
                 null, null, null, afiSafiAdvertised, gracefulAfiSafiAdvertised, llGracefulTimersAdvertised, peer);
         final List<BgpParameters> tlvs = Lists.newArrayList(bgpParameters);
         bgpPeerRegistry.addPeer(ipAddress, bgpPeer,


@@ -316,7 +317,7 @@ public abstract class AbstractAddPathTest extends DefaultRibPoliciesMockTest {
             final TablesKey ipv6Key = new TablesKey(Ipv6AddressFamily.class, UnicastSubsequentAddressFamily.class);
             advertisedTables.add(ipv6Key);
         }
             final TablesKey ipv6Key = new TablesKey(Ipv6AddressFamily.class, UnicastSubsequentAddressFamily.class);
             advertisedTables.add(ipv6Key);
         }

-        final List<TablesKey> addPathTables = new ArrayList();
+        final List<TablesKey> addPathTables = new ArrayList<>();

         if (addPath) {
             addPathTables.add(ipv4Key);
         }
         if (addPath) {
             addPathTables.add(ipv4Key);
         }


@@ -332,7 +333,9 @@ public abstract class AbstractAddPathTest extends DefaultRibPoliciesMockTest {
         attBuilder.setMultiExitDisc(new MultiExitDiscBuilder().setMed(Uint32.ZERO).build());
         if (clusterId != null) {
             attBuilder.setClusterId(new ClusterIdBuilder().setCluster(Collections.singletonList(clusterId)).build());
         attBuilder.setMultiExitDisc(new MultiExitDiscBuilder().setMed(Uint32.ZERO).build());
         if (clusterId != null) {
             attBuilder.setClusterId(new ClusterIdBuilder().setCluster(Collections.singletonList(clusterId)).build());

-            attBuilder.setOriginatorId(new OriginatorIdBuilder().setOriginator(new Ipv4Address(clusterId)).build());
+            attBuilder.setOriginatorId(new OriginatorIdBuilder()
+                .setOriginator(new Ipv4AddressNoZone(clusterId))
+                .build());

         }
         addAttributeAugmentation(attBuilder, prefix, pathId);
         return new UpdateBuilder().setAttributes(attBuilder.build()).build();
         }
         addAttributeAugmentation(attBuilder, prefix, pathId);
         return new UpdateBuilder().setAttributes(attBuilder.build()).build();

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractBGPDispatcherTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractBGPDispatcherTest.java
index e447ea66edcf621317598aeafca14f6fe5cde63d..15a77691a13e714b43b7b3b40c1023d20b57d1f6 100644 (file)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractBGPDispatcherTest.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractBGPDispatcherTest.java
@@ -29,8 +29,9 @@ import org.opendaylight.protocol.bgp.rib.impl.spi.BGPPeerRegistry;
 import org.opendaylight.protocol.bgp.rib.impl.spi.BGPSessionPreferences;
 import org.opendaylight.protocol.util.InetSocketAddressUtil;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 import org.opendaylight.protocol.bgp.rib.impl.spi.BGPSessionPreferences;
 import org.opendaylight.protocol.util.InetSocketAddressUtil;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;

-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.IetfInetUtil;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressNoZone;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.open.message.BgpParameters;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.open.message.BgpParametersBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.open.message.bgp.parameters.OptionalCapabilities;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.open.message.BgpParameters;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.open.message.BgpParametersBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.open.message.bgp.parameters.OptionalCapabilities;


@@ -75,7 +76,8 @@ public class AbstractBGPDispatcherTest {
         this.serverDispatcher = new BGPDispatcherImpl(ctx.getMessageRegistry(), this.boss, this.worker, this.registry);
 
         this.clientAddress = InetSocketAddressUtil.getRandomLoopbackInetSocketAddress();
         this.serverDispatcher = new BGPDispatcherImpl(ctx.getMessageRegistry(), this.boss, this.worker, this.registry);
 
         this.clientAddress = InetSocketAddressUtil.getRandomLoopbackInetSocketAddress();

-        final IpAddress clientPeerIp = new IpAddress(new Ipv4Address(this.clientAddress.getAddress().getHostAddress()));
+        final IpAddressNoZone clientPeerIp = new IpAddressNoZone(new Ipv4AddressNoZone(
+            this.clientAddress.getAddress().getHostAddress()));

         this.registry.addPeer(clientPeerIp, this.clientListener, createPreferences(this.clientAddress));
         this.clientDispatcher = new BGPDispatcherImpl(ctx.getMessageRegistry(), this.boss, this.worker, this.registry);
     }
         this.registry.addPeer(clientPeerIp, this.clientListener, createPreferences(this.clientAddress));
         this.clientDispatcher = new BGPDispatcherImpl(ctx.getMessageRegistry(), this.boss, this.worker, this.registry);
     }


@@ -109,12 +111,12 @@ public class AbstractBGPDispatcherTest {
         capas.add(new OptionalCapabilitiesBuilder()
                 .setCParameters(BgpExtendedMessageUtil.EXTENDED_MESSAGE_CAPABILITY).build());
         tlvs.add(new BgpParametersBuilder().setOptionalCapabilities(capas).build());
         capas.add(new OptionalCapabilitiesBuilder()
                 .setCParameters(BgpExtendedMessageUtil.EXTENDED_MESSAGE_CAPABILITY).build());
         tlvs.add(new BgpParametersBuilder().setOptionalCapabilities(capas).build());

-        final BgpId bgpId = new BgpId(new Ipv4Address(socketAddress.getAddress().getHostAddress()));
+        final BgpId bgpId = new BgpId(IetfInetUtil.INSTANCE.ipv4AddressNoZoneFor(socketAddress.getAddress()));

         return new BGPSessionPreferences(AS_NUMBER, HOLD_TIMER, bgpId, AS_NUMBER, tlvs);
     }
 
     Channel createServer(final InetSocketAddress serverAddress) {
         return new BGPSessionPreferences(AS_NUMBER, HOLD_TIMER, bgpId, AS_NUMBER, tlvs);
     }
 
     Channel createServer(final InetSocketAddress serverAddress) {

-        this.registry.addPeer(new IpAddress(new Ipv4Address(serverAddress.getAddress().getHostAddress())),
+        this.registry.addPeer(new IpAddressNoZone(new Ipv4AddressNoZone(serverAddress.getAddress().getHostAddress())),

                 this.serverListener, createPreferences(serverAddress));
         LoggerFactory.getLogger(AbstractBGPDispatcherTest.class).info("createServer");
         final ChannelFuture future = this.serverDispatcher.createServer(serverAddress);
                 this.serverListener, createPreferences(serverAddress));
         LoggerFactory.getLogger(AbstractBGPDispatcherTest.class).info("createServer");
         final ChannelFuture future = this.serverDispatcher.createServer(serverAddress);

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 fbda246aa9ea918086513229bc3754a9d36a8244..7a297363185e5b60b24944fbaa426a34247ce252 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
@@ -36,7 +36,7 @@ import org.opendaylight.protocol.bgp.rib.spi.state.BGPRibState;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPSessionState;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPTimersState;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPTransportState;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPSessionState;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPTimersState;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPTransportState;

-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.IpAddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.Update;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.open.message.BgpParameters;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.Update;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.open.message.BgpParameters;


@@ -106,7 +106,7 @@ public class AddPathAllPathsTest extends AbstractAddPathTest {
 
         BGPPeerState peer4State = peer4.getPeerState();
         assertNull(peer4State.getGroupId());
 
         BGPPeerState peer4State = peer4.getPeerState();
         assertNull(peer4State.getGroupId());

-        assertEquals(new IpAddress(PEER4), peer4State.getNeighborAddress());
+        assertEquals(new IpAddressNoZone(PEER4), peer4State.getNeighborAddress());

         assertEquals(0L, peer4State.getTotalPathsCount());
         assertEquals(0L, peer4State.getTotalPrefixes());
 
         assertEquals(0L, peer4State.getTotalPathsCount());
         assertEquals(0L, peer4State.getTotalPrefixes());
 


@@ -150,7 +150,7 @@ public class AddPathAllPathsTest extends AbstractAddPathTest {
 
         final BGPPeerState peer1State = peer1.getPeerState();
         assertNull(peer1State.getGroupId());
 
         final BGPPeerState peer1State = peer1.getPeerState();
         assertNull(peer1State.getGroupId());

-        assertEquals(new IpAddress(PEER1), peer1State.getNeighborAddress());
+        assertEquals(new IpAddressNoZone(PEER1), peer1State.getNeighborAddress());

         assertEquals(1L, peer1State.getTotalPathsCount());
         assertEquals(1L, peer1State.getTotalPrefixes());
 
         assertEquals(1L, peer1State.getTotalPathsCount());
         assertEquals(1L, peer1State.getTotalPrefixes());
 


@@ -160,7 +160,7 @@ public class AddPathAllPathsTest extends AbstractAddPathTest {
 
         final BGPTransportState transportStatePeer1 = peer1State.getBGPTransportState();
         assertEquals(new PortNumber(PORT), transportStatePeer1.getLocalPort());
 
         final BGPTransportState transportStatePeer1 = peer1State.getBGPTransportState();
         assertEquals(new PortNumber(PORT), transportStatePeer1.getLocalPort());

-        assertEquals(new IpAddress(PEER1), transportStatePeer1.getRemoteAddress());
+        assertEquals(new IpAddressNoZone(PEER1), transportStatePeer1.getRemoteAddress());

 
         assertEquals(State.UP, peer1State.getBGPSessionState().getSessionState());
         checkEquals(() -> assertEquals(1L, peer1State.getBGPPeerMessagesState().getUpdateMessagesReceivedCount()));
 
         assertEquals(State.UP, peer1State.getBGPSessionState().getSessionState());
         checkEquals(() -> assertEquals(1L, peer1State.getBGPPeerMessagesState().getUpdateMessagesReceivedCount()));


@@ -223,7 +223,7 @@ public class AddPathAllPathsTest extends AbstractAddPathTest {
 
         peer4State = peer4.getPeerState();
         assertNull(peer4State.getGroupId());
 
         peer4State = peer4.getPeerState();
         assertNull(peer4State.getGroupId());

-        assertEquals(new IpAddress(PEER4), peer4State.getNeighborAddress());
+        assertEquals(new IpAddressNoZone(PEER4), peer4State.getNeighborAddress());

         assertEquals(0L, peer4State.getTotalPathsCount());
         assertEquals(0L, peer4State.getTotalPrefixes());
 
         assertEquals(0L, peer4State.getTotalPathsCount());
         assertEquals(0L, peer4State.getTotalPrefixes());
 


@@ -233,7 +233,7 @@ public class AddPathAllPathsTest extends AbstractAddPathTest {
 
         final BGPTransportState transportState = peer4State.getBGPTransportState();
         assertEquals(new PortNumber(PORT), transportState.getLocalPort());
 
         final BGPTransportState transportState = peer4State.getBGPTransportState();
         assertEquals(new PortNumber(PORT), transportState.getLocalPort());

-        assertEquals(new IpAddress(PEER4), transportState.getRemoteAddress());
+        assertEquals(new IpAddressNoZone(PEER4), transportState.getRemoteAddress());

 
         final BGPPeerMessagesState peerMessagesState = peer4State.getBGPPeerMessagesState();
         assertEquals(0L, peerMessagesState.getNotificationMessagesReceivedCount());
 
         final BGPPeerMessagesState peerMessagesState = peer4State.getBGPPeerMessagesState();
         assertEquals(0L, peerMessagesState.getNotificationMessagesReceivedCount());

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionImplTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionImplTest.java
index 56b13a369040be7cef815971f6c49aca32519e6f..fd9a94d12e94b702e39c656c6ee797d8e7a300b1 100644 (file)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionImplTest.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionImplTest.java
@@ -49,7 +49,7 @@ import org.opendaylight.protocol.bgp.rib.spi.BGPSessionListener;
 import org.opendaylight.protocol.bgp.rib.spi.BGPTerminationReason;
 import org.opendaylight.protocol.bgp.rib.spi.State;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 import org.opendaylight.protocol.bgp.rib.spi.BGPTerminationReason;
 import org.opendaylight.protocol.bgp.rib.spi.State;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;

-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.opendaylight.params.xml.ns.yang.bgp.message.rev180329.Notify;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.NotifyBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.Open;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.Notify;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.NotifyBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.Open;


@@ -78,7 +78,7 @@ import org.opendaylight.yangtools.yang.common.Uint8;
 public class BGPSessionImplTest {
     private static final Uint16 HOLD_TIMER = Uint16.valueOf(3);
     private static final AsNumber AS_NUMBER = new AsNumber(Uint32.valueOf(30));
 public class BGPSessionImplTest {
     private static final Uint16 HOLD_TIMER = Uint16.valueOf(3);
     private static final AsNumber AS_NUMBER = new AsNumber(Uint32.valueOf(30));

-    private static final Ipv4Address BGP_ID = new Ipv4Address("1.1.1.2");
+    private static final Ipv4AddressNoZone BGP_ID = new Ipv4AddressNoZone("1.1.1.2");

     private static final String LOCAL_IP = "1.1.1.4";
     private static final int LOCAL_PORT = 12345;
 
     private static final String LOCAL_IP = "1.1.1.4";
     private static final int LOCAL_PORT = 12345;
 

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/DefaultRibPoliciesMockTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/DefaultRibPoliciesMockTest.java
index 92787b49ff79c95cda32e8cdc51544979bf8b9f8..8a08bb5e2fd3f11287199a1984cd76e4d633e43c 100644 (file)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/DefaultRibPoliciesMockTest.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/DefaultRibPoliciesMockTest.java
@@ -22,15 +22,15 @@ import org.opendaylight.protocol.bgp.rib.spi.policy.BGPRibRoutingPolicy;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.types.rev151009.IPV4UNICAST;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.routing.policy.rev151009.DefaultPolicyType;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.routing.policy.rev151009.apply.policy.group.apply.policy.Config;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.types.rev151009.IPV4UNICAST;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.routing.policy.rev151009.DefaultPolicyType;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.routing.policy.rev151009.apply.policy.group.apply.policy.Config;

-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.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.rib.TablesKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.BgpId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.ClusterIdentifier;
 
 public class DefaultRibPoliciesMockTest extends AbstractStatementRegistryConsumerTest {
     protected static final long AS = 64496;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.rib.TablesKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.BgpId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.ClusterIdentifier;
 
 public class DefaultRibPoliciesMockTest extends AbstractStatementRegistryConsumerTest {
     protected static final long AS = 64496;

-    private final Ipv4Address bgpID = new BgpId(new Ipv4Address("127.0.0.1"));
-    private final ClusterIdentifier ci = new ClusterIdentifier(new Ipv4Address("127.0.0.1"));
+    private final BgpId bgpID = new BgpId(new Ipv4AddressNoZone("127.0.0.1"));
+    private final ClusterIdentifier ci = new ClusterIdentifier(new Ipv4AddressNoZone("127.0.0.1"));

     protected BGPRibRoutingPolicy policies;
     protected BGPRibRoutingPolicyFactory policyProvider;
     @Mock
     protected BGPRibRoutingPolicy policies;
     protected BGPRibRoutingPolicyFactory policyProvider;
     @Mock

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/FSMTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/FSMTest.java
index d67c38a5b00e56741d098880e0fd35c0934a83a5..47d9a248e36d8c64b6712a661f8f629d8acffa2a 100644 (file)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/FSMTest.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/FSMTest.java
@@ -40,8 +40,8 @@ import org.opendaylight.protocol.bgp.parser.BgpTableTypeImpl;
 import org.opendaylight.protocol.bgp.rib.impl.spi.BGPPeerRegistry;
 import org.opendaylight.protocol.bgp.rib.impl.spi.BGPSessionPreferences;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 import org.opendaylight.protocol.bgp.rib.impl.spi.BGPPeerRegistry;
 import org.opendaylight.protocol.bgp.rib.impl.spi.BGPSessionPreferences;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;

-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.IpAddressNoZone;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.LinkstateAddressFamily;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.LinkstateSubsequentAddressFamily;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.Keepalive;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.LinkstateAddressFamily;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.LinkstateSubsequentAddressFamily;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.Keepalive;


@@ -150,7 +150,7 @@ public class FSMTest {
         doReturn(mock(ChannelFuture.class)).when(this.speakerListener).close();
 
         final BGPPeerRegistry peerRegistry = new StrictBGPPeerRegistry();
         doReturn(mock(ChannelFuture.class)).when(this.speakerListener).close();
 
         final BGPPeerRegistry peerRegistry = new StrictBGPPeerRegistry();

-        peerRegistry.addPeer(new IpAddress(new Ipv4Address(peerAddress.getHostAddress())),
+        peerRegistry.addPeer(new IpAddressNoZone(new Ipv4AddressNoZone(peerAddress.getHostAddress())),

                 new SimpleSessionListener(), prefs);
 
         this.clientSession = new BGPClientSessionNegotiator(new DefaultPromise<>(GlobalEventExecutor.INSTANCE),
                 new SimpleSessionListener(), prefs);
 
         this.clientSession = new BGPClientSessionNegotiator(new DefaultPromise<>(GlobalEventExecutor.INSTANCE),


@@ -161,7 +161,7 @@ public class FSMTest {
                 .setHoldTimer(Uint16.valueOf(3))
                 .setVersion(new ProtocolVersion(Uint8.valueOf(4)))
                 .setBgpParameters(tlvs)
                 .setHoldTimer(Uint16.valueOf(3))
                 .setVersion(new ProtocolVersion(Uint8.valueOf(4)))
                 .setBgpParameters(tlvs)

-                .setBgpIdentifier(new Ipv4Address("1.1.1.2"))
+                .setBgpIdentifier(new Ipv4AddressNoZone("1.1.1.2"))

                 .build();
     }
 
                 .build();
     }
 


@@ -194,7 +194,7 @@ public class FSMTest {
         this.clientSession.handleMessage(new OpenBuilder()
             .setMyAsNumber(Uint16.valueOf(30))
             .setHoldTimer(Uint16.ONE)
         this.clientSession.handleMessage(new OpenBuilder()
             .setMyAsNumber(Uint16.valueOf(30))
             .setHoldTimer(Uint16.ONE)

-            .setBgpIdentifier(new Ipv4Address("127.0.0.1"))
+            .setBgpIdentifier(new Ipv4AddressNoZone("127.0.0.1"))

             .setVersion(new ProtocolVersion(Uint8.valueOf(4)))
             .build());
         assertEquals(2, this.receivedMsgs.size());
             .setVersion(new ProtocolVersion(Uint8.valueOf(4)))
             .build());
         assertEquals(2, this.receivedMsgs.size());


@@ -226,7 +226,7 @@ public class FSMTest {
             .setHoldTimer(Uint16.ONE)
             .setVersion(new ProtocolVersion(Uint8.valueOf(4)))
             .setBgpParameters(tlvs)
             .setHoldTimer(Uint16.ONE)
             .setVersion(new ProtocolVersion(Uint8.valueOf(4)))
             .setBgpParameters(tlvs)

-            .setBgpIdentifier(new Ipv4Address("1.1.1.2"))
+            .setBgpIdentifier(new Ipv4AddressNoZone("1.1.1.2"))

             .build());
         assertEquals(2, this.receivedMsgs.size());
         assertTrue(this.receivedMsgs.get(1) instanceof Notify);
             .build());
         assertEquals(2, this.receivedMsgs.size());
         assertTrue(this.receivedMsgs.get(1) instanceof Notify);


@@ -267,7 +267,7 @@ public class FSMTest {
             .setHoldTimer(Uint16.ONE)
             .setVersion(new ProtocolVersion(Uint8.valueOf(4)))
             .setBgpParameters(tlvs)
             .setHoldTimer(Uint16.ONE)
             .setVersion(new ProtocolVersion(Uint8.valueOf(4)))
             .setBgpParameters(tlvs)

-            .setBgpIdentifier(new Ipv4Address("1.1.1.2"))
+            .setBgpIdentifier(new Ipv4AddressNoZone("1.1.1.2"))

             .build());
         assertEquals(2, this.receivedMsgs.size());
         assertTrue(this.receivedMsgs.get(1) instanceof Keepalive);
             .build());
         assertEquals(2, this.receivedMsgs.size());
         assertTrue(this.receivedMsgs.get(1) instanceof Keepalive);


@@ -298,7 +298,7 @@ public class FSMTest {
         assertTrue(this.receivedMsgs.get(0) instanceof Open);
 
         this.clientSession.handleMessage(new OpenBuilder(this.classicOpen)
         assertTrue(this.receivedMsgs.get(0) instanceof Open);
 
         this.clientSession.handleMessage(new OpenBuilder(this.classicOpen)

-                .setBgpIdentifier(new Ipv4Address("1.1.1.1")).build());
+                .setBgpIdentifier(new Ipv4AddressNoZone("1.1.1.1")).build());

         assertEquals(2, this.receivedMsgs.size());
         assertTrue(this.receivedMsgs.get(1) instanceof Notify);
         final Notification m = this.receivedMsgs.get(this.receivedMsgs.size() - 1);
         assertEquals(2, this.receivedMsgs.size());
         assertTrue(this.receivedMsgs.get(1) instanceof Notify);
         final Notification m = this.receivedMsgs.get(this.receivedMsgs.size() - 1);

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/GracefulRestartTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/GracefulRestartTest.java
index f2f5b7005b6b1107d123ff7e821dc80329c12731..c935eae1bd3729fd8816617fe4613e79208fc282 100644 (file)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/GracefulRestartTest.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/GracefulRestartTest.java
@@ -39,11 +39,11 @@ import org.opendaylight.protocol.bgp.mode.api.PathSelectionMode;
 import org.opendaylight.protocol.bgp.mode.impl.add.all.paths.AllPathSelection;
 import org.opendaylight.protocol.bgp.parser.BgpTableTypeImpl;
 import org.opendaylight.protocol.bgp.rib.impl.config.BgpPeer;
 import org.opendaylight.protocol.bgp.mode.impl.add.all.paths.AllPathSelection;
 import org.opendaylight.protocol.bgp.parser.BgpTableTypeImpl;
 import org.opendaylight.protocol.bgp.rib.impl.config.BgpPeer;

-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.IpAddressNoZone;

 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.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.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.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.bgp.rib.rib.loc.rib.tables.routes.Ipv4RoutesCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.bgp.rib.rib.loc.rib.tables.routes.Ipv6RoutesCase;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.bgp.rib.rib.loc.rib.tables.routes.Ipv4RoutesCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.bgp.rib.rib.loc.rib.tables.routes.Ipv6RoutesCase;


@@ -85,7 +85,7 @@ public class GracefulRestartTest extends AbstractAddPathTest {
     private static final RibId RIBID = new RibId("test-rib");
     private static final Ipv4Prefix PREFIX2 = new Ipv4Prefix("2.2.2.2/32");
     private static final Ipv6Prefix PREFIX3 = new Ipv6Prefix("dead:beef::/64");
     private static final RibId RIBID = new RibId("test-rib");
     private static final Ipv4Prefix PREFIX2 = new Ipv4Prefix("2.2.2.2/32");
     private static final Ipv6Prefix PREFIX3 = new Ipv6Prefix("dead:beef::/64");

-    private static final Ipv6Address IPV6_NEXT_HOP = new Ipv6Address("dead:beef::1");
+    private static final Ipv6AddressNoZone IPV6_NEXT_HOP = new Ipv6AddressNoZone("dead:beef::1");

     private static final TablesKey IPV6_TABLES_KEY = new TablesKey(Ipv6AddressFamily.class,
             UnicastSubsequentAddressFamily.class);
 
     private static final TablesKey IPV6_TABLES_KEY = new TablesKey(Ipv6AddressFamily.class,
             UnicastSubsequentAddressFamily.class);
 


@@ -390,8 +390,8 @@ public class GracefulRestartTest extends AbstractAddPathTest {
         insertRoutes(ipv4prefixes, PEER1, ipv6prefixes, IPV6_NEXT_HOP, this.session, BgpOrigin.Igp);
     }
 
         insertRoutes(ipv4prefixes, PEER1, ipv6prefixes, IPV6_NEXT_HOP, this.session, BgpOrigin.Igp);
     }
 

-    private static void insertRoutes(final List<Ipv4Prefix> ipv4prefixes, final Ipv4Address ipv4NeighborAddress,
-                              final List<Ipv6Prefix> ipv6prefixes, final Ipv6Address ipv6NeighborAddress,
+    private static void insertRoutes(final List<Ipv4Prefix> ipv4prefixes, final Ipv4AddressNoZone ipv4NeighborAddress,
+                              final List<Ipv6Prefix> ipv6prefixes, final Ipv6AddressNoZone ipv6NeighborAddress,

                               final BGPSessionImpl session, final BgpOrigin peerRole) {
         if (ipv4prefixes == null && ipv6prefixes == null) {
             waitFutureSuccess(session.writeAndFlush(BgpPeerUtil.createEndOfRib(TABLES_KEY)));
                               final BGPSessionImpl session, final BgpOrigin peerRole) {
         if (ipv4prefixes == null && ipv6prefixes == null) {
             waitFutureSuccess(session.writeAndFlush(BgpPeerUtil.createEndOfRib(TABLES_KEY)));


@@ -400,7 +400,7 @@ public class GracefulRestartTest extends AbstractAddPathTest {
         }
 
         if (ipv4prefixes != null && !ipv4prefixes.isEmpty()) {
         }
 
         if (ipv4prefixes != null && !ipv4prefixes.isEmpty()) {

-            final MpReachNlri reachIpv4 = PeerUtil.createMpReachNlri(new IpAddress(ipv4NeighborAddress),
+            final MpReachNlri reachIpv4 = PeerUtil.createMpReachNlri(new IpAddressNoZone(ipv4NeighborAddress),

                     ipv4prefixes.stream()
                             .map(IpPrefix::new)
                             .collect(Collectors.toList()));
                     ipv4prefixes.stream()
                             .map(IpPrefix::new)
                             .collect(Collectors.toList()));


@@ -409,7 +409,7 @@ public class GracefulRestartTest extends AbstractAddPathTest {
         }
 
         if (ipv6prefixes != null && !ipv4prefixes.isEmpty()) {
         }
 
         if (ipv6prefixes != null && !ipv4prefixes.isEmpty()) {

-            final MpReachNlri reachIpv6 = PeerUtil.createMpReachNlri(new IpAddress(ipv6NeighborAddress),
+            final MpReachNlri reachIpv6 = PeerUtil.createMpReachNlri(new IpAddressNoZone(ipv6NeighborAddress),

                     ipv6prefixes.stream()
                             .map(IpPrefix::new)
                             .collect(Collectors.toList()));
                     ipv6prefixes.stream()
                             .map(IpPrefix::new)
                             .collect(Collectors.toList()));

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/ParserToSalTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/ParserToSalTest.java
index b3708bbf1a02fef9ecaadcd10f0f7c6e123d72b7..655e7699de1367201d21321f44bb4ccee83ca4c5 100755 (executable)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/ParserToSalTest.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/ParserToSalTest.java
@@ -44,8 +44,8 @@ import org.opendaylight.protocol.bgp.rib.spi.RIBExtensionProviderContext;
 import org.opendaylight.protocol.bgp.rib.spi.SimpleRIBExtensionProviderContext;
 import org.opendaylight.protocol.bgp.util.HexDumpBGPFileParser;
 import org.opendaylight.protocol.concepts.KeyMapping;
 import org.opendaylight.protocol.bgp.rib.spi.SimpleRIBExtensionProviderContext;
 import org.opendaylight.protocol.bgp.util.HexDumpBGPFileParser;
 import org.opendaylight.protocol.concepts.KeyMapping;

-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.IpAddressNoZone;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.LinkstateAddressFamily;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.LinkstateSubsequentAddressFamily;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.BgpTableType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.LinkstateAddressFamily;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.LinkstateSubsequentAddressFamily;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.BgpTableType;


@@ -66,7 +66,7 @@ public class ParserToSalTest extends DefaultRibPoliciesMockTest {
     private static final TablesKey TABLE_KEY
             = new TablesKey(LinkstateAddressFamily.class, LinkstateSubsequentAddressFamily.class);
     private static final InstanceIdentifier<BgpRib> BGP_IID = InstanceIdentifier.create(BgpRib.class);
     private static final TablesKey TABLE_KEY
             = new TablesKey(LinkstateAddressFamily.class, LinkstateSubsequentAddressFamily.class);
     private static final InstanceIdentifier<BgpRib> BGP_IID = InstanceIdentifier.create(BgpRib.class);

-    private final IpAddress localAddress = new IpAddress(new Ipv4Address("127.0.0.1"));
+    private final IpAddressNoZone localAddress = new IpAddressNoZone(new Ipv4AddressNoZone("127.0.0.1"));

     private BGPMock mock;
     private AbstractRIBExtensionProviderActivator baseact;
     private AbstractRIBExtensionProviderActivator lsact;
     private BGPMock mock;
     private AbstractRIBExtensionProviderActivator baseact;
     private AbstractRIBExtensionProviderActivator lsact;


@@ -120,8 +120,8 @@ public class ParserToSalTest extends DefaultRibPoliciesMockTest {
         rib.instantiateServiceInstance();
         assertTablesExists(tables);
         rib.onGlobalContextUpdated(this.schemaService.getGlobalContext());
         rib.instantiateServiceInstance();
         assertTablesExists(tables);
         rib.onGlobalContextUpdated(this.schemaService.getGlobalContext());

-        final BGPPeer peer = AbstractAddPathTest.configurePeer(this.tableRegistry, this.localAddress.getIpv4Address(),
-                rib, null, PeerRole.Ibgp, new StrictBGPPeerRegistry());
+        final BGPPeer peer = AbstractAddPathTest.configurePeer(this.tableRegistry,
+            this.localAddress.getIpv4AddressNoZone(), rib, null, PeerRole.Ibgp, new StrictBGPPeerRegistry());

         peer.instantiateServiceInstance();
         final ListenerRegistration<?> reg = this.mock.registerUpdateListener(peer);
         reg.close();
         peer.instantiateServiceInstance();
         final ListenerRegistration<?> reg = this.mock.registerUpdateListener(peer);
         reg.close();


@@ -138,8 +138,8 @@ public class ParserToSalTest extends DefaultRibPoliciesMockTest {
         rib.instantiateServiceInstance();
         rib.onGlobalContextUpdated(this.schemaService.getGlobalContext());
         assertTablesExists(tables);
         rib.instantiateServiceInstance();
         rib.onGlobalContextUpdated(this.schemaService.getGlobalContext());
         assertTablesExists(tables);

-        final BGPPeer peer = AbstractAddPathTest.configurePeer(this.tableRegistry, this.localAddress.getIpv4Address(),
-                rib, null, PeerRole.Ibgp, new StrictBGPPeerRegistry());
+        final BGPPeer peer = AbstractAddPathTest.configurePeer(this.tableRegistry,
+            this.localAddress.getIpv4AddressNoZone(), rib, null, PeerRole.Ibgp, new StrictBGPPeerRegistry());

         peer.instantiateServiceInstance();
         final ListenerRegistration<?> reg = this.mock.registerUpdateListener(peer);
         reg.close();
         peer.instantiateServiceInstance();
         final ListenerRegistration<?> reg = this.mock.registerUpdateListener(peer);
         reg.close();

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/PeerTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/PeerTest.java
index 750e22c6f69458c6de0a505d4bbdf882ebac4284..10590766346203f22e70d9ca3f36423e6a56d2f7 100644 (file)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/PeerTest.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/PeerTest.java
@@ -37,8 +37,8 @@ import org.opendaylight.protocol.bgp.parser.BGPDocumentedException;
 import org.opendaylight.protocol.bgp.parser.BGPError;
 import org.opendaylight.protocol.bgp.parser.impl.message.update.LocalPreferenceAttributeParser;
 import org.opendaylight.protocol.bgp.rib.spi.RibSupportUtils;
 import org.opendaylight.protocol.bgp.parser.BGPError;
 import org.opendaylight.protocol.bgp.parser.impl.message.update.LocalPreferenceAttributeParser;
 import org.opendaylight.protocol.bgp.rib.spi.RibSupportUtils;

-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.IpAddressNoZone;
+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.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv4.routes.ipv4.routes.Ipv4Route;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.KeepaliveBuilder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv4.routes.ipv4.routes.Ipv4Route;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.KeepaliveBuilder;


@@ -87,7 +87,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.ModificationType;
 
 public class PeerTest extends AbstractRIBTestSetup {
 
 
 public class PeerTest extends AbstractRIBTestSetup {
 

-    private final IpAddress neighborAddress = new IpAddress(new Ipv4Address("127.0.0.1"));
+    private final IpAddressNoZone neighborAddress = new IpAddressNoZone(new Ipv4AddressNoZone("127.0.0.1"));

     private ApplicationPeer peer;
     private BGPSessionImpl session;
     private Map<YangInstanceIdentifier, NormalizedNode<?, ?>> routes;
     private ApplicationPeer peer;
     private BGPSessionImpl session;
     private Map<YangInstanceIdentifier, NormalizedNode<?, ?>> routes;


@@ -125,8 +125,8 @@ public class PeerTest extends AbstractRIBTestSetup {
         final Ipv4Prefix second = new Ipv4Prefix("127.0.0.1/32");
         final Ipv4Prefix third = new Ipv4Prefix("127.0.0.3/32");
         this.peer = new ApplicationPeer(this.tableRegistry,
         final Ipv4Prefix second = new Ipv4Prefix("127.0.0.1/32");
         final Ipv4Prefix third = new Ipv4Prefix("127.0.0.3/32");
         this.peer = new ApplicationPeer(this.tableRegistry,

-                new ApplicationRibId(this.neighborAddress.getIpv4Address().getValue()),
-                this.neighborAddress.getIpv4Address(), getRib());
+                new ApplicationRibId(this.neighborAddress.getIpv4AddressNoZone().getValue()),
+                this.neighborAddress.getIpv4AddressNoZone(), getRib());

         this.peer.instantiateServiceInstance(null, null);
         final YangInstanceIdentifier base = getRib().getYangRibId().node(LocRib.QNAME)
                 .node(Tables.QNAME).node(RibSupportUtils.toYangTablesKey(KEY));
         this.peer.instantiateServiceInstance(null, null);
         final YangInstanceIdentifier base = getRib().getYangRibId().node(LocRib.QNAME)
                 .node(Tables.QNAME).node(RibSupportUtils.toYangTablesKey(KEY));


@@ -139,11 +139,11 @@ public class PeerTest extends AbstractRIBTestSetup {
 
     @Test
     public void testClassicPeer() throws Exception {
 
     @Test
     public void testClassicPeer() throws Exception {

-        this.classic = AbstractAddPathTest.configurePeer(this.tableRegistry, this.neighborAddress.getIpv4Address(),
-                getRib(), null, PeerRole.Ibgp, new StrictBGPPeerRegistry());
+        this.classic = AbstractAddPathTest.configurePeer(this.tableRegistry,
+            this.neighborAddress.getIpv4AddressNoZone(), getRib(), null, PeerRole.Ibgp, new StrictBGPPeerRegistry());

         this.classic.instantiateServiceInstance();
         this.mockSession();
         this.classic.instantiateServiceInstance();
         this.mockSession();

-        assertEquals(this.neighborAddress.getIpv4Address().getValue(), this.classic.getName());
+        assertEquals(this.neighborAddress.getIpv4AddressNoZone().getValue(), this.classic.getName());

         this.classic.onSessionUp(this.session);
         Assert.assertArrayEquals(new byte[]{1, 1, 1, 1}, this.classic.getRawIdentifier());
         assertEquals("BGPPeer{name=127.0.0.1, tables=[TablesKey{_afi=interface org.opendaylight.yang.gen.v1"
         this.classic.onSessionUp(this.session);
         Assert.assertArrayEquals(new byte[]{1, 1, 1, 1}, this.classic.getRawIdentifier());
         assertEquals("BGPPeer{name=127.0.0.1, tables=[TablesKey{_afi=interface org.opendaylight.yang.gen.v1"


@@ -161,7 +161,7 @@ public class PeerTest extends AbstractRIBTestSetup {
         final Origin origin = new OriginBuilder().setValue(BgpOrigin.Igp).build();
         final AsPath asPath = new AsPathBuilder().setSegments(Collections.emptyList()).build();
         final CNextHop nextHop = new Ipv4NextHopCaseBuilder().setIpv4NextHop(new Ipv4NextHopBuilder()
         final Origin origin = new OriginBuilder().setValue(BgpOrigin.Igp).build();
         final AsPath asPath = new AsPathBuilder().setSegments(Collections.emptyList()).build();
         final CNextHop nextHop = new Ipv4NextHopCaseBuilder().setIpv4NextHop(new Ipv4NextHopBuilder()

-                .setGlobal(new Ipv4Address("127.0.0.1")).build()).build();
+                .setGlobal(new Ipv4AddressNoZone("127.0.0.1")).build()).build();

         final AttributesBuilder ab = new AttributesBuilder();
         ub.setAttributes(ab.setOrigin(origin).setAsPath(asPath).setCNextHop(nextHop).build());
         try {
         final AttributesBuilder ab = new AttributesBuilder();
         ub.setAttributes(ab.setOrigin(origin).setAsPath(asPath).setCNextHop(nextHop).build());
         try {


@@ -182,7 +182,7 @@ public class PeerTest extends AbstractRIBTestSetup {
 
         //create new peer so that it gets advertized routes from RIB
         final BGPPeer testingPeer = AbstractAddPathTest.configurePeer(this.tableRegistry,
 
         //create new peer so that it gets advertized routes from RIB
         final BGPPeer testingPeer = AbstractAddPathTest.configurePeer(this.tableRegistry,

-            this.neighborAddress.getIpv4Address(), getRib(), null, PeerRole.Ibgp, new StrictBGPPeerRegistry());
+            this.neighborAddress.getIpv4AddressNoZone(), getRib(), null, PeerRole.Ibgp, new StrictBGPPeerRegistry());

         testingPeer.instantiateServiceInstance();
         testingPeer.onSessionUp(this.session);
         assertEquals(3, this.routes.size());
         testingPeer.instantiateServiceInstance();
         testingPeer.onSessionUp(this.session);
         assertEquals(3, this.routes.size());


@@ -238,7 +238,7 @@ public class PeerTest extends AbstractRIBTestSetup {
                                                 .setSafi(UnicastSubsequentAddressFamily.class)
                                                 .build()).build()).build()).build())).build());
         final Open openObj = new OpenBuilder()
                                                 .setSafi(UnicastSubsequentAddressFamily.class)
                                                 .build()).build()).build()).build())).build());
         final Open openObj = new OpenBuilder()

-                .setBgpIdentifier(new Ipv4Address("1.1.1.1"))
+                .setBgpIdentifier(new Ipv4AddressNoZone("1.1.1.1"))

                 .setHoldTimer(Uint16.valueOf(50))
                 .setMyAsNumber(Uint16.valueOf(72))
                 .setBgpParameters(params).build();
                 .setHoldTimer(Uint16.valueOf(50))
                 .setMyAsNumber(Uint16.valueOf(72))
                 .setBgpParameters(params).build();

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/PeerUtil.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/PeerUtil.java
index 567c2666e0d314b519b9c0c398c927ee2ad78a68..3c63b9745117bcf5dc42903a2466d5229c0a7252 100644 (file)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/PeerUtil.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/PeerUtil.java
@@ -12,7 +12,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 import org.opendaylight.protocol.bgp.parser.spi.PathIdUtil;
 import java.util.Map;
 import java.util.stream.Collectors;
 import org.opendaylight.protocol.bgp.parser.spi.PathIdUtil;

-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.IpAddressNoZone;

 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.Ipv4Prefix;
 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.IpPrefix;
 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.Ipv6Prefix;


@@ -74,14 +74,14 @@ final class PeerUtil {
         // Hidden on purpose
     }
 
         // Hidden on purpose
     }
 

-    static MpReachNlri createMpReachNlri(final IpAddress nextHop, final List<IpPrefix> prefixes) {
+    static MpReachNlri createMpReachNlri(final IpAddressNoZone nextHop, final List<IpPrefix> prefixes) {

         final Class<? extends AddressFamily> afi;
         final CNextHop cNextHop;
         final DestinationType destinationType;
         final Class<? extends AddressFamily> afi;
         final CNextHop cNextHop;
         final DestinationType destinationType;

-        if (nextHop.getIpv4Address() != null) {
+        if (nextHop.getIpv4AddressNoZone() != null) {

             afi = Ipv4AddressFamily.class;
             cNextHop = new Ipv4NextHopCaseBuilder().setIpv4NextHop(new Ipv4NextHopBuilder()
             afi = Ipv4AddressFamily.class;
             cNextHop = new Ipv4NextHopCaseBuilder().setIpv4NextHop(new Ipv4NextHopBuilder()

-                    .setGlobal(nextHop.getIpv4Address())
+                    .setGlobal(nextHop.getIpv4AddressNoZone())

                     .build()).build();
             destinationType = new DestinationIpv4CaseBuilder().setDestinationIpv4(
                     new DestinationIpv4Builder().setIpv4Prefixes(prefixes.stream()
                     .build()).build();
             destinationType = new DestinationIpv4CaseBuilder().setDestinationIpv4(
                     new DestinationIpv4Builder().setIpv4Prefixes(prefixes.stream()


@@ -93,7 +93,7 @@ final class PeerUtil {
         } else {
             afi = Ipv6AddressFamily.class;
             cNextHop = new Ipv6NextHopCaseBuilder().setIpv6NextHop(new Ipv6NextHopBuilder()
         } else {
             afi = Ipv6AddressFamily.class;
             cNextHop = new Ipv6NextHopCaseBuilder().setIpv6NextHop(new Ipv6NextHopBuilder()

-                    .setGlobal(nextHop.getIpv6Address())
+                    .setGlobal(nextHop.getIpv6AddressNoZone())

                     .build()).build();
             destinationType = new DestinationIpv6CaseBuilder().setDestinationIpv6(
                     new DestinationIpv6Builder().setIpv6Prefixes(prefixes.stream()
                     .build()).build();
             destinationType = new DestinationIpv6CaseBuilder().setDestinationIpv6(
                     new DestinationIpv6Builder().setIpv6Prefixes(prefixes.stream()

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistryTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistryTest.java
index 71e471421f774404cac27ee7efc6878ce5d4c85d..5457a9b6b6fe4c14938778addb11345466102599 100644 (file)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistryTest.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistryTest.java
@@ -25,8 +25,8 @@ import org.opendaylight.protocol.bgp.rib.impl.spi.BGPSessionPreferences;
 import org.opendaylight.protocol.bgp.rib.impl.spi.PeerRegistrySessionListener;
 import org.opendaylight.protocol.bgp.rib.spi.BGPSessionListener;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 import org.opendaylight.protocol.bgp.rib.impl.spi.PeerRegistrySessionListener;
 import org.opendaylight.protocol.bgp.rib.spi.BGPSessionListener;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;

-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.IpAddressNoZone;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.Open;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.OpenBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.open.message.BgpParameters;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.Open;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.OpenBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.open.message.BgpParameters;


@@ -42,16 +42,16 @@ public class StrictBGPPeerRegistryTest {
 
     private static final AsNumber LOCAL_AS = new AsNumber(Uint32.valueOf(1234));
     private static final AsNumber REMOTE_AS = new AsNumber(Uint32.valueOf(1235));
 
     private static final AsNumber LOCAL_AS = new AsNumber(Uint32.valueOf(1234));
     private static final AsNumber REMOTE_AS = new AsNumber(Uint32.valueOf(1235));

-    private static final Ipv4Address FROM = new Ipv4Address("0.0.0.1");
-    private static final IpAddress REMOTE_IP = new IpAddress(FROM);
-    private static final Ipv4Address TO = new Ipv4Address("255.255.255.255");
+    private static final Ipv4AddressNoZone FROM = new Ipv4AddressNoZone("0.0.0.1");
+    private static final IpAddressNoZone REMOTE_IP = new IpAddressNoZone(FROM);
+    private static final Ipv4AddressNoZone TO = new Ipv4AddressNoZone("255.255.255.255");

 
     private final BGPSessionListener peer1 = getMockSession();
     private final Open classicOpen = createOpen(TO, LOCAL_AS);
     private StrictBGPPeerRegistry peerRegistry;
     private BGPSessionPreferences mockPreferences;
 
 
     private final BGPSessionListener peer1 = getMockSession();
     private final Open classicOpen = createOpen(TO, LOCAL_AS);
     private StrictBGPPeerRegistry peerRegistry;
     private BGPSessionPreferences mockPreferences;
 

-    private static Open createOpen(final Ipv4Address bgpId, final AsNumber as) {
+    private static Open createOpen(final Ipv4AddressNoZone bgpId, final AsNumber as) {

         final List<BgpParameters> params = Lists.newArrayList(new BgpParametersBuilder()
             .setOptionalCapabilities(Lists.newArrayList(new OptionalCapabilitiesBuilder()
                 .setCParameters(new CParametersBuilder()
         final List<BgpParameters> params = Lists.newArrayList(new BgpParametersBuilder()
             .setOptionalCapabilities(Lists.newArrayList(new OptionalCapabilitiesBuilder()
                 .setCParameters(new CParametersBuilder()


@@ -75,16 +75,16 @@ public class StrictBGPPeerRegistryTest {
 
     private static PeerRegistrySessionListener getMockSessionListener() {
         final PeerRegistrySessionListener mock = Mockito.mock(PeerRegistrySessionListener.class);
 
     private static PeerRegistrySessionListener getMockSessionListener() {
         final PeerRegistrySessionListener mock = Mockito.mock(PeerRegistrySessionListener.class);

-        Mockito.doNothing().when(mock).onSessionCreated(Mockito.any(IpAddress.class));
-        Mockito.doNothing().when(mock).onSessionRemoved(Mockito.any(IpAddress.class));
+        Mockito.doNothing().when(mock).onSessionCreated(Mockito.any(IpAddressNoZone.class));
+        Mockito.doNothing().when(mock).onSessionRemoved(Mockito.any(IpAddressNoZone.class));

         return mock;
     }
 
     @Test
     public void testIpAddressConstruction() throws BGPDocumentedException {
         final InetSocketAddress adr = new InetSocketAddress("127.0.0.1", 179);
         return mock;
     }
 
     @Test
     public void testIpAddressConstruction() throws BGPDocumentedException {
         final InetSocketAddress adr = new InetSocketAddress("127.0.0.1", 179);

-        final IpAddress ipAdr = StrictBGPPeerRegistry.getIpAddress(adr);
-        assertEquals("127.0.0.1", ipAdr.getIpv4Address().getValue());
+        final IpAddressNoZone ipAdr = StrictBGPPeerRegistry.getIpAddress(adr);
+        assertEquals("127.0.0.1", ipAdr.getIpv4AddressNoZone().getValue());

     }
 
     @Test
     }
 
     @Test


@@ -112,8 +112,8 @@ public class StrictBGPPeerRegistryTest {
 
     @Test
     public void testPeerConnectionSuccessfull() throws Exception {
 
     @Test
     public void testPeerConnectionSuccessfull() throws Exception {

-        final Ipv4Address to2 = new Ipv4Address("255.255.255.254");
-        final IpAddress remoteIp2 = new IpAddress(to2);
+        final Ipv4AddressNoZone to2 = new Ipv4AddressNoZone("255.255.255.254");
+        final IpAddressNoZone remoteIp2 = new IpAddressNoZone(to2);

 
         this.peerRegistry.addPeer(REMOTE_IP, this.peer1, this.mockPreferences);
         final BGPSessionListener session2 = getMockSession();
 
         this.peerRegistry.addPeer(REMOTE_IP, this.peer1, this.mockPreferences);
         final BGPSessionListener session2 = getMockSession();


@@ -130,9 +130,9 @@ public class StrictBGPPeerRegistryTest {
 
     @Test
     public void testDropSecondPeer() throws BGPDocumentedException {
 
     @Test
     public void testDropSecondPeer() throws BGPDocumentedException {

-        final Ipv4Address higher = new Ipv4Address("192.168.200.200");
-        final Ipv4Address lower = new Ipv4Address("10.10.10.10");
-        final IpAddress remoteIp = new IpAddress(lower);
+        final Ipv4AddressNoZone higher = new Ipv4AddressNoZone("192.168.200.200");
+        final Ipv4AddressNoZone lower = new Ipv4AddressNoZone("10.10.10.10");
+        final IpAddressNoZone remoteIp = new IpAddressNoZone(lower);

 
         this.peerRegistry.addPeer(remoteIp, this.peer1, this.mockPreferences);
 
 
         this.peerRegistry.addPeer(remoteIp, this.peer1, this.mockPreferences);
 


@@ -148,9 +148,9 @@ public class StrictBGPPeerRegistryTest {
 
     @Test
     public void testDropFirstPeer() throws Exception {
 
     @Test
     public void testDropFirstPeer() throws Exception {

-        final Ipv4Address higher = new Ipv4Address("123.123.123.123");
-        final Ipv4Address lower = new Ipv4Address("123.123.123.122");
-        final IpAddress remoteIp = new IpAddress(lower);
+        final Ipv4AddressNoZone higher = new Ipv4AddressNoZone("123.123.123.123");
+        final Ipv4AddressNoZone lower = new Ipv4AddressNoZone("123.123.123.122");
+        final IpAddressNoZone remoteIp = new IpAddressNoZone(lower);

 
         this.peerRegistry.addPeer(remoteIp, this.peer1, this.mockPreferences);
 
 
         this.peerRegistry.addPeer(remoteIp, this.peer1, this.mockPreferences);
 

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SynchronizationAndExceptionTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SynchronizationAndExceptionTest.java
index a5d45c681eb6c02637834593fe5336c9faf1c02e..56aa1f8df9ba4bc59a87e75295639016ca1e8d44 100644 (file)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SynchronizationAndExceptionTest.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SynchronizationAndExceptionTest.java
@@ -58,8 +58,8 @@ import org.opendaylight.protocol.bgp.parser.BgpTableTypeImpl;
 import org.opendaylight.protocol.bgp.rib.spi.RIBQNames;
 import org.opendaylight.protocol.bgp.rib.spi.RibSupportUtils;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 import org.opendaylight.protocol.bgp.rib.spi.RIBQNames;
 import org.opendaylight.protocol.bgp.rib.spi.RibSupportUtils;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;

-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.IpAddressNoZone;
+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.opendaylight.params.xml.ns.yang.bgp.message.rev180329.Notify;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.Open;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.Notify;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.Open;


@@ -109,7 +109,7 @@ import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
 public class SynchronizationAndExceptionTest extends AbstractAddPathTest {
     private static final int HOLD_TIMER = 3;
     private static final AsNumber AS_NUMBER = new AsNumber(Uint32.valueOf(30));
 public class SynchronizationAndExceptionTest extends AbstractAddPathTest {
     private static final int HOLD_TIMER = 3;
     private static final AsNumber AS_NUMBER = new AsNumber(Uint32.valueOf(30));

-    private static final Ipv4Address BGP_ID = new Ipv4Address("1.1.1.2");
+    private static final Ipv4AddressNoZone BGP_ID = new Ipv4AddressNoZone("1.1.1.2");

     private static final String LOCAL_IP = "1.1.1.4";
     private static final int LOCAL_PORT = 12345;
     private static final String RIB_ID = "1.1.1.2";
     private static final String LOCAL_IP = "1.1.1.4";
     private static final int LOCAL_PORT = 12345;
     private static final String RIB_ID = "1.1.1.2";


@@ -121,7 +121,7 @@ public class SynchronizationAndExceptionTest extends AbstractAddPathTest {
             .node(RibSupportUtils.toYangTablesKey(new TablesKey(Ipv4AddressFamily.class,
                     UnicastSubsequentAddressFamily.class))).node(ATTRIBUTES_NID)
             .node(UPTODATE_NID);
             .node(RibSupportUtils.toYangTablesKey(new TablesKey(Ipv4AddressFamily.class,
                     UnicastSubsequentAddressFamily.class))).node(ATTRIBUTES_NID)
             .node(UPTODATE_NID);

-    private final IpAddress neighbor = new IpAddress(new Ipv4Address(LOCAL_IP));
+    private final IpAddressNoZone neighbor = new IpAddressNoZone(new Ipv4AddressNoZone(LOCAL_IP));

     private final BgpTableType ipv4tt = new BgpTableTypeImpl(Ipv4AddressFamily.class,
             UnicastSubsequentAddressFamily.class);
     private Open classicOpen;
     private final BgpTableType ipv4tt = new BgpTableTypeImpl(Ipv4AddressFamily.class,
             UnicastSubsequentAddressFamily.class);
     private Open classicOpen;


@@ -222,7 +222,7 @@ public class SynchronizationAndExceptionTest extends AbstractAddPathTest {
         ribImpl.instantiateServiceInstance();
         ribImpl.onGlobalContextUpdated(this.schemaService.getGlobalContext());
 
         ribImpl.instantiateServiceInstance();
         ribImpl.onGlobalContextUpdated(this.schemaService.getGlobalContext());
 

-        final BGPPeer bgpPeer = AbstractAddPathTest.configurePeer(this.tableRegistry, neighbor.getIpv4Address(),
+        final BGPPeer bgpPeer = AbstractAddPathTest.configurePeer(this.tableRegistry, neighbor.getIpv4AddressNoZone(),

             ribImpl, null, PeerRole.Ibgp, this.serverRegistry, AFI_SAFIS_ADVERTIZED, Collections.emptySet());
         bgpPeer.instantiateServiceInstance();
         final BGPSessionImpl bgpSession = new BGPSessionImpl(bgpPeer, this.speakerListener, this.classicOpen,
             ribImpl, null, PeerRole.Ibgp, this.serverRegistry, AFI_SAFIS_ADVERTIZED, Collections.emptySet());
         bgpPeer.instantiateServiceInstance();
         final BGPSessionImpl bgpSession = new BGPSessionImpl(bgpPeer, this.speakerListener, this.classicOpen,


@@ -239,7 +239,7 @@ public class SynchronizationAndExceptionTest extends AbstractAddPathTest {
         final Origin origin = new OriginBuilder().setValue(BgpOrigin.Igp).build();
         final AsPath asPath = new AsPathBuilder().setSegments(Collections.emptyList()).build();
         final CNextHop nextHop = new Ipv4NextHopCaseBuilder().setIpv4NextHop(new Ipv4NextHopBuilder()
         final Origin origin = new OriginBuilder().setValue(BgpOrigin.Igp).build();
         final AsPath asPath = new AsPathBuilder().setSegments(Collections.emptyList()).build();
         final CNextHop nextHop = new Ipv4NextHopCaseBuilder().setIpv4NextHop(new Ipv4NextHopBuilder()

-                .setGlobal(new Ipv4Address("127.0.0.1")).build()).build();
+                .setGlobal(new Ipv4AddressNoZone("127.0.0.1")).build()).build();

         final AttributesBuilder ab = new AttributesBuilder();
         wrongMessage.setAttributes(ab.setOrigin(origin).setAsPath(asPath).setCNextHop(nextHop).build());
 
         final AttributesBuilder ab = new AttributesBuilder();
         wrongMessage.setAttributes(ab.setOrigin(origin).setAsPath(asPath).setCNextHop(nextHop).build());
 


@@ -271,7 +271,7 @@ public class SynchronizationAndExceptionTest extends AbstractAddPathTest {
         ribImpl.instantiateServiceInstance();
         ribImpl.onGlobalContextUpdated(this.schemaService.getGlobalContext());
 
         ribImpl.instantiateServiceInstance();
         ribImpl.onGlobalContextUpdated(this.schemaService.getGlobalContext());
 

-        final BGPPeer bgpPeer = AbstractAddPathTest.configurePeer(this.tableRegistry, neighbor.getIpv4Address(),
+        final BGPPeer bgpPeer = AbstractAddPathTest.configurePeer(this.tableRegistry, neighbor.getIpv4AddressNoZone(),

             ribImpl, null, PeerRole.Ibgp, this.serverRegistry, AFI_SAFIS_ADVERTIZED, Collections.emptySet());
         bgpPeer.instantiateServiceInstance();
         final BGPSessionImpl bgpSession = new BGPSessionImpl(bgpPeer, this.speakerListener, this.classicOpen,
             ribImpl, null, PeerRole.Ibgp, this.serverRegistry, AFI_SAFIS_ADVERTIZED, Collections.emptySet());
         bgpPeer.instantiateServiceInstance();
         final BGPSessionImpl bgpSession = new BGPSessionImpl(bgpPeer, this.speakerListener, this.classicOpen,


@@ -288,7 +288,7 @@ public class SynchronizationAndExceptionTest extends AbstractAddPathTest {
         final Origin origin = new OriginBuilder().setValue(BgpOrigin.Igp).build();
         final AsPath asPath = new AsPathBuilder().setSegments(Collections.emptyList()).build();
         final CNextHop nextHop = new Ipv4NextHopCaseBuilder().setIpv4NextHop(new Ipv4NextHopBuilder()
         final Origin origin = new OriginBuilder().setValue(BgpOrigin.Igp).build();
         final AsPath asPath = new AsPathBuilder().setSegments(Collections.emptyList()).build();
         final CNextHop nextHop = new Ipv4NextHopCaseBuilder().setIpv4NextHop(new Ipv4NextHopBuilder()

-                .setGlobal(new Ipv4Address("127.0.0.1")).build()).build();
+                .setGlobal(new Ipv4AddressNoZone("127.0.0.1")).build()).build();

         final AttributesBuilder ab = new AttributesBuilder();
         wrongMessage.setAttributes(ab.setOrigin(origin).setAsPath(asPath).setCNextHop(nextHop).build());
 
         final AttributesBuilder ab = new AttributesBuilder();
         wrongMessage.setAttributes(ab.setOrigin(origin).setAsPath(asPath).setCNextHop(nextHop).build());
 

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/AbstractConfig.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/AbstractConfig.java
index f3d37cd62ba42e9a4cd21c8926109827faebcd81..8ff73242d68bd1f90e3ab4e728d083155becf44f 100644 (file)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/AbstractConfig.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/AbstractConfig.java
@@ -40,7 +40,7 @@ import org.opendaylight.protocol.bgp.rib.spi.BGPPeerTracker;
 import org.opendaylight.protocol.bgp.rib.spi.BGPSessionListener;
 import org.opendaylight.protocol.concepts.KeyMapping;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 import org.opendaylight.protocol.bgp.rib.spi.BGPSessionListener;
 import org.opendaylight.protocol.concepts.KeyMapping;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;

-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.IpAddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.BgpRib;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.Rib;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.RibId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.BgpRib;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.Rib;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.RibId;


@@ -130,9 +130,9 @@ class AbstractConfig extends DefaultRibPoliciesMockTest {
                 UnicastSubsequentAddressFamily.class)))
                 .when(this.rib).getLocalTables();
 
                 UnicastSubsequentAddressFamily.class)))
                 .when(this.rib).getLocalTables();
 

-        doNothing().when(this.bgpPeerRegistry).addPeer(any(IpAddress.class),
+        doNothing().when(this.bgpPeerRegistry).addPeer(any(IpAddressNoZone.class),

                 any(BGPSessionListener.class), any(BGPSessionPreferences.class));
                 any(BGPSessionListener.class), any(BGPSessionPreferences.class));

-        doNothing().when(this.bgpPeerRegistry).removePeer(any(IpAddress.class));
+        doNothing().when(this.bgpPeerRegistry).removePeer(any(IpAddressNoZone.class));

         doReturn("registry").when(this.bgpPeerRegistry).toString();
         doNothing().when(this.listener).close();
         doReturn(this.bgpPeerRegistry).when(this.dispatcher).getBGPPeerRegistry();
         doReturn("registry").when(this.bgpPeerRegistry).toString();
         doNothing().when(this.listener).close();
         doReturn(this.bgpPeerRegistry).when(this.dispatcher).getBGPPeerRegistry();

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/OpenConfigMappingUtilTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/OpenConfigMappingUtilTest.java
index 49b13c3a6f9e9d3c357960c91b58190a89720cb7..493a41cbf54a419d75edad29769379c517cc052a 100644 (file)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/OpenConfigMappingUtilTest.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/OpenConfigMappingUtilTest.java
@@ -77,7 +77,9 @@ import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.network.instance.re
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.policy.types.rev151009.BGP;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.policy.types.rev151009.BGP;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 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.IpAddressNoZone;

 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.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.PortNumber;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.BgpTableType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.SendReceive;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.BgpTableType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.SendReceive;


@@ -116,7 +118,7 @@ public class OpenConfigMappingUtilTest {
     private static final NeighborKey NEIGHBOR_KEY = new NeighborKey(NEIGHBOR_ADDRESS);
     private static final Ipv4Address ROUTER_ID = new Ipv4Address("1.2.3.4");
     private static final Ipv4Address CLUSTER_ID = new Ipv4Address("4.3.2.1");
     private static final NeighborKey NEIGHBOR_KEY = new NeighborKey(NEIGHBOR_ADDRESS);
     private static final Ipv4Address ROUTER_ID = new Ipv4Address("1.2.3.4");
     private static final Ipv4Address CLUSTER_ID = new Ipv4Address("4.3.2.1");

-    private static final Ipv4Address LOCAL_HOST = new Ipv4Address("127.0.0.1");
+    private static final Ipv4AddressNoZone LOCAL_HOST = new Ipv4AddressNoZone("127.0.0.1");

 
     private static final Uint8 ALL_PATHS = Uint8.ZERO;
     private static final Uint8 N_PATHS = Uint8.TWO;
 
     private static final Uint8 ALL_PATHS = Uint8.ZERO;
     private static final Uint8 N_PATHS = Uint8.TWO;


@@ -314,7 +316,7 @@ public class OpenConfigMappingUtilTest {
         assertNull(OpenConfigMappingUtil.getLocalAddress(transport.setConfig(
                 new org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.neighbor.group.transport
                         .ConfigBuilder().build()).build()));
         assertNull(OpenConfigMappingUtil.getLocalAddress(transport.setConfig(
                 new org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.neighbor.group.transport
                         .ConfigBuilder().build()).build()));

-        assertEquals(new IpAddress(LOCAL_HOST), OpenConfigMappingUtil.getLocalAddress(transport.setConfig(
+        assertEquals(new IpAddressNoZone(LOCAL_HOST), OpenConfigMappingUtil.getLocalAddress(transport.setConfig(

                 new org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.neighbor.group.transport
                         .ConfigBuilder().setLocalAddress(new BgpNeighborTransportConfig
                         .LocalAddress(new IpAddress(new Ipv4Address(LOCAL_HOST.getValue())))).build()).build()));
                 new org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.neighbor.group.transport
                         .ConfigBuilder().setLocalAddress(new BgpNeighborTransportConfig
                         .LocalAddress(new IpAddress(new Ipv4Address(LOCAL_HOST.getValue())))).build()).build()));

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/RIBTestsUtil.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/RIBTestsUtil.java
index e95da995da8f7190b9b45d28e8fac1664645c29a..4ecfa09b357e49ef3802b58d030df62bffe6dde1 100644 (file)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/RIBTestsUtil.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/RIBTestsUtil.java
@@ -32,14 +32,14 @@ import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.t
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.top.bgp.NeighborsBuilder;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.types.rev151009.IPV4UNICAST;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.types.rev151009.IPV6UNICAST;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.top.bgp.NeighborsBuilder;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.types.rev151009.IPV4UNICAST;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.types.rev151009.IPV6UNICAST;

-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.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.GlobalAddPathsConfig;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.GlobalAddPathsConfigBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.BgpId;
 import org.opendaylight.yangtools.yang.common.Uint8;
 
 final class RIBTestsUtil {
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.GlobalAddPathsConfig;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.GlobalAddPathsConfigBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.BgpId;
 import org.opendaylight.yangtools.yang.common.Uint8;
 
 final class RIBTestsUtil {

-    private static final Ipv4Address BGP_ID = new BgpId(new Ipv4Address("127.0.0.1"));
+    private static final BgpId BGP_ID = new BgpId(new Ipv4AddressNoZone("127.0.0.1"));

     private static final List<AfiSafi> AFISAFIS_IPV4 = new ArrayList<>();
     private static final List<AfiSafi> AFISAFIS_IPV6 = new ArrayList<>();
 
     private static final List<AfiSafi> AFISAFIS_IPV4 = new ArrayList<>();
     private static final List<AfiSafi> AFISAFIS_IPV6 = new ArrayList<>();
 

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/RibImplTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/RibImplTest.java
index 2b4c51bd41076b7d5c61bee83aea3c6479455a3e..6deb03eaa955ac77e721ec4a56b087fc1d1d1fb9 100644 (file)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/RibImplTest.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/RibImplTest.java
@@ -38,7 +38,7 @@ import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.g
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.top.bgp.Global;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.top.bgp.GlobalBuilder;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.types.rev151009.IPV4UNICAST;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.top.bgp.Global;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.top.bgp.GlobalBuilder;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.types.rev151009.IPV4UNICAST;

-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.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.BgpTableType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.GlobalAddPathsConfig;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.GlobalAddPathsConfigBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.BgpTableType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.GlobalAddPathsConfig;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.GlobalAddPathsConfigBuilder;


@@ -59,7 +59,7 @@ public class RibImplTest extends AbstractConfig {
     private static final List<AfiSafi> AFISAFIS = new ArrayList<>();
     private static final BgpTableType TABLE_TYPE = new BgpTableTypeImpl(Ipv4AddressFamily.class,
             UnicastSubsequentAddressFamily.class);
     private static final List<AfiSafi> AFISAFIS = new ArrayList<>();
     private static final BgpTableType TABLE_TYPE = new BgpTableTypeImpl(Ipv4AddressFamily.class,
             UnicastSubsequentAddressFamily.class);

-    private static final Ipv4Address BGP_ID = new BgpId(new Ipv4Address("127.0.0.1"));
+    private static final BgpId BGP_ID = new BgpId(new Ipv4AddressNoZone("127.0.0.1"));

 
     static {
         AFISAFIS.add(new AfiSafiBuilder().setAfiSafiName(IPV4UNICAST.class)
 
     static {
         AFISAFIS.add(new AfiSafiBuilder().setAfiSafiName(IPV4UNICAST.class)

diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/state/BGPPeerState.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/state/BGPPeerState.java
index 8b2e57232f75459fc9c22882744fecaded7be561..96962c801e78af4acf821283e6ffed3245011509 100644 (file)
--- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/state/BGPPeerState.java
+++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/state/BGPPeerState.java
@@ -10,7 +10,7 @@ package org.opendaylight.protocol.bgp.rib.spi.state;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.protocol.bgp.rib.RibReference;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.protocol.bgp.rib.RibReference;

-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.IpAddressNoZone;

 
 /**
  * Representing operational state related to a particular BGP neighbor.
 
 /**
  * Representing operational state related to a particular BGP neighbor.


@@ -42,7 +42,7 @@ public interface BGPPeerState extends RibReference {
      *
      * @return neighbor Address
      */
      *
      * @return neighbor Address
      */

-    @NonNull IpAddress getNeighborAddress();
+    @NonNull IpAddressNoZone getNeighborAddress();

 
     /**
      * Paths installed under Effective-Rib-In for a BGP neighbor.
 
     /**
      * Paths installed under Effective-Rib-In for a BGP neighbor.

diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/state/BGPTransportState.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/state/BGPTransportState.java
index b324ebeaa1d09dce80e5e6b9c8ee96af1d5c42c0..ad10109870275a6bfa001d4f7b9e00f85f6df089 100644 (file)
--- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/state/BGPTransportState.java
+++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/state/BGPTransportState.java
@@ -8,7 +8,7 @@
 package org.opendaylight.protocol.bgp.rib.spi.state;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 package org.opendaylight.protocol.bgp.rib.spi.state;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;

-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.IpAddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
 
 /**
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
 
 /**


@@ -29,7 +29,7 @@ public interface BGPTransportState {
      *
      * @return IpAddress
      */
      *
      * @return IpAddress
      */

-    IpAddress getRemoteAddress();
+    IpAddressNoZone getRemoteAddress();

 
     /**
      * Remote Port.
 
     /**
      * Remote Port.

diff --git a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RIBSupportTest.java b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RIBSupportTest.java
index 42b88d2cce62a21dc8cdf7b2e0a0d0a4fa4076e7..159438d6a759d9d41e9f322ba1a61d7aa1c700cc 100644 (file)
--- a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RIBSupportTest.java
+++ b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RIBSupportTest.java
@@ -30,7 +30,7 @@ import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractConcurrentDataBro
 import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractDataBrokerTestCustomizer;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction;
 import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractDataBrokerTestCustomizer;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction;

-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.opendaylight.params.xml.ns.yang.bgp.message.rev180329.UpdateBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.Attributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.AttributesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.UpdateBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.Attributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.AttributesBuilder;


@@ -234,7 +234,7 @@ public class RIBSupportTest extends AbstractConcurrentDataBrokerTest {
     @Test
     public void buildUpdate() {
         final Ipv4NextHopCase nextHop = new Ipv4NextHopCaseBuilder().setIpv4NextHop(new Ipv4NextHopBuilder()
     @Test
     public void buildUpdate() {
         final Ipv4NextHopCase nextHop = new Ipv4NextHopCaseBuilder().setIpv4NextHop(new Ipv4NextHopBuilder()

-                .setGlobal(new Ipv4Address("10.0.0.2")).build()).build();
+                .setGlobal(new Ipv4AddressNoZone("10.0.0.2")).build()).build();

         final Attributes attr = new AttributesBuilder().setCNextHop(nextHop).build();
         final Collection<MapEntryNode> routes = new HashSet<>();
 
         final Attributes attr = new AttributesBuilder().setCNextHop(nextHop).build();
         final Collection<MapEntryNode> routes = new HashSet<>();
 

diff --git a/bgp/testtool/src/main/java/org/opendaylight/protocol/bgp/testtool/CommunitiesBuilder.java b/bgp/testtool/src/main/java/org/opendaylight/protocol/bgp/testtool/CommunitiesBuilder.java
index 6258c3214c29b5c2a59dcf3fcefe3d0148f83619..f2170147f025cd8903679a6b22b2033be71500ec 100644 (file)
--- a/bgp/testtool/src/main/java/org/opendaylight/protocol/bgp/testtool/CommunitiesBuilder.java
+++ b/bgp/testtool/src/main/java/org/opendaylight/protocol/bgp/testtool/CommunitiesBuilder.java
@@ -9,7 +9,7 @@ package org.opendaylight.protocol.bgp.testtool;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import java.util.ArrayList;
 import java.util.List;

-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.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.attributes.ExtendedCommunities;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.attributes.ExtendedCommunitiesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.ShortAsNumber;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.attributes.ExtendedCommunities;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.attributes.ExtendedCommunitiesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.ShortAsNumber;


@@ -50,7 +50,7 @@ final class CommunitiesBuilder {
     private static final ShortAsNumber SHORT_AS = new ShortAsNumber(Uint32.valueOf(20));
     private static final As4SpecificCommon AS_4_COMMON = new As4SpecificCommonBuilder()
             .setAsNumber(SHORT_AS).setLocalAdministrator(Uint16.valueOf(100)).build();
     private static final ShortAsNumber SHORT_AS = new ShortAsNumber(Uint32.valueOf(20));
     private static final As4SpecificCommon AS_4_COMMON = new As4SpecificCommonBuilder()
             .setAsNumber(SHORT_AS).setLocalAdministrator(Uint16.valueOf(100)).build();

-    private static final Ipv4Address IPV4 = new Ipv4Address("192.168.1.0");
+    private static final Ipv4AddressNoZone IPV4 = new Ipv4AddressNoZone("192.168.1.0");

     private static final byte[] BYTE = new byte[]{(byte) 0x4f, (byte) 0x70, (byte) 0x00, (byte) 0x00};
     private static final Uint16 LA = Uint16.valueOf(4660).intern();
 
     private static final byte[] BYTE = new byte[]{(byte) 0x4f, (byte) 0x70, (byte) 0x00, (byte) 0x00};
     private static final Uint16 LA = Uint16.valueOf(4660).intern();
 

diff --git a/bgp/testtool/src/main/java/org/opendaylight/protocol/bgp/testtool/PrefixesBuilder.java b/bgp/testtool/src/main/java/org/opendaylight/protocol/bgp/testtool/PrefixesBuilder.java
index f3a3218c9a6a4798daa17a74bfc9c4cea625c25e..0ddce00ae1e0eccc2b822a12f3eb825ee0f7d1cf 100644 (file)
--- a/bgp/testtool/src/main/java/org/opendaylight/protocol/bgp/testtool/PrefixesBuilder.java
+++ b/bgp/testtool/src/main/java/org/opendaylight/protocol/bgp/testtool/PrefixesBuilder.java
@@ -13,7 +13,7 @@ import static org.opendaylight.protocol.util.Ipv4Util.incrementIpv4Prefix;
 import java.util.Collections;
 import java.util.List;
 import org.opendaylight.protocol.bgp.rib.impl.ChannelOutputLimiter;
 import java.util.Collections;
 import java.util.List;
 import org.opendaylight.protocol.bgp.rib.impl.ChannelOutputLimiter;

-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.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv4.prefixes.DestinationIpv4Builder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv4.prefixes.destination.ipv4.Ipv4PrefixesBuilder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv4.prefixes.DestinationIpv4Builder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv4.prefixes.destination.ipv4.Ipv4PrefixesBuilder;


@@ -41,7 +41,7 @@ import org.opendaylight.yangtools.yang.common.Uint32;
 
 final class PrefixesBuilder {
     private static final Ipv4NextHopCase NEXT_HOP = new Ipv4NextHopCaseBuilder()
 
 final class PrefixesBuilder {
     private static final Ipv4NextHopCase NEXT_HOP = new Ipv4NextHopCaseBuilder()

-        .setIpv4NextHop(new Ipv4NextHopBuilder().setGlobal(new Ipv4Address("127.1.1.1")).build())
+        .setIpv4NextHop(new Ipv4NextHopBuilder().setGlobal(new Ipv4AddressNoZone("127.1.1.1")).build())

         .build();
 
     private PrefixesBuilder() {
         .build();
 
     private PrefixesBuilder() {

diff --git a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/ProtocolUtil.java b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/ProtocolUtil.java
index bfc2155d9ca954cce35b361f4f7733ec493482fb..ee295c31783a44fdab876d4d9233ea6711873c2d 100644 (file)
--- a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/ProtocolUtil.java
+++ b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/ProtocolUtil.java
@@ -74,7 +74,7 @@ public final class ProtocolUtil {
                 if (pa != null && pa.getOspfForwardingAddress() != null) {
                     pb.addAugmentation(Prefix1.class, new Prefix1Builder().setOspfPrefixAttributes(
                             new OspfPrefixAttributesBuilder().setForwardingAddress(pa.getOspfForwardingAddress()
                 if (pa != null && pa.getOspfForwardingAddress() != null) {
                     pb.addAugmentation(Prefix1.class, new Prefix1Builder().setOspfPrefixAttributes(
                             new OspfPrefixAttributesBuilder().setForwardingAddress(pa.getOspfForwardingAddress()

-                                    .getIpv4Address()).build()).build());
+                                    .getIpv4AddressNoZone()).build()).build());

                 }
                 break;
             default:
                 }
                 break;
             default:

diff --git a/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderTest.java b/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderTest.java
index 0cdc94bd12913a83007e911e97421f559836c417..498b9fb5cdbe257ac83929a6e4b50b644671ec43 100755 (executable)
--- a/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderTest.java
+++ b/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderTest.java
@@ -19,7 +19,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.mdsal.binding.api.WriteTransaction;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.junit.Test;
 import org.opendaylight.mdsal.binding.api.WriteTransaction;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;

-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.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.bgp.rib.rib.loc.rib.tables.routes.Ipv4RoutesCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv4.routes.Ipv4Routes;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.bgp.rib.rib.loc.rib.tables.routes.Ipv4RoutesCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv4.routes.Ipv4Routes;


@@ -118,7 +118,7 @@ public class Ipv4ReachabilityTopologyBuilderTest extends AbstractTopologyBuilder
         final Attributes attribute = new AttributesBuilder()
             .setOrigin(new OriginBuilder().setValue(BgpOrigin.Igp).build())
             .setCNextHop(new Ipv4NextHopCaseBuilder().setIpv4NextHop(new Ipv4NextHopBuilder()
         final Attributes attribute = new AttributesBuilder()
             .setOrigin(new OriginBuilder().setValue(BgpOrigin.Igp).build())
             .setCNextHop(new Ipv4NextHopCaseBuilder().setIpv4NextHop(new Ipv4NextHopBuilder()

-                .setGlobal(new Ipv4Address(nextHop)).build()).build()).build();
+                .setGlobal(new Ipv4AddressNoZone(nextHop)).build()).build()).build();

         return new Ipv4RouteBuilder().withKey(new Ipv4RouteKey(new PathId(PATH_ID), ROUTE_IP4PREFIX))
             .setPrefix(new Ipv4Prefix(ROUTE_IP4PREFIX)).setAttributes(attribute).build();
     }
         return new Ipv4RouteBuilder().withKey(new Ipv4RouteKey(new PathId(PATH_ID), ROUTE_IP4PREFIX))
             .setPrefix(new Ipv4Prefix(ROUTE_IP4PREFIX)).setAttributes(attribute).build();
     }

diff --git a/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderTest.java b/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderTest.java
index c3471f42c61ca31172b3fc90b314b0842dd95662..422d597577b2427fcb573b5c403b49c35fffb468 100755 (executable)
--- a/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderTest.java
+++ b/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderTest.java
@@ -19,7 +19,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.mdsal.binding.api.WriteTransaction;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.junit.Test;
 import org.opendaylight.mdsal.binding.api.WriteTransaction;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;

-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.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.bgp.rib.rib.loc.rib.tables.routes.Ipv6RoutesCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv6.routes.Ipv6Routes;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.bgp.rib.rib.loc.rib.tables.routes.Ipv6RoutesCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv6.routes.Ipv6Routes;


@@ -112,11 +112,11 @@ public class Ipv6ReachabilityTopologyBuilderTest extends AbstractTopologyBuilder
         wTx.commit();
     }
 
         wTx.commit();
     }
 

-    private static Ipv6Route createIpv6Route(final String netxHop) {
+    private static Ipv6Route createIpv6Route(final String nextHop) {

         final Attributes attribute = new AttributesBuilder()
             .setOrigin(new OriginBuilder().setValue(BgpOrigin.Igp).build())
             .setCNextHop(new Ipv6NextHopCaseBuilder().setIpv6NextHop(
         final Attributes attribute = new AttributesBuilder()
             .setOrigin(new OriginBuilder().setValue(BgpOrigin.Igp).build())
             .setCNextHop(new Ipv6NextHopCaseBuilder().setIpv6NextHop(

-                new Ipv6NextHopBuilder().setGlobal(new Ipv6Address(netxHop)).build()).build()).build();
+                new Ipv6NextHopBuilder().setGlobal(new Ipv6AddressNoZone(nextHop)).build()).build()).build();

         return new Ipv6RouteBuilder().withKey(new Ipv6RouteKey(new PathId(PATH_ID), ROUTE_IP6PREFIX))
             .setPrefix(new Ipv6Prefix(ROUTE_IP6PREFIX)).setAttributes(attribute).build();
     }
         return new Ipv6RouteBuilder().withKey(new Ipv6RouteKey(new PathId(PATH_ID), ROUTE_IP6PREFIX))
             .setPrefix(new Ipv6Prefix(ROUTE_IP6PREFIX)).setAttributes(attribute).build();
     }

diff --git a/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilderTest.java b/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilderTest.java
index 34d9df1e7db676b95659235cf54308aa34046670..ca484e624f751fe82db7b590a9e1c92dda011964 100755 (executable)
--- a/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilderTest.java
+++ b/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilderTest.java
@@ -39,9 +39,9 @@ import org.opendaylight.mdsal.binding.api.DataTreeModification;
 import org.opendaylight.mdsal.binding.api.WriteTransaction;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 import org.opendaylight.mdsal.binding.api.WriteTransaction;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;

-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.IpAddressNoZone;

 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.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.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.AdministrativeGroup;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.Identifier;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.AdministrativeGroup;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.Identifier;


@@ -399,7 +399,7 @@ public class LinkstateTopologyBuilderTest extends AbstractTopologyBuilderTest {
                 .addAugmentation(Attributes1.class, new Attributes1Builder()
                         .setLinkStateAttribute(new PrefixAttributesCaseBuilder()
                             .setPrefixAttributes(new PrefixAttributesBuilder()
                 .addAugmentation(Attributes1.class, new Attributes1Builder()
                         .setLinkStateAttribute(new PrefixAttributesCaseBuilder()
                             .setPrefixAttributes(new PrefixAttributesBuilder()

-                                .setOspfForwardingAddress(new IpAddress(new Ipv4Address(ospfFwdAddress)))
+                                .setOspfForwardingAddress(new IpAddressNoZone(new Ipv4AddressNoZone(ospfFwdAddress)))

                                 .setPrefixMetric(new IgpMetric(Uint32.valueOf(igpMetric)))
                                 .build())
                             .build())
                                 .setPrefixMetric(new IgpMetric(Uint32.valueOf(igpMetric)))
                                 .build())
                             .build())

diff --git a/bmp/bmp-api/src/main/yang/bmp-message.yang b/bmp/bmp-api/src/main/yang/bmp-message.yang
index 3462c45f53c06707cb6ed81a398038cc990d2dcd..b60ee4449cc7bfeaff795c9f7daccb057e3af7fb 100644 (file)
--- a/bmp/bmp-api/src/main/yang/bmp-message.yang
+++ b/bmp/bmp-api/src/main/yang/bmp-message.yang
@@ -392,7 +392,7 @@ module bmp-message {
                  belong to one address domain from the other.";
         }
         leaf address {
                  belong to one address domain from the other.";
         }
         leaf address {

-            type inet:ip-address;
+            type inet:ip-address-no-zone;

             mandatory true;
             description
                 "The remote IP address associated with the TCP
             mandatory true;
             description
                 "The remote IP address associated with the TCP


@@ -411,7 +411,7 @@ module bmp-message {
                  significant bits.";
         }
         leaf bgp-id {
                  significant bits.";
         }
         leaf bgp-id {

-            type inet:ipv4-address;
+            type inet:ipv4-address-no-zone;

             mandatory true;
             description
                 "The BGP Identifier of the peer from which the
             mandatory true;
             description
                 "The BGP Identifier of the peer from which the


@@ -458,7 +458,7 @@ module bmp-message {
 
     grouping peer-up {
         leaf local-address {
 
     grouping peer-up {
         leaf local-address {

-            type inet:ip-address;
+            type inet:ip-address-no-zone;

             mandatory true;
             description
                 "The local IP address associated with the peering
             mandatory true;
             description
                 "The local IP address associated with the peering

diff --git a/bmp/bmp-api/src/main/yang/bmp-monitor.yang b/bmp/bmp-api/src/main/yang/bmp-monitor.yang
index 258489f45cbd450e3795b6f7dc7d9bc2a0ad1488..86b2fdf3a2358cf7dd90247bbf2f824c6bfc9c6d 100644 (file)
--- a/bmp/bmp-api/src/main/yang/bmp-monitor.yang
+++ b/bmp/bmp-api/src/main/yang/bmp-monitor.yang
@@ -37,7 +37,7 @@ module bmp-monitor {
 
     typedef router-id {
         description "Monitored router identified by IP address.";
 
     typedef router-id {
         description "Monitored router identified by IP address.";

-        type inet:ip-address;
+        type inet:ip-address-no-zone;

     }
 
     typedef monitor-id {
     }
 
     typedef monitor-id {

diff --git a/bmp/bmp-api/src/main/yang/odl-bmp-monitor-config.yang b/bmp/bmp-api/src/main/yang/odl-bmp-monitor-config.yang
index 416bd5b5ea53a38a75a4706f04fd645b113a176a..8c1ce5a3dca716320e6693f94a844da8c1256a37 100644 (file)
--- a/bmp/bmp-api/src/main/yang/odl-bmp-monitor-config.yang
+++ b/bmp/bmp-api/src/main/yang/odl-bmp-monitor-config.yang
@@ -33,7 +33,7 @@ module odl-bmp-monitor-config {
     grouping server-config {
         container server {
             leaf binding-address {
     grouping server-config {
         container server {
             leaf binding-address {

-                type inet:ip-address;
+                type inet:ip-address-no-zone;

                 default "0.0.0.0";
             }
 
                 default "0.0.0.0";
             }
 


@@ -56,7 +56,7 @@ module odl-bmp-monitor-config {
 
             list monitored-router {
                 leaf address {
 
             list monitored-router {
                 leaf address {

-                    type inet:ip-address;
+                    type inet:ip-address-no-zone;

                     mandatory true;
                 }
 
                     mandatory true;
                 }
 

diff --git a/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpMonitoringStationImpl.java b/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpMonitoringStationImpl.java
index b081181d2c8e7e40826d3a40c55a143a5572fa86..f44827e6db4dbbf321a8a738788935a1b63efff3 100644 (file)
--- a/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpMonitoringStationImpl.java
+++ b/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpMonitoringStationImpl.java
@@ -133,7 +133,7 @@ public final class BmpMonitoringStationImpl implements BmpMonitoringStation, Clu
                 if (mr.isActive()) {
                     requireNonNull(mr.getAddress());
                     requireNonNull(mr.getPort());
                 if (mr.isActive()) {
                     requireNonNull(mr.getAddress());
                     requireNonNull(mr.getPort());

-                    final String s = mr.getAddress().getIpv4Address().getValue();
+                    final String s = mr.getAddress().getIpv4AddressNoZone().getValue();

                     final InetAddress addr = InetAddresses.forString(s);
                     final KeyMapping ret;
                     final Rfc2385Key rfc2385KeyPassword = mr.getPassword();
                     final InetAddress addr = InetAddresses.forString(s);
                     final KeyMapping ret;
                     final Rfc2385Key rfc2385KeyPassword = mr.getPassword();

diff --git a/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpRouterPeerImpl.java b/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpRouterPeerImpl.java
index 26d141fce2bf4b267fdb1729aa1ea71962987f3d..1c3112ad8c2f0941917e2b47bc219768c0236aad 100644 (file)
--- a/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpRouterPeerImpl.java
+++ b/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpRouterPeerImpl.java
@@ -25,7 +25,7 @@ import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction;
 import org.opendaylight.mdsal.dom.api.DOMTransactionChain;
 import org.opendaylight.protocol.bgp.rib.spi.RIBExtensionConsumerContext;
 import org.opendaylight.protocol.bmp.impl.spi.BmpRouterPeer;
 import org.opendaylight.mdsal.dom.api.DOMTransactionChain;
 import org.opendaylight.protocol.bgp.rib.spi.RIBExtensionConsumerContext;
 import org.opendaylight.protocol.bmp.impl.spi.BmpRouterPeer;

-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.IpAddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Timestamp;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.open.message.BgpParameters;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.open.message.bgp.parameters.OptionalCapabilities;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Timestamp;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.open.message.BgpParameters;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.open.message.bgp.parameters.OptionalCapabilities;


@@ -425,12 +425,11 @@ public final class BmpRouterPeerImpl implements BmpRouterPeer {
         }
     }
 
         }
     }
 

-
-    private static String getStringIpAddress(final IpAddress ipAddress) {
-        if (ipAddress.getIpv4Address() != null) {
-            return ipAddress.getIpv4Address().getValue();
+    private static String getStringIpAddress(final IpAddressNoZone ipAddress) {
+        if (ipAddress.getIpv4AddressNoZone() != null) {
+            return ipAddress.getIpv4AddressNoZone().getValue();

         }
         }

-        return ipAddress.getIpv6Address().getValue();
+        return ipAddress.getIpv6AddressNoZone().getValue();

     }
 
 }
     }
 
 }

diff --git a/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/KeyConstructorUtil.java b/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/KeyConstructorUtil.java
index 9da1a855ab27b5906ab9c9bf092b4ac26fbfd880..72972bb60c7da2b1629ba7d5eed0828bacf2137e 100644 (file)
--- a/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/KeyConstructorUtil.java
+++ b/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/KeyConstructorUtil.java
@@ -26,7 +26,7 @@ public final class KeyConstructorUtil {
             mrs.stream().filter(Objects::nonNull).filter(KeyConstructorUtil::isNotNullorEmpty)
                 .forEach(mr -> {
                     final Rfc2385Key rfc2385KeyPassword = mr.getPassword();
             mrs.stream().filter(Objects::nonNull).filter(KeyConstructorUtil::isNotNullorEmpty)
                 .forEach(mr -> {
                     final Rfc2385Key rfc2385KeyPassword = mr.getPassword();

-                    ret.put(IetfInetUtil.INSTANCE.inetAddressFor(mr.getAddress()),
+                    ret.put(IetfInetUtil.INSTANCE.inetAddressForNoZone(mr.getAddress()),

                         rfc2385KeyPassword.getValue().getBytes(StandardCharsets.US_ASCII));
                 });
         }
                         rfc2385KeyPassword.getValue().getBytes(StandardCharsets.US_ASCII));
                 });
         }

diff --git a/bmp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/app/BmpMonitorImplTest.java b/bmp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/app/BmpMonitorImplTest.java
index b756e589011b8a97d6a292506b593da008958550..34ae453e3e999e9634631274694675bc98aa9670 100644 (file)
--- a/bmp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/app/BmpMonitorImplTest.java
+++ b/bmp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/app/BmpMonitorImplTest.java
@@ -66,8 +66,8 @@ import org.opendaylight.protocol.bmp.parser.message.TestUtil;
 import org.opendaylight.protocol.bmp.spi.registry.BmpMessageRegistry;
 import org.opendaylight.protocol.bmp.spi.registry.SimpleBmpExtensionProviderContext;
 import org.opendaylight.protocol.util.CheckUtil;
 import org.opendaylight.protocol.bmp.spi.registry.BmpMessageRegistry;
 import org.opendaylight.protocol.bmp.spi.registry.SimpleBmpExtensionProviderContext;
 import org.opendaylight.protocol.util.CheckUtil;

-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.IpAddressNoZone;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.bmp.monitor.monitor.router.peer.pre.policy.rib.tables.routes.Ipv4RoutesCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.PeerId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.rib.Tables;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.bmp.monitor.monitor.router.peer.pre.policy.rib.tables.routes.Ipv4RoutesCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.PeerId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.rib.Tables;


@@ -109,7 +109,7 @@ public class BmpMonitorImplTest extends AbstractConcurrentDataBrokerTest {
     // the router (monitee) address where we are going to simulate a BMP request from
     private static final String REMOTE_ROUTER_ADDRESS_1 = "127.0.0.12";
     private static final String REMOTE_ROUTER_ADDRESS_2 = "127.0.0.13";
     // the router (monitee) address where we are going to simulate a BMP request from
     private static final String REMOTE_ROUTER_ADDRESS_1 = "127.0.0.12";
     private static final String REMOTE_ROUTER_ADDRESS_2 = "127.0.0.13";

-    private static final Ipv4Address PEER1 = new Ipv4Address("20.20.20.20");
+    private static final Ipv4AddressNoZone PEER1 = new Ipv4AddressNoZone("20.20.20.20");

     private static final MonitorId MONITOR_ID = new MonitorId("monitor");
     private static final KeyedInstanceIdentifier<Monitor, MonitorKey> MONITOR_IID = InstanceIdentifier
         .create(BmpMonitor.class).child(Monitor.class, new MonitorKey(MONITOR_ID));
     private static final MonitorId MONITOR_ID = new MonitorId("monitor");
     private static final KeyedInstanceIdentifier<Monitor, MonitorKey> MONITOR_IID = InstanceIdentifier
         .create(BmpMonitor.class).child(Monitor.class, new MonitorKey(MONITOR_ID));


@@ -331,7 +331,7 @@ public class BmpMonitorImplTest extends AbstractConcurrentDataBrokerTest {
             assertEquals(PeerType.Global, peer.getType());
             assertEquals(PEER_ID, peer.getPeerId());
             assertEquals(PEER1, peer.getBgpId());
             assertEquals(PeerType.Global, peer.getType());
             assertEquals(PEER_ID, peer.getPeerId());
             assertEquals(PEER1, peer.getBgpId());

-            assertEquals(TestUtil.IPV4_ADDRESS_10, peer.getAddress().getIpv4Address());
+            assertEquals(TestUtil.IPV4_ADDRESS_10, peer.getAddress().getIpv4AddressNoZone());

             assertEquals(TestUtil.PEER_AS, peer.getAs());
             assertNull(peer.getPeerDistinguisher());
             assertNull(peer.getStats());
             assertEquals(TestUtil.PEER_AS, peer.getAs());
             assertNull(peer.getPeerDistinguisher());
             assertNull(peer.getStats());


@@ -352,7 +352,7 @@ public class BmpMonitorImplTest extends AbstractConcurrentDataBrokerTest {
 
             assertNotNull(peer.getPeerSession());
             final PeerSession peerSession = peer.getPeerSession();
 
             assertNotNull(peer.getPeerSession());
             final PeerSession peerSession = peer.getPeerSession();

-            assertEquals(TestUtil.IPV4_ADDRESS_10, peerSession.getLocalAddress().getIpv4Address());
+            assertEquals(TestUtil.IPV4_ADDRESS_10, peerSession.getLocalAddress().getIpv4AddressNoZone());

             assertEquals(TestUtil.PEER_LOCAL_PORT, peerSession.getLocalPort());
             assertEquals(TestUtil.PEER_REMOTE_PORT, peerSession.getRemotePort());
             assertEquals(Status.Up, peerSession.getStatus());
             assertEquals(TestUtil.PEER_LOCAL_PORT, peerSession.getLocalPort());
             assertEquals(TestUtil.PEER_REMOTE_PORT, peerSession.getRemotePort());
             assertEquals(Status.Up, peerSession.getStatus());


@@ -481,6 +481,6 @@ public class BmpMonitorImplTest extends AbstractConcurrentDataBrokerTest {
     }
 
     private static RouterId getRouterId(final String routerIp) {
     }
 
     private static RouterId getRouterId(final String routerIp) {

-        return new RouterId(new IpAddress(new Ipv4Address(routerIp)));
+        return new RouterId(new IpAddressNoZone(new Ipv4AddressNoZone(routerIp)));

     }
 }
     }
 }

diff --git a/bmp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMockSession.java b/bmp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMockSession.java
index 36d219f32ec63918242d73ebad6f01938bc28042..d35d31ab413a3beada11c4181dd2e80154823055 100644 (file)
--- a/bmp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMockSession.java
+++ b/bmp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMockSession.java
@@ -5,7 +5,6 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */

-

 package org.opendaylight.protocol.bmp.mock;
 
 import static org.opendaylight.protocol.util.Ipv4Util.incrementIpv4Address;
 package org.opendaylight.protocol.bmp.mock;
 
 import static org.opendaylight.protocol.util.Ipv4Util.incrementIpv4Address;


@@ -18,7 +17,7 @@ import io.netty.channel.SimpleChannelInboundHandler;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import org.opendaylight.protocol.bmp.api.BmpSession;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import org.opendaylight.protocol.bmp.api.BmpSession;

-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.opendaylight.params.xml.ns.yang.bmp.message.rev180329.AdjRibInType;
 import org.opendaylight.yangtools.yang.binding.Notification;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev180329.AdjRibInType;
 import org.opendaylight.yangtools.yang.binding.Notification;


@@ -29,9 +28,9 @@ public final class BmpMockSession extends SimpleChannelInboundHandler<Notificati
 
     private static final Logger LOG = LoggerFactory.getLogger(BmpMockSession.class);
 
 
     private static final Logger LOG = LoggerFactory.getLogger(BmpMockSession.class);
 

-    private static final Ipv4Address NEXT_HOP = new Ipv4Address("1.1.1.1");
+    private static final Ipv4AddressNoZone NEXT_HOP = new Ipv4AddressNoZone("1.1.1.1");

     private static final Ipv4Prefix PREFIX = new Ipv4Prefix("1.1.1.1/32");
     private static final Ipv4Prefix PREFIX = new Ipv4Prefix("1.1.1.1/32");

-    private static final Ipv4Address PEER_ADDRESS = NEXT_HOP;
+    private static final Ipv4AddressNoZone PEER_ADDRESS = NEXT_HOP;

 
     private final int peersCount;
     private final int prePolicyRoutesCount;
 
     private final int peersCount;
     private final int prePolicyRoutesCount;


@@ -75,7 +74,7 @@ public final class BmpMockSession extends SimpleChannelInboundHandler<Notificati
 
     private void advertizePeers(final InetSocketAddress localAddress) {
         channel.writeAndFlush(BmpMockUtil.createInitiation());
 
     private void advertizePeers(final InetSocketAddress localAddress) {
         channel.writeAndFlush(BmpMockUtil.createInitiation());

-        Ipv4Address peerAddress = PEER_ADDRESS;
+        Ipv4AddressNoZone peerAddress = PEER_ADDRESS;

         for (int i = 0; i < this.peersCount; i++) {
             channel.writeAndFlush(BmpMockUtil.createPeerUp(peerAddress, localAddress.getAddress()));
             LOG.debug("BMP router {} advertized peer {}", channel.localAddress(), peerAddress);
         for (int i = 0; i < this.peersCount; i++) {
             channel.writeAndFlush(BmpMockUtil.createPeerUp(peerAddress, localAddress.getAddress()));
             LOG.debug("BMP router {} advertized peer {}", channel.localAddress(), peerAddress);


@@ -86,7 +85,7 @@ public final class BmpMockSession extends SimpleChannelInboundHandler<Notificati
     }
 
     private static void advertizeRoutes(final int count, final AdjRibInType type, final Channel channel,
     }
 
     private static void advertizeRoutes(final int count, final AdjRibInType type, final Channel channel,

-            final Ipv4Address peerAddress) {
+            final Ipv4AddressNoZone peerAddress) {

         Ipv4Prefix prefix = PREFIX;
         for (int i = 0; i < count; i++) {
             channel.writeAndFlush(BmpMockUtil.createRouteMonitoring(peerAddress, type, prefix));
         Ipv4Prefix prefix = PREFIX;
         for (int i = 0; i < count; i++) {
             channel.writeAndFlush(BmpMockUtil.createRouteMonitoring(peerAddress, type, prefix));

diff --git a/bmp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMockUtil.java b/bmp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMockUtil.java
index e15959904b1c21fe4efc60fe801ee0e3c27fd0fa..61f57803e1debb7bd72673fb847fdcc262a3cba9 100755 (executable)
--- a/bmp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMockUtil.java
+++ b/bmp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMockUtil.java
@@ -10,8 +10,8 @@ package org.opendaylight.protocol.bmp.mock;
 import java.net.InetAddress;
 import java.util.Collections;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 import java.net.InetAddress;
 import java.util.Collections;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;

-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.IpAddressNoZone;
+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;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.OpenBuilder;
 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;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.OpenBuilder;


@@ -52,7 +52,7 @@ final class BmpMockUtil {
     private static final String NAME = "BMP mock";
     private static final int HOLD_TIMER = 180;
     private static final AsNumber ASN = new AsNumber(Uint32.valueOf(65431));
     private static final String NAME = "BMP mock";
     private static final int HOLD_TIMER = 180;
     private static final AsNumber ASN = new AsNumber(Uint32.valueOf(65431));

-    private static final Ipv4Address NEXT_HOP = new Ipv4Address("1.2.3.4");
+    private static final Ipv4AddressNoZone NEXT_HOP = new Ipv4AddressNoZone("1.2.3.4");

     private static final PortNumber PEER_PORT = new PortNumber(Uint16.valueOf(179).intern());
     private static final ProtocolVersion PROTOCOL_VERSION = new ProtocolVersion(Uint8.valueOf(4));
     private static final Origin ORIGIN = new OriginBuilder().setValue(BgpOrigin.Igp).build();
     private static final PortNumber PEER_PORT = new PortNumber(Uint16.valueOf(179).intern());
     private static final ProtocolVersion PROTOCOL_VERSION = new ProtocolVersion(Uint8.valueOf(4));
     private static final Origin ORIGIN = new OriginBuilder().setValue(BgpOrigin.Igp).build();


@@ -72,18 +72,19 @@ final class BmpMockUtil {
         return msgBuilder.build();
     }
 
         return msgBuilder.build();
     }
 

-    static PeerUpNotification createPeerUp(final Ipv4Address peerIp, final InetAddress localAddress) {
+    static PeerUpNotification createPeerUp(final Ipv4AddressNoZone peerIp, final InetAddress localAddress) {

         final PeerUpNotificationBuilder msgBuilder = new PeerUpNotificationBuilder();
         final PeerUpNotificationBuilder msgBuilder = new PeerUpNotificationBuilder();

-        msgBuilder.setLocalAddress(new IpAddress(new Ipv4Address(localAddress.getHostAddress())));
+        msgBuilder.setLocalAddress(new IpAddressNoZone(new Ipv4AddressNoZone(localAddress.getHostAddress())));

         msgBuilder.setLocalPort(PEER_PORT);
         msgBuilder.setRemotePort(PEER_PORT);
         msgBuilder.setReceivedOpen(new ReceivedOpenBuilder(createOpen(peerIp)).build());
         msgBuilder.setLocalPort(PEER_PORT);
         msgBuilder.setRemotePort(PEER_PORT);
         msgBuilder.setReceivedOpen(new ReceivedOpenBuilder(createOpen(peerIp)).build());

-        msgBuilder.setSentOpen(new SentOpenBuilder(createOpen(new Ipv4Address(localAddress.getHostAddress()))).build());
+        msgBuilder.setSentOpen(new SentOpenBuilder(createOpen(new Ipv4AddressNoZone(localAddress.getHostAddress())))
+            .build());

         msgBuilder.setPeerHeader(createPeerHeader(peerIp, AdjRibInType.PrePolicy));
         return msgBuilder.build();
     }
 
         msgBuilder.setPeerHeader(createPeerHeader(peerIp, AdjRibInType.PrePolicy));
         return msgBuilder.build();
     }
 

-    private static OpenMessage createOpen(final Ipv4Address address) {
+    private static OpenMessage createOpen(final Ipv4AddressNoZone address) {

         final OpenBuilder msgBuilder = new OpenBuilder();
         msgBuilder.setBgpIdentifier(address);
         msgBuilder.setHoldTimer(HOLD_TIMER);
         final OpenBuilder msgBuilder = new OpenBuilder();
         msgBuilder.setBgpIdentifier(address);
         msgBuilder.setHoldTimer(HOLD_TIMER);


@@ -92,9 +93,9 @@ final class BmpMockUtil {
         return msgBuilder.build();
     }
 
         return msgBuilder.build();
     }
 

-    private static PeerHeader createPeerHeader(final Ipv4Address bgpId, final AdjRibInType ribType) {
+    private static PeerHeader createPeerHeader(final Ipv4AddressNoZone bgpId, final AdjRibInType ribType) {

         return new PeerHeaderBuilder()
         return new PeerHeaderBuilder()

-            .setAddress(new IpAddress(bgpId))
+            .setAddress(new IpAddressNoZone(bgpId))

             .setAdjRibInType(ribType)
             .setAs(new AsNumber(ASN))
             .setBgpId(bgpId)
             .setAdjRibInType(ribType)
             .setAs(new AsNumber(ASN))
             .setBgpId(bgpId)


@@ -103,7 +104,7 @@ final class BmpMockUtil {
             .build();
     }
 
             .build();
     }
 

-    static RouteMonitoringMessage createRouteMonitoring(final Ipv4Address bgpId, final AdjRibInType ribType,
+    static RouteMonitoringMessage createRouteMonitoring(final Ipv4AddressNoZone bgpId, final AdjRibInType ribType,

             final Ipv4Prefix prefix) {
         final RouteMonitoringMessageBuilder routeMonitMsgBuilder = new RouteMonitoringMessageBuilder()
             .setPeerHeader(createPeerHeader(bgpId, ribType))
             final Ipv4Prefix prefix) {
         final RouteMonitoringMessageBuilder routeMonitMsgBuilder = new RouteMonitoringMessageBuilder()
             .setPeerHeader(createPeerHeader(bgpId, ribType))

diff --git a/bmp/bmp-mock/src/test/java/org/opendaylight/protocol/bmp/mock/BmpMockUtilTest.java b/bmp/bmp-mock/src/test/java/org/opendaylight/protocol/bmp/mock/BmpMockUtilTest.java
index 0a3f8ddcae6272faafdb07c85648ebced8108247..278885604fb3e29112fc2c00b422890f2259eb3b 100644 (file)
--- a/bmp/bmp-mock/src/test/java/org/opendaylight/protocol/bmp/mock/BmpMockUtilTest.java
+++ b/bmp/bmp-mock/src/test/java/org/opendaylight/protocol/bmp/mock/BmpMockUtilTest.java
@@ -5,7 +5,6 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */

-

 package org.opendaylight.protocol.bmp.mock;
 
 import static org.junit.Assert.assertEquals;
 package org.opendaylight.protocol.bmp.mock;
 
 import static org.junit.Assert.assertEquals;


@@ -15,7 +14,7 @@ import static org.junit.Assert.assertNull;
 import com.google.common.net.InetAddresses;
 import java.net.InetAddress;
 import org.junit.Test;
 import com.google.common.net.InetAddresses;
 import java.net.InetAddress;
 import org.junit.Test;

-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.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.Ipv4NextHopCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev180329.AdjRibInType;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.Ipv4NextHopCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev180329.AdjRibInType;


@@ -29,7 +28,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.mess
 
 public class BmpMockUtilTest {
 
 
 public class BmpMockUtilTest {
 

-    private static final Ipv4Address PEER_IP = new Ipv4Address("127.0.0.1");
+    private static final Ipv4AddressNoZone PEER_IP = new Ipv4AddressNoZone("127.0.0.1");

     private static final InetAddress LOCAL_ADDRESS = InetAddresses.forString("127.0.0.2");
     private static final Ipv4Prefix PREFIX = new Ipv4Prefix("1.2.3.4/32");
 
     private static final InetAddress LOCAL_ADDRESS = InetAddresses.forString("127.0.0.2");
     private static final Ipv4Prefix PREFIX = new Ipv4Prefix("1.2.3.4/32");
 


@@ -46,12 +45,12 @@ public class BmpMockUtilTest {
     public void testCreatePeerUp() {
         final PeerUpNotification peerUp = BmpMockUtil.createPeerUp(PEER_IP, LOCAL_ADDRESS);
         final PeerHeader peerHeader = peerUp.getPeerHeader();
     public void testCreatePeerUp() {
         final PeerUpNotification peerUp = BmpMockUtil.createPeerUp(PEER_IP, LOCAL_ADDRESS);
         final PeerHeader peerHeader = peerUp.getPeerHeader();

-        assertEquals(PEER_IP, peerHeader.getAddress().getIpv4Address());
+        assertEquals(PEER_IP, peerHeader.getAddress().getIpv4AddressNoZone());

         assertEquals(65431L, peerHeader.getAs().getValue().longValue());
         assertEquals(PEER_IP, peerHeader.getBgpId());
         assertEquals(PeerType.Global, peerHeader.getType());
         assertNull(peerUp.getInformation());
         assertEquals(65431L, peerHeader.getAs().getValue().longValue());
         assertEquals(PEER_IP, peerHeader.getBgpId());
         assertEquals(PeerType.Global, peerHeader.getType());
         assertNull(peerUp.getInformation());

-        assertEquals(LOCAL_ADDRESS.getHostAddress(), peerUp.getLocalAddress().getIpv4Address().getValue());
+        assertEquals(LOCAL_ADDRESS.getHostAddress(), peerUp.getLocalAddress().getIpv4AddressNoZone().getValue());

         assertEquals(179, peerUp.getLocalPort().getValue().intValue());
         assertEquals(179, peerUp.getRemotePort().getValue().intValue());
         assertNotNull(peerUp.getReceivedOpen());
         assertEquals(179, peerUp.getLocalPort().getValue().intValue());
         assertEquals(179, peerUp.getRemotePort().getValue().intValue());
         assertNotNull(peerUp.getReceivedOpen());


@@ -63,7 +62,7 @@ public class BmpMockUtilTest {
         final RouteMonitoringMessage routeMonitoring = BmpMockUtil
                 .createRouteMonitoring(PEER_IP, AdjRibInType.PrePolicy, PREFIX);
         final PeerHeader peerHeader = routeMonitoring.getPeerHeader();
         final RouteMonitoringMessage routeMonitoring = BmpMockUtil
                 .createRouteMonitoring(PEER_IP, AdjRibInType.PrePolicy, PREFIX);
         final PeerHeader peerHeader = routeMonitoring.getPeerHeader();

-        assertEquals(PEER_IP, peerHeader.getAddress().getIpv4Address());
+        assertEquals(PEER_IP, peerHeader.getAddress().getIpv4AddressNoZone());

         assertEquals(65431L, peerHeader.getAs().getValue().longValue());
         assertEquals(PEER_IP, peerHeader.getBgpId());
         assertEquals(PeerType.Global, peerHeader.getType());
         assertEquals(65431L, peerHeader.getAs().getValue().longValue());
         assertEquals(PEER_IP, peerHeader.getBgpId());
         assertEquals(PeerType.Global, peerHeader.getType());

diff --git a/bmp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/PeerUpHandler.java b/bmp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/PeerUpHandler.java
index 2b03ce47cffbb2a9e7574eb3b391b3c82163d85c..20c97c2c858a54ed925a632c4cf773ea709ef7d9 100644 (file)
--- a/bmp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/PeerUpHandler.java
+++ b/bmp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/PeerUpHandler.java
@@ -21,7 +21,7 @@ import org.opendaylight.protocol.bmp.spi.parser.BmpDeserializationException;
 import org.opendaylight.protocol.bmp.spi.parser.BmpTlvRegistry;
 import org.opendaylight.protocol.util.Ipv4Util;
 import org.opendaylight.protocol.util.Ipv6Util;
 import org.opendaylight.protocol.bmp.spi.parser.BmpTlvRegistry;
 import org.opendaylight.protocol.util.Ipv4Util;
 import org.opendaylight.protocol.util.Ipv6Util;

-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.IpAddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.OpenBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.OpenMessage;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.OpenBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.OpenMessage;


@@ -54,11 +54,11 @@ public class PeerUpHandler extends AbstractBmpPerPeerMessageParser<InformationBu
         checkArgument(message instanceof PeerUpNotification, "An instance of Peer Up notification is required");
         final PeerUpNotification peerUp = (PeerUpNotification) message;
 
         checkArgument(message instanceof PeerUpNotification, "An instance of Peer Up notification is required");
         final PeerUpNotification peerUp = (PeerUpNotification) message;
 

-        if (peerUp.getLocalAddress().getIpv4Address() != null) {
+        if (peerUp.getLocalAddress().getIpv4AddressNoZone() != null) {

             buffer.writeZero(Ipv6Util.IPV6_LENGTH - Ipv4Util.IP4_LENGTH);
             buffer.writeZero(Ipv6Util.IPV6_LENGTH - Ipv4Util.IP4_LENGTH);

-            Ipv4Util.writeIpv4Address(peerUp.getLocalAddress().getIpv4Address(), buffer);
+            Ipv4Util.writeIpv4Address(peerUp.getLocalAddress().getIpv4AddressNoZone(), buffer);

         } else {
         } else {

-            Ipv6Util.writeIpv6Address(peerUp.getLocalAddress().getIpv6Address(), buffer);
+            Ipv6Util.writeIpv6Address(peerUp.getLocalAddress().getIpv6AddressNoZone(), buffer);

         }
         ByteBufUtils.write(buffer, peerUp.getLocalPort().getValue());
         ByteBufUtils.write(buffer, peerUp.getRemotePort().getValue());
         }
         ByteBufUtils.write(buffer, peerUp.getLocalPort().getValue());
         ByteBufUtils.write(buffer, peerUp.getRemotePort().getValue());


@@ -85,9 +85,9 @@ public class PeerUpHandler extends AbstractBmpPerPeerMessageParser<InformationBu
 
         if (peerUpNot.getPeerHeader().isIpv4()) {
             bytes.skipBytes(Ipv6Util.IPV6_LENGTH - Ipv4Util.IP4_LENGTH);
 
         if (peerUpNot.getPeerHeader().isIpv4()) {
             bytes.skipBytes(Ipv6Util.IPV6_LENGTH - Ipv4Util.IP4_LENGTH);

-            peerUpNot.setLocalAddress(new IpAddress(Ipv4Util.addressForByteBuf(bytes)));
+            peerUpNot.setLocalAddress(new IpAddressNoZone(Ipv4Util.addressForByteBuf(bytes)));

         } else {
         } else {

-            peerUpNot.setLocalAddress(new IpAddress(Ipv6Util.addressForByteBuf(bytes)));
+            peerUpNot.setLocalAddress(new IpAddressNoZone(Ipv6Util.addressForByteBuf(bytes)));

         }
         peerUpNot.setLocalPort(new PortNumber(ByteBufUtils.readUint16(bytes)));
         peerUpNot.setRemotePort(new PortNumber(ByteBufUtils.readUint16(bytes)));
         }
         peerUpNot.setLocalPort(new PortNumber(ByteBufUtils.readUint16(bytes)));
         peerUpNot.setRemotePort(new PortNumber(ByteBufUtils.readUint16(bytes)));

diff --git a/bmp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/TestUtil.java b/bmp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/TestUtil.java
index 6a2a41480deb02bbd5b3137345e8fc1563158507..35525495e930ade0f7593e3c75c58997fcfe5308 100644 (file)
--- a/bmp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/TestUtil.java
+++ b/bmp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/TestUtil.java
@@ -12,8 +12,8 @@ import com.google.common.collect.Lists;
 import java.util.ArrayList;
 import java.util.List;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 import java.util.ArrayList;
 import java.util.List;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;

-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.IpAddressNoZone;
+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;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Counter32;
 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;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Counter32;


@@ -112,12 +112,12 @@ import org.opendaylight.yangtools.yang.common.Uint64;
 import org.opendaylight.yangtools.yang.common.Uint8;
 
 public final class TestUtil {
 import org.opendaylight.yangtools.yang.common.Uint8;
 
 public final class TestUtil {

-    public static final Ipv4Address IPV4_ADDRESS_10 = new Ipv4Address("10.10.10.10");
-    private static final Ipv4Address IPV4_ADDRESS_20 = new Ipv4Address("20.20.20.20");
-    private static final Ipv4Address IPV4_ADDRESS_30 = new Ipv4Address("30.30.30.30");
-    private static final Ipv4Address IPV4_ADDRESS_40 = new Ipv4Address("40.40.40.40");
-    private static final Ipv4Address IPV4_ADDRESS_12 = new Ipv4Address("12.12.12.12");
-    private static final Ipv4Address IPV4_ADDRESS_100 = new Ipv4Address("100.100.100.100");
+    public static final Ipv4AddressNoZone IPV4_ADDRESS_10 = new Ipv4AddressNoZone("10.10.10.10");
+    private static final Ipv4AddressNoZone IPV4_ADDRESS_20 = new Ipv4AddressNoZone("20.20.20.20");
+    private static final Ipv4AddressNoZone IPV4_ADDRESS_30 = new Ipv4AddressNoZone("30.30.30.30");
+    private static final Ipv4AddressNoZone IPV4_ADDRESS_40 = new Ipv4AddressNoZone("40.40.40.40");
+    private static final Ipv4AddressNoZone IPV4_ADDRESS_12 = new Ipv4AddressNoZone("12.12.12.12");
+    private static final Ipv4AddressNoZone IPV4_ADDRESS_100 = new Ipv4AddressNoZone("100.100.100.100");

     public static final AsNumber PEER_AS = new AsNumber(Uint32.valueOf(72L));
     public static final PortNumber PEER_LOCAL_PORT = new PortNumber(Uint16.valueOf(220));
     public static final PortNumber PEER_REMOTE_PORT = new PortNumber(Uint16.valueOf(5000));
     public static final AsNumber PEER_AS = new AsNumber(Uint32.valueOf(72L));
     public static final PortNumber PEER_LOCAL_PORT = new PortNumber(Uint16.valueOf(220));
     public static final PortNumber PEER_REMOTE_PORT = new PortNumber(Uint16.valueOf(5000));


@@ -150,11 +150,11 @@ public final class TestUtil {
         return terminatMsgBuilder.setTlvs(tlvsBuilder.build()).build();
     }
 
         return terminatMsgBuilder.setTlvs(tlvsBuilder.build()).build();
     }
 

-    private static PeerHeader createPeerHeader(final Ipv4Address bgpId, final AdjRibInType ribType) {
+    private static PeerHeader createPeerHeader(final Ipv4AddressNoZone bgpId, final AdjRibInType ribType) {

         final PeerHeaderBuilder peerHeaderBuilder = new PeerHeaderBuilder()
         final PeerHeaderBuilder peerHeaderBuilder = new PeerHeaderBuilder()

-            .setAddress(new IpAddress(IPV4_ADDRESS_10))
+            .setAddress(new IpAddressNoZone(IPV4_ADDRESS_10))

             .setAs(PEER_AS)
             .setAs(PEER_AS)

-            .setBgpId(new Ipv4Address(bgpId))
+            .setBgpId(bgpId)

             .setAdjRibInType(ribType)
             .setTimestampMicro(new Timestamp(Uint32.TEN))
             .setTimestampSec(new Timestamp(Uint32.valueOf(5)))
             .setAdjRibInType(ribType)
             .setTimestampMicro(new Timestamp(Uint32.TEN))
             .setTimestampSec(new Timestamp(Uint32.valueOf(5)))


@@ -163,7 +163,7 @@ public final class TestUtil {
         return peerHeaderBuilder.build();
     }
 
         return peerHeaderBuilder.build();
     }
 

-    private static PeerHeader createPeerHeader(final Ipv4Address bgpId) {
+    private static PeerHeader createPeerHeader(final Ipv4AddressNoZone bgpId) {

         return createPeerHeader(bgpId, AdjRibInType.PrePolicy);
     }
 
         return createPeerHeader(bgpId, AdjRibInType.PrePolicy);
     }
 


@@ -171,21 +171,21 @@ public final class TestUtil {
         return createPeerHeader(IPV4_ADDRESS_10);
     }
 
         return createPeerHeader(IPV4_ADDRESS_10);
     }
 

-    public static PeerUpNotification createPeerUpNotification(final Ipv4Address bgpId, final boolean multiprotocol) {
-        final PeerUpNotificationBuilder peerUpNotifBuilder = new PeerUpNotificationBuilder()
-            .setLocalAddress(new IpAddress(IPV4_ADDRESS_10))
-            .setLocalPort(PEER_LOCAL_PORT)
-            .setPeerHeader(createPeerHeader(bgpId))
-            .setReceivedOpen(new ReceivedOpenBuilder(createOpen(multiprotocol)).build())
-            .setRemotePort(PEER_REMOTE_PORT)
-            .setSentOpen((SentOpen) createOpen(multiprotocol))
-            .setInformation(new InformationBuilder().setStringInformation(
-                ImmutableList.<StringInformation>builder().add(
-                    new StringInformationBuilder().setStringTlv(
-                        new StringTlvBuilder().setStringInfo("aaaa")
-            .build()).build()).build()).build());
-
-        return peerUpNotifBuilder.build();
+    public static PeerUpNotification createPeerUpNotification(final Ipv4AddressNoZone bgpId,
+            final boolean multiprotocol) {
+        return new PeerUpNotificationBuilder()
+                .setLocalAddress(new IpAddressNoZone(IPV4_ADDRESS_10))
+                .setLocalPort(PEER_LOCAL_PORT)
+                .setPeerHeader(createPeerHeader(bgpId))
+                .setReceivedOpen(new ReceivedOpenBuilder(createOpen(multiprotocol)).build())
+                .setRemotePort(PEER_REMOTE_PORT)
+                .setSentOpen((SentOpen) createOpen(multiprotocol))
+                .setInformation(new InformationBuilder().setStringInformation(
+                    ImmutableList.of(new StringInformationBuilder()
+                        .setStringTlv(new StringTlvBuilder().setStringInfo("aaaa").build())
+                        .build()))
+                    .build())
+                .build();

     }
 
     static PeerUpNotification createPeerUpNotification() {
     }
 
     static PeerUpNotification createPeerUpNotification() {


@@ -200,17 +200,17 @@ public final class TestUtil {
         return peerDownNotifBuilder.build();
     }
 
         return peerDownNotifBuilder.build();
     }
 

-    public static PeerDownNotification createPeerDownNotification(final Ipv4Address bgpId) {
+    public static PeerDownNotification createPeerDownNotification(final Ipv4AddressNoZone bgpId) {

         final NotificationBuilder notifBuilder = new NotificationBuilder()
             .setNotification(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message
                     .rev180329.peer.down.data.notification.NotificationBuilder()
             .setErrorCode(Uint8.ONE)
             .setErrorSubcode(Uint8.ONE).build());
         final NotificationBuilder notifBuilder = new NotificationBuilder()
             .setNotification(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message
                     .rev180329.peer.down.data.notification.NotificationBuilder()
             .setErrorCode(Uint8.ONE)
             .setErrorSubcode(Uint8.ONE).build());

-        final PeerDownNotificationBuilder peerDownNotifBuilder = new PeerDownNotificationBuilder()
+        return new PeerDownNotificationBuilder()

             .setData(notifBuilder.build())
             .setLocalSystemClosed(true)
             .setData(notifBuilder.build())
             .setLocalSystemClosed(true)

-            .setPeerHeader(TestUtil.createPeerHeader(bgpId));
-        return peerDownNotifBuilder.build();
+            .setPeerHeader(TestUtil.createPeerHeader(bgpId))
+            .build();

     }
 
     static PeerDownNotification createPeerDownNotification() {
     }
 
     static PeerDownNotification createPeerDownNotification() {


@@ -220,7 +220,7 @@ public final class TestUtil {
     private static List<BgpParameters> createBgpParameters(final boolean multiprotocol) {
         final BgpParametersBuilder bgpParamBuilder = new BgpParametersBuilder()
             .setOptionalCapabilities(createOptionalCapabilities(multiprotocol));
     private static List<BgpParameters> createBgpParameters(final boolean multiprotocol) {
         final BgpParametersBuilder bgpParamBuilder = new BgpParametersBuilder()
             .setOptionalCapabilities(createOptionalCapabilities(multiprotocol));

-        final List<BgpParameters> bgpParameters = Lists.newArrayList();
+        final List<BgpParameters> bgpParameters = new ArrayList<>();

         bgpParameters.add(bgpParamBuilder.build());
 
         return bgpParameters;
         bgpParameters.add(bgpParamBuilder.build());
 
         return bgpParameters;


@@ -242,7 +242,7 @@ public final class TestUtil {
             .setCParameters(paramsBuilder
                     .setAs4BytesCapability(new As4BytesCapabilityBuilder()
                             .setAsNumber(new AsNumber(Uint32.valueOf(80))).build()).build());
             .setCParameters(paramsBuilder
                     .setAs4BytesCapability(new As4BytesCapabilityBuilder()
                             .setAsNumber(new AsNumber(Uint32.valueOf(80))).build()).build());

-        final List<OptionalCapabilities> optCapabilities = Lists.newArrayList();
+        final List<OptionalCapabilities> optCapabilities = new ArrayList<>();

         optCapabilities.add(optCapabilitiesBuilder.build());
         optCapabilities.add(optCapabilitiesBuilder2.build());
 
         optCapabilities.add(optCapabilitiesBuilder.build());
         optCapabilities.add(optCapabilitiesBuilder2.build());
 


@@ -251,7 +251,7 @@ public final class TestUtil {
 
     private static OpenMessage createOpen(final boolean mutiprotocol) {
         final SentOpenBuilder sentOpenBuilder = new SentOpenBuilder()
 
     private static OpenMessage createOpen(final boolean mutiprotocol) {
         final SentOpenBuilder sentOpenBuilder = new SentOpenBuilder()

-            .setBgpIdentifier(new Ipv4Address(IPV4_ADDRESS_20))
+            .setBgpIdentifier(IPV4_ADDRESS_20)

             .setHoldTimer(Uint16.valueOf(1000))
             .setMyAsNumber(Uint16.valueOf(72))
             .setBgpParameters(createBgpParameters(mutiprotocol));
             .setHoldTimer(Uint16.valueOf(1000))
             .setMyAsNumber(Uint16.valueOf(72))
             .setBgpParameters(createBgpParameters(mutiprotocol));


@@ -264,14 +264,14 @@ public final class TestUtil {
     }
 
     public static RouteMonitoringMessage createRouteMonitMsg(final boolean withNormalizedIpv4Prefixes,
     }
 
     public static RouteMonitoringMessage createRouteMonitMsg(final boolean withNormalizedIpv4Prefixes,

-            final Ipv4Address bgpId, final AdjRibInType ribType) {
-        final RouteMonitoringMessageBuilder routeMonitMsgBuilder = new RouteMonitoringMessageBuilder()
+            final Ipv4AddressNoZone bgpId, final AdjRibInType ribType) {
+        return new RouteMonitoringMessageBuilder()

             .setPeerHeader(createPeerHeader(bgpId, ribType))
             .setPeerHeader(createPeerHeader(bgpId, ribType))

-            .setUpdate(createUpdate(withNormalizedIpv4Prefixes));
-        return routeMonitMsgBuilder.build();
+            .setUpdate(createUpdate(withNormalizedIpv4Prefixes))
+            .build();

     }
 
     }
 

-    public static RouteMirroringMessage createRouteMirrorMsg(final Ipv4Address bgpId) {
+    public static RouteMirroringMessage createRouteMirrorMsg(final Ipv4AddressNoZone bgpId) {

         final RouteMirroringMessageBuilder routeMirrorMsgBuilder = new RouteMirroringMessageBuilder()
             .setPeerHeader(createPeerHeader(bgpId));
         final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev180329.mirror
         final RouteMirroringMessageBuilder routeMirrorMsgBuilder = new RouteMirroringMessageBuilder()
             .setPeerHeader(createPeerHeader(bgpId));
         final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev180329.mirror


@@ -299,13 +299,13 @@ public final class TestUtil {
     private static Attributes createAttributes() {
         final List<AsNumber> asSequences = Lists.newArrayList(new AsNumber(Uint32.valueOf(72)),
             new AsNumber(Uint32.valueOf(82)), new AsNumber(Uint32.valueOf(92)));
     private static Attributes createAttributes() {
         final List<AsNumber> asSequences = Lists.newArrayList(new AsNumber(Uint32.valueOf(72)),
             new AsNumber(Uint32.valueOf(82)), new AsNumber(Uint32.valueOf(92)));

-        final List<Segments> segments = Lists.newArrayList();
+        final List<Segments> segments = new ArrayList<>();

         final SegmentsBuilder segmentsBuild = new SegmentsBuilder();
         segmentsBuild.setAsSequence(asSequences).build();
 
         final AttributesBuilder attribBuilder = new AttributesBuilder()
             .setAggregator(new AggregatorBuilder().setAsNumber(new AsNumber(Uint32.valueOf(72)))
         final SegmentsBuilder segmentsBuild = new SegmentsBuilder();
         segmentsBuild.setAsSequence(asSequences).build();
 
         final AttributesBuilder attribBuilder = new AttributesBuilder()
             .setAggregator(new AggregatorBuilder().setAsNumber(new AsNumber(Uint32.valueOf(72)))

-                    .setNetworkAddress(new Ipv4Address(IPV4_ADDRESS_20)).build())
+                    .setNetworkAddress(IPV4_ADDRESS_20).build())

             .setAigp(new AigpBuilder().setAigpTlv(new AigpTlvBuilder()
                     .setMetric(new AccumulatedIgpMetric(Uint64.ONE)).build()).build())
             .setAsPath(new AsPathBuilder().setSegments(segments).build())
             .setAigp(new AigpBuilder().setAigpTlv(new AigpTlvBuilder()
                     .setMetric(new AccumulatedIgpMetric(Uint64.ONE)).build()).build())
             .setAsPath(new AsPathBuilder().setSegments(segments).build())


@@ -324,7 +324,7 @@ public final class TestUtil {
     }
 
     private static List<Communities> createCommunities() {
     }
 
     private static List<Communities> createCommunities() {

-        final List<Communities> communities = Lists.newArrayList();
+        final List<Communities> communities = new ArrayList<>();

         final CommunitiesBuilder commBuilder = new CommunitiesBuilder()
             .setAsNumber(new AsNumber(Uint32.valueOf(65535)))
             .setSemantics(Uint16.valueOf(65381));
         final CommunitiesBuilder commBuilder = new CommunitiesBuilder()
             .setAsNumber(new AsNumber(Uint32.valueOf(65535)))
             .setSemantics(Uint16.valueOf(65381));


@@ -360,7 +360,7 @@ public final class TestUtil {
         return Lists.newArrayList(w1, w2, w3);
     }
 
         return Lists.newArrayList(w1, w2, w3);
     }
 

-    public static StatsReportsMessage createStatsReportMsg(final Ipv4Address bgpId) {
+    public static StatsReportsMessage createStatsReportMsg(final Ipv4AddressNoZone bgpId) {

         final StatsReportsMessageBuilder statsReportMsgBuilder = new StatsReportsMessageBuilder();
         statsReportMsgBuilder.setPeerHeader(TestUtil.createPeerHeader(bgpId));
         final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev180329.stat
         final StatsReportsMessageBuilder statsReportMsgBuilder = new StatsReportsMessageBuilder();
         statsReportMsgBuilder.setPeerHeader(TestUtil.createPeerHeader(bgpId));
         final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev180329.stat


@@ -405,7 +405,7 @@ public final class TestUtil {
     }
 
 
     }
 
 

-    public static RouteMonitoringMessage createRouteMonMsgWithEndOfRibMarker(final Ipv4Address bgpId,
+    public static RouteMonitoringMessage createRouteMonMsgWithEndOfRibMarker(final Ipv4AddressNoZone bgpId,

             final AdjRibInType ribType) {
         return new RouteMonitoringMessageBuilder().setPeerHeader(createPeerHeader(bgpId, ribType))
                 .setUpdate(createEndOfRibMarker()).build();
             final AdjRibInType ribType) {
         return new RouteMonitoringMessageBuilder().setPeerHeader(createPeerHeader(bgpId, ribType))
                 .setUpdate(createEndOfRibMarker()).build();


@@ -414,5 +414,4 @@ public final class TestUtil {
     private static Update createEndOfRibMarker() {
         return new UpdateBuilder().build();
     }
     private static Update createEndOfRibMarker() {
         return new UpdateBuilder().build();
     }

-

 }
 }

diff --git a/bmp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/spi/parser/AbstractBmpPerPeerMessageParser.java b/bmp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/spi/parser/AbstractBmpPerPeerMessageParser.java
index 27539f2a633ea48e1e34d6a09c41fc2514d86b32..f582ff1b397461c59cb7d8e4cae8e41b8c3c87c6 100644 (file)
--- a/bmp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/spi/parser/AbstractBmpPerPeerMessageParser.java
+++ b/bmp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/spi/parser/AbstractBmpPerPeerMessageParser.java
@@ -18,7 +18,7 @@ import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.protocol.util.Ipv4Util;
 import org.opendaylight.protocol.util.Ipv6Util;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 import org.opendaylight.protocol.util.Ipv4Util;
 import org.opendaylight.protocol.util.Ipv6Util;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;

-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.IpAddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Timestamp;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev180329.AdjRibInType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev180329.Peer.PeerDistinguisher;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Timestamp;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev180329.AdjRibInType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev180329.Peer.PeerDistinguisher;


@@ -83,9 +83,9 @@ public abstract class AbstractBmpPerPeerMessageParser<T extends Builder<?>> exte
         }
         if (phBuilder.isIpv4()) {
             bytes.skipBytes(Ipv6Util.IPV6_LENGTH - Ipv4Util.IP4_LENGTH);
         }
         if (phBuilder.isIpv4()) {
             bytes.skipBytes(Ipv6Util.IPV6_LENGTH - Ipv4Util.IP4_LENGTH);

-            phBuilder.setAddress(new IpAddress(Ipv4Util.addressForByteBuf(bytes)));
+            phBuilder.setAddress(new IpAddressNoZone(Ipv4Util.addressForByteBuf(bytes)));

         } else {
         } else {

-            phBuilder.setAddress(new IpAddress(Ipv6Util.addressForByteBuf(bytes)));
+            phBuilder.setAddress(new IpAddressNoZone(Ipv6Util.addressForByteBuf(bytes)));

         }
         phBuilder.setAs(new AsNumber(ByteBufUtils.readUint32(bytes)));
         phBuilder.setBgpId(Ipv4Util.addressForByteBuf(bytes));
         }
         phBuilder.setAs(new AsNumber(ByteBufUtils.readUint32(bytes)));
         phBuilder.setBgpId(Ipv4Util.addressForByteBuf(bytes));


@@ -117,9 +117,9 @@ public abstract class AbstractBmpPerPeerMessageParser<T extends Builder<?>> exte
         }
         if (peerHeader.isIpv4()) {
             output.writeZero(Ipv6Util.IPV6_LENGTH - Ipv4Util.IP4_LENGTH);
         }
         if (peerHeader.isIpv4()) {
             output.writeZero(Ipv6Util.IPV6_LENGTH - Ipv4Util.IP4_LENGTH);

-            Ipv4Util.writeIpv4Address(peerHeader.getAddress().getIpv4Address(), output);
+            Ipv4Util.writeIpv4Address(peerHeader.getAddress().getIpv4AddressNoZone(), output);

         } else {
         } else {

-            Ipv6Util.writeIpv6Address(peerHeader.getAddress().getIpv6Address(), output);
+            Ipv6Util.writeIpv6Address(peerHeader.getAddress().getIpv6AddressNoZone(), output);

         }
         ByteBufUtils.write(output, peerHeader.getAs().getValue());
         Ipv4Util.writeIpv4Address(peerHeader.getBgpId(), output);
         }
         ByteBufUtils.write(output, peerHeader.getAs().getValue());
         Ipv4Util.writeIpv4Address(peerHeader.getBgpId(), output);

diff --git a/bmp/bmp-spi/src/test/java/org/opendaylight/protocol/bmp/spi/parser/AbstractBmpPerPeerMessageParserTest.java b/bmp/bmp-spi/src/test/java/org/opendaylight/protocol/bmp/spi/parser/AbstractBmpPerPeerMessageParserTest.java
index 0fac7e3d9bd4201deba0e58093f6edd57b3f6672..d19c71f9149d3a14bfec722524789253a36e6bcd 100644 (file)
--- a/bmp/bmp-spi/src/test/java/org/opendaylight/protocol/bmp/spi/parser/AbstractBmpPerPeerMessageParserTest.java
+++ b/bmp/bmp-spi/src/test/java/org/opendaylight/protocol/bmp/spi/parser/AbstractBmpPerPeerMessageParserTest.java
@@ -20,9 +20,9 @@ import org.opendaylight.protocol.bgp.parser.spi.MessageRegistry;
 import org.opendaylight.protocol.bgp.parser.spi.pojo.ServiceLoaderBGPExtensionProviderContext;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 import org.opendaylight.protocol.bgp.parser.spi.pojo.ServiceLoaderBGPExtensionProviderContext;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;

-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.Ipv6Address;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressNoZone;
+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.Ipv6AddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Timestamp;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.RdTwoOctetAs;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.RouteDistinguisher;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Timestamp;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.RdTwoOctetAs;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.RouteDistinguisher;


@@ -94,9 +94,9 @@ public class AbstractBmpPerPeerMessageParserTest {
             .setType(PeerType.forValue(0))
             .setAdjRibInType(AdjRibInType.forValue(1))
             .setIpv4(true)
             .setType(PeerType.forValue(0))
             .setAdjRibInType(AdjRibInType.forValue(1))
             .setIpv4(true)

-            .setAddress(new IpAddress(new Ipv4Address("192.168.1.1")))
+            .setAddress(new IpAddressNoZone(new Ipv4AddressNoZone("192.168.1.1")))

             .setAs(new AsNumber(Uint32.valueOf(168)))
             .setAs(new AsNumber(Uint32.valueOf(168)))

-            .setBgpId(new Ipv4Address("1.1.1.1"))
+            .setBgpId(new Ipv4AddressNoZone("1.1.1.1"))

             .setTimestampSec(new Timestamp(Uint32.valueOf(16909060)))
             .setTimestampMicro(new Timestamp(Uint32.valueOf(16909060)))
             .build());
             .setTimestampSec(new Timestamp(Uint32.valueOf(16909060)))
             .setTimestampMicro(new Timestamp(Uint32.valueOf(16909060)))
             .build());


@@ -118,9 +118,9 @@ public class AbstractBmpPerPeerMessageParserTest {
                     new RouteDistinguisher(new RdTwoOctetAs("0:" + RD))))
                 .setAdjRibInType(AdjRibInType.forValue(1))
                 .setIpv4(false)
                     new RouteDistinguisher(new RdTwoOctetAs("0:" + RD))))
                 .setAdjRibInType(AdjRibInType.forValue(1))
                 .setIpv4(false)

-                .setAddress(new IpAddress(new Ipv6Address("2001::1")))
+                .setAddress(new IpAddressNoZone(new Ipv6AddressNoZone("2001::1")))

                 .setAs(new AsNumber(Uint32.valueOf(168)))
                 .setAs(new AsNumber(Uint32.valueOf(168)))

-                .setBgpId(new Ipv4Address("1.1.1.2"))
+                .setBgpId(new Ipv4AddressNoZone("1.1.1.2"))

                 .setTimestampSec(new Timestamp(Uint32.ZERO))
                 .setTimestampMicro(new Timestamp(Uint32.ZERO));
 
                 .setTimestampSec(new Timestamp(Uint32.ZERO))
                 .setTimestampMicro(new Timestamp(Uint32.ZERO));
 

diff --git a/pcep/api/src/main/yang/pcep-config.yang b/pcep/api/src/main/yang/pcep-config.yang
index 01b3bdd7ae97d1357c63f7f10f5ea67e7a6964ad..501d41148973f6ccf156f4732e86da10973b100f 100644 (file)
--- a/pcep/api/src/main/yang/pcep-config.yang
+++ b/pcep/api/src/main/yang/pcep-config.yang
@@ -36,7 +36,7 @@ module pcep-config {
             }
 
             leaf listen-address {
             }
 
             leaf listen-address {

-                type inet:ip-address;
+                type inet:ip-address-no-zone;

                 default "0.0.0.0";
             }
 
                 default "0.0.0.0";
             }
 


@@ -69,4 +69,4 @@ module pcep-config {
             }
         }
     }
             }
         }
     }

-}
\ No newline at end of file
+}

diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPPccIdReqIPv4ObjectParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPPccIdReqIPv4ObjectParser.java
index 18be23365709f4d96b347e6cb4d67d428d51c760..873180d0cc37ea763891e30c08637d3e61a74918 100644 (file)
--- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPPccIdReqIPv4ObjectParser.java
+++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPPccIdReqIPv4ObjectParser.java
@@ -5,10 +5,10 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */

-

 package org.opendaylight.protocol.pcep.parser.object;
 
 package org.opendaylight.protocol.pcep.parser.object;
 

-import com.google.common.base.Preconditions;
+import static com.google.common.base.Preconditions.checkArgument;
+

 import io.netty.buffer.ByteBuf;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.util.Ipv4Util;
 import io.netty.buffer.ByteBuf;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.util.Ipv4Util;


@@ -32,9 +32,7 @@ public final class PCEPPccIdReqIPv4ObjectParser extends AbstractPccIdReqObjectPa
 
     @Override
     public Object parseObject(final ObjectHeader header, final ByteBuf buffer) throws PCEPDeserializerException {
 
     @Override
     public Object parseObject(final ObjectHeader header, final ByteBuf buffer) throws PCEPDeserializerException {

-        Preconditions.checkArgument(buffer != null && buffer.isReadable(),
-            "Array of bytes is mandatory. Can't be null or empty.");
-        return
-            new PccIdReqBuilder().setIpAddress(new IpAddressNoZone(Ipv4Util.noZoneAddressForByteBuf(buffer))).build();
+        checkArgument(buffer != null && buffer.isReadable(), "Array of bytes is mandatory. Can't be null or empty.");
+        return new PccIdReqBuilder().setIpAddress(new IpAddressNoZone(Ipv4Util.addressForByteBuf(buffer))).build();

     }
 }
     }
 }

diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPPccIdReqIPv6ObjectParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPPccIdReqIPv6ObjectParser.java
index 2c7e98818202414912ecd899a6788a53f0c1d473..9d787c05960069684aa4863350e58eea740cd200 100644 (file)
--- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPPccIdReqIPv6ObjectParser.java
+++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPPccIdReqIPv6ObjectParser.java
@@ -5,10 +5,10 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */

-

 package org.opendaylight.protocol.pcep.parser.object;
 
 package org.opendaylight.protocol.pcep.parser.object;
 

-import com.google.common.base.Preconditions;
+import static com.google.common.base.Preconditions.checkArgument;
+

 import io.netty.buffer.ByteBuf;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.util.Ipv6Util;
 import io.netty.buffer.ByteBuf;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.util.Ipv6Util;


@@ -32,9 +32,7 @@ public final class PCEPPccIdReqIPv6ObjectParser extends AbstractPccIdReqObjectPa
 
     @Override
     public Object parseObject(final ObjectHeader header, final ByteBuf buffer) throws PCEPDeserializerException {
 
     @Override
     public Object parseObject(final ObjectHeader header, final ByteBuf buffer) throws PCEPDeserializerException {

-        Preconditions.checkArgument(buffer != null && buffer.isReadable(),
-                "Array of bytes is mandatory. Can't be null or empty.");
-        return
-            new PccIdReqBuilder().setIpAddress(new IpAddressNoZone(Ipv6Util.noZoneAddressForByteBuf(buffer))).build();
+        checkArgument(buffer != null && buffer.isReadable(), "Array of bytes is mandatory. Can't be null or empty.");
+        return new PccIdReqBuilder().setIpAddress(new IpAddressNoZone(Ipv6Util.addressForByteBuf(buffer))).build();

     }
 }
     }
 }

diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPPceIdIPv4ObjectParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPPceIdIPv4ObjectParser.java
index 83edaac20721d0de29b4a2c9b5b040afc3b1ae61..3fd2fcafa304ca0472f1623df5e441b09b6828ed 100644 (file)
--- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPPceIdIPv4ObjectParser.java
+++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPPceIdIPv4ObjectParser.java
@@ -5,10 +5,10 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */

-

 package org.opendaylight.protocol.pcep.parser.object;
 
 package org.opendaylight.protocol.pcep.parser.object;
 

-import com.google.common.base.Preconditions;
+import static com.google.common.base.Preconditions.checkArgument;
+

 import io.netty.buffer.ByteBuf;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.util.Ipv4Util;
 import io.netty.buffer.ByteBuf;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.util.Ipv4Util;


@@ -32,8 +32,7 @@ public class PCEPPceIdIPv4ObjectParser extends AbstractPceIdObjectParser {
 
     @Override
     public Object parseObject(final ObjectHeader header, final ByteBuf buffer) throws PCEPDeserializerException {
 
     @Override
     public Object parseObject(final ObjectHeader header, final ByteBuf buffer) throws PCEPDeserializerException {

-        Preconditions.checkArgument(buffer != null && buffer.isReadable(),
-                "Array of bytes is mandatory. Can't be null or empty.");
-        return new PceIdBuilder().setIpAddress(new IpAddressNoZone(Ipv4Util.noZoneAddressForByteBuf(buffer))).build();
+        checkArgument(buffer != null && buffer.isReadable(), "Array of bytes is mandatory. Can't be null or empty.");
+        return new PceIdBuilder().setIpAddress(new IpAddressNoZone(Ipv4Util.addressForByteBuf(buffer))).build();

     }
 }
     }
 }

diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPPceIdIPv6ObjectParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPPceIdIPv6ObjectParser.java
index fcaa7d2ea7241f995d7f84054a3326f592d830e7..a36a72f58f767c8aa4740e094dbc60a8ac3dfc1d 100644 (file)
--- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPPceIdIPv6ObjectParser.java
+++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPPceIdIPv6ObjectParser.java
@@ -5,10 +5,10 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */

-

 package org.opendaylight.protocol.pcep.parser.object;
 
 package org.opendaylight.protocol.pcep.parser.object;
 

-import com.google.common.base.Preconditions;
+import static com.google.common.base.Preconditions.checkArgument;
+

 import io.netty.buffer.ByteBuf;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.util.Ipv6Util;
 import io.netty.buffer.ByteBuf;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.util.Ipv6Util;


@@ -32,8 +32,7 @@ public class PCEPPceIdIPv6ObjectParser extends AbstractPceIdObjectParser {
 
     @Override
     public Object parseObject(final ObjectHeader header, final ByteBuf buffer) throws PCEPDeserializerException {
 
     @Override
     public Object parseObject(final ObjectHeader header, final ByteBuf buffer) throws PCEPDeserializerException {

-        Preconditions.checkArgument(buffer != null && buffer.isReadable(),
-                "Array of bytes is mandatory. Can't be null or empty.");
-        return new PceIdBuilder().setIpAddress(new IpAddressNoZone(Ipv6Util.noZoneAddressForByteBuf(buffer))).build();
+        checkArgument(buffer != null && buffer.isReadable(), "Array of bytes is mandatory. Can't be null or empty.");
+        return new PceIdBuilder().setIpAddress(new IpAddressNoZone(Ipv6Util.addressForByteBuf(buffer))).build();

     }
 }
     }
 }

diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/end/points/PCEPEndPointsIpv4ObjectParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/end/points/PCEPEndPointsIpv4ObjectParser.java
index 461c1e2272fcd5c370294939bfcf7263adf6ab3b..2261938be562b505dfc982a202cda464257d9b05 100644 (file)
--- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/end/points/PCEPEndPointsIpv4ObjectParser.java
+++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/end/points/PCEPEndPointsIpv4ObjectParser.java
@@ -65,8 +65,8 @@ public class PCEPEndPointsIpv4ObjectParser extends CommonObjectParser {
             throw new PCEPDeserializerException("Wrong length of array of bytes.");
         }
         final Ipv4Builder ipv4bldr = new Ipv4Builder()
             throw new PCEPDeserializerException("Wrong length of array of bytes.");
         }
         final Ipv4Builder ipv4bldr = new Ipv4Builder()

-                .setSourceIpv4Address(Ipv4Util.noZoneAddressForByteBuf(bytes))
-                .setDestinationIpv4Address(Ipv4Util.noZoneAddressForByteBuf(bytes));
+                .setSourceIpv4Address(Ipv4Util.addressForByteBuf(bytes))
+                .setDestinationIpv4Address(Ipv4Util.addressForByteBuf(bytes));

         builder.setIgnore(header.isIgnore())
                 .setProcessingRule(header.isProcessingRule())
                 .setAddressFamily(new Ipv4CaseBuilder().setIpv4(ipv4bldr.build()).build());
         builder.setIgnore(header.isIgnore())
                 .setProcessingRule(header.isProcessingRule())
                 .setAddressFamily(new Ipv4CaseBuilder().setIpv4(ipv4bldr.build()).build());

diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/end/points/PCEPEndPointsIpv6ObjectParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/end/points/PCEPEndPointsIpv6ObjectParser.java
index 775961fa219e27c05d8e50a474e148abe0071844..0dcd4174dfac077203384a06c86565eacd4bf12d 100644 (file)
--- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/end/points/PCEPEndPointsIpv6ObjectParser.java
+++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/end/points/PCEPEndPointsIpv6ObjectParser.java
@@ -65,11 +65,11 @@ public final class PCEPEndPointsIpv6ObjectParser extends CommonObjectParser {
             throw new PCEPDeserializerException("Wrong length of array of bytes.");
         }
         final Ipv6Builder ipv6bldr = new Ipv6Builder()
             throw new PCEPDeserializerException("Wrong length of array of bytes.");
         }
         final Ipv6Builder ipv6bldr = new Ipv6Builder()

-                .setSourceIpv6Address(Ipv6Util.noZoneAddressForByteBuf(bytes))
-                .setDestinationIpv6Address(Ipv6Util.noZoneAddressForByteBuf(bytes));
-        builder.setIgnore(header.isIgnore())
+                .setSourceIpv6Address(Ipv6Util.addressForByteBuf(bytes))
+                .setDestinationIpv6Address(Ipv6Util.addressForByteBuf(bytes));
+        return builder.setIgnore(header.isIgnore())

                 .setProcessingRule(header.isProcessingRule())
                 .setProcessingRule(header.isProcessingRule())

-                .setAddressFamily(new Ipv6CaseBuilder().setIpv6(ipv6bldr.build()).build());
-        return builder.build();
+                .setAddressFamily(new Ipv6CaseBuilder().setIpv6(ipv6bldr.build()).build())
+                .build();

     }
 }
     }
 }

diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/end/points/PCEPP2MPEndPointsIpv4ObjectParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/end/points/PCEPP2MPEndPointsIpv4ObjectParser.java
index 369eadf1df6a6af87af541b7b50ef825db9ec456..24815858d91eede2e8fe110f1eb41170b32bf30a 100644 (file)
--- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/end/points/PCEPP2MPEndPointsIpv4ObjectParser.java
+++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/end/points/PCEPP2MPEndPointsIpv4ObjectParser.java
@@ -70,10 +70,10 @@ public class PCEPP2MPEndPointsIpv4ObjectParser extends CommonObjectParser {
         builder.setProcessingRule(header.isProcessingRule());
         final P2mpIpv4Builder p2mpIpv4Builder = new P2mpIpv4Builder();
         p2mpIpv4Builder.setP2mpLeaves(P2mpLeaves.forValue(bytes.readInt()));
         builder.setProcessingRule(header.isProcessingRule());
         final P2mpIpv4Builder p2mpIpv4Builder = new P2mpIpv4Builder();
         p2mpIpv4Builder.setP2mpLeaves(P2mpLeaves.forValue(bytes.readInt()));

-        p2mpIpv4Builder.setSourceIpv4Address(Ipv4Util.noZoneAddressForByteBuf(bytes));
+        p2mpIpv4Builder.setSourceIpv4Address(Ipv4Util.addressForByteBuf(bytes));

         List<Ipv4AddressNoZone> dest = new ArrayList<>();
         while (bytes.isReadable()) {
         List<Ipv4AddressNoZone> dest = new ArrayList<>();
         while (bytes.isReadable()) {

-            dest.add(Ipv4Util.noZoneAddressForByteBuf(bytes));
+            dest.add(Ipv4Util.addressForByteBuf(bytes));

         }
         p2mpIpv4Builder.setDestinationIpv4Address(dest);
         builder.setAddressFamily(new P2mpIpv4CaseBuilder().setP2mpIpv4(p2mpIpv4Builder.build()).build());
         }
         p2mpIpv4Builder.setDestinationIpv4Address(dest);
         builder.setAddressFamily(new P2mpIpv4CaseBuilder().setP2mpIpv4(p2mpIpv4Builder.build()).build());

diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/end/points/PCEPP2MPEndPointsIpv6ObjectParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/end/points/PCEPP2MPEndPointsIpv6ObjectParser.java
index ff3d83c97ab523f21470d4efdff04ce6de6d0b51..15dadb1da40812288b99442dae7225addda9cfdf 100644 (file)
--- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/end/points/PCEPP2MPEndPointsIpv6ObjectParser.java
+++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/end/points/PCEPP2MPEndPointsIpv6ObjectParser.java
@@ -69,16 +69,16 @@ public class PCEPP2MPEndPointsIpv6ObjectParser extends CommonObjectParser {
 
         final P2mpIpv6Builder p2mpIpv6Builder = new P2mpIpv6Builder()
                 .setP2mpLeaves(P2mpLeaves.forValue(bytes.readInt()))
 
         final P2mpIpv6Builder p2mpIpv6Builder = new P2mpIpv6Builder()
                 .setP2mpLeaves(P2mpLeaves.forValue(bytes.readInt()))

-                .setSourceIpv6Address(Ipv6Util.noZoneAddressForByteBuf(bytes));
+                .setSourceIpv6Address(Ipv6Util.addressForByteBuf(bytes));

         List<Ipv6AddressNoZone> dest = new ArrayList<>();
         while (bytes.isReadable()) {
         List<Ipv6AddressNoZone> dest = new ArrayList<>();
         while (bytes.isReadable()) {

-            dest.add(Ipv6Util.noZoneAddressForByteBuf(bytes));
+            dest.add(Ipv6Util.addressForByteBuf(bytes));

         }
         p2mpIpv6Builder.setDestinationIpv6Address(dest);
         }
         p2mpIpv6Builder.setDestinationIpv6Address(dest);

-        final EndpointsObjBuilder builder = new EndpointsObjBuilder()
+        return new EndpointsObjBuilder()

                 .setIgnore(header.isIgnore())
                 .setProcessingRule(header.isProcessingRule())
                 .setIgnore(header.isIgnore())
                 .setProcessingRule(header.isProcessingRule())

-                .setAddressFamily(new P2mpIpv6CaseBuilder().setP2mpIpv6(p2mpIpv6Builder.build()).build());
-        return builder.build();
+                .setAddressFamily(new P2mpIpv6CaseBuilder().setP2mpIpv6(p2mpIpv6Builder.build()).build())
+                .build();

     }
 }
     }
 }

diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/unreach/PCEPIpv4UnreachDestinationParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/unreach/PCEPIpv4UnreachDestinationParser.java
index 25bfca7651af1093b05a4e84a9b112ba5a99d034..fc8b70be92cec5d52beaca48cd47c1f61067f36e 100644 (file)
--- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/unreach/PCEPIpv4UnreachDestinationParser.java
+++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/unreach/PCEPIpv4UnreachDestinationParser.java
@@ -56,7 +56,7 @@ public final class PCEPIpv4UnreachDestinationParser extends CommonObjectParser {
         builder.setProcessingRule(header.isProcessingRule());
         List<Ipv4AddressNoZone> dest = new ArrayList<>();
         while (bytes.isReadable()) {
         builder.setProcessingRule(header.isProcessingRule());
         List<Ipv4AddressNoZone> dest = new ArrayList<>();
         while (bytes.isReadable()) {

-            dest.add(Ipv4Util.noZoneAddressForByteBuf(bytes));
+            dest.add(Ipv4Util.addressForByteBuf(bytes));

         }
         builder.setDestination(new Ipv4DestinationCaseBuilder().setDestinationIpv4Address(dest).build());
         return builder.build();
         }
         builder.setDestination(new Ipv4DestinationCaseBuilder().setDestinationIpv4Address(dest).build());
         return builder.build();

diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/unreach/PCEPIpv6UnreachDestinationParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/unreach/PCEPIpv6UnreachDestinationParser.java
index 21cf459a58f902a19cc4ba07f6970ca5b8b554b5..f81a7a8c58eb6e682f54fe033d064a4b9b5fdfb8 100644 (file)
--- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/unreach/PCEPIpv6UnreachDestinationParser.java
+++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/unreach/PCEPIpv6UnreachDestinationParser.java
@@ -56,9 +56,9 @@ public final class PCEPIpv6UnreachDestinationParser extends CommonObjectParser {
         builder.setProcessingRule(header.isProcessingRule());
         List<Ipv6AddressNoZone> dest = new ArrayList<>();
         while (bytes.isReadable()) {
         builder.setProcessingRule(header.isProcessingRule());
         List<Ipv6AddressNoZone> dest = new ArrayList<>();
         while (bytes.isReadable()) {

-            dest.add(Ipv6Util.noZoneAddressForByteBuf(bytes));
+            dest.add(Ipv6Util.addressForByteBuf(bytes));

         }
         }

-        builder.setDestination(new Ipv6DestinationCaseBuilder().setDestinationIpv6Address(dest).build());
-        return builder.build();
+        return builder.setDestination(new Ipv6DestinationCaseBuilder().setDestinationIpv6Address(dest).build())
+                .build();

     }
 }
     }
 }

diff --git a/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07LSPIdentifierIpv4TlvParser.java b/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07LSPIdentifierIpv4TlvParser.java
index 53eb5691dda3a0f79cf38784752ae8bb39a44e09..e429c36ac55d6a1946736e13818a11f72a7e77a7 100644 (file)
--- a/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07LSPIdentifierIpv4TlvParser.java
+++ b/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07LSPIdentifierIpv4TlvParser.java
@@ -47,11 +47,11 @@ public final class Stateful07LSPIdentifierIpv4TlvParser implements TlvParser, Tl
         checkArgument(buffer.readableBytes() == V4_LENGTH, "Length %s does not match LSP Identifiers Ipv4 tlv length.",
                 buffer.readableBytes());
         final Ipv4Builder builder = new Ipv4Builder()
         checkArgument(buffer.readableBytes() == V4_LENGTH, "Length %s does not match LSP Identifiers Ipv4 tlv length.",
                 buffer.readableBytes());
         final Ipv4Builder builder = new Ipv4Builder()

-                .setIpv4TunnelSenderAddress(Ipv4Util.noZoneAddressForByteBuf(buffer));
+                .setIpv4TunnelSenderAddress(Ipv4Util.addressForByteBuf(buffer));

         final LspId lspId = new LspId(Uint32.valueOf(buffer.readUnsignedShort()));
         final TunnelId tunnelId = new TunnelId(ByteBufUtils.readUint16(buffer));
         final LspId lspId = new LspId(Uint32.valueOf(buffer.readUnsignedShort()));
         final TunnelId tunnelId = new TunnelId(ByteBufUtils.readUint16(buffer));

-        builder.setIpv4ExtendedTunnelId(new Ipv4ExtendedTunnelId(Ipv4Util.noZoneAddressForByteBuf(buffer)));
-        builder.setIpv4TunnelEndpointAddress(Ipv4Util.noZoneAddressForByteBuf(buffer));
+        builder.setIpv4ExtendedTunnelId(new Ipv4ExtendedTunnelId(Ipv4Util.addressForByteBuf(buffer)));
+        builder.setIpv4TunnelEndpointAddress(Ipv4Util.addressForByteBuf(buffer));

         final AddressFamily afi = new Ipv4CaseBuilder().setIpv4(builder.build()).build();
         return new LspIdentifiersBuilder()
                 .setAddressFamily(afi)
         final AddressFamily afi = new Ipv4CaseBuilder().setIpv4(builder.build()).build();
         return new LspIdentifiersBuilder()
                 .setAddressFamily(afi)

diff --git a/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07LSPIdentifierIpv6TlvParser.java b/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07LSPIdentifierIpv6TlvParser.java
index badb1c753691007a88d2b0416b77585e83c2f630..462b7027c5bdfbf391f6df524c9aa2bc28f514d8 100644 (file)
--- a/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07LSPIdentifierIpv6TlvParser.java
+++ b/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07LSPIdentifierIpv6TlvParser.java
@@ -46,11 +46,11 @@ public final class Stateful07LSPIdentifierIpv6TlvParser implements TlvParser, Tl
         checkArgument(buffer.readableBytes() == V6_LENGTH, "Length %s does not match LSP Identifiers Ipv6 tlv length.",
                 buffer.readableBytes());
         final Ipv6Builder builder = new Ipv6Builder();
         checkArgument(buffer.readableBytes() == V6_LENGTH, "Length %s does not match LSP Identifiers Ipv6 tlv length.",
                 buffer.readableBytes());
         final Ipv6Builder builder = new Ipv6Builder();

-        builder.setIpv6TunnelSenderAddress(Ipv6Util.noZoneAddressForByteBuf(buffer));
+        builder.setIpv6TunnelSenderAddress(Ipv6Util.addressForByteBuf(buffer));

         final LspId lspId = new LspId(Uint32.valueOf(buffer.readUnsignedShort()));
         final TunnelId tunnelId = new TunnelId(ByteBufUtils.readUint16(buffer));
         final LspId lspId = new LspId(Uint32.valueOf(buffer.readUnsignedShort()));
         final TunnelId tunnelId = new TunnelId(ByteBufUtils.readUint16(buffer));

-        builder.setIpv6ExtendedTunnelId(new Ipv6ExtendedTunnelId(Ipv6Util.noZoneAddressForByteBuf(buffer)));
-        builder.setIpv6TunnelEndpointAddress(Ipv6Util.noZoneAddressForByteBuf(buffer));
+        builder.setIpv6ExtendedTunnelId(new Ipv6ExtendedTunnelId(Ipv6Util.addressForByteBuf(buffer)));
+        builder.setIpv6TunnelEndpointAddress(Ipv6Util.addressForByteBuf(buffer));

         final AddressFamily afi = new Ipv6CaseBuilder().setIpv6(builder.build()).build();
         return new LspIdentifiersBuilder().setAddressFamily(afi).setLspId(lspId).setTunnelId(tunnelId).build();
     }
         final AddressFamily afi = new Ipv6CaseBuilder().setIpv6(builder.build()).build();
         return new LspIdentifiersBuilder().setAddressFamily(afi).setLspId(lspId).setTunnelId(tunnelId).build();
     }

diff --git a/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07RSVPErrorSpecTlvParser.java b/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07RSVPErrorSpecTlvParser.java
index 01c908f6b937962618099eeb8277708c8d8ec16e..ce02b576538eb643c908cfdebf05097db4c287c0 100644 (file)
--- a/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07RSVPErrorSpecTlvParser.java
+++ b/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07RSVPErrorSpecTlvParser.java
@@ -119,9 +119,9 @@ public final class Stateful07RSVPErrorSpecTlvParser implements TlvParser, TlvSer
     private static RsvpCase parseRsvp(final int classType, final ByteBuf buffer) {
         final RsvpErrorBuilder builder = new RsvpErrorBuilder();
         if (classType == RSVP_IPV4_ERROR_CLASS_TYPE) {
     private static RsvpCase parseRsvp(final int classType, final ByteBuf buffer) {
         final RsvpErrorBuilder builder = new RsvpErrorBuilder();
         if (classType == RSVP_IPV4_ERROR_CLASS_TYPE) {

-            builder.setNode(new IpAddressNoZone(Ipv4Util.noZoneAddressForByteBuf(buffer)));
+            builder.setNode(new IpAddressNoZone(Ipv4Util.addressForByteBuf(buffer)));

         } else if (classType == RSVP_IPV6_ERROR_CLASS_TYPE) {
         } else if (classType == RSVP_IPV6_ERROR_CLASS_TYPE) {

-            builder.setNode(new IpAddressNoZone(Ipv6Util.noZoneAddressForByteBuf(buffer)));
+            builder.setNode(new IpAddressNoZone(Ipv6Util.addressForByteBuf(buffer)));

         }
         final BitArray flags = BitArray.valueOf(buffer, FLAGS_SIZE);
         builder.setFlags(new Flags(flags.get(IN_PLACE), flags.get(NOT_GUILTY)));
         }
         final BitArray flags = BitArray.valueOf(buffer, FLAGS_SIZE);
         builder.setFlags(new Flags(flags.get(IN_PLACE), flags.get(NOT_GUILTY)));

diff --git a/pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPObjectParserTest.java b/pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPObjectParserTest.java
index c77f6c5d26bfdd95994054d8db05b114b9ff9903..87d859419b02e21cae7e3710fbb63d5d1d2bcec7 100644 (file)
--- a/pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPObjectParserTest.java
+++ b/pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPObjectParserTest.java
@@ -212,11 +212,11 @@ public class PCEPObjectParserTest {
         final LspIdentifiers tlv3 = new LspIdentifiersBuilder()
                 .setAddressFamily(new Ipv4CaseBuilder()
                     .setIpv4(new Ipv4Builder()
         final LspIdentifiers tlv3 = new LspIdentifiersBuilder()
                 .setAddressFamily(new Ipv4CaseBuilder()
                     .setIpv4(new Ipv4Builder()

-                        .setIpv4TunnelSenderAddress(Ipv4Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer(
+                        .setIpv4TunnelSenderAddress(Ipv4Util.addressForByteBuf(Unpooled.wrappedBuffer(

                             new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78 })))
                             new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78 })))

-                        .setIpv4ExtendedTunnelId(new Ipv4ExtendedTunnelId(Ipv4Util.noZoneAddressForByteBuf(
+                        .setIpv4ExtendedTunnelId(new Ipv4ExtendedTunnelId(Ipv4Util.addressForByteBuf(

                             Unpooled.wrappedBuffer(new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78 }))))
                             Unpooled.wrappedBuffer(new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78 }))))

-                        .setIpv4TunnelEndpointAddress(Ipv4Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer(
+                        .setIpv4TunnelEndpointAddress(Ipv4Util.addressForByteBuf(Unpooled.wrappedBuffer(

                             new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78 })))
                         .build())
                     .build())
                             new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78 })))
                         .build())
                     .build())


@@ -225,7 +225,7 @@ public class PCEPObjectParserTest {
         final RsvpErrorSpec tlv4 = new RsvpErrorSpecBuilder()
                 .setErrorType(new RsvpCaseBuilder()
                     .setRsvpError(new RsvpErrorBuilder()
         final RsvpErrorSpec tlv4 = new RsvpErrorSpecBuilder()
                 .setErrorType(new RsvpCaseBuilder()
                     .setRsvpError(new RsvpErrorBuilder()

-                        .setNode(new IpAddressNoZone(Ipv4Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer(
+                        .setNode(new IpAddressNoZone(Ipv4Util.addressForByteBuf(Unpooled.wrappedBuffer(

                             new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78 }))))
                         .setFlags(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820
                             .ErrorSpec.Flags(false, true))
                             new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78 }))))
                         .setFlags(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820
                             .ErrorSpec.Flags(false, true))

diff --git a/pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPTlvParserTest.java b/pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPTlvParserTest.java
index e2993cc3d6556ad4ed282f5afb4325d38a7f7dd9..95abe9f04ec414eef08386b254d454d847ac4f2f 100644 (file)
--- a/pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPTlvParserTest.java
+++ b/pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPTlvParserTest.java
@@ -146,11 +146,11 @@ public class PCEPTlvParserTest {
     public void testLspIdentifiers4Tlv() throws PCEPDeserializerException {
         final Stateful07LSPIdentifierIpv4TlvParser parser = new Stateful07LSPIdentifierIpv4TlvParser();
         final Ipv4Builder afi = new Ipv4Builder();
     public void testLspIdentifiers4Tlv() throws PCEPDeserializerException {
         final Stateful07LSPIdentifierIpv4TlvParser parser = new Stateful07LSPIdentifierIpv4TlvParser();
         final Ipv4Builder afi = new Ipv4Builder();

-        afi.setIpv4TunnelSenderAddress(Ipv4Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer(
+        afi.setIpv4TunnelSenderAddress(Ipv4Util.addressForByteBuf(Unpooled.wrappedBuffer(

             new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78 })));
             new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78 })));

-        afi.setIpv4ExtendedTunnelId(new Ipv4ExtendedTunnelId(Ipv4Util.noZoneAddressForByteBuf(
+        afi.setIpv4ExtendedTunnelId(new Ipv4ExtendedTunnelId(Ipv4Util.addressForByteBuf(

             Unpooled.wrappedBuffer(new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78 }))));
             Unpooled.wrappedBuffer(new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78 }))));

-        afi.setIpv4TunnelEndpointAddress(Ipv4Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer(
+        afi.setIpv4TunnelEndpointAddress(Ipv4Util.addressForByteBuf(Unpooled.wrappedBuffer(

             new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78 })));
         final LspIdentifiers tlv = new LspIdentifiersBuilder().setAddressFamily(
             new Ipv4CaseBuilder().setIpv4(afi.build()).build()).setLspId(new LspId(Uint32.valueOf(65535)))
             new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78 })));
         final LspIdentifiers tlv = new LspIdentifiersBuilder().setAddressFamily(
             new Ipv4CaseBuilder().setIpv4(afi.build()).build()).setLspId(new LspId(Uint32.valueOf(65535)))


@@ -165,19 +165,19 @@ public class PCEPTlvParserTest {
     public void testLspIdentifiers6Tlv() throws PCEPDeserializerException {
         final Stateful07LSPIdentifierIpv6TlvParser parser = new Stateful07LSPIdentifierIpv6TlvParser();
         final Ipv6Builder afi = new Ipv6Builder();
     public void testLspIdentifiers6Tlv() throws PCEPDeserializerException {
         final Stateful07LSPIdentifierIpv6TlvParser parser = new Stateful07LSPIdentifierIpv6TlvParser();
         final Ipv6Builder afi = new Ipv6Builder();

-        afi.setIpv6TunnelSenderAddress(Ipv6Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer(
+        afi.setIpv6TunnelSenderAddress(Ipv6Util.addressForByteBuf(Unpooled.wrappedBuffer(

             new byte[] {
                 (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78,
                 (byte) 0x9A, (byte) 0xBC, (byte) 0xDE, (byte) 0xF0, (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78,
                 (byte) 0x9A, (byte) 0xBC, (byte) 0xDE, (byte) 0xF0
             })));
             new byte[] {
                 (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78,
                 (byte) 0x9A, (byte) 0xBC, (byte) 0xDE, (byte) 0xF0, (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78,
                 (byte) 0x9A, (byte) 0xBC, (byte) 0xDE, (byte) 0xF0
             })));

-        afi.setIpv6ExtendedTunnelId(new Ipv6ExtendedTunnelId(Ipv6Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer(
+        afi.setIpv6ExtendedTunnelId(new Ipv6ExtendedTunnelId(Ipv6Util.addressForByteBuf(Unpooled.wrappedBuffer(

             new byte[] {
                 (byte) 0x12, (byte) 0x34, (byte) 0x56,
                 (byte) 0x78, (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78, (byte) 0x01, (byte) 0x23, (byte) 0x45,
                 (byte) 0x67, (byte) 0x01, (byte) 0x23, (byte) 0x45, (byte) 0x67
             }))));
             new byte[] {
                 (byte) 0x12, (byte) 0x34, (byte) 0x56,
                 (byte) 0x78, (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78, (byte) 0x01, (byte) 0x23, (byte) 0x45,
                 (byte) 0x67, (byte) 0x01, (byte) 0x23, (byte) 0x45, (byte) 0x67
             }))));

-        afi.setIpv6TunnelEndpointAddress(Ipv6Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer(
+        afi.setIpv6TunnelEndpointAddress(Ipv6Util.addressForByteBuf(Unpooled.wrappedBuffer(

             new byte[] {
                 (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78,
                 (byte) 0x9A, (byte) 0xBC, (byte) 0xDE, (byte) 0xF0, (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78,
             new byte[] {
                 (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78,
                 (byte) 0x9A, (byte) 0xBC, (byte) 0xDE, (byte) 0xF0, (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78,


@@ -196,7 +196,7 @@ public class PCEPTlvParserTest {
     public void testRSVPError4SpecTlv() throws PCEPDeserializerException {
         final Stateful07RSVPErrorSpecTlvParser parser = new Stateful07RSVPErrorSpecTlvParser();
         final RsvpErrorBuilder builder = new RsvpErrorBuilder()
     public void testRSVPError4SpecTlv() throws PCEPDeserializerException {
         final Stateful07RSVPErrorSpecTlvParser parser = new Stateful07RSVPErrorSpecTlvParser();
         final RsvpErrorBuilder builder = new RsvpErrorBuilder()

-                .setNode(new IpAddressNoZone(Ipv4Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer(
+                .setNode(new IpAddressNoZone(Ipv4Util.addressForByteBuf(Unpooled.wrappedBuffer(

                     new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78 }))))
                 .setFlags(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.ErrorSpec
                     .Flags(false, true))
                     new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78 }))))
                 .setFlags(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.ErrorSpec
                     .Flags(false, true))


@@ -214,7 +214,7 @@ public class PCEPTlvParserTest {
     public void testRSVPError6SpecTlv() throws PCEPDeserializerException {
         final Stateful07RSVPErrorSpecTlvParser parser = new Stateful07RSVPErrorSpecTlvParser();
         final RsvpErrorBuilder builder = new RsvpErrorBuilder()
     public void testRSVPError6SpecTlv() throws PCEPDeserializerException {
         final Stateful07RSVPErrorSpecTlvParser parser = new Stateful07RSVPErrorSpecTlvParser();
         final RsvpErrorBuilder builder = new RsvpErrorBuilder()

-                .setNode(new IpAddressNoZone(Ipv6Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer(new byte[] {
+                .setNode(new IpAddressNoZone(Ipv6Util.addressForByteBuf(Unpooled.wrappedBuffer(new byte[] {

                     (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78,
                     (byte) 0x9a, (byte) 0xbc, (byte) 0xde, (byte) 0xf0, (byte) 0x12, (byte) 0x34, (byte) 0x56,
                     (byte) 0x78, (byte) 0x9a, (byte) 0xbc, (byte) 0xde, (byte) 0xf0
                     (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78,
                     (byte) 0x9a, (byte) 0xbc, (byte) 0xde, (byte) 0xf0, (byte) 0x12, (byte) 0x34, (byte) 0x56,
                     (byte) 0x78, (byte) 0x9a, (byte) 0xbc, (byte) 0xde, (byte) 0xf0

diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPObjectParserTest.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPObjectParserTest.java
index 9db53cd60d4096f2d3591b4a06be15f44e5a9d22..306a9038deda4394c68e321ea1c178d17bde52dc 100644 (file)
--- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPObjectParserTest.java
+++ b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPObjectParserTest.java
@@ -531,13 +531,15 @@ public class PCEPObjectParserTest {
         final ByteBuf result
             = Unpooled.wrappedBuffer(ByteArray.fileToBytes("src/test/resources/PCEPEndPointsObject1IPv4.bin"));
 
         final ByteBuf result
             = Unpooled.wrappedBuffer(ByteArray.fileToBytes("src/test/resources/PCEPEndPointsObject1IPv4.bin"));
 

-        final EndpointsObjBuilder builder = new EndpointsObjBuilder();
-        builder.setProcessingRule(true);
-        builder.setIgnore(false);
-        builder.setAddressFamily(new Ipv4CaseBuilder().setIpv4(
-            new Ipv4Builder().setSourceIpv4Address(Ipv4Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer(srcIPBytes)))
-                .setDestinationIpv4Address(
-                Ipv4Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer(destIPBytes))).build()).build());
+        final EndpointsObjBuilder builder = new EndpointsObjBuilder()
+                .setProcessingRule(true)
+                .setIgnore(false)
+                .setAddressFamily(new Ipv4CaseBuilder()
+                    .setIpv4(new Ipv4Builder()
+                        .setSourceIpv4Address(Ipv4Util.addressForByteBuf(Unpooled.wrappedBuffer(srcIPBytes)))
+                        .setDestinationIpv4Address(Ipv4Util.addressForByteBuf(Unpooled.wrappedBuffer(destIPBytes)))
+                        .build())
+                    .build());

 
         assertEquals(builder.build(), parser.parseObject(new ObjectHeaderImpl(true, false),
             result.slice(4, result.readableBytes() - 4)));
 
         assertEquals(builder.build(), parser.parseObject(new ObjectHeaderImpl(true, false),
             result.slice(4, result.readableBytes() - 4)));


@@ -579,7 +581,7 @@ public class PCEPObjectParserTest {
         builder.setIgnore(false);
         builder.setAddressFamily(new P2mpIpv4CaseBuilder().setP2mpIpv4(new P2mpIpv4Builder()
                 .setP2mpLeaves(P2mpLeaves.NewLeavesToAdd)
         builder.setIgnore(false);
         builder.setAddressFamily(new P2mpIpv4CaseBuilder().setP2mpIpv4(new P2mpIpv4Builder()
                 .setP2mpLeaves(P2mpLeaves.NewLeavesToAdd)

-                .setSourceIpv4Address(Ipv4Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer(srcIPBytes)))
+                .setSourceIpv4Address(Ipv4Util.addressForByteBuf(Unpooled.wrappedBuffer(srcIPBytes)))

                 .setDestinationIpv4Address(Arrays.asList(new Ipv4AddressNoZone("255.255.255.255"),
                         new Ipv4AddressNoZone("255.255.255.252"))).build()).build());
 
                 .setDestinationIpv4Address(Arrays.asList(new Ipv4AddressNoZone("255.255.255.255"),
                         new Ipv4AddressNoZone("255.255.255.252"))).build()).build());
 


@@ -623,8 +625,8 @@ public class PCEPObjectParserTest {
         builder.setProcessingRule(true);
         builder.setIgnore(false);
         builder.setAddressFamily(new Ipv6CaseBuilder().setIpv6(
         builder.setProcessingRule(true);
         builder.setIgnore(false);
         builder.setAddressFamily(new Ipv6CaseBuilder().setIpv6(

-            new Ipv6Builder().setSourceIpv6Address(Ipv6Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer(srcIPBytes)))
-                .setDestinationIpv6Address(Ipv6Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer(destIPBytes)))
+            new Ipv6Builder().setSourceIpv6Address(Ipv6Util.addressForByteBuf(Unpooled.wrappedBuffer(srcIPBytes)))
+                .setDestinationIpv6Address(Ipv6Util.addressForByteBuf(Unpooled.wrappedBuffer(destIPBytes)))

                 .build()).build());
 
         assertEquals(builder.build(), parser.parseObject(new ObjectHeaderImpl(true, false),
                 .build()).build());
 
         assertEquals(builder.build(), parser.parseObject(new ObjectHeaderImpl(true, false),


@@ -677,7 +679,7 @@ public class PCEPObjectParserTest {
         builder.setIgnore(false);
         builder.setAddressFamily(new P2mpIpv6CaseBuilder().setP2mpIpv6(new P2mpIpv6Builder()
                 .setP2mpLeaves(P2mpLeaves.NewLeavesToAdd)
         builder.setIgnore(false);
         builder.setAddressFamily(new P2mpIpv6CaseBuilder().setP2mpIpv6(new P2mpIpv6Builder()
                 .setP2mpLeaves(P2mpLeaves.NewLeavesToAdd)

-                .setSourceIpv6Address(Ipv6Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer(srcIPBytes)))
+                .setSourceIpv6Address(Ipv6Util.addressForByteBuf(Unpooled.wrappedBuffer(srcIPBytes)))

                 .setDestinationIpv6Address(Arrays.asList(
                         new Ipv6AddressNoZone("2:5dd2:ffec:a1b6:581e:9f50::"),
                         new Ipv6AddressNoZone("3:5dd2:ffec:a1b6:581e:9f50::")
                 .setDestinationIpv6Address(Arrays.asList(
                         new Ipv6AddressNoZone("2:5dd2:ffec:a1b6:581e:9f50::"),
                         new Ipv6AddressNoZone("3:5dd2:ffec:a1b6:581e:9f50::")

diff --git a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/PCCEndPointIpv4ObjectParser.java b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/PCCEndPointIpv4ObjectParser.java
index 06e351defd3dfe32df9ab5185a2a0011a8729258..01691339f9a03ca5612307bc526357ba2fc82e9e 100644 (file)
--- a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/PCCEndPointIpv4ObjectParser.java
+++ b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/PCCEndPointIpv4ObjectParser.java
@@ -5,10 +5,10 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */

-

 package org.opendaylight.protocol.pcep.pcc.mock;
 
 package org.opendaylight.protocol.pcep.pcc.mock;
 

-import com.google.common.base.Preconditions;
+import static com.google.common.base.Preconditions.checkArgument;
+

 import io.netty.buffer.ByteBuf;
 import org.opendaylight.protocol.pcep.parser.object.end.points.PCEPEndPointsIpv4ObjectParser;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import io.netty.buffer.ByteBuf;
 import org.opendaylight.protocol.pcep.parser.object.end.points.PCEPEndPointsIpv4ObjectParser;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;


@@ -23,8 +23,7 @@ public class PCCEndPointIpv4ObjectParser extends PCEPEndPointsIpv4ObjectParser {
 
     @Override
     public Object parseObject(final ObjectHeader header, final ByteBuf bytes) throws PCEPDeserializerException {
 
     @Override
     public Object parseObject(final ObjectHeader header, final ByteBuf bytes) throws PCEPDeserializerException {

-        Preconditions.checkArgument(bytes != null && bytes.isReadable(),
-                "Array of bytes is mandatory. Can't be null or empty.");
+        checkArgument(bytes != null && bytes.isReadable(), "Array of bytes is mandatory. Can't be null or empty.");

         final EndpointsObjBuilder builder = new EndpointsObjBuilder();
         if (bytes.readableBytes() != Ipv4Util.IP4_LENGTH * 2) {
             throw new PCEPDeserializerException("Wrong length of array of bytes.");
         final EndpointsObjBuilder builder = new EndpointsObjBuilder();
         if (bytes.readableBytes() != Ipv4Util.IP4_LENGTH * 2) {
             throw new PCEPDeserializerException("Wrong length of array of bytes.");


@@ -32,8 +31,8 @@ public class PCCEndPointIpv4ObjectParser extends PCEPEndPointsIpv4ObjectParser {
         builder.setIgnore(header.isIgnore());
         builder.setProcessingRule(header.isProcessingRule());
         final Ipv4Builder b = new Ipv4Builder();
         builder.setIgnore(header.isIgnore());
         builder.setProcessingRule(header.isProcessingRule());
         final Ipv4Builder b = new Ipv4Builder();

-        b.setSourceIpv4Address(Ipv4Util.noZoneAddressForByteBuf(bytes));
-        b.setDestinationIpv4Address(Ipv4Util.noZoneAddressForByteBuf(bytes));
+        b.setSourceIpv4Address(Ipv4Util.addressForByteBuf(bytes));
+        b.setDestinationIpv4Address(Ipv4Util.addressForByteBuf(bytes));

         builder.setAddressFamily(new Ipv4CaseBuilder().setIpv4(b.build()).build());
         return builder.build();
     }
         builder.setAddressFamily(new Ipv4CaseBuilder().setIpv4(b.build()).build());
         return builder.build();
     }

diff --git a/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCEndPointIpv4ObjectParserTest.java b/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCEndPointIpv4ObjectParserTest.java
index 9409e6d0e84195bf360e4247eb385dd2aa8ebb6d..2188744bafde459345a455e875d0a5786eeb3ffc 100644 (file)
--- a/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCEndPointIpv4ObjectParserTest.java
+++ b/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCEndPointIpv4ObjectParserTest.java
@@ -5,7 +5,6 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */

-

 package org.opendaylight.protocol.pcep.pcc.mock;
 
 import static org.junit.Assert.assertEquals;
 package org.opendaylight.protocol.pcep.pcc.mock;
 
 import static org.junit.Assert.assertEquals;


@@ -17,7 +16,7 @@ import org.junit.Test;
 import org.opendaylight.protocol.pcep.spi.ObjectHeaderImpl;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.util.Ipv4Util;
 import org.opendaylight.protocol.pcep.spi.ObjectHeaderImpl;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.util.Ipv4Util;

-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.opendaylight.params.xml.ns.yang.pcep.types.rev181109.ObjectHeader;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.endpoints.address.family.Ipv4Case;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.endpoints.object.EndpointsObj;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.ObjectHeader;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.endpoints.address.family.Ipv4Case;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.endpoints.object.EndpointsObj;


@@ -39,8 +38,8 @@ public class PCCEndPointIpv4ObjectParserTest {
     public void testParseObject() throws PCEPDeserializerException {
         final ObjectHeader header = new ObjectHeaderImpl(false, false);
         final ByteBuf bytes = Unpooled.buffer();
     public void testParseObject() throws PCEPDeserializerException {
         final ObjectHeader header = new ObjectHeaderImpl(false, false);
         final ByteBuf bytes = Unpooled.buffer();

-        bytes.writeBytes(Ipv4Util.bytesForAddress(new Ipv4Address(IP1)));
-        bytes.writeBytes(Ipv4Util.bytesForAddress(new Ipv4Address(IP2)));
+        bytes.writeBytes(Ipv4Util.bytesForAddress(new Ipv4AddressNoZone(IP1)));
+        bytes.writeBytes(Ipv4Util.bytesForAddress(new Ipv4AddressNoZone(IP2)));

         final EndpointsObj output = (EndpointsObj) new PCCEndPointIpv4ObjectParser().parseObject(header, bytes);
 
         assertEquals(IP1, ((Ipv4Case) output.getAddressFamily()).getIpv4().getSourceIpv4Address().getValue());
         final EndpointsObj output = (EndpointsObj) new PCCEndPointIpv4ObjectParser().parseObject(header, bytes);
 
         assertEquals(IP1, ((Ipv4Case) output.getAddressFamily()).getIpv4().getSourceIpv4Address().getValue());

diff --git a/pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/segment/routing/AbstractSrSubobjectParser.java b/pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/segment/routing/AbstractSrSubobjectParser.java
index 6842b24e2020db8fa50f87d42d5a3cae6a6e0a6d..291d974bba324b6b5c54ffa9a84d83cc5bae9bf4 100644 (file)
--- a/pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/segment/routing/AbstractSrSubobjectParser.java
+++ b/pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/segment/routing/AbstractSrSubobjectParser.java
@@ -151,19 +151,19 @@ public abstract class AbstractSrSubobjectParser {
     private static Nai parseNai(final SidType sidType, final ByteBuf buffer) {
         switch (sidType) {
             case Ipv4NodeId:
     private static Nai parseNai(final SidType sidType, final ByteBuf buffer) {
         switch (sidType) {
             case Ipv4NodeId:

-                return new IpNodeIdBuilder().setIpAddress(
-                    new IpAddressNoZone(Ipv4Util.noZoneAddressForByteBuf(buffer))).build();
+                return new IpNodeIdBuilder().setIpAddress(new IpAddressNoZone(Ipv4Util.addressForByteBuf(buffer)))
+                        .build();

             case Ipv6NodeId:
             case Ipv6NodeId:

-                return new IpNodeIdBuilder().setIpAddress(
-                    new IpAddressNoZone(Ipv6Util.noZoneAddressForByteBuf(buffer))).build();
+                return new IpNodeIdBuilder().setIpAddress(new IpAddressNoZone(Ipv6Util.addressForByteBuf(buffer)))
+                        .build();

             case Ipv4Adjacency:
                 return new IpAdjacencyBuilder()
             case Ipv4Adjacency:
                 return new IpAdjacencyBuilder()

-                        .setLocalIpAddress(new IpAddressNoZone(Ipv4Util.noZoneAddressForByteBuf(buffer)))
-                        .setRemoteIpAddress(new IpAddressNoZone(Ipv4Util.noZoneAddressForByteBuf(buffer))).build();
+                        .setLocalIpAddress(new IpAddressNoZone(Ipv4Util.addressForByteBuf(buffer)))
+                        .setRemoteIpAddress(new IpAddressNoZone(Ipv4Util.addressForByteBuf(buffer))).build();

             case Ipv6Adjacency:
                 return new IpAdjacencyBuilder()
             case Ipv6Adjacency:
                 return new IpAdjacencyBuilder()

-                        .setLocalIpAddress(new IpAddressNoZone(Ipv6Util.noZoneAddressForByteBuf(buffer)))
-                        .setRemoteIpAddress(new IpAddressNoZone(Ipv6Util.noZoneAddressForByteBuf(buffer))).build();
+                        .setLocalIpAddress(new IpAddressNoZone(Ipv6Util.addressForByteBuf(buffer)))
+                        .setRemoteIpAddress(new IpAddressNoZone(Ipv6Util.addressForByteBuf(buffer))).build();

             case Unnumbered:
                 return new UnnumberedAdjacencyBuilder()
                         .setLocalNodeId(ByteBufUtils.readUint32(buffer))
             case Unnumbered:
                 return new UnnumberedAdjacencyBuilder()
                         .setLocalNodeId(ByteBufUtils.readUint32(buffer))

diff --git a/pcep/topology/topology-api/src/main/yang/network-topology-pcep.yang b/pcep/topology/topology-api/src/main/yang/network-topology-pcep.yang
index d5eaf1527c87cc1e5f05375742074c8299b43536..80eaf821e6f1fed5c4019409a262f1b077593125 100644 (file)
--- a/pcep/topology/topology-api/src/main/yang/network-topology-pcep.yang
+++ b/pcep/topology/topology-api/src/main/yang/network-topology-pcep.yang
@@ -102,7 +102,7 @@ module network-topology-pcep {
                     nor its relationship to other control, management, or
                     data plane addresses.";
 
                     nor its relationship to other control, management, or
                     data plane addresses.";
 

-                type inet:ip-address;
+                type inet:ip-address-no-zone;

             }
 
             container stateful-tlv {
             }
 
             container stateful-tlv {

diff --git a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java
index 86588e0c3196b78bf0c7aad7460bfcaf4f6ba7be..3b9e0ae35e44393bad1f8bc128b041e52b362325 100755 (executable)
--- a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java
+++ b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java
@@ -43,7 +43,7 @@ import org.opendaylight.protocol.pcep.PCEPCloseTermination;
 import org.opendaylight.protocol.pcep.PCEPSession;
 import org.opendaylight.protocol.pcep.PCEPTerminationReason;
 import org.opendaylight.protocol.pcep.TerminationReason;
 import org.opendaylight.protocol.pcep.PCEPSession;
 import org.opendaylight.protocol.pcep.PCEPTerminationReason;
 import org.opendaylight.protocol.pcep.TerminationReason;

-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressNoZoneBuilder;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.LspObject;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.Path1;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.lsp.object.Lsp;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.LspObject;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.Path1;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.lsp.object.Lsp;


@@ -162,7 +162,7 @@ public abstract class AbstractTopologySessionListener<S, L> implements TopologyS
         onSessionUp(psession, pccBuilder);
         this.synced.set(isSynchronized());
 
         onSessionUp(psession, pccBuilder);
         this.synced.set(isSynchronized());
 

-        pccBuilder.setIpAddress(IpAddressBuilder.getDefaultInstance(peerAddress.getHostAddress()));
+        pccBuilder.setIpAddress(IpAddressNoZoneBuilder.getDefaultInstance(peerAddress.getHostAddress()));

         final InstanceIdentifier<Node1> topologyAugment = state.getNodeId().augmentation(Node1.class);
         this.pccIdentifier = topologyAugment.child(PathComputationClient.class);
         final Node initialNodeState = state.getInitialNodeState();
         final InstanceIdentifier<Node1> topologyAugment = state.getNodeId().augmentation(Node1.class);
         this.pccIdentifier = topologyAugment.child(PathComputationClient.class);
         final Node initialNodeState = state.getInitialNodeState();

diff --git a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyProviderUtil.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyProviderUtil.java
index a6908754d28cf3243db201a604d79ea9cd9b7a63..8d1368e2bffd3bf1ec551dd554783be4e1b7d435 100644 (file)
--- a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyProviderUtil.java
+++ b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyProviderUtil.java
@@ -17,7 +17,7 @@ import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.protocol.concepts.KeyMapping;
 import org.opendaylight.protocol.pcep.SpeakerIdMapping;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil;
 import org.opendaylight.protocol.concepts.KeyMapping;
 import org.opendaylight.protocol.pcep.SpeakerIdMapping;
 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.IpAddressNoZone;

 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.rfc2385.cfg.rev160324.Rfc2385Key;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.config.rev181109.PcepNodeConfig;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.rfc2385.cfg.rev160324.Rfc2385Key;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.config.rev181109.PcepNodeConfig;


@@ -54,8 +54,9 @@ final class PCEPTopologyProviderUtil {
         return ret;
     }
 
         return ret;
     }
 

-    static InetSocketAddress getInetSocketAddress(final @NonNull IpAddress address, final @NonNull PortNumber port) {
-        return new InetSocketAddress(IetfInetUtil.INSTANCE.inetAddressFor(address), port.getValue().toJava());
+    static InetSocketAddress getInetSocketAddress(final @NonNull IpAddressNoZone address,
+            final @NonNull PortNumber port) {
+        return new InetSocketAddress(IetfInetUtil.INSTANCE.inetAddressForNoZone(address), port.getValue().toJava());

     }
 
     static boolean filterPcepTopologies(final @Nullable TopologyTypes topologyTypes) {
     }
 
     static boolean filterPcepTopologies(final @Nullable TopologyTypes topologyTypes) {

diff --git a/pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractPCEPSessionTest.java b/pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractPCEPSessionTest.java
index 16c45c385d167036e78e144bea65d4edc4e0d9ff..e415ff2b3239b0035c59bf4b1ca0e1afec4067b6 100644 (file)
--- a/pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractPCEPSessionTest.java
+++ b/pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractPCEPSessionTest.java
@@ -41,9 +41,9 @@ import org.opendaylight.protocol.pcep.PCEPSessionListener;
 import org.opendaylight.protocol.pcep.impl.DefaultPCEPSessionNegotiator;
 import org.opendaylight.protocol.pcep.impl.PCEPSessionImpl;
 import org.opendaylight.protocol.util.InetSocketAddressUtil;
 import org.opendaylight.protocol.pcep.impl.DefaultPCEPSessionNegotiator;
 import org.opendaylight.protocol.pcep.impl.PCEPSessionImpl;
 import org.opendaylight.protocol.util.InetSocketAddressUtil;

-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.IpAddressNoZone;

 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.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.PortNumber;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.config.rev171025.pcep.config.SessionConfig;
 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;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.config.rev171025.pcep.config.SessionConfig;


@@ -147,7 +147,8 @@ public abstract class AbstractPCEPSessionTest<T extends TopologySessionListenerF
 
         @SuppressWarnings("unchecked") final T listenerFactory = (T) ((Class) ((ParameterizedType) this.getClass()
                 .getGenericSuperclass()).getActualTypeArguments()[0]).newInstance();
 
         @SuppressWarnings("unchecked") final T listenerFactory = (T) ((Class) ((ParameterizedType) this.getClass()
                 .getGenericSuperclass()).getActualTypeArguments()[0]).newInstance();

-        doReturn(new IpAddress(new Ipv4Address(this.testAddress))).when(this.sessionConfig).getListenAddress();
+        doReturn(new IpAddressNoZone(new Ipv4AddressNoZone(this.testAddress))).when(this.sessionConfig)
+            .getListenAddress();

         doReturn(new PortNumber(Uint16.valueOf(4189))).when(this.sessionConfig).getListenPort();
         doReturn(RPC_TIMEOUT).when(this.sessionConfig).getRpcTimeout();
         doReturn(TEST_TOPOLOGY_ID).when(this.topology).getTopologyId();
         doReturn(new PortNumber(Uint16.valueOf(4189))).when(this.sessionConfig).getListenPort();
         doReturn(RPC_TIMEOUT).when(this.sessionConfig).getRpcTimeout();
         doReturn(TEST_TOPOLOGY_ID).when(this.topology).getTopologyId();

diff --git a/pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListenerTest.java b/pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListenerTest.java
index befdc2cfb70eb3df06b1452492e5c35ef442f63f..4f33b07e1505d784831df2c824c7890694c95f94 100755 (executable)
--- a/pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListenerTest.java
+++ b/pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListenerTest.java
@@ -155,7 +155,7 @@ public class Stateful07TopologySessionListenerTest
                 Optional.of(MsgBuilderUtil.createSrp(Uint32.ZERO)), null);
         this.listener.onMessage(this.session, esm);
         readDataOperational(getDataBroker(), this.pathComputationClientIId, pcc -> {
                 Optional.of(MsgBuilderUtil.createSrp(Uint32.ZERO)), null);
         this.listener.onMessage(this.session, esm);
         readDataOperational(getDataBroker(), this.pathComputationClientIId, pcc -> {

-            assertEquals(this.testAddress, pcc.getIpAddress().getIpv4Address().getValue());
+            assertEquals(this.testAddress, pcc.getIpAddress().getIpv4AddressNoZone().getValue());

             // reported lsp so far empty, has not received response (PcRpt) yet
             assertTrue(pcc.getReportedLsp().isEmpty());
             return pcc;
             // reported lsp so far empty, has not received response (PcRpt) yet
             assertTrue(pcc.getReportedLsp().isEmpty());
             return pcc;

diff --git a/pcep/tunnel/tunnel-provider/src/test/java/org/opendaylight/bgpcep/pcep/tunnel/provider/NodeChangedListenerTest.java b/pcep/tunnel/tunnel-provider/src/test/java/org/opendaylight/bgpcep/pcep/tunnel/provider/NodeChangedListenerTest.java
index 9ba1b763a8ce483d821876ab4f578c49f5f78117..9bee31adc9201853f9fd43855104b693572437c2 100644 (file)
--- a/pcep/tunnel/tunnel-provider/src/test/java/org/opendaylight/bgpcep/pcep/tunnel/provider/NodeChangedListenerTest.java
+++ b/pcep/tunnel/tunnel-provider/src/test/java/org/opendaylight/bgpcep/pcep/tunnel/provider/NodeChangedListenerTest.java
@@ -24,6 +24,7 @@ import org.opendaylight.mdsal.binding.api.WriteTransaction;
 import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractConcurrentDataBrokerTest;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
 import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractConcurrentDataBrokerTest;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 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.IpAddressNoZone;

 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.opendaylight.params.xml.ns.yang.network.concepts.rev131125.Bandwidth;
 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.opendaylight.params.xml.ns.yang.network.concepts.rev131125.Bandwidth;


@@ -220,7 +221,7 @@ public class NodeChangedListenerTest extends AbstractConcurrentDataBrokerTest {
         node1Builder.setPathComputationClient(new PathComputationClientBuilder()
                 .setStateSync(PccSyncState.Synchronized)
                 .setReportedLsp(Lists.newArrayList(reportedLps))
         node1Builder.setPathComputationClient(new PathComputationClientBuilder()
                 .setStateSync(PccSyncState.Synchronized)
                 .setReportedLsp(Lists.newArrayList(reportedLps))

-                .setIpAddress(new IpAddress(new Ipv4Address(ipv4Address)))
+                .setIpAddress(new IpAddressNoZone(new Ipv4AddressNoZone(ipv4Address)))

                 .build());
         nodeBuilder.addAugmentation(Node1.class, node1Builder.build());
         final WriteTransaction wTx = getDataBroker().newWriteOnlyTransaction();
                 .build());
         nodeBuilder.addAugmentation(Node1.class, node1Builder.build());
         final WriteTransaction wTx = getDataBroker().newWriteOnlyTransaction();

diff --git a/rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/te/AssociationObjectParserIPV4.java b/rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/te/AssociationObjectParserIPV4.java
index e8f71738f11dbf1a2f0c478ce37e2e5b099014c9..ba0cda6cade8dc911e4a8df6df2b09826718d3c7 100644 (file)
--- a/rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/te/AssociationObjectParserIPV4.java
+++ b/rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/te/AssociationObjectParserIPV4.java
@@ -14,6 +14,6 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.
 public final class AssociationObjectParserIPV4 extends AbstractAssociationParser {
     @Override
     protected IpAddressNoZone parseAssociationIpAddress(final ByteBuf byteBuf) {
 public final class AssociationObjectParserIPV4 extends AbstractAssociationParser {
     @Override
     protected IpAddressNoZone parseAssociationIpAddress(final ByteBuf byteBuf) {

-        return new IpAddressNoZone(Ipv4Util.noZoneAddressForByteBuf(byteBuf));
+        return new IpAddressNoZone(Ipv4Util.addressForByteBuf(byteBuf));

     }
 }
     }
 }

diff --git a/rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/te/AssociationObjectParserIPV6.java b/rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/te/AssociationObjectParserIPV6.java
index 6d66fd3fdf6b5753d4cf0e4261fcab9cc9bac8ce..9b34b82bc0d643701aa01c86a85d91ccfa527b33 100644 (file)
--- a/rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/te/AssociationObjectParserIPV6.java
+++ b/rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/te/AssociationObjectParserIPV6.java
@@ -14,6 +14,6 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.
 public final class AssociationObjectParserIPV6 extends AbstractAssociationParser {
     @Override
     protected IpAddressNoZone parseAssociationIpAddress(final ByteBuf byteBuf) {
 public final class AssociationObjectParserIPV6 extends AbstractAssociationParser {
     @Override
     protected IpAddressNoZone parseAssociationIpAddress(final ByteBuf byteBuf) {

-        return new IpAddressNoZone(Ipv6Util.noZoneAddressForByteBuf(byteBuf));
+        return new IpAddressNoZone(Ipv6Util.addressForByteBuf(byteBuf));

     }
 }
     }
 }

diff --git a/rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/te/DetourObjectIpv4Parser.java b/rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/te/DetourObjectIpv4Parser.java
index e3afde14ef68940ab15228a83e1b2d41bb67aa63..5d03b745c063f64ab72cb8f64c7bcbe07b2396a7 100644 (file)
--- a/rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/te/DetourObjectIpv4Parser.java
+++ b/rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/te/DetourObjectIpv4Parser.java
@@ -31,8 +31,8 @@ public final class DetourObjectIpv4Parser extends AbstractRSVPObjectParser {
         final List<Plr> plrList = new ArrayList<>();
         while (byteBuf.isReadable()) {
             final PlrBuilder plr = new PlrBuilder();
         final List<Plr> plrList = new ArrayList<>();
         while (byteBuf.isReadable()) {
             final PlrBuilder plr = new PlrBuilder();

-            plr.setPlrId(Ipv4Util.noZoneAddressForByteBuf(byteBuf));
-            plr.setAvoidNode(Ipv4Util.noZoneAddressForByteBuf(byteBuf));
+            plr.setPlrId(Ipv4Util.addressForByteBuf(byteBuf));
+            plr.setAvoidNode(Ipv4Util.addressForByteBuf(byteBuf));

             plrList.add(plr.build());
         }
         return ipv4Case.setPlr(plrList).build();
             plrList.add(plr.build());
         }
         return ipv4Case.setPlr(plrList).build();

diff --git a/rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/te/DetourObjectIpv6Parser.java b/rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/te/DetourObjectIpv6Parser.java
index f37f19bafda3626ef17745330d4f82c03765c4fd..5b4d062c956ca19ab8a59089041ef2f2f23f6f01 100644 (file)
--- a/rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/te/DetourObjectIpv6Parser.java
+++ b/rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/te/DetourObjectIpv6Parser.java
@@ -36,14 +36,14 @@ public final class DetourObjectIpv6Parser extends AbstractRSVPObjectParser {
 
         while (plrId.isReadable()) {
             final PlrIdBuilder plr = new PlrIdBuilder();
 
         while (plrId.isReadable()) {
             final PlrIdBuilder plr = new PlrIdBuilder();

-            plr.setPlrId(Ipv6Util.noZoneAddressForByteBuf(plrId));
+            plr.setPlrId(Ipv6Util.addressForByteBuf(plrId));

             plrIdList.add(plr.build());
         }
 
         final List<AvoidNode> avoidNodeList = new ArrayList<>();
         while (byteBuf.isReadable()) {
             final AvoidNodeBuilder plr = new AvoidNodeBuilder();
             plrIdList.add(plr.build());
         }
 
         final List<AvoidNode> avoidNodeList = new ArrayList<>();
         while (byteBuf.isReadable()) {
             final AvoidNodeBuilder plr = new AvoidNodeBuilder();

-            plr.setAvoidNode(Ipv6Util.noZoneAddressForByteBuf(byteBuf));
+            plr.setAvoidNode(Ipv6Util.addressForByteBuf(byteBuf));

             avoidNodeList.add(plr.build());
         }
 
             avoidNodeList.add(plr.build());
         }
 

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 3b10fca15d49b663769a98bd50c16e0a2df56871..9672f1b276e0e80306ffd20a606e903e51665540 100644 (file)
--- a/util/src/main/java/org/opendaylight/protocol/util/Ipv4Util.java
+++ b/util/src/main/java/org/opendaylight/protocol/util/Ipv4Util.java
@@ -20,8 +20,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map.Entry;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil;
 import java.util.List;
 import java.util.Map.Entry;
 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.IpAddressNoZone;

 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;
 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;


@@ -41,23 +40,13 @@ public final class Ipv4Util {
         // Hidden on purpose
     }
 
         // Hidden on purpose
     }
 

-    /**
-     * Reads from ByteBuf buffer and converts bytes to Ipv4Address.
-     *
-     * @param buffer containing Ipv4 address, starting at reader index
-     * @return Ipv4Address
-     */
-    public static Ipv4Address addressForByteBuf(final ByteBuf buffer) {
-        return IetfInetUtil.INSTANCE.ipv4AddressFor(ByteArray.readBytes(buffer, IP4_LENGTH));
-    }
-

     /**
      * Reads from ByteBuf buffer and converts bytes to Ipv4Address.
      *
      * @param buffer containing Ipv4 address, starting at reader index
      * @return Ipv4AddressNoZone
      */
     /**
      * Reads from ByteBuf buffer and converts bytes to Ipv4Address.
      *
      * @param buffer containing Ipv4 address, starting at reader index
      * @return Ipv4AddressNoZone
      */

-    public static Ipv4AddressNoZone noZoneAddressForByteBuf(final ByteBuf buffer) {
+    public static Ipv4AddressNoZone addressForByteBuf(final ByteBuf buffer) {

         return IetfInetUtil.INSTANCE.ipv4AddressNoZoneFor(ByteArray.readBytes(buffer, IP4_LENGTH));
     }
 
         return IetfInetUtil.INSTANCE.ipv4AddressNoZoneFor(ByteArray.readBytes(buffer, IP4_LENGTH));
     }
 


@@ -67,7 +56,7 @@ public final class Ipv4Util {
      * @param ipAddress Ipv4 address
      * @return ByteBuf with filled in bytes from ipAddress
      */
      * @param ipAddress Ipv4 address
      * @return ByteBuf with filled in bytes from ipAddress
      */

-    public static ByteBuf byteBufForAddress(final Ipv4Address ipAddress) {
+    public static ByteBuf byteBufForAddress(final Ipv4AddressNoZone ipAddress) {

         return Unpooled.wrappedBuffer(bytesForAddress(ipAddress));
     }
 
         return Unpooled.wrappedBuffer(bytesForAddress(ipAddress));
     }
 


@@ -77,8 +66,8 @@ public final class Ipv4Util {
      * @param address Ipv4Address to be converted
      * @return byte array
      */
      * @param address Ipv4Address to be converted
      * @return byte array
      */

-    public static byte[] bytesForAddress(final Ipv4Address address) {
-        return IetfInetUtil.INSTANCE.ipv4AddressBytes(address);
+    public static byte[] bytesForAddress(final Ipv4AddressNoZone address) {
+        return IetfInetUtil.INSTANCE.ipv4AddressNoZoneBytes(address);

     }
 
     public static int prefixBitsToBytes(final int bits) {
     }
 
     public static int prefixBitsToBytes(final int bits) {


@@ -199,10 +188,10 @@ public final class Ipv4Util {
      * Converts InetAddress to IpAddress.
      *
      * @param inetAddress address
      * Converts InetAddress to IpAddress.
      *
      * @param inetAddress address

-     * @return IpAddress
+     * @return IpAddressNoZone

      */
      */

-    public static IpAddress getIpAddress(final InetAddress inetAddress) {
-        return IetfInetUtil.INSTANCE.ipAddressFor(inetAddress);
+    public static IpAddressNoZone getIpAddress(final InetAddress inetAddress) {
+        return IetfInetUtil.INSTANCE.ipAddressNoZoneFor(inetAddress);

     }
 
     /**
     }
 
     /**


@@ -212,7 +201,7 @@ public final class Ipv4Util {
      * @param port      number
      * @return InetSocketAddress
      */
      * @param port      number
      * @return InetSocketAddress
      */

-    public static InetSocketAddress toInetSocketAddress(final IpAddress ipAddress, final PortNumber port) {
+    public static InetSocketAddress toInetSocketAddress(final IpAddressNoZone ipAddress, final PortNumber port) {

         final String ipString = toStringIP(ipAddress);
         return new InetSocketAddress(InetAddresses.forString(ipString), port.getValue().toJava());
     }
         final String ipString = toStringIP(ipAddress);
         return new InetSocketAddress(InetAddresses.forString(ipString), port.getValue().toJava());
     }


@@ -233,12 +222,13 @@ public final class Ipv4Util {
      * @param ipv4Address ipv4 address to be incremented
      * @return new ipv4 address
      */
      * @param ipv4Address ipv4 address to be incremented
      * @return new ipv4 address
      */

-    public static Ipv4Address incrementIpv4Address(final Ipv4Address ipv4Address) {
-        return new Ipv4Address(incrementIpv4Address(ipv4Address.getValue()));
+    public static Ipv4AddressNoZone incrementIpv4Address(final Ipv4AddressNoZone ipv4Address) {
+        return new Ipv4AddressNoZone(incrementIpv4Address(ipv4Address.getValue()));

     }
 
     public static Ipv4Prefix incrementIpv4Prefix(final Ipv4Prefix ipv4Prefix) {
     }
 
     public static Ipv4Prefix incrementIpv4Prefix(final Ipv4Prefix ipv4Prefix) {

-        final Entry<Ipv4Address, Integer> splitIpv4Prefix = IetfInetUtil.INSTANCE.splitIpv4Prefix(ipv4Prefix);
+        final Entry<Ipv4AddressNoZone, Integer> splitIpv4Prefix =
+                IetfInetUtil.INSTANCE.splitIpv4PrefixNoZone(ipv4Prefix);

         return IetfInetUtil.INSTANCE.ipv4PrefixFor(incrementIpv4Address(splitIpv4Prefix.getKey()),
                 splitIpv4Prefix.getValue());
     }
         return IetfInetUtil.INSTANCE.ipv4PrefixFor(incrementIpv4Address(splitIpv4Prefix.getKey()),
                 splitIpv4Prefix.getValue());
     }


@@ -249,29 +239,11 @@ public final class Ipv4Util {
      * @param ipAddress address
      * @return String value of Ipv4Address or Ipv6Address
      */
      * @param ipAddress address
      * @return String value of Ipv4Address or Ipv6Address
      */

-    public static String toStringIP(final IpAddress ipAddress) {
-        if (ipAddress.getIpv4Address() != null) {
-            return ipAddress.getIpv4Address().getValue();
-        }
-        return ipAddress.getIpv6Address().getValue();
-    }
-
-
-    /**
-     * Writes IPv4 address if not null, otherwise writes zeros to the
-     * <code>output</code> ByteBuf. ByteBuf's writerIndex is increased by 4.
-     *
-     * @param ipv4Address
-     *            IPv4 address to be written to the output.
-     * @param output
-     *            ByteBuf, where ipv4Address or zeros are written.
-     */
-    public static void writeIpv4Address(final Ipv4Address ipv4Address, final ByteBuf output) {
-        if (ipv4Address != null) {
-            output.writeBytes(bytesForAddress(ipv4Address));
-        } else {
-            output.writeInt(0);
+    public static String toStringIP(final IpAddressNoZone ipAddress) {
+        if (ipAddress.getIpv4AddressNoZone() != null) {
+            return ipAddress.getIpv4AddressNoZone().getValue();

         }
         }

+        return ipAddress.getIpv6AddressNoZone().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 7cd6ec51c04cfb807861e4cd5abc171fc7d3d61e..29b9d1cd52810f9e25e7231962ee74f6a00ee4e8 100644 (file)
--- a/util/src/main/java/org/opendaylight/protocol/util/Ipv6Util.java
+++ b/util/src/main/java/org/opendaylight/protocol/util/Ipv6Util.java
@@ -17,7 +17,6 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil;
 import java.util.Collections;
 import java.util.List;
 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.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.Ipv6AddressNoZone;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix;
 


@@ -42,8 +41,8 @@ public final class Ipv6Util {
      * @param ip to be uncompressed
      * @return Ipv6Address with same, but uncompressed, value
      */
      * @param ip to be uncompressed
      * @return Ipv6Address with same, but uncompressed, value
      */

-    public static Ipv6Address getFullForm(final Ipv6Address ip) {
-        return new Ipv6Address(InetAddresses.forString(ip.getValue()).getHostAddress());
+    public static Ipv6AddressNoZone getFullForm(final Ipv6AddressNoZone ip) {
+        return new Ipv6AddressNoZone(InetAddresses.forString(ip.getValue()).getHostAddress());

     }
 
     /**
     }
 
     /**


@@ -52,17 +51,7 @@ public final class Ipv6Util {
      * @param buffer containing Ipv6 address, starting at reader index
      * @return Ipv6Address
      */
      * @param buffer containing Ipv6 address, starting at reader index
      * @return Ipv6Address
      */

-    public static Ipv6Address addressForByteBuf(final ByteBuf buffer) {
-        return IetfInetUtil.INSTANCE.ipv6AddressFor(ByteArray.readBytes(buffer, IPV6_LENGTH));
-    }
-
-    /**
-     * Reads from ByteBuf buffer and converts bytes to Ipv6AddressNoZone.
-     *
-     * @param buffer containing Ipv6 address, starting at reader index
-     * @return Ipv6AddressNoZone
-     */
-    public static Ipv6AddressNoZone noZoneAddressForByteBuf(final ByteBuf buffer) {
+    public static Ipv6AddressNoZone addressForByteBuf(final ByteBuf buffer) {

         return IetfInetUtil.INSTANCE.ipv6AddressNoZoneFor(ByteArray.readBytes(buffer, IPV6_LENGTH));
     }
 
         return IetfInetUtil.INSTANCE.ipv6AddressNoZoneFor(ByteArray.readBytes(buffer, IPV6_LENGTH));
     }
 


@@ -71,7 +60,7 @@ public final class Ipv6Util {
      * @param ipAddress Ipv6 address
      * @return ByteBuf with filled in bytes from ipAddress
      */
      * @param ipAddress Ipv6 address
      * @return ByteBuf with filled in bytes from ipAddress
      */

-    public static ByteBuf byteBufForAddress(final Ipv6Address ipAddress) {
+    public static ByteBuf byteBufForAddress(final Ipv6AddressNoZone ipAddress) {

         return Unpooled.wrappedBuffer(bytesForAddress(ipAddress));
     }
 
         return Unpooled.wrappedBuffer(bytesForAddress(ipAddress));
     }
 


@@ -81,8 +70,8 @@ public final class Ipv6Util {
      * @param address Ipv6Address to be converted
      * @return byte array
      */
      * @param address Ipv6Address to be converted
      * @return byte array
      */

-    public static byte[] bytesForAddress(final Ipv6Address address) {
-        return IetfInetUtil.INSTANCE.ipv6AddressBytes(address);
+    public static byte[] bytesForAddress(final Ipv6AddressNoZone address) {
+        return IetfInetUtil.INSTANCE.ipv6AddressNoZoneBytes(address);

     }
 
     /**
     }
 
     /**


@@ -162,23 +151,6 @@ public final class Ipv6Util {
         return list;
     }
 
         return list;
     }
 

-    /**
-     * Writes IPv6 address if not null, otherwise writes zeros to the
-     * <code>output</code> ByteBuf. ByteBuf's writerIndex is increased by 16.
-     *
-     * @param ipv6Address
-     *            IPv6 address to be written to the output.
-     * @param output
-     *            ByteBuf, where ipv6Address or zeros are written.
-     */
-    public static void writeIpv6Address(final Ipv6Address ipv6Address, final ByteBuf output) {
-        if (ipv6Address != null) {
-            output.writeBytes(bytesForAddress(ipv6Address));
-        } else {
-            output.writeZero(IPV6_LENGTH);
-        }
-    }
-

     /**
      * Writes IPv6 address if not null, otherwise writes zeros to the
      * <code>output</code> ByteBuf. ByteBuf's writerIndex is increased by 16.
     /**
      * Writes IPv6 address if not null, otherwise writes zeros to the
      * <code>output</code> ByteBuf. ByteBuf's writerIndex is increased by 16.

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 3489023407af5f433d347d965b7833c858f23df7..8716122453481655d7e5f9cd0343fbcc5598aa0e 100644 (file)
--- a/util/src/test/java/org/opendaylight/protocol/util/IPAddressesAndPrefixesTest.java
+++ b/util/src/test/java/org/opendaylight/protocol/util/IPAddressesAndPrefixesTest.java
@@ -21,13 +21,14 @@ import io.netty.buffer.Unpooled;
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
 import java.util.List;
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
 import java.util.List;

-import org.junit.Assert;

 import org.junit.Test;
 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.IpAddressNoZone;

 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.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.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;
 import org.opendaylight.yangtools.yang.common.Uint16;
 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;
 import org.opendaylight.yangtools.yang.common.Uint16;


@@ -115,16 +116,16 @@ public class IPAddressesAndPrefixesTest {
         final ByteBuf bb4 = Unpooled.wrappedBuffer(new byte[]{123, 122, 4, 5});
         final ByteBuf bb6 = Unpooled.wrappedBuffer(new byte[]{0x20, (byte) 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01});
         final ByteBuf bb4 = Unpooled.wrappedBuffer(new byte[]{123, 122, 4, 5});
         final ByteBuf bb6 = Unpooled.wrappedBuffer(new byte[]{0x20, (byte) 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01});

-        assertEquals(bb4, Ipv4Util.byteBufForAddress(new Ipv4Address("123.122.4.5")));
-        assertEquals(bb6, Ipv6Util.byteBufForAddress(new Ipv6Address("2001::1")));
+        assertEquals(bb4, Ipv4Util.byteBufForAddress(new Ipv4AddressNoZone("123.122.4.5")));
+        assertEquals(bb6, Ipv6Util.byteBufForAddress(new Ipv6AddressNoZone("2001::1")));

     }
 
     @Test
     public void testBytesForAddress() {
         assertArrayEquals(new byte[]{12, 58, (byte) 201, 99},
     }
 
     @Test
     public void testBytesForAddress() {
         assertArrayEquals(new byte[]{12, 58, (byte) 201, 99},

-                Ipv4Util.bytesForAddress(new Ipv4Address("12.58.201.99")));
+                Ipv4Util.bytesForAddress(new Ipv4AddressNoZone("12.58.201.99")));

         assertArrayEquals(new byte[]{0x20, (byte) 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         assertArrayEquals(new byte[]{0x20, (byte) 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

-            0x00, 0x00, 0x00, 0x01}, Ipv6Util.bytesForAddress(new Ipv6Address("2001::1")));
+            0x00, 0x00, 0x00, 0x01}, Ipv6Util.bytesForAddress(new Ipv6AddressNoZone("2001::1")));

     }
 
     @Test
     }
 
     @Test


@@ -187,30 +188,30 @@ public class IPAddressesAndPrefixesTest {
 
     @Test
     public void testFullFormOfIpv6() {
 
     @Test
     public void testFullFormOfIpv6() {

-        assertEquals(new Ipv6Address("0:0:0:0:0:0:0:1"), Ipv6Util.getFullForm(new Ipv6Address("::1")));
+        assertEquals(new Ipv6Address("0:0:0:0:0:0:0:1"), Ipv6Util.getFullForm(new Ipv6AddressNoZone("::1")));

     }
 
     @Test
     public void testInetAddressToIpAddress() {
     }
 
     @Test
     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());
+        final IpAddressNoZone ipAddress = Ipv4Util.getIpAddress(InetAddresses.forString("123.42.13.8"));
+        assertNotNull(ipAddress.getIpv4AddressNoZone());
+        assertEquals(new Ipv4Address("123.42.13.8"), ipAddress.getIpv4AddressNoZone());

 
 

-        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());
+        final IpAddressNoZone ipAddress2 = Ipv4Util.getIpAddress(InetAddresses.forString("2001:db8:1:2::"));
+        assertNotNull(ipAddress2.getIpv6AddressNoZone());
+        assertEquals(new Ipv6Address("2001:db8:1:2::"), ipAddress2.getIpv6AddressNoZone());

     }
 
     @Test
     public void testToInetSocketAddress() {
     }
 
     @Test
     public void testToInetSocketAddress() {

-        final InetSocketAddress isa = Ipv4Util.toInetSocketAddress(new IpAddress(new Ipv4Address("123.42.13.8")),
-                new PortNumber(Uint16.TEN));
-        Assert.assertEquals(10, isa.getPort());
-        Assert.assertEquals("123.42.13.8", InetAddresses.toAddrString(isa.getAddress()));
-
-        final InetSocketAddress isa2 = Ipv4Util.toInetSocketAddress(new IpAddress(new Ipv6Address("2001:db8:1:2::")),
-                new PortNumber(Uint16.TEN));
-        Assert.assertEquals(10, isa2.getPort());
-        Assert.assertEquals("2001:db8:1:2::", InetAddresses.toAddrString(isa2.getAddress()));
+        final InetSocketAddress isa = Ipv4Util.toInetSocketAddress(
+            new IpAddressNoZone(new Ipv4AddressNoZone("123.42.13.8")), new PortNumber(Uint16.TEN));
+        assertEquals(10, isa.getPort());
+        assertEquals("123.42.13.8", InetAddresses.toAddrString(isa.getAddress()));
+
+        final InetSocketAddress isa2 = Ipv4Util.toInetSocketAddress(
+            new IpAddressNoZone(new Ipv6AddressNoZone("2001:db8:1:2::")), new PortNumber(Uint16.TEN));
+        assertEquals(10, isa2.getPort());
+        assertEquals("2001:db8:1:2::", InetAddresses.toAddrString(isa2.getAddress()));

     }
 }
     }
 }

diff --git a/util/src/test/java/org/opendaylight/protocol/util/Ipv4UtilTest.java b/util/src/test/java/org/opendaylight/protocol/util/Ipv4UtilTest.java
index 8cfeeea0d27b0e3dd1cbcca62427756e498957ba..aa5f0e23d43a23c4caffab5242714a4038fb810f 100644 (file)
--- a/util/src/test/java/org/opendaylight/protocol/util/Ipv4UtilTest.java
+++ b/util/src/test/java/org/opendaylight/protocol/util/Ipv4UtilTest.java
@@ -14,7 +14,7 @@ import static org.opendaylight.protocol.util.Ipv4Util.writeIpv4Prefix;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import org.junit.Test;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import org.junit.Test;

-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;
 
 public class Ipv4UtilTest {
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
 
 public class Ipv4UtilTest {


@@ -24,7 +24,7 @@ public class Ipv4UtilTest {
     public void testWriteIpv4Address() {
         final byte[] result = { 127, 0, 0, 1 };
         final ByteBuf output = Unpooled.buffer(Ipv4Util.IP4_LENGTH);
     public void testWriteIpv4Address() {
         final byte[] result = { 127, 0, 0, 1 };
         final ByteBuf output = Unpooled.buffer(Ipv4Util.IP4_LENGTH);

-        writeIpv4Address(new Ipv4Address("127.0.0.1"), output);
+        writeIpv4Address(new Ipv4AddressNoZone("127.0.0.1"), output);

         assertArrayEquals(result, output.array());
 
         output.clear();
         assertArrayEquals(result, output.array());
 
         output.clear();

diff --git a/util/src/test/java/org/opendaylight/protocol/util/Ipv6UtilTest.java b/util/src/test/java/org/opendaylight/protocol/util/Ipv6UtilTest.java
index 35afddaee0be249a7387a0865d82be9253921455..abc1e5ae12604e5336ce29825313fb78480d2001 100644 (file)
--- a/util/src/test/java/org/opendaylight/protocol/util/Ipv6UtilTest.java
+++ b/util/src/test/java/org/opendaylight/protocol/util/Ipv6UtilTest.java
@@ -14,7 +14,7 @@ import static org.opendaylight.protocol.util.Ipv6Util.writeIpv6Prefix;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import org.junit.Test;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import org.junit.Test;

-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;
 
 public class Ipv6UtilTest {
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix;
 
 public class Ipv6UtilTest {


@@ -23,7 +23,7 @@ public class Ipv6UtilTest {
         final byte[] result = { 0x20, (byte) 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
             0x00, 0x00, 0x01 };
         final ByteBuf output = Unpooled.buffer(Ipv6Util.IPV6_LENGTH);
         final byte[] result = { 0x20, (byte) 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
             0x00, 0x00, 0x01 };
         final ByteBuf output = Unpooled.buffer(Ipv6Util.IPV6_LENGTH);

-        writeIpv6Address(new Ipv6Address("2001::1"), output);
+        writeIpv6Address(new Ipv6AddressNoZone("2001::1"), output);

         assertArrayEquals(result, output.array());
 
         output.clear();
         assertArrayEquals(result, output.array());
 
         output.clear();