Add the openflowplugin-blueprint-config bundles to the features xml

This turns on the blueprint wiring for the openflow helium plugin

Change-Id: I5725495f3a40e636bc35cb1a9281c593ad072840
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>

diff --git a/features-li/pom.xml b/features-li/pom.xml
index 62d49173bbe057832a356a4773a5c3ef93028174..7111c20fe03384fd10265233c547cd59bea4904c 100644 (file)
--- a/features-li/pom.xml
+++ b/features-li/pom.xml
@@ -175,6 +175,11 @@
             <classifier>config</classifier>
             <type>xml</type>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>openflowplugin-blueprint-config</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.opendaylight.dlux</groupId>

diff --git a/features-li/src/main/features/features.xml b/features-li/src/main/features/features.xml
index 9872cf47ca44d1960827f6417618694cbe9fc379..638c8a073c6d16bca452f67a9aee8418c5f00c85 100644 (file)
--- a/features-li/src/main/features/features.xml
+++ b/features-li/src/main/features/features.xml
@@ -36,7 +36,8 @@
         <bundle>mvn:org.opendaylight.openflowplugin/openflowplugin/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.openflowplugin/openflowplugin-impl/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.openflowplugin/openflowplugin-extension-api/{{VERSION}}</bundle>
-       <bundle>mvn:org.opendaylight.controller/liblldp/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.controller/liblldp/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.openflowplugin/openflowplugin-blueprint-config/{{VERSION}}</bundle>
         <configfile finalname="etc/opendaylight/karaf/42-openflowplugin-Li.xml">mvn:org.opendaylight.openflowplugin/openflowplugin-controller-config/{{VERSION}}/xml/config-Li</configfile>
     </feature>
 

diff --git a/features/pom.xml b/features/pom.xml
index c02e3c1d8a21be6f033fe23fe272dc226769d7ac..5568bd2c1d9f8db8b4f005978888b1cf0df1cdf2 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -205,6 +205,11 @@
             <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>openflowplugin-impl</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>openflowplugin-blueprint-config-he</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowplugin.applications</groupId>
             <artifactId>table-miss-enforcer</artifactId>

diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml
index 36e80a25b53b7d085655c8c229f7763d3fd82dd8..214452365c5c7780c16f2063c94ed640cec524d3 100644 (file)
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -33,9 +33,10 @@
         <bundle>mvn:org.opendaylight.openflowplugin/openflowplugin/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.openflowplugin/openflowplugin-api/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.openflowplugin/openflowplugin-extension-api/{{VERSION}}</bundle>
-       <bundle>mvn:org.opendaylight.controller/liblldp/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.controller/liblldp/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.openflowplugin.applications/inventory-manager/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.openflowplugin.applications/statistics-manager/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.openflowplugin/openflowplugin-blueprint-config-he/{{VERSION}}</bundle>
         <configfile finalname="${config.configfile.directory}/${config.statistics.manager.configfile}">mvn:org.opendaylight.openflowplugin.applications/statistics-manager-config/{{VERSION}}/xml/config</configfile>
         <configfile finalname="${config.configfile.directory}/${config.inventory.manager.configfile}">mvn:org.opendaylight.openflowplugin.applications/inventory-manager/{{VERSION}}/xml/config</configfile>
         <configfile finalname="etc/opendaylight/karaf/42-openflowplugin-He.xml">mvn:org.opendaylight.openflowplugin/openflowplugin-controller-config/{{VERSION}}/xml/config-He</configfile>