Merge "BUG 4978 add neutron service to feature openstack"

diff --cc features/src/main/features/features.xml
index 0a8154c259aefda41711c991a739aeae07551e84,3b5ab6a2b2cec959a6be44d76924455c687496c2..a96363e54ac77f6b2dd087e8f07a63779311a8b8
--- 1/features/src/main/features/features.xml
--- 2/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@@ -99,16 -98,9 +99,18 @@@ and is available at http://www.eclipse.
      <bundle>mvn:org.opendaylight.neutron/dummyprovider/${neutron.version}</bundle>
      <feature version="${project.version}">odl-vpnservice-impl-ui</feature>
    </feature>
-   <feature name='odl-vpnservice-openstack' version='${project.version}' description='OpenDaylight :: vpnservice :: impl :: REST '>
-     <feature version="${project.version}">odl-vpnservice-impl</feature>
+   <feature name='odl-vpnservice-openstack' version='${project.version}' description='OpenDaylight :: vpnservice :: openstack'>
+     <feature version="${neutron.version}">odl-neutron-service</feature>
+     <bundle>mvn:org.opendaylight.neutron/dummyprovider/${neutron.version}</bundle>
+     <feature version="${project.version}">odl-vpnservice-impl-rest</feature>
    </feature>
 +  <feature name='odl-vpnservice-intent' version='${project.version}' description='OpenDaylight :: vpnservice :: intent'>
 +    <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
 +    <feature version='${nic.version}'>odl-nic-core-service-mdsal</feature>
 +    <feature version='${nic.version}'>odl-nic-core</feature>
 +    <feature version='${nic.version}'>odl-nic-listeners</feature>
 +    <bundle>mvn:org.opendaylight.vpnservice/vpnintent-api/{{VERSION}}</bundle>
 +    <bundle>mvn:org.opendaylight.vpnservice/vpnintent-impl/{{VERSION}}</bundle>
 +    <configfile finalname="vpnintent-impl-default-config.xml">mvn:org.opendaylight.vpnservice/vpnintent-impl/{{VERSION}}/xml/config</configfile>
 +  </feature>
    </features>