ibm_power_hmc 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 214dfa7f9a89d236f1f9bc4ee927b619596a0fabe59c2f596359637e891601ab
-  data.tar.gz: 2affd160febc3952014ab522bb9b0f89b0ebef6d785720d2d8d2a875cd1df918
+  metadata.gz: 6aae673197b8e5426c2f75250ef521db9d7e8eed79a20c70089612a10d189cfc
+  data.tar.gz: f7b5cd95629fedf835a97eebd33874edf777527cb8af2c4c5ebdbaaf9364d4d8
 SHA512:
-  metadata.gz: 3e6e6ae8b4c7d84eea70e3328ea44834a5b95ecd98fbe6a31c045e575951b6c17751ca7d6517d3ad58647b5c8b7e1321470c368c48018c31a450a28ba40463e5
-  data.tar.gz: f9139f2ea1a83d0abedc3c73832450e20fa4fcf7c56cc65c50ec5b14750bb5bb2eb17d7948ffc22d5887984d0f412ae8213a237892350e55f0cd55a49af80f30
+  metadata.gz: 793385e1153eff3f9d4bdb8eafe62365a92f0d7fcde75452c1327c36de86b99b2ffd011bf05a57ec9101b4d2d6e84139bc4e86e6cb83347aadef1f0fe5e10b1c
+  data.tar.gz: 3eedcfd6693b0ac13c725488c1f13bb6433e94b136eaebf1c48f4118582b7ed937ad0e6fe1d06f8c74d209eb67f885e181cc26b7b60683f837628f9fc5ed4f3c

data/lib/ibm_power_hmc/connection.rb

@@ -330,8 +330,19 @@ module IbmPowerHmc
       parse_feed(doc, Event)
     end
 
+    ##
+    # @!method schema(type)
+    # Retrieve the XML schema file for a given object type.
+    # @param type [String] The object type (e.g. "LogicalPartition", "inc/Types")
+    # @return [REXML::Document] The XML schema file.
+    def schema(type)
+      method_url = "/rest/api/web/schema/#{type}.xsd"
+      response = request(:get, method_url)
+      REXML::Document.new(response.body)
+    end
+
     class HttpError < Error
-      attr_reader :status, :uri, :reason, :message
+      attr_reader :status, :uri, :reason, :message, :original_exception
 
       ##
       # @!method initialize(err)
@@ -339,18 +350,26 @@ module IbmPowerHmc
       # @param err [RestClient::Exception] The REST client exception.
       def initialize(err)
         super
+        @original_exception = err
         @status = err.http_code
+        @message = err.message
 
         # Try to parse body as an HttpErrorResponse
-        doc = REXML::Document.new(err.response.body)
-        entry = doc.elements["entry"]
-        unless entry.nil?
-          resp = HttpErrorResponse.new(entry)
-          @uri = resp.uri
-          @reason = resp.reason
-          @message = resp.message
+        unless err.response.nil?
+          doc = REXML::Document.new(err.response.body)
+          entry = doc.elements["entry"]
+          unless entry.nil?
+            resp = HttpErrorResponse.new(entry)
+            @uri = resp.uri
+            @reason = resp.reason
+            @message = resp.message
+          end
         end
       end
+
+      def to_s
+        "msg=#{@message} status=#{@status} reason=#{@reason} uri=#{@uri}"
+      end
     end
 
     ##
@@ -364,11 +383,13 @@ module IbmPowerHmc
     def request(method, url, headers = {}, payload = nil)
       logon if @api_session_token.nil?
       reauth = false
+      # Check for relative URLs
+      url = "https://#{@hostname}#{url}" if url.start_with?("/")
       begin
         headers = headers.merge({"X-API-Session" => @api_session_token})
         RestClient::Request.execute(
           :method => method,
-          :url => "https://" + @hostname + url,
+          :url => url,
           :verify_ssl => @verify_ssl,
           :payload => payload,
           :headers => headers

data/lib/ibm_power_hmc/objects.rb

@@ -6,10 +6,11 @@ require 'uri'
 module IbmPowerHmc
   # HMC generic object
   class HmcObject
-    attr_reader :uuid
+    attr_reader :uuid, :xml
 
     def initialize(doc)
       @uuid = doc.elements["id"].text
+      @xml = doc
     end
 
     def get_value(doc, xpath, varname)
@@ -49,6 +50,7 @@ module IbmPowerHmc
       "State" => "state",
       "Hostname" => "hostname",
       "PrimaryIPAddress" => "ipaddr",
+      "SystemFirmware" => "fwversion",
       "AssociatedSystemMemoryConfiguration/InstalledSystemMemory" => "memory",
       "AssociatedSystemMemoryConfiguration/CurrentAvailableSystemMemory" => "avail_mem",
       "AssociatedSystemProcessorConfiguration/InstalledSystemProcessorUnits" => "cpus",

data/lib/ibm_power_hmc/pcm.rb

@@ -37,15 +37,6 @@ module IbmPowerHmc
         href = link.attributes["href"]
         next if href.nil?
 
-        # Validate URI
-        begin
-          href = URI(href)
-        rescue
-          next
-        end
-        # Remove https://hostname:port prefix.
-        href.scheme = href.host = href.port = nil
-
         response = request(:get, href.to_s)
         metrics << JSON.parse(response.body)
       end

data/lib/ibm_power_hmc/version.rb

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

metadata

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