foreman_discovery 20.0.0 → 21.0.1

data/locale/ru/foreman_discovery.po

@@ -10,10 +10,10 @@
 # Yulia <yulia.poyarkova@redhat.com>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 18.0.1\n"
+"Project-Id-Version: foreman_discovery 21.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2021-09-20 17:24+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"PO-Revision-Date: 2013-11-15 17:25+0000\n"
+"Last-Translator: Yulia <yulia.poyarkova@redhat.com>, 2016\n"
 "Language-Team: Russian (http://www.transifex.com/foreman/foreman/language/ru/)"
 "\n"
 "MIME-Version: 1.0\n"
@@ -520,12 +520,18 @@ msgstr ""
 msgid "New in the last 24 hours"
 msgstr "Новое за последние 24 часа"
 
+msgid "No Discovery Rules found in this context. Create Discovery Rules to perform automated provisioning on Discovered Hosts"
+msgstr ""
+
 msgid "No discovered hosts available"
 msgstr "Нет обнаруженных узлов"
 
 msgid "No discovered hosts for the selected period"
 msgstr "За указанный период времени новых узлов не обнаружено"
 
+msgid "No discovered hosts found in this context. This page shows discovered bare-metal or virtual nodes waiting to be provisioned."
+msgstr ""
+
 msgid "No discovered hosts to provision"
 msgstr "Нет обнаруженных узлов"
 

data/locale/sv_SE/foreman_discovery.po

@@ -8,10 +8,10 @@
 # johnny.westerlund <johnny.westerlund@gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 18.0.1\n"
+"Project-Id-Version: foreman_discovery 21.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2021-09-20 17:24+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"PO-Revision-Date: 2013-11-15 17:25+0000\n"
+"Last-Translator: johnny.westerlund <johnny.westerlund@gmail.com>, 2014\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/foreman/foreman/lang"
 "uage/sv_SE/)\n"
 "MIME-Version: 1.0\n"
@@ -66,7 +66,7 @@ msgid "Automatically reboot or kexec discovered host during provisioning"
 msgstr ""
 
 msgid "Back"
-msgstr ""
+msgstr "Tillbaka"
 
 msgid "CPUs"
 msgstr "CPUer"
@@ -135,7 +135,7 @@ msgid "Destroyed selected hosts"
 msgstr "Förstör markerade värdar"
 
 msgid "Details"
-msgstr ""
+msgstr "Detaljer"
 
 msgid "Disable"
 msgstr ""
@@ -311,7 +311,7 @@ msgid "Foreman discovered hosts summary"
 msgstr ""
 
 msgid "Hardware"
-msgstr ""
+msgstr "Hårdvara"
 
 msgid "Hardware facts"
 msgstr ""
@@ -366,7 +366,7 @@ msgid "Hostnames must not start with numbers. A good approach is to use unique i
 msgstr ""
 
 msgid "Hosts"
-msgstr ""
+msgstr "Värdar"
 
 msgid "Hosts Limit"
 msgstr ""
@@ -456,7 +456,7 @@ msgid "Location"
 msgstr "Lokation"
 
 msgid "Locations"
-msgstr ""
+msgstr "Lokationer"
 
 msgid "Lock PXE"
 msgstr ""
@@ -498,7 +498,7 @@ msgid "Name of the parameter"
 msgstr "Parameterns namn"
 
 msgid "Network"
-msgstr ""
+msgstr "Nätverk"
 
 msgid "Network facts"
 msgstr ""
@@ -512,12 +512,18 @@ msgstr ""
 msgid "New in the last 24 hours"
 msgstr ""
 
+msgid "No Discovery Rules found in this context. Create Discovery Rules to perform automated provisioning on Discovered Hosts"
+msgstr ""
+
 msgid "No discovered hosts available"
 msgstr ""
 
 msgid "No discovered hosts for the selected period"
 msgstr ""
 
+msgid "No discovered hosts found in this context. This page shows discovered bare-metal or virtual nodes waiting to be provisioned."
+msgstr ""
+
 msgid "No discovered hosts to provision"
 msgstr ""
 
@@ -549,7 +555,7 @@ msgid "Organization"
 msgstr "Organisation"
 
 msgid "Organizations"
-msgstr ""
+msgstr "Organisationer"
 
 msgid "PXEGrub template to be used when pinning a host to discovery"
 msgstr ""
@@ -573,7 +579,7 @@ msgid "Prefer IPv6 to IPv4 when calling discovered nodes"
 msgstr ""
 
 msgid "Primary"
-msgstr ""
+msgstr "Primär"
 
 msgid "Provision"
 msgstr "Provisionera"
@@ -678,7 +684,7 @@ msgid "Specify target hostname template pattern in the same syntax as in Provisi
 msgstr ""
 
 msgid "Storage"
-msgstr ""
+msgstr "Lagring"
 
 msgid "Storage facts"
 msgstr ""
@@ -717,7 +723,7 @@ msgid "This might take a while, as all hosts, facts and reports will be destroye
 msgstr "Detta kan dröja då alla värdar, fakta och rapporter också kommer bli förstörda"
 
 msgid "Type"
-msgstr ""
+msgstr "Typ"
 
 msgid "Type of name generator"
 msgstr ""

data/locale/zh_CN/foreman_discovery.po

@@ -5,10 +5,10 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 18.0.1\n"
+"Project-Id-Version: foreman_discovery 21.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2021-09-20 17:24+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"PO-Revision-Date: 2013-11-15 17:25+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/foreman/foreman/langu"
 "age/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -506,12 +506,18 @@ msgstr "新主机"
 msgid "New in the last 24 hours"
 msgstr "在最近 24 小时之内新建"
 
+msgid "No Discovery Rules found in this context. Create Discovery Rules to perform automated provisioning on Discovered Hosts"
+msgstr ""
+
 msgid "No discovered hosts available"
 msgstr "没有可用的发现主机"
 
 msgid "No discovered hosts for the selected period"
 msgstr "选定时间段内没有发现主机"
 
+msgid "No discovered hosts found in this context. This page shows discovered bare-metal or virtual nodes waiting to be provisioned."
+msgstr ""
+
 msgid "No discovered hosts to provision"
 msgstr "没有要置备的发现主机"
 
@@ -561,10 +567,10 @@ msgid "Please Confirm"
 msgstr "请确认"
 
 msgid "Prefer IPv6"
-msgstr ""
+msgstr "首选使用 IPv6"
 
 msgid "Prefer IPv6 to IPv4 when calling discovered nodes"
-msgstr ""
+msgstr "在调用发现节点时，首选 IPv6 而不是 IPv4"
 
 msgid "Primary"
 msgstr "主"

data/locale/zh_TW/foreman_discovery.po

@@ -5,10 +5,10 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 18.0.1\n"
+"Project-Id-Version: foreman_discovery 21.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2021-09-20 17:24+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"PO-Revision-Date: 2013-11-15 17:25+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/foreman/foreman/lang"
 "uage/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -509,12 +509,18 @@ msgstr ""
 msgid "New in the last 24 hours"
 msgstr ""
 
+msgid "No Discovery Rules found in this context. Create Discovery Rules to perform automated provisioning on Discovered Hosts"
+msgstr ""
+
 msgid "No discovered hosts available"
 msgstr ""
 
 msgid "No discovered hosts for the selected period"
 msgstr ""
 
+msgid "No discovered hosts found in this context. This page shows discovered bare-metal or virtual nodes waiting to be provisioned."
+msgstr ""
+
 msgid "No discovered hosts to provision"
 msgstr ""
 

data/package.json

@@ -21,16 +21,14 @@
     "url": "http://projects.theforeman.org/projects/foreman_discovery/issues"
   },
   "peerDependencies": {
-    "@theforeman/vendor": "^6.0.0"
+    "@theforeman/vendor": ">= 0"
   },
   "devDependencies": {
     "@babel/core": "^7.7.0",
-    "@theforeman/builder": "^6.0.0",
-    "@theforeman/eslint-plugin-foreman": "^6.0.0",
-    "@theforeman/stories": "^7.0.0",
-    "@theforeman/test": "^8.0.0",
-    "@theforeman/vendor-dev": "^6.0.0",
-    "babel-eslint": "^10.0.3",
+    "@theforeman/builder": ">= 0",
+    "@theforeman/eslint-plugin-foreman": ">= 0",
+    "@theforeman/stories": ">= 0",
+    "@theforeman/test": ">= 0",
     "eslint": "^6.7.2",
     "prettier": "^1.19.1",
     "stylelint": "^9.3.0",

data/test/unit/discovered_extensions_test.rb

@@ -196,6 +196,19 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
     def suggest_ip
       "192.168.101.13"
     end
+
+    def ip_addr
+      @ip_addr ||= IPAddr.new("#{suggest_ip}/24")
+    end
+    
+    
+    def subnet_range
+      @subnet_range ||= ip_addr.to_range
+    end
+
+    def ip_include?(ip)
+      ip_addr.include?(ip)
+    end
   end
 
   test "subnet is changed and unused_ip called" do
@@ -208,7 +221,7 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
     assert_equal subnet, host.subnet
     hostgroup = FactoryBot.create(:hostgroup, :with_rootpass, :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)
+    Subnet.any_instance.expects(:unused_ip).at_least_once.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)

data/test/unit/host_discovered_test.rb

@@ -408,12 +408,18 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     assert_match(/Invalid hostname: Could not normalize the hostname/, exception.message)
   end
 
-  test "chooshing the first valid fact from array of fact names" do
+  test "choosing the first valid fact from array of fact names" do
     facts = {"custom_hostname" => "testhostname","notmyfact" => "notusedfactvalue"}
     discovery_hostname_fact_array = ['macaddress','custom_hostname','someotherfact']
     assert_equal Host::Discovered.return_first_valid_fact(discovery_hostname_fact_array,facts),"testhostname"
   end
 
+  test "choosing the first valid MAC address from array of fact names" do
+    facts = {"custom_hostname" => "testhostname","macaddress" => "e5:17:4e:28:02:4c","notmyfact" => "notusedfactvalue"}
+    discovery_hostname_fact_array = ['custom_hostname','macaddress','someotherfact']
+    assert_equal Host::Discovered.return_first_valid_mac(discovery_hostname_fact_array,facts),"e5:17:4e:28:02:4c"
+  end
+
   context 'notification recipients' do
     setup do
       @admins = User.except_hidden.where(:admin => true).pluck(:id)

data/test/unit/managed_extensions_test.rb

@@ -91,7 +91,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 nokaslr nomodeset",
+        "append" => "inst.ks=http://foreman.example.com/unattended/provision&static=yes inst.ks.sendmac ip=::::::none nameserver= ksdevice=bootif BOOTIF= nomodeset nokaslr nomodeset",
         "extra" => []
       }
       assert @host.operatingsystem.respond_to?(:pxe_type)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_discovery
 version: !ruby/object:Gem::Version
-  version: 20.0.0
+  version: 21.0.1
 platform: ruby
 authors:
 - Aditi Puntambekar
@@ -31,6 +31,8 @@ authors:
 - imriz
 - Imri Zvik
 - Ivan Nečas
+- Jan Matusz
+- John Mazzie
 - Joseph Mitchell Magen
 - June Zhang
 - kgaikwad
@@ -74,7 +76,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-25 00:00:00.000000000 Z
+date: 2022-04-27 00:00:00.000000000 Z
 dependencies: []
 description: MaaS Discovery Plugin engine for Foreman
 email: gsutclif@redhat.com
@@ -201,51 +203,35 @@ files:
 - lib/foreman_discovery/engine.rb
 - lib/foreman_discovery/version.rb
 - locale/ca/LC_MESSAGES/foreman_discovery.mo
-- locale/ca/foreman_discovery.edit.po
 - locale/ca/foreman_discovery.po
 - locale/de/LC_MESSAGES/foreman_discovery.mo
-- locale/de/foreman_discovery.edit.po
 - locale/de/foreman_discovery.po
 - locale/en/LC_MESSAGES/foreman_discovery.mo
-- locale/en/foreman_discovery.edit.po
 - locale/en/foreman_discovery.po
 - locale/en_GB/LC_MESSAGES/foreman_discovery.mo
-- locale/en_GB/foreman_discovery.edit.po
 - locale/en_GB/foreman_discovery.po
 - locale/es/LC_MESSAGES/foreman_discovery.mo
-- locale/es/foreman_discovery.edit.po
 - locale/es/foreman_discovery.po
 - locale/foreman_discovery.pot
 - locale/fr/LC_MESSAGES/foreman_discovery.mo
-- locale/fr/foreman_discovery.edit.po
 - locale/fr/foreman_discovery.po
 - locale/gl/LC_MESSAGES/foreman_discovery.mo
-- locale/gl/foreman_discovery.edit.po
 - locale/gl/foreman_discovery.po
 - locale/it/LC_MESSAGES/foreman_discovery.mo
-- locale/it/foreman_discovery.edit.po
 - locale/it/foreman_discovery.po
 - locale/ja/LC_MESSAGES/foreman_discovery.mo
-- locale/ja/foreman_discovery.edit.po
 - locale/ja/foreman_discovery.po
 - locale/ko/LC_MESSAGES/foreman_discovery.mo
-- locale/ko/foreman_discovery.edit.po
 - locale/ko/foreman_discovery.po
-- locale/messages.mo
 - locale/pt_BR/LC_MESSAGES/foreman_discovery.mo
-- locale/pt_BR/foreman_discovery.edit.po
 - locale/pt_BR/foreman_discovery.po
 - locale/ru/LC_MESSAGES/foreman_discovery.mo
-- locale/ru/foreman_discovery.edit.po
 - locale/ru/foreman_discovery.po
 - locale/sv_SE/LC_MESSAGES/foreman_discovery.mo
-- locale/sv_SE/foreman_discovery.edit.po
 - locale/sv_SE/foreman_discovery.po
 - locale/zh_CN/LC_MESSAGES/foreman_discovery.mo
-- locale/zh_CN/foreman_discovery.edit.po
 - locale/zh_CN/foreman_discovery.po
 - locale/zh_TW/LC_MESSAGES/foreman_discovery.mo
-- locale/zh_TW/foreman_discovery.edit.po
 - locale/zh_TW/foreman_discovery.po
 - package.json
 - test/factories/discovery_host_related.rb
@@ -332,10 +318,12 @@ summary: MaaS Discovery Plugin for Foreman
 test_files:
 - test/factories/discovery_host_related.rb
 - test/factories/discovery_rule_related.rb
+- test/facts/bond0-eth0-eth1-active-passive.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/regular_host.json
 - test/facts/rhel-dl380-1kdisks.json
@@ -344,28 +332,26 @@ test_files:
 - test/facts/simple-bond.json
 - test/facts/suse-vmware.json
 - test/facts/vmware_local.json
-- test/facts/bond0-eth0-eth1-active-passive.json
-- test/facts/facts_with_lldp_bond_candidate.json
 - test/facts/only-ipv6.json
 - test/facts/skylake-ipv6.json
 - test/functional/api/v2/discovery_rules_controller_test.rb
 - test/functional/api/v2/discovered_hosts_controller_test.rb
 - test/functional/api/v2/fact_value_extensions_test.rb
 - test/functional/foreman_discovery/concerns/hosts_controller_extensions_test.rb
-- test/functional/discovery_rules_controller_test.rb
 - test/functional/discovered_hosts_controller_test.rb
+- test/functional/discovery_rules_controller_test.rb
 - test/integration/discovered_hosts_test.rb
-- test/unit/ui_notifications/destroy_host_test.rb
-- test/unit/ui_notifications/new_host_test.rb
 - test/unit/discovered_mailer_test.rb
 - test/unit/discovery_taxonomy_extensions_test.rb
 - test/unit/lldp_neighbors_test.rb
-- test/unit/discovery_rule_test.rb
-- test/unit/fact_to_category_resolver_test.rb
-- test/unit/managed_extensions_test.rb
-- test/unit/host_discovered_test.rb
+- test/unit/ui_notifications/destroy_host_test.rb
+- test/unit/ui_notifications/new_host_test.rb
 - test/unit/discovered_extensions_test.rb
 - test/unit/discovery_attribute_set_test.rb
+- test/unit/discovery_rule_test.rb
 - test/unit/fact_parser_test.rb
+- test/unit/fact_to_category_resolver_test.rb
+- test/unit/host_discovered_test.rb
+- test/unit/managed_extensions_test.rb
 - test/test_helper_discovery.rb
 - test/test_plugin_helper.rb