Split odl-mdsal-broker-local and odl-mdsal-broker features

These two features are supposed to be exclusive -- either we want
local-only services (-local) or we want clustered services.

JIRA: CONTROLLER-1584
Change-Id: I11c261b6c97471356645826c00ea052ffbe7b82b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/features/mdsal/odl-mdsal-all/pom.xml b/features/mdsal/odl-mdsal-all/pom.xml
index e5d21fd2b7b423b516f408309c1e5f66c33bd161..1763d66f9a314fa454605ec3228292d29d10c950 100644 (file)
--- a/features/mdsal/odl-mdsal-all/pom.xml
+++ b/features/mdsal/odl-mdsal-all/pom.xml
@@ -40,12 +40,6 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-mdsal-broker-local</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-mdsal-model-inventory</artifactId>

diff --git a/features/mdsal/odl-mdsal-broker-local/pom.xml b/features/mdsal/odl-mdsal-broker-local/pom.xml
index 0ca3406360aaad16711800279fda14c8bb6cbc01..5a67be48095f1f12ee8ff32d751bd61a8508351a 100644 (file)
--- a/features/mdsal/odl-mdsal-broker-local/pom.xml
+++ b/features/mdsal/odl-mdsal-broker-local/pom.xml
@@ -21,10 +21,14 @@
     <version>1.10.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
-    <name>OpenDaylight :: MDSAL :: Broker</name>
+    <name>OpenDaylight :: MDSAL :: Broker (local)</name>
+    <description>OpenDaylight Controller stack without clustering</description>
 
     <properties>
-        <!-- CONTROLLER-1584 -->
+        <!-- FIXME: CONTROLLER-1584:
+            - mdsal-eos-dom-simple does not activate
+            - we need a DOMDataBroker instance activation
+            -->
         <skip.karaf.featureTest>true</skip.karaf.featureTest>
     </properties>
 
@@ -55,39 +59,6 @@
     </dependencyManagement>
 
     <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>odl-yangtools-codec</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>odl-mdsal-binding-dom-adapter</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-config-netty</artifactId>
-            <version>0.11.0-SNAPSHOT</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>odl-lmax-3</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-controller-mdsal-common</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <!-- FIXME: Bug 4202: Add MD-SAL provided odl-mdsal-binding-adapter -->
-        <!-- FIXME: Bug 4202: Add MD-SAL provided odl-mdsal-dom-broker -->
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>odl-mdsal-dom</artifactId>
@@ -112,21 +83,28 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+
+        <!-- Single-node Entity Ownership Service -->
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>sal-broker-impl</artifactId>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-eos-dom-simple</artifactId>
         </dependency>
+
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>sal-binding-api</artifactId>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-config-netty</artifactId>
+            <version>0.11.0-SNAPSHOT</version>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
+
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>sal-binding-broker-impl</artifactId>
+            <artifactId>sal-broker-impl</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>sal-binding-util</artifactId>
+            <artifactId>sal-binding-broker-impl</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml b/features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml
index 7e5996cfaf91e43f26fbd9fc92de7dd62f6757de..de892133973881fa6bb58ea86a4d0b05c2e0a0fe 100644 (file)
--- a/features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml
+++ b/features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml
@@ -8,6 +8,9 @@
  -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="odl-mdsal-${project.version}">
     <feature name="odl-mdsal-broker-local" version="${project.version}">
-        <feature version="[5,6)">odl-lmax-3</feature>
+        <feature version="[4,5)">odl-mdsal-dom</feature>
+        <feature version="[4,5)">odl-mdsal-eos-binding</feature>
+        <feature version="[4,5)">odl-mdsal-eos-dom</feature>
+        <feature version="[4,5)">odl-mdsal-singleton-dom</feature>
     </feature>
 </features>

diff --git a/features/mdsal/odl-mdsal-broker/pom.xml b/features/mdsal/odl-mdsal-broker/pom.xml
index 4844b995b6b8665b09ffb0e1a1420b65cf58e491..a61bf0b42d7f2776880aa445144ab47957fd6a82 100644 (file)
--- a/features/mdsal/odl-mdsal-broker/pom.xml
+++ b/features/mdsal/odl-mdsal-broker/pom.xml
@@ -21,28 +21,74 @@
     <version>1.10.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
+    <name>OpenDaylight :: MDSAL :: Broker (clustered)</name>
+    <description>OpenDaylight Controller stack with clustering</description>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>4.0.0</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>1.10.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>odl-mdsal-eos-binding</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>odl-mdsal-singleton-dom</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-mdsal-remoterpc-connector</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-mdsal-distributed-datastore</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+
         <dependency>
-            <!-- FIXME: this is not quite right -->
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-mdsal-broker-local</artifactId>
-            <version>${project.version}</version>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-config-netty</artifactId>
+            <version>0.11.0-SNAPSHOT</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sal-broker-impl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sal-binding-broker-impl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sal-connector-api</artifactId>
+        </dependency>
     </dependencies>
 </project>

diff --git a/features/mdsal/odl-mdsal-broker/src/main/feature/feature.xml b/features/mdsal/odl-mdsal-broker/src/main/feature/feature.xml
new file mode 100644 (file)
index 0000000..d6c1382
--- /dev/null
+++ b/features/mdsal/odl-mdsal-broker/src/main/feature/feature.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2019 PANTHEON.tech, s.r.o. and others.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+ -->
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="odl-mdsal-${project.version}">
+    <feature name="odl-mdsal-broker" version="${project.version}">
+        <feature version="[4,5)">odl-mdsal-singleton-dom</feature>
+        <feature version="[4,5)">odl-mdsal-eos-binding</feature>
+    </feature>
+</features>