foreman_salt 13.0.0 → 13.1.0

data/lib/foreman_salt/plugin.rb

@@ -7,21 +7,22 @@ Foreman::Plugin.register :foreman_salt do
   apipie_documented_controllers ["#{ForemanSalt::Engine.root}/app/controllers/foreman_salt/api/v2/*.rb"]
 
   # Menus
+  divider :top_menu, :parent => :configure_menu, :caption => 'Salt'
   menu :top_menu, :salt_environments,
        :url_hash => { :controller => :'foreman_salt/salt_environments', :action => :index },
        :caption  => 'Environments',
-       :parent   => :configure_menu,
-       :after    => :common_parameters
+       :parent   => :configure_menu
 
   menu :top_menu, :salt_modules,
        :url_hash => { :controller => :'foreman_salt/salt_modules', :action => :index },
        :caption  => 'States',
-       :parent   => :configure_menu,
-       :after    => :common_parameters
+       :parent   => :configure_menu
+
+  menu :top_menu, :salt_variables,
+       :url_hash => { :controller => :'foreman_salt/salt_variables', :action => :index },
+       :caption => N_('Variables'),
+       :parent => :configure_menu
 
-  divider :top_menu, :parent => :configure_menu,
-                     :caption => 'Salt',
-                     :after   => :common_parameters
 
   # Permissions
   security_block :foreman_salt do
@@ -59,6 +60,33 @@ Foreman::Plugin.register :foreman_salt do
                  :'foreman_salt/api/v2/salt_environments' => [:destroy] },
                :resource_type => 'ForemanSalt::SaltEnvironment'
 
+    permission :view_salt_variables,
+               {
+                 :'foreman_salt/salt_variables' => [:index, :auto_complete_search],
+                 :'foreman_salt/api/v2/salt_variables' => [:index, :show]
+               },
+               :resource_type => 'ForemanSalt::SaltVariable'
+
+    permission :edit_salt_variables,
+               { :'foreman_salt/salt_variables' => [:edit, :update],
+                 :'foreman_salt/api/v2/salt_variables' => [:update],
+                 :'foreman_salt/api/v2/salt_override_values' => [:create, :destroy] },
+               :resource_type => 'ForemanSalt::SaltVariable'
+
+    permission :destroy_salt_variables,
+               {
+                 :'foreman_salt/salt_variables' => [:destroy],
+                 :'foreman_salt/api/v2/salt_variables' => [:destroy]
+               },
+               :resource_type => 'ForemanSalt::SaltVariable'
+
+    permission :create_salt_variables,
+               {
+                 :'foreman_salt/salt_variables' => [:new, :create],
+                 :'foreman_salt/api/v2/salt_variables' => [:create]
+               },
+               :resource_type => 'ForemanSalt::SaltVariable'
+
     permission :create_reports,
                { :'foreman_salt/api/v2/jobs' => [:upload] },
                :resource_type => 'Report'
@@ -124,18 +152,18 @@ Foreman::Plugin.register :foreman_salt do
   end
 
   # Roles
-  role 'Salt admin', [:saltrun_hosts, :create_salt_modules,
-                      :view_salt_modules, :edit_salt_modules,
-                      :destroy_salt_modules,
+  role 'Salt admin', [:saltrun_hosts,
+                      :create_salt_modules, :view_salt_modules,
+                      :edit_salt_modules, :destroy_salt_modules,
+                      :import_salt_modules,
                       :view_smart_proxies_salt_keys,
-                      :destroy_smart_proxies_salt_keys,
-                      :edit_smart_proxies_salt_keys,
-                      :create_smart_proxies_salt_autosign,
-                      :view_smart_proxies_salt_autosign,
+                      :edit_smart_proxies_salt_keys, :destroy_smart_proxies_salt_keys,
+                      :create_smart_proxies_salt_autosign, :view_smart_proxies_salt_autosign,
                       :destroy_smart_proxies_salt_autosign,
                       :create_salt_environments, :view_salt_environments,
-                      :edit_salt_environments,
-                      :destroy_salt_environments]
+                      :edit_salt_environments, :destroy_salt_environments,
+                      :create_salt_variables, :view_salt_variables,
+                      :edit_salt_variables, :destroy_salt_variables]
 
 
   # Parameter filters

data/lib/foreman_salt/version.rb

@@ -1,3 +1,3 @@
 module ForemanSalt
-  VERSION = '13.0.0'
+  VERSION = '13.1.0'
 end

data/locale/de/foreman_salt.edit.po

@@ -2,28 +2,30 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the foreman_salt package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# 
 # Translators:
 # Lukáš Zapletal, 2019
 # Ettore Atalan <atalanttore@googlemail.com>, 2019
-# Dominic Cleal <dominic@cleal.org>, 2019
-# Wiederoder <stefanwiederoder@googlemail.com>, 2019
+# 0868a4d1af5275b3f70b0a6dac4c99a4, 2019
 # abf90805572190d649c59f7a021d76cb, 2019
 # Michael Moll, 2019
 # Hannes Schaller <admin@cyberkov.at>, 2019
-# Bryan Kearney <bryan.kearney@gmail.com>, 2019
 # Ulrich Habel <rhaen@pkgbox.de>, 2019
 # Arnold Bechtoldt <mail@arnoldbechtoldt.com>, 2019
 # simon11 <simon.stieger.98@live.de>, 2019
+# Bryan Kearney <bryan.kearney@gmail.com>, 2019
+# Crited <Alexander.Stoll@netways.de>, 2019
 # Bernhard Suttner <bernhard.suttner@atix.de>, 2019
-#
+# Wiederoder <stefanwiederoder@googlemail.com>, 2019
+# 
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_salt 1.0.0\n"
+"Project-Id-Version: foreman_salt 13.1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-07-22 19:13+0000\n"
 "PO-Revision-Date: 2019-04-29 07:31+0000\n"
-"Last-Translator: Bernhard Suttner <bernhard.suttner@atix.de>, 2019\n"
+"Last-Translator: Wiederoder <stefanwiederoder@googlemail.com>, 2019\n"
 "Language-Team: German (https://www.transifex.com/foreman/teams/114/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -33,11 +35,11 @@ msgstr ""
 
 #: ../app/controllers/foreman_salt/api/v2/jobs_controller.rb:12
 msgid "JID"
-msgstr ""
+msgstr "JID"
 
 #: ../app/controllers/foreman_salt/api/v2/jobs_controller.rb:13
 msgid "Function"
-msgstr ""
+msgstr "Funktion"
 
 #: ../app/controllers/foreman_salt/api/v2/jobs_controller.rb:14
 msgid "Result"
@@ -55,7 +57,8 @@ msgstr "Alle Autosign-Einträge auflisten"
 msgid "Create an autosign record"
 msgstr "Autosign-Eintrag erstellen"
 
-#: ../app/controllers/foreman_salt/api/v2/salt_autosign_controller.rb:17 ../app/controllers/foreman_salt/api/v2/salt_autosign_controller.rb:25
+#: ../app/controllers/foreman_salt/api/v2/salt_autosign_controller.rb:17
+#: ../app/controllers/foreman_salt/api/v2/salt_autosign_controller.rb:25
 msgid "Autosign record"
 msgstr "Autosign-Einträge"
 
@@ -175,7 +178,8 @@ msgstr "Nur Probelauf"
 msgid "Could not find salt environment with id %s"
 msgstr "Salt Umgebung mit ID %s konnte nicht gefunden werden"
 
-#: ../app/controllers/foreman_salt/concerns/hosts_controller_extensions.rb:44 ../app/helpers/concerns/foreman_salt/hosts_helper_extensions.rb:38
+#: ../app/controllers/foreman_salt/concerns/hosts_controller_extensions.rb:44
+#: ../app/helpers/concerns/foreman_salt/hosts_helper_extensions.rb:38
 msgid "Salt Master"
 msgstr "Salt Master"
 
@@ -188,14 +192,14 @@ msgid "Updated hosts: changed salt environment"
 msgstr ""
 
 #: ../app/controllers/foreman_salt/minions_controller.rb:24
-msgid ""
-"Unable to generate output, Check log files\n"
-msgstr ""
-"Kann keine Ausgabe erzeugen, Bitte Logdateien prüfen\n"
+msgid "Unable to generate output, Check log files\\n"
+msgstr "Kann keine Ausgabe erzeugen, Bitte Logdateien prüfen\\n"
 
 #: ../app/controllers/foreman_salt/minions_controller.rb:29
 msgid "Successfully executed, check log files for more details"
-msgstr "Erfolgreich ausgeführt, für weitere Informationen bitte die Protokolldateien prüfen"
+msgstr ""
+"Erfolgreich ausgeführt, für weitere Informationen bitte die Protokolldateien"
+" prüfen"
 
 #: ../app/controllers/foreman_salt/salt_autosign_controller.rb:17
 msgid "Autosign created for #{params[:id]}"
@@ -205,7 +209,8 @@ msgstr "Autosign-Eintrag erstellt für #{params[:id]}"
 msgid "Autosign deleted for #{params[:id]}"
 msgstr "Autosign-Eintrag entfernt für #{params[:id]}"
 
-#: ../app/controllers/foreman_salt/salt_environments_controller.rb:30 ../app/controllers/foreman_salt/salt_modules_controller.rb:34
+#: ../app/controllers/foreman_salt/salt_environments_controller.rb:30
+#: ../app/controllers/foreman_salt/salt_modules_controller.rb:34
 msgid "Successfully updated %s."
 msgstr "%s wurde aktualisiert."
 
@@ -221,7 +226,8 @@ msgstr "Schlüssel #{key} zurückgewiesen"
 msgid "Key deleted for #{key}"
 msgstr "Schlüssel #{key} entfernt"
 
-#: ../app/controllers/foreman_salt/salt_modules_controller.rb:66 ../app/controllers/foreman_salt/salt_modules_controller.rb:73
+#: ../app/controllers/foreman_salt/salt_modules_controller.rb:66
+#: ../app/controllers/foreman_salt/salt_modules_controller.rb:73
 msgid "No changes found"
 msgstr "Keine Änderungen festgestellt"
 
@@ -237,7 +243,8 @@ msgstr "Salt ENC"
 msgid "Salt external nodes YAML dump"
 msgstr "YAML-Ausgabe des externen Salt-Knotens"
 
-#: ../app/helpers/concerns/foreman_salt/hosts_helper_extensions.rb:17 ../lib/foreman_salt/plugin.rb:156
+#: ../app/helpers/concerns/foreman_salt/hosts_helper_extensions.rb:17
+#: ../lib/foreman_salt/plugin.rb:156
 msgid "Run Salt"
 msgstr "Salt starten"
 
@@ -253,7 +260,8 @@ msgstr ""
 msgid "Change Salt Environment"
 msgstr ""
 
-#: ../app/helpers/concerns/foreman_salt/hosts_helper_extensions.rb:39 ../app/views/hosts/select_multiple_salt_environment.html.erb:7
+#: ../app/helpers/concerns/foreman_salt/hosts_helper_extensions.rb:39
+#: ../app/views/hosts/select_multiple_salt_environment.html.erb:7
 msgid "Salt Environment"
 msgstr "Salt Umgebung"
 
@@ -277,7 +285,8 @@ msgstr "Zurückgewiesen"
 msgid "Unaccepted"
 msgstr "Abgelehnt"
 
-#: ../app/helpers/foreman_salt/salt_modules_helper.rb:5 ../app/views/foreman_salt/salt_modules/import.html.erb:1
+#: ../app/helpers/foreman_salt/salt_modules_helper.rb:5
+#: ../app/views/foreman_salt/salt_modules/import.html.erb:1
 msgid "Import from %s"
 msgstr "Importieren aus %s"
 
@@ -343,7 +352,9 @@ msgstr "Salt State muss in der Umgebung des Hosts sein"
 
 #: ../app/models/foreman_salt/concerns/host_managed_extensions.rb:79
 msgid "Host must have an environment in order to set salt states"
-msgstr "Host muss einer Salt Umgebung angehören bevor ein Salt State gesetzt werden kann"
+msgstr ""
+"Host muss einer Salt Umgebung angehören bevor ein Salt State gesetzt werden "
+"kann"
 
 #: ../app/models/foreman_salt/salt_environment.rb:13
 msgid "is alphanumeric and cannot contain spaces"
@@ -354,8 +365,12 @@ msgid "Salt environment"
 msgstr "Salt Umgebung"
 
 #: ../app/models/foreman_salt/salt_module.rb:16
-msgid "must be alphanumeric, can contain periods, dashes, underscores and must not contain spaces"
-msgstr "muss alphanumerisch sein; kann Punkte, Striche, Unterstriche enthalten jedoch keine Leerzeichen"
+msgid ""
+"must be alphanumeric, can contain periods, dashes, underscores and must not "
+"contain spaces"
+msgstr ""
+"muss alphanumerisch sein; kann Punkte, Striche, Unterstriche enthalten "
+"jedoch keine Leerzeichen"
 
 #: ../app/models/foreman_salt/salt_module.rb:40
 msgid "Salt state"
@@ -377,7 +392,8 @@ msgstr "Ungültiger Bericht"
 msgid "Must specify a Smart Proxy to use"
 msgstr "Zu verwendender Smart Proxy muss angegeben werden"
 
-#: ../app/views/foreman_salt/salt_autosign/_form.html.erb:4 ../app/views/foreman_salt/salt_autosign/index.html.erb:7
+#: ../app/views/foreman_salt/salt_autosign/_form.html.erb:4
+#: ../app/views/foreman_salt/salt_autosign/index.html.erb:7
 msgid "Name"
 msgstr "Name"
 
@@ -401,7 +417,8 @@ msgstr "Neu"
 msgid "New Autosign Entry"
 msgstr "Neuer Autosign-Eintrag"
 
-#: ../app/views/foreman_salt/salt_environments/_form.html.erb:4 ../app/views/foreman_salt/salt_environments/index.html.erb:1
+#: ../app/views/foreman_salt/salt_environments/_form.html.erb:4
+#: ../app/views/foreman_salt/salt_environments/index.html.erb:1
 msgid "Salt Environments"
 msgstr "Salt Umgebungen"
 
@@ -409,27 +426,32 @@ msgstr "Salt Umgebungen"
 msgid "Edit Salt Environment %s"
 msgstr "Salt Umgebung %s bearbeiten"
 
-#: ../app/views/foreman_salt/salt_environments/index.html.erb:3 ../app/views/foreman_salt/salt_environments/new.html.erb:1
+#: ../app/views/foreman_salt/salt_environments/index.html.erb:3
+#: ../app/views/foreman_salt/salt_environments/new.html.erb:1
 msgid "New Salt Environment"
 msgstr "Neue Salt Umgebung"
 
 #: ../app/views/foreman_salt/salt_environments/index.html.erb:7
 msgid "SaltEnvironment|Name"
-msgstr ""
+msgstr "Name"
 
-#: ../app/views/foreman_salt/salt_environments/index.html.erb:8 ../app/views/foreman_salt/salt_modules/import.html.erb:24
+#: ../app/views/foreman_salt/salt_environments/index.html.erb:8
+#: ../app/views/foreman_salt/salt_modules/import.html.erb:24
 msgid "States"
 msgstr "States"
 
-#: ../app/views/foreman_salt/salt_environments/index.html.erb:9 ../app/views/foreman_salt/salt_modules/index.html.erb:11
+#: ../app/views/foreman_salt/salt_environments/index.html.erb:9
+#: ../app/views/foreman_salt/salt_modules/index.html.erb:11
 msgid "Hosts"
 msgstr "Hosts"
 
-#: ../app/views/foreman_salt/salt_environments/index.html.erb:10 ../app/views/foreman_salt/salt_modules/index.html.erb:12
+#: ../app/views/foreman_salt/salt_environments/index.html.erb:10
+#: ../app/views/foreman_salt/salt_modules/index.html.erb:12
 msgid "Host groups"
 msgstr "Hostgruppen"
 
-#: ../app/views/foreman_salt/salt_environments/index.html.erb:21 ../app/views/foreman_salt/salt_modules/index.html.erb:28
+#: ../app/views/foreman_salt/salt_environments/index.html.erb:21
+#: ../app/views/foreman_salt/salt_modules/index.html.erb:28
 msgid "Delete %s?"
 msgstr "%s löschen?"
 
@@ -465,11 +487,15 @@ msgstr "Akzeptieren"
 msgid "Reject"
 msgstr "Zurückweisen"
 
-#: ../app/views/foreman_salt/salt_modules/_form.html.erb:4 ../app/views/foreman_salt/salt_modules/_host_tab.html.erb:1 ../app/views/foreman_salt/salt_modules/index.html.erb:1
+#: ../app/views/foreman_salt/salt_modules/_form.html.erb:4
+#: ../app/views/foreman_salt/salt_modules/_host_tab.html.erb:1
+#: ../app/views/foreman_salt/salt_modules/index.html.erb:1
 msgid "Salt States"
 msgstr "Salt States"
 
-#: ../app/views/foreman_salt/salt_modules/_form.html.erb:5 ../app/views/foreman_salt/salt_modules/_form.html.erb:14 ../app/views/foreman_salt/salt_modules/index.html.erb:10
+#: ../app/views/foreman_salt/salt_modules/_form.html.erb:5
+#: ../app/views/foreman_salt/salt_modules/_form.html.erb:14
+#: ../app/views/foreman_salt/salt_modules/index.html.erb:10
 msgid "Environments"
 msgstr "Umgebungen"
 
@@ -507,7 +533,7 @@ msgstr ""
 
 #: ../app/views/foreman_salt/salt_modules/import.html.erb:21
 msgid "Check/Uncheck All"
-msgstr ""
+msgstr "Alle auswählen/abwählen"
 
 #: ../app/views/foreman_salt/salt_modules/import.html.erb:22
 msgid "Environment"
@@ -525,13 +551,14 @@ msgstr "Abbrechen"
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: ../app/views/foreman_salt/salt_modules/index.html.erb:4 ../app/views/foreman_salt/salt_modules/new.html.erb:1
+#: ../app/views/foreman_salt/salt_modules/index.html.erb:4
+#: ../app/views/foreman_salt/salt_modules/new.html.erb:1
 msgid "New Salt State"
 msgstr "Neuen Salt State"
 
 #: ../app/views/foreman_salt/salt_modules/index.html.erb:9
 msgid "SaltModule|Name"
-msgstr ""
+msgstr "Name"
 
 #: ../app/views/foreman_salt/salt_modules/index.html.erb:26
 msgid "Edit"
@@ -543,7 +570,7 @@ msgstr ""
 
 #: ../app/views/hosts/select_multiple_salt_environment.html.erb:5
 msgid "*Clear environment*"
-msgstr ""
+msgstr "*Lösche Umgebung*"
 
 #: ../lib/foreman_salt/plugin.rb:152
 msgid "Run Salt state.highstate"
@@ -551,12 +578,12 @@ msgstr ""
 
 #: action_names.rb:2
 msgid "Action with sub plans"
-msgstr ""
+msgstr "Aktion mit Unterplänen"
 
 #: action_names.rb:3
 msgid "Import facts"
-msgstr ""
+msgstr "Fakten importieren"
 
 #: action_names.rb:4
 msgid "Import Puppet classes"
-msgstr ""
+msgstr "Puppet-Klassen importieren"

data/locale/en/foreman_salt.edit.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_salt 1.0.0\n"
+"Project-Id-Version: foreman_salt 13.1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-07-22 19:13+0000\n"
 "PO-Revision-Date: 2019-04-25 22:19+0000\n"

data/test/factories/foreman_salt_factories.rb

@@ -6,6 +6,12 @@ FactoryBot.define do
   factory :salt_environment, :class => 'ForemanSalt::SaltEnvironment' do
     sequence(:name) { |n| "environment#{n}" }
   end
+
+  factory :salt_variable, :class => 'ForemanSalt::SaltVariable' do
+    sequence(:key) { |n| "salt_variable_#{n}" }
+    sequence(:default_value) { |n| "default_value_#{n}" }
+    salt_module
+  end
 end
 
 FactoryBot.modify do

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

@@ -35,7 +35,7 @@ class ::ForemanSalt::Api::V2::SaltStatesControllerTest < ActionController::TestC
       @states = { 'env1' => %w(state1 state2 state3),
                   'env2' => %w(state1 state2) }
 
-      ::ProxyAPI::Salt.any_instance.stubs(:states_list).returns(@states)
+      ProxyAPI::Salt.any_instance.stubs(:states_list).returns(@states)
     end
 
     test 'should import' do

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

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'test_plugin_helper'
+
+module ForemanSalt
+  module Api
+    module V2
+      # Tests for the controller to CRUD Salt Variables
+      class SaltVariablesControllerTest < ActionController::TestCase
+        setup do
+          @variable = FactoryBot.create(:salt_variable)
+        end
+
+        test 'should get index' do
+          get :index, :session => set_session_user
+          response = JSON.parse(@response.body)
+          assert_not_empty response['results']
+          assert_response :success
+        end
+
+        test 'should destroy' do
+          delete :destroy, :params => { :id => @variable.id }, :session => set_session_user
+          assert_response :ok
+          assert_not SaltVariable.exists?(@variable.id)
+        end
+
+        test 'should create' do
+          params = { :key => 'test name', :salt_state_id => FactoryBot.create(:salt_module).id }
+          post :create, :params => params, :session => set_session_user
+          assert_response :success
+        end
+      end
+    end
+  end
+end

data/test/functional/minions_controller_test.rb

@@ -2,17 +2,77 @@ require 'test_plugin_helper'
 
 module ForemanSalt
   class MinionsControllerTest < ActionController::TestCase
-    test 'salt smart proxy should get salt external node' do
+    setup do
       User.current = User.anonymous_admin
+      Setting::Salt.load_defaults
       Setting[:restrict_registered_smart_proxies] = true
       Setting[:require_ssl_smart_proxies] = false
 
-      proxy = FactoryBot.create :smart_proxy, :with_salt_feature
-      Resolv.any_instance.stubs(:getnames).returns([proxy.to_s])
+      @proxy = FactoryBot.create(:smart_proxy, :with_salt_feature)
+      Resolv.any_instance.stubs(:getnames).returns([@proxy.to_s])
+
+      @host = FactoryBot.create(:host, salt_environment: FactoryBot.create(:salt_environment), salt_proxy: @proxy)
+      FactoryBot.create(:host_parameter, name: "parameter1", value: "different", host: @host)
+    end
+
+    test 'salt smart proxy should get salt external node' do
+      get :node, params: { :id => @host, :format => 'yml' }
+      assert_response :success
+
+      res = YAML.safe_load(@response.body)
+      assert_equal res['parameters']['parameter1'], 'different'
+    end
+
+    test 'setting salt_namespace_pillars is considered' do
+      Setting['salt_namespace_pillars'] = true
+
+      get :node, params: { :id => @host, :format => 'yml' }
+      assert_response :success
+
+      res = YAML.safe_load(@response.body)
+      assert_equal res['parameters']['foreman']['parameter1'], 'different'
+    end
+
+    test 'salt variable is available' do
+      @var = FactoryBot.create(:salt_variable, override: true)
+      @var.salt_module.salt_environments << @host.salt_environment
+      @host.salt_modules << @var.salt_module
 
-      host = FactoryBot.create :host
-      get :node, params: { :id => host, :format => 'yml' }
+      get :node, params: { :id => @host, :format => 'yml' }
       assert_response :success
+
+      res = YAML.safe_load(@response.body)
+      assert_equal res['parameters'][@var.key], @var.value
+    end
+
+    test 'salt variable overrides host parameter' do
+      @var = FactoryBot.create(:salt_variable, key: 'parameter1', override: true)
+      @var.salt_module.salt_environments << @host.salt_environment
+      @host.salt_modules << @var.salt_module
+
+      get :node, params: { :id => @host, :format => 'yml' }
+      assert_response :success
+
+      res = YAML.safe_load(@response.body)
+      assert_equal res['parameters']['parameter1'], @var.value
+    end
+
+    test 'salt variable matching host' do
+      @var = FactoryBot.create(:salt_variable, key: 'parameter1', override: true)
+      # rubocop:disable Lint/UselessAssignment
+      value1 = LookupValue.create(:lookup_key => @var, :match => "os=debian", :value => "aaa")
+      value2 = LookupValue.create(:lookup_key => @var, :match => "fqdn=#{@host.fqdn}", :value => "myval")
+      value3 = LookupValue.create(:lookup_key => @var, :match => "hostgroup=Unusual", :value => "bbbb")
+      # rubocop:enable Lint/UselessAssignment
+
+      @var.salt_module.salt_environments << @host.salt_environment
+      @host.salt_modules << @var.salt_module
+
+      get :node, params: { :id => @host, :format => 'yml' }
+      assert_response :success
+
+      res = YAML.safe_load(@response.body)
+      assert_equal res['parameters']['parameter1'], value2.value
     end
   end
 end

data/test/functional/salt_modules_controller_test.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'test_plugin_helper'
+# functional tests for SaltModulesController
+module ForemanSalt
+  class SaltModulesControllerTest < ActionController::TestCase
+    setup do
+      @model = FactoryBot.create(:salt_module)
+    end
+
+    basic_index_test "salt_modules"
+    basic_new_test
+    basic_edit_test "salt_module"
+
+    test 'should destroy module' do
+      assert_difference('SaltModule.count', -1) do
+        delete :destroy, :params => { :id => @model.id }, :session => set_session_user
+      end
+      assert_redirected_to salt_modules_url
+    end
+  end
+end

data/test/functional/salt_variables_controller_test.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'test_plugin_helper'
+module ForemanSalt
+  # functional tests for SaltVariablesController
+  class SaltVariablesControllerTest < ActionController::TestCase
+    setup do
+      @model = FactoryBot.create(:salt_variable)
+      @proxy = FactoryBot.create(:smart_proxy, :with_salt_feature)
+    end
+
+    basic_index_test "salt_variables"
+    basic_new_test
+    basic_edit_test "salt_variable"
+    basic_pagination_per_page_test
+    basic_pagination_rendered_test
+
+    test 'should destroy variable' do
+      assert_difference('SaltVariable.count', -1) do
+        delete :destroy, :params => { :id => @model.id }, :session => set_session_user
+      end
+      assert_redirected_to salt_variables_url
+    end
+
+    test 'should create salt variable' do
+      params = { :foreman_salt_salt_variable => { :key => 'great name', :salt_module_id => FactoryBot.create(:salt_module).id } }
+      assert_difference('SaltVariable.count', 1) do
+        post :create, :params => params, :session => set_session_user
+      end
+      assert_redirected_to salt_variables_url
+    end
+  end
+end

data/test/integration/salt_autosign_test.rb

@@ -6,7 +6,7 @@ module ForemanSalt
     setup do
       @proxy = FactoryBot.create :smart_proxy, :with_salt_feature
 
-      ::ProxyAPI::Salt.any_instance.stubs(:autosign_list).returns(
+      ProxyAPI::Salt.any_instance.stubs(:autosign_list).returns(
         ['foo.example.com']
       )
     end

data/test/integration/salt_keys_test.rb

@@ -6,7 +6,7 @@ module ForemanSalt
     setup do
       @proxy = FactoryBot.create :smart_proxy, :with_salt_feature
 
-      ::ProxyAPI::Salt.any_instance.stubs(:key_list).returns(
+      ProxyAPI::Salt.any_instance.stubs(:key_list).returns(
         'saltstack.example.com' => { 'state' => 'accepted', 'fingerprint' => '98:c2:63:c1:57:59:bc:bd:f1:ef:5a:38:b2:e9:71:c0' },
         'saltclient01.example.com' => { 'state' => 'unaccepted', 'fingerprint' => '98:c2:63:c1:57:59:bc:bd:f1:ef:5a:38:b2:e9:71:c1' },
         'saltclient02.example.com' => { 'state' => 'unaccepted', 'fingerprint' => '98:c2:63:c1:57:59:bc:bd:f1:ef:5a:38:b2:e9:71:c2' },
@@ -39,12 +39,12 @@ module ForemanSalt
     end
 
     test 'has accept link' do
-      ::ProxyAPI::Salt.any_instance.stubs(:key_accept).returns(true)
+      ProxyAPI::Salt.any_instance.stubs(:key_accept).returns(true)
       assert_row_button(smart_proxy_salt_keys_path(:smart_proxy_id => @proxy.id), 'saltclient01.example.com', 'Accept', true)
     end
 
     test 'has reject link' do
-      ::ProxyAPI::Salt.any_instance.stubs(:key_reject).returns(true)
+      ProxyAPI::Salt.any_instance.stubs(:key_reject).returns(true)
       assert_row_button(smart_proxy_salt_keys_path(:smart_proxy_id => @proxy.id), 'saltclient01.example.com', 'Reject', true)
     end
   end

data/test/integration/salt_module_test.rb

@@ -9,7 +9,7 @@ module ForemanSalt
       states = %w(state1 state2 state3 state4)
       state_list = { 'env1' => states, 'env2' => states }
 
-      ::ProxyAPI::Salt.any_instance.stubs(:states_list).returns(state_list)
+      ProxyAPI::Salt.any_instance.stubs(:states_list).returns(state_list)
     end
 
     test 'index page' do