ilorb 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4dda8bc7feb3994e4cfbd360716f380af125b2e0
-  data.tar.gz: 9c2b8b3d6f61d440df5039feaf2f94769b9c2ec9
+  metadata.gz: 62653f5b9895874fed33c3809ef3ee0ab36be009
+  data.tar.gz: cac900742ac25d1bfbff654e0aba7094d1419bb2
 SHA512:
-  metadata.gz: 423966543881ffd1e3720fdc0d44bd2858dd4f4cbd2681c72d2ed7d7b9b64b92b4b796d733df0e0d2120c4f8adf1e2e698350e1a24e0377e6a6c3c90e81a76f2
-  data.tar.gz: d43910027cb1dc97efe24c9f81c743d49fc56731d744a73f7f508b9b3755998949b64a2ae9361599b61af2cbf4348e636d83e61f632a3305e7623b08e78b3a57
+  metadata.gz: d7cb339ba4da6be19d191aac561538b76324efd1cf205c8cd32b8a3724a12c91000cd2719b8ee47611a98d2ebd88a201c29fb9b58a4fe988e69f988f205e659f
+  data.tar.gz: 6801e037528efada5421ff2a088e7cd80749c4bf3db80974c6f803c16a93fc2dea9f1cc9bcdba288d555663f1019de2366c017fbde5fe1a48b1adaa7ca83dc36

data/.gitignore

@@ -0,0 +1 @@
+pkg

data/.ruby-gemset

@@ -0,0 +1 @@
+ilorb

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    ilorb (0.0.2)
+    ilorb (0.0.3)
       nokogiri
-      nori
+      nori (~> 2)
 
 GEM
   remote: https://rubygems.org/
@@ -14,10 +14,10 @@ GEM
       safe_yaml (~> 0.9.0)
     diff-lcs (1.2.4)
     method_source (0.8.1)
-    mini_portile (0.5.3)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
-    nori (2.4.0)
+    mini_portile (0.6.2)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    nori (2.5.0)
     pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)

data/Rakefile

@@ -0,0 +1,6 @@
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+task default: :spec

data/ilorb.gemspec

@@ -24,5 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "webmock", "~> 1.13"
   spec.add_development_dependency "pry"
   spec.add_dependency "nokogiri"
-  spec.add_dependency "nori"
+  spec.add_dependency "nori", "~> 2"
 end

data/lib/ilorb/definitions/rib.rb

@@ -27,7 +27,9 @@ context :rib_info do
 
   write_cmd :ahs_clear_data
   write_cmd :brownout_recovery # > mod_global_settings
-  write_cmd :certificate_signing_request
+  write_cmd :certificate_signing_request do
+    elements :csr_state, :csr_country, :csr_locality, :csr_organization, :csr_organizational_unit, :csr_common_name
+  end
   write_cmd :clear_eventlog
   write_cmd :computer_lock do
     not_implemented
@@ -41,8 +43,7 @@ context :rib_info do
   write_cmd :hotkey_config do
     not_implemented
   end
-  write_cmd :import_certificate do #TODO
-    not_implemented
+  write_cmd :import_certificate do
     text :certificate
   end
   write_cmd :insert_virtual_media do
@@ -51,11 +52,18 @@ context :rib_info do
   write_cmd :license do
     elements :activate => :key
   end
-  write_cmd :mod_global_settings do #TODO
-    not_implemented
-  end
-  write_cmd :mod_network_settings do #TODO
-    not_implemented
+  write_cmd :mod_global_settings do
+    elements :session_timeout, :f8_prompt_enabled, :http_port, :https_port, :remote_console_port, :min_password, :ilo_funct_enabled, :virtual_media_port, :f8_login_required, :enforce_aes, :authentication_failure_logging, :ssh_status, :ssh_port, :serial_cli_status, :serial_cli_speed, :rbsu_post_ip, :snmp_access_enabled, :snmp_port, :snmp_trap_port, :remote_syslog_enable, :remote_syslog_port, :remote_syslog_server_address, :alertmail_enable, :alertmail_email_address, :alertmail_sender_domain, :alertmail_smtp_server, :ipmi_dcmi_over_lan_enabled, :vsp_log_enable
+  end
+  write_cmd :mod_network_settings do
+    elements :enable_nic, :nic_speed, :full_duplex, :speed_autoselect, :ping_gateway,
+             :shared_network_port, :vlan_enabled, :vlan_id,
+             :dhcp_enable, :dhcp_domain_name, :dhcp_gateway, :dhcp_dns_server, :dhcp_wins_server, :dhcp_static_route, :dhcp_sntp_settings,
+             :ip_address, :subnet_mask, :gateway_ip_address, :dns_name, :domain_name,
+             :prim_dns_server, :sec_dns_server, :ter_dns_server, :reg_ddns_server,
+             :prim_wins_server, :sec_wins_server, :reg_wins_server,
+             :sntp_server1, :sntp_server2, :timezone,
+             :enclosure_ip_enable, :web_agent_ip_address
   end
   write_cmd :mod_snmp_im_settings do #TODO
     not_implemented

data/lib/ilorb/definitions/server.rb

@@ -1,51 +1,95 @@
 context :server_info do
-  read_cmd :get_embedded_health
-  read_cmd :get_host_power_saver_status
-  read_cmd :get_host_power_status
-  read_cmd :get_host_pwr_micro_ver
-  read_cmd :get_one_time_boot
-  read_cmd :get_persistent_boot
-  read_cmd :get_power_cap
-  read_cmd :get_power_readings
-  read_cmd :get_pwreg
-  read_cmd :get_server_auto_pwr
-  read_cmd :get_server_name
-  read_cmd :get_server_power_on_time
-  read_cmd :get_uid_status
+  read_cmd :get_tpm_status
 
-  write_cmd :clear_server_power_on_time
-  write_cmd :cold_boot_server
-  write_cmd :hold_pwr_btn do
-    attributes :toggle
+  read_cmd :get_current_boot_mode
+
+  read_cmd :get_pending_boot_mode
+  write_cmd :set_pending_boot_mode do
+    attributes :value
   end
-  write_cmd :press_power_btn
-  write_cmd :reset_server
-  write_cmd :server_auto_pwr do
+
+  read_cmd :get_persistent_boot
+  write_cmd :set_persistent_boot do
+    elements :device => [ :value ]
+  end
+
+  read_cmd :get_one_time_boot
+  write_cmd :set_one_time_boot do
     attributes :value
   end
+
+  read_cmd :get_supported_boot_mode
+
+  read_cmd :get_server_name
   write_cmd :server_name do
     attributes :value
   end
-  write_cmd :set_host_power do
-    attributes :host_power
-  end
-  write_cmd :set_host_power_saver do
-    attributes :host_power_saver
+
+  read_cmd :get_server_fqdn
+  write_cmd :server_fqdn do
+    attributes :value
   end
-  write_cmd :set_one_time_boot do
+
+  read_cmd :get_smh_fqdn
+  write_cmd :smh_fqdn do
     attributes :value
   end
-  write_cmd :set_persistent_boot do
-    elements :device => [ :value ]
+
+  read_cmd :get_product_name
+
+  read_cmd :get_embedded_health
+
+  read_cmd :get_power_readings
+
+  read_cmd :get_pwreg
+  write_cmd :set_pwreg do
+    elements :pwralert => :type, :pwralert_settings => [:threshold, :duration]
   end
+
+  read_cmd :get_power_cap
   write_cmd :set_power_cap do
     attributes :power_cap
   end
-  write_cmd :set_pwreg do
-    elements :pwralert => :type, :pwralert_settings => [:threshold, :duration]
+
+  read_cmd :get_host_power_saver_status
+  write_cmd :set_host_power_saver do
+    attributes :host_power_saver
+  end
+
+  read_cmd :get_host_power_status
+  write_cmd :set_host_power do
+    attributes :host_power
+  end
+
+  read_cmd :get_host_pwr_micro_ver
+
+  write_cmd :reset_server
+
+  write_cmd :press_pwr_btn
+
+  write_cmd :hold_pwr_btn do
+    attributes :toggle
   end
+
+  write_cmd :cold_boot_server
+
+  write_cmd :warm_boot_server
+
+  read_cmd :get_server_auto_pwr
+  write_cmd :server_auto_pwr do
+    attributes :value
+  end
+
+  read_cmd :get_uid_status
   write_cmd :uid_control do
     attributes :uid
   end
-  write_cmd :warm_boot_server
+
+  read_cmd :get_pers_mouse_keyboard_enabled
+  write_cmd :set_pers_mouse_keyboard_enabled do
+    attributes :value
+  end
+
+  read_cmd :get_server_power_on_time
+  write_cmd :clear_server_power_on_time
 end

data/lib/ilorb/definitions/user.rb

@@ -1,19 +1,23 @@
 context :user_info do
-  read_cmd :get_user do
-    attributes :user_login
-  end
-  read_cmd :get_all_users
-  read_cmd :get_all_user_info
-
   write_cmd :add_user do
     attributes :user_name, :user_login, :password
     elements :admin_priv, :remote_cons_priv, :reset_server_priv, :virtual_media_priv, :config_ilo_priv
   end
+
   write_cmd :delete_user do
     attributes :user_login
   end
+
+  read_cmd :get_user do
+    attributes :user_login
+  end
+
   write_cmd :mod_user do
     attributes :user_login
     elements :user_name, :user_login, :password, :admin_priv, :remote_cons_priv, :reset_server_priv, :virtual_media_priv, :config_ilo_priv, :del_users_ssh_key
   end
+
+  read_cmd :get_all_users
+
+  read_cmd :get_all_user_info
 end

data/lib/ilorb/ribcl.rb

@@ -1,5 +1,9 @@
 class ILORb
   class RIBCL < Hash
+
+    class NotImplementedError < StandardError; end
+    class InvalidDefinitionError < StandardError; end
+
     def initialize
       super
     end
@@ -92,14 +96,6 @@ class ILORb
         map
       end
 
-      def get_params
-        params = []
-        params += @attributes
-        params << @text if @text
-        params += map_elements.keys
-        params
-      end
-
       private
       # private methods are used by DSL
 
@@ -118,12 +114,16 @@ class ILORb
             end
           end
           @elements.merge!(hash)
+        else
+          raise InvalidDefinitionError, "no elements and text"
         end
       end
 
       def text(param)
         if @elements.empty?
           @text = param
+        else
+          raise InvalidDefinitionError, "no text and elements"
         end
       end
 

data/lib/ilorb/version.rb

@@ -1,3 +1,3 @@
 class ILORb
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/ilorb.rb

@@ -8,8 +8,6 @@ require 'ilorb/ribcl'
 
 class ILORb
 
-  class NotImplemented < StandardError; end
-
   def initialize(config = {})
     @hostname = config[:hostname]
     @login = config[:login] || "Administrator"
@@ -32,48 +30,47 @@ class ILORb
     if @ribcl.has_command?(name)
       command = @ribcl.command(name)
 
-      raise NotImplemented, "#{name} is not supported" unless command.supported?
+      raise RIBCL::NotImplementedError, "#{name} is not supported" unless command.supported?
+      @log.info("Calling method #{name}")
 
       params = args.first || {}
       attributes = {}
       element_map = nil
 
-      #TODO check for text
-
       command.get_attributes.each do |attr|
         # Attributes are mandatory
         error("Attribute #{attr} missing in #{name} call") unless params.has_key?(attr)
         attributes.store(attr, @ribcl.encode(params.delete(attr)))
       end
 
-      element_map = command.map_elements
+      if !command.get_elements.empty?
+        element_map = command.map_elements
 
-      elements_array = []
-
-      [ params ].flatten.each do |params_hash|
-        elements = {}
-        params_hash.each do |key, value|
-          # Elements are not mandatory for now
-          elements.store(key, @ribcl.encode(params_hash.delete(key))) if element_map.has_key?(key)
+        elements_array = [params].flatten.map do |params_hash|
+          Hash[params_hash.map{ |k,v| [ k, @ribcl.encode(params_hash.delete(k)) ] if element_map.has_key?(k) }.compact]
         end
-        elements_array << elements
-      end
 
-      #TODO check for CDATA
-
-      @log.info("Calling method #{name}")
-      request = ribcl_request(command, attributes) do |xml|
-        elements_array.each do |elements_hash|
-          elements_hash.each do |key, value|
-            elt = command.get_elements[element_map[key].first]
-            if elt.is_a?(Array)
-              attrs = Hash[elt.map{|x| [x, elements_hash.delete(element_map.invert[[element_map[key].first, x]])]}]
-            else
-              attrs = {element_map[key].last => value}
+        #TODO check for CDATA
+
+        request = ribcl_request(command, attributes) do |xml|
+          elements_array.each do |elements_hash|
+            elements_hash.each do |key, value|
+              elt = command.get_elements[element_map[key].first]
+              if elt.is_a?(Array)
+                attrs = Hash[elt.map{|x| [x, elements_hash.delete(element_map.invert[[element_map[key].first, x]])]}]
+              else
+                attrs = {element_map[key].last => value}
+              end
+              xml.send(element_map[key].first, attrs)
             end
-            xml.send(element_map[key].first, attrs)
           end
         end
+      elsif !command.get_text.nil?
+        if text = params[command.get_text]
+          request = ribcl_request(command, text, attributes)
+        end
+      else
+        request = ribcl_request(command, attributes)
       end
 
       response = send_request(request)
@@ -93,6 +90,22 @@ class ILORb
 
   private
 
+  def ribcl_request(command, *args, &block)
+    builder = Nokogiri::XML::Builder.new do |xml|
+      xml.ribcl(:version => "2.0") {
+        xml.login(:password => @password, :user_login => @login) {
+          xml.send(command.context, :mode => command.mode) {
+            xml.send(command.name, *args) {
+              yield xml if block_given?
+            }
+          }
+        }
+      }
+    end
+
+    builder.to_xml
+  end
+
   def send_request(xml)
     case @protocol
     when :http
@@ -127,7 +140,7 @@ class ILORb
     sock = TCPSocket.new(@hostname, @port)
 
     ctx = OpenSSL::SSL::SSLContext.new(:TLSv1)
-    ctx.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    ctx.verify_mode = OpenSSL::SSL::VERIFY_NONE unless @verify_ssl
     ssl_sock = OpenSSL::SSL::SSLSocket.new(sock, ctx)
     ssl_sock.sync_close = true
 
@@ -178,22 +191,6 @@ class ILORb
     output
   end
 
-  def ribcl_request(command, args = {}, &block)
-    builder = Nokogiri::XML::Builder.new do |xml|
-      xml.ribcl(:version => "2.0") {
-        xml.login(:password => @password, :user_login => @login) {
-          xml.send(command.context, :mode => command.mode) {
-            xml.send(command.name, args) {
-              yield xml if block_given?
-            }
-          }
-        }
-      }
-    end
-
-    builder.to_xml
-  end
-
   def setup_commands
     @ribcl = ILORb::RIBCL.load(File.join(File.dirname(__FILE__), "ilorb/definitions", "*.rb"))
     nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ilorb
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Jonathan Amiez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-02 00:00:00.000000000 Z
+date: 2015-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,16 +84,16 @@ dependencies:
   name: nori
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 description: HP ILO Ruby interface
 email:
 - jonathan.amiez@gmail.com
@@ -101,9 +101,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- ".ruby-gemset"
 - Gemfile
 - Gemfile.lock
 - README.md
+- Rakefile
 - ilorb.gemspec
 - lib/ilorb.rb
 - lib/ilorb/definitions/rib.rb
@@ -135,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Configure and retrieve data from server's ILO management card