Avoid uploading license if all features are same

If the features in the license file are the same with
the installed features on the Unity, skips the uploading.

Author: Peter Wang

README.md

@@ -649,4 +649,6 @@ peter.wang13 at emc.com
 
 ## Release Notes
 
-0.1.0 - Initial release.
+0.1.0 - Initial release.
+0.1.1 - Add license differential uploading.
+      - Pool expansion if new raid groups are added.

examples/example_license.pp

@@ -1,5 +1,5 @@
 unity_system { 'FNM00150600267':
-  ip       => '10.245.101.35',
+  ip       => '10.245.101.39',
   user     => 'admin',
   password => 'Password123!',
 }

examples/example_lun.pp

@@ -1,7 +1,7 @@
 
 # Define a Unity System
 unity_system { 'FNM00150600267':
-  ip       => '10.245.101.35',
+  ip       => '10.245.101.39',
   user     => 'admin',
   password => 'Password123!',
 }

lib/puppet/provider/unity_license/license_provider.rb

@@ -24,15 +24,56 @@ def create
 
     unity = get_unity_system(@resource[:unity_system])
     unity.upload_license(@resource[:license_file].to_s)
+
   end
 
   def destroy
     Puppet.info "License #{@resource[:licence_file]} is not able to remove from Unity system."
   end
 
   def exists?
-    Puppet.info "License #{@resource[:license_file]} cannot be queried."
+    Puppet.info "Checking existence of License #{@resource[:license_file]}."
     # Always force license uploading.
-    false
+    is_license_same? @resource[:license_file].to_s
   end
+
+
+  def get_file_info(path)
+    feature_names = []
+    File.open(path, 'r') do |license|
+      while (line = license.gets)
+        if line.include? 'INCREMENT'
+          f_name = line.split[1]
+          feature_names << f_name
+        end
+      end
+
+      return feature_names
+    end
+  end
+
+  def get_array_licenses
+    license_names = []
+    unity = get_unity_system(@resource[:unity_system])
+    licenses = unity.get_license
+    licenses.to_enum.each do |license|
+      license_names << license.name.to_s
+    end
+
+    license_names
+
+  end
+
+  def is_license_same?(path)
+    curr = get_array_licenses
+    file_lic = get_file_info path
+    if curr.to_set == file_lic.to_set
+      Puppet.debug "No change in #{path}. Skipping license uploading."
+      return true
+    else
+      Puppet.info "New changes found in #{path}, uploading changes: #{(file_lic.to_set - curr.to_set).to_a}."
+      return false
+    end
+  end
+
 end

lib/puppet/util/dellemc/unity_helper.rb

@@ -8,14 +8,22 @@
 $storops = RubyPython.import('storops')
 $storops.enable_log
 
+$unity_info = {}
+
 def get_unity_system(unity_resource)
   local_unity = @resource.catalog.resource(unity_resource.to_s)
+  if $unity_info.include? local_unity[:ip]
+    Puppet.info "#{local_unity[:ip]} is already connected, using the cached connection."
+    return $unity_info[local_unity[:ip]]
+  end
   unity = $storops.UnitySystem.new(local_unity[:ip], local_unity[:user], local_unity[:password])
+  $unity_info[local_unity[:ip]] = unity
+
+  unity
 end
 
 def get_raid_group_parameters(raid_groups)
   pool = RubyPython.import('storops.unity.resource.pool')
-  disk = RubyPython.import('storops.unity.resource.disk')
   parameters = []
   raid_groups.each do |raid_group|
     # disk_group = disk.UnityDiskGroup.new(raid_group[:disk_group])

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "dellemc-unity",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "author": "Peter Wang",
   "summary": "Configure and manage the DellEMC Unity storage systems.",
   "license": "Apache-2.0",

rebuild_install.bat

@@ -4,4 +4,4 @@ rem A handy script for debugging the puppet module
 
 cmd /c puppet module uninstall dellemc-unity
 cmd /c puppet module build
-cmd /c puppet module install ".\pkg\dellemc-unity-0.1.0.tar.gz"  --ignore-dependencies
+cmd /c puppet module install ".\pkg\dellemc-unity-0.1.1.tar.gz"  --ignore-dependencies