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 170364bae4e85c690141c0c0895a21a158421c8c..cf74dc82a3782cab79ed26ebcb5fe5a9d63127e4 100644 (file)
--- 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 b983fb549d9262aa3478bf3d9bdd7d41283067a4..041440ba3bf8b21d533a331ca4c6508c01d894bc 100644 (file)
--- 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 9906754a4b523ad5649ebaa19f336167d43d9189..5ac364f029ec0658b758824a9805919278b9038e 100644 (file)
--- 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.