xclarity_client 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c225f7e8fa4892e4d6df4a2d52b28baeee25bdfa
-  data.tar.gz: 45626fcb6f69044de36d88d0eb77e6aa1d965ae6
+  metadata.gz: 66b57c7b42803f37cb0a30b52a4e98224beeb4e4
+  data.tar.gz: 68bccb6791d594e9215cd1f415520e009aba56f0
 SHA512:
-  metadata.gz: f4e5f46a91ff93ceb5993e2ce7a62898906fe442d124c42f31c43e837eb93ceb30bade4c9af9dc930f63e2813e58e2a8208d8491218597a65f953f6cd6097ed2
-  data.tar.gz: 3d13dc05ecaeaab18e3e688e93c28c5b2e03ad884c78c5d488b098b13675426a8af2aad7c1e3cb6e4d9b2a55937a52853ee91b6a57346b63ce7bfd48b6e143ab
+  metadata.gz: 6e9b91e844ad444cad459fdef944c327d9925016b2928c1e53a1f436a4d355161b2aad9cf2f95aa887cd83702775e8944700ab8b90545416c2fb7fa138c6c520
+  data.tar.gz: 830f1079550d10f203feba46d65db5bd54c497e5a0a77b80265a1d784c5eb7aaad1e87ebfd9ada21fa3b7a58d61794779d1a53126c82b97ce8b01deea44f4682

data/docs/apib/node_bmc.apib

@@ -0,0 +1,15 @@
+FORMAT: 1A
+
+# XClarity Nodes
+
+# PUT /nodes/6B538D351B8211E193F65CF3FC6E4030/bmc
+
++ Response 200
+  {
+  }
++ Response 400
++ Response 401
++ Response 404
++ Response 409
++ Response 500
+

data/lib/xclarity_client/client.rb

@@ -1,5 +1,7 @@
 module XClarityClient
   class Client
+    include XClarityClient::PowerManagementMixin
+
     def initialize(connection)
       @connection = connection
     end
@@ -142,20 +144,6 @@ module XClarityClient
       EventManagement.new(@connection).get_object_with_opts(opts, Event)
     end
 
-    def power_on_node(uuid = '')
-      NodeManagement.new(@connection).set_node_power_state(uuid, 'powerOn')
-    end
-
-    def power_off_node(uuid = '')
-      NodeManagement.new(@connection).set_node_power_state(uuid, 'powerOff')
-    end
-
-    def power_restart_node(uuid = '')
-      NodeManagement.new(@connection).set_node_power_state(uuid,
-                                                           'powerCycleSoftGrace'
-                                                          )
-    end
-
     def blink_loc_led(uuid = '')
       NodeManagement.new(@connection).set_loc_led_state(uuid, 'Blinking')
     end

data/lib/xclarity_client/node_management.rb

@@ -1,9 +1,10 @@
 require 'json'
 require 'uuid'
 
+# XClarityClient module/namespace
 module XClarityClient
+  # Node Management class
   class NodeManagement < XClarityBase
-    OFF = 1
     include XClarityClient::ManagementMixin
 
     def initialize(conf)
@@ -14,17 +15,26 @@ module XClarityClient
       get_all_resources(Node, opts)
     end
 
-    def set_node_power_state(uuid, powerState = OFF)
-      puts 'UUID to shutdown ' + uuid
-      power_request = case powerState
-                      when OFF
-                        JSON.generate(powerState: 'powerOff')
-                      else
-                        JSON.generate(powerState: 'powerOn')
-                      end
-      $lxca_log.info "XclarityClient::ManagementMixin set_node_power_state", "Power state action has been sent"
-
-      do_put(Node::BASE_URI + '/' + uuid, power_request)
+    def set_node_power_state(uuid, requested_state = nil)
+      if [uuid, requested_state].any? { |item| item.nil? }
+        error = 'Invalid target or power state requested'
+        source = 'XClarity::NodeManagement set_node_power_state'
+        $lxca_log.info source, error
+        raise ArgumentError, error
+      end
+
+      send_power_request(Node::BASE_URI + '/' + uuid, requested_state)
+    end
+
+    def set_bmc_power_state(uuid, requested_state = nil)
+      if [uuid, requested_state].any? { |item| item.nil? }
+        error = 'Invalid target or power state requested'
+        source = 'XClarity::NodeManagement set_bmc_power_state'
+        $lxca_log.info source, error
+        raise ArgumentError, error
+      end
+
+      send_power_request(Node::BASE_URI + '/' + uuid + '/bmc', requested_state)
     end
 
     def set_loc_led_state(uuid, state, name = 'Identify')
@@ -34,5 +44,16 @@ module XClarityClient
 
       do_put("#{Node::BASE_URI}/#{uuid}", request)
     end
+
+    private
+
+    def send_power_request(uri, requested_state = nil)
+      power_request = JSON.generate(powerState: requested_state)
+      response = do_put(uri, power_request)
+      msg = "Power state action has been sent with request #{power_request}"
+
+      $lxca_log.info 'XclarityClient::NodeManagement set_node_power_state', msg
+      response
+    end
   end
 end

data/lib/xclarity_client/version.rb

@@ -1,3 +1,3 @@
 module XClarityClient
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/lib/xclarity_client/xclarity_power_management_mixin.rb

@@ -0,0 +1,36 @@
+# Top Level Xclarity module
+module XClarityClient
+  # Power management mixin
+  module PowerManagementMixin
+    def power_on_node(uuid = '')
+      NodeManagement.new(@connection).set_node_power_state(uuid, :powerOn)
+    end
+
+    def power_off_node(uuid = '')
+      NodeManagement.new(@connection).set_node_power_state(uuid, :powerOff)
+    end
+
+    def power_off_node_now(uuid = '')
+      NodeManagement.new(@connection).set_node_power_state(uuid, :powerNMI)
+    end
+
+    def power_restart_node(uuid = '')
+      client = NodeManagement.new(@connection)
+      client.set_node_power_state(uuid, :powerCycleSoftGrace)
+    end
+
+    def power_restart_node_now(uuid = '')
+      client = NodeManagement.new(@connection)
+      client.set_node_power_state(uuid, :powerCycleSoft)
+    end
+
+    def power_restart_node_controller(uuid = '')
+      client = NodeManagement.new(@connection)
+      client.set_bmc_power_state(uuid, :restart)
+    end
+
+    def power_restart_node_to_setup(uuid = '')
+      NodeManagement.new(@connection).set_node_power_state(uuid, :bootToF1)
+    end
+  end
+end

data/lib/xclarity_client/xclarity_resource.rb

@@ -4,6 +4,7 @@ module XClarityClient
       attributes.each do |key, value|
         begin
           value = value.gsub("\u0000", '') if value.is_a?(String)
+          key = key.to_s.gsub("-","_")
           send("#{key}=", value)
         rescue
           $log.warn("UNEXISTING ATTRIBUTES FOR #{self.class}: #{key}") unless defined?(Rails).nil?

data/lib/xclarity_client.rb

@@ -6,10 +6,10 @@ module XClarityClient
 end
 
 require 'xclarity_client/configuration'
-require 'xclarity_client/client'
 require 'xclarity_client/xclarity_base'
 require 'xclarity_client/xclarity_resource'
 require 'xclarity_client/xclarity_management_mixin'
+require 'xclarity_client/xclarity_power_management_mixin'
 require 'xclarity_client/virtual_appliance_management'
 require 'xclarity_client/node'
 require 'xclarity_client/node_management'
@@ -34,3 +34,4 @@ require 'xclarity_client/cabinet_management'
 require 'xclarity_client/event'
 require 'xclarity_client/event_management'
 require 'xclarity_client/discover'
+require 'xclarity_client/client'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xclarity_client
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Manasa Rao
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-18 00:00:00.000000000 Z
+date: 2017-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -152,6 +152,7 @@ files:
 - docs/apib/fan_mux.apib
 - docs/apib/fan_muxes.apib
 - docs/apib/node.apib
+- docs/apib/node_bmc.apib
 - docs/apib/power_supply.apib
 - docs/apib/scalable_complex.apib
 - docs/apib/squisher.rb
@@ -188,6 +189,7 @@ files:
 - lib/xclarity_client/virtual_appliance_management.rb
 - lib/xclarity_client/xclarity_base.rb
 - lib/xclarity_client/xclarity_management_mixin.rb
+- lib/xclarity_client/xclarity_power_management_mixin.rb
 - lib/xclarity_client/xclarity_resource.rb
 - xclarity_client.gemspec
 homepage: https://github.com/lenovo/xclarity_client