From 81688ad57f49694fbb9020df1ba879fe6a10dd7f Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Sun, 20 Nov 2016 22:33:16 +0100 Subject: Fix bridge-domain and L2 of (sub-)interface ordering BD creation should go before L2 creation. Change-Id: I155234a6d8babbf419b661db9a2fb948ada113bd Signed-off-by: Marek Gradzki --- .../main/java/io/fd/hc2vpp/v3po/VppHoneycombWriterFactory.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'v3po/v3po2vpp') 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 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 l2FibEntryId = bdId.child(L2FibTable.class).child(L2FibEntry.class); -- cgit 1.2.3-korg