Merge pull request #8 from Karmkor/add_config_diff

Adding diff output when interface config is changing

lib/cumulus/ifupdown2.rb

@@ -1,6 +1,8 @@
 require 'json'
+require 'puppet/util/diff'
 # defines functions that read and write ifquery output
 class Ifupdown2Config
+  include Puppet::Util::Diff
   attr_accessor :confighash, :currenthash
   def initialize(resource)
     @resource = resource
@@ -38,10 +40,36 @@ def remove_nil_entries(myhash)
   end
 
   def compare_with_current
+    diff_config
     remove_nil_entries(@confighash) ==
       remove_nil_entries(@currenthash)
   end
 
+  # diff between old and new config
+  def diff_config
+    filepath = @resource[:location] + '/' + @resource[:name]
+    if Puppet::FileSystem.exist?(filepath)
+      tmp_intf = hash_to_if
+      if !tmp_intf.empty?
+        tmp_filepath = '/tmp/puppet-temp-iface-' + @resource[:name] + rand(36**8).to_s(36)
+        begin
+          ifacefile = File.open(tmp_filepath, 'w')
+          ifacefile.write(tmp_intf)
+        ensure
+          ifacefile.close
+        end
+        diff = Puppet::Util::Diff.diff(filepath, tmp_filepath)
+        if !diff.empty?
+          Puppet.info "config diff for #{@resource[:name]}"
+          Puppet.notice "#{diff}"
+        end
+        if File.exist?(tmp_filepath)
+          File.delete(tmp_filepath)
+        end
+      end
+    end
+  end
+
   ##
   # Use ifquery to generate a configuration from a hash and return the
   # configuration.

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "c2devel-cumulus_interfaces",
-  "version": "1.2.8",
+  "version": "1.2.10",
   "author": "Cumulus Networks",
   "summary": "Configures Cumulus Linux interfaces",
   "license": "GPLv2",