From 30ab1da275449685a4d5ff0a9479788988632252 Mon Sep 17 00:00:00 2001
From: Alfredo Moralejo <amoralej@redhat.com>
Date: Mon, 19 Aug 2019 18:52:23 +0200
Subject: [PATCH] Remove neutron-fwaas tempest plugin installation

After [1] and [2], fwaas tempest plugin is integrated in neutron-tempest-plugin
so no additional package installation is needed.

This patch removes old fwaas tempest plugin installation. It keeps the
parameter in the manifest for backward compatibility of manifest using
it.

[1] https://review.opendev.org/#/c/643668/
[2] https://review.opendev.org/#/c/643662/

Change-Id: If2115f59657a1b6c8c8c1541f8f78f9b9103a885
---
 manifests/init.pp                              | 18 ++++++++----------
 manifests/params.pp                            |  1 -
 ...-fwaas-tempest-plugin-a2335d7d5c914b17.yaml |  8 ++++++++
 spec/classes/tempest_init_spec.rb              |  1 -
 4 files changed, 16 insertions(+), 12 deletions(-)
 create mode 100644 releasenotes/notes/Remove-fwaas-tempest-plugin-a2335d7d5c914b17.yaml

diff --git a/manifests/init.pp b/manifests/init.pp
index 744e0adc..c0eb1f21 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -137,8 +137,6 @@
 #   Defaults to false
 #  [*neutron_bgpvpn_available*]
 #   Defaults to false
-#  [*neutron_fwaas_available*]
-#   Defaults to true
 #  [*neutron_l2gw_available*]
 #   Defaults to true
 #  [*neutron_vpnaas_available*]
@@ -225,6 +223,9 @@
 #   Defaults to undef
 #  [*allow_tenant_isolation*]
 #   Defaults to undef
+#  [*neutron_fwaas_available*]
+#   Just for backwards compatibility, it actually does nothing as fwaas plugin
+#   is integrated in neutron tempest plugin.
 #
 class tempest(
   $package_ensure                   = 'present',
@@ -326,7 +327,6 @@ class tempest(
   $horizon_available                = true,
   $neutron_available                = false,
   $neutron_bgpvpn_available         = false,
-  $neutron_fwaas_available          = true,
   $neutron_l2gw_available           = false,
   $neutron_vpnaas_available         = false,
   $neutron_dr_available             = false,
@@ -366,6 +366,7 @@ class tempest(
   $alt_tenant_name                  = undef,
   $admin_tenant_name                = undef,
   $allow_tenant_isolation           = undef,
+  $neutron_fwaas_available          = undef,
 ) {
 
   if !is_service_default($tempest_roles) and !empty($tempest_roles){
@@ -407,6 +408,10 @@ class tempest(
     $use_dynamic_credentials_real = $use_dynamic_credentials
   }
 
+  if $neutron_fwaas_available {
+    warning('The tempest::neutron_fwaas_available parameter is deprecated. FWaaS plugin is now part of neutron plugin.')
+  }
+
   include ::tempest::params
 
   include ::openstacklib::openstackclient
@@ -651,13 +656,6 @@ class tempest(
         name   => $::tempest::params::python_neutron_tests,
         tag    => ['openstack', 'tempest-package'],
       }
-      if $neutron_fwaas_available {
-        package { 'python-neutron-fwaas-tests':
-          ensure => present,
-          name   => $::tempest::params::python_fwaas_tests,
-          tag    => ['openstack', 'tempest-package'],
-        }
-      }
       if $neutron_l2gw_available and $::tempest::params::python_l2gw_tests {
         package { 'python-networking-l2gw-tests-tempest':
           ensure => present,
diff --git a/manifests/params.pp b/manifests/params.pp
index 5135e7bf..17da00f1 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -28,7 +28,6 @@ class tempest::params {
       $python_vitrage_tests    = "python${pyvers}-vitrage-tests-tempest"
       $python_murano_tests     = "python${pyvers}-murano-tests-tempest"
       $python_neutron_tests    = "python${pyvers}-neutron-tests-tempest"
-      $python_fwaas_tests      = "python${pyvers}-neutron-fwaas-tests"
       $python_l2gw_tests       = "python${pyvers}-networking-l2gw-tests-tempest"
       $python_vpnaas_tests     = "python${pyvers}-neutron-vpnaas-tests"
       $python_dr_tests         = "python${pyvers}-neutron-dynamic-routing-tests"
diff --git a/releasenotes/notes/Remove-fwaas-tempest-plugin-a2335d7d5c914b17.yaml b/releasenotes/notes/Remove-fwaas-tempest-plugin-a2335d7d5c914b17.yaml
new file mode 100644
index 00000000..f073a8ba
--- /dev/null
+++ b/releasenotes/notes/Remove-fwaas-tempest-plugin-a2335d7d5c914b17.yaml
@@ -0,0 +1,8 @@
+---
+prelude: >
+    FWaaS tempest plugin has been moved from neutron-fwaas repo to the new
+    neutron-tempest-plugin.
+deprecations:
+  - |
+    Parameter neutron_fwaas_available has been deprecated and it's does not
+    affect tempest plugins installation.
diff --git a/spec/classes/tempest_init_spec.rb b/spec/classes/tempest_init_spec.rb
index fbc35694..bed37fa2 100644
--- a/spec/classes/tempest_init_spec.rb
+++ b/spec/classes/tempest_init_spec.rb
@@ -403,7 +403,6 @@ describe 'tempest' do
 
       describe "should install neutron and *aas tests packages" do
         it { expect { is_expected.to contain_package('python-neutron-tests') } }
-        it { expect { is_expected.to contain_package('python-neutron-fwaas-tests') } }
         it { expect { is_expected.to contain_package('python-neutron-vpnaas-tests') } }
         it { expect { is_expected.to contain_package('python-neutron-dynamic-routing-tests') } }
         it { expect { is_expected.to contain_package('python-networking-l2gw-tests-tempest') } }