From a13bad76bfee4dcdda02367bdbdae020761370cb Mon Sep 17 00:00:00 2001
From: Ricardo Noriega <rnoriega@redhat.com>
Date: Tue, 25 Apr 2017 16:18:45 +0200
Subject: [PATCH] Add L2GW Tempest plugin support

Change-Id: I3e6b62422340356ce3d320c71b5b8975a22e9f21
Signed-off-by: Ricardo Noriega <rnoriega@redhat.com>
---
 manifests/init.pp                                     | 11 +++++++++++
 manifests/params.pp                                   |  2 ++
 .../notes/add-l2gw-driver-dea71457310f31bd.yaml       |  3 +++
 spec/classes/tempest_init_spec.rb                     |  2 ++
 4 files changed, 18 insertions(+)
 create mode 100644 releasenotes/notes/add-l2gw-driver-dea71457310f31bd.yaml

diff --git a/manifests/init.pp b/manifests/init.pp
index e5b4703b..c7704969 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -139,6 +139,8 @@
 #   Defaults to true
 #  [*neutron_lbaas_available*]
 #   Defaults to true
+#  [*neutron_l2gw_available*]
+#   Defaults to true
 #  [*neutron_vpnaas_available*]
 #   Defaults to false
 #  [*nova_available*]
@@ -315,6 +317,7 @@ class tempest(
   $neutron_bgpvpn_available      = false,
   $neutron_fwaas_available       = true,
   $neutron_lbaas_available       = true,
+  $neutron_l2gw_available        = false,
   $neutron_vpnaas_available      = false,
   $nova_available                = true,
   $murano_available              = false,
@@ -538,6 +541,7 @@ the future release. Please use tempest::package_ensure instead.")
     'service_available/panko':                         value => $panko_available;
     'service_available/designate':                     value => $designate_available;
     'service_available/horizon':                       value => $horizon_available;
+    'service_available/l2gw':                          value => $neutron_l2gw_available;
     'service_available/neutron':                       value => $neutron_available;
     'service_available/mistral':                       value => $mistral_available;
     'service_available/vitrage':                       value => $vitrage_available;
@@ -669,6 +673,13 @@ the future release. Please use tempest::package_ensure instead.")
           tag    => ['openstack', 'tempest-package'],
         }
       }
+      if $neutron_l2gw_available and $::tempest::params::python_l2gw_tests {
+        package { 'python-networking-l2gw-tests':
+          ensure => present,
+          name   => $::tempest::params::python_l2gw_tests,
+          tag    => ['openstack', 'tempest-package'],
+        }
+      }
       if $neutron_vpnaas_available {
         package { 'python-neutron-vpnaas-tests':
           ensure => present,
diff --git a/manifests/params.pp b/manifests/params.pp
index e1f5df3c..11f29244 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -29,6 +29,7 @@ class tempest::params {
       $python_neutron_tests    = 'python-neutron-tests'
       $python_fwaas_tests      = 'python-neutron-fwaas-tests'
       $python_lbaas_tests      = 'python-neutron-lbaas-tests'
+      $python_l2gw_tests       = 'python-networking-l2gw-tests'
       $python_vpnaas_tests     = 'python-neutron-vpnaas-tests'
       $python_nova_tests       = 'python-nova-tests'
       $python_sahara_tests     = 'python-sahara-tests-tempest'
@@ -64,6 +65,7 @@ class tempest::params {
       $python_horizon_tests    = false
       $python_ironic_tests     = false
       $python_keystone_tests   = false
+      $python_l2gw_tests       = false
       $python_mistral_tests    = false
       $python_vitrage_tests    = false
       $python_murano_tests     = false
diff --git a/releasenotes/notes/add-l2gw-driver-dea71457310f31bd.yaml b/releasenotes/notes/add-l2gw-driver-dea71457310f31bd.yaml
new file mode 100644
index 00000000..b3c6599b
--- /dev/null
+++ b/releasenotes/notes/add-l2gw-driver-dea71457310f31bd.yaml
@@ -0,0 +1,3 @@
+---
+features:
+  - Add L2GW Tempest plugin support
diff --git a/spec/classes/tempest_init_spec.rb b/spec/classes/tempest_init_spec.rb
index 75e925e9..2cd93e0e 100644
--- a/spec/classes/tempest_init_spec.rb
+++ b/spec/classes/tempest_init_spec.rb
@@ -252,6 +252,7 @@ describe 'tempest' do
           is_expected.to contain_tempest_config('service_available/gnocchi').with(:value => false)
           is_expected.to contain_tempest_config('service_available/panko').with(:value => false)
           is_expected.to contain_tempest_config('service_available/horizon').with(:value => true)
+          is_expected.to contain_tempest_config('service_available/l2gw').with(:value => false)
           is_expected.to contain_tempest_config('service_available/neutron').with(:value => true)
           is_expected.to contain_tempest_config('service_available/mistral').with(:value => false)
           is_expected.to contain_tempest_config('service_available/vitrage').with(:value => false)
@@ -403,6 +404,7 @@ describe 'tempest' do
         it { expect { is_expected.to contain_package('python-neutron-lbaas-tests') } }
         it { expect { is_expected.to contain_package('python-neutron-vpnaas-tests') } }
         it { expect { is_expected.to contain_package('python-networking-bgpvpn-tests') } }
+        it { expect { is_expected.to contain_package('python-networking-l2gw-tests') } }
         it { expect { is_expected.to contain_package('python-horizon-tests-tempest') } }
       end
     end