From 85790ea6e297ac85036fd96c3a6fb0f8e641ab54 Mon Sep 17 00:00:00 2001 From: Jan Srnicek Date: Mon, 15 May 2017 12:51:24 +0200 Subject: HC2VPP-155 - Lisp enabled/disable ordering fixed - must be written before interfaces, to prevent setting flags for not existing interface Change-Id: Iaa592b96030b10d476d7f01b341ac19149352429 Signed-off-by: Jan Srnicek --- .../io/fd/hc2vpp/lisp/translate/write/factory/LispWriterFactory.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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); -- cgit 1.2.3-korg