ibm_power_hmc 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e96072a9ae18c79163e6f52a904e3b4f696f9b5d56729fc92d234a385929269
-  data.tar.gz: 69738a546bff4977e35c4732894a0b1916ec8e0dd49601c7e41d95e793f83ae8
+  metadata.gz: 3162f83d1c3168407716f683401e5f3f1b3c49489728561e52ab49410209beaa
+  data.tar.gz: c50f1ac36cda911c01262b06762fd928c06790d4df116f020958edd10ca0713e
 SHA512:
-  metadata.gz: cbe96ad163dc152b885638579ca712a47e07716d98485cd3585de86d8b01e8ba961211cc27a0d0d8b0e4273f610b94eab46e114fc98f1049b480ab73a266f0fa
-  data.tar.gz: 94dafbe96f39811e3b1e70eae35fcc22442c05bbe0eae3fbca3e1e5577c35dffeb575bef5ecc87babdd08939904882391f811b5ddd980983ce30679e7f6c7f18
+  metadata.gz: 014ff944d75d5dccf07d894628a0b41c08fe99d3478558f57b22aff2a1e86cc9589368c3a55696dc0f196edabd59f0d9e47b0f2aa09f726b7d6b18c5d250e775
+  data.tar.gz: 68a388e0a6a75c9cc61e9befeca8644fa64f92e95ca8411948fe166ba81c44997bd67c0247d943567fb0f345671bb9164dbc77294bdeb153f534b394c4637334

data/lib/ibm_power_hmc/connection.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'erb'
+
 # Module for IBM HMC Rest API Client
 module IbmPowerHmc
   class Error < StandardError; end
@@ -16,12 +18,13 @@ module IbmPowerHmc
     # @param username [String] User name.
     # @param port [Integer] TCP port number.
     # @param validate_ssl [Boolean] Verify SSL certificates.
-    def initialize(host:, password:, username: "hscroot", port: 12_443, validate_ssl: true)
+    def initialize(host:, password:, username: "hscroot", port: 12_443, validate_ssl: true, timeout: 60)
       @hostname = "#{host}:#{port}"
       @username = username
       @password = password
       @verify_ssl = validate_ssl
       @api_session_token = nil
+      @timeout = timeout
     end
 
     ##
@@ -76,13 +79,13 @@ module IbmPowerHmc
     end
 
     ##
-    # @!method managed_systems(search = {})
+    # @!method managed_systems(search = nil)
     # Retrieve the list of systems managed by the HMC.
-    # @param search [Hash] The optional property name and value to match.
+    # @param search [String] The optional search criteria.
     # @return [Array<IbmPowerHmc::ManagedSystem>] The list of managed systems.
-    def managed_systems(search = {})
+    def managed_systems(search = nil)
       method_url = "/rest/api/uom/ManagedSystem"
-      search.each { |key, value| method_url += "/search/(#{key}==#{value})" }
+      method_url += "/search/(#{ERB::Util.url_encode(search)})" unless search.nil?
       response = request(:get, method_url)
       FeedParser.new(response.body).objects(:ManagedSystem)
     end
@@ -102,15 +105,15 @@ module IbmPowerHmc
     end
 
     ##
-    # @!method lpars(sys_uuid = nil, search = {})
+    # @!method lpars(sys_uuid = nil, search = nil)
     # Retrieve the list of logical partitions managed by the HMC.
     # @param sys_uuid [String] The UUID of the managed system.
-    # @param search [Hash] The optional property name and value to match.
+    # @param search [String] The optional search criteria.
     # @return [Array<IbmPowerHmc::LogicalPartition>] The list of logical partitions.
-    def lpars(sys_uuid = nil, search = {})
+    def lpars(sys_uuid = nil, search = nil)
       if sys_uuid.nil?
         method_url = "/rest/api/uom/LogicalPartition"
-        search.each { |key, value| method_url += "/search/(#{key}==#{value})" }
+        method_url += "/search/(#{ERB::Util.url_encode(search)})" unless search.nil?
       else
         method_url = "/rest/api/uom/ManagedSystem/#{sys_uuid}/LogicalPartition"
       end
@@ -198,16 +201,16 @@ module IbmPowerHmc
     end
 
     ##
-    # @!method vioses(sys_uuid = nil, search = {}, permissive = true)
+    # @!method vioses(sys_uuid = nil, search = nil, permissive = true)
     # Retrieve the list of virtual I/O servers managed by the HMC.
     # @param sys_uuid [String] The UUID of the managed system.
-    # @param search [Hash] The optional property name and value to match.
+    # @param search [String] The optional search criteria.
     # @param permissive [Boolean] Skip virtual I/O servers that have error conditions.
     # @return [Array<IbmPowerHmc::VirtualIOServer>] The list of virtual I/O servers.
-    def vioses(sys_uuid = nil, search = {}, permissive = true)
+    def vioses(sys_uuid = nil, search = nil, permissive = true)
       if sys_uuid.nil?
         method_url = "/rest/api/uom/VirtualIOServer"
-        search.each { |key, value| method_url += "/search/(#{key}==#{value})" }
+        method_url += "/search/(#{ERB::Util.url_encode(search)})" unless search.nil?
       else
         method_url = "/rest/api/uom/ManagedSystem/#{sys_uuid}/VirtualIOServer"
       end
@@ -858,7 +861,8 @@ module IbmPowerHmc
           :url => url,
           :verify_ssl => @verify_ssl,
           :payload => payload,
-          :headers => headers
+          :headers => headers,
+          :timeout => @timeout
         )
       rescue RestClient::Exception => e
         # Do not retry on failed logon attempts.

data/lib/ibm_power_hmc/parser.rb

@@ -262,7 +262,9 @@ module IbmPowerHmc
       :model => "MachineTypeModelAndSerialNumber/Model",
       :serial => "MachineTypeModelAndSerialNumber/SerialNumber",
       :vtpm_version => "AssociatedSystemSecurity/VirtualTrustedPlatformModuleVersion",
-      :vtpm_lpars => "AssociatedSystemSecurity/AvailableVirtualTrustedPlatformModulePartitions"
+      :vtpm_lpars => "AssociatedSystemSecurity/AvailableVirtualTrustedPlatformModulePartitions",
+      :is_classic_hmc_mgmt => "IsClassicHMCManagement",
+      :is_hmc_mgmt_master => "IsHMCPowerVMManagementMaster"
     }.freeze
 
     def group_uuids
@@ -517,7 +519,9 @@ module IbmPowerHmc
       :type     => "AdapterType", # "Server", "Client", "Unknown"
       :location => "LocationCode",
       :slot     => "VirtualSlotNumber",
-      :required => "RequiredAdapter"
+      :required => "RequiredAdapter",
+      :lpar_id  => "LocalPartitionID",
+      :dr_name  => "DynamicReconfigurationConnectorName"
     }.freeze
   end
 

data/lib/ibm_power_hmc/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module IbmPowerHmc
-  VERSION = "0.13.0"
+  VERSION = "0.14.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ibm_power_hmc
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - IBM Power
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-06 00:00:00.000000000 Z
+date: 2022-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client