diff options
Diffstat (limited to 'v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory')
| -rw-r--r-- | v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/InterfacesReaderFactory.java (renamed from v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/InterfacesStateReaderFactory.java) | 114 | ||||
| -rw-r--r-- | v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/InterfacesWriterFactory.java | 60 | ||||
| -rw-r--r-- | v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/SubinterfaceAugmentationReaderFactory.java (renamed from v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/SubinterfaceStateAugmentationReaderFactory.java) | 63 | ||||
| -rw-r--r-- | v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/SubinterfaceAugmentationWriterFactory.java | 22 |
4 files changed, 129 insertions, 130 deletions
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/InterfacesStateReaderFactory.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/InterfacesReaderFactory.java index 949b98fc2..8b792d5f0 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/InterfacesStateReaderFactory.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/InterfacesReaderFactory.java @@ -21,21 +21,21 @@ import com.google.inject.Inject; import com.google.inject.name.Named; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.v3po.DisabledInterfacesManager; -import io.fd.hc2vpp.v3po.interfacesstate.AfPacketCustomizer; -import io.fd.hc2vpp.v3po.interfacesstate.EthernetCustomizer; -import io.fd.hc2vpp.v3po.interfacesstate.GreCustomizer; -import io.fd.hc2vpp.v3po.interfacesstate.InterfaceCustomizer; -import io.fd.hc2vpp.v3po.interfacesstate.InterfaceRoutingCustomizer; -import io.fd.hc2vpp.v3po.interfacesstate.InterfaceStatisticsCustomizer; -import io.fd.hc2vpp.v3po.interfacesstate.L2Customizer; -import io.fd.hc2vpp.v3po.interfacesstate.TapV2Customizer; -import io.fd.hc2vpp.v3po.interfacesstate.VhostUserCustomizer; -import io.fd.hc2vpp.v3po.interfacesstate.VxlanCustomizer; -import io.fd.hc2vpp.v3po.interfacesstate.VxlanGpeCustomizer; -import io.fd.hc2vpp.v3po.interfacesstate.cache.InterfaceCacheDumpManager; -import io.fd.hc2vpp.v3po.interfacesstate.cache.InterfaceStatisticsManager; -import io.fd.hc2vpp.v3po.interfacesstate.pbb.PbbRewriteStateCustomizer; -import io.fd.hc2vpp.v3po.interfacesstate.span.InterfaceMirroredInterfacesCustomizer; +import io.fd.hc2vpp.v3po.read.AfPacketCustomizer; +import io.fd.hc2vpp.v3po.read.EthernetCustomizer; +import io.fd.hc2vpp.v3po.read.GreCustomizer; +import io.fd.hc2vpp.v3po.read.InterfaceCustomizer; +import io.fd.hc2vpp.v3po.read.InterfaceRoutingCustomizer; +import io.fd.hc2vpp.v3po.read.InterfaceStatisticsCustomizer; +import io.fd.hc2vpp.v3po.read.L2Customizer; +import io.fd.hc2vpp.v3po.read.TapV2Customizer; +import io.fd.hc2vpp.v3po.read.VhostUserCustomizer; +import io.fd.hc2vpp.v3po.read.VxlanCustomizer; +import io.fd.hc2vpp.v3po.read.VxlanGpeCustomizer; +import io.fd.hc2vpp.v3po.read.cache.InterfaceCacheDumpManager; +import io.fd.hc2vpp.v3po.read.cache.InterfaceStatisticsManager; +import io.fd.hc2vpp.v3po.read.pbb.PbbRewriteCustomizer; +import io.fd.hc2vpp.v3po.read.span.InterfaceMirroredInterfacesCustomizer; import io.fd.honeycomb.translate.impl.read.GenericInitListReader; import io.fd.honeycomb.translate.impl.read.GenericInitReader; import io.fd.honeycomb.translate.impl.read.GenericReader; @@ -43,31 +43,31 @@ import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder; import io.fd.jvpp.core.future.FutureJVppCore; import io.fd.jvpp.stats.future.FutureJVppStatsFacade; -import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190502.VppInterfaceStateAugmentation; -import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190502.VppInterfaceStateAugmentationBuilder; -import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190502.interfaces.state._interface.AfPacket; -import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190502.interfaces.state._interface.Ethernet; -import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190502.interfaces.state._interface.Gre; -import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190502.interfaces.state._interface.L2; -import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190502.interfaces.state._interface.Routing; -import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190502.interfaces.state._interface.Span; -import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190502.interfaces.state._interface.SpanBuilder; -import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190502.interfaces.state._interface.TapV2; -import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190502.interfaces.state._interface.VhostUser; -import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190502.interfaces.state._interface.Vxlan; -import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190502.interfaces.state._interface.VxlanGpe; -import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190502.span.state.attributes.MirroredInterfaces; -import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190502.span.state.attributes.mirrored.interfaces.MirroredInterface; -import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.pbb.rev161214.PbbRewriteStateInterfaceAugmentation; -import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.pbb.rev161214.PbbRewriteStateInterfaceAugmentationBuilder; -import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.pbb.rev161214.interfaces.state._interface.PbbRewriteState; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev180220.InterfacesState; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev180220.InterfacesStateBuilder; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev180220.interfaces.state.Interface; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev180220.interfaces.state._interface.Statistics; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190502.VppInterfaceAugmentation; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190502.VppInterfaceAugmentationBuilder; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190502.interfaces._interface.AfPacket; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190502.interfaces._interface.Ethernet; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190502.interfaces._interface.Gre; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190502.interfaces._interface.L2; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190502.interfaces._interface.Routing; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190502.interfaces._interface.Span; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190502.interfaces._interface.SpanBuilder; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190502.interfaces._interface.TapV2; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190502.interfaces._interface.VhostUser; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190502.interfaces._interface.Vxlan; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190502.interfaces._interface.VxlanGpe; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190502.span.attributes.MirroredInterfaces; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190502.span.attributes.mirrored.interfaces.MirroredInterface; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.pbb.rev161214.PbbRewriteInterfaceAugmentation; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.pbb.rev161214.PbbRewriteInterfaceAugmentationBuilder; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.pbb.rev161214.interfaces._interface.PbbRewrite; +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.interfaces.rev180220.InterfacesBuilder; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev180220.interfaces.Interface; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev180220.interfaces._interface.Statistics; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -public final class InterfacesStateReaderFactory implements ReaderFactory { +public final class InterfacesReaderFactory implements ReaderFactory { private final FutureJVppStatsFacade jvppStats; private final NamingContext ifcNamingCtx; @@ -77,18 +77,18 @@ public final class InterfacesStateReaderFactory implements ReaderFactory { private final FutureJVppCore jvpp; private final InterfaceStatisticsManager statisticsManager; - static final InstanceIdentifier<InterfacesState> IFC_STATE_ID = - InstanceIdentifier.create(InterfacesState.class); + static final InstanceIdentifier<Interfaces> IFC_STATE_ID = + InstanceIdentifier.create(Interfaces.class); static final InstanceIdentifier<Interface> IFC_ID = IFC_STATE_ID.child(Interface.class); @Inject - public InterfacesStateReaderFactory(final FutureJVppCore jvpp, - final FutureJVppStatsFacade jvppStats, - @Named("interface-context") final NamingContext ifcNamingCtx, - @Named("bridge-domain-context") final NamingContext bdNamingCtx, - final DisabledInterfacesManager ifcDisableContext, - final InterfaceCacheDumpManager ifaceDumpManager, - final InterfaceStatisticsManager statisticsManager) { + public InterfacesReaderFactory(final FutureJVppCore jvpp, + final FutureJVppStatsFacade jvppStats, + @Named("interface-context") final NamingContext ifcNamingCtx, + @Named("bridge-domain-context") final NamingContext bdNamingCtx, + final DisabledInterfacesManager ifcDisableContext, + final InterfaceCacheDumpManager ifaceDumpManager, + final InterfaceStatisticsManager statisticsManager) { this.jvpp = jvpp; this.jvppStats = jvppStats; this.ifcNamingCtx = ifcNamingCtx; @@ -100,8 +100,8 @@ public final class InterfacesStateReaderFactory implements ReaderFactory { @Override public void init(final ModifiableReaderRegistryBuilder registry) { - // InterfacesState(Structural) - registry.addStructuralReader(IFC_STATE_ID, InterfacesStateBuilder.class); + // Interfaces(Structural) + registry.addStructuralReader(IFC_STATE_ID, InterfacesBuilder.class); // Interface registry.add(new GenericInitListReader<>(IFC_ID, new InterfaceCustomizer(ifcNamingCtx, ifcDisableContext, ifaceDumpManager))); @@ -118,10 +118,10 @@ public final class InterfacesStateReaderFactory implements ReaderFactory { private void initVppIfcAugmentationReaders(final ModifiableReaderRegistryBuilder registry, final InstanceIdentifier<Interface> ifcId) { - // VppInterfaceStateAugmentation - final InstanceIdentifier<VppInterfaceStateAugmentation> vppIfcAugId = - ifcId.augmentation(VppInterfaceStateAugmentation.class); - registry.addStructuralReader(vppIfcAugId, VppInterfaceStateAugmentationBuilder.class); + // VppInterfaceAugmentation + final InstanceIdentifier<VppInterfaceAugmentation> vppIfcAugId = + ifcId.augmentation(VppInterfaceAugmentation.class); + registry.addStructuralReader(vppIfcAugId, VppInterfaceAugmentationBuilder.class); // Ethernet registry.add(new GenericInitReader<>(vppIfcAugId.child(Ethernet.class), new EthernetCustomizer(ifaceDumpManager))); @@ -161,10 +161,10 @@ public final class InterfacesStateReaderFactory implements ReaderFactory { private void initPbbRewriteAugmentation(final ModifiableReaderRegistryBuilder registry, final InstanceIdentifier<Interface> ifcId) { - registry.addStructuralReader(ifcId.augmentation(PbbRewriteStateInterfaceAugmentation.class), - PbbRewriteStateInterfaceAugmentationBuilder.class); + registry.addStructuralReader(ifcId.augmentation(PbbRewriteInterfaceAugmentation.class), + PbbRewriteInterfaceAugmentationBuilder.class); - registry.add(new GenericReader<>(ifcId.augmentation(PbbRewriteStateInterfaceAugmentation.class).child( - PbbRewriteState.class), new PbbRewriteStateCustomizer(jvpp))); + registry.add(new GenericReader<>(ifcId.augmentation(PbbRewriteInterfaceAugmentation.class).child( + PbbRewrite.class), new PbbRewriteCustomizer(jvpp))); } } diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/InterfacesWriterFactory.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/InterfacesWriterFactory.java index 4e9f7b9cc..0ba8c351a 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/InterfacesWriterFactory.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/InterfacesWriterFactory.java @@ -21,37 +21,37 @@ import com.google.inject.Inject; import com.google.inject.name.Named; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.v3po.DisabledInterfacesManager; -import io.fd.hc2vpp.v3po.interfaces.AfPacketCustomizer; -import io.fd.hc2vpp.v3po.interfaces.AfPacketValidator; -import io.fd.hc2vpp.v3po.interfaces.EthernetCustomizer; -import io.fd.hc2vpp.v3po.interfaces.EthernetValidator; -import io.fd.hc2vpp.v3po.interfaces.GreCustomizer; -import io.fd.hc2vpp.v3po.interfaces.GreValidator; -import io.fd.hc2vpp.v3po.interfaces.InterfaceCustomizer; -import io.fd.hc2vpp.v3po.interfaces.InterfaceRoutingCustomizer; -import io.fd.hc2vpp.v3po.interfaces.InterfaceRoutingValidator; -import io.fd.hc2vpp.v3po.interfaces.InterfaceUnnumberedCustomizer; -import io.fd.hc2vpp.v3po.interfaces.InterfaceUnnumberedValidator; -import io.fd.hc2vpp.v3po.interfaces.InterfaceValidator; -import io.fd.hc2vpp.v3po.interfaces.InterfacesStatisticsCustomizer; import io.fd.hc2vpp.v3po.interfaces.InterfacesStatisticsValidator; -import io.fd.hc2vpp.v3po.interfaces.L2Customizer; -import io.fd.hc2vpp.v3po.interfaces.L2Validator; -import io.fd.hc2vpp.v3po.interfaces.LoopbackCustomizer; -import io.fd.hc2vpp.v3po.interfaces.LoopbackValidator; -import io.fd.hc2vpp.v3po.interfaces.TapV2Customizer; -import io.fd.hc2vpp.v3po.interfaces.TapV2Validator; -import io.fd.hc2vpp.v3po.interfaces.VhostUserCustomizer; -import io.fd.hc2vpp.v3po.interfaces.VhostUserValidator; -import io.fd.hc2vpp.v3po.interfaces.VxlanCustomizer; -import io.fd.hc2vpp.v3po.interfaces.VxlanGpeCustomizer; -import io.fd.hc2vpp.v3po.interfaces.VxlanGpeValidator; -import io.fd.hc2vpp.v3po.interfaces.VxlanValidator; -import io.fd.hc2vpp.v3po.interfaces.pbb.PbbRewriteCustomizer; -import io.fd.hc2vpp.v3po.interfaces.pbb.PbbRewriteValidator; -import io.fd.hc2vpp.v3po.interfaces.span.MirroredInterfaceCustomizer; -import io.fd.hc2vpp.v3po.interfaces.span.MirroredInterfaceValidator; -import io.fd.hc2vpp.v3po.interfacesstate.cache.InterfaceStatisticsManager; +import io.fd.hc2vpp.v3po.write.AfPacketValidator; +import io.fd.hc2vpp.v3po.write.EthernetValidator; +import io.fd.hc2vpp.v3po.write.GreValidator; +import io.fd.hc2vpp.v3po.write.InterfaceRoutingValidator; +import io.fd.hc2vpp.v3po.write.InterfaceUnnumberedValidator; +import io.fd.hc2vpp.v3po.write.InterfaceValidator; +import io.fd.hc2vpp.v3po.write.L2Validator; +import io.fd.hc2vpp.v3po.write.LoopbackValidator; +import io.fd.hc2vpp.v3po.write.TapV2Validator; +import io.fd.hc2vpp.v3po.write.VhostUserValidator; +import io.fd.hc2vpp.v3po.write.VxlanGpeValidator; +import io.fd.hc2vpp.v3po.write.VxlanValidator; +import io.fd.hc2vpp.v3po.write.pbb.PbbRewriteValidator; +import io.fd.hc2vpp.v3po.write.span.MirroredInterfaceValidator; +import io.fd.hc2vpp.v3po.read.cache.InterfaceStatisticsManager; +import io.fd.hc2vpp.v3po.write.AfPacketCustomizer; +import io.fd.hc2vpp.v3po.write.EthernetCustomizer; +import io.fd.hc2vpp.v3po.write.GreCustomizer; +import io.fd.hc2vpp.v3po.write.InterfaceCustomizer; +import io.fd.hc2vpp.v3po.write.InterfaceRoutingCustomizer; +import io.fd.hc2vpp.v3po.write.InterfaceUnnumberedCustomizer; +import io.fd.hc2vpp.v3po.write.InterfacesStatisticsCustomizer; +import io.fd.hc2vpp.v3po.write.L2Customizer; +import io.fd.hc2vpp.v3po.write.LoopbackCustomizer; +import io.fd.hc2vpp.v3po.write.TapV2Customizer; +import io.fd.hc2vpp.v3po.write.VhostUserCustomizer; +import io.fd.hc2vpp.v3po.write.VxlanCustomizer; +import io.fd.hc2vpp.v3po.write.VxlanGpeCustomizer; +import io.fd.hc2vpp.v3po.write.pbb.PbbRewriteCustomizer; +import io.fd.hc2vpp.v3po.write.span.MirroredInterfaceCustomizer; import io.fd.honeycomb.translate.impl.write.GenericListWriter; import io.fd.honeycomb.translate.impl.write.GenericWriter; import io.fd.honeycomb.translate.write.WriterFactory; diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/SubinterfaceStateAugmentationReaderFactory.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/SubinterfaceAugmentationReaderFactory.java index d3fb57da7..39100b91b 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/SubinterfaceStateAugmentationReaderFactory.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/SubinterfaceAugmentationReaderFactory.java @@ -20,40 +20,40 @@ import com.google.common.collect.Sets; import com.google.inject.Inject; import com.google.inject.name.Named; import io.fd.hc2vpp.common.translate.util.NamingContext; -import io.fd.hc2vpp.v3po.interfacesstate.RewriteCustomizer; -import io.fd.hc2vpp.v3po.interfacesstate.SubInterfaceCustomizer; -import io.fd.hc2vpp.v3po.interfacesstate.SubInterfaceL2Customizer; -import io.fd.hc2vpp.v3po.interfacesstate.SubInterfaceRoutingCustomizer; -import io.fd.hc2vpp.v3po.interfacesstate.cache.InterfaceCacheDumpManager; -import io.fd.hc2vpp.v3po.interfacesstate.span.SubInterfaceMirroredInterfacesCustomizer; +import io.fd.hc2vpp.v3po.read.RewriteCustomizer; +import io.fd.hc2vpp.v3po.read.SubInterfaceCustomizer; +import io.fd.hc2vpp.v3po.read.SubInterfaceL2Customizer; +import io.fd.hc2vpp.v3po.read.SubInterfaceRoutingCustomizer; +import io.fd.hc2vpp.v3po.read.cache.InterfaceCacheDumpManager; +import io.fd.hc2vpp.v3po.read.span.SubInterfaceMirroredInterfacesCustomizer; import io.fd.honeycomb.translate.impl.read.GenericInitListReader; import io.fd.honeycomb.translate.impl.read.GenericInitReader; import io.fd.honeycomb.translate.impl.read.GenericReader; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder; import io.fd.jvpp.core.future.FutureJVppCore; -import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.subinterface.span.rev170607.VppSubinterfaceSpanStateAugmentation; -import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.subinterface.span.rev170607.VppSubinterfaceSpanStateAugmentationBuilder; -import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.subinterface.span.rev170607.interfaces.state._interface.sub.interfaces.sub._interface.SpanState; -import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.subinterface.span.rev170607.interfaces.state._interface.sub.interfaces.sub._interface.SpanStateBuilder; -import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190502.span.state.attributes.MirroredInterfaces; -import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.SubinterfaceStateAugmentation; -import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.SubinterfaceStateAugmentationBuilder; -import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.interfaces.state._interface.SubInterfaces; -import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.interfaces.state._interface.SubInterfacesBuilder; -import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.interfaces.state._interface.sub.interfaces.SubInterface; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.subinterface.span.rev170607.VppSubinterfaceSpanAugmentation; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.subinterface.span.rev170607.VppSubinterfaceSpanAugmentationBuilder; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.subinterface.span.rev170607.interfaces._interface.sub.interfaces.sub._interface.Span; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.subinterface.span.rev170607.interfaces._interface.sub.interfaces.sub._interface.SpanBuilder; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190502.span.attributes.MirroredInterfaces; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.SubinterfaceAugmentation; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.SubinterfaceAugmentationBuilder; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.interfaces._interface.SubInterfaces; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.interfaces._interface.SubInterfacesBuilder; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.interfaces._interface.sub.interfaces.SubInterface; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.match.attributes.match.type.vlan.tagged.VlanTagged; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.rewrite.attributes.Rewrite; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.sub._interface.base.attributes.Match; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.sub._interface.base.attributes.Tags; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.sub._interface.base.attributes.tags.Tag; -import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.sub._interface.l2.state.attributes.L2; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.sub._interface.l2.config.attributes.L2; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.sub._interface.routing.attributes.Routing; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.vlan.rev180319.tag.rewrite.PushTags; import org.opendaylight.yang.gen.v1.urn.ieee.params.xml.ns.yang.dot1q.types.rev150626.dot1q.tag.or.any.Dot1qTag; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -public final class SubinterfaceStateAugmentationReaderFactory implements ReaderFactory { +public final class SubinterfaceAugmentationReaderFactory implements ReaderFactory { private final FutureJVppCore jvpp; private final NamingContext ifcCtx; @@ -61,10 +61,10 @@ public final class SubinterfaceStateAugmentationReaderFactory implements ReaderF private final InterfaceCacheDumpManager ifaceDumpManager; @Inject - public SubinterfaceStateAugmentationReaderFactory(final FutureJVppCore jvpp, - @Named("interface-context") final NamingContext ifcCtx, - @Named("bridge-domain-context") final NamingContext bdCtx, - final InterfaceCacheDumpManager ifaceDumpManager) { + public SubinterfaceAugmentationReaderFactory(final FutureJVppCore jvpp, + @Named("interface-context") final NamingContext ifcCtx, + @Named("bridge-domain-context") final NamingContext bdCtx, + final InterfaceCacheDumpManager ifaceDumpManager) { this.jvpp = jvpp; this.ifcCtx = ifcCtx; this.bdCtx = bdCtx; @@ -74,9 +74,9 @@ public final class SubinterfaceStateAugmentationReaderFactory implements ReaderF @Override public void init(final ModifiableReaderRegistryBuilder registry) { // SubinterfaceStateAugmentation(Structural) - final InstanceIdentifier<SubinterfaceStateAugmentation> subIfcAugId = - InterfacesStateReaderFactory.IFC_ID.augmentation(SubinterfaceStateAugmentation.class); - registry.addStructuralReader(subIfcAugId, SubinterfaceStateAugmentationBuilder.class); + final InstanceIdentifier<SubinterfaceAugmentation> subIfcAugId = + InterfacesReaderFactory.IFC_ID.augmentation(SubinterfaceAugmentation.class); + registry.addStructuralReader(subIfcAugId, SubinterfaceAugmentationBuilder.class); // SubInterfaces(Structural) final InstanceIdentifier<SubInterfaces> subIfcsId = subIfcAugId.child(SubInterfaces.class); registry.addStructuralReader(subIfcsId, SubInterfacesBuilder.class); @@ -105,15 +105,14 @@ public final class SubinterfaceStateAugmentationReaderFactory implements ReaderF final InstanceIdentifier<Routing> routingId = subIfcId.child(Routing.class); registry.add(new GenericReader<>(routingId, new SubInterfaceRoutingCustomizer(jvpp, ifcCtx))); - final InstanceIdentifier<VppSubinterfaceSpanStateAugmentation> spanStateAugId = - subIfcId.augmentation(VppSubinterfaceSpanStateAugmentation.class); - registry.addStructuralReader(spanStateAugId, VppSubinterfaceSpanStateAugmentationBuilder.class); + final InstanceIdentifier<VppSubinterfaceSpanAugmentation> spanAugId = + subIfcId.augmentation(VppSubinterfaceSpanAugmentation.class); + registry.addStructuralReader(spanAugId, VppSubinterfaceSpanAugmentationBuilder.class); - final InstanceIdentifier<SpanState> spanStateId = spanStateAugId - .child(SpanState.class); - registry.addStructuralReader(spanStateId, SpanStateBuilder.class); + final InstanceIdentifier<Span> spanId = spanAugId.child(Span.class); + registry.addStructuralReader(spanId, SpanBuilder.class); - final InstanceIdentifier<MirroredInterfaces> mirroredInterfacesId = spanStateId.child(MirroredInterfaces.class); + final InstanceIdentifier<MirroredInterfaces> mirroredInterfacesId = spanId.child(MirroredInterfaces.class); registry.add(new GenericInitReader<>(mirroredInterfacesId, new SubInterfaceMirroredInterfacesCustomizer(jvpp, ifcCtx))); } diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/SubinterfaceAugmentationWriterFactory.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/SubinterfaceAugmentationWriterFactory.java index 237eab57a..877c8d1ab 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/SubinterfaceAugmentationWriterFactory.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/SubinterfaceAugmentationWriterFactory.java @@ -20,18 +20,18 @@ import com.google.common.collect.Sets; import com.google.inject.Inject; import com.google.inject.name.Named; import io.fd.hc2vpp.common.translate.util.NamingContext; -import io.fd.hc2vpp.v3po.interfaces.RewriteCustomizer; -import io.fd.hc2vpp.v3po.interfaces.RewriteValidator; -import io.fd.hc2vpp.v3po.interfaces.SubInterfaceCustomizer; -import io.fd.hc2vpp.v3po.interfaces.SubInterfaceL2Customizer; -import io.fd.hc2vpp.v3po.interfaces.SubInterfaceL2Validator; -import io.fd.hc2vpp.v3po.interfaces.SubInterfaceRoutingCustomizer; -import io.fd.hc2vpp.v3po.interfaces.SubInterfaceRoutingValidator; -import io.fd.hc2vpp.v3po.interfaces.SubInterfaceUnnumberedCustomizer; -import io.fd.hc2vpp.v3po.interfaces.SubInterfaceUnnumberedValidator; -import io.fd.hc2vpp.v3po.interfaces.SubInterfaceValidator; -import io.fd.hc2vpp.v3po.interfaces.span.MirroredInterfaceCustomizer; +import io.fd.hc2vpp.v3po.write.RewriteValidator; +import io.fd.hc2vpp.v3po.write.SubInterfaceL2Validator; +import io.fd.hc2vpp.v3po.write.SubInterfaceRoutingValidator; +import io.fd.hc2vpp.v3po.write.SubInterfaceUnnumberedValidator; +import io.fd.hc2vpp.v3po.write.SubInterfaceValidator; import io.fd.hc2vpp.v3po.util.SubInterfaceUtils; +import io.fd.hc2vpp.v3po.write.RewriteCustomizer; +import io.fd.hc2vpp.v3po.write.SubInterfaceCustomizer; +import io.fd.hc2vpp.v3po.write.SubInterfaceL2Customizer; +import io.fd.hc2vpp.v3po.write.SubInterfaceRoutingCustomizer; +import io.fd.hc2vpp.v3po.write.SubInterfaceUnnumberedCustomizer; +import io.fd.hc2vpp.v3po.write.span.MirroredInterfaceCustomizer; import io.fd.honeycomb.translate.impl.write.GenericListWriter; import io.fd.honeycomb.translate.impl.write.GenericWriter; import io.fd.honeycomb.translate.write.WriterFactory; |