diff options
| author |   Maros Marsalek <mmarsale@cisco.com> | 2016-09-20 15:53:57 +0200 |
|---|---|---|
| committer | Maros Marsalek <mmarsale@cisco.com> | 2016-09-20 15:58:37 +0200 |
| commit | e0c64356a96dc9c2441139acd2ca281133d80844 (patch) | |
| tree | 29e6d3cc33705b85808d0b654b1611525834ac94 | |
| parent | 21ded20ef88dcc3b55abf646bcbfdc05a0565474 (diff) | |
HONEYCOMB-222 Fix Interface L2 writer order
The writer was placed between Interface and Subitnerface,
so it was invoked before subinterfaces were processed.
Meaning that if the L2/xconnect targetted subitnerface, it
would be submitted prematurely.
Moving the Interface L2 writer after Subinterface writer.
Change-Id: I192ebde5eaf4b05a104d76bce39de74569cdb608
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
| -rw-r--r-- | v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/InterfacesWriterFactory.java | 4 | ||||
| -rw-r--r-- | v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/Readme.adoc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/InterfacesWriterFactory.java b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/InterfacesWriterFactory.java index 0f7d517c4..c8b4ae458 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/InterfacesWriterFactory.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/InterfacesWriterFactory.java @@ -171,9 +171,9 @@ public final class InterfacesWriterFactory implements WriterFactory { registry.addAfter( new GenericWriter<>(VPP_IFC_AUG_ID.child(Routing.class), new RoutingCustomizer(jvpp, ifcNamingContext)), specificIfcTypes); - // Routing(Execute only after specific interface customizers) = + // L2(Execute only after subinterface (and all other ifc types) = registry.addAfter(new GenericWriter<>(L2_ID, new L2Customizer(jvpp, ifcNamingContext, bdNamingContext)), - specificIfcTypes); + SubinterfaceAugmentationWriterFactory.SUB_IFC_ID); // Proxy Arp (execute after specific interface customizers) registry.addAfter( new GenericWriter<>(VPP_IFC_AUG_ID.child(ProxyArp.class), new ProxyArpCustomizer(jvpp, ifcNamingContext)), diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/Readme.adoc b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/Readme.adoc index 57800d22c..a95c397ce 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/Readme.adoc +++ b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/Readme.adoc @@ -10,9 +10,9 @@ Current order of v3po-api writers is: . Tap . Vxlan . Interface -. L2 . SubInterface . L2 +. SubInterface-L2 . Ethernet . Routing . ClassifyTable |