From a939bc5880ca54d3fbe124d3a6b68c4d955ad533 Mon Sep 17 00:00:00 2001
From: Ricardo Noriega <rnoriega@redhat.com>
Date: Mon, 18 Dec 2017 19:26:17 +0100
Subject: [PATCH] Workaround due to Tempest plugin split

Change-Id: Id790daf8ebd986a4ec4cd59426b044f3fbe52553
Signed-off-by: Ricardo Noriega <rnoriega@redhat.com>
---
 python-networking-l2gw.spec | 29 ++++++-----------------------
 1 file changed, 6 insertions(+), 23 deletions(-)

diff --git a/python-networking-l2gw.spec b/python-networking-l2gw.spec
index 32c8322..6146876 100644
--- a/python-networking-l2gw.spec
+++ b/python-networking-l2gw.spec
@@ -30,7 +30,6 @@ BuildRequires:  python-oslotest
 BuildRequires:  python-pbr
 BuildRequires:  python-setuptools
 BuildRequires:  python-subunit
-BuildRequires:  python-tempest
 BuildRequires:  python-testrepository
 BuildRequires:  python-testscenarios
 BuildRequires:  python-testtools
@@ -80,17 +79,6 @@ Requires:   python-mock >= 2.0.0
 %description tests
 Networking-l2gw set of tests
 
-%package -n %{name}-tests-tempest
-Summary:    %{sname} Tempest Plugin
-
-Requires:   python-%{pypi_name} = %{epoch}:%{version}-%{release}
-
-Requires:   python-neutron-tests
-Requires:   python-tempest >= 14.0.0
-
-%description -n %{name}-tests-tempest
-It contains tempest plugin for %{name}.
-
 %package -n openstack-%{servicename}-agent
 Summary:    Neutron L2 Gateway Agent
 Requires:   python-%{pypi_name} = %{epoch}:%{version}-%{release}
@@ -105,6 +93,11 @@ Agent that enables L2 Gateway functionality
 # Remove bundled egg-info
 rm -rf %{pypi_name}.egg-info
 
+# Remove tempest plugin entrypoint as a workaround
+sed -i '/tempest/d' setup.cfg
+rm -rf networking_l2gw/tests/tempest
+rm -rf networking_l2gw/tests/api
+
 %build
 %py2_build
 %if 0%{?with_doc}
@@ -127,8 +120,6 @@ ln -s %{_sysconfdir}/neutron/l2gw_plugin.ini %{buildroot}%{_datadir}/neutron/ser
 # Install systemd units
 install -p -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/%{servicename}-agent.service
 
-%py2_entrypoint %{sname} %{pypi_name}
-
 %post -n openstack-%{servicename}-agent
 %systemd_post %{servicename}-agent.service
 
@@ -156,9 +147,7 @@ install -p -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/%{servicename}-agent.ser
 %files -n %{name}-tests
 %license LICENSE
 %{python2_sitelib}/%{sname}/tests
-%{python2_sitelib}/%{sname}_tests.egg-info
-%exclude %{python2_sitelib}/%{sname}/tests/tempest
-%exclude %{python2_sitelib}/%{sname}/tests/api
+%{python2_sitelib}/%{sname}/tests/__init__.py
 
 %files -n openstack-%{servicename}-agent
 %license LICENSE
@@ -166,10 +155,4 @@ install -p -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/%{servicename}-agent.ser
 %{_unitdir}/%{servicename}-agent.service
 %{_bindir}/neutron-l2gateway-agent
 
-%files -n %{name}-tests-tempest
-%{python2_sitelib}/%{sname}_tests.egg-info
-%{python2_sitelib}/%{sname}/tests/__init__.py
-%{python2_sitelib}/%{sname}/tests/tempest
-%{python2_sitelib}/%{sname}/tests/api
-
 %changelog