foreman_puppet 0.0.2 → 0.1.0

data/locale/foreman_puppet.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foreman_puppet 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-02 04:11+0100\n"
-"PO-Revision-Date: 2021-02-02 04:11+0100\n"
+"POT-Creation-Date: 2021-02-03 18:00+0100\n"
+"PO-Revision-Date: 2021-02-03 18:00+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -1071,6 +1071,22 @@ msgstr ""
 msgid "Loading parameters..."
 msgstr ""
 
+#: action_names.rb:2
+msgid "Action with sub plans"
+msgstr ""
+
+#: action_names.rb:3
+msgid "Import facts"
+msgstr ""
+
+#: action_names.rb:4
+msgid "Import Puppet classes"
+msgstr ""
+
+#: action_names.rb:5
+msgid "Remote action:"
+msgstr ""
+
 #: gemspec.rb:2
-msgid "TODO: Description of ForemanPuppetEnc."
+msgid "Allow assigning Puppet environmets and classes to the Foreman Hosts."
 msgstr ""

data/test/controllers/foreman_puppet/api/v2/environments_controller_test.rb

@@ -335,7 +335,7 @@ module ForemanPuppet
           # and should result in a disk_tree of {"env1" => ["a", "b", "c"],"env2" => ["a", "b", "c"]}
           envs = HashWithIndifferentAccess.new(env1: %w[a b c], env2: %w[a b c])
           pcs = [HashWithIndifferentAccess.new('a' => { 'name' => 'a', 'module' => nil, 'params' => { 'key' => 'special' } })]
-          classes = Hash[pcs.map { |k| [k.keys.first, Foreman::ImporterPuppetclass.new(k.values.first)] }]
+          classes = pcs.map { |k| [k.keys.first, Foreman::ImporterPuppetclass.new(k.values.first)] }.to_h
           Environment.expects(:puppetEnvs).returns(envs).at_least(0)
           ProxyAPI::Puppet.any_instance.stubs(:environments).returns(%w[env1 env2])
           ProxyAPI::Puppet.any_instance.stubs(:classes).returns(classes)

data/test/controllers/foreman_puppet/api/v2/hosts_controller_test.rb

@@ -92,7 +92,7 @@ module ForemanPuppet
             assert_response :success
             response = ActiveSupport::JSON.decode(@response.body)
             puppet_class = response['data']['classes'].keys
-            assert_equal host.puppetclasses.map(&:name), puppet_class
+            assert_equal host.puppet.puppetclasses.map(&:name), puppet_class
           end
         end
       end

data/test/controllers/foreman_puppet/api/v2/provisioning_templates_controller_test.rb

@@ -0,0 +1,32 @@
+require 'test_puppet_helper'
+
+module ForemanPuppet
+  module Api
+    module V2
+      class ProvisioningTemplatesControllerTest < ActionController::TestCase
+        tests ::Api::V2::ProvisioningTemplatesController
+
+        let(:environment) { FactoryBot.create(:environment) }
+
+        test 'should create provisioning template with template_combinations' do
+          name = RFauxFactory.gen_alpha
+          valid_attrs = {
+            name: name, template: RFauxFactory.gen_alpha, template_kind_id: template_kinds(:ipxe).id,
+            template_combinations_attributes: [
+              { hostgroup_id: hostgroups(:common).id, environment_id: environment.id },
+            ]
+          }
+          post :create, params: { provisioning_template: valid_attrs }
+          assert_response :created
+          response = ActiveSupport::JSON.decode(@response.body)
+          assert response.key?('id')
+          assert response.key?('template_combinations')
+          template_combinations = response['template_combinations']
+          assert_equal 1, template_combinations.length
+          template_combination = TemplateCombination.find(template_combinations[0]['id'])
+          assert_equal response['id'], template_combination.provisioning_template_id
+        end
+      end
+    end
+  end
+end

data/test/controllers/foreman_puppet/environments_controller_test.rb

@@ -215,7 +215,7 @@ module ForemanPuppet
         # and should result in a disk_tree of {"env1" => ["a", "b", "c"],"env2" => ["a", "b", "c"]}
         envs = HashWithIndifferentAccess.new(env1: %w[a b c], env2: %w[a b c])
         pcs = [HashWithIndifferentAccess.new('a' => { 'name' => 'a', 'module' => '', 'params' => {} })]
-        classes = Hash[pcs.map { |k| [k.keys.first, Foreman::ImporterPuppetclass.new(k.values.first)] }]
+        classes = pcs.map { |k| [k.keys.first, Foreman::ImporterPuppetclass.new(k.values.first)] }.to_h
         Environment.expects(:puppetEnvs).returns(envs).at_least(0)
         ProxyAPI::Puppet.any_instance.stubs(:environments).returns(%w[env1 env2])
         ProxyAPI::Puppet.any_instance.stubs(:classes).returns(classes)

data/test/factories/foreman_puppet_factories.rb

@@ -105,11 +105,14 @@ FactoryBot.define do
         evaluator.parameter_count.times do
           evaluator.environments.each do |env|
             FactoryBot.create :puppetclass_lookup_key, override: false, puppetclass: pc, environment: env
+            # for Host#managed validation, once extracted_from_core? we can remove
+            env.reload
           end
         end
       else
         evaluator.environments.each do |env|
           FactoryBot.create :environment_class, puppetclass: pc, environment: env unless env.nil?
+          env.reload
         end
       end
     end

data/test/integration/foreman_puppet/puppetclass_js_test.rb

@@ -14,6 +14,7 @@ module ForemanPuppet
       visit puppetclasses_path
       click_link 'vim'
       assert page.has_no_link? 'Common'
+      find(:xpath, "//a[@title='Select All']").hover
       find(:xpath, "//a[@data-original-title='Select All']").click
       assert_submit_button(puppetclasses_path)
       assert page.has_link? 'vim'
@@ -24,6 +25,7 @@ module ForemanPuppet
       smart_class_parameter_long = FactoryBot.create(:puppetclass_lookup_key, puppetclass: puppetclass, variable: 'a' * 50)
       visit edit_puppetclass_path(puppetclass)
       click_link 'Smart Class Parameter'
+      page.find("#pill_#{smart_class_parameter_long.id}-#{smart_class_parameter_long.key}").hover
       assert_equal smart_class_parameter_long.key, page.find("#pill_#{smart_class_parameter_long.id}-#{smart_class_parameter_long.key}")['data-original-title']
     end
 
@@ -31,6 +33,7 @@ module ForemanPuppet
       smart_class_parameter_short = FactoryBot.create(:puppetclass_lookup_key, puppetclass: puppetclass, variable: 'a' * 40)
       visit edit_puppetclass_path(puppetclass)
       click_link 'Smart Class Parameter'
+      page.find("#pill_#{smart_class_parameter_short.id}-#{smart_class_parameter_short.key}").hover
       assert_empty page.find("#pill_#{smart_class_parameter_short.id}-#{smart_class_parameter_short.key}")['data-original-title']
     end
   end

data/test/models/foreman_puppet/host_puppet_facet_test.rb

@@ -1,13 +1,46 @@
 require 'test_puppet_helper'
 
 module ForemanPuppet
-  class HostgroupPuppetFacetTest < ActiveSupport::TestCase
+  class HostPuppetFacetTest < ActiveSupport::TestCase
     let(:environment) { FactoryBot.create(:environment) }
     let(:diff_environment) { FactoryBot.create(:environment) }
     let(:puppetclass_both) { FactoryBot.create(:puppetclass, environments: [environment, diff_environment]) }
     let(:config_group) { FactoryBot.create(:config_group, :with_puppetclass, class_environments: [environment]) }
     let(:config_group_diff_env) { FactoryBot.create(:config_group, :with_puppetclass, class_environments: [diff_environment]) }
 
+    describe '.populate_fields_from_facts' do
+      test 'populate environment without any puppet info' do
+        h = FactoryBot.create(:host)
+        parser = stub(environment: environment)
+        HostPuppetFacet.populate_fields_from_facts(h, parser, 'puppet', FactoryBot.create(:puppet_smart_proxy))
+        assert_equal environment, h.puppet.environment
+      end
+
+      test 'changes puppet environment when setting says to do so' do
+        Setting[:update_environment_from_facts] = true
+        h = FactoryBot.create(:host, :with_puppet_enc)
+        parser = stub(environment: environment)
+        HostPuppetFacet.populate_fields_from_facts(h, parser, 'puppet', FactoryBot.create(:puppet_smart_proxy))
+        assert_equal environment, h.puppet.environment
+      end
+
+      test 'keep puppet environment when parser has empty environment' do
+        Setting[:update_environment_from_facts] = true
+        h = FactoryBot.create(:host, :with_puppet_enc)
+        parser = stub(environment: nil)
+        HostPuppetFacet.populate_fields_from_facts(h, parser, 'puppet', FactoryBot.create(:puppet_smart_proxy))
+        assert_not_nil h.puppet.environment
+      end
+
+      test 'do not update puppet environment when setting says not to' do
+        Setting[:update_environment_from_facts] = false
+        h = FactoryBot.create(:host, :with_puppet_enc)
+        parser = stub(environment: environment)
+        HostPuppetFacet.populate_fields_from_facts(h, parser, 'puppet', FactoryBot.create(:puppet_smart_proxy))
+        assert_not_equal environment, h.puppet.environment
+      end
+    end
+
     describe '#classes_in_groups' do
       test 'classes_in_groups should return the puppetclasses of a config group only if it is in host environment' do
         host = FactoryBot.create(:host, :with_puppet_enc,

data/test/models/foreman_puppet/host_test.rb

@@ -241,7 +241,7 @@ module ForemanPuppet
 
       host.puppet.environment = env_with_other_tax
       assert_not host.valid?
-      assert_match(/is not assigned/, host.errors[:environment_id].first)
+      assert_match(/is not assigned/, host.errors['puppet.environment_id'].first)
     end
 
     test 'when saving a host, require puppet environment if puppet master is set' do

data/test/models/foreman_puppet/provisioning_template_test.rb

@@ -77,47 +77,47 @@ module ForemanPuppet
       test 'find_template finds a matching template with hg and env' do
         assert_equal @ct1.name,
           ProvisioningTemplate.find_template({ kind: @tk.name,
-                                               operatingsystem_id: @os1.id,
-                                               hostgroup_id: @hg1.id,
-                                               environment_id: @ev1.id }).name
+            operatingsystem_id: @os1.id,
+            hostgroup_id: @hg1.id,
+            environment_id: @ev1.id }).name
       end
 
       test 'find_template finds a matching template with hg only' do
         assert_equal @ct2.name,
           ProvisioningTemplate.find_template({ kind: @tk.name,
-                                               operatingsystem_id: @os1.id,
-                                               hostgroup_id: @hg1.id }).name
+            operatingsystem_id: @os1.id,
+            hostgroup_id: @hg1.id }).name
       end
 
       test 'find_template finds a matching template with hg and mismatched env' do
         assert_equal @ct2.name,
           ProvisioningTemplate.find_template({ kind: @tk.name,
-                                               operatingsystem_id: @os1.id,
-                                               hostgroup_id: @hg1.id,
-                                               environment_id: @ev3.id }).name
+            operatingsystem_id: @os1.id,
+            hostgroup_id: @hg1.id,
+            environment_id: @ev3.id }).name
       end
 
       test 'find_template finds a matching template with env only' do
         assert_equal @ct3.name,
           ProvisioningTemplate.find_template({ kind: @tk.name,
-                                               operatingsystem_id: @os1.id,
-                                               environment_id: @ev1.id }).name
+            operatingsystem_id: @os1.id,
+            environment_id: @ev1.id }).name
       end
 
       test 'find_template finds a matching template with env and mismatched hg' do
         assert_equal @ct3.name,
           ProvisioningTemplate.find_template({ kind: @tk.name,
-                                               operatingsystem_id: @os1.id,
-                                               hostgroup_id: @hg3.id,
-                                               environment_id: @ev1.id }).name
+            operatingsystem_id: @os1.id,
+            hostgroup_id: @hg3.id,
+            environment_id: @ev1.id }).name
       end
 
       test 'find_template finds the default template when hg and env do not match' do
         assert_equal @ctd.name,
           ProvisioningTemplate.find_template({ kind: @tk.name,
-                                               operatingsystem_id: @os1.id,
-                                               hostgroup_id: @hg3.id,
-                                               environment_id: @ev3.id }).name
+            operatingsystem_id: @os1.id,
+            hostgroup_id: @hg3.id,
+            environment_id: @ev3.id }).name
       end
     end
   end

data/test/models/foreman_puppet/report_test.rb

@@ -0,0 +1,21 @@
+require 'test_puppet_helper'
+
+module ForemanPuppet
+  class TestReport < ::Report
+  end
+
+  class ReportTest < ActiveSupport::TestCase
+    test 'Inherited children can search by environment' do
+      assert_nothing_raised do
+        TestReport.search_for('environment = blah')
+      end
+    end
+
+    # to include the environment search
+    test 'Inherited children can search' do
+      assert_nothing_raised do
+        TestReport.search_for('blah')
+      end
+    end
+  end
+end

data/test/models/foreman_puppet/user_test.rb

@@ -0,0 +1,29 @@
+require 'test_puppet_helper'
+
+module ForemanPuppet
+  class UserTest < ActiveSupport::TestCase
+    describe '#visible_environments' do
+      let(:environment) { FactoryBot.create(:environment) }
+      setup { environment }
+
+      # These will need refactor when the environment fixtures will be gone
+      test 'should show the list of environments visible as admin user' do
+        # Admin user sees all environments - including the ones without taxonomies
+        env_names = %w[production global_puppetmaster testing] + [environment.name]
+        assert_equal env_names.sort, ::User.current.visible_environments.sort
+      end
+
+      test 'should show the list of environments visible as inherited admin user' do
+        ::User.current = FactoryBot.create(:user, usergroups: [FactoryBot.create(:usergroup, admin: true)]).reload
+        env_names = %w[production global_puppetmaster testing] + [environment.name]
+        assert_same_elements env_names, ::User.current.visible_environments
+      end
+
+      test 'should show the list of environments visible as non-admin user' do
+        # Non-admin user only sees environments in a taxonomy at least
+        setup_user 'view', 'environments'
+        assert_equal [environment.name], ::User.current.visible_environments
+      end
+    end
+  end
+end

data/test/services/foreman_puppet/host_info_providers/puppet_info_test.rb

@@ -37,9 +37,9 @@ module ForemanPuppet
 
       value = as_admin do
         LookupValue.create! lookup_key_id: puppetclass_lookup_key.id,
-                            match: "organization=#{taxonomies(:organization1)},location=#{taxonomies(:location1)}",
-                            value: 'test',
-                            omit: false
+          match: "organization=#{taxonomies(:organization1)},location=#{taxonomies(:location1)}",
+          value: 'test',
+          omit: false
       end
       enc = HostInfoProviders::PuppetInfo.new(@host).puppetclass_parameters
 
@@ -78,19 +78,17 @@ module ForemanPuppet
       host = FactoryBot.build_stubbed(:host, :with_puppet_enc, environment: environment, puppetclasses: [puppetclass])
       Classification::MatchesGenerator.any_instance.expects(:attr_to_value).with('comment').returns('override')
 
-      assert_equal(
-        {
-          lkey.id => {
-            lkey.key => {
-              value: 'overridden value',
-              element: 'comment',
-              element_name: 'override',
-              managed: false,
-            },
+      expected = {
+        lkey.id => {
+          lkey.key => {
+            value: 'overridden value',
+            element: 'comment',
+            element_name: 'override',
+            managed: false,
           },
         },
-        Classification::ValuesHashQuery.values_hash(host, LookupKey.where(id: [lkey])).raw
-      )
+      }
+      assert_equal(expected, Classification::ValuesHashQuery.values_hash(host, LookupKey.where(id: [lkey])).raw)
 
       Classification::MatchesGenerator.any_instance.unstub(:attr_to_value)
     end
@@ -108,9 +106,9 @@ module ForemanPuppet
         puppetclass: puppetclass, path: "location\ncomment")
       as_admin do
         LookupValue.create! lookup_key_id: lkey.id,
-                            match: "location=#{taxonomies(:location1)}",
-                            value: 'test',
-                            omit: true
+          match: "location=#{taxonomies(:location1)}",
+          value: 'test',
+          omit: true
       end
 
       enc = HostInfoProviders::PuppetInfo.new(@host).puppetclass_parameters
@@ -124,9 +122,9 @@ module ForemanPuppet
                                                                         path: "location\ncomment")
       lvalue = as_admin do
         LookupValue.create! lookup_key_id: lkey.id,
-                            match: "location=#{taxonomies(:location1)}",
-                            value: 'test',
-                            omit: false
+          match: "location=#{taxonomies(:location1)}",
+          value: 'test',
+          omit: false
       end
 
       enc = HostInfoProviders::PuppetInfo.new(@host).puppetclass_parameters
@@ -142,22 +140,22 @@ module ForemanPuppet
 
       as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "location=#{taxonomies(:location1)}",
-                            value: { example: { a: 'test' } },
-                            omit: true
+          match: "location=#{taxonomies(:location1)}",
+          value: { example: { a: 'test' } },
+          omit: true
       end
       as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "organization=#{taxonomies(:organization1)}",
-                            value: { example: { b: 'test2' } },
-                            omit: true
+          match: "organization=#{taxonomies(:organization1)}",
+          value: { example: { b: 'test2' } },
+          omit: true
       end
 
       as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "os=#{operatingsystems(:redhat)}",
-                            value: { example: { a: 'test3' } },
-                            omit: true
+          match: "os=#{operatingsystems(:redhat)}",
+          value: { example: { a: 'test3' } },
+          omit: true
       end
 
       enc = HostInfoProviders::PuppetInfo.new(@host).puppetclass_parameters
@@ -184,13 +182,13 @@ module ForemanPuppet
 
       as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "hostgroup=#{parent_hostgroup}",
-                            value: ['parent'],
-                            omit: false
+          match: "hostgroup=#{parent_hostgroup}",
+          value: ['parent'],
+          omit: false
         LookupValue.create! lookup_key_id: key.id,
-                            match: "organization=#{taxonomies(:organization1)}",
-                            value: ['org'],
-                            omit: false
+          match: "organization=#{taxonomies(:organization1)}",
+          value: ['org'],
+          omit: false
       end
 
       enc = HostInfoProviders::PuppetInfo.new(host).puppetclass_parameters
@@ -218,13 +216,13 @@ module ForemanPuppet
 
       as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "organization=#{parent_org}",
-                            value: ['parent'],
-                            omit: false
+          match: "organization=#{parent_org}",
+          value: ['parent'],
+          omit: false
         LookupValue.create! lookup_key_id: key.id,
-                            match: "location=#{taxonomies(:location1)}",
-                            value: ['loc'],
-                            omit: false
+          match: "location=#{taxonomies(:location1)}",
+          value: ['loc'],
+          omit: false
       end
 
       enc = HostInfoProviders::PuppetInfo.new(host).puppetclass_parameters
@@ -252,13 +250,13 @@ module ForemanPuppet
 
       as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "location=#{parent_loc}",
-                            value: ['parent'],
-                            omit: false
+          match: "location=#{parent_loc}",
+          value: ['parent'],
+          omit: false
         LookupValue.create! lookup_key_id: key.id,
-                            match: "organization=#{taxonomies(:organization1)}",
-                            value: ['org'],
-                            omit: false
+          match: "organization=#{taxonomies(:organization1)}",
+          value: ['org'],
+          omit: false
       end
 
       enc = HostInfoProviders::PuppetInfo.new(host).puppetclass_parameters
@@ -285,17 +283,17 @@ module ForemanPuppet
 
       as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "hostgroup=#{parent_hostgroup}",
-                            value: ['parent'],
-                            omit: false
+          match: "hostgroup=#{parent_hostgroup}",
+          value: ['parent'],
+          omit: false
         LookupValue.create! lookup_key_id: key.id,
-                            match: "hostgroup=#{child_hostgroup}",
-                            value: ['child'],
-                            omit: false
+          match: "hostgroup=#{child_hostgroup}",
+          value: ['child'],
+          omit: false
         LookupValue.create! lookup_key_id: key.id,
-                            match: "organization=#{taxonomies(:organization1)}",
-                            value: ['org'],
-                            omit: false
+          match: "organization=#{taxonomies(:organization1)}",
+          value: ['org'],
+          omit: false
       end
 
       enc = HostInfoProviders::PuppetInfo.new(host).puppetclass_parameters
@@ -323,17 +321,17 @@ module ForemanPuppet
 
       as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "organization=#{parent_org}",
-                            value: ['parent'],
-                            omit: false
+          match: "organization=#{parent_org}",
+          value: ['parent'],
+          omit: false
         LookupValue.create! lookup_key_id: key.id,
-                            match: "organization=#{child_org}",
-                            value: ['child'],
-                            omit: false
+          match: "organization=#{child_org}",
+          value: ['child'],
+          omit: false
         LookupValue.create! lookup_key_id: key.id,
-                            match: "location=#{taxonomies(:location1)}",
-                            value: ['loc'],
-                            omit: false
+          match: "location=#{taxonomies(:location1)}",
+          value: ['loc'],
+          omit: false
       end
 
       enc = HostInfoProviders::PuppetInfo.new(host).puppetclass_parameters
@@ -361,17 +359,17 @@ module ForemanPuppet
 
       as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "location=#{parent_loc}",
-                            value: ['parent'],
-                            omit: false
+          match: "location=#{parent_loc}",
+          value: ['parent'],
+          omit: false
         LookupValue.create! lookup_key_id: key.id,
-                            match: "location=#{child_loc}",
-                            value: ['child'],
-                            omit: false
+          match: "location=#{child_loc}",
+          value: ['child'],
+          omit: false
         LookupValue.create! lookup_key_id: key.id,
-                            match: "organization=#{taxonomies(:organization1)}",
-                            value: ['org'],
-                            omit: false
+          match: "organization=#{taxonomies(:organization1)}",
+          value: ['org'],
+          omit: false
       end
 
       enc = HostInfoProviders::PuppetInfo.new(host).puppetclass_parameters
@@ -398,17 +396,17 @@ module ForemanPuppet
 
       value2 = as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "hostgroup=#{parent_hostgroup}",
-                            value: 'parent',
-                            omit: false
+          match: "hostgroup=#{parent_hostgroup}",
+          value: 'parent',
+          omit: false
         LookupValue.create! lookup_key_id: key.id,
-                            match: "hostgroup=#{child_hostgroup}",
-                            value: 'child',
-                            omit: false
+          match: "hostgroup=#{child_hostgroup}",
+          value: 'child',
+          omit: false
         LookupValue.create! lookup_key_id: key.id,
-                            match: "organization=#{taxonomies(:organization1)}",
-                            value: 'org',
-                            omit: false
+          match: "organization=#{taxonomies(:organization1)}",
+          value: 'org',
+          omit: false
       end
 
       enc = HostInfoProviders::PuppetInfo.new(host).puppetclass_parameters
@@ -434,17 +432,17 @@ module ForemanPuppet
 
       value2 = as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "organization=#{parent_org}",
-                            value: 'parent',
-                            omit: false
+          match: "organization=#{parent_org}",
+          value: 'parent',
+          omit: false
         LookupValue.create! lookup_key_id: key.id,
-                            match: "organization=#{child_org}",
-                            value: 'child',
-                            omit: false
+          match: "organization=#{child_org}",
+          value: 'child',
+          omit: false
         LookupValue.create! lookup_key_id: key.id,
-                            match: "location=#{taxonomies(:location1)}",
-                            value: 'loc',
-                            omit: false
+          match: "location=#{taxonomies(:location1)}",
+          value: 'loc',
+          omit: false
       end
 
       enc = HostInfoProviders::PuppetInfo.new(host).puppetclass_parameters
@@ -470,17 +468,17 @@ module ForemanPuppet
 
       value2 = as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "location=#{parent_loc}",
-                            value: 'parent',
-                            omit: false
+          match: "location=#{parent_loc}",
+          value: 'parent',
+          omit: false
         LookupValue.create! lookup_key_id: key.id,
-                            match: "location=#{child_loc}",
-                            value: 'child',
-                            omit: false
+          match: "location=#{child_loc}",
+          value: 'child',
+          omit: false
         LookupValue.create! lookup_key_id: key.id,
-                            match: "organization=#{taxonomies(:organization1)}",
-                            value: 'org',
-                            omit: false
+          match: "organization=#{taxonomies(:organization1)}",
+          value: 'org',
+          omit: false
       end
 
       enc = HostInfoProviders::PuppetInfo.new(host).puppetclass_parameters
@@ -506,17 +504,17 @@ module ForemanPuppet
 
       value2 = as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "hostgroup=#{parent_hostgroup}",
-                            value: 'parent',
-                            omit: false
+          match: "hostgroup=#{parent_hostgroup}",
+          value: 'parent',
+          omit: false
         LookupValue.create! lookup_key_id: key.id,
-                            match: "location=#{taxonomies(:location1)}",
-                            value: 'loc',
-                            omit: true
+          match: "location=#{taxonomies(:location1)}",
+          value: 'loc',
+          omit: true
         LookupValue.create! lookup_key_id: key.id,
-                            match: "hostgroup=#{child_hostgroup}",
-                            value: 'child',
-                            omit: false
+          match: "hostgroup=#{child_hostgroup}",
+          value: 'child',
+          omit: false
       end
 
       enc = HostInfoProviders::PuppetInfo.new(host).puppetclass_parameters
@@ -544,17 +542,17 @@ module ForemanPuppet
 
       value2 = as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "organization=#{parent_org}",
-                            value: 'parent',
-                            omit: false
+          match: "organization=#{parent_org}",
+          value: 'parent',
+          omit: false
         LookupValue.create! lookup_key_id: key.id,
-                            match: "location=#{taxonomies(:location1)}",
-                            value: 'loc',
-                            omit: true
+          match: "location=#{taxonomies(:location1)}",
+          value: 'loc',
+          omit: true
         LookupValue.create! lookup_key_id: key.id,
-                            match: "organization=#{child_org}",
-                            value: 'child',
-                            omit: false
+          match: "organization=#{child_org}",
+          value: 'child',
+          omit: false
       end
 
       enc = HostInfoProviders::PuppetInfo.new(host).puppetclass_parameters
@@ -582,17 +580,17 @@ module ForemanPuppet
 
       value2 = as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "location=#{parent_loc}",
-                            value: 'parent',
-                            omit: false
+          match: "location=#{parent_loc}",
+          value: 'parent',
+          omit: false
         LookupValue.create! lookup_key_id: key.id,
-                            match: "organization=#{taxonomies(:organization1)}",
-                            value: 'org',
-                            omit: true
+          match: "organization=#{taxonomies(:organization1)}",
+          value: 'org',
+          omit: true
         LookupValue.create! lookup_key_id: key.id,
-                            match: "location=#{child_loc}",
-                            value: 'child',
-                            omit: false
+          match: "location=#{child_loc}",
+          value: 'child',
+          omit: false
       end
 
       enc = HostInfoProviders::PuppetInfo.new(host).puppetclass_parameters
@@ -608,13 +606,13 @@ module ForemanPuppet
 
       value2 = as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "location=#{taxonomies(:location1)}",
-                            value: 'test_incorrect',
-                            omit: false
+          match: "location=#{taxonomies(:location1)}",
+          value: 'test_incorrect',
+          omit: false
         LookupValue.create! lookup_key_id: key.id,
-                            match: "organization=#{taxonomies(:organization1)},location=#{taxonomies(:location1)}",
-                            value: 'test_correct',
-                            omit: false
+          match: "organization=#{taxonomies(:organization1)},location=#{taxonomies(:location1)}",
+          value: 'test_correct',
+          omit: false
       end
       enc = HostInfoProviders::PuppetInfo.new(@host).puppetclass_parameters
       key.reload
@@ -630,15 +628,15 @@ module ForemanPuppet
 
       value = as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "organization=#{taxonomies(:organization1)},location=#{taxonomies(:location1)}",
-                            value: 'test_correct',
-                            omit: false
+          match: "organization=#{taxonomies(:organization1)},location=#{taxonomies(:location1)}",
+          value: 'test_correct',
+          omit: false
       end
       as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "organization=#{taxonomies(:organization1)}",
-                            value: 'test_incorrect',
-                            omit: false
+          match: "organization=#{taxonomies(:organization1)}",
+          value: 'test_incorrect',
+          omit: false
       end
       enc = HostInfoProviders::PuppetInfo.new(@host).puppetclass_parameters
 
@@ -662,22 +660,22 @@ module ForemanPuppet
 
       as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "hostgroup=#{parent_hostgroup},organization=#{taxonomies(:organization1)}",
-                            value: 'parent',
-                            omit: false
+          match: "hostgroup=#{parent_hostgroup},organization=#{taxonomies(:organization1)}",
+          value: 'parent',
+          omit: false
       end
       value2 = as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "hostgroup=#{child_hostgroup},organization=#{taxonomies(:organization1)}",
-                            value: 'child',
-                            omit: false
+          match: "hostgroup=#{child_hostgroup},organization=#{taxonomies(:organization1)}",
+          value: 'child',
+          omit: false
       end
 
       as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "location=#{taxonomies(:location1)}",
-                            value: 'loc',
-                            omit: false
+          match: "location=#{taxonomies(:location1)}",
+          value: 'loc',
+          omit: false
       end
 
       enc = HostInfoProviders::PuppetInfo.new(host).puppetclass_parameters
@@ -694,21 +692,21 @@ module ForemanPuppet
 
       as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "location=#{taxonomies(:location1)}",
-                            value: '<%= [2,3] %>',
-                            omit: false
+          match: "location=#{taxonomies(:location1)}",
+          value: '<%= [2,3] %>',
+          omit: false
       end
       as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "organization=#{taxonomies(:organization1)}",
-                            value: '<%= [3,4] %>',
-                            omit: false
+          match: "organization=#{taxonomies(:organization1)}",
+          value: '<%= [3,4] %>',
+          omit: false
       end
       as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "os=#{operatingsystems(:redhat)}",
-                            value: '<%= [4,5] %>',
-                            omit: false
+          match: "os=#{operatingsystems(:redhat)}",
+          value: '<%= [4,5] %>',
+          omit: false
       end
 
       key.reload
@@ -764,9 +762,9 @@ module ForemanPuppet
 
       as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "location=#{taxonomies(:location1)}",
-                            value: '<%= "c" %>',
-                            omit: false
+          match: "location=#{taxonomies(:location1)}",
+          value: '<%= "c" %>',
+          omit: false
       end
 
       key.reload