foreman_salt 13.2.4 → 14.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fddee03aa8a25bb479f486dff933348cd4d2ecd5f58acfd3a24b0f41e42add81
-  data.tar.gz: fd3936b47b815c6dde269e4b1a31c31688f32654d77b134d64fec3f9a001c279
+  metadata.gz: 287507e11ca2f63bc8341eae5bc832e7d95ad5b848922b9eba44b85486fd9dc3
+  data.tar.gz: e1a70ace048abbcf30d57e0631f8b1ad1627bbad3c5261b2196d0a92663ef833
 SHA512:
-  metadata.gz: 0cc753435d43457397cab17d476c9bd35a411ce11835f33e664b3032efe847332762e8b1b28efc3f97051cd7015bb0b99662aae6502ad52c3c8f232f62d6029c
-  data.tar.gz: 9840624a4241c66a91314f1a5a4eff96dada377aa0bf7b33bcb9d928143ed795978b6f874d6e444f4678c1d623e13e5b53601734ad08180fcbc320c3eb9d8780
+  metadata.gz: '08395ab98cb79f8dfc725268cfcb9dc8b11c015562625ea56f90315edaa9bcf1c76601d123481d57eed865212cc7212cfa36be6ea1506d8e59d1ac15afaa5f2b'
+  data.tar.gz: f7a59b6f52e80340520a8ed4523e39727659612a737fb848c33731013684f09dcbe83e27c02c928a22614f18842120ce3d53908bc2ec4176a153bb69c2124527

data/README.md

@@ -17,6 +17,7 @@ This plug-in adds support for Salt to Foreman.
 | >= 1.22         | 10.3.1         |
 | >= 1.23         | 11.0.1         |
 | >= 1.24         | 13.2.0         |
+| >= 2.5          | 14.0.0         |
 
 ## Documentation
 

data/app/controllers/foreman_salt/api/v2/salt_autosign_controller.rb

@@ -4,7 +4,15 @@ module ForemanSalt
   module Api
     module V2
       class SaltAutosignController < ::ForemanSalt::Api::V2::BaseController
-        before_action :find_proxy, :setup_proxy
+        include ::Foreman::Controller::SmartProxyAuth
+        include ::Foreman::Controller::Parameters::Host
+
+        # The add_smart_proxy_filters must be executed first! Otherwise, resource_finder won't work properly
+        add_smart_proxy_filters :auth
+
+        before_action :find_proxy, except: [:auth]
+        before_action :find_host, :find_proxy_via_host, only: [:auth]
+        before_action :setup_proxy
 
         api :GET, '/salt_autosign/:smart_proxy_id', N_('List all autosign records')
         param :smart_proxy_id, :identifier_dottable, :required => true
@@ -28,6 +36,18 @@ module ForemanSalt
           render :json => { root_node_name => _('Record deleted.') }
         end
 
+        api :PUT, '/salt_autosign_auth', N_("Set the salt_status as \'successful authentication\' and remove the corresponding autosign key from the Smart Proxy")
+        param :name, String, :required => true
+        def auth
+          Rails.logger.info("Removing Salt autosign key and update status for host #{@host}")
+          @api.autosign_remove_key(@host.salt_autosign_key) unless @host.salt_autosign_key.nil?
+          @host.update(:salt_status => ForemanSalt::SaltStatus.minion_auth_success)
+          render :json => { :message => "Removed autosign key and updated status succesfully" }, :status => 204
+        rescue ::Foreman::Exception => e
+          Rails.logger.warn("Cannot delete autosign key of host (id => #{params[:name]}) state: #{e}")
+          render :json => { :message => e.to_s }, :status => :unprocessable_entity
+        end
+
         def metadata_total
           @total ||= all_autosign.count
         end
@@ -50,11 +70,21 @@ module ForemanSalt
           @_autosigns ||= @api.autosign_list.map { |record| OpenStruct.new(:record => record) }
         end
 
+        def find_host
+          @host = resource_finder(Host.authorized(:view_hosts), params[:name])
+          not_found unless @host
+        end
+
         def find_proxy
           @proxy = ::SmartProxy.friendly.find(params[:smart_proxy_id])
           not_found unless @proxy
         end
 
+        def find_proxy_via_host
+          @proxy = ::SmartProxy.friendly.find(@host.salt_proxy.id)
+          not_found unless @proxy
+        end
+
         def setup_proxy
           @api = ProxyAPI::Salt.new(:url => @proxy.url)
         end

data/app/lib/proxy_api/salt.rb

@@ -14,7 +14,7 @@ module ::ProxyAPI
     def autosign_create(name)
       parse(post('', "autosign/#{URI.escape(name)}"))
     rescue => e
-      raise ProxyException.new(url, e, N_('Unable to set Salt autosign for %s'), name)
+      raise ProxyException.new(url, e, N_('Unable to set Salt autosign hostname for %s'), name)
     end
 
     def autosign_remove(name)
@@ -22,7 +22,21 @@ module ::ProxyAPI
     rescue RestClient::ResourceNotFound
       true # entry doesn't exists anyway
     rescue => e
-      raise ProxyException.new(url, e, N_('Unable to delete Salt autosign for %s'), name)
+      raise ProxyException.new(url, e, N_('Unable to delete Salt autosign hostname for %s'), name)
+    end
+
+    def autosign_create_key(key)
+      parse(post('', "autosign_key/#{URI.escape(key)}"))
+    rescue => e
+      raise ProxyException.new(url, e, N_('Unable to create Salt autosign key %s'), key)
+    end
+
+    def autosign_remove_key(key)
+      parse(delete("autosign_key/#{URI.escape(key)}"))
+    rescue RestClient::ResourceNotFound
+      true # entry doesn't exists anyway
+    rescue => e
+      raise ProxyException.new(url, e, N_('Unable to delete Salt autosign key %s'), key)
     end
 
     def environments_list

data/app/models/foreman_salt/concerns/host_managed_extensions.rb

@@ -42,9 +42,8 @@ module ForemanSalt
 
         validate :salt_modules_in_host_environment
 
-        after_build      :delete_salt_key, :if => ->(host) { host.salt_proxy }
-        before_provision :accept_salt_key, :if => ->(host) { host.salt_proxy }
-        before_destroy   :delete_salt_key, :if => ->(host) { host.salt_proxy }
+        after_build :ensure_salt_autosign, :if => ->(host) { host.salt_proxy }
+        before_destroy :remove_salt_minion, :if => ->(host) { host.salt_proxy }
       end
 
       def salt_params
@@ -58,6 +57,14 @@ module ForemanSalt
         end
       end
 
+      def host_params_grains_name
+        "salt_grains"
+      end
+
+      def autosign_grain_name
+        "autosign_key"
+      end
+
       def salt_modules_for_enc
         all_salt_modules.collect(&:name).uniq
       end
@@ -95,24 +102,66 @@ module ForemanSalt
         end
       end
 
-      private
-
-      def accept_salt_key
+      def derive_salt_grains(use_autosign: False)
+        grains = {}
         begin
-          Rails.logger.info("Host #{fqdn} is built, accepting Salt key")
-          key = ForemanSalt::SmartProxies::SaltKeys.find(salt_proxy, fqdn)
-          key&.accept
+          Rails.logger.info("Derive Salt Grains from host_params and autosign_key")
+          grains[autosign_grain_name] = salt_autosign_key if use_autosign && !salt_autosign_key.nil?
+          unless host_params[host_params_grains_name].nil? ||
+              host_params[host_params_grains_name].class != Hash
+            grains.merge!(host_params[host_params_grains_name])
+          end
         rescue Foreman::Exception => e
-          Rails.logger.warn("Unable to accept key for #{fqdn}: #{e}")
+          Rails.logger.warn("Unable to derive Salt Grains: #{e}")
         end
+        grains
+      end
+
+      private
+
+      def ensure_salt_autosign
+        remove_salt_autosign
+        create_salt_autosign
+      end
+
+      def remove_salt_minion
+        remove_salt_autosign
+        remove_salt_key
+      end
+
+      def remove_salt_key
+        Rails.logger.info("Remove salt key for host #{fqdn}")
+        api = ProxyAPI::Salt.new(:url => salt_proxy.url)
+        api.key_delete(name)
+      end
+
+      def remove_salt_autosign
+        key = self.salt_autosign_key
+        unless key.nil?
+          Rails.logger.info("Remove salt autosign key for host #{fqdn}")
+          begin
+            api = ProxyAPI::Salt.new(:url => salt_proxy.url)
+            api.autosign_remove_key(key)
+          rescue Foreman::Exception => e
+            Rails.logger.warn("Unable to remove salt autosign for #{fqdn}: #{e}")
+          end
+        end
+      end
+
+      def generate_provisioning_key
+          SecureRandom.hex(10)
       end
 
-      def delete_salt_key
+      def create_salt_autosign
         begin
-          key = ForemanSalt::SmartProxies::SaltKeys.find(salt_proxy, fqdn)
-          key&.delete
+          Rails.logger.info("Create salt autosign key for host #{fqdn}")
+          api = ProxyAPI::Salt.new(:url => salt_proxy.url)
+          key = generate_provisioning_key
+          api.autosign_create_key(key)
+          update(:salt_autosign_key => key)
+          update(:salt_status => ForemanSalt::SaltStatus.minion_auth_waiting)
         rescue Foreman::Exception => e
-          Rails.logger.warn("Unable to delete key for #{fqdn}: #{e}")
+          Rails.logger.warn("Unable to create salt autosign for #{fqdn}: #{e}")
         end
       end
     end
@@ -120,5 +169,5 @@ module ForemanSalt
 end
 
 class ::Host::Managed::Jail < Safemode::Jail
-  allow :salt_environment
+  allow :salt_environment, :salt_master, :derive_salt_grains
 end

data/app/models/foreman_salt/salt_status.rb

@@ -0,0 +1,12 @@
+module ForemanSalt
+  # Define the class that holds different states a Salt host become
+  class SaltStatus
+    def self.minion_auth_waiting
+      'Waiting for Salt Minion to authenticate'
+    end
+
+    def self.minion_auth_success
+      'Salt Minion was authenticated successfully to Salt Master'
+    end
+  end
+end

data/app/services/foreman_salt/report_importer.rb

@@ -43,7 +43,7 @@ module ForemanSalt
 
       @host.save(:validate => false)
       @host.reload
-      @host.refresh_statuses
+      @host.refresh_statuses([HostStatus.find_status_by_humanized_name("configuration")])
 
       logger.info("Imported report for #{@host} in #{(Time.zone.now - start_time).round(2)} seconds")
     end

data/config/routes.rb

@@ -38,6 +38,7 @@ Rails.application.routes.draw do
       scope '(:apiv)', :defaults => { :apiv => 'v2' },
                        :apiv => /v1|v2/, :constraints => ApiConstraints.new(:version => 2) do
         match '/jobs/upload' => 'foreman_salt/api/v2/jobs#upload', :via => :post
+        match '/salt_autosign_auth' => 'foreman_salt/api/v2/salt_autosign#auth', :via => :put
 
         constraints(:smart_proxy_id => /[\w\.-]+/, :name => /[\w\.-]+/, :record => /[^\/]+/) do
           match '/salt_keys/:smart_proxy_id' => 'foreman_salt/api/v2/salt_keys#index', :via => :get

data/db/migrate/20210312150333_add_salt_autosign_to_host.rb

@@ -0,0 +1,6 @@
+class AddSaltAutosignToHost < ActiveRecord::Migration[4.2]
+  def change
+    add_column :hosts, :salt_autosign_key, :string, limit: 255, null: true
+    add_column :hosts, :salt_status, :string, limit: 255, null: true
+  end
+end

data/db/seeds.d/76-job_templates.rb

@@ -20,7 +20,7 @@ if ForemanSalt.with_remote_execution?
           sync = !Rails.env.test? && Setting[:remote_execution_sync_templates]
           template = JobTemplate.import_raw!(File.read(template),
                                              :default => true,
-                                             :locked => true,
+                                             :lock => true,
                                              :update => sync)
           template.organizations = organizations if template.present?
           template.locations = locations if template.present?

data/lib/foreman_salt/engine.rb

@@ -38,16 +38,14 @@ module ForemanSalt
 
     initializer 'foreman_salt.assets.precompile' do |app|
       app.config.assets.precompile += %w(foreman_salt/states.js)
-    end
-
-    initializer 'foreman_salt.assets.precompile' do |app|
       app.config.assets.precompile += %w[foreman_salt/Salt.png]
     end
 
     initializer 'foreman_salt.configure_assets', :group => :assets do
       SETTINGS[:foreman_salt] = {
         :assets => {
-          :precompile => ['foreman_salt/states.js']
+          :precompile => ['foreman_salt/Salt.png',
+                          'foreman_salt/states.js']
         }
       }
     end

data/lib/foreman_salt/extensions.rb

@@ -1,7 +1,4 @@
 begin
-  ::Foreman::Plugin.fact_importer_registry.register(:foreman_salt, ForemanSalt::FactImporter)
-  ::FactParser.register_fact_parser(:foreman_salt, ForemanSalt::FactParser)
-
   # Helper Extensions
   ::HostsHelper.send :include, ForemanSalt::HostsHelperExtensions
   ::SmartProxiesHelper.send :include, ForemanSalt::SmartProxiesHelperExtensions

data/lib/foreman_salt/version.rb

@@ -1,3 +1,3 @@
 module ForemanSalt
-  VERSION = '13.2.4'
+  VERSION = '14.0.0'
 end

data/test/functional/api/v2/salt_autosign_controller_test.rb

@@ -3,6 +3,8 @@ require 'test_plugin_helper'
 class ::ForemanSalt::Api::V2::SaltAutosignControllerTest < ActionController::TestCase
   setup do
     @proxy = FactoryBot.create(:smart_proxy, :with_salt_feature)
+    @host = FactoryBot.create(:host, :managed)
+    @host.salt_proxy = @proxy
     ProxyAPI::Salt.any_instance.stubs(:autosign_list).returns((%w(foo bar baz)))
   end
 

data/test/integration/salt_autosign_test.rb

@@ -19,13 +19,13 @@ module ForemanSalt
       visit smart_proxy_path(@proxy)
       assert page.has_link? "Salt Autosign"
       click_link "Salt Autosign"
-      assert page.has_content?("Autosign entries for #{@proxy.hostname}"), 'Page title does not appear'
+      assert page.has_title?("Autosign entries for #{@proxy.hostname}"), 'Page title does not appear'
     end
 
     test 'index page' do
       visit smart_proxy_salt_autosign_index_path(:smart_proxy_id => @proxy.id)
       assert find_link('Keys').visible?, 'Keys is not visible'
-      assert has_content?("Autosign entries for #{@proxy.hostname}"), 'Page title does not appear'
+      assert has_title?("Autosign entries for #{@proxy.hostname}"), 'Page title does not appear'
       assert has_content?('Displaying'), 'Pagination "Display ..." does not appear'
     end
 

data/test/integration/salt_keys_test.rb

@@ -22,13 +22,12 @@ module ForemanSalt
       visit smart_proxy_path(@proxy)
       assert page.has_link? "Salt Keys"
       click_link "Salt Keys"
-      assert page.has_content?("Salt Keys on #{@proxy.hostname}"), 'Page title does not appear'
+      assert page.has_title?("Salt Keys on #{@proxy}"), 'Page title does not appear'
     end
 
     test 'index page' do
       visit smart_proxy_salt_keys_path(:smart_proxy_id => @proxy.id)
-      assert find_link('Autosign').visible?, 'Autosign is not visible'
-      assert has_content?("Salt Keys on #{@proxy.hostname}"), 'Page title does not appear'
+      assert has_title?("Salt Keys on #{@proxy}"), 'Page title does not appear'
       assert has_content?('Displaying'), 'Pagination "Display ..." does not appear'
     end
 

data/test/unit/host_extensions_test.rb

@@ -56,23 +56,67 @@ module ForemanSalt
       assert host.configuration?
     end
 
-    context 'key handling' do
+    context 'autosign handling' do
       before do
-        @host = FactoryBot.create(:host, :managed, :build => true)
+        @host = FactoryBot.create(:host, :managed)
         @host.salt_proxy = @proxy
-        @key_stub = stub("key")
-        ForemanSalt::SmartProxies::SaltKeys.expects(:find).at_least_once.with(@host.salt_proxy, @host.fqdn).returns(@key_stub)
+        stub_request(:post, "#{@proxy.url}/salt/autosign_key/asdfasdfasfasdf").
+          to_return(status: 200, body: "", headers: {})
       end
 
-      test 'host key is accepted when host is built' do
-        @key_stub.expects(:accept).at_least_once.returns(true)
-        assert @host.built
-        @host.run_callbacks(:commit) # callbacks don't run with Foreman's transactional fixtures
+      test 'host autosign is created when host is built' do
+        autosign_key = "asdfasdfasfasdf"
+        @host.expects(:generate_provisioning_key).returns(autosign_key)
+        @host.build = true
+        assert @host.save!
+        @host.clear_host_parameters_cache!
+        assert_equal autosign_key, @host.salt_autosign_key
+      end
+    end
+
+    context 'function derive_salt_grains' do
+      before do
+        @host = FactoryBot.create(:host, :managed)
+        @host.salt_proxy = @proxy
+      end
+
+      test 'host returns autosign when deriving salt grains' do
+        autosign_key = "asdfasdfasfasdf"
+        expected_hash = { @host.autosign_grain_name => autosign_key }
+        @host.salt_autosign_key = autosign_key
+        assert_equal expected_hash, @host.instance_eval { derive_salt_grains(:use_autosign => true) }
+      end
+
+      test 'host returns empty hash when deriving salt grains without any given' do
+        expected_hash = {}
+        assert_equal expected_hash, @host.instance_eval { derive_salt_grains(:use_autosign => true) }
+      end
+
+      test 'host returns empty hash when deriving salt grains without autosign' do
+        expected_hash = {}
+        assert_equal expected_hash, @host.instance_eval { derive_salt_grains(:use_autosign => false) }
+      end
+
+      test 'host returns host param grains when deriving salt grains' do
+        expected_hash = { "Some key": "Some value", "Another key": "An extraordinary value" }
+        @host.host_params[@host.host_params_grains_name] = expected_hash
+        assert_equal expected_hash, @host.instance_eval { derive_salt_grains(:use_autosign => false) }
+      end
+
+      test 'host returns only host param grains when deriving salt grains' do
+        expected_hash = { "Some key": "Some value", "Another key": "An extraordinary value" }
+        @host.host_params[@host.host_params_grains_name] = expected_hash
+        assert_equal expected_hash, @host.instance_eval { derive_salt_grains(:use_autosign => true) }
       end
 
-      test 'host key is deleted when host is removed' do
-        @key_stub.expects(:delete).at_least_once.returns(true)
-        assert @host.destroy
+      test 'host returns host param grains plus autosign when deriving salt grains' do
+        autosign_key = "asdfasdfasfasdf"
+        host_param_grains = { "Some key": "Some value",
+                              "Another key": "An extraordinary value" }
+        expected_hash = host_param_grains.merge(@host.autosign_grain_name => autosign_key)
+        @host.salt_autosign_key = autosign_key
+        @host.host_params[@host.host_params_grains_name] = host_param_grains
+        assert_equal expected_hash, @host.instance_eval { derive_salt_grains(:use_autosign => true) }
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_salt
 version: !ruby/object:Gem::Version
-  version: 13.2.4
+  version: 14.0.0
 platform: ruby
 authors:
 - Stephen Benjamin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-09 00:00:00.000000000 Z
+date: 2021-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -56,14 +56,14 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.71.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.71.0
 description: Foreman Plug-in for Salt
@@ -110,21 +110,19 @@ files:
 - app/lib/proxy_api/salt.rb
 - app/models/foreman_salt/concerns/host_managed_extensions.rb
 - app/models/foreman_salt/concerns/hostgroup_extensions.rb
-- app/models/foreman_salt/fact_name.rb
 - app/models/foreman_salt/host_salt_module.rb
 - app/models/foreman_salt/hostgroup_salt_module.rb
 - app/models/foreman_salt/salt_environment.rb
 - app/models/foreman_salt/salt_module.rb
 - app/models/foreman_salt/salt_module_environment.rb
 - app/models/foreman_salt/salt_provider.rb
+- app/models/foreman_salt/salt_status.rb
 - app/models/foreman_salt/salt_variable.rb
 - app/models/setting/salt.rb
 - app/overrides/salt_environment_host_selector.rb
 - app/overrides/salt_environment_hostgroup_selector.rb
 - app/overrides/salt_modules_selector.rb
 - app/overrides/salt_proxy_selector.rb
-- app/services/foreman_salt/fact_importer.rb
-- app/services/foreman_salt/fact_parser.rb
 - app/services/foreman_salt/report_importer.rb
 - app/services/foreman_salt/smart_proxies/salt_keys.rb
 - app/views/foreman_salt/api/v2/salt_autosign/base.json.rabl
@@ -190,6 +188,7 @@ files:
 - db/migrate/20150509101505_add_primary_keys.rb
 - db/migrate/20161103104146_add_index_to_join_tables.rb
 - db/migrate/20190515112233_add_salt_module_id_to_lookup_keys.rb
+- db/migrate/20210312150333_add_salt_autosign_to_host.rb
 - db/seeds.d/75-salt_seeds.rb
 - db/seeds.d/76-job_templates.rb
 - lib/foreman_salt.rb
@@ -258,15 +257,12 @@ files:
 - test/integration/salt_module_test.rb
 - test/integration/salt_variable_test.rb
 - test/test_plugin_helper.rb
-- test/unit/grains_centos.json
 - test/unit/grains_importer_test.rb
 - test/unit/highstate.json
 - test/unit/highstate_pchanges.json
 - test/unit/host_extensions_test.rb
 - test/unit/hostgroup_extensions_test.rb
 - test/unit/report_importer_test.rb
-- test/unit/salt_fact_importer_test.rb
-- test/unit/salt_fact_parser_test.rb
 - test/unit/salt_keys_test.rb
 - test/unit/salt_modules_test.rb
 - test/unit/salt_variables_test.rb
@@ -306,10 +302,7 @@ test_files:
 - test/unit/highstate_pchanges.json
 - test/unit/hostgroup_extensions_test.rb
 - test/unit/highstate.json
-- test/unit/salt_fact_parser_test.rb
 - test/unit/salt_modules_test.rb
-- test/unit/grains_centos.json
-- test/unit/salt_fact_importer_test.rb
 - test/unit/report_importer_test.rb
 - test/unit/salt_variables_test.rb
 - test/unit/salt_keys_test.rb

data/app/models/foreman_salt/fact_name.rb

@@ -1,14 +0,0 @@
-module ForemanSalt
-  # Define the class that fact names that come from Salt should have
-  # It allows us to filter facts by origin, and also to display the origin
-  # in the fact values table (/fact_values)
-  class FactName < ::FactName
-    def origin
-      'Salt'
-    end
-
-    def icon_path
-      'foreman_salt/Salt'
-    end
-  end
-end

data/app/services/foreman_salt/fact_importer.rb

@@ -1,15 +0,0 @@
-module ForemanSalt
-  class FactImporter < ::StructuredFactImporter
-    def fact_name_class
-      ForemanSalt::FactName
-    end
-
-    def self.support_background
-      true
-    end
-
-    def self.authorized_smart_proxy_features
-      'Salt'
-    end
-  end
-end

data/app/services/foreman_salt/fact_parser.rb

@@ -1,114 +0,0 @@
-module ForemanSalt
-  class FactParser < ::FactParser
-    attr_reader :facts
-
-    def operatingsystem
-      os = Operatingsystem.where(os_hash).first_or_initialize
-      if os.new_record?
-        os.deduce_family
-        os.release_name = facts[:lsb_distrib_codename]
-        os.save
-      end
-      os if os.persisted?
-    end
-
-    def architecture
-      name = facts[:osarch]
-      name = 'x86_64' if name == 'amd64'
-      Architecture.where(:name => name).first_or_create unless name.blank?
-    end
-
-    def environment
-      # Don't touch the Puppet environment field
-    end
-
-    def model
-      name = facts[:productname]
-      Model.where(:name => name.strip).first_or_create unless name.blank?
-    end
-
-    def domain
-      name = facts[:domain]
-      Domain.where(:name => name).first_or_create unless name.blank?
-    end
-
-    def ip
-      ip = facts.find { |fact, value| fact =~ /^fqdn_ip4/ && value && value != '127.0.0.1' }
-      ip[1] if ip
-    end
-
-    def primary_interface
-      interface = interfaces.find { |_, value| value[:ipaddress] == ip }
-      interface[0] if interface
-    end
-
-    def mac
-      interface = interfaces.find { |_, value| value[:ipaddress] == ip }
-      interface[1][:macaddress] if interface
-    end
-
-    def ipmi_interface
-      nil
-    end
-
-    def interfaces
-      interfaces = {}
-
-      facts.each do |fact, value|
-        next unless value && fact.to_s =~ /^ip_interfaces/
-
-        (_, interface_name) = fact.split(FactName::SEPARATOR)
-
-        next if (IPAddr.new('fe80::/10').include?(value) rescue false)
-
-        if !interface_name.blank? && interface_name != 'lo'
-          interface = interfaces.fetch(interface_name, {})
-          interface[:macaddress] = macs[interface_name]
-          if Net::Validations.validate_ip6(value)
-            interface[:ipaddress6] = value unless interface.include?(:ipaddress6)
-          else
-            interface[:ipaddress] = value unless interface.include?(:ipaddress)
-          end
-          interfaces[interface_name] = interface
-        end
-      end
-
-      interfaces.each do |name, interface|
-        set_additional_attributes(interface, name)
-      end
-
-      interfaces
-    end
-
-    def support_interfaces_parsing?
-      true
-    end
-
-    private
-
-    def os_hash
-      name = facts[:os]
-      (_, major, minor, sub) = /(\d+)\.?(\d+)?\.?(\d+)?/.match(facts[:osrelease]).to_a
-      if name == 'CentOS'
-        if sub
-          minor += '.' + sub
-        end
-      end
-      { :name => name, :major => major, :minor => minor }
-    end
-
-    def macs
-      unless @macs
-        @macs = {}
-        facts.each do |fact, value|
-          next unless value && fact.to_s =~ /^hwaddr_interfaces/
-
-          data = fact.split(FactName::SEPARATOR)
-          interface = data[1]
-          macs[interface] = value
-        end
-      end
-      @macs
-    end
-  end
-end

data/test/unit/grains_centos.json

@@ -1,113 +0,0 @@
-{
-  "facts": {
-    "kernelrelease": "2.6.32-431.23.3.el6.x86_64",
-    "ipv6::0": "::1",
-    "ipv6::1": "fe80::5054:ff:fe35:302a",
-    "saltversioninfo": [
-      2014,
-      1,
-      7
-    ],
-    "operatingsystem": "CentOS",
-    "lsb_distrib_id": "CentOS",
-    "pythonversion::2": 6,
-    "pythonversion::3": "final",
-    "pythonversion::0": 2,
-    "pythonversion::1": 6,
-    "cpu_model": "QEMU Virtual CPU version (cpu64-rhel6)",
-    "pythonversion::4": 0,
-    "oscodename": "Final",
-    "num_gpus": 1,
-    "productname": "KVM",
-    "osarch": "x86_64",
-    "biosversion": "0.5.1",
-    "kernel": "Linux",
-    "domain": "example.com",
-    "pythonpath::4": "/usr/lib64/python2.6/lib-tk",
-    "pythonpath::5": "/usr/lib64/python2.6/lib-old",
-    "pythonpath::6": "/usr/lib64/python2.6/lib-dynload",
-    "pythonpath::7": "/usr/lib64/python2.6/site-packages",
-    "pythonpath::0": "/usr/bin",
-    "mem_total": 742,
-    "pythonpath::2": "/usr/lib64/python2.6",
-    "pythonpath::3": "/usr/lib64/python2.6/plat-linux2",
-    "pythonpath::8": "/usr/lib/python2.6/site-packages",
-    "cpu_flags::25": "pni",
-    "cpu_flags::24": "unfair_spinlock",
-    "cpu_flags::27": "hypervisor",
-    "cpu_flags::26": "cx16",
-    "cpu_flags::21": "nx",
-    "cpu_flags::20": "syscall",
-    "cpu_flags::23": "up",
-    "cpu_flags::22": "lm",
-    "cpu_flags::28": "lahf_lm",
-    "defaultlanguage": "en_US",
-    "osfullname": "CentOS",
-    "localhost": "saltclient01.example.com",
-    "lsb_distrib_release": "6.5",
-    "saltpath": "/usr/lib/python2.6/site-packages/salt",
-    "biosreleasedate": "01/01/2007",
-    "host": "saltclient01",
-    "defaultencoding": "UTF8",
-    "path": "/sbin:/usr/sbin:/bin:/usr/bin",
-    "ip_interfaces::eth0::0": "10.7.13.141",
-    "ip_interfaces::eth0::1": "10.7.23.141",
-    "manufacturer": "Red Hat",
-    "fqdn": "saltclient01.example.com",
-    "os": "CentOS",
-    "osfinger": "CentOS-6",
-    "ps": "ps -efH",
-    "server_id": 654860635,
-    "zmqversion": "3.2.4",
-    "osmajorrelease::1": "5",
-    "osmajorrelease::0": "6",
-    "ip_interfaces::lo::0": "127.0.0.1",
-    "master": "saltstack.example.com",
-    "shell": "/bin/sh",
-    "saltversion": "2014.1.7",
-    "hwaddr_interfaces::lo": "00:00:00:00:00:00",
-    "_timestamp": "2014-08-28 10:02:16 ",
-    "cpu_flags::18": "sse",
-    "cpu_flags::19": "sse2",
-    "cpu_flags::14": "pse36",
-    "cpu_flags::15": "clflush",
-    "cpu_flags::16": "mmx",
-    "cpu_flags::17": "fxsr",
-    "cpu_flags::10": "mtrr",
-    "cpu_flags::11": "pge",
-    "cpu_flags::12": "mca",
-    "cpu_flags::13": "cmov",
-    "cpuarch": "x86_64",
-    "pythonpath::1": "/usr/lib64/python26.zip",
-    "cpu_flags::6": "mce",
-    "cpu_flags::7": "cx8",
-    "cpu_flags::4": "msr",
-    "cpu_flags::5": "pae",
-    "cpu_flags::2": "pse",
-    "cpu_flags::3": "tsc",
-    "cpu_flags::0": "fpu",
-    "cpu_flags::1": "de",
-    "serialnumber": "Not Specified",
-    "hwaddr_interfaces::eth0": "52:54:00:35:30:2a",
-    "cpu_flags::8": "apic",
-    "cpu_flags::9": "sep",
-    "gpus::0::model": "GD 5446",
-    "id": "saltclient01.example.com",
-    "osrelease": "6.5",
-    "num_cpus": 1,
-    "virtual": "kvm",
-    "ipv4::0": "10.7.23.141",
-    "ipv4::1": "10.7.13.141",
-    "ipv4::2": "127.0.0.1",
-    "_type": "foreman_salt",
-    "nodename": "saltclient01.example.com",
-    "os_family": "RedHat",
-    "operatingsystemrelease": "6.5",
-    "gpus::0::vendor": "unknown",
-    "lsb_distrib_codename": "Final",
-    "fqdn_ip4::0": "10.7.13.141",
-    "ip_interfaces::eth1::0": "1.2.3.4",
-    "hwaddr_interfaces::eth1": "DE:AD:BE:EF:07:13"
-  },
-  "name": "saltclient01.example.com"
-}

data/test/unit/salt_fact_importer_test.rb

@@ -1,24 +0,0 @@
-require 'test_plugin_helper'
-
-module ForemanSalt
-  class SaltFactImpoterTest < ActiveSupport::TestCase
-    def setup
-      @host = FactoryBot.build(:host)
-    end
-
-    test 'should have fact set' do
-      importer = FactImporter.new(@host, 'a' => 'b')
-      assert_equal({ 'a' => 'b' }, importer.send(:facts))
-    end
-
-    test 'should have Salt as origin' do
-      importer = FactImporter.new(@host, 'a' => 'b')
-      importer.stubs(:ensure_no_active_transaction).returns(true)
-      importer.import!
-      imported_fact = FactName.find_by_name('a')
-      assert_equal 'a', imported_fact.name
-      assert_equal 'Salt', imported_fact.origin
-      assert_equal 'foreman_salt/Salt', imported_fact.icon_path
-    end
-  end
-end

data/test/unit/salt_fact_parser_test.rb

@@ -1,44 +0,0 @@
-require 'test_plugin_helper'
-
-module ForemanSalt
-  class SaltFactsParserTest < ActiveSupport::TestCase
-    def setup
-      grains = JSON.parse(File.read(File.join(Engine.root, 'test', 'unit', 'grains_centos.json')))
-      @facts_parser = FactParser.new grains["facts"]
-      User.current = users :admin
-    end
-
-    test "should return list of interfaces" do
-      assert @facts_parser.interfaces.present?
-      assert_not_nil @facts_parser.suggested_primary_interface(FactoryBot.build(:host))
-      assert @facts_parser.interfaces.key?(@facts_parser.suggested_primary_interface(FactoryBot.build(:host)).first)
-    end
-
-    test "should set operatingsystem correctly" do
-      os = @facts_parser.operatingsystem
-      assert os.present?
-      assert_equal 'CentOS', os.name
-      assert_equal '6', os.major
-      assert_equal '5', os.minor
-      assert_equal 'CentOS 6.5', os.title
-    end
-
-    test "should set domain correctly" do
-      domain = @facts_parser.domain
-      assert domain.present?
-      assert_equal 'example.com', domain.name
-    end
-
-    test "should set ip correctly" do
-      assert_equal '10.7.13.141', @facts_parser.ip
-    end
-
-    test "should set primary_interface correctly" do
-      assert_equal 'eth0', @facts_parser.primary_interface
-    end
-
-    test "should set mac correctly" do
-      assert_equal '52:54:00:35:30:2a', @facts_parser.mac
-    end
-  end
-end