saklient 0.0.2.2 → 0.0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 748198f5c71149eaa9d33f85f745c8449ae74680
-  data.tar.gz: 5a66f4f992fff57b4ba0ccefb0b4dddbbb22bfb1
+  metadata.gz: dbbdaf09c98095e51cab1badda0f43a9ec1b8da6
+  data.tar.gz: 5fb32beceb6f5b6166b787d614c8364ab315a6d7
 SHA512:
-  metadata.gz: 79c177e6f7d0c678a39bbe4bb0f7b0364b6d519f442ba902140a8a7da25e7c9c9844dceb0a38d498530115acb6b3919bb1cdd38ddc4dfe5c46716270596ec69c
-  data.tar.gz: 096eb145cc4318322f8ecd38ea826987ec4518f2757861e3269670dd0a5b5dbd2c7ceed39e2fcd78198156b5a3ac760cf1959561d432693871c382d26929d355
+  metadata.gz: 5b75f6ddbb1f866837675c117c08598b8c09a2a69cf2d5a140519e8234d0d7fb178d35c9877c579423178afd0c3204b4cbe557fd67075a1b45efbce8bf9192be
+  data.tar.gz: 48bdb7d3eaed8a7d66fa153430c913463a13e8d505cb836580fc0b6bc6f04fe34088d1d6ca3bc648f8356753854d6a9b44340309abb2a482da19c21c77369953

data/lib/saklient/cloud/api.rb

@@ -3,6 +3,7 @@
 require_relative '../util'
 require_relative 'client'
 require_relative 'product'
+require_relative 'facility'
 require_relative 'models/model_icon'
 require_relative 'models/model_server'
 require_relative 'models/model_disk'
@@ -12,8 +13,10 @@ require_relative 'models/model_iso_image'
 require_relative 'models/model_iface'
 require_relative 'models/model_swytch'
 require_relative 'models/model_router'
+require_relative 'models/model_bridge'
 require_relative 'models/model_ipv6_net'
 require_relative 'models/model_script'
+require_relative 'models/model_license'
 
 module Saklient
   module Cloud
@@ -70,6 +73,29 @@ module Saklient
 
       protected
 
+      # @private
+      # @return [Facility]
+      attr_accessor :_facility
+
+      # @private
+      # @return [Facility]
+      def get_facility
+        return @_facility
+      end
+
+      public
+
+      # 設備情報にアクセスするためのモデルを集めたオブジェクト.
+      #
+      # @return [Facility]
+      attr_reader :facility
+
+      def facility
+        get_facility
+      end
+
+      protected
+
       # @private
       # @return [Saklient::Cloud::Models::Model_Icon]
       attr_accessor :_icon
@@ -277,6 +303,29 @@ module Saklient
 
       protected
 
+      # @private
+      # @return [Saklient::Cloud::Models::Model_Bridge]
+      attr_accessor :_bridge
+
+      # @private
+      # @return [Saklient::Cloud::Models::Model_Bridge]
+      def get_bridge
+        return @_bridge
+      end
+
+      public
+
+      # ブリッジにアクセスするためのモデル.
+      #
+      # @return [Saklient::Cloud::Models::Model_Bridge]
+      attr_reader :bridge
+
+      def bridge
+        get_bridge
+      end
+
+      protected
+
       # @private
       # @return [Saklient::Cloud::Models::Model_Ipv6Net]
       attr_accessor :_ipv6_net
@@ -323,12 +372,36 @@ module Saklient
 
       protected
 
+      # @private
+      # @return [Saklient::Cloud::Models::Model_License]
+      attr_accessor :_license
+
+      # @private
+      # @return [Saklient::Cloud::Models::Model_License]
+      def get_license
+        return @_license
+      end
+
+      public
+
+      # ライセンスにアクセスするためのモデル.
+      #
+      # @return [Saklient::Cloud::Models::Model_License]
+      attr_reader :license
+
+      def license
+        get_license
+      end
+
+      protected
+
       # @private
       # @param [Client] client
       def initialize(client)
         Saklient::Util::validate_type(client, 'Saklient::Cloud::Client')
         @_client = client
         @_product = Saklient::Cloud::Product.new(client)
+        @_facility = Saklient::Cloud::Facility.new(client)
         @_icon = Saklient::Cloud::Models::Model_Icon.new(client)
         @_server = Saklient::Cloud::Models::Model_Server.new(client)
         @_disk = Saklient::Cloud::Models::Model_Disk.new(client)
@@ -338,8 +411,10 @@ module Saklient
         @_iface = Saklient::Cloud::Models::Model_Iface.new(client)
         @_swytch = Saklient::Cloud::Models::Model_Swytch.new(client)
         @_router = Saklient::Cloud::Models::Model_Router.new(client)
+        @_bridge = Saklient::Cloud::Models::Model_Bridge.new(client)
         @_ipv6_net = Saklient::Cloud::Models::Model_Ipv6Net.new(client)
         @_script = Saklient::Cloud::Models::Model_Script.new(client)
+        @_license = Saklient::Cloud::Models::Model_License.new(client)
       end
 
       public

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.2 rev-0de622ef1458f0fe03cbb11b1bec990a3bfa25c4',
+          'User-Agent'       => 'saklient.ruby ver-0.0.2.3 rev-12b993d3bd1fedb86be7312ac4648dc4e5693cfa',
           'X-Requested-With' => 'XMLHttpRequest',
           'X-Sakura-HTTP-Method' => method,
           'X-Sakura-Error-Level' => 'warning',

data/lib/saklient/cloud/facility.rb

@@ -0,0 +1,45 @@
+# -*- encoding: UTF-8 -*-
+
+require_relative 'models/model_region'
+require_relative 'client'
+
+module Saklient
+  module Cloud
+
+    # 設備情報にアクセスするためのモデルを集めたクラス.
+    class Facility
+
+      protected
+
+      # @private
+      # @return [Saklient::Cloud::Models::Model_Region]
+      attr_accessor :_region
+
+      # @private
+      # @return [Saklient::Cloud::Models::Model_Region]
+      def get_region
+        return @_region
+      end
+
+      public
+
+      # リージョン情報.
+      #
+      # @return [Saklient::Cloud::Models::Model_Region]
+      attr_reader :region
+
+      def region
+        get_region
+      end
+
+      # @private
+      # @param [Client] client
+      def initialize(client)
+        Saklient::Util::validate_type(client, 'Saklient::Cloud::Client')
+        @_region = Saklient::Cloud::Models::Model_Region.new(client)
+      end
+
+    end
+
+  end
+end

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

@@ -203,15 +203,12 @@ module Saklient
         end
 
         # @private
-        # @param [String] className
         # @param [any] obj
         # @param [bool] wrapped
         # @return [Saklient::Cloud::Resources::Resource]
-        def _create_resource_with(className, obj, wrapped = false)
-          Saklient::Util::validate_type(className, 'String')
+        def _create_resource_impl(obj, wrapped = false)
           Saklient::Util::validate_type(wrapped, 'bool')
-          className = _class_name if (className).nil?
-          return Saklient::Cloud::Resources::Resource::create_with(className, @_client, obj, wrapped)
+          return nil
         end
 
         # 新規リソース作成用のオブジェクトを用意します.
@@ -219,11 +216,9 @@ module Saklient
         # 返り値のオブジェクトにパラメータを設定し, save() を呼ぶことで実際のリソースが作成されます.
         #
         # @private
-        # @param [String] className
         # @return [Saklient::Cloud::Resources::Resource] リソースオブジェクト
-        def _create(className = nil)
-          Saklient::Util::validate_type(className, 'String')
-          return _create_resource_with(className, nil)
+        def _create
+          return _create_resource_impl(nil)
         end
 
         # 指定したIDを持つ唯一のリソースを取得します.
@@ -238,7 +233,7 @@ module Saklient
           result = @_client.request('GET', _api_path + '/' + Saklient::Util::url_encode(id), query)
           @_total = 1
           @_count = 1
-          return _create_resource_with(nil, result, true)
+          return _create_resource_impl(result, true)
         end
 
         # リソースの検索リクエストを実行し, 結果をリストで取得します.
@@ -254,7 +249,7 @@ module Saklient
           data = []
           records = result[_root_key_m.to_sym]
           for record in records
-            data << _create_resource_with(nil, record)
+            data << _create_resource_impl(record)
           end
           return data
         end
@@ -271,7 +266,7 @@ module Saklient
           @_count = result[:Count]
           return nil if @_total == 0
           records = result[_root_key_m.to_sym]
-          return _create_resource_with(nil, records[0])
+          return _create_resource_impl(records[0])
         end
 
         # 指定した文字列を名前に含むリソースに絞り込みます.

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

@@ -2,6 +2,7 @@
 
 require_relative '../client'
 require_relative 'model'
+require_relative '../resources/resource'
 require_relative '../resources/appliance'
 require_relative '../resources/load_balancer'
 require_relative '../resources/vpc_router'
@@ -40,6 +41,19 @@ module Saklient
           return 'Appliance'
         end
 
+        # @private
+        # @param [any] obj
+        # @param [bool] wrapped
+        # @return [Saklient::Cloud::Resources::Resource]
+        def _create_resource_impl(obj, wrapped = false)
+          Saklient::Util::validate_type(wrapped, 'bool')
+          ret = Saklient::Cloud::Resources::Appliance.new(@_client, obj, wrapped)
+          clazz = ret.clazz
+          return Saklient::Cloud::Resources::LoadBalancer.new(@_client, obj, wrapped) if clazz == 'loadbalancer'
+          return Saklient::Cloud::Resources::VpcRouter.new(@_client, obj, wrapped) if clazz == 'vpcrouter'
+          return ret
+        end
+
         public
 
         # 次に取得するリストの開始オフセットを指定します.
@@ -89,13 +103,14 @@ module Saklient
           Saklient::Util::validate_type(vrid, 'Fixnum')
           Saklient::Util::validate_type(realIps, 'Array')
           Saklient::Util::validate_type(isHighSpec, 'bool')
-          ret = _create('LoadBalancer')
+          ret = Saklient::Cloud::Resources::LoadBalancer.new(@_client, nil)
           return ret.set_initial_params(swytch, vrid, realIps, isHighSpec)
         end
 
         # @return [Saklient::Cloud::Resources::VpcRouter]
         def create_vpc_router
-          return _create('VpcRouter')
+          ret = Saklient::Cloud::Resources::VpcRouter.new(@_client, nil)
+          return ret
         end
 
         # 指定したIDを持つ唯一のリソースを取得します.

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

@@ -2,6 +2,7 @@
 
 require_relative '../client'
 require_relative 'model'
+require_relative '../resources/resource'
 require_relative '../resources/archive'
 require_relative '../resources/load_balancer'
 require_relative '../resources/vpc_router'
@@ -40,6 +41,15 @@ module Saklient
           return 'Archive'
         end
 
+        # @private
+        # @param [any] obj
+        # @param [bool] wrapped
+        # @return [Saklient::Cloud::Resources::Resource]
+        def _create_resource_impl(obj, wrapped = false)
+          Saklient::Util::validate_type(wrapped, 'bool')
+          return Saklient::Cloud::Resources::Archive.new(@_client, obj, wrapped)
+        end
+
         public
 
         # 次に取得するリストの開始オフセットを指定します.

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

@@ -0,0 +1,148 @@
+# -*- encoding: UTF-8 -*-
+
+require_relative '../client'
+require_relative 'model'
+require_relative '../resources/resource'
+require_relative '../resources/bridge'
+
+module Saklient
+  module Cloud
+    module Models
+
+      # ブリッジを検索・作成するための機能を備えたクラス.
+      class Model_Bridge < Saklient::Cloud::Models::Model
+
+        protected
+
+        # @private
+        # @return [String]
+        def _api_path
+          return '/bridge'
+        end
+
+        # @private
+        # @return [String]
+        def _root_key
+          return 'Bridge'
+        end
+
+        # @private
+        # @return [String]
+        def _root_key_m
+          return 'Bridges'
+        end
+
+        # @private
+        # @return [String]
+        def _class_name
+          return 'Bridge'
+        end
+
+        # @private
+        # @param [any] obj
+        # @param [bool] wrapped
+        # @return [Saklient::Cloud::Resources::Resource]
+        def _create_resource_impl(obj, wrapped = false)
+          Saklient::Util::validate_type(wrapped, 'bool')
+          return Saklient::Cloud::Resources::Bridge.new(@_client, obj, wrapped)
+        end
+
+        public
+
+        # 次に取得するリストの開始オフセットを指定します.
+        #
+        # @param [Fixnum] offset オフセット
+        # @return [Model_Bridge] this
+        def offset(offset)
+          Saklient::Util::validate_type(offset, 'Fixnum')
+          return _offset(offset)
+        end
+
+        # 次に取得するリストの上限レコード数を指定します.
+        #
+        # @param [Fixnum] count 上限レコード数
+        # @return [Model_Bridge] this
+        def limit(count)
+          Saklient::Util::validate_type(count, 'Fixnum')
+          return _limit(count)
+        end
+
+        # Web APIのフィルタリング設定を直接指定します.
+        #
+        # @param [String] key キー
+        # @param [any] value 値
+        # @param [bool] multiple valueに配列を与え, OR条件で完全一致検索する場合にtrueを指定します. 通常, valueはスカラ値であいまい検索されます.
+        # @return [Model_Bridge]
+        def filter_by(key, value, multiple = false)
+          Saklient::Util::validate_type(key, 'String')
+          Saklient::Util::validate_type(multiple, 'bool')
+          return _filter_by(key, value, multiple)
+        end
+
+        # 次のリクエストのために設定されているステートをすべて破棄します.
+        #
+        # @return [Model_Bridge] this
+        def reset
+          return _reset
+        end
+
+        # 新規リソース作成用のオブジェクトを用意します.
+        #
+        # 返り値のオブジェクトにパラメータを設定し, save() を呼ぶことで実際のリソースが作成されます.
+        #
+        # @return [Saklient::Cloud::Resources::Bridge] リソースオブジェクト
+        def create
+          return _create
+        end
+
+        # 指定したIDを持つ唯一のリソースを取得します.
+        #
+        # @param [String] id
+        # @return [Saklient::Cloud::Resources::Bridge] リソースオブジェクト
+        def get_by_id(id)
+          Saklient::Util::validate_type(id, 'String')
+          return _get_by_id(id)
+        end
+
+        # リソースの検索リクエストを実行し, 結果をリストで取得します.
+        #
+        # @return [Array<Saklient::Cloud::Resources::Bridge>] リソースオブジェクトの配列
+        def find
+          return _find
+        end
+
+        # 指定した文字列を名前に含むリソースに絞り込みます.
+        #
+        # 大文字・小文字は区別されません.
+        # 半角スペースで区切られた複数の文字列は, それらをすべて含むことが条件とみなされます.
+        #
+        # @todo Implement test case
+        # @param [String] name
+        # @return [Model_Bridge]
+        def with_name_like(name)
+          Saklient::Util::validate_type(name, 'String')
+          return _with_name_like(name)
+        end
+
+        # 名前でソートします.
+        #
+        # @todo Implement test case
+        # @param [bool] reverse
+        # @return [Model_Bridge]
+        def sort_by_name(reverse = false)
+          Saklient::Util::validate_type(reverse, 'bool')
+          return _sort_by_name(reverse)
+        end
+
+        # @private
+        # @param [Saklient::Cloud::Client] client
+        def initialize(client)
+          super(client)
+          Saklient::Util::validate_type(client, 'Saklient::Cloud::Client')
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -2,6 +2,7 @@
 
 require_relative '../client'
 require_relative 'model'
+require_relative '../resources/resource'
 require_relative '../resources/disk'
 
 module Saklient
@@ -37,6 +38,15 @@ module Saklient
           return 'Disk'
         end
 
+        # @private
+        # @param [any] obj
+        # @param [bool] wrapped
+        # @return [Saklient::Cloud::Resources::Resource]
+        def _create_resource_impl(obj, wrapped = false)
+          Saklient::Util::validate_type(wrapped, 'bool')
+          return Saklient::Cloud::Resources::Disk.new(@_client, obj, wrapped)
+        end
+
         public
 
         # 次に取得するリストの開始オフセットを指定します.

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

@@ -2,6 +2,7 @@
 
 require_relative '../client'
 require_relative 'model'
+require_relative '../resources/resource'
 require_relative '../resources/disk_plan'
 
 module Saklient
@@ -37,6 +38,15 @@ module Saklient
           return 'DiskPlan'
         end
 
+        # @private
+        # @param [any] obj
+        # @param [bool] wrapped
+        # @return [Saklient::Cloud::Resources::Resource]
+        def _create_resource_impl(obj, wrapped = false)
+          Saklient::Util::validate_type(wrapped, 'bool')
+          return Saklient::Cloud::Resources::DiskPlan.new(@_client, obj, wrapped)
+        end
+
         public
 
         # 次に取得するリストの開始オフセットを指定します.

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

@@ -2,6 +2,7 @@
 
 require_relative '../client'
 require_relative 'model'
+require_relative '../resources/resource'
 require_relative '../resources/icon'
 require_relative '../enums/escope'
 
@@ -38,6 +39,15 @@ module Saklient
           return 'Icon'
         end
 
+        # @private
+        # @param [any] obj
+        # @param [bool] wrapped
+        # @return [Saklient::Cloud::Resources::Resource]
+        def _create_resource_impl(obj, wrapped = false)
+          Saklient::Util::validate_type(wrapped, 'bool')
+          return Saklient::Cloud::Resources::Icon.new(@_client, obj, wrapped)
+        end
+
         public
 
         # 次に取得するリストの開始オフセットを指定します.

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

@@ -2,6 +2,7 @@
 
 require_relative '../client'
 require_relative 'model'
+require_relative '../resources/resource'
 require_relative '../resources/iface'
 
 module Saklient
@@ -37,6 +38,15 @@ module Saklient
           return 'Iface'
         end
 
+        # @private
+        # @param [any] obj
+        # @param [bool] wrapped
+        # @return [Saklient::Cloud::Resources::Resource]
+        def _create_resource_impl(obj, wrapped = false)
+          Saklient::Util::validate_type(wrapped, 'bool')
+          return Saklient::Cloud::Resources::Iface.new(@_client, obj, wrapped)
+        end
+
         public
 
         # 次に取得するリストの開始オフセットを指定します.

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

@@ -2,6 +2,7 @@
 
 require_relative '../client'
 require_relative 'model'
+require_relative '../resources/resource'
 require_relative '../resources/ipv6_net'
 
 module Saklient
@@ -37,6 +38,15 @@ module Saklient
           return 'IPv6Net'
         end
 
+        # @private
+        # @param [any] obj
+        # @param [bool] wrapped
+        # @return [Saklient::Cloud::Resources::Resource]
+        def _create_resource_impl(obj, wrapped = false)
+          Saklient::Util::validate_type(wrapped, 'bool')
+          return Saklient::Cloud::Resources::Ipv6Net.new(@_client, obj, wrapped)
+        end
+
         public
 
         # 次に取得するリストの開始オフセットを指定します.

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

@@ -2,6 +2,7 @@
 
 require_relative '../client'
 require_relative 'model'
+require_relative '../resources/resource'
 require_relative '../resources/iso_image'
 require_relative '../enums/escope'
 
@@ -38,6 +39,15 @@ module Saklient
           return 'IsoImage'
         end
 
+        # @private
+        # @param [any] obj
+        # @param [bool] wrapped
+        # @return [Saklient::Cloud::Resources::Resource]
+        def _create_resource_impl(obj, wrapped = false)
+          Saklient::Util::validate_type(wrapped, 'bool')
+          return Saklient::Cloud::Resources::IsoImage.new(@_client, obj, wrapped)
+        end
+
         public
 
         # 次に取得するリストの開始オフセットを指定します.