smart_proxy_discovery 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7ba59c0ad52b0cd69c9ab51fdfe85d833dd624e
-  data.tar.gz: 849a4f4ae8f9de1092d5e96569a358c7d49c67e1
+  metadata.gz: 02de287c3c81909a6ebf627361f303b21874c998
+  data.tar.gz: 59d4362be288a33f18c22e9bc405337d8496a28a
 SHA512:
-  metadata.gz: b780662313b5efcd778a3d203e396294806a93aa68a681cc56217564c847bf65ba3de69c8990a57374573d068d4bba8bc6ee4f8a264cdaa4d35054b4f0c11faf
-  data.tar.gz: e266f8c9cfb8ea229de42a39db7d5865403998af0d085fa1c6132f8c0dffbb029da62df69582b9f2dedfbd9a49d503df5db0d06fe5a9cde29fb07e9048b0b152
+  metadata.gz: 66859faacc3d6882164d4ce185bb74e8f69d2737cd24f4e5bde00451491d7199ac3086781c2fb6025bea5949358780accd0bd0518d2934543cf61d3f2dbbe304
+  data.tar.gz: cd79673ed414988fb9f06d5a9082bdf49c7720528affbe68838064708bc7d2310021b5597c723c27d01f9ff4003e4b388d6e2b262a8f48595170046d8a4e37f5

data/lib/smart_proxy_discovery/discovery.rb

@@ -6,5 +6,6 @@ module Proxy::Discovery
 
     http_rackup_path File.expand_path('http_config.ru', File.expand_path('../', __FILE__))
     https_rackup_path File.expand_path('http_config.ru', File.expand_path('../', __FILE__))
+    default_settings :node_scheme => 'https', :node_port => 8443
   end
 end

data/lib/smart_proxy_discovery/discovery_api.rb

@@ -19,7 +19,11 @@ module Proxy::Discovery
   module ApiHelpers
     def error_responder(error)
       error_code = error.respond_to?(:http_code) ? error.http_code : 500
-      log_halt(error_code, "failed to update Foreman: #{error}")
+      if error.respond_to?(:http_code) && error.respond_to?(:http_body)
+        log_halt(error_code, "Proxy error HTTP #{error.http_code} (#{error.message}): #{error.http_body})")
+      else
+        log_halt(error_code, error)
+      end
     end
   end
 
@@ -45,16 +49,25 @@ module Proxy::Discovery
     include ApiHelpers
     authorize_with_trusted_hosts
 
+    get '/:ip/inventory/facter' do
+      content_type :json
+      begin
+        Proxy::Discovery.inventory_facter(params[:ip])
+      rescue => error
+        error_responder(error)
+      end
+    end
+
     get '/:ip/facts' do
       content_type :json
       begin
-        Proxy::Discovery.refresh_facts(params[:ip])
+        Proxy::Discovery.refresh_facts_legacy(params[:ip])
       rescue => error
         error_responder(error)
       end
     end
 
-    put '/:ip/reboot' do
+    put '/:ip/power/reboot' do
       content_type :json
       begin
         Proxy::Discovery.reboot(params[:ip])
@@ -62,5 +75,23 @@ module Proxy::Discovery
         error_responder(error)
       end
     end
+
+    put '/:ip/power/kexec' do
+      content_type :json
+      begin
+        Proxy::Discovery.kexec(params[:ip], request.body.read)
+      rescue => error
+        error_responder(error)
+      end
+    end
+
+    put '/:ip/reboot' do
+      content_type :json
+      begin
+        Proxy::Discovery.reboot_legacy(params[:ip])
+      rescue => error
+        error_responder(error)
+      end
+    end
   end
 end

data/lib/smart_proxy_discovery/discovery_main.rb

@@ -1,5 +1,6 @@
 require 'rest-client'
 require 'proxy/request'
+require 'json'
 
 module Proxy::Discovery
   extend ::Proxy::Util
@@ -7,32 +8,52 @@ module Proxy::Discovery
 
   class << self
     CREATE_DISCOVERED_HOST_PATH = '/api/v2/discovered_hosts/facts'
-    REFRESH_HOST_PATH           = '/facts'
+    SCHEME = Proxy::Discovery::Plugin.settings.node_scheme
+    PORT = Proxy::Discovery::Plugin.settings.node_port
 
     def create_discovered_host(request)
       foreman_request = Proxy::HttpRequest::ForemanRequest.new()
       req = foreman_request.request_factory.create_post(CREATE_DISCOVERED_HOST_PATH, request.body.read)
       response = foreman_request.send_request(req)
       unless response.is_a? Net::HTTPSuccess
-        raise response
+        msg = JSON.parse(response.body)['message'] rescue "N/A"
+        raise "Discovery failed, code #{response.code}, reason: #{msg}"
       end
     end
 
-    def refresh_facts(ip)
-      url    = "http://#{ip}:8443"
-      client = get_rest_client(url)
-      client[REFRESH_HOST_PATH].get
+    def inventory_facter(ip)
+      client = get_rest_client(generate_url(ip))
+      client["/inventory/facter"].get()
     end
 
-    def reboot(ip)
+    def refresh_facts_legacy(ip)
+      client = get_rest_client(generate_url(ip))
+      client['/facts'].get
+    end
+
+    def reboot_legacy(ip)
       url         = "http://#{ip}:8443"
       reboot_path = "/bmc/#{ip}/chassis/power/cycle"
       client      = get_rest_client(url)
       client[reboot_path].put({})
     end
 
+    def reboot(ip)
+      client = get_rest_client(generate_url(ip))
+      client["/power/reboot"].put({})
+    end
+
+    def kexec(ip, body)
+      client = get_rest_client(generate_url(ip))
+      client["/power/kexec"].put(body)
+    end
+
     private
 
+    def generate_url(ip)
+      "#{SCHEME}://#{ip}:#{PORT}"
+    end
+
     def get_rest_client(url)
       RestClient::Resource.new(url, :verify_ssl => OpenSSL::SSL::VERIFY_NONE)
     end

data/lib/smart_proxy_discovery/version.rb

@@ -1,5 +1,5 @@
 module Proxy
   module Discovery
-    VERSION = '1.0.2'
+    VERSION = '1.0.3'
   end
 end

data/settings.d/discovery.yml.example

@@ -1,2 +1,6 @@
 ---
 :enabled: true
+
+# connection to discovered nodes
+#:node_scheme: https
+#:node_port: 8443

metadata

@@ -1,89 +1,103 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_discovery
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Shlomi Zadok
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - '>'
       - !ruby/object:Gem::Version
         version: 1.6.2
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - '>'
       - !ruby/object:Gem::Version
         version: 1.6.2
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '1.7'
 description: Smart proxy discovery plugin
@@ -94,16 +108,16 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 files:
-- LICENSE
-- README.md
-- bundler.d/discovery.rb
-- lib/smart_proxy_discovery.rb
-- lib/smart_proxy_discovery/discovery.rb
 - lib/smart_proxy_discovery/discovery_api.rb
-- lib/smart_proxy_discovery/discovery_main.rb
 - lib/smart_proxy_discovery/http_config.ru
+- lib/smart_proxy_discovery/discovery.rb
+- lib/smart_proxy_discovery/discovery_main.rb
 - lib/smart_proxy_discovery/version.rb
+- lib/smart_proxy_discovery.rb
 - settings.d/discovery.yml.example
+- bundler.d/discovery.rb
+- README.md
+- LICENSE
 homepage: http://github.com/theforeman/smart_proxy_discovery
 licenses:
 - GPLv3
@@ -114,17 +128,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: Smart proxy discovery plugin