ilo-sdk 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e3d66a47d72463a4564931c4c6764ccdcc9799f
-  data.tar.gz: 872a83c910c87089bc9ec82318f2ca9eb43a14c5
+  metadata.gz: a7d69fdc25188262aeac98e737390e8816483736
+  data.tar.gz: 6d4ee8248719197181c07065d57c5dfecd21beb5
 SHA512:
-  metadata.gz: 1a184e445883fdaa526d4511d5a84bbccfbbbfcb56fc3fe530b161f73e2b72c9faeca92d69dcbef638db95fae104bdd68b8107e7430147bdde6fcc4b1f7a7ca0
-  data.tar.gz: 97689bb3dfb16e23afff23f3e232b7ad4df00cee038d4f3f241beff3986d71f078aab9bb6a57728ef6ac3056a52f035f3730431b6bc7420332cad218eb59935f
+  metadata.gz: 20cecf33036d39ec7d1cb2c580c9925b08fc378b988cebb2b67b6388dcb795c3f76cf12c653d995062392ec48ef973a864a5e1216594dd2ec05fc5d0fcdfe44d
+  data.tar.gz: fd390be798147aac7992bb2b3a992aaca7f2febd49241d29a476134ea0282f63f51fc7f04d2edf5cd40dd34ce99034a95e190aa8852506b621009b213820ee08

data/CHANGELOG.md

@@ -1,4 +1,8 @@
 ### New (Unreleased)
+ - (none)
+
+#### v1.2.2
+ - Fixed log_entry helper methods
 
 #### v1.2.1
  - Added rest command to cli

data/lib/ilo-sdk/helpers/log_entry_helper.rb

@@ -1,7 +1,7 @@
-# (C) Copyright 2016 Hewlett Packard Enterprise Development LP
+# (c) Copyright 2016 Hewlett Packard Enterprise Development LP
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
-# You may not use this file except in compliance with the License.
+# you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software distributed
@@ -9,16 +9,31 @@
 # CONDITIONS OF ANY KIND, either express or implied. See the License for the
 # specific language governing permissions and limitations under the License.
 
+require 'time'
+
 module ILO_SDK
   # Contains helper methods for Log Entry actions
   module LogEntryHelper
+    # Get the URI for the specified log type
+    # @param [String, Symbol] log_type
+    # @raise [RuntimeError] if type is invalid
+    # @return [String] URI of log service
+    def uri_for_log_type(log_type, id = 1)
+      resource = case log_type.to_s.upcase
+                 when 'IEL' then 'Managers'
+                 when 'IML' then 'Systems'
+                 else raise "Invalid log_type '#{log_type}'. Valid options are IEL and IML"
+                 end
+      "/redfish/v1/#{resource}/#{id}/LogServices/#{log_type.upcase}/"
+    end
+
     # Clear the specified logs
     # @param [String, Symbol] log_type
     # @raise [RuntimeError] if the request failed
     # @return true
     def clear_logs(log_type)
       new_action = { 'Action' => 'ClearLog' }
-      response = rest_post("/redfish/v1/Managers/1/LogServices/#{log_type}/", body: new_action)
+      response = rest_post(uri_for_log_type(log_type), body: new_action)
       response_handler(response)
       true
     end
@@ -28,28 +43,25 @@ module ILO_SDK
     # @raise [RuntimeError] if the request failed
     # @return [TrueClass, FalseClass] logs_empty
     def logs_empty?(log_type)
-      response = rest_get("/redfish/v1/Managers/1/LogServices/#{log_type}/Entries/")
+      response = rest_get("#{uri_for_log_type(log_type)}Entries/")
       response_handler(response)['Items'].empty?
     end
 
     # Get the specified logs
-    # @param [String, Symbol] severity_level
-    # @param [String, Symbol] duration
-    # @param [String, Symbol] log_type
+    # @param [String, Symbol, NilClass] severity_level Set to nil to get all logs
+    # @param [String, Symbol] duration Up to this many hours ago
+    # @param [String, Symbol] log_type IEL or IML
     # @raise [RuntimeError] if the request failed
-    # @return logs
+    # @return [Array] log entries
     def get_logs(severity_level, duration, log_type)
-      response = rest_get("/redfish/v1/Managers/1/LogServices/#{log_type}/Entries/")
+      response = rest_get("#{uri_for_log_type(log_type)}Entries/")
       entries = response_handler(response)['Items']
-      logs = []
-      entries.each do |e|
-        if severity_level.nil?
-          logs.push("#{e['Severity']} | #{e['Message']} | #{e['Created']}") if Time.parse(e['Created']) > (Time.now.utc - (duration * 3600))
-        elsif e['Severity'] == severity_level && Time.parse(e['Created']) > (Time.now.utc - (duration * 3600))
-          logs.push("#{e['Severity']} | #{e['Message']} | #{e['Created']}")
-        end
+      start_time = Time.now.utc - (duration * 3600)
+      if severity_level.nil?
+        entries.select { |e| Time.parse(e['Created']) > start_time }
+      else
+        entries.select { |e| severity_level.to_s.casecmp(e['Severity']) == 0 && Time.parse(e['Created']) > start_time }
       end
-      logs
     end
   end
 end

data/lib/ilo-sdk/version.rb

@@ -11,5 +11,5 @@
 
 # Gem version defined here
 module ILO_SDK
-  VERSION = '1.2.1'.freeze
+  VERSION = '1.2.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ilo-sdk
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Anirudh Gupta
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-31 00:00:00.000000000 Z
+date: 2016-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor