Add counter to a base number for order gen

Signed-off-by: Ken Barber <ken@bob.sh>

diff --git a/lib/puppet/provider/firewall/iptables.rb b/lib/puppet/provider/firewall/iptables.rb
index 03da45486614478441fcea4405ad2c08c28ae350..c8e9c94789c9d326584fc2c99d65ca7e3c8e3c11 100644 (file)
--- a/lib/puppet/provider/firewall/iptables.rb
+++ b/lib/puppet/provider/firewall/iptables.rb
@@ -232,7 +232,8 @@ Puppet::Type.type(:firewall).provide :iptables, :parent => Puppet::Provider::Fir
     # Puppet-firewall requires that all rules have comments (resource names) and will fail if
     # a rule in iptables does not have a comment. We get around this by appending a high level
     if ! hash[:name]
-      hash[:name] = "999#{counter} #{Digest::MD5.hexdigest(line)}"
+      num = 9000 + counter
+      hash[:name] = "#{num} #{Digest::MD5.hexdigest(line)}"
     end
 
     # Iptables defaults to log_level '4', so it is omitted from the output of iptables-save.

diff --git a/spec/spec_helper_system.rb b/spec/spec_helper_system.rb
index 9c36272cd24541078bbf61262590262b8ccfaccf..53a4f83c2feb82692ab4e076aefe0bc4d91ca358 100644 (file)
--- a/spec/spec_helper_system.rb
+++ b/spec/spec_helper_system.rb
@@ -29,6 +29,9 @@ RSpec.configure do |c|
   # Project root for the firewall code
   proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 
+  # Enable colour in Jenkins
+  c.tty = true
+
   # Import in our local helpers
   c.include ::LocalHelpers
 

diff --git a/spec/system/purge_spec.rb b/spec/system/purge_spec.rb
index d245710657cda6a11c3cc1e0d7b5b3c519695dde..0c14ee121065adff6a02428646f2d8c5883990f0 100644 (file)
--- a/spec/system/purge_spec.rb
+++ b/spec/system/purge_spec.rb
@@ -4,9 +4,10 @@ describe "purge tests:" do
   it 'make sure duplicate existing rules get purged' do
     iptables_flush_all_tables
 
-    system_run('iptables -A INPUT -s 1.2.1.2')
-    system_run('iptables -A INPUT -s 1.2.1.2')
+    system_run('/sbin/iptables -A INPUT -s 1.2.1.2')
+    system_run('/sbin/iptables -A INPUT -s 1.2.1.2')
     pp = <<-EOS
+class { 'firewall': }
 resources { 'firewall':
   purge => true,
 }
@@ -16,7 +17,7 @@ resources { 'firewall':
       r[:exit_code].should == 2
     end
 
-    system_run('iptables-save') do |r|
+    system_run('/sbin/iptables-save') do |r|
       r[:stdout].should_not =~ /1\.2\.1\.2/
       r[:stderr].should == ''
     end

diff --git a/spec/unit/puppet/provider/iptables_spec.rb b/spec/unit/puppet/provider/iptables_spec.rb
index 37c6757455549fce21a3476e343aee2acea6b246..9bcde6edc3a53328ded3a399bba9964a7bde4200 100644 (file)
--- a/spec/unit/puppet/provider/iptables_spec.rb
+++ b/spec/unit/puppet/provider/iptables_spec.rb
@@ -121,7 +121,7 @@ describe 'iptables provider' do
     let(:instance) { provider.new(resource) }
 
     it 'rule name contains a MD5 sum of the line' do
-      resource[:name].should == "9999 #{Digest::MD5.hexdigest(resource[:line])}"
+      resource[:name].should == "9000 #{Digest::MD5.hexdigest(resource[:line])}"
     end
   end