foreman_discovery 9.0.0 → 9.1.0

data/test/functional/discovery_rules_controller_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'test_plugin_helper'
 
 class DiscoveryRulesControllerTest < ActionController::TestCase
   setup :initialize_host

data/test/functional/foreman_discovery/concerns/hosts_controller_extensions_test.rb

@@ -1,5 +1,4 @@
 require 'test_plugin_helper'
-require 'test_helper_discovery'
 
 module ForemanDiscovery
   module Concerns

data/test/test_helper_discovery.rb

@@ -1,4 +1,8 @@
-def set_session_user_with_perms perms
+def set_session_user(user)
+  SETTINGS[:login] ? {:user => user.id, :expires_at => 5.minutes.from_now} : {}
+end
+
+def user_with_perms(perms)
   perms = perms.collect{|p| Permission.find_by_name(p) || Permission.create(:name => p) }
   perms.each do |p|
     p.resource_type = 'Host' if p.name =~ /discovered_hosts$/
@@ -11,16 +15,36 @@ def set_session_user_with_perms perms
   end
   user = FactoryGirl.create :user, :with_mail, :admin => false
   user.roles << role
-  user.save!
-  SETTINGS[:login] ? {:user => user.id, :expires_at => 5.minutes.from_now} : {}
+  user.save
+  user
+end
+
+def as_default_manager
+  as_user(default_manager) do
+    yield
+  end
+end
+
+def as_default_reader
+  as_user(default_reader) do
+    yield
+  end
+end
+
+def default_manager
+  @default_manager ||= user_with_perms(Foreman::Plugin.find('foreman_discovery').default_roles['Discovery Manager'])
+end
+
+def default_reader
+  @default_reader ||= user_with_perms(Foreman::Plugin.find('foreman_discovery').default_roles['Discovery Reader'])
 end
 
 def set_session_user_default_reader
-  set_session_user_with_perms Foreman::Plugin.find('foreman_discovery').default_roles['Discovery Reader']
+  set_session_user(default_reader)
 end
 
 def set_session_user_default_manager
-  set_session_user_with_perms Foreman::Plugin.find('foreman_discovery').default_roles['Discovery Manager']
+  set_session_user(default_manager)
 end
 
 def extract_form_errors(response)
@@ -47,7 +71,19 @@ end
 def setup_hostgroup(host)
   domain = FactoryGirl.create(:domain)
   subnet = FactoryGirl.create(:subnet_ipv4, :network => "192.168.100.0")
-  hostgroup = FactoryGirl.create(:hostgroup, :with_environment, :with_rootpass, :with_puppet_orchestration, :with_os, :subnet => subnet, :domain => domain, :organizations => [host.organization], :locations => [host.location])
+  environment = FactoryGirl.create(:environment, :organizations => [host.organization], :locations => [host.location])
+  medium = FactoryGirl.create(:medium, :organizations => [host.organization], :locations => [host.location])
+  os = FactoryGirl.create(:operatingsystem, :with_ptables, :with_archs, :media => [medium])
+  hostgroup = FactoryGirl.create(
+    :hostgroup, :with_rootpass, :with_puppet_orchestration,
+    :operatingsystem => os,
+    :architecture => os.architectures.first,
+    :ptable => os.ptables.first,
+    :medium => os.media.first,
+    :environment => environment,
+    :subnet => subnet,
+    :domain => domain,
+    :organizations => [host.organization], :locations => [host.location])
   domain.subnets << hostgroup.subnet
   hostgroup.medium.organizations |= [host.organization]
   hostgroup.medium.locations |= [host.location]

data/test/test_plugin_helper.rb

@@ -1,6 +1,8 @@
 # This calls the main test_helper in Foreman-core
 require 'test_helper'
 
+require 'test_helper_discovery'
+
 # Add plugin to FactoryGirl's paths
 FactoryGirl.definition_file_paths << File.join(File.dirname(__FILE__), 'factories')
 FactoryGirl.reload

data/test/unit/discovered_extensions_test.rb

@@ -1,14 +1,16 @@
-require 'test_helper'
+require 'test_plugin_helper'
 
-class FindDiscoveryRulesTest < ActiveSupport::TestCase
+class DiscoveredExtensionsTest < ActiveSupport::TestCase
   include Foreman::Controller::DiscoveredExtensions
 
   setup do
     @facts = {
-      "interfaces"       => "lo,eth0",
+      "interfaces"       => "lo,eth0,eth1",
       "ipaddress"        => "192.168.100.42",
       "ipaddress_eth0"   => "192.168.100.42",
+      "ipaddress_eth1"   => "192.168.100.15",
       "macaddress_eth0"  => "AA:BB:CC:DD:EE:FF",
+      "macaddress_eth1"  => "AA:BB:CC:DD:EE:F1",
       "discovery_bootif" => "AA:BB:CC:DD:EE:FF",
     }
     set_default_settings
@@ -162,18 +164,63 @@ class FindDiscoveryRulesTest < ActiveSupport::TestCase
     assert_equal host.name, "macaabbccddeeff"
   end
 
-  test "attributes from hostgroup are copied after auto provisioning" do
+  test "attributes from hostgroup are copied after auto provisioning for host with subnet detected" do
     facts = @facts.merge({"somefact" => "abc"})
+    domain = FactoryGirl.create(:domain)
+    subnet = FactoryGirl.create(:subnet_ipv4, :tftp, :dhcp, :name => 'subnet_100', :network => '192.168.100.0', :organizations => [Organization.find_by_name("Organization 1")], :locations => [Location.find_by_name("Location 1")])
     host = Host::Discovered.import_host(facts)
+    assert_equal subnet, host.subnet
+    hostgroup = FactoryGirl.create(:hostgroup, :with_environment, :with_rootpass, :with_puppet_orchestration, :with_os, :pxe_loader => "PXELinux BIOS", :subnet => subnet, :domain => domain)
+    r1 = FactoryGirl.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc", :organizations => [host.organization], :locations => [host.location], :hostgroup => hostgroup)
+    host.primary_interface.expects(:queue_tftp).at_least(1)
+    host.primary_interface.expects(:queue_dhcp).at_least(1)
+    assert managed_host = perform_auto_provision(host, r1)
+    assert_empty managed_host.errors
+    refute_nil hostgroup.pxe_loader, managed_host.pxe_loader
+    assert_equal hostgroup.pxe_loader, managed_host.pxe_loader
+    refute_nil hostgroup.subnet, managed_host.subnet
+    assert_equal hostgroup.subnet, managed_host.subnet
+    refute_nil hostgroup.subnet, managed_host.primary_interface.subnet
+    assert_equal hostgroup.subnet, managed_host.primary_interface.subnet
+    refute_nil hostgroup.subnet, managed_host.provision_interface.subnet
+    assert_equal hostgroup.subnet, managed_host.provision_interface.subnet
+    refute_nil hostgroup.domain, managed_host.domain
+    assert_equal hostgroup.domain, managed_host.domain
+    refute_nil hostgroup.environment, managed_host.environment
+    assert_equal hostgroup.environment, managed_host.environment
+    refute_nil hostgroup.puppet_proxy, managed_host.puppet_proxy
+    assert_equal hostgroup.puppet_proxy, managed_host.puppet_proxy
+    refute_nil hostgroup.puppet_ca_proxy, managed_host.puppet_ca_proxy
+    assert_equal hostgroup.puppet_ca_proxy, managed_host.puppet_ca_proxy
+  end
+
+  test "attributes from hostgroup are copied after auto provisioning for host without subnet detected" do
+    facts = @facts.merge({"somefact" => "abc"})
+    host = Host::Discovered.import_host(facts)
+    refute host.subnet
     domain = FactoryGirl.create(:domain)
-    subnet = FactoryGirl.create(:subnet_ipv4, :name => 'subnet_100', :network => '192.168.100.0', :organizations => [host.organization], :locations => [host.location])
-    hostgroup = FactoryGirl.create(:hostgroup, :with_environment, :with_rootpass, :with_os, :subnet => subnet, :domain => domain)
-    r1 = FactoryGirl.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc",
-                            :organizations => [host.organization], :locations => [host.location], :hostgroup => hostgroup)
+    subnet = FactoryGirl.create(:subnet_ipv4, :tftp, :dhcp, :name => 'subnet_100', :network => '192.168.100.0', :organizations => [Organization.find_by_name("Organization 1")], :locations => [Location.find_by_name("Location 1")])
+    hostgroup = FactoryGirl.create(:hostgroup, :with_environment, :with_rootpass, :with_puppet_orchestration, :with_os, :pxe_loader => "PXELinux BIOS", :subnet => subnet, :domain => domain)
+    r1 = FactoryGirl.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc", :organizations => [host.organization], :locations => [host.location], :hostgroup => hostgroup)
+    host.primary_interface.expects(:queue_tftp).at_least(1)
+    host.primary_interface.expects(:queue_dhcp).at_least(1)
     assert managed_host = perform_auto_provision(host, r1)
     assert_empty managed_host.errors
+    refute_nil hostgroup.pxe_loader, managed_host.pxe_loader
+    assert_equal hostgroup.pxe_loader, managed_host.pxe_loader
+    refute_nil hostgroup.subnet, managed_host.subnet
+    assert_equal hostgroup.subnet, managed_host.subnet
+    refute_nil hostgroup.subnet, managed_host.primary_interface.subnet
+    assert_equal hostgroup.subnet, managed_host.primary_interface.subnet
+    refute_nil hostgroup.subnet, managed_host.provision_interface.subnet
+    assert_equal hostgroup.subnet, managed_host.provision_interface.subnet
+    refute_nil hostgroup.domain, managed_host.domain
+    assert_equal hostgroup.domain, managed_host.domain
+    refute_nil hostgroup.environment, managed_host.environment
     assert_equal hostgroup.environment, managed_host.environment
+    refute_nil hostgroup.puppet_proxy, managed_host.puppet_proxy
     assert_equal hostgroup.puppet_proxy, managed_host.puppet_proxy
+    refute_nil hostgroup.puppet_ca_proxy, managed_host.puppet_ca_proxy
     assert_equal hostgroup.puppet_ca_proxy, managed_host.puppet_ca_proxy
   end
 
@@ -263,7 +310,5 @@ class FindDiscoveryRulesTest < ActiveSupport::TestCase
       refute perform_auto_provision host, r1
       assert_equal "xabc", host.name
     end
-
   end
-
 end

data/test/unit/discovery_attribute_set_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'test_plugin_helper'
 
 class DiscoveryAttributeSetTest < ActiveSupport::TestCase
 

data/test/unit/discovery_rule_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'test_plugin_helper'
 
 class DiscoveryRuleTest < ActiveSupport::TestCase
   setup do

data/test/unit/discovery_taxonomy_extensions_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'test_plugin_helper'
 
 class DiscoveryTaxonomyExtensionsTest < ActiveSupport::TestCase
   setup do

data/test/unit/fact_parser_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'test_plugin_helper'
 
 class FactParserTest < ActiveSupport::TestCase
   setup do

data/test/unit/host_discovered_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'test_plugin_helper'
 
 class HostDiscoveredTest < ActiveSupport::TestCase
   setup do
@@ -16,6 +16,12 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     assert Host::Discovered.find_by_name('mace41f13cc3658')
   end
 
+  test 'fact value association is set accordingly' do
+    discovered_host = FactoryGirl.create(:discovered_host, :with_facts, :fact_count => 1)
+    fact_value = discovered_host.fact_values.first
+    assert_equal discovered_host.id, fact_value.host.id
+  end
+
   test "should setup subnet" do
     raw = parse_json_fixture('/facts.json')
     subnet = FactoryGirl.create(:subnet_ipv4, :name => 'Subnet99', :network => '10.35.27.0', :organizations => [organization_one], :locations => [location_one])
@@ -211,7 +217,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     assert Token.where(:host_id => h.id).empty?
   end
 
-  test "all non-discovery facts are deleted after provisioning" do
+  test "all non-discovery facts are deleted after managed conversion" do
     Setting[:discovery_clean_facts] = true
     raw = parse_json_fixture('/facts.json')['facts']
     raw.merge!({
@@ -226,7 +232,46 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     assert_equal "content", managed.facts_hash['discovery_keep_me']
   end
 
-  test "all facts are preserved after provisioning" do
+  test "primary interface is preserved after managed conversion" do
+    raw = parse_json_fixture('/facts.json')['facts']
+    raw.merge!({
+      'keep_me' => "content",
+      'discovery_keep_me' => "content",
+      })
+    host = Host::Discovered.import_host(raw)
+    host.save
+    managed = ::ForemanDiscovery::HostConverter.to_managed(host)
+    refute_nil managed.primary_interface
+    assert_equal "e4:1f:13:cc:36:58", managed.primary_interface.mac
+  end
+
+  test "provision interface is preserved after managed conversion" do
+    raw = parse_json_fixture('/facts.json')['facts']
+    raw.merge!({
+      'keep_me' => "content",
+      'discovery_keep_me' => "content",
+      })
+    host = Host::Discovered.import_host(raw)
+    host.save
+    managed = ::ForemanDiscovery::HostConverter.to_managed(host)
+    refute_nil managed.provision_interface
+    assert_equal "e4:1f:13:cc:36:58", managed.provision_interface.mac
+  end
+
+  test "provision interface host association is preserved after managed conversion" do
+    raw = parse_json_fixture('/facts.json')['facts']
+    raw.merge!({
+      'keep_me' => "content",
+      'discovery_keep_me' => "content",
+      })
+    host = Host::Discovered.import_host(raw)
+    host.save
+    managed = ::ForemanDiscovery::HostConverter.to_managed(host)
+    refute_nil managed.provision_interface
+    assert_equal host, managed.provision_interface.host
+  end
+
+  test "all facts are preserved after managed conversion" do
     raw = parse_json_fixture('/facts.json')['facts']
     raw.merge!({
       'keep_me' => "content",

data/test/unit/managed_extensions_test.rb

@@ -0,0 +1,76 @@
+require 'test_plugin_helper'
+
+class ManagedExtensionsTest < ActiveSupport::TestCase
+  class StubHost < ApplicationRecord
+    include Host::ManagedExtensions
+
+    # prevent from Could not find table exception
+    def self.table_name
+      'hosts'
+    end
+  end
+
+  setup do
+    set_default_settings
+
+    @host = StubHost.new
+    @host.legacy_api = false
+    @host.type = "Host::Discovered"
+    @host.stubs(:old).returns(@host)
+    @facts = {}
+    @host.stubs(:facts).returns(@facts)
+    @post_queue = mock('Post Queue')
+    @host.stubs(:post_queue).returns(@post_queue)
+    @operatingsystem = mock('OS')
+    @host.stubs(:operatingsystem).returns(@operatingsystem)
+    @host.stubs(:provisioning_template).returns('A template')
+    @host.stubs(:medium).returns('http://a_medium')
+    @host.stubs(:architecture).returns(FactoryGirl.create(:architecture))
+    @kexec_json = {
+      :kernel => "http://a_host/vmlinuz",
+      :initrd => "http://a_host/someimage.img"
+    }
+    @host.stubs(:unattended_render).returns(@kexec_json.to_json)
+  end
+
+  test "queue_reboot enques reboot command when there is no kexec fact" do
+    @host.stubs(:type_changed?).returns(true)
+    @host.stubs(:new_record?).returns(false)
+    @host.id = 130513
+    ::Host::Base.stubs(:find).with(@host.id).returns(@host)
+    @post_queue.expects(:create).with(has_entry(:action, [@host, :setReboot])).once
+    @host.queue_reboot
+  end
+
+  test "queue_reboot enques reboot command when there is no kexec template" do
+    @host.stubs(:type_changed?).returns(true)
+    @host.stubs(:new_record?).returns(false)
+    @host.id = 130513
+    ::Host::Base.stubs(:find).with(@host.id).returns(@host)
+    @facts['discovery_kexec'] = "Kexec version X.Y.Z"
+    @host.stubs(:provisioning_template).returns(nil)
+    @post_queue.expects(:create).with(has_entry(:action, [@host, :setReboot])).once
+    @host.queue_reboot
+  end
+
+  test "queue_reboot enques kexec command" do
+    @host.stubs(:type_changed?).returns(true)
+    @host.stubs(:new_record?).returns(false)
+    @host.id = 130513
+    ::Host::Base.stubs(:find).with(@host.id).returns(@host)
+    @facts['discovery_kexec'] = "Kexec version X.Y.Z"
+    @post_queue.expects(:create).with(has_entry(:action, [@host, :setKexec])).once
+    @host.queue_reboot
+  end
+
+  test "setReboot calls reboot API" do
+    Host::Discovered.any_instance.expects(:reboot).once
+    @host.setReboot
+  end
+
+  test "setKexec calls boot_files_uri and kexec API" do
+    Host::Discovered.any_instance.expects(:kexec).once
+    @operatingsystem.expects(:boot_files_uri).with(@host.medium, @host.architecture, @host)
+    @host.setKexec
+  end
+end

data/test/unit/setting_discovered_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'test_plugin_helper'
 
 class SettingDiscoveredTest < ActiveSupport::TestCase
   test "can create setting of discovered type" do

data/test/unit/ui_notifications/destroy_host_test.rb

@@ -1,5 +1,4 @@
 require 'test_plugin_helper'
-require 'test_helper_discovery'
 
 class DestroyHostNotificationTest < ActiveSupport::TestCase
   test 'destorying discovered host should remove notification' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_discovery
 version: !ruby/object:Gem::Version
-  version: 9.0.0
+  version: 9.1.0
 platform: ruby
 authors:
 - alongoldboim
@@ -45,11 +45,12 @@ authors:
 - Swapnil Abnave
 - Timo Goebel
 - Tom Caspy
+- Tomer Brisker
 - Yann Cézard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-07 00:00:00.000000000 Z
+date: 2017-06-14 00:00:00.000000000 Z
 dependencies: []
 description: MaaS Discovery Plugin engine for Foreman
 email: gsutclif@redhat.com
@@ -75,7 +76,6 @@ files:
 - app/lib/facter_utils.rb
 - app/mailers/discovered_mailer.rb
 - app/models/concerns/discovery_taxonomy_extensions.rb
-- app/models/concerns/fact_value_extensions.rb
 - app/models/discovery_attribute_set.rb
 - app/models/discovery_rule.rb
 - app/models/host/discovered.rb
@@ -109,6 +109,7 @@ files:
 - app/views/discovered_hosts/_discovered_host_modal.html.erb
 - app/views/discovered_hosts/_discovered_hosts_list.html.erb
 - app/views/discovered_hosts/_selected_hosts.html.erb
+- app/views/discovered_hosts/edit.html.erb
 - app/views/discovered_hosts/index.html.erb
 - app/views/discovered_hosts/multiple_destroy.html.erb
 - app/views/discovered_hosts/select_multiple_location.html.erb
@@ -149,6 +150,7 @@ files:
 - db/seeds.d/60_discovery_proxy_feature.rb
 - db/seeds.d/70_discovery_mail_notification.rb
 - db/seeds.d/80_discovery_ui_notification.rb
+- db/seeds.d/90_add_permissions_from_default_roles.rb
 - extra/build_iso.sh
 - extra/discover_host
 - extra/discovery_init.sh.example
@@ -209,6 +211,7 @@ files:
 - locale/zh_TW/LC_MESSAGES/foreman_discovery.mo
 - locale/zh_TW/foreman_discovery.edit.po
 - locale/zh_TW/foreman_discovery.po
+- test/factories/discovery_host_related.rb
 - test/factories/discovery_rule_related.rb
 - test/functional/api/v2/discovered_hosts_controller_test.rb
 - test/functional/api/v2/discovery_rules_controller_test.rb
@@ -216,7 +219,6 @@ files:
 - test/functional/discovered_hosts_controller_test.rb
 - test/functional/discovery_rules_controller_test.rb
 - test/functional/foreman_discovery/concerns/hosts_controller_extensions_test.rb
-- test/test_helper.rb
 - test/test_helper_discovery.rb
 - test/test_plugin_helper.rb
 - test/unit/discovered_extensions_test.rb
@@ -225,9 +227,9 @@ files:
 - test/unit/discovery_rule_test.rb
 - test/unit/discovery_taxonomy_extensions_test.rb
 - test/unit/fact_parser_test.rb
-- test/unit/fact_value_extensions_test.rb
 - test/unit/facts.json
 - test/unit/host_discovered_test.rb
+- test/unit/managed_extensions_test.rb
 - test/unit/setting_discovered_test.rb
 - test/unit/ui_notifications/destroy_host_test.rb
 - test/unit/ui_notifications/new_host_test.rb
@@ -251,30 +253,30 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: MaaS Discovery Plugin for Foreman
 test_files:
-- test/functional/discovery_rules_controller_test.rb
-- test/functional/api/v2/discovery_rules_controller_test.rb
-- test/functional/api/v2/fact_value_extensions_test.rb
-- test/functional/api/v2/discovered_hosts_controller_test.rb
-- test/functional/discovered_hosts_controller_test.rb
-- test/functional/foreman_discovery/concerns/hosts_controller_extensions_test.rb
-- test/factories/discovery_rule_related.rb
-- test/unit/discovered_extensions_test.rb
-- test/unit/fact_parser_test.rb
+- test/test_plugin_helper.rb
+- test/test_helper_discovery.rb
 - test/unit/discovery_attribute_set_test.rb
-- test/unit/setting_discovered_test.rb
 - test/unit/facts.json
-- test/unit/fact_value_extensions_test.rb
 - test/unit/discovered_mailer_test.rb
-- test/unit/discovery_taxonomy_extensions_test.rb
+- test/unit/managed_extensions_test.rb
 - test/unit/discovery_rule_test.rb
-- test/unit/host_discovered_test.rb
-- test/unit/ui_notifications/destroy_host_test.rb
+- test/unit/discovered_extensions_test.rb
+- test/unit/discovery_taxonomy_extensions_test.rb
 - test/unit/ui_notifications/new_host_test.rb
-- test/test_helper_discovery.rb
-- test/test_plugin_helper.rb
-- test/test_helper.rb
+- test/unit/ui_notifications/destroy_host_test.rb
+- test/unit/setting_discovered_test.rb
+- test/unit/host_discovered_test.rb
+- test/unit/fact_parser_test.rb
+- test/factories/discovery_host_related.rb
+- test/factories/discovery_rule_related.rb
+- test/functional/foreman_discovery/concerns/hosts_controller_extensions_test.rb
+- test/functional/api/v2/fact_value_extensions_test.rb
+- test/functional/api/v2/discovered_hosts_controller_test.rb
+- test/functional/api/v2/discovery_rules_controller_test.rb
+- test/functional/discovered_hosts_controller_test.rb
+- test/functional/discovery_rules_controller_test.rb