redfish_tools 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 4c6ab90b8f72271602995c5d80f2db1c5a98464932e0f63998b12be0e62f056b
-  data.tar.gz: 4e855bde6379285944b597b86a985e6b14ff7accb841f7cbc499a355ade3b88f
+SHA1:
+  metadata.gz: d8e4fd83aeaa6c8af2e97fce4d2e92802cc97281
+  data.tar.gz: d2e92b0b838758132ba345a45ab6d8c4b423dcf3
 SHA512:
-  metadata.gz: c0bb889e806d7d7512308122084d7c376caffd163dc931418829d3f512c73423e9c1bbd79392b65e28c70ab984e2f0bf1d0114869558755a40d59c8231f2b31f
-  data.tar.gz: e6e7f0d9331526ef9c0237bae96ee5ce27c94ad77150179c6913f6fe2449b9ccf59a75d8d47472db0477496cdf1a0f735a73f14f51d847de6f6c14e607059bbe
+  metadata.gz: f8c3805f96c543a24c787edb52ec70a60ccf097b547e9a6ca87909219f810f091852479ba4237439c2ae146222536f9a30fdc2f814fd3b4491c1d9296ebbf184
+  data.tar.gz: f02fc22a3b4600a5b41621026bf26c98160f6c72665d23290b6df19dd538f209a267fca3ebfd2ece864e76e7840d16dc08f3a9013b5418631726a1bbfd678aa4

data/.travis.yml

@@ -1,4 +1,3 @@
-sudo: false
 language: ruby
 cache: bundler
 rvm:

data/lib/redfish_tools/server.rb

@@ -27,5 +27,26 @@ module RedfishTools
       @basic_auth_header ||= "Basic " +
         Base64.strict_encode64("#{username}:#{password}")
     end
+
+    def system_actions
+      # Hash of action_id => system_id
+      @system_actions ||= load_all_system_actions
+    end
+
+    private
+
+    def load_all_system_actions
+      systems_id = datastore.get("/redfish/v1").body["Systems"]["@odata.id"]
+      datastore.get(systems_id).body["Members"].reduce({}) do |acc, link|
+        acc.merge(load_system_actions(link["@odata.id"]))
+      end
+    end
+
+    def load_system_actions(id)
+      actions = datastore.get(id).body.dig("Actions") || {}
+      actions.each_with_object({}) do |(name, data), acc|
+        acc[data["target"]] = { name: name, system_id: id }
+      end
+    end
   end
 end

data/lib/redfish_tools/servlet.rb

@@ -12,21 +12,38 @@ module RedfishTools
 
     def_delegators :@server,
                    :datastore, :login_path, :username, :password,
-                   :basic_auth_header
+                   :basic_auth_header, :system_actions
 
     BAD_HEADERS = Set.new(["connection", "content-length", "keep-alive"])
     DEFAULT_HEADERS = {
       "content-type" => "application/json"
     }.freeze
+    TRANSITIONS = {
+      "On"  => {
+        "GracefullShutdown" => "Off",
+        "ForceOff"          => "Off",
+        "PushPowerButton"   => "Off",
+        "Nmi"               => "Off",
+        "GracefullRestart"  => "On",
+        "ForceRestart"      => "On",
+        "PowerCycle"        => "On",
+      }.freeze,
+      "Off" => {
+        "On"              => "On",
+        "ForceOn"         => "On",
+        "PushPowerButton" => "On",
+      }.freeze,
+    }.freeze
 
     def service(request, response)
       return response.status = 401 unless authorized?(request)
-      return response.status = 404 unless datastore.get(request.path).body
 
       super
     end
 
     def do_GET(request, response)
+      return response.status = 404 unless datastore.get(request.path).body
+
       item = datastore.get(request.path)
       response.status = 200
       set_headers(response, item.headers)
@@ -34,18 +51,27 @@ module RedfishTools
     end
 
     def do_POST(request, response)
+      action = system_actions[request.path]
       item = datastore.get(request.path)
-      return response.status = 405 unless item.body["Members"]
+      return response.status = 404 unless action || item.body
+      return response.status = 405 if action.nil? && item.body["Members"].nil?
 
       data = JSON.parse(request.body)
-      item_n = login_path?(request) ? login(item, data) : new_item(item, data)
-      return response.status = 400 unless item_n&.body
+      if action
+        body, headers, status = execute_action(action, data)
+      elsif login_path?(request.path)
+        body, headers, status = login(item, data)
+      else
+        body, headers, status = new_item(item, data)
+      end
 
-      response.status = 201
-      set_headers(response, item_n.headers)
-      response.body = item_n.body.to_json
+      response.status = status
+      set_headers(response, headers)
+      response.body = body.to_json
     rescue JSON::ParserError
       response.status = 400
+      set_headers(response)
+      response.body = error_body("Invalid JSON").to_json
     end
 
     def do_PUT(_request, response)
@@ -57,27 +83,54 @@ module RedfishTools
     end
 
     def do_DELETE(request, response)
-      delete_item(datastore.get(request.path))
+      item = datastore.get(request.path)
+      return response.status = 404 unless item.body
+
+      delete_item(item)
       response.status = 204
     end
 
     private
 
-    def login_path?(request)
-      login_path == request.path.chomp("/")
+    def error_body(msg)
+      { "error" => { "message" => msg } }
+    end
+
+    def execute_action(action, data)
+      # TODO(@tadeboro): This method currently only handles reset action.
+      system = datastore.get(action[:system_id]).body
+      action = system["Actions"][action[:name]]
+      reset = data["ResetType"]
+
+      unless action["ResetType@Redfish.AllowableValues"].include?(reset)
+        return error_body("Invalid reset type"), nill, 400
+      end
+
+      unless TRANSITIONS[system["PowerState"]].key?(reset)
+        return error_body("Invalid reset type for curent state"), nil, 400
+      end
+
+      # Simulate reset action
+      system["PowerState"] = TRANSITIONS[system["PowerState"]][reset]
+
+      [error_body("Success"), nil, 200]
+    end
+
+    def login_path?(path)
+      login_path == path.chomp("/")
     end
 
     def login(item, data)
       user = data["UserName"]
-      pass = data["Password"]
-      return nil unless username == user && password == pass
+      unless username == user && password == data["Password"]
+        return error_body("Invalid username/password"), nil, 400
+      end
 
-      res = new_item(item,
-                     "@odata.type" => "#Session.v1_1_0.Session",
-                     "UserName"    => user,
-                     "Password"    => nil)
-      res.headers = DEFAULT_HEADERS.merge("X-Auth-Token" => res.body["Id"])
-      res
+      body, _, status = new_item(item,
+                                 "@odata.type" => "#Session.v1_1_0.Session",
+                                 "UserName"    => user,
+                                 "Password"    => nil)
+      [body, DEFAULT_HEADERS.merge("X-Auth-Token" => body["Id"]), status]
     end
 
     def new_item(item, data)
@@ -87,7 +140,8 @@ module RedfishTools
       item.body["Members"].push("@odata.id" => oid)
 
       base = { "@odata.id" => oid, "Id" => id, "Name" => id }
-      datastore.set(oid, base.merge(data), parent: item)
+      new_item = datastore.set(oid, base.merge(data), parent: item)
+      [new_item.body, nil, 201]
     end
 
     def delete_item(item)
@@ -105,7 +159,7 @@ module RedfishTools
         always_allow?(request.path) || # Non-protected endpoints
         authorized_basic?(request) ||
         authorized_session?(request) ||
-        (request.request_method == "POST" && login_path?(request))
+        (request.request_method == "POST" && login_path?(request.path))
     end
 
     def always_allow?(path)
@@ -134,7 +188,7 @@ module RedfishTools
       nil
     end
 
-    def set_headers(response, headers)
+    def set_headers(response, headers = nil)
       headers ||= DEFAULT_HEADERS
       headers.each do |k, v|
         response[k] = v unless BAD_HEADERS.member?(k.downcase)

data/lib/redfish_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RedfishTools
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/redfish_tools.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "server_sent_events", "~> 0.1.1"
   spec.add_runtime_dependency "thor", "~> 0.19"
 
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redfish_tools
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Tadej Borovšak
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-24 00:00:00.000000000 Z
+date: 2019-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redfish_client
@@ -56,16 +56,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -176,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Collection of tools for working with Redfish services.