Update the haproxy::balancermember for multiple ports

Also, parameter changes:
- `balancer_port` to `ports`
- `server_name` to `server_names`
- `balancer_ip` to `ipaddresses`
- `balancermember_options` to `options`

1 files changed, 43 insertions, 21 deletions

diff --git a/spec/defines/balancermember_spec.rb b/spec/defines/balancermember_spec.rb
index 73aa223..1a37673 100644
--- a/spec/defines/balancermember_spec.rb
+++ b/spec/defines/balancermember_spec.rb
@@ -3,58 +3,80 @@ require 'spec_helper'
 describe 'haproxy::balancermember' do
   let(:title) { 'tyler' }
   let(:facts) do
-    { :ipaddress => '1.1.1.1',
+    {
+      :ipaddress => '1.1.1.1',
       :hostname  => 'dero'
     }
   end
 
   context 'with a single balancermember option' do
     let(:params) do
-      { :name                   => 'tyler',
-        :listening_service      => 'croy',
-        :balancer_port          => '18140',
-        :balancermember_options => 'check'
+      {
+        :name              => 'tyler',
+        :listening_service => 'croy',
+        :ports             => '18140',
+        :options           => 'check'
       }
     end
 
     it { should contain_concat__fragment('croy_balancermember_tyler').with(
       'order'   => '20',
       'target'  => '/etc/haproxy/haproxy.cfg',
-      'content' => "  server  dero 1.1.1.1:18140  check\n\n"
-      ) }
+      'content' => "  server dero 1.1.1.1:18140 check\n\n"
+    ) }
   end
 
   context 'with multiple balancermember options' do
     let(:params) do
-      { :name                   => 'tyler',
-        :listening_service      => 'croy',
-        :balancer_port          => '18140',
-        :balancermember_options => ['check', 'close']
+      {
+        :name              => 'tyler',
+        :listening_service => 'croy',
+        :ports             => '18140',
+        :options           => ['check', 'close']
       }
     end
 
     it { should contain_concat__fragment('croy_balancermember_tyler').with(
       'order'   => '20',
       'target'  => '/etc/haproxy/haproxy.cfg',
-      'content' => "  server  dero 1.1.1.1:18140  check close\n\n"
-      ) }
+      'content' => "  server dero 1.1.1.1:18140 check close\n\n"
+    ) }
   end
 
   context 'with multiple servers' do
     let(:params) do
-      { :name                   => 'tyler',
-        :listening_service      => 'croy',
-        :balancer_port          => '18140',
-        :server_name            => ['server01', 'server02'],
-        :balancer_ip            => ['192.168.56.200', '192.168.56.201'],
-        :balancermember_options => ['check']
+      {
+        :name              => 'tyler',
+        :listening_service => 'croy',
+        :ports             => '18140',
+        :server_names      => ['server01', 'server02'],
+        :ipaddresses       => ['192.168.56.200', '192.168.56.201'],
+        :options           => ['check']
       }
     end
 
     it { should contain_concat__fragment('croy_balancermember_tyler').with(
       'order'   => '20',
       'target'  => '/etc/haproxy/haproxy.cfg',
-      'content' => "  server  server01 192.168.56.200:18140  check\n  server  server02 192.168.56.201:18140  check\n\n"
-      ) }
+      'content' => "  server server01 192.168.56.200:18140 check\n  server server02 192.168.56.201:18140 check\n\n"
+    ) }
+  end
+  context 'with multiple servers and multiple ports' do
+    let(:params) do
+      {
+        :name              => 'tyler',
+        :listening_service => 'croy',
+        :ports             => ['18140','18150'],
+        :server_names      => ['server01', 'server02'],
+        :ipaddresses       => ['192.168.56.200', '192.168.56.201'],
+        :options           => ['check']
+      }
+    end
+
+    it { should contain_concat__fragment('croy_balancermember_tyler').with(
+      'order'   => '20',
+      'target'  => '/etc/haproxy/haproxy.cfg',
+      'content' => "  server server01 192.168.56.200:18140,192.168.56.200:18150 check\n  server server02 192.168.56.201:18140,192.168.56.201:18150 check\n\n"
+    ) }
   end
 end