diff options
Diffstat (limited to 'v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/initializers/InterfacesInitializer.java')
-rw-r--r-- | v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/initializers/InterfacesInitializer.java | 89 |
1 files changed, 46 insertions, 43 deletions
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/initializers/InterfacesInitializer.java b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/initializers/InterfacesInitializer.java index db3d540c7..a41a6e87b 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/initializers/InterfacesInitializer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/initializers/InterfacesInitializer.java @@ -34,20 +34,20 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.VxlanGpeVni; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.interfaces._interface.EthernetBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.interfaces._interface.L2Builder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.interfaces._interface.SubInterfaceBuilder; +// import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.interfaces._interface.SubInterfaceBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.interfaces._interface.TapBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.interfaces._interface.VhostUserBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.interfaces._interface.VxlanBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.interfaces._interface.VxlanGpeBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.interfaces._interface.l2.VlanTagRewriteBuilder; +// import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.interfaces._interface.l2.VlanTagRewriteBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.interfaces.state._interface.Ethernet; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.interfaces.state._interface.L2; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.interfaces.state._interface.SubInterface; +// import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.interfaces.state._interface.SubInterface; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.interfaces.state._interface.Tap; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.interfaces.state._interface.VhostUser; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.interfaces.state._interface.Vxlan; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.interfaces.state._interface.VxlanGpe; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.interfaces.state._interface.l2.VlanTagRewrite; +// import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.interfaces.state._interface.l2.VlanTagRewrite; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.l2.base.attributes.Interconnection; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.l2.base.attributes.interconnection.BridgeBased; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.l2.base.attributes.interconnection.BridgeBasedBuilder; @@ -122,10 +122,11 @@ public class InterfacesInitializer extends AbstractDataTreeConverter<InterfacesS setL2(augmentBuilder, l2); } - final SubInterface subInterface = vppIfcAugmentation.getSubInterface(); - if(subInterface != null) { - setSubinterface(augmentBuilder, subInterface); - } + // FIXME new vlan model +// final SubInterface subInterface = vppIfcAugmentation.getSubInterface(); +// if(subInterface != null) { +// setSubinterface(augmentBuilder, subInterface); +// } final Ethernet ethernet = vppIfcAugmentation.getEthernet(); if(ethernet != null) { @@ -140,32 +141,33 @@ public class InterfacesInitializer extends AbstractDataTreeConverter<InterfacesS return builder.build(); } - private static void setSubinterface(final VppInterfaceAugmentationBuilder augmentBuilder, - final SubInterface subInterface) { - final SubInterfaceBuilder subIfcBuilder = new SubInterfaceBuilder(); - - if(subInterface.isDefaultSubif() != null) { - subIfcBuilder.setDefaultSubif(subInterface.isDefaultSubif()); - } - if(subInterface.isExactMatch() != null) { - subIfcBuilder.setExactMatch(subInterface.isExactMatch()); - } - if(subInterface.isMatchAnyInnerId() != null) { - subIfcBuilder.setMatchAnyInnerId(subInterface.isMatchAnyInnerId()); - } - if(subInterface.isMatchAnyOuterId() != null) { - subIfcBuilder.setMatchAnyOuterId(subInterface.isMatchAnyOuterId()); - } - - subIfcBuilder.setIdentifier(subInterface.getIdentifier()); - subIfcBuilder.setInnerId(subInterface.getInnerId()); - subIfcBuilder.setNumberOfTags(subInterface.getNumberOfTags()); - subIfcBuilder.setOuterId(subInterface.getOuterId()); - subIfcBuilder.setSuperInterface(subInterface.getSuperInterface()); - subIfcBuilder.setVlanType(subInterface.getVlanType()); - - augmentBuilder.setSubInterface(subIfcBuilder.build()); - } + // FIXME vlan new modele +// private static void setSubinterface(final VppInterfaceAugmentationBuilder augmentBuilder, +// final SubInterface subInterface) { +// final SubInterfaceBuilder subIfcBuilder = new SubInterfaceBuilder(); +// +// if(subInterface.isDefaultSubif() != null) { +// subIfcBuilder.setDefaultSubif(subInterface.isDefaultSubif()); +// } +// if(subInterface.isExactMatch() != null) { +// subIfcBuilder.setExactMatch(subInterface.isExactMatch()); +// } +// if(subInterface.isMatchAnyInnerId() != null) { +// subIfcBuilder.setMatchAnyInnerId(subInterface.isMatchAnyInnerId()); +// } +// if(subInterface.isMatchAnyOuterId() != null) { +// subIfcBuilder.setMatchAnyOuterId(subInterface.isMatchAnyOuterId()); +// } +// +// subIfcBuilder.setIdentifier(subInterface.getIdentifier()); +// subIfcBuilder.setInnerId(subInterface.getInnerId()); +// subIfcBuilder.setNumberOfTags(subInterface.getNumberOfTags()); +// subIfcBuilder.setOuterId(subInterface.getOuterId()); +// subIfcBuilder.setSuperInterface(subInterface.getSuperInterface()); +// subIfcBuilder.setVlanType(subInterface.getVlanType()); +// +// augmentBuilder.setSubInterface(subIfcBuilder.build()); +// } private static void setEthernet(final VppInterfaceAugmentationBuilder augmentBuilder, final Ethernet ethernet) { final EthernetBuilder ethernetBuilder = new EthernetBuilder(); @@ -193,15 +195,16 @@ public class InterfacesInitializer extends AbstractDataTreeConverter<InterfacesS } } - final VlanTagRewrite vlanTagRewrite = l2.getVlanTagRewrite(); - if(vlanTagRewrite != null) { - final VlanTagRewriteBuilder vlanTagRewriteBuilder = new VlanTagRewriteBuilder(); - vlanTagRewriteBuilder.setFirstPushed(vlanTagRewrite.getFirstPushed()); - vlanTagRewriteBuilder.setRewriteOperation(vlanTagRewrite.getRewriteOperation()); - vlanTagRewriteBuilder.setTag1(vlanTagRewrite.getTag1()); - vlanTagRewriteBuilder.setTag2(vlanTagRewrite.getTag2()); - l2Builder.setVlanTagRewrite(vlanTagRewriteBuilder.build()); - } + // FIXME new vlan model +// final VlanTagRewrite vlanTagRewrite = l2.getVlanTagRewrite(); +// if(vlanTagRewrite != null) { +// final VlanTagRewriteBuilder vlanTagRewriteBuilder = new VlanTagRewriteBuilder(); +// vlanTagRewriteBuilder.setFirstPushed(vlanTagRewrite.getFirstPushed()); +// vlanTagRewriteBuilder.setRewriteOperation(vlanTagRewrite.getRewriteOperation()); +// vlanTagRewriteBuilder.setTag1(vlanTagRewrite.getTag1()); +// vlanTagRewriteBuilder.setTag2(vlanTagRewrite.getTag2()); +// l2Builder.setVlanTagRewrite(vlanTagRewriteBuilder.build()); +// } augmentBuilder.setL2(l2Builder.build()); } |