Merge "Tests for neutron-ovsdb"

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

diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml
index bc6072c93a88d34a4c28c8d1c92161dbb404c043..0d87284cdac5c1c055e79385c75f71469830fdfc 100755 (executable)
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -25,8 +25,6 @@
     <repository>mvn:org.opendaylight.neutron/features-neutron/{{VERSION}}/xml/features</repository>
     <!-- Repos needed by ofoverlay for SFC -->
     <repository>mvn:org.opendaylight.sfc/features-sfc/{{VERSION}}/xml/features</repository>
-    <!-- Repos needed by the UI Backend -->
-    <repository>mvn:org.opendaylight.netconf/features-restconf/{{VERSION}}/xml/features</repository>
     <!-- Repos needed by the UI -->
     <repository>mvn:org.opendaylight.dlux/features-dlux/{{VERSION}}/xml/features</repository>
     <!-- Repos needed by IOvisor Renderer -->
@@ -137,7 +135,6 @@
         <feature version="${neutron.version}">odl-neutron-service</feature>
         <feature version="${project.version}">odl-groupbasedpolicy-base</feature>
         <bundle>mvn:org.opendaylight.groupbasedpolicy/l2-l3-domain-extension/{{VERSION}}</bundle>
-        <bundle>mvn:org.opendaylight.neutron/dummyprovider/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.groupbasedpolicy/neutron-mapper/{{VERSION}}</bundle>
         <configfile finalname="${config.configfile.directory}/15-l2-l3-domain-extension.xml">mvn:org.opendaylight.groupbasedpolicy/l2-l3-domain-extension/{{VERSION}}/xml/config</configfile>
         <configfile finalname="${config.configfile.directory}/15-neutron-mapper.xml">mvn:org.opendaylight.groupbasedpolicy/neutron-mapper/{{VERSION}}/xml/config</configfile>
@@ -176,25 +173,12 @@
         <configfile finalname="${config.configfile.directory}/15-neutron-vpp-mapper.xml">mvn:org.opendaylight.groupbasedpolicy/neutron-vpp-mapper/{{VERSION}}/xml/config</configfile>
     </feature>
 
-    <!--
-         The UI Backend
-    -->
-    <feature name='odl-groupbasedpolicy-uibackend' version='${project.version}' description='OpenDaylight :: groupbasedpolicy :: UI Backend provides APIs for UI '>
-        <feature version="${project.version}">odl-groupbasedpolicy-base</feature>
-        <feature version="${restconf.version}">odl-restconf</feature>
-        <bundle>mvn:org.opendaylight.groupbasedpolicy/ui-backend/{{VERSION}}</bundle>
-        <configfile finalname="${config.configfile.directory}/15-ui-backend.xml">mvn:org.opendaylight.groupbasedpolicy/ui-backend/{{VERSION}}/xml/config</configfile>
-    </feature>
-
     <!--
          UI
     -->
     <feature name='odl-groupbasedpolicy-ui' version='${project.version}' description='OpenDaylight :: groupbasedpolicy :: DLUX UI '>
         <feature version="${dlux.version}">odl-dlux-core</feature>
-        <feature version="${dlux.version}">odl-dlux-yangvisualizer</feature>
-        <feature version="${project.version}">odl-groupbasedpolicy-uibackend</feature>
         <bundle>mvn:org.opendaylight.groupbasedpolicy/groupbasedpolicy-ui-bundle/{{VERSION}}</bundle>
-        <bundle>mvn:org.opendaylight.groupbasedpolicy/groupbasedpolicy-old-ui-bundle/{{VERSION}}</bundle>
     </feature>
 
     <!--
@@ -235,4 +219,17 @@
         <configfile finalname="${config.configfile.directory}/15-l2-l3-domain-extension.xml">mvn:org.opendaylight.groupbasedpolicy/l2-l3-domain-extension/{{VERSION}}/xml/config</configfile>
         <configfile finalname="${config.configfile.directory}/15-groupbasedpolicy-ios-xe-renderer.xml">mvn:org.opendaylight.groupbasedpolicy/ios-xe-renderer/{{VERSION}}/xml/config</configfile>
     </feature>
+
+    <!--
+       GBP-ISE ADAPTER
+   -->
+    <feature name='odl-groupbasedpolicy-ise-adapter' version='${project.version}' description='OpenDaylight :: groupbasedpolicy :: gbp-ise adapter'>
+        <feature version="${project.version}">odl-groupbasedpolicy-sxp-mapper</feature>
+        <feature version="${sxp.version}">odl-sxp-core</feature>
+        <bundle>mvn:commons-net/commons-net/{{VERSION}}</bundle>
+        <bundle>mvn:com.sun.jersey/jersey-client/{{VERSION}}</bundle>
+        <bundle>mvn:com.sun.jersey/jersey-core/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.groupbasedpolicy/groupbasedpolicy-ise-adapter/{{VERSION}}</bundle>
+        <configfile finalname="${config.configfile.directory}/16-groupbasedpolicy-ise-adapter.xml">mvn:org.opendaylight.groupbasedpolicy/groupbasedpolicy-ise-adapter/{{VERSION}}/xml/config</configfile>
+    </feature>
 </features>