From: Sam Hague <shague@redhat.com>
Date: Thu, 26 May 2016 22:00:22 +0000 (-0400)
Subject: Reenable netvirt-vpnservice - no longer uses nic
X-Git-Tag: release/boron~53
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Fdistribution.git;a=commitdiff_plain;h=e4747edad8a6c9546e84c5472a5343a1336de36d

Reenable netvirt-vpnservice - no longer uses nic

Change-Id: I7f78ce17a044c32fef7ec93ba202e52318b7cc7d
Signed-off-by: Sam Hague <shague@redhat.com>
---

diff --git a/features-index/pom.xml b/features-index/pom.xml
index 170364ba..cf74dc82 100644
--- a/features-index/pom.xml
+++ b/features-index/pom.xml
@@ -252,7 +252,6 @@
        <classifier>features</classifier>
        <type>xml</type>
      </dependency>
-    <!-- Depends on NIC, which is commented-out
      <dependency>
        <groupId>org.opendaylight.netvirt</groupId>
        <artifactId>vpnservice-features</artifactId>
@@ -260,7 +259,6 @@
        <classifier>features</classifier>
        <type>xml</type>
      </dependency>
-    -->
      <dependency>
       <groupId>org.opendaylight.netide</groupId>
       <artifactId>netide-features</artifactId>
diff --git a/features-index/src/main/resources/features.xml b/features-index/src/main/resources/features.xml
index b983fb54..041440ba 100644
--- a/features-index/src/main/resources/features.xml
+++ b/features-index/src/main/resources/features.xml
@@ -68,9 +68,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>
-    <!-- Depends on NIC, which is commented-out.
     <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>
     <!-- NIC merge jobs are failing due to getTableFeatures() method moved in OpenFlowPlugin (new design)
     <repository>mvn:org.opendaylight.nic/features-nic/${feature.nic.version}/xml/features</repository>
diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index 9906754a..5ac364f0 100644
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -157,9 +157,7 @@
             which leads to BindException.
         <feature version='${feature.lacp.version}'>odl-lacp-ui</feature>
         -->
-        <!-- Depends on NIC, which is commented out.
         <feature version='${feature.netvirt.vpnservice.version}'>odl-netvirt-vpnservice-openstack</feature>
-        -->
         <!-- Commented out, because NIC brings in Li designed OpenFlowPlugin
             which leads to BindException.
             Also, NIC merge jobs are currently failing.