From b6ead1d5525b5b1500729959acbce905bbcbf04a Mon Sep 17 00:00:00 2001
From: Marek Gradzki <mgradzki@cisco.com>
Date: Tue, 3 Jul 2018 12:44:55 +0200
Subject: HC2VPP-275: use ip-address-no-zone in v3po YANG model

The inet:ip-address type was used in HC models
due to ODL bug:

https://bugs.opendaylight.org/show_bug.cgi?id=6413
which was fixed long time ago...

Change-Id: Icaa8ac1269c730243afba53bc663f39f7c90f36c
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
---
 .../io/fd/hc2vpp/v3po/interfaces/VxlanGpeCustomizer.java | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/VxlanGpeCustomizer.java')

diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/VxlanGpeCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/VxlanGpeCustomizer.java
index fb9b50abc..ac21c4dbd 100644
--- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/VxlanGpeCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/VxlanGpeCustomizer.java
@@ -31,7 +31,7 @@ import io.fd.vpp.jvpp.core.future.FutureJVppCore;
 import java.net.InetAddress;
 import java.util.concurrent.CompletionStage;
 import javax.annotation.Nonnull;
-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.interfaces.rev140508.InterfaceType;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev180703.VxlanGpeTunnel;
@@ -118,23 +118,23 @@ public class VxlanGpeCustomizer extends AbstractInterfaceTypeCustomizer<VxlanGpe
     }
 
     private boolean isIpv6(final VxlanGpe vxlanGpe) {
-        if (vxlanGpe.getLocal().getIpv4Address() == null) {
-            checkArgument(vxlanGpe.getRemote().getIpv4Address() == null, "Inconsistent ip addresses: %s, %s",
+        if (vxlanGpe.getLocal().getIpv4AddressNoZone() == null) {
+            checkArgument(vxlanGpe.getRemote().getIpv4AddressNoZone() == null, "Inconsistent ip addresses: %s, %s",
                     vxlanGpe.getLocal(),
                     vxlanGpe.getRemote());
             return true;
         } else {
-            checkArgument(vxlanGpe.getRemote().getIpv6Address() == null, "Inconsistent ip addresses: %s, %s",
+            checkArgument(vxlanGpe.getRemote().getIpv6AddressNoZone() == null, "Inconsistent ip addresses: %s, %s",
                     vxlanGpe.getLocal(),
                     vxlanGpe.getRemote());
             return false;
         }
     }
 
-    private String getAddressString(final IpAddress addr) {
-        return addr.getIpv4Address() == null
-                ? addr.getIpv6Address().getValue()
-                : addr.getIpv4Address().getValue();
+    private String getAddressString(final IpAddressNoZone addr) {
+        return addr.getIpv4AddressNoZone() == null
+                ? addr.getIpv6AddressNoZone().getValue()
+                : addr.getIpv4AddressNoZone().getValue();
     }
 
     private void deleteVxlanGpeTunnel(final InstanceIdentifier<VxlanGpe> id, final String swIfName,
-- 
cgit 1.2.3-korg