From: Luis Gomez <ecelgp@gmail.com>
Date: Wed, 8 Jun 2016 17:27:17 +0000 (-0700)
Subject: Change NatApp features to not-compatible
X-Git-Tag: release/boron~42
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Fdistribution.git;a=commitdiff_plain;h=79d0517e3678be391f0b5102a4734e5959292039

Change NatApp features to not-compatible

This application is sending packet-out messages which is not-compatible
with other OF applications.

Change-Id: I29fff7fb16858aecb8531147d84a5160055bbb80
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
---

diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index a5633c29..47f502a1 100644
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -87,8 +87,6 @@
         <feature version='${feature.lispflowmapping.version}'>odl-lispflowmapping-ui</feature>
         <feature version='${feature.benchmark.version}'>odl-mdsal-benchmark</feature>
         <feature version='${feature.mdsal.version}'>odl-mdsal-broker</feature>
-        <feature version='${feature.natapp.version}'>odl-natapp-api</feature>
-        <feature version='${feature.natapp.version}'>odl-natapp</feature>
         <feature version='${feature.nemo.version}'>odl-nemo-engine</feature>
         <feature version='${feature.nemo.version}'>odl-nemo-engine-rest</feature>
         <feature version='${feature.nemo.version}'>odl-nemo-engine-ui</feature>
@@ -162,6 +160,8 @@
             which leads to BindException.
         <feature version='${feature.lacp.version}'>odl-lacp-ui</feature>
         -->
+        <feature version='${feature.natapp.version}'>odl-natapp-api</feature>
+        <feature version='${feature.natapp.version}'>odl-natapp</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.