Changes features for odl-groupbasedpolicy-vpp

[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 0edb002dca23d2f81227424c4909f7c5565a725d..e0669a90bea8f8c53b70a3024f13be5ce52736d0 100755 (executable)
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -29,7 +29,7 @@
     <repository>mvn:org.opendaylight.dlux/features-dlux/{{VERSION}}/xml/features</repository>
     <!-- Repos needed by IOvisor Renderer -->
     <repository>mvn:org.opendaylight.aaa/features-aaa-shiro/${aaa.version}/xml/features</repository>
-    <!-- Repos needed by sxp-mapper -->
+    <!-- Repos needed by sxp-integration -->
     <repository>mvn:org.opendaylight.sxp/features/${sxp.version}/xml/features</repository>
     <!-- Repos needed by iosxe renderer -->
     <repository>mvn:org.opendaylight.netconf/features-netconf-connector/${netconf.version}/xml/features</repository>
@@ -57,7 +57,7 @@
         <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>
-        <feature version='${sfc.version}'>odl-sfcofl2</feature>
+        <feature version='${sfc.version}'>odl-sfc-openflow-renderer</feature>
         <feature version='${sfc.version}'>odl-sfc-ui</feature>
         <bundle>mvn:commons-net/commons-net/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.groupbasedpolicy/ofoverlay-renderer/{{VERSION}}</bundle>
@@ -78,7 +78,7 @@
         <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>
-        <feature version='${sfc.version}'>odl-sfcofl2</feature>
+        <feature version='${sfc.version}'>odl-sfc-openflow-renderer</feature>
         <feature version='${sfc.version}'>odl-sfc-ui</feature>
         <bundle>mvn:commons-net/commons-net/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.groupbasedpolicy/ovssfc-renderer/{{VERSION}}</bundle>
@@ -155,8 +155,8 @@
     -->
     <feature name='odl-groupbasedpolicy-vpp' version='${project.version}' description='OpenDaylight :: groupbasedpolicy :: VPP renderer '>
         <feature version="${project.version}">odl-groupbasedpolicy-base</feature>
-        <feature version="${netconf.version}">odl-netconf-topology</feature>
-        <feature version="${vbd.version}">odl-vbd-api</feature>
+        <feature version="${netconf.version}">odl-netconf-clustered-topology</feature>
+        <feature version="${vbd.version}">odl-vbd</feature>
         <bundle>mvn:org.opendaylight.groupbasedpolicy/l2-l3-domain-extension/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.groupbasedpolicy/vpp-renderer/{{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>
@@ -182,16 +182,14 @@
     </feature>
 
     <!--
-        SXP-MAPPER
+        SXP Distribution Service
     -->
-    <feature name='odl-groupbasedpolicy-sxp-mapper' version='${project.version}' description='OpenDaylight :: groupbasedpolicy :: sxp-mapper'>
+    <feature name='odl-groupbasedpolicy-ip-sgt-distribution-service' version='${project.version}' description='OpenDaylight :: groupbasedpolicy :: ip-sgt-distribution-service'>
         <feature version="${project.version}">odl-groupbasedpolicy-base</feature>
         <feature version="${sxp.version}">odl-sxp-core</feature>
-        <bundle>mvn:org.opendaylight.groupbasedpolicy/l2-l3-domain-extension/{{VERSION}}</bundle>
-        <bundle>mvn:commons-net/commons-net/{{VERSION}}</bundle>
-        <bundle>mvn:org.opendaylight.groupbasedpolicy/sxp-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-groupbasedpolicy-sxp-mapper.xml">mvn:org.opendaylight.groupbasedpolicy/sxp-mapper/{{VERSION}}/xml/config</configfile>
+        <feature version="${sxp.version}">odl-sxp-controller</feature>
+        <bundle>mvn:org.opendaylight.groupbasedpolicy/ip-sgt-distribution-service/{{VERSION}}</bundle>
+        <configfile finalname="${config.configfile.directory}/15-groupbasedpolicy-ip-sgt-distribution-service.xml">mvn:org.opendaylight.groupbasedpolicy/ip-sgt-distribution-service/{{VERSION}}/xml/config</configfile>
     </feature>
 
     <!--
@@ -211,13 +209,12 @@
     <feature name='odl-groupbasedpolicy-ios-xe' version='${project.version}' description='OpenDaylight :: groupbasedpolicy :: ios-xe renderer'>
         <feature version="${project.version}">odl-groupbasedpolicy-base</feature>
         <feature version="${project.version}">odl-groupbasedpolicy-sxp-ep-provider</feature>
+        <feature version="${project.version}">odl-groupbasedpolicy-ip-sgt-distribution-service</feature>
         <feature version="${sfc.version}">odl-sfc-provider</feature>
         <feature version="${sxp.version}">odl-sxp-core</feature>
-        <feature version="${netconf.version}">odl-netconf-topology</feature>
+        <feature version="${netconf.version}">odl-netconf-clustered-topology</feature>
         <bundle>mvn:org.opendaylight.groupbasedpolicy/l2-l3-domain-extension/{{VERSION}}</bundle>
-        <bundle>mvn:org.opendaylight.groupbasedpolicy/sxp-mapper/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.groupbasedpolicy/ios-xe-renderer/{{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-groupbasedpolicy-ios-xe-renderer.xml">mvn:org.opendaylight.groupbasedpolicy/ios-xe-renderer/{{VERSION}}/xml/config</configfile>
     </feature>
 
@@ -229,21 +226,22 @@
         <feature version="${project.version}">odl-groupbasedpolicy-base</feature>
         <bundle>mvn:org.opendaylight.groupbasedpolicy/l2-l3-domain-extension/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.groupbasedpolicy/sxp-ep-provider/{{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-groupbasedpolicy-sxp-ep-provider.xml">mvn:org.opendaylight.groupbasedpolicy/sxp-ep-provider/{{VERSION}}/xml/config</configfile>
     </feature>
+    <feature name='odl-groupbasedpolicy-sxp-mapper' version='${project.version}' description='OpenDaylight :: groupbasedpolicy :: sxp-mapper'>
+        <!-- TODO: remove later - this is temporary "feature-forwarding" in order to keep integration feature test working -->
+        <feature version="${project.version}">odl-groupbasedpolicy-sxp-ep-provider</feature>
+    </feature>
 
     <!--
-       GBP-ISE ADAPTER
+       GBP-SXP integration : ise-adapter
    -->
-    <feature name='odl-groupbasedpolicy-ise-adapter' version='${project.version}' description='OpenDaylight :: groupbasedpolicy :: gbp-ise adapter'>
+    <feature name='odl-groupbasedpolicy-sxp-ise-adapter' version='${project.version}' description='OpenDaylight :: groupbasedpolicy :: sxp ise adapter'>
         <feature version="${project.version}">odl-groupbasedpolicy-sxp-ep-provider</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/sxp-ise-adapter/{{VERSION}}</bundle>
-        <bundle>mvn:org.opendaylight.groupbasedpolicy/sxp-ep-provider/{{VERSION}}</bundle>
-        <configfile finalname="${config.configfile.directory}/16-groupbasedpolicy-ise-adapter.xml">mvn:org.opendaylight.groupbasedpolicy/sxp-ise-adapter/{{VERSION}}/xml/config</configfile>
+        <configfile finalname="${config.configfile.directory}/16-groupbasedpolicy-sxp-ise-adapter.xml">mvn:org.opendaylight.groupbasedpolicy/sxp-ise-adapter/{{VERSION}}/xml/config</configfile>
     </feature>
+
 </features>