summaryrefslogtreecommitdiffstats
path: root/v3po/v3po2vpp
diff options
context:
space:
mode:
authorMarek Gradzki <mgradzki@cisco.com>2016-11-20 22:33:16 +0100
committerMarek Gradzki <mgradzki@cisco.com>2016-11-21 08:16:31 +0100
commit81688ad57f49694fbb9020df1ba879fe6a10dd7f (patch)
treecab66cdc686c9c6b0dbf99532a27503e20db695b /v3po/v3po2vpp
parent175197da8ea43335df3daeba4c6296fcd83a057c (diff)
Fix bridge-domain and L2 of (sub-)interface ordering
BD creation should go before L2 creation. Change-Id: I155234a6d8babbf419b661db9a2fb948ada113bd Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'v3po/v3po2vpp')
-rw-r--r--v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/VppHoneycombWriterFactory.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/VppHoneycombWriterFactory.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/VppHoneycombWriterFactory.java
index 0f836d632..3629fbcdb 100644
--- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/VppHoneycombWriterFactory.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/VppHoneycombWriterFactory.java
@@ -57,10 +57,13 @@ public final class VppHoneycombWriterFactory implements WriterFactory {
public void init(final ModifiableWriterRegistryBuilder registry) {
// Vpp has no handlers
// BridgeDomains has no handlers
- // BridgeDomain =
+ // BridgeDomain(handled before L2 of ifc and subifc) =
final InstanceIdentifier<BridgeDomain> bdId =
- InstanceIdentifier.create(Vpp.class).child(BridgeDomains.class).child(BridgeDomain.class);
- registry.add(new GenericListWriter<>(bdId, new BridgeDomainCustomizer(jvpp, bdContext)));
+ InstanceIdentifier.create(Vpp.class).child(BridgeDomains.class).child(BridgeDomain.class);
+ registry.addBefore(new GenericListWriter<>(bdId, new BridgeDomainCustomizer(jvpp, bdContext)),
+ Sets.newHashSet(
+ L2_ID,
+ SubinterfaceAugmentationWriterFactory.L2_ID));
// L2FibTable has no handlers
// L2FibEntry(handled after BridgeDomain and L2 of ifc and subifc) =
final InstanceIdentifier<L2FibEntry> l2FibEntryId = bdId.child(L2FibTable.class).child(L2FibEntry.class);