HC2VPP-156: fix unnumbered sub-interface handling

Change-Id: I3c6f4dcd972834543b4fd1193540b5052c787d78
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>

1 files changed, 5 insertions, 4 deletions

diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceUnnumberedCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceUnnumberedCustomizer.java
index ef03f1a57..6cec61712 100644
--- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceUnnumberedCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/SubInterfaceUnnumberedCustomizer.java
@@ -16,12 +16,13 @@
 
 package io.fd.hc2vpp.v3po.interfaces;
 
+import static io.fd.hc2vpp.v3po.util.SubInterfaceUtils.subInterfaceFullNameConfig;
+
 import io.fd.hc2vpp.common.translate.util.NamingContext;
 import io.fd.honeycomb.translate.write.WriteContext;
 import io.fd.honeycomb.translate.write.WriteFailedException;
 import io.fd.vpp.jvpp.core.future.FutureJVppCore;
 import javax.annotation.Nonnull;
-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.unnumbered.interfaces.rev170510.unnumbered.config.attributes.Unnumbered;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
@@ -36,7 +37,7 @@ public final class SubInterfaceUnnumberedCustomizer extends AbstractUnnumberedCu
     public void writeCurrentAttributes(@Nonnull final InstanceIdentifier<Unnumbered> id,
                                        @Nonnull final Unnumbered dataAfter,
                                        @Nonnull final WriteContext writeContext) throws WriteFailedException {
-        setUnnumbered(id, id.firstKeyOf(Interface.class).getName(), dataAfter, writeContext);
+        setUnnumbered(id, subInterfaceFullNameConfig(id), dataAfter, writeContext);
     }
 
     @Override
@@ -44,13 +45,13 @@ public final class SubInterfaceUnnumberedCustomizer extends AbstractUnnumberedCu
                                         @Nonnull final Unnumbered dataBefore, @Nonnull final Unnumbered dataAfter,
                                         @Nonnull final WriteContext writeContext)
         throws WriteFailedException {
-        setUnnumbered(id, id.firstKeyOf(Interface.class).getName(), dataAfter, writeContext);
+        setUnnumbered(id, subInterfaceFullNameConfig(id), dataAfter, writeContext);
     }
 
     @Override
     public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier<Unnumbered> id,
                                         @Nonnull final Unnumbered dataBefore,
                                         @Nonnull final WriteContext writeContext) throws WriteFailedException {
-        disableUnnumbered(id, id.firstKeyOf(Interface.class).getName(), dataBefore, writeContext);
+        disableUnnumbered(id, subInterfaceFullNameConfig(id), dataBefore, writeContext);
     }
 }