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
Enable DIDM in odl-integration-all
[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 a5633c2921298eefafca6ad1e99a13f38f6f7c8e..050cd60da5ee25023af846efeea073a077e8bfdc 100644
(file)
--- a/
features-test/src/main/resources/features.xml
+++ b/
features-test/src/main/resources/features.xml
@@
-81,14
+81,16
@@
<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.mdsal.version}'>odl-mdsal-broker</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.mdsal.version}'>odl-mdsal-broker</feature>
- <feature version='${feature.natapp.version}'>odl-natapp-api</feature>
- <feature version='${feature.natapp.version}'>odl-natapp</feature>
<feature version='${feature.nemo.version}'>odl-nemo-engine</feature>
<feature version='${feature.nemo.version}'>odl-nemo-engine-rest</feature>
<feature version='${feature.nemo.version}'>odl-nemo-engine-ui</feature>
<feature version='${feature.nemo.version}'>odl-nemo-engine</feature>
<feature version='${feature.nemo.version}'>odl-nemo-engine-rest</feature>
<feature version='${feature.nemo.version}'>odl-nemo-engine-ui</feature>
@@
-97,9
+99,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>
@@
-109,7
+109,9
@@
<feature version='${feature.ovsdb.version}'>odl-ovsdb-southbound-impl</feature>
<feature version='${feature.packetcable.version}'>odl-packetcable-policy-server-all</feature>
<feature version='${feature.restconf.version}'>odl-restconf-noauth</feature>
<feature version='${feature.ovsdb.version}'>odl-ovsdb-southbound-impl</feature>
<feature version='${feature.packetcable.version}'>odl-packetcable-policy-server-all</feature>
<feature version='${feature.restconf.version}'>odl-restconf-noauth</feature>
+ <!-- Remove sdninterfaceapp until they remove their dependency on tcpmd5
<feature version='${feature.sdninterfaceapp.version}'>odl-sdninterfaceapp-all</feature>
<feature version='${feature.sdninterfaceapp.version}'>odl-sdninterfaceapp-all</feature>
+ -->
<feature version='${feature.sfc.version}'>odl-sfc-test-consumer</feature>
<feature version='${feature.sfc.version}'>odl-sfclisp</feature>
<feature version='${feature.sfc.version}'>odl-sfc-ui</feature>
<feature version='${feature.sfc.version}'>odl-sfc-test-consumer</feature>
<feature version='${feature.sfc.version}'>odl-sfclisp</feature>
<feature version='${feature.sfc.version}'>odl-sfc-ui</feature>
@@
-118,8
+120,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>
+ <!-- Issues 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,22
+133,20
@@
<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>
- <feature version='${feature.usecplugin.version}'>odl-usecplugin-a
pi
</feature>
- <feature version='${feature.usecplugin.version}'>odl-usecplugin</feature>
+ <feature version='${feature.usecplugin.version}'>odl-usecplugin-a
aa
</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.groupbasedpolicy.version}'>odl-groupbasedpolicy-iovisor</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.groupbasedpolicy.version}'>odl-groupbasedpolicy-iovisor</feature>
+ <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-neutronmapper</feature>
+ <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-neutron-and-ofoverlay</feature>
+ <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-neutron-vpp-mapper</feature>
<feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-ne-location-provider</feature>
<feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-ofoverlay</feature>
<feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-sxp-mapper</feature>
<feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-ne-location-provider</feature>
<feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-ofoverlay</feature>
<feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-sxp-mapper</feature>
@@
-162,7
+163,9
@@
which leads to BindException.
<feature version='${feature.lacp.version}'>odl-lacp-ui</feature>
-->
which leads to BindException.
<feature version='${feature.lacp.version}'>odl-lacp-ui</feature>
-->
- <feature version='${feature.netvirt.vpnservice.version}'>odl-netvirt-vpnservice-openstack</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-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>
@@
-172,7
+175,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>