foreman_discovery 12.0.1 → 12.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98a080f7ad2a14e13a076a7494394840496744de18693ddc452f350c8c901faf
-  data.tar.gz: 36b67cccee6114006973102a963bc599ffd28a7821dbae30616602f6e9b1acd5
+  metadata.gz: c74650551a3323dcaa112a06e384b8bd5038df5622b71e327585cfa134efeb86
+  data.tar.gz: 3e5dacb7e4c536048b38156ec69b265d79724424ab0917d239ec9144a52802f5
 SHA512:
-  metadata.gz: 54765d0d9f705a926be0dcde3514de726ef2403e64cd565abaa9398d1189dabfbc4fd1d43dad0a2ea46ce6b5924858f3b68736363ce67dd0e83f169aba53dcde
-  data.tar.gz: 8c0569417e8d35fb6a040af15d3709b8673ac4a91764156d3c257de0ddb5bd6f5ddd31c29a20d20c69ed3f691e85215497377ca3c76e906825139d22a2d7fb89
+  metadata.gz: 2d6770e0543989dfa2270ece14eb165d45f2a6ccf82795247c372fc14dc81bff5efe87b3abf4964ce366fe1032b96d95e56777b6986fe61f1ce86851d734ce22
+  data.tar.gz: 0f7262e88dbe6e92ebd3aff9bb888ede73744d250d7b308b99b3a39d6a992a9652ca422be8032e0a6c6090c2adcf6f5dd7ef62763a5e0fcb796f71e25d8aed36

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

@@ -46,6 +46,7 @@ module Api
 
       def create
         @discovery_rule = DiscoveryRule.new(discovery_rule_params)
+        @discovery_rule.priority = DiscoveryRule.suggest_priority if discovery_rule_params[:priority].blank?
         process_response @discovery_rule.save
       end
 

data/app/controllers/discovery_rules_controller.rb

@@ -12,7 +12,7 @@ class DiscoveryRulesController < ApplicationController
   end
 
   def new
-    @discovery_rule = DiscoveryRule.new
+    @discovery_rule = DiscoveryRule.new(:priority => DiscoveryRule.suggest_priority)
   end
 
   def create

data/app/models/discovery_rule.rb

@@ -1,4 +1,5 @@
 class DiscoveryRule < ApplicationRecord
+  STEP = 100
   audited :associated_with => :hostgroup
   include Authorizable
   extend FriendlyId
@@ -40,6 +41,10 @@ class DiscoveryRule < ApplicationRecord
    self.priority  ||= 0
   end
 
+  def self.suggest_priority
+    self.unscoped.maximum(:priority).to_i + STEP
+  end
+
   def enforce_taxonomy
     return if hostgroup.nil?
     if SETTINGS[:organizations_enabled]

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

@@ -24,7 +24,7 @@
                        :label_help => render('discovery_rules/template_inline').html_safe,
                        :label_help_options => {:title => _("Hostname for provisioned hosts"), :'data-placement' => 'bottom' } %>
             <%= counter_f f, :max_count, :label => _('Hosts Limit'), :help_inline => _('Maximum hosts provisioned with this rule (0 = unlimited)'), :min => 0 %>
-            <%= counter_f f, :priority, :help_inline => _('Rule priority (lower integer means higher priority)'), step: 100, value: 0 %>
+            <%= counter_f f, :priority, :help_inline => _('Rule priority (lower integer means higher priority)'), step: DiscoveryRule::STEP %>
             <%= checkbox_f f, :enabled %>
           </div>
           <%= render 'taxonomies/loc_org_tabs', :f => f, :obj => @discovery_rule %>

data/lib/foreman_discovery/version.rb

@@ -1,3 +1,3 @@
 module ForemanDiscovery
-  VERSION = "12.0.1"
+  VERSION = "12.0.2"
 end

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

@@ -31,7 +31,6 @@ class Api::V2::DiscoveryRulesControllerTest < ActionController::TestCase
     assert_equal "Location 1", discovery_rule['locations'].first['name']
   end
 
-  test_attributes :pid => '121e0a30-8a24-47d7-974d-998886ed1ea7'
   test "should create discovery rule with taxonomy" do
     hostgroup = FactoryBot.create(:hostgroup, :with_os, :with_rootpass, :organizations => [organization_one], :locations => [location_one])
     valid_attributes = {
@@ -65,7 +64,6 @@ class Api::V2::DiscoveryRulesControllerTest < ActionController::TestCase
     assert_response :success
   end
 
-  test_attributes :pid => '769c0739-538b-4451-af7b-deb2ecd3dc0d'
   test "should update discovery rule name" do
     rule = FactoryBot.create(:discovery_rule)
     new_name = 'new_rule_name'
@@ -81,7 +79,6 @@ class Api::V2::DiscoveryRulesControllerTest < ActionController::TestCase
     assert_response :success
   end
 
-  test_attributes :pid => '0f8ec302-f9de-4713-87b7-0f1aca515149'
   test "should update taxonomies for discovery rule" do
     min_required_attr = { :name => 'new_rule', :search => 'CPU_Count = 1', :hostgroup_id => hostgroups(:unusual).id }
     rule = DiscoveryRule.new(min_required_attr)
@@ -100,7 +97,6 @@ class Api::V2::DiscoveryRulesControllerTest < ActionController::TestCase
     assert_equal [location_one.id], rule.locations.map {|loc| loc.id}
   end
 
-  test_attributes :pid => '2c5ecb7e-87bc-4980-9620-7ae00e3f360e'
   test "should update search rule" do
     rule = FactoryBot.create(:discovery_rule)
     new_search = 'Location = Default_Location'
@@ -110,7 +106,6 @@ class Api::V2::DiscoveryRulesControllerTest < ActionController::TestCase
     assert_equal new_search, rule.search
   end
 
-  test_attributes :pid => '33084060-2866-46b9-bfab-23d91aea73d8'
   test "should update host limit" do
     rule = FactoryBot.create(:discovery_rule)
     new_max_count = 150
@@ -121,7 +116,6 @@ class Api::V2::DiscoveryRulesControllerTest < ActionController::TestCase
     assert_equal new_max_count, rule.max_count
   end
 
-  test_attributes :pid => '330aa943-167b-46dd-b434-1a6e5fe8f283'
   test "test_positive_disable" do
     rule = FactoryBot.create(:discovery_rule)
     assert rule.enabled
@@ -131,7 +125,6 @@ class Api::V2::DiscoveryRulesControllerTest < ActionController::TestCase
     refute rule.enabled
   end
 
-  test_attributes :pid => '9fdba953-dcc7-4532-9204-17a45b0d9e05'
   test "should destroy discovery rule" do
     rule = FactoryBot.create(:discovery_rule)
     assert_difference('DiscoveryRule.unscoped.count', -1) do
@@ -141,7 +134,6 @@ class Api::V2::DiscoveryRulesControllerTest < ActionController::TestCase
     refute DiscoveryRule.unscoped.exists?(rule.id)
   end
 
-  test_attributes :pid => '415379b7-0134-40b9-adb1-2fe0adb1ac36'
   test "should not create with too long name" do
     assert_difference('DiscoveryRule.unscoped.count', 0) do
       post :create, params: {:discovery_rule => {

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

@@ -5,14 +5,12 @@ class Api::V2::SettingsControllerTest < ActionController::TestCase
     FactoryBot.create(:setting, :name => 'discovery_prefix', :value => 'mac', :category => 'Setting::Discovered')
   end
 
-  test_attributes :pid => '2c5ecb7e-87bc-4980-9620-7ae00e3f360e'
   test "should update hostname prefix without value" do
     setting = Setting.find_by_name("discovery_prefix")
     put :update, params: { :id => setting.id, :setting => { :value => '' } }
     assert_equal JSON.parse(@response.body)['value'], '', "Can't update discovery_prefix setting with empty value"
   end
 
-  test_attributes :pid => '4969994d-f934-4f0e-9a98-476b87eb0527'
   test "should update hostname prefix" do
     value = RFauxFactory.gen_alpha
     setting = Setting.find_by_name("discovery_prefix")

data/test/functional/discovered_hosts_controller_test.rb

@@ -294,6 +294,9 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
     hostgroup = prepare_hostgroup_for_dns_rebuild(host)
     Nic::Managed.any_instance.expects(:rebuild_dns).never
     Host::Managed.any_instance.stubs(:skip_orchestration?).returns(false)
+    Host::Managed.any_instance.stubs(:queue_puppetca_create).returns(true)
+    Host::Managed.any_instance.stubs(:queue_puppetca_certname_reset).returns(true)
+    Host::Managed.any_instance.stubs(:queue_puppetca_autosign_destroy).returns(true)
     put :update, params: {:commit => "Update", :id => host.id,
                   :host => {
       :name => 'mytest',

data/test/unit/discovery_rule_test.rb

@@ -55,7 +55,6 @@ class DiscoveryRuleTest < ActiveSupport::TestCase
     end
   end
 
-  test_attributes :pid => 'b8ae7a80-b9a8-4924-808c-482a2b4102c4'
   test "should create discovery rule with name and minimum required attributes" do
     rule = DiscoveryRule.new(:name => 'new_rule', :search => 'cpu_count = 1', :hostgroup_id => hostgroups(:unusual).id)
     assert_valid rule
@@ -101,7 +100,6 @@ class DiscoveryRuleTest < ActiveSupport::TestCase
     assert_equal "must be present.", rule.errors[:hostgroup].first
   end
 
-  test_attributes :pid => '4ec7d76a-22ba-4c3e-952c-667a6f0a5728'
   test "should not create with invalid priority type" do
     rule = DiscoveryRule.new(
       :name => 'new_rule',
@@ -125,7 +123,6 @@ class DiscoveryRuleTest < ActiveSupport::TestCase
     assert_equal "must be less than 2147483648", rule.errors[:priority].first
   end
 
-  test_attributes :pid => '84503d8d-86f6-49bf-ab97-eff418d3e3d0'
   test "should not create with invalid max count type" do
     rule = DiscoveryRule.new(
       :name => 'new_rule',
@@ -210,5 +207,13 @@ class DiscoveryRuleTest < ActiveSupport::TestCase
         hostgroup_one.save!
       end
     end
+
+    test 'should be able to suggest next priority' do
+      existing = FactoryBot.create(:discovery_rule)
+      first_new = FactoryBot.create(:discovery_rule, :priority => DiscoveryRule.suggest_priority)
+      assert first_new.priority > 0
+      second_new = FactoryBot.create(:discovery_rule, :priority => DiscoveryRule.suggest_priority)
+      assert_equal DiscoveryRule::STEP, second_new.priority - first_new.priority
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_discovery
 version: !ruby/object:Gem::Version
-  version: 12.0.1
+  version: 12.0.2
 platform: ruby
 authors:
 - alongoldboim
@@ -64,7 +64,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-26 00:00:00.000000000 Z
+date: 2018-07-13 00:00:00.000000000 Z
 dependencies: []
 description: MaaS Discovery Plugin engine for Foreman
 email: gsutclif@redhat.com