From: Maros Marsalek <mmarsale@cisco.com>
Date: Thu, 21 Jul 2016 14:33:17 +0000 (+0200)
Subject: Fix classifier writer ordering
X-Git-Tag: v1.17.01-RC0~216
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=e3a3206592bf4e47f517205ec1f6cf83d92a3d5e;p=hc2vpp.git

Fix classifier writer ordering

Change-Id: Iee5dfcad853dc7d7f8a5eb4a4b2afc1d92b6b1c8
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
---

diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/Readme.adoc b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/Readme.adoc
index d6fa3770d..57800d22c 100644
--- a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/Readme.adoc
+++ b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/Readme.adoc
@@ -15,8 +15,8 @@ Current order of v3po-api writers is:
 . L2
 . Ethernet
 . Routing
-. ClassifySession
 . ClassifyTable
+. ClassifySession
 . Acl
 . Ipv6
 . Ipv4
diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierHoneycombWriterModule.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierHoneycombWriterModule.java
index 5d15d16c2..7b78b6bc7 100644
--- a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierHoneycombWriterModule.java
+++ b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierHoneycombWriterModule.java
@@ -61,15 +61,16 @@ public class VppClassifierHoneycombWriterModule extends
         }
 
         @Override
-        public void init(final ModifiableWriterRegistryBuilder registry) {
-
+        public void init(@Nonnull final ModifiableWriterRegistryBuilder registry) {
+            // Ordering here is: First create table, then create sessions and then assign as ACL
+            // ClassifyTable
             registry.addBefore(
-                new GenericListWriter<>(CLASSIFY_TABLE_ID, new ClassifyTableWriter(jvpp, classifyTableContext)),
-                ACL_ID);
-
+                    new GenericListWriter<>(CLASSIFY_TABLE_ID, new ClassifyTableWriter(jvpp, classifyTableContext)),
+                    CLASSIFY_SESSION_ID);
+            //  ClassifyTableSession
             registry.addBefore(
-                new GenericListWriter<>(CLASSIFY_SESSION_ID, new ClassifySessionWriter(jvpp, classifyTableContext)),
-                CLASSIFY_TABLE_ID);
+                    new GenericListWriter<>(CLASSIFY_SESSION_ID, new ClassifySessionWriter(jvpp, classifyTableContext)),
+                    ACL_ID);
         }
     }
 }