Reorganize features

  - Remove the *-all feature, since it's use is not recommended
  - Introduce a less inclusive than *-all user facing feature: *-msmr
  - Make *-southbound a standalone feature
  - Reduce dependencies for *-ui

Change-Id: I2336995b4089ad47fa1327cb67d8b4e7df708873
Signed-off-by: Lorand Jakab <lojakab@cisco.com>

diff --git a/distribution-karaf/pom.xml b/distribution-karaf/pom.xml
index cf8cb095f8864d94be8e2312ef1ba4e5cdc0a5d4..e847669183f26f9c883c95549a0d6ff6b7adf16d 100644 (file)
--- a/distribution-karaf/pom.xml
+++ b/distribution-karaf/pom.xml
@@ -26,7 +26,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   </prerequisites>
 
   <properties>
-    <karaf.localFeature>odl-lispflowmapping-all</karaf.localFeature>
+    <karaf.localFeature>odl-lispflowmapping-msmr</karaf.localFeature>
   </properties>
 
   <dependencyManagement>

diff --git a/features/pom.xml b/features/pom.xml
index 6b6172f3dc0e5344781cfc01bbb632a8c60caafa..4a77e77627dd7c24251655339815df6ad7dda404 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -28,13 +28,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <properties>
     <commons.opendaylight.version>1.6.0-SNAPSHOT</commons.opendaylight.version>
     <configfile.directory>etc/opendaylight/karaf</configfile.directory>
+    <config.version>0.4.0-SNAPSHOT</config.version>
     <dlux.core.version>0.3.0-SNAPSHOT</dlux.core.version>
     <features.file>features.xml</features.file>
     <mdsal.version>1.3.0-SNAPSHOT</mdsal.version>
     <mdsal.model.version>0.8.0-SNAPSHOT</mdsal.model.version>
     <neutron.version>0.6.0-SNAPSHOT</neutron.version>
     <restconf.version>1.3.0-SNAPSHOT</restconf.version>
-    <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
   </properties>
 
   <dependencyManagement>
@@ -59,6 +59,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>features-config</artifactId>
+      <version>${config.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>features-base</artifactId>
@@ -81,14 +88,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>features-yangtools</artifactId>
-      <version>${yangtools.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.dlux</groupId>
       <artifactId>features-dlux</artifactId>

diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml
index 68e38c56d121738f6385f7accd2375b340be6c22..3055fea698837a56d4f979cdffce15fd9c94ac94 100644 (file)
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -14,30 +14,25 @@
     <!-- Needed for odl-mdsal-broker -->
     <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
-    <!-- Needed for odl-mdsal-apidocs -->
+    <!-- Needed for odl-restconf -->
     <repository>mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features</repository>
+    <!-- Needed for odl-config-api -->
+    <repository>mvn:org.opendaylight.controller/features-config/${config.version}/xml/features</repository>
     <!-- TODO features-base should be removed when we get rid of Activators, hopefully soon -->
     <repository>mvn:org.opendaylight.controller/features-base/${commons.opendaylight.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.neutron/features-neutron/${neutron.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.dlux/features-dlux/${dlux.core.version}/xml/features</repository>
 
-    <feature name="odl-lispflowmapping-all" description="OpenDaylight :: LISP Flow Mapping :: All" version='${project.version}'>
+    <feature name="odl-lispflowmapping-msmr" description="OpenDaylight :: LISP Flow Mapping :: Map-Server/Map-Resolver" version='${project.version}'>
         <feature version="${project.version}">odl-lispflowmapping-mappingservice</feature>
         <feature version="${project.version}">odl-lispflowmapping-southbound</feature>
-        <feature version="${project.version}">odl-lispflowmapping-neutron</feature>
     </feature>
 
     <feature name="odl-lispflowmapping-mappingservice" description="OpenDaylight :: LISP Flow Mapping :: Mapping Service" version='${project.version}'>
-        <!-- TODO felix-dm should be removed when we get rid of Activators, hopefully soon -->
-        <feature>odl-base-felix-dm</feature>
+        <feature version="${restconf.version}">odl-restconf</feature>
         <feature version="${mdsal.version}">odl-mdsal-broker</feature>
-        <feature version="${restconf.version}">odl-mdsal-apidocs</feature>
-        <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
+        <feature version='${project.version}'>odl-lispflowmapping-models</feature>
         <feature version="${project.version}">odl-lispflowmapping-inmemorydb</feature>
-        <bundle>mvn:com.google.guava/guava/${guava.version}</bundle>
-        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.lisp-proto/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.api/${project.version}</bundle>
         <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.implementation/${project.version}</bundle>
         <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.shell/${project.version}</bundle>
         <configfile finalname="${configfile.directory}/lfm-mappingservice.xml">
@@ -47,10 +42,7 @@
 
     <feature name="odl-lispflowmapping-inmemorydb" description="OpenDaylight :: LISP Flow Mapping :: In Memory DB" version='${project.version}'>
         <feature version="${mdsal.version}">odl-mdsal-broker</feature>
-        <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
-        <bundle>mvn:com.google.guava/guava/${guava.version}</bundle>
-        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.lisp-proto/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.api/${project.version}</bundle>
+        <feature version='${project.version}'>odl-lispflowmapping-models</feature>
         <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.inmemorydb/${project.version}</bundle>
         <configfile finalname="${configfile.directory}/lfm-inmemorydb.xml">
             mvn:org.opendaylight.lispflowmapping/mappingservice.inmemorydb/${project.version}/xml/config
@@ -58,7 +50,9 @@
     </feature>
 
     <feature name="odl-lispflowmapping-southbound" description="OpenDaylight :: LISP Flow Mapping :: Southbound Plugin" version='${project.version}'>
-        <feature version="${project.version}">odl-lispflowmapping-mappingservice</feature>
+        <feature version="${restconf.version}">odl-restconf</feature>
+        <feature version="${mdsal.version}">odl-mdsal-broker</feature>
+        <feature version='${project.version}'>odl-lispflowmapping-models</feature>
         <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.southbound/${project.version}</bundle>
         <configfile finalname="${configfile.directory}/lfm-mappingservice-sb.xml">
             mvn:org.opendaylight.lispflowmapping/mappingservice.southbound/${project.version}/xml/config
@@ -66,16 +60,25 @@
     </feature>
 
     <feature name="odl-lispflowmapping-neutron" description="OpenDaylight :: LISP Flow Mapping :: Neutron Integration" version='${project.version}'>
+        <!-- TODO felix-dm should be removed when we get rid of Activators, hopefully soon -->
+        <feature>odl-base-felix-dm</feature>
         <feature version="${neutron.version}">odl-neutron-service</feature>
         <feature version="${project.version}">odl-lispflowmapping-mappingservice</feature>
         <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.neutron/${project.version}</bundle>
     </feature>
 
     <feature name="odl-lispflowmapping-ui" description="OpenDaylight :: LISP Flow Mapping :: User Interface" version='${project.version}'>
-        <feature version="${yangtools.version}">odl-yangtools-all</feature>
-        <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
-        <feature version="${dlux.core.version}">odl-dlux-all</feature>
+        <feature version="${dlux.core.version}">odl-dlux-core</feature>
+        <feature version="${project.version}">odl-lispflowmapping-mappingservice</feature>
         <bundle>mvn:org.opendaylight.lispflowmapping/lispflowmapping-ui-bundle/${project.version}</bundle>
     </feature>
 
+    <feature name="odl-lispflowmapping-models" description="OpenDaylight :: LISP Flow Mapping :: Models" version='${project.version}'>
+        <feature version='${config.version}'>odl-config-api</feature>
+        <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
+        <bundle>mvn:org.apache.commons/commons-lang3/${commons.lang3.version}</bundle>
+        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.lisp-proto/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.api/${project.version}</bundle>
+    </feature>
+
 </features>

diff --git a/mappingservice/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java b/mappingservice/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java
index be746bcc913e5376feeab2abf194c96547fcfbf7..6133be05c3108917dd4eaa45d82b189d3ea0ef40 100644 (file)
--- a/mappingservice/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java
+++ b/mappingservice/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java
@@ -180,7 +180,7 @@ public class MappingServiceIntegrationTest extends AbstractMdsalTestBase {
 
     @Override
     public String getFeatureName() {
-        return "odl-lispflowmapping-all";
+        return "odl-lispflowmapping-msmr";
     }
 
     @Override