foreman_discovery 24.0.1 → 25.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fea157692374486c03ed7c9a3185704468ea18c30919abe85a1579eda158113e
-  data.tar.gz: 5fcf2c407782870e9513460057f7be04903073c0dfe11842f3a9038794014e68
+  metadata.gz: 8eee62d61a02887b7fae697853ef06410a24f4a364b3ded2d5f1ae8e6c8037e2
+  data.tar.gz: 1270edfbdd2a140773f7d5673ee399d0037bc1b5a5b140873284632236f1323d
 SHA512:
-  metadata.gz: 5517f989fb2bad25c8f55a6df4a2f19209f3f0e2b227c56d00bc2a088a9c71ee316fb211cd0ec9ddfb0184905c884498e2cbe0f53a0f2f062935b3f9619a232e
-  data.tar.gz: 7c383bc8724080672a9bcf62501356aa6389bf69444b4aef23388649627074f5d17ee3e60fba033d869762e734afe96841fddf0bb698e9e24ad21bd5721ab2d1
+  metadata.gz: 02ad926fda08a7bba1f0d479beb6905779903890dc0364975ccd16958767c6fd76b94dbc699951347783d55cd952735a4f591a4d98563cb2cb776c2d2bc56cdf
+  data.tar.gz: 66d2015d31098d376ab4e747bf72d5b46fb097740723d36823e032d6fb72b7ee1fdf38cda29c6f6f75260e9d59a3815e64d500a788759fbe53b572cc528f0569

data/app/controllers/api/v2/discovered_hosts_controller.rb

@@ -162,7 +162,7 @@ module Api
 
         total_count = 0
         overall_errors = ""
-        Host::Discovered.all.each do |discovered_host|
+        Host::Discovered.all.find_each do |discovered_host|
           if rule = find_discovery_rule(discovered_host)
             result &= perform_auto_provision(discovered_host, rule)
             unless discovered_host.errors.empty?

data/app/helpers/discovered_hosts_helper.rb

@@ -40,7 +40,7 @@ module DiscoveredHostsHelper
   end
 
   def turn_zero_to_not_available(value)
-    value == 0 ? 'N/A' : value
+    (value == 0) ? 'N/A' : value
   end
 
   def discovery_attribute(host, attr, default_value = _('N/A'))

data/app/models/host/discovered.rb

@@ -222,7 +222,7 @@ class Host::Discovered < ::Host::Base
   end
 
   def self.normalize_string_for_hostname(hostname)
-    hostname = hostname.to_s.downcase.gsub(/(^[^a-z0-9]*|[^a-z0-9\-]|[^a-z0-9]*$)/,'')
+    hostname = hostname.to_s.downcase.gsub(/(^[^a-z0-9]*|[^a-z0-9-]|[^a-z0-9]*$)/,'')
     raise(::Foreman::Exception.new(N_("Invalid hostname: Could not normalize the hostname"))) unless hostname && hostname.present?
     hostname
   end

data/app/views/discovered_hosts/show.html.erb

@@ -96,28 +96,30 @@
   </div>
 </div>
 
-<script type="text/javascript" charset="utf-8">
-  $(document).ready(function(){
-    $("table").css('padding', '0');
-    $("table").css("cssText", 'margin-bottom: 0 !important;');
+<% content_for(:javascripts) do -%>
+  <script type="text/javascript" charset="utf-8">
+    $(document).ready(function(){
+      $("table").css('padding', '0');
+      $("table").css("cssText", 'margin-bottom: 0 !important;');
 
-    provision_class = 'active'
-    primary_class = 'active'
-    var flag_primary = '<i class="glyphicon glyphicon glyphicon-tag primary-flag '+ primary_class +'" title="" data-original-title="'+ __('Primary') +'"></i>';
-    var flags_provision = '<i class="glyphicon glyphicon glyphicon-hdd provision-flag '+ provision_class +'" title="" data-original-title="'+ __('Provisioning') +'"></i>';
+      provision_class = 'active'
+      primary_class = 'active'
+      var flag_primary = '<i class="glyphicon glyphicon glyphicon-tag primary-flag '+ primary_class +'" title="" data-original-title="'+ __('Primary') +'"></i>';
+      var flags_provision = '<i class="glyphicon glyphicon glyphicon-hdd provision-flag '+ provision_class +'" title="" data-original-title="'+ __('Provisioning') +'"></i>';
 
-    $('.flag-primary').html(flag_primary);
-    $('.flag-provision').append(flags_provision);
-    $('.primary-flag').tooltip();
-    $('.provision-flag').tooltip();
+      $('.flag-primary').html(flag_primary);
+      $('.flag-provision').append(flags_provision);
+      $('.primary-flag').tooltip();
+      $('.provision-flag').tooltip();
 
-    expand_all_toggle_action = { 'Expand All': 'show', 'Collapse All': 'hide' };
-    $('#expand_all').on('click', function () {
-      $(this).text(function(i, text){
-          $('#accordion .panel-collapse').collapse(expand_all_toggle_action[text]);
-          return text === "Expand All" ? "Collapse All" : "Expand All";
-      })
-    });
+      expand_all_toggle_action = { 'Expand All': 'show', 'Collapse All': 'hide' };
+      $('#expand_all').on('click', function () {
+        $(this).text(function(i, text){
+            $('#accordion .panel-collapse').collapse(expand_all_toggle_action[text]);
+            return text === "Expand All" ? "Collapse All" : "Expand All";
+        })
+      });
 
-  });
-</script>
+    });
+  </script>
+<% end %>

data/app/views/discovery_rules/_form.html.erb

@@ -31,9 +31,3 @@
         </div>
     <%= submit_or_cancel f %>
 <% end %>
-
-<script type="text/javascript" charset="utf-8">
-$(document).ready(function() {
-  $('input.counter_spinner').spinner();
-});
-</script>

data/config/initializers/inflections.rb

@@ -0,0 +1,5 @@
+Rails.autoloaders.each do |autoloader|
+  autoloader.inflector.inflect(
+    'node_api' => 'NodeAPI'
+  )
+end

data/db/migrate/20141223142759_fill_discovery_attribute_sets_for_existing_hosts.rb

@@ -4,7 +4,7 @@ end
 
 class FillDiscoveryAttributeSetsForExistingHosts < ActiveRecord::Migration[4.2]
   def up
-    FakeDiscoveredHost.where(:type => "Host::Discovered").all.each do |host|
+    FakeDiscoveredHost.where(:type => "Host::Discovered").all.find_each do |host|
       begin
         say "Populating attribute set for discovered host #{host.name}"
         ForemanDiscovery::ImportHooks::DiscoveryAttribute.new(host: host, facts: host.facts_hash).after_populate

data/db/migrate/20150512150432_remove_old_discovery_reader_permissions.rb

@@ -1,6 +1,6 @@
 class RemoveOldDiscoveryReaderPermissions < ActiveRecord::Migration[4.2]
   def up
-    Permission.where("name like '%_discovery_rules' and resource_type is null").each do |permission|
+    Permission.where("name like '%_discovery_rules' and resource_type is null").find_each do |permission|
       permission.update(:resource_type => 'DiscoveryRule')
     end
   end