From bf902c6bb20825f6d32556203ff867f638098ded Mon Sep 17 00:00:00 2001
From: Sam Hague <shague@redhat.com>
Date: Tue, 10 May 2016 16:28:59 -0400
Subject: [PATCH] use netvirt-vpnservice features

Change-Id: I91fc936c3497d844495105db4aab58a615bb916b
Signed-off-by: Sam Hague <shague@redhat.com>
---
 features-index/pom.xml                         | 16 ++++++++--------
 features-index/src/main/resources/features.xml |  2 +-
 features-test/src/main/resources/features.xml  |  3 +--
 pom.xml                                        |  2 +-
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/features-index/pom.xml b/features-index/pom.xml
index b97ed782..800a1b83 100644
--- a/features-index/pom.xml
+++ b/features-index/pom.xml
@@ -243,7 +243,14 @@
        <classifier>features</classifier>
        <type>xml</type>
      </dependency>
-    <dependency>
+     <dependency>
+       <groupId>org.opendaylight.netvirt</groupId>
+       <artifactId>vpnservice-features</artifactId>
+       <version>${feature.netvirt.vpnservice.version}</version>
+       <classifier>features</classifier>
+       <type>xml</type>
+     </dependency>
+     <dependency>
       <groupId>org.opendaylight.netide</groupId>
       <artifactId>netide-features</artifactId>
       <version>${feature.netide.version}</version>
@@ -434,13 +441,6 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.vpnservice</groupId>
-      <artifactId>vpnservice-features</artifactId>
-      <version>${feature.vpnservice.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.yang-push</groupId>
       <artifactId>yangpush-features</artifactId>
diff --git a/features-index/src/main/resources/features.xml b/features-index/src/main/resources/features.xml
index b9de378e..7e277a0e 100644
--- a/features-index/src/main/resources/features.xml
+++ b/features-index/src/main/resources/features.xml
@@ -65,6 +65,7 @@
     <repository>mvn:org.opendaylight.netide/netide-features/${feature.netide.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.netvirt/features-netvirt/${feature.netvirt.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.netvirt/openstack.net-virt-sfc-features/${feature.netvirt.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.netvirt/vpnservice-features/${feature.netvirt.vpnservice.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.neutron/features-neutron/${feature.neutron.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.nic/features-nic/${feature.nic.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.ocpplugin/features-ocpplugin/${feature.ocpplugin.version}/xml/features</repository>
@@ -92,7 +93,6 @@
     <repository>mvn:org.opendaylight.unimgr/unimgr-features/${feature.unimgr.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.usc/usc-features/${feature.usc.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.usecplugin/usecplugin-features/${feature.usecplugin.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.vpnservice/vpnservice-features/${feature.vpnservice.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.vtn/features-vtn-manager/${feature.vtn-manager.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.yang-push/yangpush-features/${feature.yang-push.version}/xml/features</repository>
 </features>
diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index 11159f1a..04a79f56 100644
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -158,6 +158,7 @@
         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.
@@ -168,8 +169,6 @@
         <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>
diff --git a/pom.xml b/pom.xml
index 0a690cda..d9ab7a5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,6 +47,7 @@
     <feature.netconf.version>1.1.0-SNAPSHOT</feature.netconf.version>
     <feature.netide.version>0.2.0-SNAPSHOT</feature.netide.version>
     <feature.netvirt.version>1.3.0-SNAPSHOT</feature.netvirt.version>
+    <feature.netvirt.vpnservice.version>0.3.0-SNAPSHOT</feature.netvirt.vpnservice.version>
     <feature.nic.version>1.2.0-SNAPSHOT</feature.nic.version>
     <feature.neutron.version>0.7.0-SNAPSHOT</feature.neutron.version>
     <feature.ocpplugin.version>0.1.0-SNAPSHOT</feature.ocpplugin.version>
@@ -68,7 +69,6 @@
     <feature.unimgr.version>0.1.0-SNAPSHOT</feature.unimgr.version>
     <feature.usc.version>1.2.0-SNAPSHOT</feature.usc.version>
     <feature.usecplugin.version>1.1.0-SNAPSHOT</feature.usecplugin.version>
-    <feature.vpnservice.version>0.3.0-SNAPSHOT</feature.vpnservice.version>
     <feature.vtn-manager.version>0.5.0-SNAPSHOT</feature.vtn-manager.version>
     <feature.yang-push.version>1.1.0-SNAPSHOT</feature.yang-push.version>
     <feature.yangtools.version>1.0.0-SNAPSHOT</feature.yangtools.version>
-- 
2.36.6