Code Review
/
integration
/
distribution.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add sdninterface back in distribution
[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 96899f632c93a7993470739a77e6c68dd7934206..b066d6ec3d1f6a218f1ad211cf0a1f7448dc716e 100644
(file)
--- a/
features-test/src/main/resources/features.xml
+++ b/
features-test/src/main/resources/features.xml
@@
-67,6
+67,7
@@
Needs to be uncommented once in Boron
<feature version='${feature.armoury.version}'>odl-armoury-workloadmanager</feature>
-->
Needs to be uncommented once in Boron
<feature version='${feature.armoury.version}'>odl-armoury-workloadmanager</feature>
-->
+ <feature version='${feature.atrium.version}'>odl-atrium-all</feature>
<feature version='${feature.bgpcep.version}'>odl-bgpcep-bgp-all</feature>
<feature version='${feature.bgpcep.version}'>odl-bgpcep-bmp</feature>
<feature version='${feature.bgpcep.version}'>odl-bgpcep-pcep-all</feature>
<feature version='${feature.bgpcep.version}'>odl-bgpcep-bgp-all</feature>
<feature version='${feature.bgpcep.version}'>odl-bgpcep-bmp</feature>
<feature version='${feature.bgpcep.version}'>odl-bgpcep-pcep-all</feature>
@@
-81,8
+82,12
@@
<feature version='${feature.circuitsw.version}'>odl-circuitsw-switch</feature>
<feature version='${feature.circuitsw.version}'>odl-circuitsw-switch-rest</feature>
<feature version='${feature.circuitsw.version}'>odl-circuitsw-switch-ui</feature>
<feature version='${feature.circuitsw.version}'>odl-circuitsw-switch</feature>
<feature version='${feature.circuitsw.version}'>odl-circuitsw-switch-rest</feature>
<feature version='${feature.circuitsw.version}'>odl-circuitsw-switch-ui</feature>
+ <feature version='${didm.version}'>odl-didm-all</feature>
<feature version='${feature.dlux.version}'>odl-dlux-core</feature>
<feature version='${project.version}'>odl-distribution-version</feature>
<feature version='${feature.dlux.version}'>odl-dlux-core</feature>
<feature version='${project.version}'>odl-distribution-version</feature>
+ <feature version='${feature.eman.version}'>odl-eman</feature>
+ <feature version='${feature.eman.version}'>odl-eman-rest</feature>
+ <feature version='${feature.eman.version}'>odl-eman-ui</feature>
<feature version='${feature.lispflowmapping.version}'>odl-lispflowmapping-msmr</feature>
<feature version='${feature.lispflowmapping.version}'>odl-lispflowmapping-ui</feature>
<feature version='${feature.benchmark.version}'>odl-mdsal-benchmark</feature>
<feature version='${feature.lispflowmapping.version}'>odl-lispflowmapping-msmr</feature>
<feature version='${feature.lispflowmapping.version}'>odl-lispflowmapping-ui</feature>
<feature version='${feature.benchmark.version}'>odl-mdsal-benchmark</feature>
@@
-95,9
+100,7
@@
<feature version='${feature.netide.version}'>odl-netide-rest</feature>
<feature version='${feature.netide.version}'>odl-netide-app</feature>
<feature version='${feature.ocpplugin.version}'>odl-ocpplugin-all</feature>
<feature version='${feature.netide.version}'>odl-netide-rest</feature>
<feature version='${feature.netide.version}'>odl-netide-app</feature>
<feature version='${feature.ocpplugin.version}'>odl-ocpplugin-all</feature>
- <!-- Issue with of-config merge requires this line commented out
<feature version='${feature.of-config.version}'>odl-of-config-all</feature>
<feature version='${feature.of-config.version}'>odl-of-config-all</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-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>
@@
-116,10
+119,9
@@
<feature version='${feature.sfc.version}'>odl-sfc-netconf</feature>
<feature version='${feature.sxp.version}'>odl-sxp-controller</feature>
<feature version='${snmp.plugin.version}'>odl-snmp-plugin</feature>
<feature version='${feature.sfc.version}'>odl-sfc-netconf</feature>
<feature version='${feature.sxp.version}'>odl-sxp-controller</feature>
<feature version='${snmp.plugin.version}'>odl-snmp-plugin</feature>
- <!-- Issue
with old adsal dependency shows
up in aaa distribution-check
+ <!-- Issue
s with yang parser show
up in aaa distribution-check
<feature version='${feature.snmp4sdn.version}'>odl-snmp4sdn-all</feature>
-->
<feature version='${feature.snmp4sdn.version}'>odl-snmp4sdn-all</feature>
-->
- <feature version='${feature.tcpmd5.version}'>odl-tcpmd5-all</feature>
<feature version='${feature.topoprocessing.version}'>odl-topoprocessing-network-topology</feature>
<feature version='${feature.topoprocessing.version}'>odl-topoprocessing-inventory</feature>
<feature version='${feature.topoprocessing.version}'>odl-topoprocessing-i2rs</feature>
<feature version='${feature.topoprocessing.version}'>odl-topoprocessing-network-topology</feature>
<feature version='${feature.topoprocessing.version}'>odl-topoprocessing-inventory</feature>
<feature version='${feature.topoprocessing.version}'>odl-topoprocessing-i2rs</feature>
@@
-130,20
+132,13
@@
<feature version='${feature.usc.version}'>odl-usc-channel</feature>
<feature version='${feature.usc.version}'>odl-usc-channel-rest</feature>
<feature version='${feature.usc.version}'>odl-usc-channel-ui</feature>
<feature version='${feature.usc.version}'>odl-usc-channel</feature>
<feature version='${feature.usc.version}'>odl-usc-channel-rest</feature>
<feature version='${feature.usc.version}'>odl-usc-channel-ui</feature>
-
- <!-- Addition of new features mandates existing usecplugin features to be commented out-->
- <!--feature version='${feature.usecplugin.version}'>odl-usecplugin-api</feature-->
- <!--feature version='${feature.usecplugin.version}'>odl-usecplugin</feature-->
+ <feature version='${feature.usecplugin.version}'>odl-usecplugin-aaa</feature>
+ <feature version='${feature.usecplugin.version}'>odl-usecplugin-openflow</feature>
</feature>
<!-- Please use alphabetical order for non-compatible features -->
<feature name='odl-integration-all' version='${project.version}'>
<feature version='${feature.alto.version}'>odl-alto-release</feature>
</feature>
<!-- Please use alphabetical order for non-compatible features -->
<feature name='odl-integration-all' version='${project.version}'>
<feature version='${feature.alto.version}'>odl-alto-release</feature>
- <!-- Commented out, because DIDM brings in Li designed OpenFlowPlugin
- which leads to BindException.
- Also, DIDM merge jobs are currently failing.
- <feature version='${didm.version}'>odl-didm-all</feature>
- -->
<feature version='${feature.faas.version}'>odl-faas-base</feature>
<feature version='${feature.genius.version}'>odl-genius-rest</feature>
<feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-faas</feature>
<feature version='${feature.faas.version}'>odl-faas-base</feature>
<feature version='${feature.genius.version}'>odl-genius-rest</feature>
<feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-faas</feature>
@@
-169,7
+164,7
@@
-->
<feature version='${feature.natapp.version}'>odl-natapp-api</feature>
<feature version='${feature.natapp.version}'>odl-natapp</feature>
-->
<feature version='${feature.natapp.version}'>odl-natapp-api</feature>
<feature version='${feature.natapp.version}'>odl-natapp</feature>
- <feature version='${feature.netvirt.vpnservice.version}'>odl-netvirt-
vpnservice-
openstack</feature>
+ <feature version='${feature.netvirt.vpnservice.version}'>odl-netvirt-openstack</feature>
<!-- Commented out, because NIC brings in Li designed OpenFlowPlugin
which leads to BindException.
<feature version='${feature.nic.version}'>odl-nic-core-mdsal</feature>
<!-- Commented out, because NIC brings in Li designed OpenFlowPlugin
which leads to BindException.
<feature version='${feature.nic.version}'>odl-nic-core-mdsal</feature>
@@
-179,7
+174,9
@@
<feature version='${feature.snbi.version}'>odl-snbi-all</feature>
<feature version='${feature.sfc.version}'>odl-sfc-ios-xe-renderer</feature>
<feature version='${feature.sfc.version}'>odl-sfc-openflow-renderer</feature>
<feature version='${feature.snbi.version}'>odl-snbi-all</feature>
<feature version='${feature.sfc.version}'>odl-sfc-ios-xe-renderer</feature>
<feature version='${feature.sfc.version}'>odl-sfc-openflow-renderer</feature>
+ <!-- Issues with yang parser show up in aaa distribution-check
<feature version='${feature.tsdr.version}'>odl-tsdr-hsqldb-all</feature>
<feature version='${feature.tsdr.version}'>odl-tsdr-hsqldb-all</feature>
+ -->
<feature version='${feature.vtn-manager.version}'>odl-vtn-manager-neutron</feature>
<feature version='${feature.vtn-manager.version}'>odl-vtn-manager-rest</feature>
<feature version='${feature.yang-push.version}'>odl-yangpush-api</feature>
<feature version='${feature.vtn-manager.version}'>odl-vtn-manager-neutron</feature>
<feature version='${feature.vtn-manager.version}'>odl-vtn-manager-rest</feature>
<feature version='${feature.yang-push.version}'>odl-yangpush-api</feature>