foreman_discovery 12.0.2 → 13.0.1

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

@@ -31,6 +31,7 @@ class Api::V2::DiscoveryRulesControllerTest < ActionController::TestCase
     assert_equal "Location 1", discovery_rule['locations'].first['name']
   end
 
+  test_attributes :pid => '121e0a30-8a24-47d7-974d-998886ed1ea7'
   test "should create discovery rule with taxonomy" do
     hostgroup = FactoryBot.create(:hostgroup, :with_os, :with_rootpass, :organizations => [organization_one], :locations => [location_one])
     valid_attributes = {
@@ -64,6 +65,7 @@ class Api::V2::DiscoveryRulesControllerTest < ActionController::TestCase
     assert_response :success
   end
 
+  test_attributes :pid => '769c0739-538b-4451-af7b-deb2ecd3dc0d'
   test "should update discovery rule name" do
     rule = FactoryBot.create(:discovery_rule)
     new_name = 'new_rule_name'
@@ -79,6 +81,7 @@ class Api::V2::DiscoveryRulesControllerTest < ActionController::TestCase
     assert_response :success
   end
 
+  test_attributes :pid => '0f8ec302-f9de-4713-87b7-0f1aca515149'
   test "should update taxonomies for discovery rule" do
     min_required_attr = { :name => 'new_rule', :search => 'CPU_Count = 1', :hostgroup_id => hostgroups(:unusual).id }
     rule = DiscoveryRule.new(min_required_attr)
@@ -97,6 +100,7 @@ class Api::V2::DiscoveryRulesControllerTest < ActionController::TestCase
     assert_equal [location_one.id], rule.locations.map {|loc| loc.id}
   end
 
+  test_attributes :pid => '2c5ecb7e-87bc-4980-9620-7ae00e3f360e'
   test "should update search rule" do
     rule = FactoryBot.create(:discovery_rule)
     new_search = 'Location = Default_Location'
@@ -106,6 +110,7 @@ class Api::V2::DiscoveryRulesControllerTest < ActionController::TestCase
     assert_equal new_search, rule.search
   end
 
+  test_attributes :pid => '33084060-2866-46b9-bfab-23d91aea73d8'
   test "should update host limit" do
     rule = FactoryBot.create(:discovery_rule)
     new_max_count = 150
@@ -116,6 +121,7 @@ class Api::V2::DiscoveryRulesControllerTest < ActionController::TestCase
     assert_equal new_max_count, rule.max_count
   end
 
+  test_attributes :pid => '330aa943-167b-46dd-b434-1a6e5fe8f283'
   test "test_positive_disable" do
     rule = FactoryBot.create(:discovery_rule)
     assert rule.enabled
@@ -125,6 +131,7 @@ class Api::V2::DiscoveryRulesControllerTest < ActionController::TestCase
     refute rule.enabled
   end
 
+  test_attributes :pid => '9fdba953-dcc7-4532-9204-17a45b0d9e05'
   test "should destroy discovery rule" do
     rule = FactoryBot.create(:discovery_rule)
     assert_difference('DiscoveryRule.unscoped.count', -1) do
@@ -134,6 +141,7 @@ class Api::V2::DiscoveryRulesControllerTest < ActionController::TestCase
     refute DiscoveryRule.unscoped.exists?(rule.id)
   end
 
+  test_attributes :pid => '415379b7-0134-40b9-adb1-2fe0adb1ac36'
   test "should not create with too long name" do
     assert_difference('DiscoveryRule.unscoped.count', 0) do
       post :create, params: {:discovery_rule => {

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

@@ -5,12 +5,14 @@ class Api::V2::SettingsControllerTest < ActionController::TestCase
     FactoryBot.create(:setting, :name => 'discovery_prefix', :value => 'mac', :category => 'Setting::Discovered')
   end
 
+  test_attributes :pid => '2c5ecb7e-87bc-4980-9620-7ae00e3f360e'
   test "should update hostname prefix without value" do
     setting = Setting.find_by_name("discovery_prefix")
     put :update, params: { :id => setting.id, :setting => { :value => '' } }
     assert_equal JSON.parse(@response.body)['value'], '', "Can't update discovery_prefix setting with empty value"
   end
 
+  test_attributes :pid => '4969994d-f934-4f0e-9a98-476b87eb0527'
   test "should update hostname prefix" do
     value = RFauxFactory.gen_alpha
     setting = Setting.find_by_name("discovery_prefix")

data/test/test_helper_discovery.rb

@@ -67,6 +67,8 @@ def set_default_settings
   FactoryBot.create(:setting, :name => 'discovery_pxegrub2_lock_template', :value => 'pxegrub2_discovery', :category => 'Setting::Discovered')
   FactoryBot.create(:setting, :name => 'discovery_always_rebuild_dns', :value => true, :category => 'Setting::Discovered')
   FactoryBot.create(:setting, :name => 'discovery_error_on_existing', :value => false, :category => 'Setting::Discovered')
+  FactoryBot.create(:setting, :name => 'discovery_naming', :value => 'Fact', :category => 'Setting::Discovered')
+  FactoryBot.create(:setting, :name => 'discovery_auto_bond', :value => false, :category => 'Setting::Discovered')
 end
 
 def setup_hostgroup(host)

data/test/unit/discovered_mailer_test.rb

@@ -41,4 +41,18 @@ class DiscoveredMailerTest < ActiveSupport::TestCase
     refute(@email.body.parts.first.body.raw_source.start_with?('<!DOCTYPE')) # text email
     assert(@email.body.parts.last.body.raw_source.start_with?('<!DOCTYPE')) # html email
   end
+
+  test 'discovery mailer sends email when user object is used' do
+    assert MailNotification[:discovered_summary].deliver(user: @user)
+  end
+
+  test 'discovery mailer sends email when user id is used' do
+    assert MailNotification[:discovered_summary].deliver(user: @user.id)
+  end
+
+  test 'discovery mailer must raise exception when sending email to an unknown user type' do
+    assert_raises Foreman::Exception do
+      MailNotification[:discovered_summary].deliver(user: @user.mail)
+    end
+  end
 end

data/test/unit/discovery_rule_test.rb

@@ -55,6 +55,7 @@ class DiscoveryRuleTest < ActiveSupport::TestCase
     end
   end
 
+  test_attributes :pid => 'b8ae7a80-b9a8-4924-808c-482a2b4102c4'
   test "should create discovery rule with name and minimum required attributes" do
     rule = DiscoveryRule.new(:name => 'new_rule', :search => 'cpu_count = 1', :hostgroup_id => hostgroups(:unusual).id)
     assert_valid rule
@@ -100,6 +101,7 @@ class DiscoveryRuleTest < ActiveSupport::TestCase
     assert_equal "must be present.", rule.errors[:hostgroup].first
   end
 
+  test_attributes :pid => '4ec7d76a-22ba-4c3e-952c-667a6f0a5728'
   test "should not create with invalid priority type" do
     rule = DiscoveryRule.new(
       :name => 'new_rule',
@@ -123,6 +125,7 @@ class DiscoveryRuleTest < ActiveSupport::TestCase
     assert_equal "must be less than 2147483648", rule.errors[:priority].first
   end
 
+  test_attributes :pid => '84503d8d-86f6-49bf-ab97-eff418d3e3d0'
   test "should not create with invalid max count type" do
     rule = DiscoveryRule.new(
       :name => 'new_rule',

data/test/unit/facts_with_lldp.json

@@ -0,0 +1,107 @@
+{
+  "name": "sinn1636.lan",
+  "facts": {
+    "processor3": "Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz",
+    "productname": "IBM System x -[7870K4G]-",
+    "kernelmajversion": "2.6",
+    "kernelversion": "2.6.32",
+    "macaddress_vnet0": "FE:54:00:1E:45:13",
+    "macaddress_br181": "E4:1F:13:CC:36:58",
+    "macaddress_usb0": "E6:1F:13:D0:43:A3",
+    "macaddress_vnet1": "FE:54:00:45:E5:3E",
+    "rubysitedir": "/usr/lib/ruby/site_ruby/1.8",
+    "macaddress_br182": "E4:1F:13:CC:36:58",
+    "processor4": "Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz",
+    "macaddress_vnet2": "FE:54:00:93:F5:56",
+    "macaddress_br183": "E4:1F:13:CC:36:58",
+    "ps": "ps -ef",
+    "processor5": "Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz",
+    "macaddress_vnet10": "FE:54:00:7D:F8:24",
+    "uniqueid": "230a021b",
+    "macaddress_vnet3": "FE:54:00:05:49:DE",
+    "lsbdistcodename": "Santiago",
+    "hardwareisa": "x86_64",
+    "lsbdistrelease": "6.2",
+    "processor6": "Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz",
+    "serialnumber": "abcdefg",
+    "processor7": "Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz",
+    "macaddress_vnet4": "FE:54:00:62:53:67",
+    "hostname": "h02",
+    "osfamily": "RedHat",
+    "gateway_if": "br180",
+    "lsbrelease": ":core-4.0-amd64:core-4.0-noarch:graphics-4.0-amd64:graphics-4.0-noarch:printing-4.0-amd64:printing-4.0-noarch",
+    "kernelrelease": "2.6.32-131.12.1.el6.x86_64",
+    "kernel": "Linux",
+    "facterversion": "1.6.2",
+    "uptime_seconds": "13651752",
+    "macaddress_vnet5": "FE:54:00:01:B9:9C",
+    "interfaces": "br180,br181,br182,br183,eth0,eth0_181,eth0_182,eth0_183,eth1,lo,usb0,vnet0,vnet1,vnet2,vnet3,vnet4,vnet5,vnet7,vnet10",
+    "macaddress_vnet7": "FE:54:00:D8:F9:38",
+    "netmask_br180": "255.255.255.192",
+    "macaddress_eth0": "E4:1F:13:CC:36:58",
+    "is_virtual": "false",
+    "macaddress": "E4:1F:13:CC:36:58",
+    "sshdsakey": "AAAAB3NzaC1kc3MAAACBAIbK60jlhYKSd4Nx6LCQPMUZcq/P1lTY3sQVrwpmfbF7d4JOGed2RWSoTBAzP3/Tjwlf+8DZ3Jd8a6Yhd6WuBzinE+owym8LXo2gDTvelhnzOVrTytM8hAi8uFEiBTGbnN1zka2y7qCPVxEu+kV20qC3mPODGxpV6y/4KOZ5Y4SHAAAAFQCyjeF+Jy9CDhiD2tfnmtMGAn1xzQAAAIBwtnUhhkB0r3ivPdQZgVy6qha8AJQG94I9FU9FnGJJEjkkfqlgNrj9SxV6Cg9EcrntnAKxZxk7PQhgvDesx69Lap9PAx3Ffb5Pl47cd7ilOXv2RJGKuxZQHNdKUF2445POwNjxSuhEkIB3/zpFXBB/zPMRfqUtlXJEwP9m6z9UFgAAAIAQDBpmcGChFP7i8T2RdMZo3hSMnU4y5lpEGhmwfbODoLSAX37wWQwUmwRP8byTEqFL0+5bp3hRbt/67EoD1O6n39/We19g/UqHkbUdZQqLqFjJfyzqfepq4HXtIIT8GbqW+FGJkH9x2fY5gtQrn9nVdmPDTwERFS98qU9glufbIw==",
+    "uptime": "158 days",
+    "manufacturer": "IBM",
+    "macaddress_eth1": "E4:1F:13:CC:36:5A",
+    "timezone": "GMT",
+    "fqdn": "a.server.b.domain",
+    "ipaddress_br180": "10.35.27.2",
+    "ipaddress_eth0": "10.35.27.3",
+    "ipaddress_eth1": "10.35.27.4",
+    "puppetversion": "2.6.12",
+    "path": "/root/.gem/bin:/root/.gem/ruby/1.8/bin:/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin:/sbin:/usr/sbin:/root/scripts",
+    "hardwaremodel": "x86_64",
+    "macaddress_eth0_181": "E4:1F:13:CC:36:58",
+    "netmask_lo": "255.0.0.0",
+    "uptime_days": "158",
+    "virtual": "physical",
+    "operatingsystemrelease": "6.2",
+    "processorcount": "8",
+    "sshrsakey": "AAAAB3NzaC1xcEabbAABIwAAAQEAwXfnuA0+6C6G152kzCbSZvTyUBrMwc0PGnmZgFpC3x4SkcMgRmtayPNqmY1vyYwyka1lNUoyU9u3TXOUkd7WrodoNYBbDQXWCAVpUci5099zUuZ8RVLcokKwNmQO0d1URgSLt2TtuLiUDB7JU2mHkoOuW9n7ODq+UzYsd2wf+/TQrvgsuyi25MROH2Z3WfMO+fmsj77h34gkuaavwB4e6lNRynjZLuEc4POFvDEW6kGCYm1g/8kRwUlB/Z1Cu0egxtxnTjILFFwfYFQu2Ksig020q1gLX3o4YL9X/YZz+JQuAOLGpK3F0owQUL7Ie3vokDsVmz2AweuLDFeh54i2Bw==",
+    "macaddress_eth0_182": "E4:1F:13:CC:36:58",
+    "memorysize": "15.57 GB",
+    "ipaddress": "10.35.27.2",
+    "rubyversion": "1.8.7",
+    "macaddress_eth0_183": "E4:1F:13:CC:36:58",
+    "physicalprocessorcount": "1",
+    "network_lo": "127.0.0.0",
+    "gateway": "10.35.27.62",
+    "lsbdistid": "RedHatEnterpriseServer",
+    "network_br180": "10.35.27.0",
+    "lsbdistdescription": "Red Hat Enterprise Linux Server release 6.2 (Santiago)",
+    "swapsize": "17.70 GB",
+    "processor0": "Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz",
+    "processor1": "Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz",
+    "macaddress_br180": "E4:1F:13:CC:36:58",
+    "selinux": "false",
+    "domain": "server.b.domain",
+    "architecture": "x86_64",
+    "uptime_hours": "3792",
+    "memoryfree": "6.87 GB",
+    "augeasversion": "0.9.0",
+    "operatingsystem": "RedHat",
+    "ipaddress_lo": "127.0.0.1",
+    "processor2": "Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz",
+    "type": "Main Server Chassis",
+    "id": "root",
+    "vlans": "181,182,183",
+    "lsbmajdistrelease": "6",
+    "swapfree": "16.72 GB",
+    "netmask": "255.255.255.192",
+    "discovery_bootif": "E4:1F:13:CC:36:58",
+    "memorysize_mb": "742.13",
+    "blockdevice_sda_size": "214749184",
+    "lldp_neighbor_chassisID_eth1": "0c:27:24:2c:c5:04",
+    "lldp_neighbor_portID_eth1": "Eth170/1/3",
+    "lldp_neighbor_sysName_eth1": "DC2-A03-DR-01",
+    "lldp_neighbor_mngAddr_ipv4_eth1": "192.0.2.13",
+    "lldp_neighbor_PVID_eth1": "184",
+    "lldp_neighbor_chassisID_eth2": "e0:d1:73:38:5a:84",
+    "lldp_neighbor_portID_eth2": "Eth171/1/3",
+    "lldp_neighbor_sysName_eth2": "DC2-A04-DR-03",
+    "lldp_neighbor_mngAddr_ipv4_eth2": "192.0.2.13",
+    "lldp_neighbor_PVID_eth2": "182"
+  }
+}

data/test/unit/facts_with_lldp_bond_candidate.json

@@ -0,0 +1,107 @@
+{
+  "name": "sinn1636.lan",
+  "facts": {
+    "processor3": "Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz",
+    "productname": "IBM System x -[7870K4G]-",
+    "kernelmajversion": "2.6",
+    "kernelversion": "2.6.32",
+    "macaddress_vnet0": "FE:54:00:1E:45:13",
+    "macaddress_br181": "E4:1F:13:CC:36:58",
+    "macaddress_usb0": "E6:1F:13:D0:43:A3",
+    "macaddress_vnet1": "FE:54:00:45:E5:3E",
+    "rubysitedir": "/usr/lib/ruby/site_ruby/1.8",
+    "macaddress_br182": "E4:1F:13:CC:36:58",
+    "processor4": "Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz",
+    "macaddress_vnet2": "FE:54:00:93:F5:56",
+    "macaddress_br183": "E4:1F:13:CC:36:58",
+    "ps": "ps -ef",
+    "processor5": "Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz",
+    "macaddress_vnet10": "FE:54:00:7D:F8:24",
+    "uniqueid": "230a021b",
+    "macaddress_vnet3": "FE:54:00:05:49:DE",
+    "lsbdistcodename": "Santiago",
+    "hardwareisa": "x86_64",
+    "lsbdistrelease": "6.2",
+    "processor6": "Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz",
+    "serialnumber": "abcdefg",
+    "processor7": "Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz",
+    "macaddress_vnet4": "FE:54:00:62:53:67",
+    "hostname": "h02",
+    "osfamily": "RedHat",
+    "gateway_if": "br180",
+    "lsbrelease": ":core-4.0-amd64:core-4.0-noarch:graphics-4.0-amd64:graphics-4.0-noarch:printing-4.0-amd64:printing-4.0-noarch",
+    "kernelrelease": "2.6.32-131.12.1.el6.x86_64",
+    "kernel": "Linux",
+    "facterversion": "1.6.2",
+    "uptime_seconds": "13651752",
+    "macaddress_vnet5": "FE:54:00:01:B9:9C",
+    "interfaces": "br180,br181,br182,br183,eth0,eth0_181,eth0_182,eth0_183,eth1,lo,usb0,vnet0,vnet1,vnet2,vnet3,vnet4,vnet5,vnet7,vnet10",
+    "macaddress_vnet7": "FE:54:00:D8:F9:38",
+    "netmask_br180": "255.255.255.192",
+    "macaddress_eth0": "E4:1F:13:CC:36:58",
+    "is_virtual": "false",
+    "macaddress": "E4:1F:13:CC:36:58",
+    "sshdsakey": "AAAAB3NzaC1kc3MAAACBAIbK60jlhYKSd4Nx6LCQPMUZcq/P1lTY3sQVrwpmfbF7d4JOGed2RWSoTBAzP3/Tjwlf+8DZ3Jd8a6Yhd6WuBzinE+owym8LXo2gDTvelhnzOVrTytM8hAi8uFEiBTGbnN1zka2y7qCPVxEu+kV20qC3mPODGxpV6y/4KOZ5Y4SHAAAAFQCyjeF+Jy9CDhiD2tfnmtMGAn1xzQAAAIBwtnUhhkB0r3ivPdQZgVy6qha8AJQG94I9FU9FnGJJEjkkfqlgNrj9SxV6Cg9EcrntnAKxZxk7PQhgvDesx69Lap9PAx3Ffb5Pl47cd7ilOXv2RJGKuxZQHNdKUF2445POwNjxSuhEkIB3/zpFXBB/zPMRfqUtlXJEwP9m6z9UFgAAAIAQDBpmcGChFP7i8T2RdMZo3hSMnU4y5lpEGhmwfbODoLSAX37wWQwUmwRP8byTEqFL0+5bp3hRbt/67EoD1O6n39/We19g/UqHkbUdZQqLqFjJfyzqfepq4HXtIIT8GbqW+FGJkH9x2fY5gtQrn9nVdmPDTwERFS98qU9glufbIw==",
+    "uptime": "158 days",
+    "manufacturer": "IBM",
+    "macaddress_eth1": "E4:1F:13:CC:36:5A",
+    "timezone": "GMT",
+    "fqdn": "a.server.b.domain",
+    "ipaddress_br180": "10.35.27.2",
+    "ipaddress_eth0": "10.35.27.3",
+    "ipaddress_eth1": "10.35.27.4",
+    "puppetversion": "2.6.12",
+    "path": "/root/.gem/bin:/root/.gem/ruby/1.8/bin:/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin:/sbin:/usr/sbin:/root/scripts",
+    "hardwaremodel": "x86_64",
+    "macaddress_eth0_181": "E4:1F:13:CC:36:58",
+    "netmask_lo": "255.0.0.0",
+    "uptime_days": "158",
+    "virtual": "physical",
+    "operatingsystemrelease": "6.2",
+    "processorcount": "8",
+    "sshrsakey": "AAAAB3NzaC1xcEabbAABIwAAAQEAwXfnuA0+6C6G152kzCbSZvTyUBrMwc0PGnmZgFpC3x4SkcMgRmtayPNqmY1vyYwyka1lNUoyU9u3TXOUkd7WrodoNYBbDQXWCAVpUci5099zUuZ8RVLcokKwNmQO0d1URgSLt2TtuLiUDB7JU2mHkoOuW9n7ODq+UzYsd2wf+/TQrvgsuyi25MROH2Z3WfMO+fmsj77h34gkuaavwB4e6lNRynjZLuEc4POFvDEW6kGCYm1g/8kRwUlB/Z1Cu0egxtxnTjILFFwfYFQu2Ksig020q1gLX3o4YL9X/YZz+JQuAOLGpK3F0owQUL7Ie3vokDsVmz2AweuLDFeh54i2Bw==",
+    "macaddress_eth0_182": "E4:1F:13:CC:36:58",
+    "memorysize": "15.57 GB",
+    "ipaddress": "10.35.27.2",
+    "rubyversion": "1.8.7",
+    "macaddress_eth0_183": "E4:1F:13:CC:36:58",
+    "physicalprocessorcount": "1",
+    "network_lo": "127.0.0.0",
+    "gateway": "10.35.27.62",
+    "lsbdistid": "RedHatEnterpriseServer",
+    "network_br180": "10.35.27.0",
+    "lsbdistdescription": "Red Hat Enterprise Linux Server release 6.2 (Santiago)",
+    "swapsize": "17.70 GB",
+    "processor0": "Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz",
+    "processor1": "Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz",
+    "macaddress_br180": "E4:1F:13:CC:36:58",
+    "selinux": "false",
+    "domain": "server.b.domain",
+    "architecture": "x86_64",
+    "uptime_hours": "3792",
+    "memoryfree": "6.87 GB",
+    "augeasversion": "0.9.0",
+    "operatingsystem": "RedHat",
+    "ipaddress_lo": "127.0.0.1",
+    "processor2": "Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz",
+    "type": "Main Server Chassis",
+    "id": "root",
+    "vlans": "181,182,183",
+    "lsbmajdistrelease": "6",
+    "swapfree": "16.72 GB",
+    "netmask": "255.255.255.192",
+    "discovery_bootif": "E4:1F:13:CC:36:58",
+    "memorysize_mb": "742.13",
+    "blockdevice_sda_size": "214749184",
+    "lldp_neighbor_chassisID_eth1": "0c:27:24:2c:c5:04",
+    "lldp_neighbor_portID_eth1": "Eth170/1/3",
+    "lldp_neighbor_sysName_eth1": "DC2-A03-DR-01",
+    "lldp_neighbor_mngAddr_ipv4_eth1": "192.0.2.13",
+    "lldp_neighbor_PVID_eth1": "182",
+    "lldp_neighbor_chassisID_eth0": "e0:d1:73:38:5a:84",
+    "lldp_neighbor_portID_eth0": "Eth171/1/3",
+    "lldp_neighbor_sysName_eth0": "DC2-A04-DR-03",
+    "lldp_neighbor_mngAddr_ipv4_eth0": "192.0.2.13",
+    "lldp_neighbor_PVID_eth0": "182"
+  }
+}

data/test/unit/host_discovered_test.rb

@@ -19,6 +19,19 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     assert Host::Discovered.find_by_name('mace41f13cc3658')
   end
 
+  test "should import facts from yaml with MAC-based generator as Host::Discovered" do
+    Setting[:discovery_naming] = "MAC-name"
+    host = discover_host_from_facts(@facts)
+    assert_equal "myrna-katie-wesly-maslyn", host.name
+  end
+
+  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)
+    host = discover_host_from_facts(@facts)
+    assert_equal "velma-startin", host.name
+  end
+
   test 'fact value association is set accordingly' do
     discovered_host = FactoryBot.create(:discovered_host, :with_facts, :fact_count => 1)
     fact_value = discovered_host.fact_values.first
@@ -32,6 +45,14 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     assert_equal subnet, host.primary_interface.subnet
   end
 
+  test "should setup subnet when update_subnets_from_facts is true" do
+    Setting[:update_subnets_from_facts] = true
+    subnet = FactoryBot.create(:subnet_ipv4, :name => 'Subnet99', :network => '10.35.27.0', :organizations => [organization_one], :locations => [location_one])
+    Subnet.expects(:subnet_for).with('10.35.27.3').returns(subnet)
+    host = discover_host_from_facts(@facts)
+    assert_equal subnet, host.primary_interface.subnet
+  end
+
   test "should setup subnet with org and loc set via settings" do
     org = FactoryBot.create(:organization, :name => "subnet_org")
     loc = FactoryBot.create(:location, :name => "subnet_loc")
@@ -357,7 +378,57 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     end
   end
 
+  test "primary interface isn't touched with no LLDP facts" do
+    Setting[:discovery_auto_bond] = true
+    raw = parse_json_fixture('/facts.json')['facts']
+    host = discover_host_from_facts(raw)
+    refute_nil host.primary_interface
+    assert_equal "eth0", host.primary_interface.identifier
+  end
+
+  test "provision_interface isn't touched with no peer on the same VLAN" do
+    Setting[:discovery_auto_bond] = true
+    raw = parse_json_fixture('/facts_with_lldp.json')['facts']
+    host = discover_host_from_facts(raw)
+    refute_nil host.primary_interface
+    assert_equal "eth0", host.primary_interface.identifier
+  end
+
+  test "provision_interface is switched to bond0 with more than one interface on the same VLAN" do
+    Setting[:discovery_auto_bond] = true
+    raw = parse_json_fixture('/facts_with_lldp_bond_candidate.json')['facts']
+    host = discover_host_from_facts(raw)
+    refute_nil host.primary_interface
+    assert_equal "bond0", host.primary_interface.identifier
+  end
+
+  test "provision_interface is not switched to bond0 if disabled" do
+    Setting[:discovery_auto_bond] = false
+    raw = parse_json_fixture('/facts_with_lldp_bond_candidate.json')['facts']
+    host = discover_host_from_facts(raw)
+    refute_nil host.primary_interface
+    assert_equal "eth0", host.primary_interface.identifier
+  end
+
+  test "former provision_interface is cleanup up after switching to bond0" do
+    Setting[:discovery_auto_bond] = true
+    raw = parse_json_fixture('/facts_with_lldp_bond_candidate.json')['facts']
+    host = discover_host_from_facts(raw)
+    refute_nil host.primary_interface
+
+    former_interface = nil
+    host.interfaces.each do |interface|
+      former_interface = interface if interface.identifier == 'eth0'
+    end
+
+    refute_nil former_interface
+    assert_instance_of ::Nic::Managed, former_interface
+    assert_nil former_interface.ip
+    assert_nil former_interface.name
+    assert_equal false, former_interface.primary
+  end
+
   def parse_json_fixture(relative_path)
-    return JSON.parse(File.read(File.expand_path(File.dirname(__FILE__) + relative_path)))
+    JSON.parse(File.read(File.expand_path(File.dirname(__FILE__) + relative_path)))
   end
 end

data/test/unit/lldp_neighbors_test.rb

@@ -0,0 +1,56 @@
+require 'test_plugin_helper'
+
+class LldpNeighborsTest < ActiveSupport::TestCase
+  test "#get_neighbors_by_interface gives nothing with no LLDP facts" do
+    assert_nil simple_facts.get_neighbors_by_interface('eth0')
+  end
+
+  test "#get_neighbors_by_interface gives nothing with unmatching PVID in LLDP facts" do
+    assert_nil lldp_facts.get_neighbors_by_interface('eth0')
+  end
+
+  test "#get_neighbors_by_interface gives a valid pair for LLDP facts with matching PVID" do
+    assert_equal %w(eth0 eth1), bond_facts.get_neighbors_by_interface('eth0')
+    assert_equal %w(eth0 eth1), bond_facts.get_neighbors_by_interface('eth1')
+    assert_nil bond_facts.get_neighbors_by_interface('br182')
+  end
+
+  test "#list_by_pvid gives an empty Hash without LLDP facts" do
+    assert_equal({}, simple_facts.list_by_pvid)
+    assert_equal({}, ForemanDiscovery::LldpNeighbors.from_facts({}).list_by_pvid)
+  end
+
+  test "#list_by_pvid gives an empty Hash without LLDP facts" do
+    assert_equal({'182' => %w(eth2), '184' => %w(eth1)}, lldp_facts.list_by_pvid)
+  end
+
+  test "#list_by_pvid pairs interfaces by PVID" do
+    assert_equal({'182' => %w(eth0 eth1)}, bond_facts.list_by_pvid)
+  end
+
+  test "#list_by_pvid supports multiple PVIDs" do
+    assert_equal({'182' => %w(eth2), '184' => %w(eth1)}, lldp_facts.list_by_pvid)
+  end
+
+  private
+
+  def simple_facts
+    neighbors 'facts'
+  end
+
+  def lldp_facts
+    neighbors 'facts_with_lldp'
+  end
+
+  def bond_facts
+    neighbors 'facts_with_lldp_bond_candidate'
+  end
+
+  def neighbors(name)
+    ForemanDiscovery::LldpNeighbors.from_facts(get_facts name)
+  end
+
+  def get_facts(name)
+    JSON.parse(File.read(File.expand_path(File.dirname(__FILE__) + "/#{name}.json")))['facts']
+  end
+end