foreman_discovery 3.0.0 → 4.0.0

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: foreman_discovery
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Greg Sutcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-10 00:00:00.000000000 Z
+date: 2015-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 description: 'MaaS Discovery Plugin engine for Foreman '
 email: gsutclif@redhat.com
 executables: []
@@ -32,114 +32,135 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
-- LICENSE
-- README.md
-- app/controllers/api/v2/discovered_hosts_controller.rb
-- app/controllers/api/v2/discovery_rules_controller.rb
-- app/controllers/concerns/foreman/controller/discovered_extensions.rb
-- app/controllers/discovered_hosts_controller.rb
 - app/controllers/discovery_rules_controller.rb
-- app/helpers/discovered_hosts_helper.rb
-- app/helpers/discovery_rules_helper.rb
+- app/controllers/discovered_hosts_controller.rb
+- app/controllers/concerns/foreman/controller/discovered_extensions.rb
+- app/controllers/api/v2/discovery_rules_controller.rb
+- app/controllers/api/v2/discovered_hosts_controller.rb
 - app/lib/puppet_fact_parser_extensions.rb
-- app/models/concerns/discovery_subnet.rb
-- app/models/discovery_attribute_set.rb
-- app/models/discovery_rule.rb
+- app/lib/facter_utils.rb
+- app/services/foreman_discovery/host_converter.rb
+- app/helpers/discovery_rules_helper.rb
+- app/helpers/discovered_hosts_helper.rb
+- app/overrides/subnet_form_with_discovery_proxy.rb
+- app/models/setting/discovered.rb
+- app/models/hostgroup_extensions.rb
 - app/models/host/discovered.rb
 - app/models/host/managed_extensions.rb
-- app/models/hostgroup_extensions.rb
-- app/models/setting/discovered.rb
-- app/overrides/subnet_form_with_discovery_proxy.rb
-- app/services/host_converter.rb
-- app/views/api/v2/discovered_hosts/auto_provision.json.rabl
-- app/views/api/v2/discovered_hosts/auto_provision_all.json.rabl
-- app/views/api/v2/discovered_hosts/base.json.rabl
-- app/views/api/v2/discovered_hosts/index.json.rabl
-- app/views/api/v2/discovered_hosts/main.json.rabl
-- app/views/api/v2/discovered_hosts/show.json.rabl
-- app/views/api/v2/discovered_hosts/update.json.rabl
-- app/views/api/v2/discovery_rules/base.json.rabl
-- app/views/api/v2/discovery_rules/index.json.rabl
-- app/views/api/v2/discovery_rules/main.json.rabl
-- app/views/api/v2/discovery_rules/show.json.rabl
-- app/views/dashboard/_discovery_widget.html.erb
+- app/models/discovery_rule.rb
+- app/models/concerns/discovery_subnet.rb
+- app/models/discovery_attribute_set.rb
 - app/views/dashboard/_discovery_widget_host_list.html.erb
+- app/views/dashboard/_discovery_widget.html.erb
+- app/views/dashboard/_discovery_widget_host.html.erb
+- app/views/discovery_rules/new.html.erb
+- app/views/discovery_rules/edit.html.erb
+- app/views/discovery_rules/index.html.erb
+- app/views/discovery_rules/_form.html.erb
 - app/views/discovered_hosts/_discovered_host.html.erb
-- app/views/discovered_hosts/_discovered_hosts_list.html.erb
 - app/views/discovered_hosts/_selected_hosts.html.erb
-- app/views/discovered_hosts/index.html.erb
 - app/views/discovered_hosts/multiple_destroy.html.erb
-- app/views/discovered_hosts/select_multiple_location.html.erb
+- app/views/discovered_hosts/index.html.erb
 - app/views/discovered_hosts/select_multiple_organization.html.erb
+- app/views/discovered_hosts/_discovered_hosts_list.html.erb
 - app/views/discovered_hosts/show.html.erb
-- app/views/discovery_rules/_form.html.erb
-- app/views/discovery_rules/edit.html.erb
-- app/views/discovery_rules/index.html.erb
-- app/views/discovery_rules/new.html.erb
-- config/initializers/discovery_setup.rb
+- app/views/discovered_hosts/select_multiple_location.html.erb
+- app/views/api/v2/discovery_rules/index.json.rabl
+- app/views/api/v2/discovery_rules/base.json.rabl
+- app/views/api/v2/discovery_rules/main.json.rabl
+- app/views/api/v2/discovery_rules/show.json.rabl
+- app/views/api/v2/discovered_hosts/index.json.rabl
+- app/views/api/v2/discovered_hosts/update.json.rabl
+- app/views/api/v2/discovered_hosts/auto_provision_all.json.rabl
+- app/views/api/v2/discovered_hosts/base.json.rabl
+- app/views/api/v2/discovered_hosts/main.json.rabl
+- app/views/api/v2/discovered_hosts/auto_provision.json.rabl
+- app/views/api/v2/discovered_hosts/show.json.rabl
+- extra/build_iso.sh
+- extra/wait_for_network.sh
+- extra/disk_facts.rb
+- extra/discover_host
+- extra/foreman_startup.rb
+- extra/discovery_init.sh.example
+- extra/ovirt-node-build/build_image.sh
+- extra/ovirt-node-build/Vagrantfile
 - config/routes.rb
+- config/initializers/discovery_setup.rb
+- db/migrate/20150310153859_remove_discovery_attribute_sets_from_managed_hosts.rb
 - db/migrate/20141107091416_create_discovery_rules.rb
+- db/migrate/20150505111345_remove_leftover_tokens.rb
 - db/migrate/20141107091417_add_discovery_rule_to_host.rb
+- db/migrate/20150302112545_remove_duplicate_tokens_from_hosts.rb
+- db/migrate/20150331132115_remove_old_permissions.rb
 - db/migrate/20141126165451_add_discovery_id_to_subnet.rb
 - db/migrate/20141223101707_create_discovery_attribute_sets.rb
 - db/migrate/20141223142759_fill_discovery_attribute_sets_for_existing_hosts.rb
-- db/migrate/20150302112545_remove_duplicate_tokens_from_hosts.rb
+- db/migrate/20150512150432_remove_old_discovery_reader_permissions.rb
+- db/migrate/20150714144500_review_discovery_permissions.rb
 - db/seeds.d/60_discovery_proxy_feature.rb
-- extra/build_iso.sh
-- extra/discover_host
-- extra/discovery_init.sh.example
-- extra/disk_facts.rb
-- extra/foreman_startup.rb
-- extra/ovirt-node-build/Vagrantfile
-- extra/ovirt-node-build/build_image.sh
-- extra/wait_for_network.sh
 - lib/discovery.rake
 - lib/foreman_discovery.rb
-- lib/foreman_discovery/engine.rb
 - lib/foreman_discovery/proxy_operations.rb
 - lib/foreman_discovery/version.rb
+- lib/foreman_discovery/engine.rb
+- locale/foreman_discovery.pot
 - locale/Makefile
-- locale/de/LC_MESSAGES/foreman_discovery.mo
+- locale/ru/foreman_discovery.po
+- locale/ru/foreman_discovery.pox
+- locale/ru/LC_MESSAGES/foreman_discovery.mo
 - locale/de/foreman_discovery.po
-- locale/en_GB/LC_MESSAGES/foreman_discovery.mo
+- locale/de/foreman_discovery.pox
+- locale/de/LC_MESSAGES/foreman_discovery.mo
+- locale/pt_BR/foreman_discovery.po
+- locale/pt_BR/foreman_discovery.pox
+- locale/pt_BR/LC_MESSAGES/foreman_discovery.mo
 - locale/en_GB/foreman_discovery.po
-- locale/es/LC_MESSAGES/foreman_discovery.mo
+- locale/en_GB/foreman_discovery.pox
+- locale/en_GB/LC_MESSAGES/foreman_discovery.mo
+- locale/zh_TW/foreman_discovery.po
+- locale/zh_TW/foreman_discovery.pox
+- locale/zh_TW/LC_MESSAGES/foreman_discovery.mo
 - locale/es/foreman_discovery.po
-- locale/foreman_discovery.pot
-- locale/fr/LC_MESSAGES/foreman_discovery.mo
+- locale/es/foreman_discovery.pox
+- locale/es/LC_MESSAGES/foreman_discovery.mo
 - locale/fr/foreman_discovery.po
-- locale/gl/LC_MESSAGES/foreman_discovery.mo
-- locale/gl/foreman_discovery.po
-- locale/it/LC_MESSAGES/foreman_discovery.mo
+- locale/fr/foreman_discovery.pox
+- locale/fr/LC_MESSAGES/foreman_discovery.mo
 - locale/it/foreman_discovery.po
-- locale/ja/LC_MESSAGES/foreman_discovery.mo
+- locale/it/foreman_discovery.pox
+- locale/it/LC_MESSAGES/foreman_discovery.mo
+- locale/messages.mo
 - locale/ja/foreman_discovery.po
-- locale/ko/LC_MESSAGES/foreman_discovery.mo
+- locale/ja/foreman_discovery.pox
+- locale/ja/LC_MESSAGES/foreman_discovery.mo
 - locale/ko/foreman_discovery.po
-- locale/pt_BR/LC_MESSAGES/foreman_discovery.mo
-- locale/pt_BR/foreman_discovery.po
-- locale/ru/LC_MESSAGES/foreman_discovery.mo
-- locale/ru/foreman_discovery.po
-- locale/sv_SE/LC_MESSAGES/foreman_discovery.mo
-- locale/sv_SE/foreman_discovery.po
-- locale/zanata.xml
-- locale/zh_CN/LC_MESSAGES/foreman_discovery.mo
+- locale/ko/foreman_discovery.pox
+- locale/ko/LC_MESSAGES/foreman_discovery.mo
 - locale/zh_CN/foreman_discovery.po
-- locale/zh_TW/LC_MESSAGES/foreman_discovery.mo
-- locale/zh_TW/foreman_discovery.po
-- test/factories/discovery_rule_related.rb
-- test/functional/api/v2/discovered_hosts_controller_test.rb
+- locale/zh_CN/foreman_discovery.pox
+- locale/zh_CN/LC_MESSAGES/foreman_discovery.mo
+- locale/zanata.xml
+- locale/gl/foreman_discovery.po
+- locale/gl/foreman_discovery.pox
+- locale/gl/LC_MESSAGES/foreman_discovery.mo
+- locale/sv_SE/foreman_discovery.po
+- locale/sv_SE/LC_MESSAGES/foreman_discovery.mo
+- LICENSE
+- README.md
+- test/functional/discovery_rules_controller_test.rb
 - test/functional/api/v2/discovery_rules_controller_test.rb
+- test/functional/api/v2/discovered_hosts_controller_test.rb
 - test/functional/discovered_hosts_controller_test.rb
-- test/functional/discovery_rules_controller_test.rb
-- test/test_helper.rb
-- test/test_plugin_helper.rb
+- test/factories/discovery_rule_related.rb
 - test/unit/discovered_extensions_test.rb
 - test/unit/discovery_attribute_set_test.rb
+- test/unit/setting_discovered_test.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
+- test/unit/discovery_rule_test.rb
+- test/unit/host_discovered_test.rb
+- test/test_plugin_helper.rb
+- test/test_helper.rb
 homepage: http://github.com/theforeman/foreman_discovery
 licenses:
 - GPL-3
@@ -150,17 +171,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: MaaS Discovery Plugin for Foreman
@@ -175,6 +196,7 @@ test_files:
 - test/unit/setting_discovered_test.rb
 - test/unit/facts.json
 - test/unit/puppet_fact_parser_extensions_test.rb
+- test/unit/discovery_rule_test.rb
 - test/unit/host_discovered_test.rb
 - test/test_plugin_helper.rb
 - test/test_helper.rb

data/app/services/host_converter.rb

@@ -1,30 +0,0 @@
-class ForemanDiscovery::HostConverter
-
-  # must be called from SQL transaction
-  def self.to_managed(original_host, set_managed = true, set_build = true)
-    if ActiveRecord::Base.connection.open_transactions <= 0
-      raise "This method must be executed with explicit transaction"
-    end
-    host = original_host.becomes(::Host::Managed)
-    host.type = 'Host::Managed'
-    # the following flags can be skipped when parameters are set to false
-    if set_managed
-      host.managed = set_managed
-      host.primary_interface.managed = set_managed
-    end
-    host.build = set_build if set_build
-    # this gets rolled back when anything in the transaction fails
-    delete_discovery_attribute_set(host.id)
-    host
-  end
-
-  private
-
-  # discovery_attribute_set should be deleted only after a host has been successfully provisioned
-  # (after discovered host becomes managed host)
-  # after this happens the host is a manged host so non of the callbacks in discovered hosts are relevant anymore
-  # for this reason the orphaned discovery_attribute_set needs to be searched for and deleted
-  def self.delete_discovery_attribute_set(host_id)
-    DiscoveryAttributeSet.destroy_all(:host_id => host_id)
-  end
-end