foreman_discovery 20.0.1 → 21.0.0

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.edit.po

@@ -5,11 +5,11 @@
 # 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"
-"POT-Creation-Date: 2021-11-25 10:15+0100\n"
-"PO-Revision-Date: 2021-09-20 17:24+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2022-03-17 14:06+0100\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"
@@ -460,31 +460,31 @@ msgstr "无效详情，必须是 Hash"
 msgid "Expected discovery_fact '%s' is missing, unable to detect primary interface and set hostname"
 msgstr "缺少期望的 discovery_fact '%s'，无法检测主接口和设置主机名称"
 
-#: ../app/models/host/discovered.rb:73
+#: ../app/models/host/discovered.rb:74
 msgid "Invalid facts: hash does not contain a valid value for any of the facts in the discovery_hostname setting: %s"
 msgstr "无效详情：hash 不包含 discovery_hostname 设置中任何详情的有效值：%s"
 
-#: ../app/models/host/discovered.rb:102
+#: ../app/models/host/discovered.rb:103
 msgid "Facts could not be imported"
 msgstr "无法导入详情"
 
-#: ../app/models/host/discovered.rb:160
+#: ../app/models/host/discovered.rb:161
 msgid "Could not get facts from proxy %{url}: %{error}"
 msgstr "无法从代理 %{url} 获得详情：%{error}"
 
-#: ../app/models/host/discovered.rb:178
+#: ../app/models/host/discovered.rb:179
 msgid "Unable to perform reboot on %{name} (%{url}): %{msg}"
 msgstr "无法在%{name}（%{url}）上执行重新引导：%{msg}"
 
-#: ../app/models/host/discovered.rb:182 ../app/models/host/discovered.rb:205
+#: ../app/models/host/discovered.rb:183 ../app/models/host/discovered.rb:206
 msgid "Unable to perform %{action} on %{ips}"
 msgstr "无法在 %{ips} 上执行 %{action}"
 
-#: ../app/models/host/discovered.rb:201
+#: ../app/models/host/discovered.rb:202
 msgid "Unable to perform kexec on %{name} (%{url}): %{msg}"
 msgstr "无法在 %{name} (%{url}) 上执行 kexec : %{msg}"
 
-#: ../app/models/host/discovered.rb:225
+#: ../app/models/host/discovered.rb:226
 msgid "Invalid hostname: Could not normalize the hostname"
 msgstr "无效的主机名：无法标准化主机名"
 
@@ -694,11 +694,11 @@ msgstr "名称生成器类型"
 
 #: ../app/models/setting/discovered.rb:40
 msgid "Prefer IPv6 to IPv4 when calling discovered nodes"
-msgstr ""
+msgstr "在调用发现节点时，首选 IPv6 而不是 IPv4"
 
 #: ../app/models/setting/discovered.rb:40
 msgid "Prefer IPv6"
-msgstr ""
+msgstr "首选使用 IPv6"
 
 #: ../app/services/foreman_discovery/fact_parser.rb:4
 msgid "Discovery fact parser does not work with non-discovery host '%{host}'"
@@ -1077,6 +1077,14 @@ msgstr "查看详情 "
 msgid "documentation"
 msgstr "文档"
 
+#: ../webpack/src/ForemanDiscovery/DiscoveredHosts/Components/EmptyState/EmptyState.js:7
+msgid "No discovered hosts found in this context. This page shows discovered bare-metal or virtual nodes waiting to be provisioned."
+msgstr ""
+
+#: ../webpack/src/ForemanDiscovery/DiscoveryRules/Components/EmptyState/EmptyState.js:12
+msgid "No Discovery Rules found in this context. Create Discovery Rules to perform automated provisioning on Discovered Hosts"
+msgstr ""
+
 #: action_names.rb:2
 msgid "Remote action:"
 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.edit.po

@@ -5,11 +5,11 @@
 # 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"
-"POT-Creation-Date: 2021-11-25 10:15+0100\n"
-"PO-Revision-Date: 2021-09-20 17:24+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2022-03-17 14:06+0100\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"
@@ -462,31 +462,31 @@ msgstr ""
 msgid "Expected discovery_fact '%s' is missing, unable to detect primary interface and set hostname"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:73
+#: ../app/models/host/discovered.rb:74
 msgid "Invalid facts: hash does not contain a valid value for any of the facts in the discovery_hostname setting: %s"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:102
+#: ../app/models/host/discovered.rb:103
 msgid "Facts could not be imported"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:160
+#: ../app/models/host/discovered.rb:161
 msgid "Could not get facts from proxy %{url}: %{error}"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:178
+#: ../app/models/host/discovered.rb:179
 msgid "Unable to perform reboot on %{name} (%{url}): %{msg}"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:182 ../app/models/host/discovered.rb:205
+#: ../app/models/host/discovered.rb:183 ../app/models/host/discovered.rb:206
 msgid "Unable to perform %{action} on %{ips}"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:201
+#: ../app/models/host/discovered.rb:202
 msgid "Unable to perform kexec on %{name} (%{url}): %{msg}"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:225
+#: ../app/models/host/discovered.rb:226
 msgid "Invalid hostname: Could not normalize the hostname"
 msgstr ""
 
@@ -1080,6 +1080,14 @@ msgstr ""
 msgid "documentation"
 msgstr ""
 
+#: ../webpack/src/ForemanDiscovery/DiscoveredHosts/Components/EmptyState/EmptyState.js:7
+msgid "No discovered hosts found in this context. This page shows discovered bare-metal or virtual nodes waiting to be provisioned."
+msgstr ""
+
+#: ../webpack/src/ForemanDiscovery/DiscoveryRules/Components/EmptyState/EmptyState.js:12
+msgid "No Discovery Rules found in this context. Create Discovery Rules to perform automated provisioning on Discovered Hosts"
+msgstr ""
+
 #: action_names.rb:2
 msgid "Remote action:"
 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/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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_discovery
 version: !ruby/object:Gem::Version
-  version: 20.0.1
+  version: 21.0.0
 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: 2022-01-20 00:00:00.000000000 Z
+date: 2022-03-17 00:00:00.000000000 Z
 dependencies: []
 description: MaaS Discovery Plugin engine for Foreman
 email: gsutclif@redhat.com
@@ -325,7 +327,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: MaaS Discovery Plugin for Foreman
@@ -362,9 +364,9 @@ test_files:
 - test/unit/lldp_neighbors_test.rb
 - test/unit/discovery_rule_test.rb
 - test/unit/fact_to_category_resolver_test.rb
-- test/unit/discovered_extensions_test.rb
 - test/unit/discovery_attribute_set_test.rb
 - test/unit/fact_parser_test.rb
+- test/unit/discovered_extensions_test.rb
 - test/unit/host_discovered_test.rb
 - test/unit/managed_extensions_test.rb
 - test/test_helper_discovery.rb