saklient 0.0.2.7 → 0.0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fc3dcacb443ef9fb88e18864b25b6e983233659
-  data.tar.gz: 1cc5f3a9323e2634ca191c523bb0975c62b6ce4b
+  metadata.gz: 87140bb4c6fba13d581e1ea1837dd2b48624542c
+  data.tar.gz: c0688e1e5079d7703bf8b9d3b04bc59f3de2bf5c
 SHA512:
-  metadata.gz: 8ee4c6080b8ea97b6fc138d99b51d83aaef7473d47efec2ac696869cc18e336c5a4a47fefc16ffd8de49c19af1a27bcaaa70f7d079a51686d5ae97f26e8d2230
-  data.tar.gz: 13b55667084a18e62dc41441f751592da315998aba2975af3c9507589c51e5e7031fae5dfa4d5e3fd033673ecea8a32155fe6ac3889c76ac388f11267e390487
+  metadata.gz: bed1ad451d918a6f9f8bb2fc4817a6f7d689c48a52cc9b67d6878938ed4d23c2763890feb6f8f41e2dca1135ddd5c501085e226ba6f5d4388c8c82d80453dc95
+  data.tar.gz: 46e0560f5b18e870ed095eb0b77cff1a33c3fb95b223eb9707ec946f61dc6c2443406905e5299a712122564052d52ea3cc997376b83bfb7cfeed6d80d092de8f

data/lib/saklient/cloud/client.rb

@@ -73,7 +73,7 @@ module Saklient
 
         extra_headers = {
           'Content-Type'     => 'application/x-www-form-urlencoded',
-          'User-Agent'       => 'saklient.ruby ver-0.0.2.7 rev-3f3b3b7ce4b10e7ebcd77c17497763ba558bf424',
+          'User-Agent'       => 'saklient.ruby ver-0.0.2.8 rev-3b18f823b96ca9e1efbfa161fdf55b8aee1cecbf',
           'X-Requested-With' => 'XMLHttpRequest',
           'X-Sakura-HTTP-Method' => method,
           'X-Sakura-Error-Level' => 'warning',

data/lib/saklient/cloud/resources/activity.rb

@@ -0,0 +1,90 @@
+# -*- encoding: UTF-8 -*-
+
+require_relative '../../util'
+require_relative '../client'
+
+module Saklient
+  module Cloud
+    module Resources
+
+      class Activity
+
+        protected
+
+        # @private
+        # @return [Saklient::Cloud::Client]
+        attr_accessor :_client
+
+        # @private
+        # @return [String]
+        attr_accessor :_source_id
+
+        # @private
+        # @return [String]
+        def _api_path_prefix
+          return nil
+        end
+
+        # @private
+        # @return [String]
+        def _api_path_suffix
+          return '/monitor'
+        end
+
+        # @private
+        # @param [String] atStr
+        # @param [any] data
+        # @return [void]
+        def _add_sample(atStr, data)
+          Saklient::Util::validate_type(atStr, 'String')
+        end
+
+        public
+
+        # @private
+        # @param [Saklient::Cloud::Client] client
+        def initialize(client)
+          Saklient::Util::validate_type(client, 'Saklient::Cloud::Client')
+          @_client = client
+        end
+
+        # @private
+        # @param [String] id
+        # @return [void]
+        def set_source_id(id)
+          Saklient::Util::validate_type(id, 'String')
+          @_source_id = id
+        end
+
+        # アクティビティを取得します.
+        #
+        #  	 * @return アクティビティ
+        #
+        # @private
+        # @param [NativeDate] startDate
+        # @param [NativeDate] endDate
+        # @return [Activity]
+        def _fetch(startDate = nil, endDate = nil)
+          Saklient::Util::validate_type(startDate, 'NativeDate')
+          Saklient::Util::validate_type(endDate, 'NativeDate')
+          query = {}
+          query[:Start] = Saklient::Util::date2str(startDate) if !(startDate).nil?
+          query[:End] = Saklient::Util::date2str(endDate) if !(endDate).nil?
+          path = _api_path_prefix + '/' + Saklient::Util::url_encode(@_source_id) + _api_path_suffix
+          data = @_client.request('GET', path)
+          return nil if (data).nil?
+          data = data[:Data]
+          return nil if (data).nil?
+          dates = data.keys.map{|k| k.to_s}
+          dates = dates.sort()
+          for date in dates
+            _add_sample(date, data[date.to_sym])
+          end
+          return self
+        end
+
+      end
+
+    end
+  end
+end

data/lib/saklient/cloud/resources/disk.rb

@@ -7,6 +7,7 @@ require_relative 'icon'
 require_relative 'disk_plan'
 require_relative 'server'
 require_relative 'disk_config'
+require_relative 'disk_activity'
 require_relative '../enums/eavailability'
 require_relative '../enums/edisk_connection'
 require_relative '../enums/estorage_class'
@@ -116,6 +117,29 @@ module Saklient
           return _reload
         end
 
+        protected
+
+        # @private
+        # @return [DiskActivity]
+        attr_accessor :_activity
+
+        public
+
+        # @private
+        # @return [DiskActivity]
+        def get_activity
+          return @_activity
+        end
+
+        # アクティビティ
+        #
+        # @return [DiskActivity]
+        attr_reader :activity
+
+        def activity
+          get_activity
+        end
+
         # @private
         # @param [Saklient::Cloud::Client] client
         # @param [any] obj
@@ -124,6 +148,7 @@ module Saklient
           super(client)
           Saklient::Util::validate_type(client, 'Saklient::Cloud::Client')
           Saklient::Util::validate_type(wrapped, 'bool')
+          @_activity = Saklient::Cloud::Resources::DiskActivity.new(client)
           api_deserialize(obj, wrapped)
         end
 
@@ -223,6 +248,7 @@ module Saklient
         # @return [void]
         def _on_after_api_deserialize(r, root)
           if !(r).nil?
+            @_activity.set_source_id(_id)
             if !r.nil? && r.key?(:SourceDisk)
               s = r[:SourceDisk]
               if !(s).nil?

data/lib/saklient/cloud/resources/disk_activity.rb

@@ -0,0 +1,72 @@
+# -*- encoding: UTF-8 -*-
+
+require_relative 'activity'
+require_relative 'disk_activity_sample'
+
+module Saklient
+  module Cloud
+    module Resources
+
+      class DiskActivity < Saklient::Cloud::Resources::Activity
+
+        protected
+
+        # @private
+        # @return [Array<DiskActivitySample>]
+        attr_accessor :_samples
+
+        # @private
+        # @return [Array<DiskActivitySample>]
+        def get_samples
+          return @_samples
+        end
+
+        public
+
+        # サンプル列
+        #
+        # @return [Array<DiskActivitySample>]
+        attr_reader :samples
+
+        def samples
+          get_samples
+        end
+
+        protected
+
+        # @private
+        # @return [String]
+        def _api_path_prefix
+          return '/disk'
+        end
+
+        # @private
+        # @param [String] atStr
+        # @param [any] data
+        # @return [void]
+        def _add_sample(atStr, data)
+          Saklient::Util::validate_type(atStr, 'String')
+          @_samples << Saklient::Cloud::Resources::DiskActivitySample.new(atStr, data)
+        end
+
+        public
+
+        # アクティビティを取得します.
+        #
+        #  	 * @return アクティビティ
+        #
+        # @param [NativeDate] startDate
+        # @param [NativeDate] endDate
+        # @return [DiskActivity]
+        def fetch(startDate = nil, endDate = nil)
+          Saklient::Util::validate_type(startDate, 'NativeDate')
+          Saklient::Util::validate_type(endDate, 'NativeDate')
+          @_samples = []
+          return _fetch(startDate, endDate)
+        end
+
+      end
+
+    end
+  end
+end

data/lib/saklient/cloud/resources/disk_activity_sample.rb

@@ -0,0 +1,129 @@
+# -*- encoding: UTF-8 -*-
+
+require_relative '../../util'
+
+module Saklient
+  module Cloud
+    module Resources
+
+      # @private
+      class DiskActivitySample
+
+        protected
+
+        # @private
+        # @return [NativeDate]
+        attr_accessor :_at
+
+        public
+
+        # @private
+        # @return [NativeDate]
+        def get_at
+          return @_at
+        end
+
+        # 記録日時
+        #
+        # @return [NativeDate]
+        attr_reader :at
+
+        def at
+          get_at
+        end
+
+        protected
+
+        # @private
+        # @return [bool]
+        attr_accessor :_is_available
+
+        public
+
+        # @private
+        # @return [bool]
+        def get_is_available
+          return @_is_available
+        end
+
+        # 有効な値のとき真
+        #
+        # @return [bool]
+        attr_reader :is_available
+
+        def is_available
+          get_is_available
+        end
+
+        protected
+
+        # @private
+        # @return [Float]
+        attr_accessor :_write
+
+        public
+
+        # @private
+        # @return [Float]
+        def get_write
+          return @_write
+        end
+
+        # ライト[BPS]
+        #
+        # @return [Float]
+        attr_reader :write
+
+        def write
+          get_write
+        end
+
+        protected
+
+        # @private
+        # @return [Float]
+        attr_accessor :_read
+
+        public
+
+        # @private
+        # @return [Float]
+        def get_read
+          return @_read
+        end
+
+        # リード[BPS]
+        #
+        # @return [Float]
+        attr_reader :read
+
+        def read
+          get_read
+        end
+
+        # @param [String] atStr
+        # @param [any] data
+        def initialize(atStr, data)
+          Saklient::Util::validate_type(atStr, 'String')
+          @_at = Saklient::Util::str2date(atStr)
+          @_is_available = true
+          v = nil
+          v = data[:Write]
+          if (v).nil?
+            @_is_available = false
+          else
+            @_write = v
+          end
+          v = data[:Read]
+          if (v).nil?
+            @_is_available = false
+          else
+            @_read = v
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/saklient/cloud/resources/iface.rb

@@ -4,6 +4,7 @@ require_relative '../../errors/saklient_exception'
 require_relative '../client'
 require_relative 'resource'
 require_relative 'swytch'
+require_relative 'iface_activity'
 
 module Saklient
   module Cloud
@@ -85,6 +86,29 @@ module Saklient
           return _reload
         end
 
+        protected
+
+        # @private
+        # @return [IfaceActivity]
+        attr_accessor :_activity
+
+        public
+
+        # @private
+        # @return [IfaceActivity]
+        def get_activity
+          return @_activity
+        end
+
+        # アクティビティ
+        #
+        # @return [IfaceActivity]
+        attr_reader :activity
+
+        def activity
+          get_activity
+        end
+
         # @private
         # @param [Saklient::Cloud::Client] client
         # @param [any] obj
@@ -93,9 +117,22 @@ module Saklient
           super(client)
           Saklient::Util::validate_type(client, 'Saklient::Cloud::Client')
           Saklient::Util::validate_type(wrapped, 'bool')
+          @_activity = Saklient::Cloud::Resources::IfaceActivity.new(client)
           api_deserialize(obj, wrapped)
         end
 
+        protected
+
+        # @private
+        # @param [any] r
+        # @param [any] root
+        # @return [void]
+        def _on_after_api_deserialize(r, root)
+          @_activity.set_source_id(_id) if !(r).nil?
+        end
+
+        public
+
         # スイッチに接続します.
         #
         # @param [Swytch] swytch 接続先のスイッチ.

data/lib/saklient/cloud/resources/iface_activity.rb

@@ -0,0 +1,78 @@
+# -*- encoding: UTF-8 -*-
+
+require_relative 'activity'
+require_relative 'iface_activity_sample'
+
+module Saklient
+  module Cloud
+    module Resources
+
+      class IfaceActivity < Saklient::Cloud::Resources::Activity
+
+        protected
+
+        # @private
+        # @return [Array<IfaceActivitySample>]
+        attr_accessor :_samples
+
+        # @private
+        # @return [Array<IfaceActivitySample>]
+        def get_samples
+          return @_samples
+        end
+
+        public
+
+        # サンプル列
+        #
+        # @return [Array<IfaceActivitySample>]
+        attr_reader :samples
+
+        def samples
+          get_samples
+        end
+
+        protected
+
+        # @private
+        # @return [String]
+        def _api_path_prefix
+          return '/interface'
+        end
+
+        # @private
+        # @return [String]
+        def _api_path_suffix
+          return '/monitor'
+        end
+
+        # @private
+        # @param [String] atStr
+        # @param [any] data
+        # @return [void]
+        def _add_sample(atStr, data)
+          Saklient::Util::validate_type(atStr, 'String')
+          @_samples << Saklient::Cloud::Resources::IfaceActivitySample.new(atStr, data)
+        end
+
+        public
+
+        # アクティビティを取得します.
+        #
+        #  	 * @return アクティビティ
+        #
+        # @param [NativeDate] startDate
+        # @param [NativeDate] endDate
+        # @return [IfaceActivity]
+        def fetch(startDate = nil, endDate = nil)
+          Saklient::Util::validate_type(startDate, 'NativeDate')
+          Saklient::Util::validate_type(endDate, 'NativeDate')
+          @_samples = []
+          return _fetch(startDate, endDate)
+        end
+
+      end
+
+    end
+  end
+end

data/lib/saklient/cloud/resources/iface_activity_sample.rb

@@ -0,0 +1,129 @@
+# -*- encoding: UTF-8 -*-
+
+require_relative '../../util'
+
+module Saklient
+  module Cloud
+    module Resources
+
+      # @private
+      class IfaceActivitySample
+
+        protected
+
+        # @private
+        # @return [NativeDate]
+        attr_accessor :_at
+
+        public
+
+        # @private
+        # @return [NativeDate]
+        def get_at
+          return @_at
+        end
+
+        # 記録日時
+        #
+        # @return [NativeDate]
+        attr_reader :at
+
+        def at
+          get_at
+        end
+
+        protected
+
+        # @private
+        # @return [bool]
+        attr_accessor :_is_available
+
+        public
+
+        # @private
+        # @return [bool]
+        def get_is_available
+          return @_is_available
+        end
+
+        # 有効な値のとき真
+        #
+        # @return [bool]
+        attr_reader :is_available
+
+        def is_available
+          get_is_available
+        end
+
+        protected
+
+        # @private
+        # @return [Float]
+        attr_accessor :_send
+
+        public
+
+        # @private
+        # @return [Float]
+        def get_send
+          return @_send
+        end
+
+        # 送信[byte/sec]
+        #
+        # @return [Float]
+        attr_reader :send
+
+        def send
+          get_send
+        end
+
+        protected
+
+        # @private
+        # @return [Float]
+        attr_accessor :_receive
+
+        public
+
+        # @private
+        # @return [Float]
+        def get_receive
+          return @_receive
+        end
+
+        # 受信[byte/sec]
+        #
+        # @return [Float]
+        attr_reader :receive
+
+        def receive
+          get_receive
+        end
+
+        # @param [String] atStr
+        # @param [any] data
+        def initialize(atStr, data)
+          Saklient::Util::validate_type(atStr, 'String')
+          @_at = Saklient::Util::str2date(atStr)
+          @_is_available = true
+          v = nil
+          v = data[:Send]
+          if (v).nil?
+            @_is_available = false
+          else
+            @_send = v
+          end
+          v = data[:Receive]
+          if (v).nil?
+            @_is_available = false
+          else
+            @_receive = v
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/saklient/cloud/resources/ipv4_range.rb

@@ -71,7 +71,7 @@ module Saklient
           i1 = Saklient::Util::ip2long(@_last)
           while i <= i1 do
             ret << Saklient::Util::long2ip(i)
-            i += 1
+            i+=1
           end
           return ret
         end
@@ -92,11 +92,11 @@ module Saklient
           first = Saklient::Util::get_by_path_any([obj], ['Min', 'min'])
           @_first = nil
           @_first = first if !(first).nil?
-          @_first = nil if @_first == ''
+          @_first = nil if !(@_first).nil? && @_first == ''
           last = Saklient::Util::get_by_path_any([obj], ['Max', 'max'])
           @_last = nil
           @_last = last if !(last).nil?
-          @_last = nil if @_last == ''
+          @_last = nil if !(@_last).nil? && @_last == ''
         end
 
       end

data/lib/saklient/cloud/resources/lb_server.rb

@@ -271,6 +271,8 @@ module Saklient
           @_response_expected = nil
           @_response_expected = (responseExpected).to_s().to_i(10) if !(responseExpected).nil?
           @_response_expected = nil if @_response_expected == 0
+          @_active_connections = 0
+          @_status = nil
         end
 
         # @return [any]

data/lib/saklient/cloud/resources/load_balancer.rb

@@ -239,7 +239,7 @@ module Saklient
         # @return [LoadBalancer]
         def reload_status
           result = request_retry('GET', _api_path + '/' + Saklient::Util::url_encode(_id) + '/status')
-          if !result.nil? && result.key?(:LoadBalancer)
+          if !(result).nil? && (!result.nil? && result.key?(:LoadBalancer))
             vips = result[:LoadBalancer]
             for vipDyn in vips
               vipStr = vipDyn[:VirtualIPAddress]

data/lib/saklient/cloud/resources/router.rb

@@ -7,6 +7,7 @@ require_relative 'icon'
 require_relative 'swytch'
 require_relative 'ipv4_net'
 require_relative 'ipv6_net'
+require_relative 'router_activity'
 require_relative '../models/model_swytch'
 
 module Saklient
@@ -94,6 +95,29 @@ module Saklient
           return _reload
         end
 
+        protected
+
+        # @private
+        # @return [RouterActivity]
+        attr_accessor :_activity
+
+        public
+
+        # @private
+        # @return [RouterActivity]
+        def get_activity
+          return @_activity
+        end
+
+        # アクティビティ
+        #
+        # @return [RouterActivity]
+        attr_reader :activity
+
+        def activity
+          get_activity
+        end
+
         # @private
         # @param [Saklient::Cloud::Client] client
         # @param [any] obj
@@ -102,9 +126,22 @@ module Saklient
           super(client)
           Saklient::Util::validate_type(client, 'Saklient::Cloud::Client')
           Saklient::Util::validate_type(wrapped, 'bool')
+          @_activity = Saklient::Cloud::Resources::RouterActivity.new(client)
           api_deserialize(obj, wrapped)
         end
 
+        protected
+
+        # @private
+        # @param [any] r
+        # @param [any] root
+        # @return [void]
+        def _on_after_api_deserialize(r, root)
+          @_activity.set_source_id(_id) if !(r).nil?
+        end
+
+        public
+
         # 作成中のルータが利用可能になるまで待機します.
         #
         # @private

data/lib/saklient/cloud/resources/router_activity.rb

@@ -0,0 +1,72 @@
+# -*- encoding: UTF-8 -*-
+
+require_relative 'activity'
+require_relative 'router_activity_sample'
+
+module Saklient
+  module Cloud
+    module Resources
+
+      class RouterActivity < Saklient::Cloud::Resources::Activity
+
+        protected
+
+        # @private
+        # @return [Array<RouterActivitySample>]
+        attr_accessor :_samples
+
+        # @private
+        # @return [Array<RouterActivitySample>]
+        def get_samples
+          return @_samples
+        end
+
+        public
+
+        # サンプル列
+        #
+        # @return [Array<RouterActivitySample>]
+        attr_reader :samples
+
+        def samples
+          get_samples
+        end
+
+        protected
+
+        # @private
+        # @return [String]
+        def _api_path_prefix
+          return '/internet'
+        end
+
+        # @private
+        # @param [String] atStr
+        # @param [any] data
+        # @return [void]
+        def _add_sample(atStr, data)
+          Saklient::Util::validate_type(atStr, 'String')
+          @_samples << Saklient::Cloud::Resources::RouterActivitySample.new(atStr, data)
+        end
+
+        public
+
+        # アクティビティを取得します.
+        #
+        #  	 * @return アクティビティ
+        #
+        # @param [NativeDate] startDate
+        # @param [NativeDate] endDate
+        # @return [RouterActivity]
+        def fetch(startDate = nil, endDate = nil)
+          Saklient::Util::validate_type(startDate, 'NativeDate')
+          Saklient::Util::validate_type(endDate, 'NativeDate')
+          @_samples = []
+          return _fetch(startDate, endDate)
+        end
+
+      end
+
+    end
+  end
+end

data/lib/saklient/cloud/resources/router_activity_sample.rb

@@ -0,0 +1,129 @@
+# -*- encoding: UTF-8 -*-
+
+require_relative '../../util'
+
+module Saklient
+  module Cloud
+    module Resources
+
+      # @private
+      class RouterActivitySample
+
+        protected
+
+        # @private
+        # @return [NativeDate]
+        attr_accessor :_at
+
+        public
+
+        # @private
+        # @return [NativeDate]
+        def get_at
+          return @_at
+        end
+
+        # 記録日時
+        #
+        # @return [NativeDate]
+        attr_reader :at
+
+        def at
+          get_at
+        end
+
+        protected
+
+        # @private
+        # @return [bool]
+        attr_accessor :_is_available
+
+        public
+
+        # @private
+        # @return [bool]
+        def get_is_available
+          return @_is_available
+        end
+
+        # 有効な値のとき真
+        #
+        # @return [bool]
+        attr_reader :is_available
+
+        def is_available
+          get_is_available
+        end
+
+        protected
+
+        # @private
+        # @return [Float]
+        attr_accessor :_outgoing
+
+        public
+
+        # @private
+        # @return [Float]
+        def get_outgoing
+          return @_outgoing
+        end
+
+        # 送信[BPS]
+        #
+        # @return [Float]
+        attr_reader :outgoing
+
+        def outgoing
+          get_outgoing
+        end
+
+        protected
+
+        # @private
+        # @return [Float]
+        attr_accessor :_incoming
+
+        public
+
+        # @private
+        # @return [Float]
+        def get_incoming
+          return @_incoming
+        end
+
+        # 受信[BPS]
+        #
+        # @return [Float]
+        attr_reader :incoming
+
+        def incoming
+          get_incoming
+        end
+
+        # @param [String] atStr
+        # @param [any] data
+        def initialize(atStr, data)
+          Saklient::Util::validate_type(atStr, 'String')
+          @_at = Saklient::Util::str2date(atStr)
+          @_is_available = true
+          v = nil
+          v = data[:Out]
+          if (v).nil?
+            @_is_available = false
+          else
+            @_outgoing = v
+          end
+          v = data[:In]
+          if (v).nil?
+            @_is_available = false
+          else
+            @_incoming = v
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/saklient/cloud/resources/server.rb

@@ -9,6 +9,7 @@ require_relative 'iface'
 require_relative 'server_plan'
 require_relative 'server_instance'
 require_relative 'iso_image'
+require_relative 'server_activity'
 require_relative '../enums/eserver_instance_status'
 require_relative '../enums/eavailability'
 require_relative '../models/model_disk'
@@ -114,6 +115,29 @@ module Saklient
           return _reload
         end
 
+        protected
+
+        # @private
+        # @return [ServerActivity]
+        attr_accessor :_activity
+
+        public
+
+        # @private
+        # @return [ServerActivity]
+        def get_activity
+          return @_activity
+        end
+
+        # アクティビティ
+        #
+        # @return [ServerActivity]
+        attr_reader :activity
+
+        def activity
+          get_activity
+        end
+
         # @private
         # @param [Saklient::Cloud::Client] client
         # @param [any] obj
@@ -122,9 +146,22 @@ module Saklient
           super(client)
           Saklient::Util::validate_type(client, 'Saklient::Cloud::Client')
           Saklient::Util::validate_type(wrapped, 'bool')
+          @_activity = Saklient::Cloud::Resources::ServerActivity.new(client)
           api_deserialize(obj, wrapped)
         end
 
+        protected
+
+        # @private
+        # @param [any] r
+        # @param [any] root
+        # @return [void]
+        def _on_after_api_deserialize(r, root)
+          @_activity.set_source_id(_id) if !(r).nil?
+        end
+
+        public
+
         # サーバが起動しているときtrueを返します.
         #
         # @return [bool]

data/lib/saklient/cloud/resources/server_activity.rb

@@ -0,0 +1,72 @@
+# -*- encoding: UTF-8 -*-
+
+require_relative 'activity'
+require_relative 'server_activity_sample'
+
+module Saklient
+  module Cloud
+    module Resources
+
+      class ServerActivity < Saklient::Cloud::Resources::Activity
+
+        protected
+
+        # @private
+        # @return [Array<ServerActivitySample>]
+        attr_accessor :_samples
+
+        # @private
+        # @return [Array<ServerActivitySample>]
+        def get_samples
+          return @_samples
+        end
+
+        public
+
+        # サンプル列
+        #
+        # @return [Array<ServerActivitySample>]
+        attr_reader :samples
+
+        def samples
+          get_samples
+        end
+
+        protected
+
+        # @private
+        # @return [String]
+        def _api_path_prefix
+          return '/server'
+        end
+
+        # @private
+        # @param [String] atStr
+        # @param [any] data
+        # @return [void]
+        def _add_sample(atStr, data)
+          Saklient::Util::validate_type(atStr, 'String')
+          @_samples << Saklient::Cloud::Resources::ServerActivitySample.new(atStr, data)
+        end
+
+        public
+
+        # アクティビティを取得します.
+        #
+        #  	 * @return アクティビティ
+        #
+        # @param [NativeDate] startDate
+        # @param [NativeDate] endDate
+        # @return [ServerActivity]
+        def fetch(startDate = nil, endDate = nil)
+          Saklient::Util::validate_type(startDate, 'NativeDate')
+          Saklient::Util::validate_type(endDate, 'NativeDate')
+          @_samples = []
+          return _fetch(startDate, endDate)
+        end
+
+      end
+
+    end
+  end
+end

data/lib/saklient/cloud/resources/server_activity_sample.rb

@@ -0,0 +1,98 @@
+# -*- encoding: UTF-8 -*-
+
+require_relative '../../util'
+
+module Saklient
+  module Cloud
+    module Resources
+
+      # @private
+      class ServerActivitySample
+
+        protected
+
+        # @private
+        # @return [NativeDate]
+        attr_accessor :_at
+
+        public
+
+        # @private
+        # @return [NativeDate]
+        def get_at
+          return @_at
+        end
+
+        # 記録日時
+        #
+        # @return [NativeDate]
+        attr_reader :at
+
+        def at
+          get_at
+        end
+
+        protected
+
+        # @private
+        # @return [bool]
+        attr_accessor :_is_available
+
+        public
+
+        # @private
+        # @return [bool]
+        def get_is_available
+          return @_is_available
+        end
+
+        # 有効な値のとき真
+        #
+        # @return [bool]
+        attr_reader :is_available
+
+        def is_available
+          get_is_available
+        end
+
+        protected
+
+        # @private
+        # @return [Float]
+        attr_accessor :_cpu_time
+
+        public
+
+        # @private
+        # @return [Float]
+        def get_cpu_time
+          return @_cpu_time
+        end
+
+        # CPU時間
+        #
+        # @return [Float]
+        attr_reader :cpu_time
+
+        def cpu_time
+          get_cpu_time
+        end
+
+        # @param [String] atStr
+        # @param [any] data
+        def initialize(atStr, data)
+          Saklient::Util::validate_type(atStr, 'String')
+          @_at = Saklient::Util::str2date(atStr)
+          @_is_available = false
+          v = data['CPU-TIME'.to_sym]
+          if !(v).nil?
+            @_is_available = true
+            @_cpu_time = v
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/saklient/cloud/resources/swytch.rb

@@ -250,7 +250,7 @@ module Saklient
           return nil if nets.length < 1
           used = _used_ipv4_address_hash
           ret = []
-          for ip in nets[0].range.as_array
+          for ip in nets[0].get_range.get_as_array
             ret << ip if !(!used.nil? && used.key?(ip.to_sym))
           end
           return ret.sort()

data/lib/saklient/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding: UTF-8 -*-
 
 module Saklient
-  VERSION = "0.0.2.7"
+  VERSION = "0.0.2.8"
 end

data/spec/loadbalancer_spec.rb

@@ -8,8 +8,7 @@ describe 'LoadBalancer' do
   
   
 	
-  TESTS_CONFIG_READYMADE_LB_ID = nil #'112600809060'
-  TESTS_CONFIG_READYMADE_SWYTCH_ID = '112500447075' #'112600553094'
+  TESTS_CONFIG_READYMADE_LB_ID = nil
   
   before do
     
@@ -56,9 +55,20 @@ describe 'LoadBalancer' do
       
       # search a switch
       puts 'searching a swytch...'
-      swytch = @api.swytch.get_by_id(TESTS_CONFIG_READYMADE_SWYTCH_ID)
-      # expect(swytches.length).to be > 0
-      # swytch = swytches[0]
+      swytches = @api.swytch.with_name_like('saklient-lb-attached').limit(1).find
+      if 0 < swytches.length
+        swytch = swytches[0]
+      else
+        puts 'ルータ＋スイッチを作成しています...'
+        router = @api.router.create
+        router.name = 'saklient-lb-attached'
+        router.band_width_mbps = 100
+        router.network_mask_len = 28
+        router.save
+        puts 'ルータ＋スイッチの作成完了を待機しています...'
+        fail 'ルータが正常に作成されません' if !router.sleep_while_creating
+        swytch = router.get_swytch
+      end
       expect(swytch).to be_an_instance_of Saklient::Cloud::Resources::Swytch
       expect(swytch.ipv4_nets.length).to be > 0
       net = swytch.ipv4_nets[0]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saklient
 version: !ruby/object:Gem::Version
-  version: 0.0.2.7
+  version: 0.0.2.8
 platform: ruby
 authors:
 - townewgokgok
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -188,15 +188,20 @@ files:
 - lib/saklient/cloud/models/model_swytch.rb
 - lib/saklient/cloud/models/query_params.rb
 - lib/saklient/cloud/product.rb
+- lib/saklient/cloud/resources/activity.rb
 - lib/saklient/cloud/resources/appliance.rb
 - lib/saklient/cloud/resources/archive.rb
 - lib/saklient/cloud/resources/bridge.rb
 - lib/saklient/cloud/resources/disk.rb
+- lib/saklient/cloud/resources/disk_activity.rb
+- lib/saklient/cloud/resources/disk_activity_sample.rb
 - lib/saklient/cloud/resources/disk_config.rb
 - lib/saklient/cloud/resources/disk_plan.rb
 - lib/saklient/cloud/resources/ftp_info.rb
 - lib/saklient/cloud/resources/icon.rb
 - lib/saklient/cloud/resources/iface.rb
+- lib/saklient/cloud/resources/iface_activity.rb
+- lib/saklient/cloud/resources/iface_activity_sample.rb
 - lib/saklient/cloud/resources/ipv4_net.rb
 - lib/saklient/cloud/resources/ipv4_range.rb
 - lib/saklient/cloud/resources/ipv6_net.rb
@@ -209,9 +214,13 @@ files:
 - lib/saklient/cloud/resources/region.rb
 - lib/saklient/cloud/resources/resource.rb
 - lib/saklient/cloud/resources/router.rb
+- lib/saklient/cloud/resources/router_activity.rb
+- lib/saklient/cloud/resources/router_activity_sample.rb
 - lib/saklient/cloud/resources/router_plan.rb
 - lib/saklient/cloud/resources/script.rb
 - lib/saklient/cloud/resources/server.rb
+- lib/saklient/cloud/resources/server_activity.rb
+- lib/saklient/cloud/resources/server_activity_sample.rb
 - lib/saklient/cloud/resources/server_instance.rb
 - lib/saklient/cloud/resources/server_plan.rb
 - lib/saklient/cloud/resources/swytch.rb
@@ -257,7 +266,6 @@ files:
 - spec/bridge_spec.rb
 - spec/enum_spec.rb
 - spec/exception_spec.rb
-- spec/ipv4net_spec.rb
 - spec/iso_image_spec.rb
 - spec/license_spec.rb
 - spec/loadbalancer_spec.rb
@@ -295,7 +303,6 @@ test_files:
 - spec/bridge_spec.rb
 - spec/enum_spec.rb
 - spec/exception_spec.rb
-- spec/ipv4net_spec.rb
 - spec/iso_image_spec.rb
 - spec/license_spec.rb
 - spec/loadbalancer_spec.rb

data/spec/ipv4net_spec.rb

@@ -1,61 +0,0 @@
-$: << File.dirname(__dir__) + '/lib'
-require 'saklient/util'
-require 'saklient/cloud/api'
-
-describe 'Ipv4Net' do
-  
-  
-  
-  before do
-    
-    # load config file
-    root = File.dirname(__dir__)
-    test_ok_file = root + '/testok'
-    expect(File).to exist(test_ok_file)
-    config_file = root + '/config.sh'
-    expect(File).to exist(config_file)
-    @config = {}
-    fh = open(config_file)
-    fh.each {|line|
-      if /^\s*export\s+(\w+)\s*=\s*(.+?)\s*$/.match(line) then
-        key = $1
-        value = $2
-        @config[key.to_sym] = value.gsub(/'([^']*)'|"([^"]*)"|\\(.)|(.)/) {|m|
-          $1 || $2 || $3 || $4
-        }
-      end
-    }
-    fh.close
-    expect(@config[:SACLOUD_TOKEN]).not_to be_empty #'SACLOUD_TOKEN must be defined in config.sh'
-    expect(@config[:SACLOUD_SECRET]).not_to be_empty #'SACLOUD_SECRET must be defined in config.sh'
-    #expect(@config[:SACLOUD_ZONE]).not_to be_empty #'SACLOUD_ZONE must be defined in config.sh'
-    
-    # authorize
-    @api = Saklient::Cloud::API::authorize(@config[:SACLOUD_TOKEN], @config[:SACLOUD_SECRET])
-    @api = @api.in_zone(@config[:SACLOUD_ZONE]) if @config[:SACLOUD_ZONE]
-    expect(@api).to be_an_instance_of Saklient::Cloud::API
-    
-  end
-  
-  
-  
-  it 'should access objects by path' do
-    
-    @api.router.find.each{|router|
-      router.get_swytch.ipv4_nets.each{|net|
-        if !net.range.nil?
-          p net.range.first
-          p net.range.last
-          # p net.range.as_array
-        end
-      }
-      p router.get_swytch.collect_used_ipv4_addresses
-      p router.get_swytch.collect_unused_ipv4_addresses
-      p
-    }
-    
-  end
-  
-  
-  
-end