From: Isaku Yamahata <isaku.yamahata@intel.com>
Date: Mon, 13 Jun 2016 17:11:26 +0000 (-0700)
Subject: neutron northbound: temporarily disable gbp neutron feature
X-Git-Tag: release/boron~43
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Fdistribution.git;a=commitdiff_plain;h=b098f9625965f859d07363ee2023060b75885f97

neutron northbound: temporarily disable gbp neutron feature

This patch is to disable temporarily disable neutron related feature
of group based policy. Once the thing is settled down, this patch
should be reverted.
ODL Neutron Norhtbound projects has revised its yang model which affects
dependent projects[1]. The patch series[2] may break dependent projects
and causes neutron-distribution-check-boron to fail. e.g. [3]
It creates circular dependency of projects so that in order to
make progress, the following process is necessary.

- distribution check needs to be disabled for temporarily(this patch), then
- merge the patches into neutron northbound[2],
- merge fixup patch for group based policy, (and fix other broken projects)
- finally, revert this patch

[1] https://wiki.opendaylight.org/view/Weather#Neutron_Northbound:_neutron_yang_model_revise_and_I.2AAware.28AD-SAL.29_interface_removal
[2] https://git.opendaylight.org/gerrit/#/q/topic:yang-model-revise
[3] https://jenkins.opendaylight.org/releng/job/neutron-distribution-check-boron/214/

Change-Id: Ic600c9a0aea22174ddd221e671e6a1874f0d8fb2
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
---

diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index 92de06c1..a5633c29 100644
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -146,9 +146,6 @@
         <feature version='${feature.genius.version}'>odl-genius-rest</feature>
         <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-faas</feature>
         <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-iovisor</feature>
-        <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-neutronmapper</feature>
-        <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-neutron-and-ofoverlay</feature>
-        <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-neutron-vpp-mapper</feature>
         <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-ne-location-provider</feature>
         <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-ofoverlay</feature>
         <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-sxp-mapper</feature>