saklient 0.0.1.1 → 0.0.2.2

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

@@ -0,0 +1,250 @@
+# -*- encoding: UTF-8 -*-
+
+require_relative '../../errors/saklient_exception'
+require_relative '../client'
+require_relative 'appliance'
+require_relative 'lb_virtual_ip'
+require_relative 'swytch'
+require_relative 'ipv4_net'
+require_relative '../enums/eappliance_class'
+
+module Saklient
+  module Cloud
+    module Resources
+
+      # ロードバランサの実体1つに対応し, 属性の取得や操作を行うためのクラス.
+      class LoadBalancer < Saklient::Cloud::Resources::Appliance
+
+        protected
+
+        # @private
+        # @return [Array<LbVirtualIp>]
+        attr_accessor :_virtual_ips
+
+        public
+
+        # @private
+        # @return [Array<LbVirtualIp>]
+        def get_virtual_ips
+          return @_virtual_ips
+        end
+
+        # 仮想IPアドレス
+        #
+        # @return [Array<LbVirtualIp>]
+        attr_reader :virtual_ips
+
+        def virtual_ips
+          get_virtual_ips
+        end
+
+        # @private
+        # @return [String]
+        def get_default_route
+          return Saklient::Util::get_by_path(self.raw_annotation, 'Network.DefaultRoute')
+        end
+
+        # @private
+        # @param [String] v
+        # @return [String]
+        def set_default_route(v)
+          Saklient::Util::validate_type(v, 'String')
+          Saklient::Util::set_by_path(self.raw_annotation, 'Network.DefaultRoute', v)
+          return v
+        end
+
+        # デフォルトルート
+        #
+        # @return [String]
+        attr_accessor :default_route
+
+        def default_route
+          get_default_route
+        end
+
+        def default_route=(v)
+          set_default_route(v)
+        end
+
+        # @private
+        # @return [Fixnum]
+        def get_mask_len
+          maskLen = Saklient::Util::get_by_path(self.raw_annotation, 'Network.NetworkMaskLen')
+          raise Saklient::Errors::SaklientException.new('invalid_data', 'Data of the resource is invalid') if (maskLen).nil?
+          return (maskLen).to_s().to_i(10)
+        end
+
+        # @private
+        # @param [Fixnum] v
+        # @return [Fixnum]
+        def set_mask_len(v)
+          Saklient::Util::validate_type(v, 'Fixnum')
+          Saklient::Util::set_by_path(self.raw_annotation, 'Network.NetworkMaskLen', v)
+          return v
+        end
+
+        # マスク長
+        #
+        # @return [Fixnum]
+        attr_accessor :mask_len
+
+        def mask_len
+          get_mask_len
+        end
+
+        def mask_len=(v)
+          set_mask_len(v)
+        end
+
+        # @private
+        # @return [Fixnum]
+        def get_vrid
+          vrid = Saklient::Util::get_by_path(self.raw_annotation, 'VRRP.VRID')
+          raise Saklient::Errors::SaklientException.new('invalid_data', 'Data of the resource is invalid') if (vrid).nil?
+          return (vrid).to_s().to_i(10)
+        end
+
+        # @private
+        # @param [Fixnum] v
+        # @return [Fixnum]
+        def set_vrid(v)
+          Saklient::Util::validate_type(v, 'Fixnum')
+          Saklient::Util::set_by_path(self.raw_annotation, 'VRRP.VRID', v)
+          return v
+        end
+
+        # VRID
+        #
+        # @return [Fixnum]
+        attr_accessor :vrid
+
+        def vrid
+          get_vrid
+        end
+
+        def vrid=(v)
+          set_vrid(v)
+        end
+
+        # @private
+        # @param [Saklient::Cloud::Client] client
+        # @param [any] obj
+        # @param [bool] wrapped
+        def initialize(client, obj, wrapped = false)
+          super(client, obj, wrapped)
+          Saklient::Util::validate_type(client, 'Saklient::Cloud::Client')
+          Saklient::Util::validate_type(wrapped, 'bool')
+          self.raw_annotation = {} if (self.raw_annotation).nil?
+        end
+
+        protected
+
+        # @private
+        # @param [any] r
+        # @param [any] root
+        # @return [void]
+        def _on_after_api_deserialize(r, root)
+          self.raw_annotation = {} if (self.raw_annotation).nil?
+          @_virtual_ips = []
+          settings = self.raw_settings
+          if !(settings).nil?
+            lb = settings[:LoadBalancer]
+            lb = [] if (lb).nil?
+            vips = lb
+            for vip in vips
+              @_virtual_ips << Saklient::Cloud::Resources::LbVirtualIp.new(vip)
+            end
+          end
+        end
+
+        # @private
+        # @param [bool] withClean
+        # @return [void]
+        def _on_before_api_serialize(withClean)
+          Saklient::Util::validate_type(withClean, 'bool')
+          lb = []
+          for vip in @_virtual_ips
+            lb << vip.to_raw_settings
+          end
+          self.raw_settings = {} if (self.raw_settings).nil?
+          self.raw_settings[:LoadBalancer] = lb
+          self.clazz = Saklient::Cloud::Enums::EApplianceClass::loadbalancer if @is_new
+        end
+
+        public
+
+        # @private
+        # @param [Swytch] swytch
+        # @param [Fixnum] vrid
+        # @param [Array<String>] realIps
+        # @param [bool] isHighSpec
+        # @return [LoadBalancer]
+        def set_initial_params(swytch, vrid, realIps, isHighSpec = false)
+          Saklient::Util::validate_type(swytch, 'Saklient::Cloud::Resources::Swytch')
+          Saklient::Util::validate_type(vrid, 'Fixnum')
+          Saklient::Util::validate_type(realIps, 'Array')
+          Saklient::Util::validate_type(isHighSpec, 'bool')
+          annot = self.raw_annotation
+          self.vrid = vrid
+          Saklient::Util::set_by_path(annot, 'Switch.ID', swytch._id)
+          if !(swytch.ipv4_nets).nil? && 0 < swytch.ipv4_nets.length
+            net = swytch.ipv4_nets[0]
+            self.default_route = net.default_route
+            self.mask_len = net.mask_len
+          else
+            self.default_route = swytch.user_default_route
+            self.mask_len = swytch.user_mask_len
+          end
+          servers = []
+          for ip in realIps
+            servers << { IPAddress: ip }
+          end
+          Saklient::Util::set_by_path(annot, 'Servers', servers)
+          self.plan_id = isHighSpec ? 2 : 1
+          return self
+        end
+
+        # @return [LoadBalancer]
+        def clear_virtual_ips
+          while 0 < @_virtual_ips.length do
+            @_virtual_ips.pop()
+          end
+          return self
+        end
+
+        # @param [any] settings
+        # @return [LbVirtualIp]
+        def add_virtual_ip(settings = nil)
+          ret = Saklient::Cloud::Resources::LbVirtualIp.new(settings)
+          @_virtual_ips << ret
+          return ret
+        end
+
+        # @param [String] address
+        # @return [LbVirtualIp]
+        def get_virtual_ip_by_address(address)
+          Saklient::Util::validate_type(address, 'String')
+          for vip in @_virtual_ips
+            return vip if vip.virtual_ip_address == address
+          end
+          return nil
+        end
+
+        # @return [LoadBalancer]
+        def reload_status
+          result = request_retry('GET', _api_path + '/' + Saklient::Util::url_encode(_id) + '/status')
+          vips = result[:LoadBalancer]
+          for vipDyn in vips
+            vipStr = vipDyn[:VirtualIPAddress]
+            vip = get_virtual_ip_by_address(vipStr)
+            next if (vip).nil?
+            vip.update_status(vipDyn[:Servers])
+          end
+          return self
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -2,6 +2,7 @@
 
 require_relative '../../util'
 require_relative '../client'
+require_relative '../../errors/http_exception'
 
 module Saklient
   module Cloud
@@ -102,9 +103,9 @@ module Saklient
         attr_accessor :is_incomplete
 
         # @private
-        # @param [any] r
+        # @param [any] query
         # @return [void]
-        def _on_before_save(r)
+        def _on_before_save(query)
         end
 
         # @private
@@ -114,6 +115,13 @@ module Saklient
         def _on_after_api_deserialize(r, root)
         end
 
+        # @private
+        # @param [bool] withClean
+        # @return [void]
+        def _on_before_api_serialize(withClean)
+          Saklient::Util::validate_type(withClean, 'bool')
+        end
+
         # @private
         # @param [any] r
         # @param [bool] withClean
@@ -172,6 +180,7 @@ module Saklient
         # @return [any]
         def api_serialize(withClean = false)
           Saklient::Util::validate_type(withClean, 'bool')
+          _on_before_api_serialize(withClean)
           ret = api_serialize_impl(withClean)
           _on_after_api_serialize(ret, withClean)
           return ret
@@ -198,21 +207,6 @@ module Saklient
           return name
         end
 
-        public
-
-        # @private
-        # @param [String] name
-        # @param [any] value
-        # @return [void]
-        def set_property(name, value)
-          Saklient::Util::validate_type(name, 'String')
-          name = normalize_field_name(name)
-          instance_variable_set('@m_'+name, value)
-          instance_variable_set('@n_'+name, true)
-        end
-
-        protected
-
         # このローカルオブジェクトに現在設定されているリソース情報をAPIに送信し, 新規作成または上書き保存します.
         #
         # @private
@@ -226,12 +220,12 @@ module Saklient
             v = query[k.to_sym]
             r[k.to_sym] = v
           end
-          _on_before_save(r)
           method = @is_new ? 'POST' : 'PUT'
           path = _api_path
           path += '/' + Saklient::Util::url_encode(_id) if !@is_new
           q = {}
           q[_root_key.to_sym] = r
+          _on_before_save(q)
           result = @_client.request(method, path, q)
           api_deserialize(result, true)
           return self
@@ -245,7 +239,7 @@ module Saklient
         def destroy
           return nil if @is_new
           path = _api_path + '/' + Saklient::Util::url_encode(_id)
-          @_client.request('DELETE', path)
+          request_retry('DELETE', path)
         end
 
         protected
@@ -255,7 +249,7 @@ module Saklient
         # @private
         # @return [Resource] this
         def _reload
-          result = @_client.request('GET', _api_path + '/' + Saklient::Util::url_encode(_id))
+          result = request_retry('GET', _api_path + '/' + Saklient::Util::url_encode(_id))
           api_deserialize(result, true)
           return self
         end
@@ -269,7 +263,7 @@ module Saklient
           query = {}
           Saklient::Util::set_by_path(query, 'Filter.ID', [_id])
           Saklient::Util::set_by_path(query, 'Include', ['ID'])
-          result = @_client.request('GET', _api_path, query)
+          result = request_retry('GET', _api_path, query)
           cnt = result[:Count]
           return cnt == 1
         end
@@ -280,6 +274,64 @@ module Saklient
           return api_serialize(true)
         end
 
+        # @private
+        # @return [String]
+        def true_class_name
+          return nil
+        end
+
+        # @private
+        # @param [String] className
+        # @param [Saklient::Cloud::Client] client
+        # @param [any] obj
+        # @param [bool] wrapped
+        # @return [Resource]
+        def self.create_with(className, client, obj, wrapped = false)
+          Saklient::Util::validate_type(className, 'String')
+          Saklient::Util::validate_type(client, 'Saklient::Cloud::Client')
+          Saklient::Util::validate_type(wrapped, 'bool')
+          a = [
+            client,
+            obj,
+            wrapped
+          ]
+          ret = Saklient::Util::create_class_instance('saklient.cloud.resources.' + className, a)
+          trueClassName = ret.true_class_name
+          ret = Saklient::Util::create_class_instance('saklient.cloud.resources.' + trueClassName, a) if !(trueClassName).nil?
+          return ret
+        end
+
+        # @param [String] method
+        # @param [String] path
+        # @param [any] query
+        # @param [Fixnum] retryCount
+        # @param [Fixnum] retrySleep
+        # @return [any]
+        def request_retry(method, path, query = nil, retryCount = 5, retrySleep = 5)
+          Saklient::Util::validate_type(method, 'String')
+          Saklient::Util::validate_type(path, 'String')
+          Saklient::Util::validate_type(retryCount, 'Fixnum')
+          Saklient::Util::validate_type(retrySleep, 'Fixnum')
+          ret = nil
+          while 1 < retryCount do
+            isOk = false
+            begin
+              ret = @_client.request(method, path, query)
+              isOk = true
+            rescue Saklient::Errors::HttpException
+              isOk = false
+            end
+            if isOk
+              retryCount = -1
+            else
+              retryCount -= 1
+              sleep(retrySleep)
+            end
+          end
+          ret = @_client.request(method, path, query) if retryCount == 0
+          return ret
+        end
+
       end
 
     end

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

@@ -132,7 +132,7 @@ module Saklient
               return true
             end
             timeoutSec -= step
-            sleep step if 0 < timeoutSec
+            sleep(step) if 0 < timeoutSec
           end
           return false
         end
@@ -450,14 +450,14 @@ module Saklient
           end
           @n_description = false
           if Saklient::Util::exists_path(r, 'NetworkMaskLen')
-            @m_network_mask_len = (Saklient::Util::get_by_path(r, 'NetworkMaskLen')).nil? ? nil : (Saklient::Util::get_by_path(r, 'NetworkMaskLen').to_s).to_i(10)
+            @m_network_mask_len = (Saklient::Util::get_by_path(r, 'NetworkMaskLen')).nil? ? nil : (Saklient::Util::get_by_path(r, 'NetworkMaskLen').to_s).to_s().to_i(10)
           else
             @m_network_mask_len = nil
             @is_incomplete = true
           end
           @n_network_mask_len = false
           if Saklient::Util::exists_path(r, 'BandWidthMbps')
-            @m_band_width_mbps = (Saklient::Util::get_by_path(r, 'BandWidthMbps')).nil? ? nil : (Saklient::Util::get_by_path(r, 'BandWidthMbps').to_s).to_i(10)
+            @m_band_width_mbps = (Saklient::Util::get_by_path(r, 'BandWidthMbps')).nil? ? nil : (Saklient::Util::get_by_path(r, 'BandWidthMbps').to_s).to_s().to_i(10)
           else
             @m_band_width_mbps = nil
             @is_incomplete = true

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

@@ -195,7 +195,7 @@ module Saklient
           end
           @n_name = false
           if Saklient::Util::exists_path(r, 'BandWidthMbps')
-            @m_band_width_mbps = (Saklient::Util::get_by_path(r, 'BandWidthMbps')).nil? ? nil : (Saklient::Util::get_by_path(r, 'BandWidthMbps').to_s).to_i(10)
+            @m_band_width_mbps = (Saklient::Util::get_by_path(r, 'BandWidthMbps')).nil? ? nil : (Saklient::Util::get_by_path(r, 'BandWidthMbps').to_s).to_s().to_i(10)
           else
             @m_band_width_mbps = nil
             @is_incomplete = true

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

@@ -280,6 +280,7 @@ module Saklient
         # @private
         # @return [Array<String>]
         def get_tags
+          @n_tags = true
           return @m_tags
         end
 
@@ -403,32 +404,17 @@ module Saklient
           return @m_annotation
         end
 
-        # (This method is generated in Translator_default#buildImpl)
-        #
-        # @private
-        # @param [any] v
-        # @return [any]
-        def set_annotation(v)
-          @m_annotation = v
-          @n_annotation = true
-          return @m_annotation
-        end
-
         public
 
         # 注釈
         #
         # @return [any]
-        attr_accessor :annotation
+        attr_reader :annotation
 
         def annotation
           get_annotation
         end
 
-        def annotation=(v)
-          set_annotation(v)
-        end
-
         protected
 
         # (This method is generated in Translator_default#buildImpl)

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

@@ -171,38 +171,15 @@ module Saklient
           return reload
         end
 
-        # サーバが停止するまで待機します.
-        #
-        # @yield [Saklient::Cloud::Resources::Server, bool]
-        # @yieldreturn [void]
-        # @param [Fixnum] timeoutSec
-        # @return [void] 成功時はtrue, タイムアウトやエラーによる失敗時はfalseを返します.
-        def after_down(timeoutSec, &callback)
-          Saklient::Util::validate_type(timeoutSec, 'Fixnum')
-          Saklient::Util::validate_type(callback, 'Proc')
-          after_status(Saklient::Cloud::Enums::EServerInstanceStatus::down, timeoutSec, &callback)
-        end
-
-        protected
-
-        # サーバが指定のステータスに遷移するまで待機します.
+        # サーバが起動するまで待機します.
         #
-        # @private
-        # @yield [Saklient::Cloud::Resources::Server, bool]
-        # @yieldreturn [void]
-        # @param [String] status
         # @param [Fixnum] timeoutSec
-        # @return [void]
-        def after_status(status, timeoutSec, &callback)
-          Saklient::Util::validate_type(status, 'String')
+        # @return [bool]
+        def sleep_until_up(timeoutSec = 180)
           Saklient::Util::validate_type(timeoutSec, 'Fixnum')
-          Saklient::Util::validate_type(callback, 'Proc')
-          ret = sleep_until(status, timeoutSec)
-          callback.call(self, ret)
+          return sleep_until(Saklient::Cloud::Enums::EServerInstanceStatus::up, timeoutSec)
         end
 
-        public
-
         # サーバが停止するまで待機します.
         #
         # @param [Fixnum] timeoutSec
@@ -223,14 +200,16 @@ module Saklient
         def sleep_until(status, timeoutSec = 180)
           Saklient::Util::validate_type(status, 'String')
           Saklient::Util::validate_type(timeoutSec, 'Fixnum')
-          step = 3
+          step = 10
           while 0 < timeoutSec do
             reload
-            s = get_instance.status
+            s = nil
+            inst = self.instance
+            s = inst.status if !(inst).nil?
             s = Saklient::Cloud::Enums::EServerInstanceStatus::down if (s).nil?
             return true if s == status
             timeoutSec -= step
-            sleep step if 0 < timeoutSec
+            sleep(step) if 0 < timeoutSec
           end
           return false
         end
@@ -265,7 +244,7 @@ module Saklient
         def add_iface
           model = Saklient::Util::create_class_instance('saklient.cloud.models.Model_Iface', [@_client])
           res = model.create
-          res.set_property('serverId', _id)
+          res.server_id = _id
           return res.save
         end
 
@@ -406,6 +385,7 @@ module Saklient
         # @private
         # @return [Array<String>]
         def get_tags
+          @n_tags = true
           return @m_tags
         end
 

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

@@ -242,14 +242,14 @@ module Saklient
           end
           @n_name = false
           if Saklient::Util::exists_path(r, 'CPU')
-            @m_cpu = (Saklient::Util::get_by_path(r, 'CPU')).nil? ? nil : (Saklient::Util::get_by_path(r, 'CPU').to_s).to_i(10)
+            @m_cpu = (Saklient::Util::get_by_path(r, 'CPU')).nil? ? nil : (Saklient::Util::get_by_path(r, 'CPU').to_s).to_s().to_i(10)
           else
             @m_cpu = nil
             @is_incomplete = true
           end
           @n_cpu = false
           if Saklient::Util::exists_path(r, 'MemoryMB')
-            @m_memory_mib = (Saklient::Util::get_by_path(r, 'MemoryMB')).nil? ? nil : (Saklient::Util::get_by_path(r, 'MemoryMB').to_s).to_i(10)
+            @m_memory_mib = (Saklient::Util::get_by_path(r, 'MemoryMB')).nil? ? nil : (Saklient::Util::get_by_path(r, 'MemoryMB').to_s).to_s().to_i(10)
           else
             @m_memory_mib = nil
             @is_incomplete = true

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

@@ -430,7 +430,7 @@ module Saklient
           end
           @n_user_default_route = false
           if Saklient::Util::exists_path(r, 'UserSubnet.NetworkMaskLen')
-            @m_user_mask_len = (Saklient::Util::get_by_path(r, 'UserSubnet.NetworkMaskLen')).nil? ? nil : (Saklient::Util::get_by_path(r, 'UserSubnet.NetworkMaskLen').to_s).to_i(10)
+            @m_user_mask_len = (Saklient::Util::get_by_path(r, 'UserSubnet.NetworkMaskLen')).nil? ? nil : (Saklient::Util::get_by_path(r, 'UserSubnet.NetworkMaskLen').to_s).to_s().to_i(10)
           else
             @m_user_mask_len = nil
             @is_incomplete = true

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

@@ -0,0 +1,28 @@
+# -*- encoding: UTF-8 -*-
+
+require_relative '../../errors/saklient_exception'
+require_relative '../client'
+require_relative 'appliance'
+
+module Saklient
+  module Cloud
+    module Resources
+
+      # ロードバランサの実体1つに対応し, 属性の取得や操作を行うためのクラス.
+      class VpcRouter < Saklient::Cloud::Resources::Appliance
+
+        # @private
+        # @param [Saklient::Cloud::Client] client
+        # @param [any] obj
+        # @param [bool] wrapped
+        def initialize(client, obj, wrapped = false)
+          super(client, obj, wrapped)
+          Saklient::Util::validate_type(client, 'Saklient::Cloud::Client')
+          Saklient::Util::validate_type(wrapped, 'bool')
+        end
+
+      end
+
+    end
+  end
+end

data/lib/saklient/util.rb

@@ -37,6 +37,16 @@ module Saklient
       end
       return obj
     end
+  
+    def self.get_by_path_any(objects, pathes)
+      for obj in objects
+        for path in pathes
+          ret = get_by_path(obj, path)
+          return ret if !ret.nil?
+        end
+      end
+      return nil
+    end
 
     # @todo array support
     # @todo overwriting

data/lib/saklient/version.rb

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