saklient 0.0.1.1 → 0.0.2.2

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

@@ -5,7 +5,10 @@ require_relative '../client'
 require_relative 'resource'
 require_relative 'icon'
 require_relative 'iface'
+require_relative 'swytch'
 require_relative '../enums/eappliance_class'
+require_relative '../enums/eavailability'
+require_relative '../enums/eserver_instance_status'
 
 module Saklient
   module Cloud
@@ -48,14 +51,48 @@ module Saklient
 
         # プラン
         #
+        # @return [Fixnum]
+        attr_accessor :m_plan_id
+
+        # インタフェース
+        #
         # @return [Array<Iface>]
         attr_accessor :m_ifaces
 
+        # 注釈
+        #
+        # @return [any]
+        attr_accessor :m_raw_annotation
+
+        # 設定の生データ
+        #
+        # @return [any]
+        attr_accessor :m_raw_settings
+
+        # @private
+        # @return [String]
+        attr_accessor :m_raw_settings_hash
+
+        # 起動状態 {Saklient::Cloud::Enums::EServerInstanceStatus}
+        #
+        # @return [String]
+        attr_accessor :m_status
+
         # サービスクラス
         #
         # @return [String]
         attr_accessor :m_service_class
 
+        # 有効状態 {Saklient::Cloud::Enums::EAvailability}
+        #
+        # @return [String]
+        attr_accessor :m_availability
+
+        # 接続先スイッチID
+        #
+        # @return [String]
+        attr_accessor :m_swytch_id
+
         # @private
         # @return [String]
         def _api_path
@@ -102,6 +139,19 @@ module Saklient
           return _reload
         end
 
+        # @private
+        # @return [String]
+        def true_class_name
+          return nil if (self.clazz).nil?
+          case (self.clazz)
+            when 'loadbalancer'
+              return 'LoadBalancer'
+            when 'vpcrouter'
+              return 'VpcRouter'
+          end
+          return nil
+        end
+
         # @private
         # @param [Saklient::Cloud::Client] client
         # @param [any] obj
@@ -113,6 +163,34 @@ module Saklient
           api_deserialize(obj, wrapped)
         end
 
+        protected
+
+        # @private
+        # @param [any] query
+        # @return [void]
+        def _on_before_save(query)
+          Saklient::Util::set_by_path(query, 'OriginalSettingsHash', get_raw_settings_hash)
+        end
+
+        public
+
+        # このルータが接続されているスイッチを取得します.
+        #
+        # @return [Swytch]
+        def get_swytch
+          model = Saklient::Util::create_class_instance('saklient.cloud.models.Model_Swytch', [@_client])
+          id = get_swytch_id
+          return model.get_by_id(id)
+        end
+
+        # アプライアンスの設定を反映します.
+        #
+        # @return [Appliance] this
+        def apply
+          @_client.request('PUT', _api_path + '/' + Saklient::Util::url_encode(_id) + '/config')
+          return self
+        end
+
         # アプライアンスを起動します.
         #
         # @return [Appliance] this
@@ -145,8 +223,65 @@ module Saklient
           return self
         end
 
+        # 作成中のアプライアンスが利用可能になるまで待機します.
+        #
+        # @param [Fixnum] timeoutSec
+        # @return [bool] 成功時はtrue, タイムアウトやエラーによる失敗時はfalseを返します.
+        def sleep_while_creating(timeoutSec = 600)
+          Saklient::Util::validate_type(timeoutSec, 'Fixnum')
+          step = 10
+          while 0 < timeoutSec do
+            reload
+            a = get_availability
+            return true if a == Saklient::Cloud::Enums::EAvailability::available
+            timeoutSec = 0 if a != Saklient::Cloud::Enums::EAvailability::migrating
+            timeoutSec -= step
+            sleep(step) if 0 < timeoutSec
+          end
+          return false
+        end
+
+        # アプライアンスが起動するまで待機します.
+        #
+        # @param [Fixnum] timeoutSec
+        # @return [bool]
+        def sleep_until_up(timeoutSec = 600)
+          Saklient::Util::validate_type(timeoutSec, 'Fixnum')
+          return sleep_until(Saklient::Cloud::Enums::EServerInstanceStatus::up, timeoutSec)
+        end
+
+        # アプライアンスが停止するまで待機します.
+        #
+        # @param [Fixnum] timeoutSec
+        # @return [bool] 成功時はtrue, タイムアウトやエラーによる失敗時はfalseを返します.
+        def sleep_until_down(timeoutSec = 600)
+          Saklient::Util::validate_type(timeoutSec, 'Fixnum')
+          return sleep_until(Saklient::Cloud::Enums::EServerInstanceStatus::down, timeoutSec)
+        end
+
         protected
 
+        # アプライアンスが指定のステータスに遷移するまで待機します.
+        #
+        # @private
+        # @param [String] status
+        # @param [Fixnum] timeoutSec
+        # @return [bool]
+        def sleep_until(status, timeoutSec = 600)
+          Saklient::Util::validate_type(status, 'String')
+          Saklient::Util::validate_type(timeoutSec, 'Fixnum')
+          step = 10
+          while 0 < timeoutSec do
+            reload
+            s = get_status
+            s = Saklient::Cloud::Enums::EServerInstanceStatus::down if (s).nil?
+            return true if s == status
+            timeoutSec -= step
+            sleep(step) if 0 < timeoutSec
+          end
+          return false
+        end
+
         # @return [bool]
         attr_accessor :n_id
 
@@ -300,6 +435,7 @@ module Saklient
         # @private
         # @return [Array<String>]
         def get_tags
+          @n_tags = true
           return @m_tags
         end
 
@@ -372,6 +508,47 @@ module Saklient
 
         protected
 
+        # @return [bool]
+        attr_accessor :n_plan_id
+
+        # (This method is generated in Translator_default#buildImpl)
+        #
+        # @private
+        # @return [Fixnum]
+        def get_plan_id
+          return @m_plan_id
+        end
+
+        # (This method is generated in Translator_default#buildImpl)
+        #
+        # @private
+        # @param [Fixnum] v
+        # @return [Fixnum]
+        def set_plan_id(v)
+          Saklient::Util::validate_type(v, 'Fixnum')
+          raise Saklient::Errors::SaklientException.new('immutable_field', 'Immutable fields cannot be modified after the resource creation: ' + 'Saklient::Cloud::Resources::Appliance#plan_id') if !@is_new
+          @m_plan_id = v
+          @n_plan_id = true
+          return @m_plan_id
+        end
+
+        public
+
+        # プラン
+        #
+        # @return [Fixnum]
+        attr_accessor :plan_id
+
+        def plan_id
+          get_plan_id
+        end
+
+        def plan_id=(v)
+          set_plan_id(v)
+        end
+
+        protected
+
         # @return [bool]
         attr_accessor :n_ifaces
 
@@ -385,7 +562,7 @@ module Saklient
 
         public
 
-        # プラン
+        # インタフェース
         #
         # @return [Array<Iface>]
         attr_reader :ifaces
@@ -396,6 +573,133 @@ module Saklient
 
         protected
 
+        # @return [bool]
+        attr_accessor :n_raw_annotation
+
+        # (This method is generated in Translator_default#buildImpl)
+        #
+        # @private
+        # @return [any]
+        def get_raw_annotation
+          return @m_raw_annotation
+        end
+
+        # (This method is generated in Translator_default#buildImpl)
+        #
+        # @private
+        # @param [any] v
+        # @return [any]
+        def set_raw_annotation(v)
+          raise Saklient::Errors::SaklientException.new('immutable_field', 'Immutable fields cannot be modified after the resource creation: ' + 'Saklient::Cloud::Resources::Appliance#raw_annotation') if !@is_new
+          @m_raw_annotation = v
+          @n_raw_annotation = true
+          return @m_raw_annotation
+        end
+
+        public
+
+        # 注釈
+        #
+        # @return [any]
+        attr_accessor :raw_annotation
+
+        def raw_annotation
+          get_raw_annotation
+        end
+
+        def raw_annotation=(v)
+          set_raw_annotation(v)
+        end
+
+        protected
+
+        # @return [bool]
+        attr_accessor :n_raw_settings
+
+        # (This method is generated in Translator_default#buildImpl)
+        #
+        # @private
+        # @return [any]
+        def get_raw_settings
+          @n_raw_settings = true
+          return @m_raw_settings
+        end
+
+        # (This method is generated in Translator_default#buildImpl)
+        #
+        # @private
+        # @param [any] v
+        # @return [any]
+        def set_raw_settings(v)
+          @m_raw_settings = v
+          @n_raw_settings = true
+          return @m_raw_settings
+        end
+
+        public
+
+        # 設定の生データ
+        #
+        # @return [any]
+        attr_accessor :raw_settings
+
+        def raw_settings
+          get_raw_settings
+        end
+
+        def raw_settings=(v)
+          set_raw_settings(v)
+        end
+
+        protected
+
+        # @return [bool]
+        attr_accessor :n_raw_settings_hash
+
+        # (This method is generated in Translator_default#buildImpl)
+        #
+        # @private
+        # @return [String]
+        def get_raw_settings_hash
+          return @m_raw_settings_hash
+        end
+
+        public
+
+        # @private
+        # @return [String]
+        attr_reader :raw_settings_hash
+
+        def raw_settings_hash
+          get_raw_settings_hash
+        end
+
+        protected
+
+        # @return [bool]
+        attr_accessor :n_status
+
+        # (This method is generated in Translator_default#buildImpl)
+        #
+        # @private
+        # @return [String]
+        def get_status
+          return @m_status
+        end
+
+        public
+
+        # 起動状態 {Saklient::Cloud::Enums::EServerInstanceStatus}
+        #
+        # @return [String]
+        attr_reader :status
+
+        def status
+          get_status
+        end
+
+        protected
+
         # @return [bool]
         attr_accessor :n_service_class
 
@@ -420,6 +724,54 @@ module Saklient
 
         protected
 
+        # @return [bool]
+        attr_accessor :n_availability
+
+        # (This method is generated in Translator_default#buildImpl)
+        #
+        # @private
+        # @return [String]
+        def get_availability
+          return @m_availability
+        end
+
+        public
+
+        # 有効状態 {Saklient::Cloud::Enums::EAvailability}
+        #
+        # @return [String]
+        attr_reader :availability
+
+        def availability
+          get_availability
+        end
+
+        protected
+
+        # @return [bool]
+        attr_accessor :n_swytch_id
+
+        # (This method is generated in Translator_default#buildImpl)
+        #
+        # @private
+        # @return [String]
+        def get_swytch_id
+          return @m_swytch_id
+        end
+
+        public
+
+        # 接続先スイッチID
+        #
+        # @return [String]
+        attr_reader :swytch_id
+
+        def swytch_id
+          get_swytch_id
+        end
+
+        protected
+
         # (This method is generated in Translator_default#buildImpl)
         #
         # @param [any] r
@@ -478,6 +830,13 @@ module Saklient
             @is_incomplete = true
           end
           @n_icon = false
+          if Saklient::Util::exists_path(r, 'Plan.ID')
+            @m_plan_id = (Saklient::Util::get_by_path(r, 'Plan.ID')).nil? ? nil : (Saklient::Util::get_by_path(r, 'Plan.ID').to_s).to_s().to_i(10)
+          else
+            @m_plan_id = nil
+            @is_incomplete = true
+          end
+          @n_plan_id = false
           if Saklient::Util::exists_path(r, 'Interfaces')
             if (Saklient::Util::get_by_path(r, 'Interfaces')).nil?
               @m_ifaces = []
@@ -494,6 +853,34 @@ module Saklient
             @is_incomplete = true
           end
           @n_ifaces = false
+          if Saklient::Util::exists_path(r, 'Remark')
+            @m_raw_annotation = Saklient::Util::get_by_path(r, 'Remark')
+          else
+            @m_raw_annotation = nil
+            @is_incomplete = true
+          end
+          @n_raw_annotation = false
+          if Saklient::Util::exists_path(r, 'Settings')
+            @m_raw_settings = Saklient::Util::get_by_path(r, 'Settings')
+          else
+            @m_raw_settings = nil
+            @is_incomplete = true
+          end
+          @n_raw_settings = false
+          if Saklient::Util::exists_path(r, 'SettingsHash')
+            @m_raw_settings_hash = (Saklient::Util::get_by_path(r, 'SettingsHash')).nil? ? nil : Saklient::Util::get_by_path(r, 'SettingsHash').to_s
+          else
+            @m_raw_settings_hash = nil
+            @is_incomplete = true
+          end
+          @n_raw_settings_hash = false
+          if Saklient::Util::exists_path(r, 'Instance.Status')
+            @m_status = (Saklient::Util::get_by_path(r, 'Instance.Status')).nil? ? nil : Saklient::Util::get_by_path(r, 'Instance.Status').to_s
+          else
+            @m_status = nil
+            @is_incomplete = true
+          end
+          @n_status = false
           if Saklient::Util::exists_path(r, 'ServiceClass')
             @m_service_class = (Saklient::Util::get_by_path(r, 'ServiceClass')).nil? ? nil : Saklient::Util::get_by_path(r, 'ServiceClass').to_s
           else
@@ -501,6 +888,20 @@ module Saklient
             @is_incomplete = true
           end
           @n_service_class = false
+          if Saklient::Util::exists_path(r, 'Availability')
+            @m_availability = (Saklient::Util::get_by_path(r, 'Availability')).nil? ? nil : Saklient::Util::get_by_path(r, 'Availability').to_s
+          else
+            @m_availability = nil
+            @is_incomplete = true
+          end
+          @n_availability = false
+          if Saklient::Util::exists_path(r, 'Switch.ID')
+            @m_swytch_id = (Saklient::Util::get_by_path(r, 'Switch.ID')).nil? ? nil : Saklient::Util::get_by_path(r, 'Switch.ID').to_s
+          else
+            @m_swytch_id = nil
+            @is_incomplete = true
+          end
+          @n_swytch_id = false
         end
 
         # @private
@@ -531,6 +932,11 @@ module Saklient
             end
           end
           Saklient::Util::set_by_path(ret, 'Icon', withClean ? ((@m_icon).nil? ? nil : @m_icon.api_serialize(withClean)) : ((@m_icon).nil? ? { ID: '0' } : @m_icon.api_serialize_id)) if withClean || @n_icon
+          if withClean || @n_plan_id
+            Saklient::Util::set_by_path(ret, 'Plan.ID', @m_plan_id)
+          else
+            missing << 'plan_id' if @is_new
+          end
           if withClean || @n_ifaces
             Saklient::Util::set_by_path(ret, 'Interfaces', [])
             for r2 in @m_ifaces
@@ -539,7 +945,17 @@ module Saklient
               ret[:Interfaces] << v
             end
           end
+          if withClean || @n_raw_annotation
+            Saklient::Util::set_by_path(ret, 'Remark', @m_raw_annotation)
+          else
+            missing << 'raw_annotation' if @is_new
+          end
+          Saklient::Util::set_by_path(ret, 'Settings', @m_raw_settings) if withClean || @n_raw_settings
+          Saklient::Util::set_by_path(ret, 'SettingsHash', @m_raw_settings_hash) if withClean || @n_raw_settings_hash
+          Saklient::Util::set_by_path(ret, 'Instance.Status', @m_status) if withClean || @n_status
           Saklient::Util::set_by_path(ret, 'ServiceClass', @m_service_class) if withClean || @n_service_class
+          Saklient::Util::set_by_path(ret, 'Availability', @m_availability) if withClean || @n_availability
+          Saklient::Util::set_by_path(ret, 'Switch.ID', @m_swytch_id) if withClean || @n_swytch_id
           raise Saklient::Errors::SaklientException.new('required_field', 'Required fields must be set before the Appliance creation: ' + missing.join(', ')) if missing.length > 0
           return ret
         end

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

@@ -267,14 +267,7 @@ module Saklient
               s = r[:SourceDisk]
               if !(s).nil?
                 id = s[:ID]
-                if !(id).nil?
-                  obj = Saklient::Util::create_class_instance('saklient.cloud.resources.Disk', [
-                    @_client,
-                    s,
-                    false
-                  ])
-                  @_source = obj
-                end
+                @_source = Saklient::Cloud::Resources::Resource::create_with('Disk', @_client, s) if !(id).nil?
               end
             end
           end
@@ -331,20 +324,6 @@ module Saklient
           return self
         end
 
-        # コピー中のアーカイブが利用可能になるまで待機します.
-        #
-        # @private
-        # @yield [Saklient::Cloud::Resources::Archive, bool]
-        # @yieldreturn [void]
-        # @param [Fixnum] timeoutSec
-        # @return [void]
-        def after_copy(timeoutSec, &callback)
-          Saklient::Util::validate_type(timeoutSec, 'Fixnum')
-          Saklient::Util::validate_type(callback, 'Proc')
-          ret = sleep_while_copying(timeoutSec)
-          callback.call(self, ret)
-        end
-
         # コピー中のアーカイブが利用可能になるまで待機します.
         #
         # @param [Fixnum] timeoutSec
@@ -358,7 +337,7 @@ module Saklient
             return true if a == Saklient::Cloud::Enums::EAvailability::available
             timeoutSec = 0 if a != Saklient::Cloud::Enums::EAvailability::migrating
             timeoutSec -= step
-            sleep step if 0 < timeoutSec
+            sleep(step) if 0 < timeoutSec
           end
           return false
         end
@@ -501,6 +480,7 @@ module Saklient
         # @private
         # @return [Array<String>]
         def get_tags
+          @n_tags = true
           return @m_tags
         end
 
@@ -785,14 +765,14 @@ module Saklient
           end
           @n_icon = false
           if Saklient::Util::exists_path(r, 'DisplayOrder')
-            @m_display_order = (Saklient::Util::get_by_path(r, 'DisplayOrder')).nil? ? nil : (Saklient::Util::get_by_path(r, 'DisplayOrder').to_s).to_i(10)
+            @m_display_order = (Saklient::Util::get_by_path(r, 'DisplayOrder')).nil? ? nil : (Saklient::Util::get_by_path(r, 'DisplayOrder').to_s).to_s().to_i(10)
           else
             @m_display_order = nil
             @is_incomplete = true
           end
           @n_display_order = false
           if Saklient::Util::exists_path(r, 'SizeMB')
-            @m_size_mib = (Saklient::Util::get_by_path(r, 'SizeMB')).nil? ? nil : (Saklient::Util::get_by_path(r, 'SizeMB').to_s).to_i(10)
+            @m_size_mib = (Saklient::Util::get_by_path(r, 'SizeMB')).nil? ? nil : (Saklient::Util::get_by_path(r, 'SizeMB').to_s).to_s().to_i(10)
           else
             @m_size_mib = nil
             @is_incomplete = true

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

@@ -234,14 +234,7 @@ module Saklient
               s = r[:SourceArchive]
               if !(s).nil?
                 id = s[:ID]
-                if !(id).nil?
-                  obj = Saklient::Util::create_class_instance('saklient.cloud.resources.Archive', [
-                    @_client,
-                    s,
-                    false
-                  ])
-                  @_source = obj
-                end
+                @_source = Saklient::Cloud::Resources::Resource::create_with('Archive', @_client, s) if !(id).nil?
               end
             end
           end
@@ -299,34 +292,20 @@ module Saklient
           return Saklient::Cloud::Resources::DiskConfig.new(@_client, _id)
         end
 
-        # コピー中のディスクが利用可能になるまで待機します.
-        #
-        # @private
-        # @yield [Saklient::Cloud::Resources::Disk, bool]
-        # @yieldreturn [void]
-        # @param [Fixnum] timeoutSec
-        # @return [void]
-        def after_copy(timeoutSec, &callback)
-          Saklient::Util::validate_type(timeoutSec, 'Fixnum')
-          Saklient::Util::validate_type(callback, 'Proc')
-          ret = sleep_while_copying(timeoutSec)
-          callback.call(self, ret)
-        end
-
         # コピー中のディスクが利用可能になるまで待機します.
         #
         # @param [Fixnum] timeoutSec
         # @return [bool] 成功時はtrue, タイムアウトやエラーによる失敗時はfalseを返します.
         def sleep_while_copying(timeoutSec = 3600)
           Saklient::Util::validate_type(timeoutSec, 'Fixnum')
-          step = 3
+          step = 10
           while 0 < timeoutSec do
             reload
             a = get_availability
             return true if a == Saklient::Cloud::Enums::EAvailability::available
             timeoutSec = 0 if a != Saklient::Cloud::Enums::EAvailability::migrating
             timeoutSec -= step
-            sleep step if 0 < timeoutSec
+            sleep(step) if 0 < timeoutSec
           end
           return false
         end
@@ -445,6 +424,7 @@ module Saklient
         # @private
         # @return [Array<String>]
         def get_tags
+          @n_tags = true
           return @m_tags
         end
 
@@ -723,7 +703,7 @@ module Saklient
           end
           @n_icon = false
           if Saklient::Util::exists_path(r, 'SizeMB')
-            @m_size_mib = (Saklient::Util::get_by_path(r, 'SizeMB')).nil? ? nil : (Saklient::Util::get_by_path(r, 'SizeMB').to_s).to_i(10)
+            @m_size_mib = (Saklient::Util::get_by_path(r, 'SizeMB')).nil? ? nil : (Saklient::Util::get_by_path(r, 'SizeMB').to_s).to_s().to_i(10)
           else
             @m_size_mib = nil
             @is_incomplete = true

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

@@ -232,7 +232,7 @@ module Saklient
           end
           @n_address = false
           if Saklient::Util::exists_path(r, 'NetworkMaskLen')
-            @m_mask_len = (Saklient::Util::get_by_path(r, 'NetworkMaskLen')).nil? ? nil : (Saklient::Util::get_by_path(r, 'NetworkMaskLen').to_s).to_i(10)
+            @m_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_mask_len = nil
             @is_incomplete = true

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

@@ -203,7 +203,7 @@ module Saklient
           end
           @n_prefix = false
           if Saklient::Util::exists_path(r, 'IPv6PrefixLen')
-            @m_prefix_len = (Saklient::Util::get_by_path(r, 'IPv6PrefixLen')).nil? ? nil : (Saklient::Util::get_by_path(r, 'IPv6PrefixLen').to_s).to_i(10)
+            @m_prefix_len = (Saklient::Util::get_by_path(r, 'IPv6PrefixLen')).nil? ? nil : (Saklient::Util::get_by_path(r, 'IPv6PrefixLen').to_s).to_s().to_i(10)
           else
             @m_prefix_len = nil
             @is_incomplete = true