From: Hideyuki Tai <Hideyuki.Tai@necam.com>
Date: Tue, 31 May 2016 13:14:00 +0000 (-0700)
Subject: Bring NIC back into distribution.
X-Git-Tag: release/boron~51
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F69%2F39669%2F2;p=integration%2Fdistribution.git

Bring NIC back into distribution.

Change-Id: I80881c504f337faad3c61378bbdc6ab131b8dbf9
Signed-off-by: Hideyuki Tai <Hideyuki.Tai@necam.com>
---

diff --git a/features-index/pom.xml b/features-index/pom.xml
index 5cd7f0d3..04813b89 100644
--- a/features-index/pom.xml
+++ b/features-index/pom.xml
@@ -280,7 +280,6 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    <!-- NIC merge jobs are failing due to getTableFeatures() method not being supported by OpenFlowPlugin anymore
     <dependency>
       <groupId>org.opendaylight.nic</groupId>
       <artifactId>features-nic</artifactId>
@@ -288,7 +287,6 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    -->
     <dependency>
       <groupId>org.opendaylight.ocpplugin</groupId>
       <artifactId>features-ocpplugin</artifactId>
diff --git a/features-index/src/main/resources/features.xml b/features-index/src/main/resources/features.xml
index 06f672f2..159d6354 100644
--- a/features-index/src/main/resources/features.xml
+++ b/features-index/src/main/resources/features.xml
@@ -71,9 +71,7 @@
     <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>
-    <!-- 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>
-    -->
     <repository>mvn:org.opendaylight.ocpplugin/features-ocpplugin/${feature.ocpplugin.version}/xml/features</repository>
     <!-- Issue with of-config merge requires this line commented out:
     <repository>mvn:org.opendaylight.of-config/features-of-config/${feature.of-config.version}/xml/features</repository>
diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index 26b31c78..10c80a3c 100644
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -162,7 +162,6 @@
         <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.
         <feature version='${feature.nic.version}'>odl-nic-core-mdsal</feature>
         -->
         <feature version='${feature.netvirt.version}'>odl-ovsdb-openstack</feature>