leofs_manager_client 0.2.10 → 0.2.11

data/lib/leofs_manager_client/leofs_manager_models.rb

@@ -30,7 +30,7 @@ module LeoFSManager
     attr_reader :node_list
 
     def initialize(h)
-      @node_stat = Node.new(h[:node_stat]) if h.has_key?(:node_stat)
+      @node_stat = NodeStat.new(h[:node_stat]) if h.has_key?(:node_stat)
       @system_info = System.new(h[:system_info]) if h.has_key?(:system_info)
       @node_list = h[:node_list].map {|node| Node.new(node) } if h.has_key?(:node_list)
     end
@@ -49,11 +49,11 @@ module LeoFSManager
 
       def initialize(h)
         @version = h[:version]
-        @n = h[:n]
-        @r = h[:r]
-        @w = h[:w]
-        @d = h[:d]
-        @ring_size = h[:ring_size]
+        @n = Integer(h[:n])
+        @r = Integer(h[:r])
+        @w = Integer(h[:w])
+        @d = Integer(h[:d])
+        @ring_size = Integer(h[:ring_size])
         @ring_cur  = h[:ring_cur]
         @ring_prev = h[:ring_prev]
       end
@@ -61,23 +61,34 @@ module LeoFSManager
 
     # Node Status Model
     class Node
-      attr_reader :version, :type, :node, :state, :log_dir, :ring_cur, :ring_prev, :joined_at,
-                  :total_mem_usage, :system_mem_usage,  :procs_mem_usage, :ets_mem_usage, :num_of_procs
+      attr_reader :type, :node, :state, :ring_cur, :ring_prev, :when
 
       def initialize(h)
-        @version   = h[:version]
-        @type      = h[:type]
-        @node      = h[:node]
-        @state     = h[:state]
-        @log_dir   = h[:log_dir]
+        @type  = h[:type]
+        @node  = h[:node]
+        @when  = Time.parse(h[:when])
+        @state = h[:state]
         @ring_cur  = h[:ring_cur]
         @ring_prev = h[:ring_prev]
-        @joined_at = h[:when]
-        @total_mem_usage  = h[:total_mem_usage]
-        @system_mem_usage = h[:system_mem_usage]
-        @procs_mem_usage  = h[:procs_mem_usage]
-        @ets_mem_usage    = h[:ets_mem_usage]
-        @num_of_procs     = h[:num_of_procs]
+      end
+
+      alias joined_at when
+    end
+
+    class NodeStat
+      @@properties = [
+        :version, :log_dir, :ring_cur, :ring_prev, :vm_version,
+        :total_mem_usage, :system_mem_usage, :procs_mem_usage,
+        :ets_mem_usage, :num_of_procs, :limit_of_procs, :thread_pool_size
+      ]
+
+      attr_reader *@@properties
+
+      def initialize(h)
+        @@properties.each do |property|
+          instance_variable_set("@#{property}", h[property])
+        end
+        @kernel_poll = (h[:kernel_poll] == "true")
       end
     end
   end
@@ -92,20 +103,23 @@ module LeoFSManager
       @size      = h[:size]
       @clock     = h[:clock]
       @checksum  = h[:checksum]
-      @timestamp = h[:timestamp]
+      @timestamp = Time.parse(h[:timestamp])
       @delete    = h[:delete]
-      @num_of_chunks = Integer(h[:num_of_chunks])
+      @num_of_chunks = h[:num_of_chunks]
     end
   end
 
   # Storage Status Model
   class StorageStat
-    attr_reader :file_size, :total_of_objects
+    attr_reader :total_of_objects
 
     def initialize(h)
-      @file_size = h[:file_size]
       @total_of_objects = h[:total_of_objects]
     end
+
+    def file_size
+      warn "property 'file_size' is deprecated"
+    end
   end
 
   # S3 Credential
@@ -124,13 +138,24 @@ module LeoFSManager
   class LoginInfo
     attr_reader :id, :role_id, :access_key_id, :secret_key, :created_at
 
+    RoleDef = {
+      1 => :normal,
+      9 => :admin
+    }
+    RoleDef.default_proc = proc {|_, key| raise "invalid @user_id: #{key}" }
+    RoleDef.freeze
+
     def initialize(h)
       h = h[:user]
       @id = h[:id]
       @role_id = h[:role_id]
       @access_key_id = h[:access_key_id]
       @secret_key = h[:secret_key]
-      @created_at = h[:created_at]
+      @created_at = Time.parse(h[:created_at])
+    end
+
+    def role
+      RoleDef[@role_id]
     end
   end
 
@@ -139,8 +164,9 @@ module LeoFSManager
 
     def initialize(h)
       @user_id = h[:user_id]
+      @role_id = h[:role_id]
       @access_key_id = h[:access_key_id]
-      @created_at = h[:created_at]
+      @created_at = Time.parse(h[:created_at])
     end
   end
 
@@ -153,7 +179,7 @@ module LeoFSManager
 
     def initialize(h)
       @endpoint = h[:endpoint]
-      @created_at = h[:created_at]
+      @created_at = Time.parse(h[:created_at])
     end
   end
 
@@ -169,7 +195,7 @@ module LeoFSManager
     def initialize(h)
       @name       = h[:bucket]
       @owner      = h[:owner]
-      @created_at = h[:created_at]
+      @created_at = Time.parse(h[:created_at])
     end
   end
 end

data/lib/leofs_manager_client.rb

@@ -26,7 +26,7 @@ require "time"
 require_relative "leofs_manager_client/leofs_manager_models"
 
 module LeoFSManager
-  VERSION = "0.2.10"
+  VERSION = "0.2.11"
 
   class Client
     CMD_VERSION          = "version"
@@ -44,14 +44,16 @@ module LeoFSManager
     CMD_S3_CRE_USER      = "s3-create-user %s %s"
     CMD_S3_UPD_USER_ROLE = "s3-update-user-role %s %s"
     CMD_S3_UPD_USER_PASS = "s3-update-user-password %s %s"
-    CMD_S3_DEL_USER      = "s3-delete-user %s %s"
-    CMD_S3_GET_KEYS      = "s3-get-keys"
+    CMD_S3_DEL_USER      = "s3-delete-user %s"
+    CMD_S3_GET_USERS     = "s3-get-users"
     CMD_S3_SET_ENDPOINT  = "s3-set-endpoint %s"
     CMD_S3_DEL_ENDPOINT  = "s3-delete-endpoint %s"
     CMD_S3_GET_ENDPOINTS = "s3-get-endpoints"
     CMD_S3_ADD_BUCKET    = "s3-add-bucket %s %s"
     CMD_S3_GET_BUCKETS   = "s3-get-buckets"
 
+    USER_ROLES = LoginInfo::RoleDef.invert
+
     # ======================================================================
     # APIs
     # ======================================================================
@@ -165,7 +167,7 @@ module LeoFSManager
     # Generate credential for LeoFS
     # Return::
     #   Credential
-    def s3_create_user(user_id, password)
+    def s3_create_user(user_id, password=nil)
       Credential.new(sender(CMD_S3_CRE_USER % [user_id, password]))
     end
 
@@ -173,6 +175,8 @@ module LeoFSManager
     # Return ::
     #   _nil_
     def s3_update_user_role(user_id, role)
+      role = role.to_sym if role.is_a? String
+      role = USER_ROLES[role] if role.is_a? Symbol
       sender(CMD_S3_UPD_USER_ROLE % [user_id, role])
       nil
     end
@@ -188,13 +192,13 @@ module LeoFSManager
     # Delete user
     # Return::
     #   _nil_
-    def s3_delete_user(user_id, password)
-      sender(CMD_S3_DEL_USER % [user_id, password])
+    def s3_delete_user(user_id)
+      sender(CMD_S3_DEL_USER % user_id)
       nil
     end
 
-    def s3_get_keys
-      users = sender(CMD_S3_GET_KEYS)[:users]
+    def s3_get_users
+      users = sender(CMD_S3_GET_USERS)[:users]
       users.map {|account| User.new(account) }
     end
 

data/spec/dummy_tcp_server.rb

@@ -71,7 +71,7 @@ module Dummy
           :size => "",
           :clock => "",
           :checksum => "",
-          :timestamp => "",
+          :timestamp => "2012-12-07 16:51:08 +0900",
           :delete => 0,
           :num_of_chunks => 0
         }
@@ -97,9 +97,9 @@ module Dummy
       ]
     }.to_json
 
-    S3GetKeys = {
+    S3GetUsers = {
       :users => [
-        { :access_key_id => "05236", :user_id => "_test_leofs_", :created_at => "2012-11-20 15:13:20 +0900" }
+        { :access_key_id => "05236", :user_id => "_test_leofs_", :role_id => 1, :created_at => "2012-11-20 15:13:20 +0900" }
       ]
     }.to_json
 
@@ -147,8 +147,8 @@ module Dummy
           Response::S3GetEndpoints
         when "s3-get-buckets"
           Response::S3GetBuckets
-        when "s3-get-keys"
-          Response::S3GetKeys
+        when "s3-get-users"
+          Response::S3GetUsers
         when "s3-create-user"
           Response::S3CreateUser
         else

data/spec/leofs_manager_client_spec.rb

@@ -94,27 +94,31 @@ describe LeoFSManager do
       it "returns Credential" do
         subject.s3_create_user("user_id", "password").should be_a Credential
       end 
+
+      it "goes with only user_id" do
+        subject.s3_create_user("user_id").should be_a Credential
+      end
     end
 
     describe "#s3_update_user_role" do
       it "returns nil" do
-        subject.s3_update_user_role("user_id", "role").should be_nil
+        subject.s3_update_user_role("user_id", "admin").should be_nil
       end
     end
 
     describe "#s3_update_user_password" do
       it "returns nil" do
-        subject.s3_update_user_role("user_id", "new_password").should be_nil
+        subject.s3_update_user_password("user_id", "new_password").should be_nil
       end
     end
 
     describe "#s3_delete_user" do
       it "returns nil" do
-        subject.s3_update_user_role("user_id", "password").should be_nil
+        subject.s3_delete_user("user_id").should be_nil
       end
     end
 
-    its(:s3_get_keys) do
+    its(:s3_get_users) do
       should be_a Array
       subject.each do |account|
         account.should be_a User

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: leofs_manager_client
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.11
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-05 00:00:00.000000000 Z
+date: 2012-12-11 00:00:00.000000000 Z
 dependencies: []
 description: Client for LeoFS Manager
 email: