An attempt to make alto features work when l2switch uses blueprint

Refer to top-level l2switch feature
instead of implementation bundles and config files.

It is possible that values from 54-alto-arphandler.xml would be ignored.

Change-Id: I88af403ffb62ea88adc936294c75846442e99895
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

diff --git a/alto-extensions/simple-pce/features/pom.xml b/alto-extensions/simple-pce/features/pom.xml
index 761c5fb7e74802eb91ea2c3b3b424a95b3e4761e..68f2090a265857ddee93f8a9285aa57374adb46f 100644 (file)
--- a/alto-extensions/simple-pce/features/pom.xml
+++ b/alto-extensions/simple-pce/features/pom.xml
@@ -30,11 +30,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <openflow.plugin.version>0.3.0-SNAPSHOT</openflow.plugin.version>
     <l2switch.version>0.4.0-SNAPSHOT</l2switch.version>
     <configfile.directory>etc/opendaylight/karaf</configfile.directory>
-    <config.packethandler.configfile>50-packethandler.xml</config.packethandler.configfile>
-    <config.loopremover.configfile>52-loopremover.xml</config.loopremover.configfile>
-    <config.arphandler.configfile>54-arphandler.xml</config.arphandler.configfile>
-    <config.addresstracker.configfile>56-addresstracker.xml</config.addresstracker.configfile>
-    <config.hosttracker.configfile>57-hosttracker.xml</config.hosttracker.configfile>
   </properties>
   <dependencyManagement>
     <dependencies>
@@ -139,79 +134,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     </dependency>
 
     <!-- bundles used by features directly -->
-    <dependency>
-      <groupId>org.opendaylight.l2switch.packethandler</groupId>
-      <artifactId>packethandler-model</artifactId>
-      <version>${l2switch.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.l2switch.packethandler</groupId>
-      <artifactId>packethandler-impl</artifactId>
-      <version>${l2switch.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.l2switch.packethandler</groupId>
-      <artifactId>packethandler-config</artifactId>
-      <version>${l2switch.version}</version>
-      <type>xml</type>
-      <classifier>config</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.l2switch.addresstracker</groupId>
-      <artifactId>addresstracker-model</artifactId>
-      <version>${l2switch.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.l2switch.addresstracker</groupId>
-      <artifactId>addresstracker-config</artifactId>
-      <version>${l2switch.version}</version>
-      <type>xml</type>
-      <classifier>config</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.l2switch.addresstracker</groupId>
-      <artifactId>addresstracker-impl</artifactId>
-      <version>${l2switch.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.l2switch.loopremover</groupId>
-      <artifactId>loopremover-model</artifactId>
-      <version>${l2switch.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.l2switch.loopremover</groupId>
-      <artifactId>loopremover-impl</artifactId>
-      <version>${l2switch.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.l2switch.loopremover</groupId>
-      <artifactId>loopremover-config</artifactId>
-      <version>${l2switch.version}</version>
-      <type>xml</type>
-      <classifier>config</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.l2switch.hosttracker</groupId>
-      <artifactId>hosttracker-model</artifactId>
-      <version>${l2switch.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.l2switch.hosttracker</groupId>
-      <artifactId>hosttracker-impl</artifactId>
-      <version>${l2switch.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.l2switch.hosttracker</groupId>
-      <artifactId>hosttracker-config</artifactId>
-      <version>${l2switch.version}</version>
-      <type>xml</type>
-      <classifier>config</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.l2switch.arphandler</groupId>
-      <artifactId>arphandler-impl</artifactId>
-      <version>${l2switch.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.alto.spce.network</groupId>
       <artifactId>network-tracker-config</artifactId>

diff --git a/alto-extensions/simple-pce/features/src/main/features/features.xml b/alto-extensions/simple-pce/features/src/main/features/features.xml
index 47ec29b401bb99ee7df9382744cdd8dac00bd605..2a02494d6d3296cf2ac1995557bc07fc4e32cc31 100644 (file)
--- a/alto-extensions/simple-pce/features/src/main/features/features.xml
+++ b/alto-extensions/simple-pce/features/src/main/features/features.xml
@@ -33,25 +33,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <feature name='odl-network-tracker-l2switch' version='${l2switch.version}' description='OpenDaylight :: network-tracker :: L2switch Wrapper'>
     <feature version="${openflow.plugin.version}">odl-openflowplugin-flow-services</feature>
     <feature version="${openflow.plugin.version}">odl-openflowplugin-southbound</feature>
-    <bundle>mvn:org.opendaylight.l2switch.hosttracker/hosttracker-model/${l2switch.version}</bundle>
-    <bundle>mvn:org.opendaylight.l2switch.hosttracker/hosttracker-impl/${l2switch.version}</bundle>
-    <configfile finalname="${configfile.directory}/${config.hosttracker.configfile}">mvn:org.opendaylight.l2switch.hosttracker/hosttracker-config/${l2switch.version}/xml/config</configfile>
-
-    <bundle>mvn:org.opendaylight.l2switch.addresstracker/addresstracker-model/${l2switch.version}</bundle>
-    <bundle>mvn:org.opendaylight.l2switch.addresstracker/addresstracker-impl/${l2switch.version}</bundle>
-    <configfile finalname="${configfile.directory}/${config.addresstracker.configfile}">mvn:org.opendaylight.l2switch.addresstracker/addresstracker-config/${l2switch.version}/xml/config</configfile>
-
-    <bundle>mvn:org.opendaylight.l2switch.arphandler/arphandler-impl/${l2switch.version}</bundle>
-    <configfile finalname="${configfile.directory}/${config.arphandler.configfile}">mvn:org.opendaylight.alto.spce.network/network-tracker-config/${l2switch.version}/xml/config</configfile>
-
-    <bundle>mvn:org.opendaylight.l2switch.packethandler/packethandler-model/${l2switch.version}</bundle>
-    <bundle>mvn:org.opendaylight.l2switch.packethandler/packethandler-impl/${l2switch.version}</bundle>
-    <configfile finalname="${configfile.directory}/${config.packethandler.configfile}">mvn:org.opendaylight.l2switch.packethandler/packethandler-config/${l2switch.version}/xml/config</configfile>
-
-    <bundle>mvn:org.opendaylight.l2switch.loopremover/loopremover-model/${l2switch.version}</bundle>
-    <bundle>mvn:org.opendaylight.l2switch.loopremover/loopremover-impl/${l2switch.version}</bundle>
-    <bundle>mvn:org.opendaylight.controller.thirdparty/net.sf.jung2/2.0.1</bundle>
-    <configfile finalname="${configfile.directory}/${config.loopremover.configfile}">mvn:org.opendaylight.l2switch.loopremover/loopremover-config/${l2switch.version}/xml/config</configfile>
+    <!-- The following top-level l2switch feature pulls in the following odl-l2switch-* features:
+    addresstracker, arphandler, hosttracker, loopremover, packethandler -->
+    <feature version="${l2switch.version}">odl-l2switch-switch</feature>
+    <!-- odl-l2switch-arphandler uses blueprint now, but we still attempt to write data to
+    the config subsystem in order to set is-proactive-flood-mode to false. -->
+    <configfile finalname="${configfile.directory}/54-alto-arphandler.xml">
+      mvn:org.opendaylight.alto.spce.network/network-tracker-config/${project.version}/xml/config
+    </configfile>
   </feature>
 
   <feature name='odl-network-tracker-rest' version='${project.version}' description='OpenDaylight :: network-tracker :: REST'>

diff --git a/alto-extensions/simple-pce/network-tracker/features/pom.xml b/alto-extensions/simple-pce/network-tracker/features/pom.xml
index 5617eddc6bf8a9bb0784072ca7e6c56328317f3e..f2c76fb3355b3eee1bda3d96369db7da480ba071 100644 (file)
--- a/alto-extensions/simple-pce/network-tracker/features/pom.xml
+++ b/alto-extensions/simple-pce/network-tracker/features/pom.xml
@@ -123,19 +123,5 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <scope>runtime</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.opendaylight.l2switch.addresstracker</groupId>
-      <artifactId>addresstracker-model</artifactId>
-      <version>${l2switch.version}</version>
-      <type>jar</type>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.l2switch.hosttracker</groupId>
-      <artifactId>hosttracker-model</artifactId>
-      <version>${l2switch.version}</version>
-      <type>jar</type>
-    </dependency>
-
   </dependencies>
 </project>

diff --git a/alto-release-features/pom.xml b/alto-release-features/pom.xml
index 58ea2c9b3cd9144870549c104ea17fad5ea3c134..fa4a9eb42f8bc2aa0d0e6c0a8b38a082e32b698e 100644 (file)
--- a/alto-release-features/pom.xml
+++ b/alto-release-features/pom.xml
@@ -28,10 +28,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <configfile.directory>etc/opendaylight/karaf</configfile.directory>
     <l2switch.version>0.4.0-SNAPSHOT</l2switch.version>
     <openflow.plugin.version>0.3.0-SNAPSHOT</openflow.plugin.version>
-    <l2switch.packethandler.configfile>50-packethandler.xml</l2switch.packethandler.configfile>
-    <l2switch.loopremover.configfile>52-loopremover.xml</l2switch.loopremover.configfile>
-    <l2switch.addresstracker.configfile>56-addresstracker.xml</l2switch.addresstracker.configfile>
-    <l2switch.hosttracker.configfile>57-hosttracker.xml</l2switch.hosttracker.configfile>
   </properties>
 
   <dependencyManagement>
@@ -330,79 +326,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.l2switch.packethandler</groupId>
-      <artifactId>packethandler-model</artifactId>
-      <version>${l2switch.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.l2switch.packethandler</groupId>
-      <artifactId>packethandler-impl</artifactId>
-      <version>${l2switch.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.l2switch.packethandler</groupId>
-      <artifactId>packethandler-config</artifactId>
-      <version>${l2switch.version}</version>
-      <type>xml</type>
-      <classifier>config</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.l2switch.addresstracker</groupId>
-      <artifactId>addresstracker-model</artifactId>
-      <version>${l2switch.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.l2switch.addresstracker</groupId>
-      <artifactId>addresstracker-config</artifactId>
-      <version>${l2switch.version}</version>
-      <type>xml</type>
-      <classifier>config</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.l2switch.addresstracker</groupId>
-      <artifactId>addresstracker-impl</artifactId>
-      <version>${l2switch.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.l2switch.loopremover</groupId>
-      <artifactId>loopremover-model</artifactId>
-      <version>${l2switch.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.l2switch.loopremover</groupId>
-      <artifactId>loopremover-impl</artifactId>
-      <version>${l2switch.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.l2switch.loopremover</groupId>
-      <artifactId>loopremover-config</artifactId>
-      <version>${l2switch.version}</version>
-      <type>xml</type>
-      <classifier>config</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.l2switch.hosttracker</groupId>
-      <artifactId>hosttracker-model</artifactId>
-      <version>${l2switch.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.l2switch.hosttracker</groupId>
-      <artifactId>hosttracker-impl</artifactId>
-      <version>${l2switch.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.l2switch.hosttracker</groupId>
-      <artifactId>hosttracker-config</artifactId>
-      <version>${l2switch.version}</version>
-      <type>xml</type>
-      <classifier>config</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.l2switch.arphandler</groupId>
-      <artifactId>arphandler-impl</artifactId>
-      <version>${l2switch.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.alto.spce.network</groupId>
       <artifactId>network-tracker-config</artifactId>

diff --git a/alto-release-features/src/main/features/features.xml b/alto-release-features/src/main/features/features.xml
index 94ada338129c2367b319b05a7a37254a50b67e9a..6a158f7ca9fd5a7d62d406ded5760552bb9b95d2 100644 (file)
--- a/alto-release-features/src/main/features/features.xml
+++ b/alto-release-features/src/main/features/features.xml
@@ -55,48 +55,26 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
     <feature version="${openflow.plugin.version}">odl-openflowplugin-flow-services</feature>
     <feature version="${openflow.plugin.version}">odl-openflowplugin-southbound</feature>
-
-    <bundle>mvn:org.opendaylight.l2switch.packethandler/packethandler-model/${l2switch.version}</bundle>
-    <bundle>mvn:org.opendaylight.l2switch.packethandler/packethandler-impl/${l2switch.version}</bundle>
-    <configfile finalname="${configfile.directory}/${l2switch.packethandler.configfile}">
-      mvn:org.opendaylight.l2switch.packethandler/packethandler-config/${l2switch.version}/xml/config
-    </configfile>
-
-    <bundle>mvn:org.opendaylight.l2switch.loopremover/loopremover-model/${l2switch.version}</bundle>
-    <bundle>mvn:org.opendaylight.l2switch.loopremover/loopremover-impl/${l2switch.version}</bundle>
-    <bundle>mvn:org.opendaylight.controller.thirdparty/net.sf.jung2/2.0.1</bundle>
-    <configfile finalname="${configfile.directory}/${l2switch.loopremover.configfile}">
-      mvn:org.opendaylight.l2switch.loopremover/loopremover-config/${l2switch.version}/xml/config
-    </configfile>
-
-    <bundle>mvn:org.opendaylight.l2switch.hosttracker/hosttracker-model/${l2switch.version}</bundle>
-    <bundle>mvn:org.opendaylight.l2switch.hosttracker/hosttracker-impl/${l2switch.version}</bundle>
-    <configfile finalname="${configfile.directory}/${l2switch.hosttracker.configfile}">
-      mvn:org.opendaylight.l2switch.hosttracker/hosttracker-config/${l2switch.version}/xml/config
-    </configfile>
-
-    <bundle>mvn:org.opendaylight.l2switch.addresstracker/addresstracker-model/${l2switch.version}</bundle>
-    <bundle>mvn:org.opendaylight.l2switch.arphandler/arphandler-impl/${l2switch.version}</bundle>
+    <!-- The following top-level l2switch feature pulls in the following odl-l2switch-* features:
+    addresstracker, arphandler, hosttracker, loopremover, packethandler -->
+    <feature version="${l2switch.version}">odl-l2switch-switch</feature>
+    <!-- odl-l2switch-arphandler uses blueprint now, but we still attempt to write data to
+    the config subsystem in order to set is-proactive-flood-mode to false. -->
     <configfile finalname="${configfile.directory}/54-alto-arphandler.xml">
       mvn:org.opendaylight.alto.spce.network/network-tracker-config/${project.version}/xml/config
     </configfile>
 
-    <bundle>mvn:org.opendaylight.l2switch.addresstracker/addresstracker-impl/${l2switch.version}</bundle>
-    <configfile finalname="${configfile.directory}/${l2switch.addresstracker.configfile}">
-      mvn:org.opendaylight.l2switch.addresstracker/addresstracker-config/${l2switch.version}/xml/config
-    </configfile>
-
     <bundle>mvn:org.opendaylight.alto.spce.network/network-tracker-api/${project.version}</bundle>
     <bundle>mvn:org.opendaylight.alto.spce.network/network-tracker-impl/${project.version}</bundle>
     <configfile finalname="${configfile.directory}/network-tracker.xml">
       mvn:org.opendaylight.alto.spce.network/network-tracker-impl/${project.version}/xml/config
     </configfile>
-
     <bundle>mvn:org.opendaylight.alto.ext/alto-spce-api/${project.version}</bundle>
     <bundle>mvn:org.opendaylight.alto.ext/alto-spce-impl/${project.version}</bundle>
     <configfile finalname="${configfile.directory}/alto-spce.xml">
       mvn:org.opendaylight.alto.ext/alto-spce-impl/${project.version}/xml/config
     </configfile>
+    <!-- FIXME: Replace with odl-alto-spce from alto-spce-features feature repository. -->
   </feature>
 
   <feature name='odl-alto-standard-types' version='${project.version}'