foreman_discovery 15.1.0 → 16.0.0

data/locale/zh_TW/foreman_discovery.po

@@ -5,10 +5,10 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 15.0.0\n"
+"Project-Id-Version: foreman_discovery 15.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2019-04-18 19:36+0000\n"
-"Last-Translator: Lukáš Zapletal\n"
+"PO-Revision-Date: 2019-10-22 20:43+0000\n"
+"Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/foreman/foreman/lang"
 "uage/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -32,6 +32,9 @@ msgstr ""
 msgid "A summary of discovered hosts"
 msgstr ""
 
+msgid "Action with sub plans"
+msgstr "有子計畫的動作"
+
 msgid "Actions"
 msgstr "動作"
 
@@ -345,6 +348,9 @@ msgstr "IP 位址"
 msgid "IP address"
 msgstr "IP 位址"
 
+msgid "IPAM must be configured for subnet '%s'"
+msgstr ""
+
 msgid "IPMI"
 msgstr "IPMI"
 
@@ -360,6 +366,12 @@ msgstr ""
 msgid "Image API returned HTTP/%{code} with '%{body}"
 msgstr ""
 
+msgid "Import Puppet classes"
+msgstr "匯入 Puppet 類別"
+
+msgid "Import facts"
+msgstr "匯入詳情"
+
 msgid "In addition to @host attribute function rand for random integers is available. Examples:"
 msgstr ""
 
@@ -576,6 +588,9 @@ msgstr ""
 msgid "Reloading kernel on %s"
 msgstr ""
 
+msgid "Remote action:"
+msgstr "遠端動作："
+
 msgid "Reported in the last 7 days"
 msgstr ""
 

data/test/facts/bond0-eth0-eth1-active-passive.json

@@ -0,0 +1,128 @@
+{
+  "uptime_seconds": 206,
+  "architecture": "x86_64",
+  "virtual": "kvm",
+  "is_virtual": true,
+  "kernel": "Linux",
+  "blockdevice_vda_size": 6442450944,
+  "blockdevice_vda_vendor": "0x1af4",
+  "blockdevices": "vda",
+  "dhcp_servers": {
+    "system": "192.168.122.1",
+    "bond0": "192.168.122.1"
+  },
+  "domain": "nat.lan",
+  "hardwaremodel": "x86_64",
+  "operatingsystem": "CentOS",
+  "os": {
+    "name": "CentOS",
+    "family": "RedHat",
+    "release": {
+      "major": "7",
+      "minor": "6",
+      "full": "7.6.1810"
+    }
+  },
+  "facterversion": "2.4.1",
+  "filesystems": "xfs",
+  "fqdn": "localhost.nat.lan",
+  "gid": "root",
+  "hardwareisa": "x86_64",
+  "hostname": "localhost",
+  "id": "root",
+  "interfaces": "bond0,eth0,eth1,lo",
+  "ipaddress_bond0": "192.168.122.7",
+  "macaddress_bond0": "52:54:00:fd:1e:62",
+  "netmask_bond0": "255.255.255.0",
+  "mtu_bond0": 1500,
+  "macaddress_eth0": "52:54:00:FD:1E:62",
+  "mtu_eth0": 1500,
+  "macaddress_eth1": "52:54:00:7C:84:DA",
+  "mtu_eth1": 1500,
+  "ipaddress_lo": "127.0.0.1",
+  "netmask_lo": "255.0.0.0",
+  "mtu_lo": 65536,
+  "ipaddress": "192.168.122.7",
+  "kernelmajversion": "3.10",
+  "kernelrelease": "3.10.0-957.el7.x86_64",
+  "kernelversion": "3.10.0",
+  "rubyplatform": "x86_64-linux",
+  "macaddress": "52:54:00:fd:1e:62",
+  "bios_vendor": "SeaBIOS",
+  "bios_version": "1.12.0-2.fc30",
+  "bios_release_date": "04/01/2014",
+  "manufacturer": "QEMU",
+  "productname": "Standard PC (Q35 + ICH9, 2009)",
+  "serialnumber": "Not Specified",
+  "uuid": "d1e61ef9-663e-4195-b256-f64b9f8cc8ae",
+  "type": "Other",
+  "memorysize": "8.41 GB",
+  "memoryfree": "8.20 GB",
+  "swapsize": "615.00 MB",
+  "swapfree": "615.00 MB",
+  "swapsize_mb": "615.00",
+  "swapfree_mb": "615.00",
+  "memorysize_mb": "8615.46",
+  "memoryfree_mb": "8395.15",
+  "netmask": "255.255.255.0",
+  "network_bond0": "192.168.122.0",
+  "network_lo": "127.0.0.0",
+  "uptime_hours": 0,
+  "operatingsystemmajrelease": "7",
+  "rubysitedir": "/usr/local/share/ruby/site_ruby/",
+  "operatingsystemrelease": "7.6.1810",
+  "osfamily": "RedHat",
+  "partitions": {
+    "vda1": {
+      "size": "2048"
+    },
+    "vda2": {
+      "uuid": "1f259325-5eb4-4334-81f3-699ace4a28ff",
+      "size": "2097152",
+      "mount": "/boot",
+      "filesystem": "xfs"
+    },
+    "vda3": {
+      "uuid": "6639b5c4-1ba1-41d6-a4a0-6253eeaaae05",
+      "size": "1259520",
+      "filesystem": "swap"
+    },
+    "vda4": {
+      "uuid": "09aced65-5b86-4efe-9da0-c86a3311e1b8",
+      "size": "9220096",
+      "mount": "/",
+      "filesystem": "xfs"
+    }
+  },
+  "path": "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin",
+  "rubyversion": "2.0.0",
+  "physicalprocessorcount": 2,
+  "processors": {
+    "models": [
+      "AMD EPYC Processor (with IBPB)",
+      "AMD EPYC Processor (with IBPB)"
+    ],
+    "count": 2,
+    "physicalcount": 2
+  },
+  "processor0": "AMD EPYC Processor (with IBPB)",
+  "processor1": "AMD EPYC Processor (with IBPB)",
+  "processorcount": 2,
+  "ps": "ps -ef",
+  "selinux": true,
+  "selinux_enforced": true,
+  "selinux_policyversion": "31",
+  "selinux_current_mode": "enforcing",
+  "selinux_config_mode": "enforcing",
+  "selinux_config_policy": "unknown",
+  "system_uptime": {
+    "seconds": 206,
+    "hours": 0,
+    "days": 0,
+    "uptime": "0:03 hours"
+  },
+  "timezone": "EDT",
+  "uniqueid": "007f0100",
+  "uptime": "0:03 hours",
+  "uptime_days": 0
+}

data/test/facts/facts_with_lldp_bond_candidate.json

@@ -6,14 +6,11 @@
     "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",
@@ -28,16 +25,15 @@
     "macaddress_vnet4": "FE:54:00:62:53:67",
     "hostname": "h02",
     "osfamily": "RedHat",
-    "gateway_if": "br180",
+    "gateway_if": "eth0",
     "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",
+    "interfaces": "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",
@@ -47,7 +43,6 @@
     "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",
@@ -69,12 +64,10 @@
     "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",

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

@@ -25,6 +25,7 @@ class Api::V2::DiscoveredHostsControllerTest < ActionController::TestCase
     }
     set_default_settings
     ::ForemanDiscovery::NodeAPI::PowerService.any_instance.stubs(:reboot).returns(true)
+    ::ForemanDiscovery::HostConverter.stubs(:unused_ip_for_host)
   end
 
   def test_get_index

data/test/integration/discovered_hosts_test.rb

@@ -10,6 +10,7 @@ class DiscoveredHostsTest < IntegrationTestWithJavascript
     discovered_host.save!
     visit discovered_hosts_path
     page.evaluate_script("document.getElementById('fixedPropertiesSelector-#{discovered_host.id}').classList.remove('fade')")
+    ::ForemanDiscovery::HostConverter.stubs(:unused_ip_for_host)
   end
 
   teardown do

data/test/test_helper_discovery.rb

@@ -133,6 +133,18 @@ def facts_simple_network100_42
   }
 end
 
+def facts_network_2001_db8
+  {
+    "interfaces"       => "lo,eth0,eth1",
+    "ipaddress6"        => "2001:db8::1",
+    "ipaddress6_eth0"   => "2001:db8::1",
+    "ipaddress6_eth1"   => "2001:db9::1",
+    "macaddress_eth0"  => "AA:BB:CC:DD:EE:FA",
+    "macaddress_eth1"  => "AA:BB:CC:DD:EE:FB",
+    "discovery_bootif" => "AA:BB:CC:DD:EE:FA",
+  }
+end
+
 def discover_host_from_facts(facts)
   User.as_anonymous_admin do
     Host::Discovered.import_host(facts)

data/test/unit/discovered_extensions_test.rb

@@ -7,7 +7,9 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
 
   setup do
     @facts = facts_simple_network100_42
+    @facts_ipv6 = facts_network_2001_db8
     set_default_settings
+    ::ForemanDiscovery::HostConverter.stubs(:unused_ip_for_host)
   end
 
   test "no rule is found for empty rule set" do
@@ -179,6 +181,53 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
     assert_equal hostgroup.puppet_ca_proxy, managed_host.puppet_ca_proxy
   end
 
+  class StubIPAM
+    def suggest_ip
+      "192.168.101.13"
+    end
+  end
+
+  test "subnet is changed and unused_ip called" do
+    ::ForemanDiscovery::HostConverter.unstub(:unused_ip_for_host)
+    facts = @facts.merge({"somefact" => "abc"})
+    domain = FactoryBot.create(:domain)
+    subnet = FactoryBot.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")])
+    subnet2 = FactoryBot.create(:subnet_ipv4, :tftp, :dhcp, :name => 'subnet_101', :network => '192.168.101.0', :organizations => [Organization.find_by_name("Organization 1")], :locations => [Location.find_by_name("Location 1")])
+    host = discover_host_from_facts(facts)
+    assert_equal subnet, host.subnet
+    hostgroup = FactoryBot.create(:hostgroup, :with_environment, :with_rootpass, :with_puppet_orchestration, :with_os, :pxe_loader => "PXELinux BIOS", :subnet => subnet2, :domain => domain)
+    r1 = FactoryBot.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc", :organizations => [host.organization], :locations => [host.location], :hostgroup => hostgroup)
+    Subnet.any_instance.expects(:unused_ip).with(host.mac).returns(StubIPAM.new)
+    host.primary_interface.stubs(:queue_tftp)
+    host.primary_interface.stubs(:queue_dhcp)
+    managed_host = perform_auto_provision(host, r1)
+    assert_empty host.errors
+    assert managed_host
+    assert_empty managed_host.errors
+    assert_equal hostgroup.subnet, managed_host.subnet
+    assert_equal "192.168.101.13", managed_host.ip
+  end
+
+  test "subnet6 is changed and unused_ip called" do
+    ::ForemanDiscovery::HostConverter.unstub(:unused_ip_for_host)
+    facts = @facts_ipv6.merge({"somefact" => "abc"})
+    domain = FactoryBot.create(:domain)
+    subnet = FactoryBot.create(:subnet_ipv6, :tftp, :dhcp, :network => "2001:db8::/32", :mask => "ffff:ffff::", :name => "ipv6_discovered", :ipam => IPAM::MODES[:eui64], :organizations => [Organization.find_by_name("Organization 1")], :locations => [Location.find_by_name("Location 1")])
+    subnet2 = FactoryBot.create(:subnet_ipv6, :tftp, :dhcp, :network => "2001:db9::/32", :mask => "ffff:ffff::", :name => "ipv6_provision", :ipam => IPAM::MODES[:eui64], :organizations => [Organization.find_by_name("Organization 1")], :locations => [Location.find_by_name("Location 1")])
+    host = discover_host_from_facts(facts)
+    assert_equal subnet, host.subnet6
+    hostgroup = FactoryBot.create(:hostgroup, :with_environment, :with_rootpass, :with_puppet_orchestration, :with_os, :pxe_loader => "PXELinux BIOS", :subnet6 => subnet2, :domain => domain)
+    r1 = FactoryBot.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc", :organizations => [host.organization], :locations => [host.location], :hostgroup => hostgroup)
+    host.primary_interface.stubs(:queue_tftp)
+    host.primary_interface.stubs(:queue_dhcp)
+    managed_host = perform_auto_provision(host, r1)
+    assert_empty host.errors
+    assert managed_host
+    assert_empty managed_host.errors
+    assert_equal hostgroup.subnet, managed_host.subnet
+    assert_equal "2001:db9::a8bb:ccff:fedd:eefa", managed_host.ip6
+  end
+
   test "attributes from hostgroup are copied after auto provisioning for host without subnet detected" do
     facts = @facts.merge({"somefact" => "abc"})
     host = discover_host_from_facts(facts)

data/test/unit/discovery_attribute_set_test.rb

@@ -14,6 +14,7 @@ class DiscoveryAttributeSetTest < ActiveSupport::TestCase
                        :name => 'discovery_prefix',
                        :value => 'mac',
                        :category => 'Setting::Discovered')
+    ::ForemanDiscovery::HostConverter.stubs(:unused_ip_for_host)
   end
 
   test "can search discovered hosts by cpu" do

data/test/unit/discovery_rule_test.rb

@@ -3,6 +3,7 @@ require_relative '../test_plugin_helper'
 class DiscoveryRuleTest < ActiveSupport::TestCase
   setup do
     @hostgroup = FactoryBot.create(:hostgroup)
+    ::ForemanDiscovery::HostConverter.stubs(:unused_ip_for_host)
   end
 
   should allow_values(*valid_name_list).for(:name)

data/test/unit/host_discovered_test.rb

@@ -7,6 +7,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
   setup do
     @facts = parse_json_fixture('regular_host', true)
     set_default_settings
+    ::ForemanDiscovery::HostConverter.stubs(:unused_ip_for_host)
   end
 
   test "should be able to create Host::Discovered objects" do
@@ -38,9 +39,20 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     assert_equal discovered_host.id, fact_value.host.id
   end
 
+  test "should detect bridge as the primary" do
+    # Detected primary should be the bridge (.2)
+    # "ipaddress_br180": "10.35.27.2"
+    # "ipaddress_eth0": "10.35.27.3"
+    # "ipaddress": "10.35.27.2"
+    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.2').returns(subnet)
+    host = discover_host_from_facts(@facts)
+    assert_equal '10.35.27.2', host.primary_interface.ip
+  end
+
   test "should setup subnet" do
     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)
+    Subnet.expects(:subnet_for).with('10.35.27.2').returns(subnet)
     host = discover_host_from_facts(@facts)
     assert_equal subnet, host.primary_interface.subnet
   end
@@ -48,7 +60,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
   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)
+    Subnet.expects(:subnet_for).with('10.35.27.2').returns(subnet)
     host = discover_host_from_facts(@facts)
     assert_equal subnet, host.primary_interface.subnet
   end
@@ -59,7 +71,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     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)
+    Subnet.expects(:subnet_for).with('10.35.27.2').returns(subnet)
     host = discover_host_from_facts(@facts)
     assert_equal subnet, host.primary_interface.subnet
     assert_equal org, host.organization
@@ -74,7 +86,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     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)
+    Subnet.expects(:subnet_for).with('10.35.27.2').returns(subnet)
     host = discover_host_from_facts(@facts)
     assert_equal subnet, host.primary_interface.subnet
     assert host.organization
@@ -92,7 +104,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
       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)
+      Subnet.expects(:subnet_for).with('10.35.27.2').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
@@ -111,7 +123,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     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)
+    Subnet.expects(:subnet_for).with('10.35.27.2').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
@@ -129,7 +141,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
       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)
+      Subnet.expects(:subnet_for).with('10.35.27.2').returns(subnet)
       host = discover_host_from_facts(@facts)
       assert_equal subnet, host.primary_interface.subnet
       assert_equal org, host.organization
@@ -148,7 +160,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     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)
+    Subnet.expects(:subnet_for).with('10.35.27.2').returns(subnet)
     host = discover_host_from_facts(@facts)
     assert_equal org, host.organization
     assert_equal loc, host.location
@@ -188,7 +200,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
                                   :organizations => [organization_one],
                                   :locations => [location_one]
       )
-      Subnet.expects(:subnet_for).with('10.35.27.3').returns(subnet)
+      Subnet.expects(:subnet_for).with('10.35.27.2').returns(subnet)
       ProxyAPI::TFTP.any_instance.expects(:set).with(anything, 'e4:1f:13:cc:36:58', anything).returns(true).times(3)
       TemplateKind::PXE.each do |kind|
         ProvisioningTemplate.where(:name => "#{kind.downcase}_discovery").first_or_create(
@@ -259,14 +271,14 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     assert_equal 'mace41f13cc3658', host1.name
     assert_equal 'IBM System x -[7870K4G]-', host1.facts["productname"]
     assert_equal 1, Host::Discovered.where(:name => 'mace41f13cc3658').count
-    assert_equal '10.35.27.3', host1.ip
+    assert_equal '10.35.27.2', host1.ip
 
     @facts["ipaddress_eth0"] = "1.2.3.4"
     @facts["productname"] = "Dishwasher DW400"
     host2 = discover_host_from_facts(@facts)
     assert_equal 'mace41f13cc3658', host2.name
     assert_equal 'Dishwasher DW400', host2.facts["productname"]
-    assert_equal '1.2.3.4', host2.ip
+    assert_equal '10.35.27.2', host2.ip
     assert_equal 1, Host::Discovered.where(:name => 'mace41f13cc3658').count
   end
 
@@ -438,12 +450,19 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     end
   end
 
+  test "primary interface via tagged VLAN is discovered with an IP" do
+    raw = parse_json_fixture('rhel7-vlan')
+    host = discover_host_from_facts(raw)
+    assert_equal "192.168.1.16", host.ip
+    assert_equal "eno49.444", host.primary_interface.identifier
+  end
+
   test "primary interface isn't touched with no LLDP facts" do
     Setting[:discovery_auto_bond] = true
     raw = parse_json_fixture('regular_host', true)
     host = discover_host_from_facts(raw)
     refute_nil host.primary_interface
-    assert_equal "eth0", host.primary_interface.identifier
+    assert_equal "br180", host.primary_interface.identifier
   end
 
   test "provision_interface isn't touched with no peer on the same VLAN" do
@@ -451,7 +470,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     raw = parse_json_fixture('facts_with_lldp', true)
     host = discover_host_from_facts(raw)
     refute_nil host.primary_interface
-    assert_equal "eth0", host.primary_interface.identifier
+    assert_equal "br180", host.primary_interface.identifier
   end
 
   test "provision_interface is switched to bond0 with more than one interface on the same VLAN" do