Adding vpnservice features

[integration/distribution.git] / features / test / src / main / resources / features.xml

diff --git a/features/test/src/main/resources/features.xml b/features/test/src/main/resources/features.xml
index 3757838c1f81a1578ef5a7bb072853f2c572083a..9cd4040e3c0659b85e3a5b1035ecff8a744f94e7 100644 (file)
--- a/features/test/src/main/resources/features.xml
+++ b/features/test/src/main/resources/features.xml
@@ -63,19 +63,19 @@
         <feature version='0.2.0-SNAPSHOT'>odl-aaa-sssd-plugin</feature>
         <feature version='0.2.0-SNAPSHOT'>odl-aaa-netconf-plugin</feature>
         <feature version='${feature.adsal.version}'>odl-adsal-all</feature>
-        <feature version='${feature.adsal.version}'>odl-adsal-compatibility</feature>
-        <feature version='${feature.bgp.version}'>odl-bgpcep-all</feature>
+        <feature version='${feature.bgpcep.version}'>odl-bgpcep-bgp-all</feature>
+        <feature version='${feature.bgpcep.version}'>odl-bgpcep-pcep-all</feature>
         <feature version='${feature.dlux.version}'>odl-dlux-core</feature>
         <feature version='${feature.lispflowmapping.version}'>odl-lispflowmapping-all</feature>
         <feature version='1.2.0-SNAPSHOT'>odl-mdsal-broker</feature>
-        <feature version='${feature.neutron.version}'>odl-neutron-northbound</feature>
-        <feature version='${feature.neutron.version}'>odl-neutron-implementation</feature>
+        <feature version='${feature.neutron.version}'>odl-neutron-service</feature>
         <feature version='${feature.mdsal.version}'>odl-netconf-connector-ssh</feature>
         <feature version='${feature.nsf.version}'>odl-nsf-all</feature>
         <feature version='0.6.0-SNAPSHOT'>odl-openflowjava-protocol</feature>
-        <feature version='0.1.0-SNAPSHOT'>odl-openflowplugin-flow-services</feature>
-        <feature version='0.1.0-SNAPSHOT'>odl-openflowplugin-flow-services-rest</feature>
-        <feature version='0.1.0-SNAPSHOT'>odl-openflowplugin-flow-services-ui</feature>
+        <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-flow-services</feature>
+        <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-flow-services-rest</feature>
+        <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-flow-services-ui</feature>
+        <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-adsal-compatibility</feature>
         <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-nxm-extensions</feature>
         <feature version='${feature.ovsdb.version}'>odl-ovsdb-all</feature>
         <feature version='${feature.packetcable.version}'>odl-packetcable-all</feature>
@@ -84,23 +84,32 @@
         <feature version='0.1.0-SNAPSHOT'>odl-sfc-all</feature>
         <feature version='0.1.0-SNAPSHOT'>odl-sfclisp</feature>
         <feature version='0.1.0-SNAPSHOT'>odl-sfcofl2</feature>
-        <feature version='${feature.snbi.version}'>odl-snbi-all</feature>
-        <feature version='${feature.topoprocessing.version}'>odl-topoprocessing-all</feature>
+        <feature version='${feature.topoprocessing.version}'>odl-topoprocessing-framework</feature>
+        <feature version='${feature.topoprocessing.version}'>odl-topoprocessing-mlmt</feature>
         <feature version='${feature.ttp.version}'>odl-ttp-all</feature>
         <feature version='0.2.0-SNAPSHOT'>odl-snmp4sdn-all</feature>
         <feature version='${feature.tcpmd5.version}'>odl-tcpmd5-all</feature>
+        <feature version='${feature.usc.version}'>odl-usc-all</feature>
+        <feature version='${snmp.plugin.version}'>odl-snmp-plugin</feature>
+        <feature version='${didm.version}'>odl-didm-identification-api</feature>
+        <feature version='${didm.version}'>odl-didm-identification</feature>
+        <feature version='${didm.version}'>odl-didm-drivers-api</feature>
+        <feature version='${feature.vpnservice.version}'>odl-vpnservice-core</feature>
     </feature>
 
     <!-- Please use aphabetical order for non-compatible features -->
     <feature name='odl-integration-all' version='${project.version}'>
-         <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-ofoverlay</feature>
-         <feature version='${project.version}'>odl-integration-compatible-with-all</feature>
-         <feature version='0.2.0-SNAPSHOT'>odl-l2switch-switch</feature>
-         <feature version='0.2.0-SNAPSHOT'>odl-l2switch-switch-rest</feature>
-         <feature version='0.2.0-SNAPSHOT'>odl-l2switch-switch-ui</feature>
-         <feature version='0.2.0-SNAPSHOT'>odl-plugin2oc</feature>
-         <feature version='${feature.ovsdb.openstack.version}'>odl-ovsdb-openstack</feature>
+        <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-ofoverlay</feature>
+        <feature version='${project.version}'>odl-integration-compatible-with-all</feature>
+        <feature version='0.2.0-SNAPSHOT'>odl-l2switch-switch</feature>
+        <feature version='0.2.0-SNAPSHOT'>odl-l2switch-switch-rest</feature>
+        <feature version='0.2.0-SNAPSHOT'>odl-l2switch-switch-ui</feature>
+<!--
+        <feature version='0.2.0-SNAPSHOT'>odl-plugin2oc</feature>
+-->
+        <feature version='${feature.ovsdb.openstack.version}'>odl-ovsdb-openstack</feature>
         <feature version='0.1.0-SNAPSHOT'>odl-ovsdb-ovssfc</feature>
+        <feature version='${feature.snbi.version}'>odl-snbi-all</feature>
         <feature version='${feature.vtn-manager.version}'>odl-vtn-manager-all</feature>
     </feature>