foreman_discovery 7.0.1 → 8.0.0

data/test/unit/host_discovered_test.rb

@@ -2,30 +2,7 @@ require 'test_helper'
 
 class HostDiscoveredTest < ActiveSupport::TestCase
   setup do
-    FactoryGirl.create(:setting,
-                       :name => 'discovery_fact',
-                       :value => 'discovery_bootif',
-                       :category => 'Setting::Discovered')
-    FactoryGirl.create(:setting,
-                       :name => 'discovery_hostname',
-                       :value => 'discovery_bootif',
-                       :category => 'Setting::Discovered')
-    FactoryGirl.create(:setting,
-                       :name => 'discovery_prefix',
-                       :value => 'mac',
-                       :category => 'Setting::Discovered')
-    FactoryGirl.create(:setting,
-                       :name => 'discovery_lock',
-                       :value => 'false',
-                       :category => 'Setting::Discovered')
-    FactoryGirl.create(:setting,
-                       :name => 'discovery_lock_template',
-                       :value => 'pxelinux_discovery',
-                       :category => 'Setting::Discovered')
-    FactoryGirl.create(:setting,
-                       :name => 'discovery_clean_facts',
-                       :value => false,
-                       :category => 'Setting::Discovered')
+    set_default_settings
   end
 
   test "should be able to create Host::Discovered objects" do
@@ -41,7 +18,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
 
   test "should setup subnet" do
     raw = parse_json_fixture('/facts.json')
-    subnet = FactoryGirl.create(:subnet_ipv4, :name => 'Subnet99', :network => '192.168.99.0', :organizations => [Organization.first], :locations => [Location.first])
+    subnet = FactoryGirl.create(:subnet_ipv4, :name => 'Subnet99', :network => '10.35.27.0', :organizations => [Organization.first], :locations => [Location.first])
     Subnet.expects(:subnet_for).with('10.35.27.3').returns(subnet)
     host = Host::Discovered.import_host(raw['facts'])
     assert_equal subnet, host.primary_interface.subnet
@@ -50,16 +27,10 @@ class HostDiscoveredTest < ActiveSupport::TestCase
   test "should setup subnet with org and loc" do
     org = FactoryGirl.create(:organization, :name => "subnet_org")
     loc = FactoryGirl.create(:location, :name => "subnet_loc")
-    FactoryGirl.create(:setting,
-                       :name => 'discovery_organization',
-                       :value => org.name,
-                       :category => 'Setting::Discovered')
-    FactoryGirl.create(:setting,
-                       :name => 'discovery_location',
-                       :value => loc.name,
-                       :category => 'Setting::Discovered')
+    Setting['discovery_organization'] = org.name
+    Setting['discovery_location'] = loc.name
     raw = parse_json_fixture('/facts.json')
-    subnet = FactoryGirl.create(:subnet_ipv4, :name => 'Subnet99', :network => '192.168.99.0', :organizations => [org], :locations => [loc])
+    subnet = FactoryGirl.create(:subnet_ipv4, :name => 'Subnet99', :network => '10.35.27.0', :organizations => [org], :locations => [loc])
     Subnet.expects(:subnet_for).with('10.35.27.3').returns(subnet)
     host = Host::Discovered.import_host(raw['facts'])
     assert_equal subnet, host.primary_interface.subnet
@@ -70,16 +41,10 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     org = FactoryGirl.create(:organization, :name => "suborg", :parent_id => org_parent.id)
     loc_parent = FactoryGirl.create(:location, :name => "loc")
     loc = FactoryGirl.create(:location, :name => "subloc", :parent_id => loc_parent.id)
-    FactoryGirl.create(:setting,
-                       :name => 'discovery_organization',
-                       :value => org.name,
-                       :category => 'Setting::Discovered')
-    FactoryGirl.create(:setting,
-                       :name => 'discovery_location',
-                       :value => loc.name,
-                       :category => 'Setting::Discovered')
+    Setting['discovery_organization'] = org.name
+    Setting['discovery_location'] = loc.name
     raw = parse_json_fixture('/facts.json')
-    subnet = FactoryGirl.create(:subnet_ipv4, :name => 'Subnet99', :network => '192.168.99.0', :organizations => [org], :locations => [loc])
+    subnet = FactoryGirl.create(:subnet_ipv4, :name => 'Subnet99', :network => '10.35.27.0', :organizations => [org], :locations => [loc])
     Subnet.expects(:subnet_for).with('10.35.27.3').returns(subnet)
     host = Host::Discovered.import_host(raw['facts'])
     assert_equal org, host.organization
@@ -114,7 +79,6 @@ class HostDiscoveredTest < ActiveSupport::TestCase
   test "should lock host into discovery via PXE configuration" do
     Host::Discovered.delete('mace41f13cc3658')
     Setting[:discovery_lock] = "true"
-    Setting[:discovery_lock_template] = 'discovery_lock_template'
     raw = parse_json_fixture('/facts.json')
     subnet = FactoryGirl.create(:subnet,
                                 :tftp,
@@ -125,12 +89,14 @@ class HostDiscoveredTest < ActiveSupport::TestCase
                                 :locations => [Location.first]
     )
     Subnet.expects(:subnet_for).with('10.35.27.3').returns(subnet)
-    ProxyAPI::TFTP.any_instance.expects(:set).with('e4:1f:13:cc:36:58', anything).returns(true)
-    ProvisioningTemplate.where(:name => 'discovery_lock_template').first_or_create(
-        :template_kind_id => template_kinds(:ipxe),
-        :snippet => true,
-        :template => "test"
-    )
+    ProxyAPI::TFTP.any_instance.expects(:set).with(anything, 'e4:1f:13:cc:36:58', anything).returns(true).times(3)
+    TemplateKind::PXE.each do |kind|
+      ProvisioningTemplate.where(:name => "#{kind.downcase}_discovery").first_or_create(
+          :template_kind_id => template_kinds(kind.downcase.to_sym),
+          :snippet => true,
+          :template => "test"
+      )
+    end
     assert Host::Discovered.import_host(raw['facts'])
     assert Host::Discovered.find_by_name('mace41f13cc3658')
     refute Host::Managed.find_by_name('mace41f13cc3658')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_discovery
 version: !ruby/object:Gem::Version
-  version: 7.0.1
+  version: 8.0.0
 platform: ruby
 authors:
 - Amos Benari
@@ -32,22 +32,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-23 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: deface
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
+date: 2017-01-06 00:00:00.000000000 Z
+dependencies: []
 description: MaaS Discovery Plugin engine for Foreman
 email: gsutclif@redhat.com
 executables: []
@@ -71,7 +57,6 @@ files:
 - app/helpers/discovery_rules_helper.rb
 - app/lib/facter_utils.rb
 - app/mailers/discovered_mailer.rb
-- app/models/concerns/discovery_subnet.rb
 - app/models/concerns/discovery_taxonomy_extensions.rb
 - app/models/concerns/fact_value_extensions.rb
 - app/models/discovery_attribute_set.rb
@@ -81,7 +66,6 @@ files:
 - app/models/hostgroup_extensions.rb
 - app/models/nic/managed_extensions.rb
 - app/models/setting/discovered.rb
-- app/overrides/subnet_form_with_discovery_proxy.rb
 - app/services/foreman_discovery/fact_parser.rb
 - app/services/foreman_discovery/host_converter.rb
 - app/services/foreman_discovery/node_api/inventory.rb
@@ -136,7 +120,11 @@ files:
 - db/migrate/20150714144500_review_discovery_permissions.rb
 - db/migrate/20151023144501_regenerate_red_hat_kexec.rb
 - db/migrate/20160719124942_add_missing_view_permissions.rb
+- db/migrate/20160805104605_rename_lock_template_setting.rb
 - db/migrate/20160818091421_add_permissions_from_default_roles.rb
+- db/migrate/20160925213030_change_discovery_widget_names.rb
+- db/migrate/20160927164411_define_explicit_length_for_discovery_rule_attributes.rb
+- db/migrate/20161006094714_add_constraints_on_subnets_smart_proxies.rb
 - db/seeds.d/50_discovery_templates.rb
 - db/seeds.d/60_discovery_proxy_feature.rb
 - db/seeds.d/70_discovery_mail_notification.rb

data/app/models/concerns/discovery_subnet.rb

@@ -1,7 +0,0 @@
-module DiscoverySubnet
-  extend ActiveSupport::Concern
-  included do
-    belongs_to :discovery, :class_name => "SmartProxy"
-  end
-end
-

data/app/overrides/subnet_form_with_discovery_proxy.rb

@@ -1,9 +0,0 @@
-selector_text = " <%= select_f f, :discovery_id, SmartProxy.with_features('Discovery'), :id, :name,
-                    {:include_blank => _('None')},
-                    :label => _('Discovery Proxy'),
-                    :help_inline => _('Discovery Proxy to use within this subnet for managing connection to discovered hosts') %>"
-
-Deface::Override.new(:virtual_path  => "subnets/_form",
-                     :name          => "add_discovery_proxy_to_subnet",
-                     :insert_bottom => 'div#proxies',
-                     :text          =>  selector_text)