foreman_discovery 1.4.0 → 1.4.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzQ0MGMzMTczYWU0ZGY0ZTY4MmE5YjcxMDIyM2M1YmMyMTliNWY5MQ==
+    NWZjNjE1NzM2ODY0MjNhNzA5NTA3YTUwNDg5ZDIxNDEwNWJhYzVmYQ==
   data.tar.gz: !binary |-
-    NGUwNThkYjM1OTNlMzhiNmM2MjYxOTZhZThkYzY2NGM5OWE2NzE3ZA==
+    YzI1Yjc3N2VkMTBkODgyYWE2Nzg4ZDZkNzgzYTFmYWJkZGViZDlmOA==
 SHA512:
   metadata.gz: !binary |-
-    YThhN2ViNDhlZjg5M2UyYzZlOGY4ZjI4YWIwNjZkNzU2ZTIwZDMzMGQyMmE5
-    MTNkZjkyODllZWUwODM3MTFiNTBiZDA5NDdkNjk4NzM1MTMyOWViOTRiOTcz
-    MWFlMWIxMjY3MzM2OTYyZTY3MzQ4MmIyZjU4ZWZhZTcxZjMwNTY=
+    MzkwZTcyZGNlYjZkYmQ0OWM5YTBmNTI0MTAyMzQwNDYwMzJhZDc5NDY3ODc5
+    OWIxYjA4OWNmYzVjZGQwN2NiOWY4ZDYwOGI2MmJmNGNlOWViNDNlODkxNTA4
+    ZmJjNzIwMTYxOGFmZmE0YTE4MjRjMmVkNGE4YThjZjQyMmVkNzc=
   data.tar.gz: !binary |-
-    M2Y1ZmQwNDNlODIzMDUwOTMwZGRmOTY5ZWJkYzVmY2I5MjE1OWI4ZjMxNmFi
-    YzEyNzdmMDc2NGIxMGM4ZjFiMTQ0NDJmOTZjOGFiNDc1N2NiM2E1MjFhNmI3
-    NzM0YTI1ZWU3YWE0ZWMyMDJkOTc2MTM5NzNjNzRkZTQwMWE5MGM=
+    ODcxNDVjZDQxYzNmM2MxZTNkMDhhNDI1ZDY2NTBkNmJlMjE1MDZmNjk2NjFi
+    YmY1OTk0Yzc2YzA5NmVlMWIxMzE4NzVlODY2MjNmYTdjNTczNGNhZjllNjg5
+    OTUyODA1MTY0ZDkzOWQ3YzBhY2E4N2Y5YTA4NjE5ZTZiM2UyOTM=

data/app/lib/puppet_fact_parser_extensions.rb

@@ -8,18 +8,22 @@ module PuppetFactParserExtensions
 
   # we prefer discovery_bootif fact to choose right primary interface (interface used to boot the image)
   def primary_interface_with_discovery_fact
-    mac = facts[discovery_mac_fact_name]
-    interfaces.each do |int, values|
-      return int.to_s if (values[:macaddress] == mac)
+    if facts.has_key?(discovery_mac_fact_name)
+      mac = facts[discovery_mac_fact_name]
+      interfaces.each do |int, values|
+        return int.to_s if (values[:macaddress].try(:downcase) == mac.try(:downcase))
+      end
     end
     primary_interface_without_discovery_fact # fallback if we didn't find interface with such macaddress
   end
 
   # search for IP of interface with primary interface macaddress (ipaddress fact does not have to be interface used for boot)
   def ip_with_discovery_fact
-    facts[:interfaces].split(',').each do |interface|
-      if facts["macaddress_#{interface}"].try(:downcase) == facts[discovery_mac_fact_name].try(:downcase)
-        return facts["ipaddress_#{interface}"]
+    if facts[:interfaces] && facts.has_key?(discovery_mac_fact_name)
+      facts[:interfaces].split(',').each do |interface|
+        if facts["macaddress_#{interface}"].try(:downcase) == facts[discovery_mac_fact_name].try(:downcase)
+          return facts["ipaddress_#{interface}"]
+        end
       end
     end
     ip_without_discovery_fact # fallback if IP was not found

data/lib/foreman_discovery/version.rb

@@ -1,3 +1,3 @@
 module ForemanDiscovery
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 end

data/locale/de/foreman_discovery.po

@@ -9,7 +9,7 @@
 # simon11 <simon.stieger.98@live.de>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 1.4.0.rc2\n"
+"Project-Id-Version: foreman_discovery 1.4.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-20 08:33+0100\n"
 "PO-Revision-Date: 2014-09-16 16:47+0000\n"

data/locale/en_GB/foreman_discovery.po

@@ -7,7 +7,7 @@
 # Dominic Cleal <dcleal@redhat.com>, 2013-2014
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 1.4.0.rc2\n"
+"Project-Id-Version: foreman_discovery 1.4.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-20 08:33+0100\n"
 "PO-Revision-Date: 2014-08-22 09:57+0000\n"

data/locale/es/foreman_discovery.po

@@ -5,14 +5,14 @@
 # 
 # Translators:
 # francis <hackgo@gmail.com>, 2013-2014
-# Sergio Ocón <sergio@redhat.com>, 2014
+# Sergio Ocón <sergio.ocon@redhat.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 1.4.0.rc2\n"
+"Project-Id-Version: foreman_discovery 1.4.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-20 08:33+0100\n"
 "PO-Revision-Date: 2014-08-29 11:11+0000\n"
-"Last-Translator: Sergio Ocón <sergio@redhat.com>\n"
+"Last-Translator: Sergio Ocón <sergio.ocon@redhat.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/foreman/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

data/locale/fr/foreman_discovery.po

@@ -8,7 +8,7 @@
 # Pierre-Emmanuel Dutang <dutangp@gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 1.4.0.rc2\n"
+"Project-Id-Version: foreman_discovery 1.4.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-20 08:33+0100\n"
 "PO-Revision-Date: 2014-08-25 08:30+0000\n"

data/locale/gl/foreman_discovery.po

@@ -6,7 +6,7 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 1.4.0.rc2\n"
+"Project-Id-Version: foreman_discovery 1.4.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-20 08:33+0100\n"
 "PO-Revision-Date: 2014-08-22 09:57+0000\n"

data/locale/it/foreman_discovery.po

@@ -7,7 +7,7 @@
 # caifti <caifti@gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 1.4.0.rc2\n"
+"Project-Id-Version: foreman_discovery 1.4.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-20 08:33+0100\n"
 "PO-Revision-Date: 2014-09-16 13:11+0000\n"

data/locale/ja/foreman_discovery.po

@@ -6,7 +6,7 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 1.4.0.rc2\n"
+"Project-Id-Version: foreman_discovery 1.4.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-20 08:33+0100\n"
 "PO-Revision-Date: 2014-09-16 13:21+0000\n"

data/locale/ko/foreman_discovery.po

@@ -6,7 +6,7 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 1.4.0.rc2\n"
+"Project-Id-Version: foreman_discovery 1.4.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-20 08:33+0100\n"
 "PO-Revision-Date: 2014-09-16 13:21+0000\n"

data/locale/pt_BR/foreman_discovery.po

@@ -9,7 +9,7 @@
 # luizvasconcelos <luizvasconceloss@yahoo.com.br>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 1.4.0.rc2\n"
+"Project-Id-Version: foreman_discovery 1.4.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-20 08:33+0100\n"
 "PO-Revision-Date: 2014-09-16 13:30+0000\n"

data/locale/ru/foreman_discovery.po

@@ -8,7 +8,7 @@
 # Dominic Cleal <dcleal@redhat.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 1.4.0.rc2\n"
+"Project-Id-Version: foreman_discovery 1.4.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-20 08:33+0100\n"
 "PO-Revision-Date: 2014-09-16 13:30+0000\n"

data/locale/sv_SE/foreman_discovery.po

@@ -8,7 +8,7 @@
 # johnny.westerlund <johnny.westerlund@gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 1.4.0.rc2\n"
+"Project-Id-Version: foreman_discovery 1.4.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-20 08:33+0100\n"
 "PO-Revision-Date: 2014-09-16 13:30+0000\n"

data/locale/zh_CN/foreman_discovery.po

@@ -6,7 +6,7 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 1.4.0.rc2\n"
+"Project-Id-Version: foreman_discovery 1.4.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-20 08:33+0100\n"
 "PO-Revision-Date: 2014-09-16 13:21+0000\n"

data/locale/zh_TW/foreman_discovery.po

@@ -6,7 +6,7 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 1.4.0.rc2\n"
+"Project-Id-Version: foreman_discovery 1.4.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-20 08:33+0100\n"
 "PO-Revision-Date: 2014-09-16 13:21+0000\n"

data/test/unit/puppet_fact_parser_extensions_test.rb

@@ -0,0 +1,63 @@
+require 'test_helper'
+
+class DummyPuppetFactParser
+  def ip
+    '192.168.0.30'
+  end
+
+  def primary_interface
+    'eth1'
+  end
+
+  def interfaces
+    {
+      'eth0' => {'macaddress' => 'aa:00:00:00:00:01', 'ipaddress' => '192.168.0.2'},
+      'eth3' => {'ipaddress' => '192.168.2.2'},
+      'eth2' => {'macaddress' => 'bb:00:00:00:00:01', 'ipaddress' => '192.168.1.2'}
+    }.with_indifferent_access
+  end
+
+  def facts
+    {
+      :ipaddress => '192.168.0.2', :macaddress => 'bb:00:00:00:00:01', :interfaces => 'eth0,eth1,lo',
+      :macaddress_eth1 => 'bb:00:00:00:00:01', :ipaddress_eth1 => '192.168.1.2',
+      :macaddress_eth0 => 'aa:00:00:00:00:01', :ipaddress_eth0 => '192.168.0.2',
+      :macaddress_lo => '', :ipaddress_lo => '127.0.0.1',
+      :mac_fact => 'AA:00:00:00:00:01'
+    }.with_indifferent_access
+  end
+
+  include PuppetFactParserExtensions
+end
+
+class PuppetFactParserTest < ActiveSupport::TestCase
+  setup do
+    @parser = DummyPuppetFactParser.new
+  end
+
+  test '#ip_with_discovery_fact ignores discovery part completely if discovery facts are not present' do
+    @parser.stubs(:discovery_mac_fact_name).returns('fact_that_does_not_exist')
+    assert_equal '192.168.0.30', @parser.ip
+  end
+
+  test '#ip_with_discovery_fact finds primary interface based on discovery facts and returns it\'s ip' do
+    @parser.stubs(:discovery_mac_fact_name).returns('mac_fact')
+    assert_equal '192.168.0.2', @parser.ip
+  end
+
+  test '#primary_interface_with_discovery_fact finds primary interface based on discovery facts' do
+    @parser.stubs(:discovery_mac_fact_name).returns('mac_fact')
+    assert_equal 'eth0', @parser.primary_interface
+  end
+
+  test '#primary_interface_with_discovery_fact falls back if no interface can be found by discovery mac' do
+    @parser.facts[:mac_fact] = 'cc:00:00:00:00:01'
+    @parser.stubs(:discovery_mac_fact_name).returns('mac_fact')
+    assert_equal 'eth0', @parser.primary_interface
+  end
+
+  test '#primary_interface_with_discovery_fact uses macaddress fact if discovery facts not available' do
+    @parser.stubs(:discovery_mac_fact_name).returns('fact_that_does_not_exist')
+    assert_equal 'eth1', @parser.primary_interface
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_discovery
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Greg Sutcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-30 00:00:00.000000000 Z
+date: 2014-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: open4
@@ -118,6 +118,7 @@ files:
 - test/test_plugin_helper.rb
 - test/unit/facts.json
 - test/unit/host_discovered_test.rb
+- test/unit/puppet_fact_parser_extensions_test.rb
 - test/unit/setting_discovered_test.rb
 homepage: http://github.com/theforeman/foreman_discovery
 licenses:
@@ -148,5 +149,6 @@ test_files:
 - test/functional/discovered_hosts_controller_test.rb
 - test/test_helper.rb
 - test/unit/facts.json
+- test/unit/puppet_fact_parser_extensions_test.rb
 - test/unit/setting_discovered_test.rb
 - test/unit/host_discovered_test.rb