From be67982d556c161012a665ec645b537e7a3a2bc9 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Thu, 30 Apr 2015 15:17:01 -0400
Subject: [PATCH] FWaaS: update packaging for Debian & Ubuntu

Ubuntu [1] and Debian [2] are now using neutron-fwaas.
Also cleaning unit-tests.

[1] http://packages.ubuntu.com/source/vivid/neutron-fwaas
[2] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=783590

Closes-bug #1450589

Change-Id: Ia9c951941c2832b0c6e6b987ed64924b9c827195
---
 manifests/params.pp                         |  2 +-
 manifests/services/fwaas.pp                 |  4 +--
 spec/classes/neutron_services_fwaas_spec.rb | 39 +++++++++++----------
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 72b2935ce..08179434e 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -142,7 +142,7 @@ class neutron::params {
     $l3_agent_package   = 'neutron-l3-agent'
     $l3_agent_service   = 'neutron-l3-agent'
 
-    $fwaas_package      = false
+    $fwaas_package      = 'neutron-fwaas'
 
     $cliff_package      = 'python-cliff'
     $kernel_headers     = "linux-headers-${::kernelrelease}"
diff --git a/manifests/services/fwaas.pp b/manifests/services/fwaas.pp
index 78551e2ec..0a4d07d32 100644
--- a/manifests/services/fwaas.pp
+++ b/manifests/services/fwaas.pp
@@ -55,11 +55,11 @@ class neutron::services::fwaas (
       Package[$::neutron::params::vpnaas_agent_package] -> Neutron_fwaas_service_config<||>
     }
     else {
-      ensure_resource( 'package', $::neutron::params::l3_agent_package, {
+      ensure_resource( 'package', $::neutron::params::fwaas_package, {
         'ensure' => $neutron::package_ensure,
         'tag'    => 'openstack'
       })
-      Package[$::neutron::params::l3_agent_package] -> Neutron_fwaas_service_config<||>
+      Package[$::neutron::params::fwaas_package] -> Neutron_fwaas_service_config<||>
     }
   } elsif($::osfamily == 'Redhat') {
     # RH platforms
diff --git a/spec/classes/neutron_services_fwaas_spec.rb b/spec/classes/neutron_services_fwaas_spec.rb
index 223526fd3..0a3803890 100644
--- a/spec/classes/neutron_services_fwaas_spec.rb
+++ b/spec/classes/neutron_services_fwaas_spec.rb
@@ -46,20 +46,32 @@ describe 'neutron::services::fwaas' do
     end
   end
 
-  context 'on Debian platforms' do
+  context 'on Ubuntu platforms' do
     let :facts do
-      { :osfamily => 'Debian' }
-    end
-
-    let :platform_params do
-      { :l3_agent_package     => 'neutron-l3-agent',
-        :vpnaas_agent_package => 'neutron-vpn-agent'}
+      { :osfamily        => 'Debian',
+        :operatingsystem => 'Ubuntu' }
     end
 
     it_configures 'neutron fwaas service plugin'
 
-    it 'installs neutron l3 agent package' do
-      is_expected.to contain_package('neutron-l3-agent').with(
+    it 'installs neutron fwaas package' do
+      is_expected.to contain_package('neutron-fwaas').with(
+        :ensure => 'present',
+        :tag    => 'openstack'
+      )
+    end
+  end
+
+  context 'on Debian platforms without VPNaaS' do
+    let :facts do
+      { :osfamily        => 'Debian',
+        :operatingsystem => 'Debian' }
+    end
+
+    it_configures 'neutron fwaas service plugin'
+
+    it 'installs neutron fwaas package' do
+      is_expected.to contain_package('neutron-fwaas').with(
         :ensure => 'present',
         :tag    => 'openstack'
       )
@@ -71,11 +83,6 @@ describe 'neutron::services::fwaas' do
       { :osfamily => 'Debian' }
     end
 
-    let :platform_params do
-      { :l3_agent_package     => 'neutron-l3-agent',
-        :vpnaas_agent_package => 'neutron-vpn-agent' }
-    end
-
     let :params do
       { :vpnaas_agent_package => true }
     end
@@ -95,10 +102,6 @@ describe 'neutron::services::fwaas' do
       { :osfamily => 'RedHat' }
     end
 
-    let :platform_params do
-      { :fwaas_package => 'openstack-neutron-fwaas' }
-    end
-
     it_configures 'neutron fwaas service plugin'
 
     it 'installs neutron fwaas service package' do