foreman_discovery 14.0.1 → 15.0.0

data/test/facts/qemu_noip.json

@@ -0,0 +1,2 @@
+{"os::release":null,"os":null,"processors":null,"discovery_proxy_type":"proxy","discovery_proxy_uri":"https://svrhqsrhs002v.bcnet.bou.or.ug:9090","discovery_dns":"172.16.2.12","discovery_gateway":"172.16.6.254","discovery_netmask":"255.255.255.0","discovery_ip":"172.16.6.177","discovery_ip_cidr":"172.16.6.177/24","discovery_kexec":"kexec-tools 2.0.15","nmprimary_ip6_route":"dst = ff00::/8, nh = ::, mt = 256, table=255","nmprimary_ip6_address":"fe80::21a:4aff:fe16:182/64","nmprimary_ip4_dns":"172.16.2.12","nmprimary_ip4_route":"dst = 172.16.6.0/24, nh = 0.0.0.0, mt = 100","nmprimary_ip4_gateway":"172.16.6.254","nmprimary_ip4_address":"172.16.6.177/24","nmprimary_general_vpn":"no","nmprimary_general_default6":"no","nmprimary_general_default":"yes","nmprimary_general_state":"activated","nmprimary_general_devices":"eth0","nmprimary_general_uuid":"7eef0138-2e0d-11e9-bf6e-001a4a160182","nmprimary_general_name":"primary","nmprimary_proxy_browser-only":"no","nmprimary_proxy_method":"none","nmprimary_vlan_flags":"1","nmprimary_vlan_id":"0","nmprimary_ipv6_dhcp-send-hostname":"yes","nmprimary_ipv6_addr-gen-mode":"eui64","nmprimary_ipv6_ip6-privacy":"-1","nmprimary_ipv6_may-fail":"yes","nmprimary_ipv6_never-default":"no","nmprimary_ipv6_ignore-auto-dns":"no","nmprimary_ipv6_ignore-auto-routes":"no","nmprimary_ipv6_route-table":"0","nmprimary_ipv6_route-metric":"-1","nmprimary_ipv6_dns-priority":"0","nmprimary_ipv6_method":"ignore","nmprimary_ipv4_may-fail":"yes","nmprimary_ipv4_never-default":"no","nmprimary_ipv4_dhcp-send-hostname":"no","nmprimary_ipv4_ignore-auto-dns":"no","nmprimary_ipv4_ignore-auto-routes":"no","nmprimary_ipv4_route-table":"0","nmprimary_ipv4_route-metric":"-1","nmprimary_ipv4_gateway":"172.16.6.254","nmprimary_ipv4_addresses":"172.16.6.177/24","nmprimary_ipv4_dns-priority":"0","nmprimary_ipv4_dns":"172.16.2.12","nmprimary_ipv4_method":"manual","nmprimary_802-3-ethernet_wake-on-lan":"default","nmprimary_802-3-ethernet_mtu":"auto","nmprimary_802-3-ethernet_mac-address":"00:1A:4A:16:01:82","nmprimary_802-3-ethernet_auto-negotiate":"no","nmprimary_802-3-ethernet_speed":"0","nmprimary_connection_lldp":"default","nmprimary_connection_metered":"unknown","nmprimary_connection_autoconnect-slaves":"-1","nmprimary_connection_read-only":"no","nmprimary_connection_auth-retries":"-1","nmprimary_connection_autoconnect-retries":"-1","nmprimary_connection_autoconnect-priority":"1","nmprimary_connection_autoconnect":"yes","nmprimary_connection_type":"802-3-ethernet","nmprimary_connection_uuid":"7eef0138-2e0d-11e9-bf6e-001a4a160182","nmprimary_connection_id":"primary","link_eth0":"true","discovery_bootip":"172.16.6.177","discovery_bootif":"00:1a:4a:16:01:82","discovery_release":"20180918.78a7ee2","discovery_version":"3.5.3","ipaddress":"172.16.6.177","macaddress":"00:1a:4a:16:01:82","processorcount":"2","processor1":"Intel Core Processor (Haswell, no TSX)","processor0":"Intel Core Processor (Haswell, no TSX)","facterversion":"2.4.1","netmask":"255.255.255.0","os::release::full":"7.5","os::release::minor":"5","os::release::major":"7","os::family":"RedHat","os::name":"RedHat","architecture":"x86_64","is_virtual":"true","virtual":"kvm","processors::physicalcount":"2","processors::count":"2","processors::models":"[\"Intel Core Processor (Haswell, no TSX)\", \"Intel Core Processor (Haswell, no TSX)\"]","network_eth0":"172.16.6.0","fqdn":"fdi","type":"Other","uuid":"8DC0DD71-F164-47BA-B0C6-F2EA8D322476","serialnumber":"30303038-3337-584D-5136-32343036324C","productname":"RHEV Hypervisor","manufacturer":"Red Hat","bios_release_date":"04/01/2014","bios_version":"1.11.0-2.el7","bios_vendor":"SeaBIOS","blockdevices":"sda,sr0","blockdevice_sr0_model":"QEMU DVD-ROM","blockdevice_sr0_vendor":"QEMU","blockdevice_sr0_size":"251658240","blockdevice_sda_model":"QEMU HARDDISK","blockdevice_sda_vendor":"QEMU","blockdevice_sda_size":"75161927680","physicalprocessorcount":"2","uniqueid":"10acb106","memorysize_mb":"7981.07","memorysize":"7.79 GB","hostname":"fdi","id":"root","ps":"ps -ef","hardwareisa":"x86_64","gid":"root","mtu_eth0":"1500","netmask_eth0":"255.255.255.0","macaddress_eth0":"00:1a:4a:16:01:82","ipaddress_eth0":"172.16.6.177","interfaces":"eth0,lo","hardwaremodel":"x86_64","lib":"/usr/share/fdi/facts:/opt/extension/facts"}
+

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

@@ -12,8 +12,6 @@ class Api::V2::DiscoveredHostsControllerTest < ActionController::TestCase
   end
 
   setup do
-    SETTINGS[:organizations_enabled] = true
-    SETTINGS[:locations_enabled] = true
     FactoryBot.create(:subnet, :network => "192.168.100.1", :mask => "255.255.255.0", :locations => [location_one], :organizations => [organization_one])
     @request.env['HTTP_REFERER'] = '/discovery_rules'
     @facts = {
@@ -159,20 +157,6 @@ class Api::V2::DiscoveredHostsControllerTest < ActionController::TestCase
     assert_equal "No rule found for host #{host.name}", show_response["error"]["message"]
   end
 
-  def test_auto_provision_with_wrong_disabled_org_sucess
-    disable_orchestration
-    SETTINGS[:organizations_enabled] = false
-    facts = @facts.merge({"somefact" => "abc"})
-    host = discover_host_from_facts(facts)
-    taxonomy = { :locations => [host.location] }
-    FactoryBot.create(:discovery_rule, {:priority => 1, :search => "facts.somefact = abc", :hostgroup => FactoryBot.create(:hostgroup, :with_os, :with_rootpass, taxonomy)}.merge(taxonomy))
-    post :auto_provision, params: { :id => host.id }
-    assert_match host.name, @response.body
-    assert_response :success
-  ensure
-    SETTINGS[:organizations_enabled] = true
-  end
-
   def test_auto_provision_success_and_delete
     disable_orchestration
     facts = @facts.merge({"somefact" => "abc"})

data/test/functional/discovered_hosts_controller_test.rb

@@ -84,27 +84,25 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
   end
 
   def test_edit_form_quick_submit
-    disable_taxonomies do
-      domain = FactoryBot.create(:domain)
-      hostgroup = FactoryBot.create(:hostgroup, :with_subnet, :with_environment, :with_rootpass, :with_os, :domain => domain)
-      new_ip = hostgroup.subnet.ipaddr
-      host = discover_host_from_facts(@facts.merge({
-                                                     'ipaddress' => new_ip,
-                                                     'ipaddress_eth0' => new_ip
-                                                   }))
-      get :edit, params: {
-        :id => host.id,
-        :quick_submit => true,
-        :host => {
-          :hostgroup_id => hostgroup.id
-        } }, session: set_session_user_default_manager
-
-      managed_host = Host.find(host.id)
-      assert managed_host.build
-      assert_redirected_to host_url(managed_host)
-      assert_equal hostgroup.id, managed_host.hostgroup_id
-      assert_match(/Successfully/, flash[:success])
-    end
+    domain = FactoryBot.create(:domain)
+    hostgroup = FactoryBot.create(:hostgroup, :with_subnet, :with_environment, :with_rootpass, :with_os, :domain => domain)
+    new_ip = hostgroup.subnet.ipaddr
+    host = discover_host_from_facts(@facts.merge({
+                                                    'ipaddress' => new_ip,
+                                                    'ipaddress_eth0' => new_ip
+                                                  }))
+    get :edit, params: {
+      :id => host.id,
+      :quick_submit => true,
+      :host => {
+        :hostgroup_id => hostgroup.id
+      } }, session: set_session_user_default_manager
+
+    managed_host = Host.find(host.id)
+    assert managed_host.build
+    assert_redirected_to host_url(managed_host)
+    assert_equal hostgroup.id, managed_host.hostgroup_id
+    assert_match(/Successfully/, flash[:success])
   end
 
   def test_edit_form_submit_parameters

data/test/test_helper_discovery.rb

@@ -1,5 +1,5 @@
 def set_session_user(user)
-  SETTINGS[:login] ? {:user => user.id, :expires_at => 5.minutes.from_now} : {}
+  {:user => user.id, :expires_at => 5.minutes.from_now}
 end
 
 def user_with_perms(perms)

data/test/unit/discovery_rule_test.rb

@@ -150,7 +150,6 @@ class DiscoveryRuleTest < ActiveSupport::TestCase
   end
 
   test "should enforce hostgroup organizations" do
-    skip unless SETTINGS[:organizations_enabled]
     rule = DiscoveryRule.new :name => "myrule",
       :search => "cpu_count > 1",
       :hostgroup_id => @hostgroup.id
@@ -159,7 +158,6 @@ class DiscoveryRuleTest < ActiveSupport::TestCase
   end
 
   test "should enforce hostgroup organizations and locations" do
-    skip unless (SETTINGS[:organizations_enabled] && SETTINGS[:locations_enabled])
     loc = FactoryBot.create(:location, :name => "hgloc")
     @hostgroup.locations << loc
     @hostgroup.save!

data/test/unit/host_discovered_test.rb

@@ -27,7 +27,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
 
   test "should import facts from yaml with random based generator as Host::Discovered" do
     Setting[:discovery_naming] = "Random-name"
-    Rails.cache.stubs(:fetch).with("name_generator_register").returns(1305)
+    NameGenerator.any_instance.stubs(:register).returns(1305)
     host = discover_host_from_facts(@facts)
     assert_equal "velma-startin", host.name
   end
@@ -62,17 +62,82 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     Subnet.expects(:subnet_for).with('10.35.27.3').returns(subnet)
     host = discover_host_from_facts(@facts)
     assert_equal subnet, host.primary_interface.subnet
+    assert_equal org, host.organization
+    assert_equal loc, host.location
   end
 
-  test "should setup subnet with org and loc set via facts" do
-    org = FactoryBot.create(:organization, :name => "subnet_org_via_fact")
-    loc = FactoryBot.create(:location, :name => "subnet_loc_via_fact")
-    @facts['foreman_organization'] = org.name
-    @facts['foreman_location'] = loc.name
-    subnet = FactoryBot.create(:subnet_ipv4, :name => 'Subnet99', :network => '10.35.27.0', :organizations => [org], :locations => [loc])
+  test "should detect taxonomy as 'first' organization (e.g. randomly)" do
+    org = FactoryBot.create(:organization)
+    loc = FactoryBot.create(:location)
+    org2 = FactoryBot.create(:organization)
+    loc2 = FactoryBot.create(:location)
+    Setting['discovery_organization'] = nil
+    Setting['discovery_location'] = nil
+    subnet = FactoryBot.create(:subnet_ipv4, :name => 'Subnet99', :network => '10.35.27.0', :organizations => [org, org2], :locations => [loc, loc2])
     Subnet.expects(:subnet_for).with('10.35.27.3').returns(subnet)
     host = discover_host_from_facts(@facts)
     assert_equal subnet, host.primary_interface.subnet
+    assert host.organization
+    assert host.location
+  end
+
+  test "discovery_organization must not be overriden by organization_fact from core" do
+    begin
+      org = FactoryBot.create(:organization, :name => "subnet_org", :title => "subnet_org")
+      loc = FactoryBot.create(:location, :name => "subnet_loc", :title => "subnet_loc")
+      bad_org = FactoryBot.create(:organization, :name => "bad_org", :title => "bad_org")
+      bad_loc = FactoryBot.create(:location, :name => "bad_loc", :title => "bad_loc")
+      Setting['organization_fact'] = "test_org"
+      Setting['location_fact'] = "test_loc"
+      Setting['discovery_organization'] = org.name
+      Setting['discovery_location'] = loc.name
+      subnet = FactoryBot.create(:subnet_ipv4, :name => 'Subnet99', :network => '10.35.27.0', :organizations => [org], :locations => [loc])
+      Subnet.expects(:subnet_for).with('10.35.27.3').returns(subnet)
+      host = discover_host_from_facts(@facts.merge("test_org" => bad_org.title, "test_loc" => bad_loc.title))
+      assert_equal subnet, host.primary_interface.subnet
+      assert_equal org, host.organization
+      assert_equal loc, host.location
+    ensure
+      Setting['organization_fact'] = nil
+      Setting['location_fact'] = nil
+    end
+  end
+
+  test "discovery_organization must not be overriden by foreman_organization from core" do
+    org = FactoryBot.create(:organization, :name => "subnet_org", :title => "subnet_org")
+    loc = FactoryBot.create(:location, :name => "subnet_loc", :title => "subnet_loc")
+    bad_org = FactoryBot.create(:organization, :name => "bad_org", :title => "bad_org")
+    bad_loc = FactoryBot.create(:location, :name => "bad_loc", :title => "bad_loc")
+    Setting['discovery_organization'] = org.name
+    Setting['discovery_location'] = loc.name
+    subnet = FactoryBot.create(:subnet_ipv4, :name => 'Subnet99', :network => '10.35.27.0', :organizations => [org, bad_org], :locations => [loc, bad_loc])
+    Subnet.expects(:subnet_for).with('10.35.27.3').returns(subnet)
+    host = discover_host_from_facts(@facts.merge("foreman_organization" => bad_org.title, "foreman_location" => bad_loc.title))
+    assert_equal subnet, host.primary_interface.subnet
+    assert_equal org, host.organization
+    assert_equal loc, host.location
+  end
+
+  test "discovery_organization must not be overriden by default_organization from core" do
+    begin
+      org = FactoryBot.create(:organization, :name => "subnet_org", :title => "subnet_org")
+      loc = FactoryBot.create(:location, :name => "subnet_loc", :title => "subnet_loc")
+      bad_org = FactoryBot.create(:organization, :name => "bad_org", :title => "bad_org")
+      bad_loc = FactoryBot.create(:location, :name => "bad_loc", :title => "bad_loc")
+      Setting['default_organization'] = bad_org.title
+      Setting['default_location'] = bad_loc.title
+      Setting['discovery_organization'] = org.name
+      Setting['discovery_location'] = loc.name
+      subnet = FactoryBot.create(:subnet_ipv4, :name => 'Subnet99', :network => '10.35.27.0', :organizations => [org, bad_org], :locations => [loc, bad_loc])
+      Subnet.expects(:subnet_for).with('10.35.27.3').returns(subnet)
+      host = discover_host_from_facts(@facts)
+      assert_equal subnet, host.primary_interface.subnet
+      assert_equal org, host.organization
+      assert_equal loc, host.location
+    ensure
+      Setting['default_organization'] = nil
+      Setting['default_location'] = nil
+    end
   end
 
   test "should set nested org and loc" do
@@ -371,15 +436,6 @@ class HostDiscoveredTest < ActiveSupport::TestCase
       @host.organization = @org
       assert_equal recipients, @host.notification_recipients_ids.sort
     end
-
-    test 'finds only admin users if organizations are disabled' do
-      begin
-        SETTINGS[:organizations_enabled] = false
-        assert_equal @admins.sort, @host.notification_recipients_ids.sort
-      ensure
-        SETTINGS[:organizations_enabled] = true
-      end
-    end
   end
 
   test "primary interface isn't touched with no LLDP facts" do

data/test/unit/managed_extensions_test.rb

@@ -65,7 +65,7 @@ class ManagedExtensionsTest < ActiveSupport::TestCase
     end
 
     test "setKexec calls renderer" do
-      Host::Discovered.any_instance.expects(:kexec).with() { |json| JSON.parse(json) }.once
+      Host::Discovered.any_instance.expects(:render_template).with() { |json| JSON.parse(json) }.once
       Foreman::Renderer.expects(:render).returns({})
       @host.setKexec
     end
@@ -88,7 +88,7 @@ class ManagedExtensionsTest < ActiveSupport::TestCase
 
     test "kexec template is correctly rendered" do
       expected = {
-        "append" => "ks=http://foreman.some.host.fqdn/unattended/provision&static=yes inst.ks.sendmac ip=::::::none nameserver= ksdevice=bootif BOOTIF= nomodeset nomodeset",
+        "append" => "ks=http://foreman.some.host.fqdn/unattended/provision&static=yes inst.ks.sendmac ip=::::::none nameserver= ksdevice=bootif BOOTIF= nomodeset nokaslr nomodeset",
         "extra" => []
       }
       assert @host.operatingsystem.respond_to?(:pxe_type)

data/test/unit/ui_notifications/destroy_host_test.rb

@@ -41,6 +41,15 @@ class DestroyHostNotificationTest < ActiveSupport::TestCase
     assert_equal 0, blueprint.notifications.count
   end
 
+  test 'discovered host type must not update notifications on plain save' do
+    host = FactoryBot.create(:discovered_host)
+    ForemanDiscovery::UINotifications::NewHost.deliver!(host)
+    assert_equal 1, blueprint.notifications.count
+    host.name = "triggerchange"
+    assert host.save!
+    assert_equal 1, blueprint.notifications.count
+  end
+
   test 'type change should not removing notifications for discovered hosts' do
     host1 = FactoryBot.create(:discovered_host)
     ForemanDiscovery::UINotifications::NewHost.deliver!(host1)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_discovery
 version: !ruby/object:Gem::Version
-  version: 14.0.1
+  version: 15.0.0
 platform: ruby
 authors:
 - Aditi Puntambekar
@@ -28,6 +28,7 @@ authors:
 - Ido Kanner
 - imriz
 - Imri Zvik
+- Ivan Nečas
 - Joseph Mitchell Magen
 - June Zhang
 - kgaikwad
@@ -67,7 +68,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-30 00:00:00.000000000 Z
+date: 2019-05-13 00:00:00.000000000 Z
 dependencies: []
 description: MaaS Discovery Plugin engine for Foreman
 email: gsutclif@redhat.com
@@ -233,12 +234,14 @@ files:
 - locale/zh_TW/foreman_discovery.po
 - test/factories/discovery_host_related.rb
 - test/factories/discovery_rule_related.rb
+- test/facts/asswweb061.json
 - test/facts/default.json
 - test/facts/dell_npars.json
 - test/facts/dell_vlan.json
 - test/facts/facts_with_lldp.json
 - test/facts/facts_with_lldp_bond_candidate.json
 - test/facts/pxeless-vlan.json
+- test/facts/qemu_noip.json
 - test/facts/regular_host.json
 - test/facts/rhel-dl380-1kdisks.json
 - test/facts/rhel-r730.json
@@ -300,7 +303,9 @@ test_files:
 - test/integration/discovered_hosts_test.rb
 - test/facts/facts_with_lldp.json
 - test/facts/dell_vlan.json
+- test/facts/asswweb061.json
 - test/facts/rhel-r730.json
+- test/facts/qemu_noip.json
 - test/facts/regular_host.json
 - test/facts/vmware_local.json
 - test/facts/pxeless-vlan.json