<feature version='${feature.aaa.version}'>odl-aaa-authz</feature>
<feature version='${feature.netconf.version}'>odl-aaa-netconf-plugin</feature>
<feature version='${feature.aaa.version}'>odl-aaa-sssd-plugin</feature>
- <feature version='${feature.alto.version}'>odl-alto-release</feature>
<!-- Remove Armoury from Beryllium release as per as committers consent:
https://lists.opendaylight.org/pipermail/armoury-dev/2016-January/000081.html.
Need to be uncommented once in Boron -->
<feature version='${feature.neutron.version}'>odl-neutron-service</feature>
<feature version='${feature.netconf.version}'>odl-netconf-connector-ssh</feature>
<feature version='${feature.netide.version}'>odl-netide-rest</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>
-->
<!-- Please use aphabetical 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.
which leads to BindException.
<feature version='${feature.lacp.version}'>odl-lacp-ui</feature>
-->
+ <feature version='${feature.netvirt.vpnservice.version}'>odl-netvirt-vpnservice-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>
-->
- <feature version='${feature.ovsdb.version}'>odl-ovsdb-sfc</feature>
- <feature version='${feature.ovsdb.version}'>odl-ovsdb-openstack</feature>
+ <feature version='${feature.netvirt.version}'>odl-ovsdb-openstack</feature>
+ <feature version='${feature.netvirt.version}'>odl-ovsdb-sfc</feature>
<feature version='${feature.snbi.version}'>odl-snbi-all</feature>
<feature version='${feature.sfc.version}'>odl-sfcofl2</feature>
<feature version='${feature.tsdr.version}'>odl-tsdr-hsqldb-all</feature>
- <feature version='${feature.vpnservice.version}'>odl-vpnservice-core</feature>
- <feature version='${feature.vpnservice.version}'>odl-vpnservice-openstack</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>