Fix MRI feature references

OFP features are referencing a number of MRI features without using
ranged imports. Fix this up, improving our ability to upgrade
seamlessly.

Change-Id: Ife2b804628dd9d7e0ca84f16e5e7a1e023bc072c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/features-aggregator/odl-openflowplugin-nsf-model/src/main/feature/feature.xml b/features-aggregator/odl-openflowplugin-nsf-model/src/main/feature/feature.xml
new file mode 100644 (file)
index 0000000..ca8b11a
--- /dev/null
+++ b/features-aggregator/odl-openflowplugin-nsf-model/src/main/feature/feature.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<features name="odl-openflowplugin-nsf-model-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
+    <feature name="odl-openflowplugin-nsf-model" version="${project.version}">
+        <feature version="[6,7)">odl-mdsal-model-odl-l2-types</feature>
+        <feature version="[2,3)">odl-mdsal-model-inventory</feature>
+        <feature version="[2,3)">odl-controller-model-topology</feature>
+    </feature>
+</features>

diff --git a/features-aggregator/odl-openflowplugin-southbound/src/main/feature/feature.xml b/features-aggregator/odl-openflowplugin-southbound/src/main/feature/feature.xml
index 30af60ff2d8ee72628c7cbcab3411641cb7e1578..526f6b06f3676bb0efb81e89094fe6f3a88ca0c8 100644 (file)
--- a/features-aggregator/odl-openflowplugin-southbound/src/main/feature/feature.xml
+++ b/features-aggregator/odl-openflowplugin-southbound/src/main/feature/feature.xml
@@ -2,5 +2,6 @@
 <features name="openflowplugin-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
     <feature name="odl-openflowplugin-southbound" version="${project.version}">
         <configfile finalname="etc/org.opendaylight.openflowplugin.cfg">mvn:org.opendaylight.openflowplugin/openflowplugin-blueprint-config/${project.version}/cfg/config</configfile>
+        <feature version="[2,3)">odl-mdsal-broker</feature>
     </feature>
 </features>

diff --git a/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/src/main/feature/feature.xml b/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/src/main/feature/feature.xml
index c67c426eb5cd07061f87a33a574e3c6103de69df..f3b7a4b424de096c37db0ab400ce1b2f38094d62 100644 (file)
--- a/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/src/main/feature/feature.xml
+++ b/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/src/main/feature/feature.xml
@@ -4,5 +4,7 @@
     <feature name='odl-openflowjava-protocol' version='${project.version}'>
         <configfile finalname="etc/opendaylight/datastore/initial/config/default-openflow-connection-config.xml">mvn:org.opendaylight.openflowplugin.openflowjava/openflowjava-blueprint-config/${project.version}/xml/config</configfile>
         <configfile finalname="etc/opendaylight/datastore/initial/config/legacy-openflow-connection-config.xml">mvn:org.opendaylight.openflowplugin.openflowjava/openflowjava-blueprint-config/${project.version}/xml/legacyConfig</configfile>
+        <feature version="[7,8)">odl-netty-4</feature>
+        <feature version="[6,7)">odl-mdsal-model-rfc6991</feature>
     </feature>
-</features>
\ No newline at end of file
+</features>