neutron: unbreak of neutron northbound yang model revise

[netvirt.git] / vpnservice / features / src / main / features / features.xml

diff --git a/vpnservice/features/src/main/features/features.xml b/vpnservice/features/src/main/features/features.xml
index 785461ae3323b990eda87f3fc4ed44802866a6d0..4d93c9dae41981412f1f708fcf535edae2493ed0 100644 (file)
--- a/vpnservice/features/src/main/features/features.xml
+++ b/vpnservice/features/src/main/features/features.xml
@@ -18,7 +18,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <repository>mvn:org.opendaylight.netconf/features-restconf/{{VERSION}}/xml/features</repository>
   <repository>mvn:org.opendaylight.ovsdb/southbound-features/{{VERSION}}/xml/features</repository>
   <repository>mvn:org.opendaylight.neutron/features-neutron/{{VERSION}}/xml/features</repository>
-  <repository>mvn:org.opendaylight.nic/features-nic/{{VERSION}}/xml/features</repository>
   <repository>mvn:org.opendaylight.ovsdb/hwvtepsouthbound-features/{{VERSION}}/xml/features</repository>
   <repository>mvn:org.opendaylight.genius/genius-features/{{VERSION}}/xml/features</repository>
   <feature name='odl-netvirt-vpnservice-api' version='${project.version}' description='OpenDaylight :: vpnservice :: api '>
@@ -37,6 +36,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <bundle>mvn:org.opendaylight.netvirt/neutronvpn-api/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.netvirt/dhcpservice-api/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.netvirt/natservice-api/{{VERSION}}</bundle>
+    <bundle>mvn:org.opendaylight.netvirt/aclservice-api/{{VERSION}}</bundle>
   </feature>
   <feature name='odl-netvirt-vpnservice-impl' version='${project.version}' description='OpenDaylight :: vpnservice :: impl '>
     <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
@@ -59,6 +59,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <bundle>mvn:org.opendaylight.netvirt/elanmanager-api/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.netvirt/elanmanager-impl/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.netvirt/natservice-impl/{{VERSION}}</bundle>
+    <bundle>mvn:org.opendaylight.netvirt/aclservice-impl/{{VERSION}}</bundle>
 
     <!--<bundle>mvn:org.opendaylight.vpnservice.third-party/org.apache.thriftlib/1.1.0-SNAPSHOT</bundle>-->
     <bundle>wrap:mvn:org.apache.thrift/libthrift/0.9.1$overwrite=merge&amp;Bundle-Version=0.9.1&amp;Export-Package=*;-noimport:=true;version="0.9.1"</bundle>
@@ -70,6 +71,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <configfile finalname="dhcpservice-impl-default-config.xml">mvn:org.opendaylight.netvirt/dhcpservice-impl/{{VERSION}}/xml/config</configfile>
     <configfile finalname="elanmanager-impl-default-config.xml">mvn:org.opendaylight.netvirt/elanmanager-impl/{{VERSION}}/xml/config</configfile>
     <configfile finalname="natservice-impl-default-config.xml">mvn:org.opendaylight.netvirt/natservice-impl/{{VERSION}}/xml/config</configfile>
+    <configfile finalname="aclservice-impl-default-config.xml">mvn:org.opendaylight.netvirt/aclservice-impl/{{VERSION}}/xml/config</configfile>
 
   </feature>
   <feature name='odl-netvirt-vpnservice-impl-rest' version='${project.version}' description='OpenDaylight :: vpnservice :: impl :: REST '>
@@ -83,12 +85,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   </feature>
   <feature name='odl-netvirt-vpnservice-core' version='${project.version}' description='OpenDaylight :: vpnservice :: core'>
     <feature version="${neutron.version}">odl-neutron-service</feature>
-    <bundle>mvn:org.opendaylight.neutron/dummyprovider/{{VERSION}}</bundle>
     <feature version="${project.version}">odl-netvirt-vpnservice-impl-ui</feature>
   </feature>
   <feature name='odl-netvirt-vpnservice-openstack' version='${project.version}' description='OpenDaylight :: vpnservice :: openstack'>
     <feature version="${neutron.version}">odl-neutron-service</feature>
-    <bundle>mvn:org.opendaylight.neutron/dummyprovider/{{VERSION}}</bundle>
     <feature version="${project.version}">odl-netvirt-vpnservice-impl-rest</feature>
   </feature>
   </features>