--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/firewall/lib/puppet/util/ipcidr.rb	Sat Mar 14 20:58:03 2015 +0000
@@ -0,0 +1,42 @@
+require 'ipaddr'
+
+# IPCidr object wrapper for IPAddr
+module Puppet
+  module Util
+    class IPCidr < IPAddr
+      def initialize(ipaddr)
+        begin
+          super(ipaddr)
+        rescue ArgumentError => e
+          if e.message =~ /invalid address/
+            raise ArgumentError, "Invalid address from IPAddr.new: #{ipaddr}"
+          else
+            raise e
+          end
+        end
+      end
+
+      def netmask
+        _to_string(@mask_addr)
+      end
+
+      def prefixlen
+        m = case @family
+            when Socket::AF_INET
+              IN4MASK
+            when Socket::AF_INET6
+              IN6MASK
+            else
+              raise "unsupported address family"
+            end
+        return $1.length if /\A(1*)(0*)\z/ =~ (@mask_addr & m).to_s(2)
+        raise "bad addr_mask format"
+      end
+
+      def cidr
+        cidr = sprintf("%s/%s", self.to_s, self.prefixlen)
+        cidr
+      end
+    end
+  end
+end