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

[bgpcep.git] / bgp / extensions / mvpn / src / test / java / org / opendaylight / protocol / bgp / mvpn / impl / attributes / tunnel / identifier / PAddressPMulticastGroupUtilTest.java

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
  */
-
 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.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";
-    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
@@ -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 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() {
@@ -68,12 +67,12 @@ public final class PAddressPMulticastGroupUtilTest {
 
     private static class MyPAddressPMulticastGroup implements PAddressPMulticastGroup {
         @Override
-        public IpAddress getPAddress() {
+        public IpAddressNoZone getPAddress() {
             return IP_ADDRESS;
         }
 
         @Override
-        public IpAddress getPMulticastGroup() {
+        public IpAddressNoZone getPMulticastGroup() {
             return P_MULTICAST;
         }