From 83206cb1b6b0a6a3bbe45d646ed69a5f2b587fed Mon Sep 17 00:00:00 2001 From: Michal Cmarada Date: Thu, 9 May 2019 15:07:47 +0200 Subject: HC2VPP-411: Bump ietf-interfaces, ietf-ip, iana-if-types models Change-Id: Ic042d96c9671729fd4f11efcd59c618a657d5bef Signed-off-by: Michal Cmarada --- mpls/api/pom.xml | 6 ++++-- mpls/impl/src/main/java/io/fd/hc2vpp/mpls/MplsWriterFactory.java | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'mpls') diff --git a/mpls/api/pom.xml b/mpls/api/pom.xml index 43ecd166e..44a20c58d 100644 --- a/mpls/api/pom.xml +++ b/mpls/api/pom.xml @@ -45,8 +45,10 @@ ietf-inet-types-2013-07-15 - org.opendaylight.mdsal.model - ietf-interfaces + + org.opendaylight.mdsal.binding.model.ietf + rfc8343 + ${odl.binding.model.version} org.opendaylight.mdsal.model diff --git a/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/MplsWriterFactory.java b/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/MplsWriterFactory.java index 987f6b636..17e2db795 100644 --- a/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/MplsWriterFactory.java +++ b/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/MplsWriterFactory.java @@ -28,7 +28,7 @@ import io.fd.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.mpls.rev171120.StaticLspVppLookupAugmentation; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.mpls.rev171120.vpp.label.lookup.attributes.LabelLookup; -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.rev180220.Interfaces; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls._static.rev170702.Mpls1; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls._static.rev170702._static.lsp.paths.out.segment.multiple.paths.Paths; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls._static.rev170702._static.lsp.paths.out.segment.multiple.paths.paths.Path; @@ -45,10 +45,10 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.routing.rev import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; final class MplsWriterFactory implements WriterFactory { - private static final InstanceIdentifier + private static final InstanceIdentifier IFC_ID = InstanceIdentifier.create(Interfaces.class).child( - org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface.class); + org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev180220.interfaces.Interface.class); private static final InstanceIdentifier ROUTING_ID = InstanceIdentifier.create(Routing.class); private static final InstanceIdentifier MPLS_ID = ROUTING_ID.augmentation(Routing1.class).child(Mpls.class); -- cgit 1.2.3-korg