From 81c9cdfa5a9e91b91d73a6a2b20cff8b612d7de3 Mon Sep 17 00:00:00 2001
From: Maros Marsalek <mmarsale@cisco.com>
Date: Wed, 27 Jul 2016 11:05:51 +0200
Subject: HONEYCOMB-130: Separate v3po plugin from HC infra

Creating folders:
- common/
- infra/
- v3po/
- vpp-common/

Change-Id: I2c39e1b17e39e7c0f0628f44aa5fe08563fa06e4
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
---
 v3po/v3po2vpp/pom.xml                            | 16 +++---
 v3po/v3po2vpp/src/main/config/default-config.xml | 64 ++++++++++++++++++++++++
 2 files changed, 72 insertions(+), 8 deletions(-)

(limited to 'v3po/v3po2vpp')

diff --git a/v3po/v3po2vpp/pom.xml b/v3po/v3po2vpp/pom.xml
index edff40b3d..7bd412681 100644
--- a/v3po/v3po2vpp/pom.xml
+++ b/v3po/v3po2vpp/pom.xml
@@ -30,22 +30,22 @@
 
     <dependencies>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>io.fd.honeycomb</groupId>
             <artifactId>translate-spi</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>io.fd.honeycomb</groupId>
             <artifactId>notification-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>io.fd.honeycomb</groupId>
             <artifactId>translate-utils</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>io.fd.honeycomb.vpp</groupId>
             <artifactId>vpp-translate-utils</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -69,18 +69,18 @@
         <!---->
 
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>io.fd.honeycomb</groupId>
             <artifactId>translate-impl</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>io.fd.honeycomb.vpp</groupId>
             <artifactId>vpp-jvpp-cfg</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>vpp-cfg-init</artifactId>
+            <groupId>io.fd.honeycomb</groupId>
+            <artifactId>cfg-init</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/v3po/v3po2vpp/src/main/config/default-config.xml b/v3po/v3po2vpp/src/main/config/default-config.xml
index 6a671382c..b6a73824c 100644
--- a/v3po/v3po2vpp/src/main/config/default-config.xml
+++ b/v3po/v3po2vpp/src/main/config/default-config.xml
@@ -217,6 +217,51 @@
                         <name>vpp-classifier-honeycomb-writer</name>
                     </writer-factory>
                 </module>
+
+                <!-- Config initializer for VPP subtree-->
+                <module>
+                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:v3po2vpp">prefix:vpp-cfg-initializer</type>
+                    <name>vpp-cfg-initializer</name>
+                    <binding-data-broker>
+                        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">prefix:binding-async-data-broker</type>
+                        <name>cfg-init-binding-data-broker</name>
+                    </binding-data-broker>
+                </module>
+                <!-- Config initializer for Interfaces subtree-->
+                <module>
+                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:v3po2vpp">prefix:interfaces-cfg-initializer</type>
+                    <name>interfaces-cfg-initializer</name>
+                    <binding-data-broker>
+                        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">prefix:binding-async-data-broker</type>
+                        <name>cfg-init-binding-data-broker</name>
+                    </binding-data-broker>
+                </module>
+                <!-- Config initializer for vpp-classifier subtree-->
+                <module>
+                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:v3po2vpp">prefix:vpp-classifier-cfg-initializer</type>
+                    <name>vpp-classifier-cfg-initializer</name>
+                    <binding-data-broker>
+                        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">prefix:binding-async-data-broker</type>
+                        <name>cfg-init-binding-data-broker</name>
+                    </binding-data-broker>
+                </module>
+                <!-- Add vpp initializer to initializer registry -->
+                <module>
+                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:data:init">prefix:cfg-initializer-registry</type>
+                    <name>initializer-registry</name>
+                    <initializers>
+                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:data:init">prefix:cfg-initializer</type>
+                        <name>vpp-cfg-initializer</name>
+                    </initializers>
+                    <initializers>
+                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:data:init">prefix:cfg-initializer</type>
+                        <name>interfaces-cfg-initializer</name>
+                    </initializers>
+                    <initializers>
+                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:data:init">prefix:cfg-initializer</type>
+                        <name>vpp-classifier-cfg-initializer</name>
+                    </initializers>
+                </module>
             </modules>
 
             <services xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
@@ -276,6 +321,25 @@
                         </provider>
                     </instance>
                 </service>
+
+                <service>
+                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:data:init">prefix:cfg-initializer</type>
+                    <instance>
+                        <name>vpp-cfg-initializer</name>
+                        <provider>/modules/module[type='vpp-cfg-initializer'][name='vpp-cfg-initializer']
+                        </provider>
+                    </instance>
+                    <instance>
+                        <name>interfaces-cfg-initializer</name>
+                        <provider>/modules/module[type='interfaces-cfg-initializer'][name='interfaces-cfg-initializer']
+                        </provider>
+                    </instance>
+                    <instance>
+                        <name>vpp-classifier-cfg-initializer</name>
+                        <provider>/modules/module[type='vpp-classifier-cfg-initializer'][name='vpp-classifier-cfg-initializer']
+                        </provider>
+                    </instance>
+                </service>
             </services>
         </data>
     </configuration>
-- 
cgit 1.2.3-korg