Merge changes I8490a721,I71941875

[groupbasedpolicy.git] / features / src / main / resources / features.xml

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index e5709d61ea25466f1cd561c7e7f23da9df518953..e16767b8ef2330578917bd520ab09eaeff421872 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -16,17 +16,21 @@
     <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
 
     <!-- Repos needed by the OpenFlow Overlay renderer -->
-    <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/${openflowplugin.distribution.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin-extension/${openflowplugin.distribution.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/${openflowplugin.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin-extension/${openflowplugin.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.ovsdb/southbound-features/${ovsdb.southbound.version}/xml/features</repository>
+
+    <!-- Repos needed by the Neutron Mapper -->
+    <repository>mvn:org.opendaylight.neutron/features-neutron/${neutron.version}/xml/features</repository>
+
+    <!-- Repos needed by the UI Backend -->
+    <repository>mvn:org.opendaylight.controller/features-restconf/${restconf.version}/xml/features</repository>
 
     <!-- The common GBP components -->
     <feature name='odl-groupbasedpolicy-base' version='${project.version}' description='OpenDaylight :: groupbasedpolicy :: Base Copmonents'>
         <feature version="${mdsal.version}">odl-mdsal-broker</feature>
         <feature version='${yangtools.version}'>odl-yangtools-binding</feature>
         <feature version='${yangtools.version}'>odl-yangtools-models</feature>
-        <bundle start="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version}</bundle>
-        <bundle start="true">mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle>
-        <bundle start="true">mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle>
         <bundle>mvn:org.opendaylight.groupbasedpolicy/groupbasedpolicy/${project.version}</bundle>
     </feature>
 
@@ -37,11 +41,10 @@
         Network Virtualization behavior using OpenFlow
     -->
     <feature name='odl-groupbasedpolicy-ofoverlay' version='${project.version}' description='OpenDaylight :: groupbasedpolicy :: OpenFlow Overlay Renderer'>
-        <!--
         <feature version="${project.version}">odl-groupbasedpolicy-base</feature>
-        -->
-        <feature version="${openflowplugin.distribution.version}">odl-openflowplugin-flow-services</feature>
-        <feature version='${openflowplugin.distribution.version}'>odl-openflowplugin-nxm-extensions</feature>
+        <feature version="${openflowplugin.version}">odl-openflowplugin-flow-services</feature>
+        <feature version='${openflowplugin.version}'>odl-openflowplugin-nxm-extensions</feature>
+        <feature version='${ovsdb.southbound.version}'>odl-ovsdb-southbound-impl</feature>
         <bundle>mvn:org.opendaylight.groupbasedpolicy/ofoverlay-renderer/${project.version}</bundle>
         <configfile finalname="${config.configfile.directory}/${config.groupbasedpolicy.ofoverlayconfigfile}">mvn:org.opendaylight.groupbasedpolicy/groupbasedpolicy-ofoverlay-config/${project.version}/xml/config</configfile>
     </feature>
@@ -53,9 +56,10 @@
         OpFlex renderer in the controller
     -->
     <feature name='odl-groupbasedpolicy-opflex' version='${project.version}' description='OpenDaylight :: groupbasedpolicy :: OpFlex Renderer'>
-        <!--
         <feature version="${project.version}">odl-groupbasedpolicy-base</feature>
-        -->
+        <bundle start="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version}</bundle>
+        <bundle start="true">mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle>
+        <bundle start="true">mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle>
         <bundle>mvn:org.opendaylight.groupbasedpolicy/opflex-renderer/${project.version}</bundle>
         <configfile finalname="${config.configfile.directory}/${config.groupbasedpolicy.opflexconfigfile}">mvn:org.opendaylight.groupbasedpolicy/groupbasedpolicy-opflex-config/${project.version}/xml/config</configfile>
     </feature>
@@ -69,7 +73,7 @@
          things in.
     -->
     <feature name='odl-groupbasedpolicy-openstackgbp' version='${project.version}' description='OpenDaylight :: groupbasedpolicy :: Support OpenStack GBP Endpoints '>
-        <!--
+        <!-- DEPRECATED SOON.
         <feature version="${project.version}">odl-groupbasedpolicy-ofoverlay</feature>
         -->
         <feature version="${mdsal.version}">odl-mdsal-broker</feature>
@@ -77,13 +81,25 @@
     </feature>
 
     <!--
-         The OpenContrail renderer
+         The Neutron provider
     -->
-    <feature name='odl-groupbasedpolicy-oc' version='${project.version}' description='OpenDaylight :: groupbasedpolicy :: Opencontrail'>
+    <feature name='odl-groupbasedpolicy-neutronmapper' version='${project.version}' description='OpenDaylight :: groupbasedpolicy :: Neutron Mapper mapps neutron APIs to GBP APIs '>
         <feature version="${mdsal.version}">odl-mdsal-broker</feature>
-        <bundle>mvn:org.opendaylight.groupbasedpolicy/oc-renderer/${project.version}</bundle>
-        <configfile finalname="${config.configfile.directory}/${config.groupbasedpolicy.occonfigfile}">mvn:org.opendaylight.groupbasedpolicy/groupbasedpolicy-oc-config/${project.version}/xml/config
-       </configfile>
+        <feature version="${neutron.version}">odl-neutron-service</feature>
+        <feature version="${project.version}">odl-groupbasedpolicy-base</feature>
+        <feature version="${project.version}">odl-groupbasedpolicy-ofoverlay</feature>
+        <bundle>mvn:org.opendaylight.groupbasedpolicy/neutron-mapper/${project.version}</bundle>
+        <configfile finalname="${config.configfile.directory}/${config.groupbasedpolicy.neutronmapperconfigfile}">mvn:org.opendaylight.groupbasedpolicy/neutron-mapper-config/${project.version}/xml/config</configfile>
     </feature>
-</features>
 
+    <!--
+         The UI Backend
+    -->
+    <feature name='odl-groupbasedpolicy-uibackend' version='${project.version}' description='OpenDaylight :: groupbasedpolicy :: UI Backend provides APIs for UI '>
+        <feature version="${mdsal.version}">odl-mdsal-broker</feature>
+        <feature version="${project.version}">odl-groupbasedpolicy-base</feature>
+        <feature version="${restconf.version}">odl-restconf</feature>
+        <bundle>mvn:org.opendaylight.groupbasedpolicy/ui-backend/${project.version}</bundle>
+        <configfile finalname="${config.configfile.directory}/${config.groupbasedpolicy.uibackendconfigfile}">mvn:org.opendaylight.groupbasedpolicy/ui-backend-config/${project.version}/xml/config</configfile>
+    </feature>
+</features>