saklient 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f21124a0ab39a29f6738fec54307b59d14b0c94c
-  data.tar.gz: 29a28dc476ec0fcaf0f5ce015dfde17d4d646825
+  metadata.gz: 9bd88b2b564abfa841ba4ea1d3a4690129c36fc5
+  data.tar.gz: bf4d4494c832dc366f38c151631697cd5734fc67
 SHA512:
-  metadata.gz: 06b8a9e95e75f7e0bbb9a41ec12f31cb3358880c63a6e29c4ca9d880eac618088559afbc4dd41252f8f56fb91b3436bce140492661ec991365847d4ecc3b2521
-  data.tar.gz: e41c0a56a997850fa5efcb38451be88e3b481662bcb61a0c43fe25e4f98174c10d24f1db60e379958dae8af52fc2b00770591330ccd823e813c0ff481e0e3388
+  metadata.gz: d95ad8fedd4a2da51becafba0dcd7d855c2b320a618b27280eb234148c009350c81f071a05fb3dd898798fea439d0a827a4377b6435f03b14aaa79fcf4f7329d
+  data.tar.gz: f90d83eb6a37ff23b6ca447557d446d21b39c8e9e814d0d1cc451c818b4dbccfa7a33e2b7c8d001dbabc778ff9e4b0cc09338d1d3662b2730dce0f7e0de06a7a

data/lib/saklient/cloud/client.rb

@@ -13,7 +13,8 @@ module Saklient
       def initialize(token, secret)
         @config = {
           api_root: 'https://secure.sakura.ad.jp/cloud/',
-          api_root_suffix: nil
+          api_root_suffix: nil,
+          timeout_sec: 180
         }
         set_access_key token, secret
         self
@@ -44,6 +45,10 @@ module Saklient
         @config[:secret] = secret
       end
 
+      def set_timeout(sec)
+        @config[:timeout_sec]  = sec
+      end
+
       def request(method, path, params={})
         json = params.to_json
 
@@ -73,7 +78,7 @@ module Saklient
 
         extra_headers = {
           'Content-Type'     => 'application/x-www-form-urlencoded',
-          'User-Agent'       => 'saklient.ruby ver-0.0.5 rev-705e6fc541c30cec41e72e5e531418d64f196863',
+          'User-Agent'       => 'saklient.ruby ver-0.0.6 rev-705e6fc541c30cec41e72e5e531418d64f196863',
           'X-Requested-With' => 'XMLHttpRequest',
           'X-Sakura-HTTP-Method' => method,
           'X-Sakura-Error-Level' => 'warning',
@@ -94,7 +99,10 @@ module Saklient
           http.use_ssl = true
           # http.verify_mode = OpenSSL::SSL::VERIFY_NONE
         end
-        res = http.start {|conn| conn.request req }
+        res = http.start {|conn|
+          conn.read_timeout = @config[:timeout_sec]
+          conn.request req
+        }
 
         ret = JSON.parse(res.body, {:symbolize_names => true})
         status = res.code.to_i

data/lib/saklient/cloud/models/model_disk.rb

@@ -168,6 +168,13 @@ module Saklient
           return _sort_by_name(reverse)
         end
 
+        # @param [bool] reverse
+        # @return [Model_Disk]
+        def sort_by_connection_order(reverse = false)
+          Saklient::Util::validate_type(reverse, 'bool')
+          return _sort('ConnectionOrder', reverse)
+        end
+
         # @private
         # @param [Saklient::Cloud::Client] client
         def initialize(client)

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

@@ -150,6 +150,16 @@ module Saklient
           return reload
         end
 
+        # 指定したIDのスイッチに接続します.
+        #
+        # @param [String] swytchId 接続先のスイッチID.
+        # @return [Iface] this
+        def connect_to_swytch_by_id(swytchId)
+          Saklient::Util::validate_type(swytchId, 'String')
+          @_client.request('PUT', _api_path + '/' + Saklient::Util::url_encode(_id) + '/to/switch/' + swytchId)
+          return reload
+        end
+
         # 共有セグメントに接続します.
         #
         # @return [Iface] this

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

@@ -299,7 +299,7 @@ module Saklient
         # @return [Array<Disk>]
         def find_disks
           model = Saklient::Util::create_class_instance('saklient.cloud.models.Model_Disk', [@_client])
-          return model.with_server_id(_id).find
+          return model.with_server_id(_id).sort_by_connection_order.find
         end
 
         # サーバにインタフェースを1つ増設し, それを取得します.

data/lib/saklient/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saklient
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - townewgokgok
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-20 00:00:00.000000000 Z
+date: 2016-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -317,3 +317,4 @@ test_files:
 - spec/server_spec.rb
 - spec/swytch_spec.rb
 - spec/util_spec.rb
+has_rdoc: