From: Jan Srnicek <jsrnicek@cisco.com>
Date: Mon, 15 May 2017 10:51:24 +0000 (+0200)
Subject: HC2VPP-155 - Lisp enabled/disable ordering fixed
X-Git-Tag: v1.17.07-F0~23
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F91%2F6691%2F4;p=hc2vpp.git

HC2VPP-155 - Lisp enabled/disable ordering fixed

- must be written before interfaces, to prevent setting flags
for not existing interface

Change-Id: I7fc472f3bfed2c71081a5db8628f557fb1870743
Signed-off-by: Jan Srnicek <jsrnicek@cisco.com>
---

diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/factory/LispWriterFactory.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/factory/LispWriterFactory.java
index 46cb9da7b..91bbf6ad2 100755
--- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/factory/LispWriterFactory.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/factory/LispWriterFactory.java
@@ -31,6 +31,7 @@ import io.fd.honeycomb.translate.write.WriterFactory;
 import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder;
 import javax.annotation.Nonnull;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces;
+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.lisp.rev170315.Lisp;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev170315.lisp.feature.data.grouping.LispFeatureData;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev170315.map.register.grouping.MapRegister;
@@ -56,7 +57,7 @@ public final class LispWriterFactory extends AbstractLispInfraFactoryBase implem
         // and in scenario when vpp data are lost, it would end up calling
         // sw_interface_set_flags for non existing interface index
         registry.addBefore(new GenericWriter<>(LISP_INSTANCE_IDENTIFIER, new LispCustomizer(vppApi)),
-                InstanceIdentifier.create(Interfaces.class));
+                InstanceIdentifier.create(Interfaces.class).child(Interface.class));
 
         registry.addAfter(writer(LISP_FEATURE_IDENTIFIER.child(PitrCfg.class),
                 new PitrCfgCustomizer(vppApi, lispStateCheckService)), LOCATOR_SET_ID);