Merge pull request #169 from jfroche/add-service-description-short

Add description and short option for firewalld zone

.gitignore

@@ -3,3 +3,4 @@ pkg/
 .project
 Gemfile.lock
 .vagrant
+spec/fixtures

lib/puppet/provider/firewalld_zone/firewall_cmd.rb

@@ -23,6 +23,8 @@ def create
     self.sources=(@resource[:sources]) if @resource[:sources]
     self.interfaces=@resource[:interfaces]
     self.icmp_blocks=(@resource[:icmp_blocks]) if @resource[:icmp_blocks]
+    self.description=(@resource[:description]) if @resource[:description]
+    self.short=(@resource[:short]) if @resource[:short]
   end
 
   def destroy
@@ -185,5 +187,20 @@ def get_icmp_types
     execute_firewall_cmd(['--get-icmptypes'], nil).split(' ')
   end
 
-end
+  def description
+    execute_firewall_cmd(['--get-description'], @resource[:name], true, false)
+  end
 
+  def description=(new_description)
+    execute_firewall_cmd(['--set-description', new_description], @resource[:name], true, false)
+  end
+
+  def short
+    execute_firewall_cmd(['--get-short'], @resource[:name], true, false)
+  end
+
+  def short=(new_short)
+    execute_firewall_cmd(['--set-short', new_short], @resource[:name], true, false)
+  end
+
+end

lib/puppet/type/firewalld_zone.rb

@@ -245,5 +245,13 @@ def purge_ports
     end
   end
 
+  newparam(:description) do
+    desc "Description of the zone to add"
+  end
+
+  newparam(:short) do
+    desc "Short description of the zone to add"
+  end
+
 end
 

spec/unit/puppet/provider/firewalld_zone_spec.rb

@@ -0,0 +1,62 @@
+require 'spec_helper'
+
+provider_class = Puppet::Type.type(:firewalld_zone).provider(:firewall_cmd)
+
+describe provider_class do
+  let(:resource) do
+    @resource = Puppet::Type.type(:firewalld_zone).new(
+      ensure: :present,
+      name: 'internal',
+      description: 'Interface for management',
+      interfaces: ["eth0"],
+      provider: described_class.name
+    )
+  end
+  let(:provider) { resource.provider }
+
+  before :each do
+    provider.class.stubs(:execute_firewall_cmd).returns(Object.any_instance.stubs(:exitstatus => 0))
+    provider.class.stubs(:execute_firewall_cmd).with(['--list-interfaces']).returns(Object.any_instance.stubs(:exitstatus => 0, :chomp => ""))
+  end
+
+  describe 'when creating' do
+    context 'with name white' do
+      it "should execute firewall_cmd with new-zone" do
+        resource.expects(:[]).with(:name).returns('white').at_least_once
+        resource.expects(:[]).with(:target).returns(nil).at_least_once
+        resource.expects(:[]).with(:sources).returns(nil).at_least_once
+        resource.expects(:[]).with(:interfaces).returns(["eth0"]).at_least_once
+        resource.expects(:[]).with(:icmp_blocks).returns(nil).at_least_once
+        resource.expects(:[]).with(:description).returns(nil).at_least_once
+        resource.expects(:[]).with(:short).returns("little description").at_least_once
+        provider.expects(:execute_firewall_cmd).with(["--list-interfaces"])
+        provider.expects(:execute_firewall_cmd).with(["--add-interface", 'eth0'])
+        provider.expects(:execute_firewall_cmd).with(["--new-zone", 'white'], nil)
+        provider.expects(:execute_firewall_cmd).with(["--set-short", 'little description'], "white", true, false)
+        provider.create
+      end
+    end
+  end
+
+  describe "when modifying" do
+    context "type" do
+      it "should remove and create a new ipset" do
+        resource.expects(:[]).with(:name).returns('white').at_least_once
+        resource.expects(:[]).with(:target).returns(nil).at_least_once
+        resource.expects(:[]).with(:sources).returns(nil).at_least_once
+        resource.expects(:[]).with(:interfaces).returns(["eth0"]).at_least_once
+        resource.expects(:[]).with(:icmp_blocks).returns(nil).at_least_once
+        resource.expects(:[]).with(:description).returns(nil).at_least_once
+        resource.expects(:[]).with(:short).returns("little description").at_least_once
+        provider.expects(:execute_firewall_cmd).with(["--list-interfaces"])
+        provider.expects(:execute_firewall_cmd).with(["--add-interface", 'eth0'])
+        provider.expects(:execute_firewall_cmd).with(["--new-zone", 'white'], nil)
+        provider.expects(:execute_firewall_cmd).with(["--set-short", 'little description'], "white", true, false)
+        provider.expects(:execute_firewall_cmd).with(["--set-description", :"Better description"], "white", true, false)
+        provider.create
+
+        provider.description = :'Better description'
+      end
+    end
+  end
+end