saklient 0.0.2.11 → 0.0.5

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

@@ -0,0 +1,157 @@
+# -*- encoding: UTF-8 -*-
+
+# This code is automatically transpiled by Saklient Translator
+
+require_relative '../../util'
+
+module Saklient
+  module Cloud
+    module Resources
+
+      # GSLBの監視対象サーバ設定.
+      class GslbServer
+
+        protected
+
+        # @private
+        # @return [bool]
+        attr_accessor :_enabled
+
+        public
+
+        # @private
+        # @return [bool]
+        def get_enabled
+          return @_enabled
+        end
+
+        # @private
+        # @param [bool] v
+        # @return [bool]
+        def set_enabled(v)
+          Saklient::Util::validate_type(v, 'bool')
+          @_enabled = v
+          return @_enabled
+        end
+
+        # 有効状態
+        #
+        # @return [bool]
+        attr_accessor :enabled
+
+        def enabled
+          get_enabled
+        end
+
+        def enabled=(v)
+          set_enabled(v)
+        end
+
+        protected
+
+        # @private
+        # @return [String]
+        attr_accessor :_ip_address
+
+        public
+
+        # @private
+        # @return [String]
+        def get_ip_address
+          return @_ip_address
+        end
+
+        # @private
+        # @param [String] v
+        # @return [String]
+        def set_ip_address(v)
+          Saklient::Util::validate_type(v, 'String')
+          @_ip_address = v
+          return @_ip_address
+        end
+
+        # IPアドレス
+        #
+        # @return [String]
+        attr_accessor :ip_address
+
+        def ip_address
+          get_ip_address
+        end
+
+        def ip_address=(v)
+          set_ip_address(v)
+        end
+
+        protected
+
+        # @private
+        # @return [Fixnum]
+        attr_accessor :_weight
+
+        public
+
+        # @private
+        # @return [Fixnum]
+        def get_weight
+          return @_weight
+        end
+
+        # @private
+        # @param [Fixnum] v
+        # @return [Fixnum]
+        def set_weight(v)
+          Saklient::Util::validate_type(v, 'Fixnum')
+          @_weight = v
+          return @_weight
+        end
+
+        # 重み値
+        #
+        # @return [Fixnum]
+        attr_accessor :weight
+
+        def weight
+          get_weight
+        end
+
+        def weight=(v)
+          set_weight(v)
+        end
+
+        # @private
+        # @param [any] obj
+        def initialize(obj = nil)
+          obj = {} if (obj).nil?
+          enabled = Saklient::Util::get_by_path_any([obj], ['Enabled', 'enabled'])
+          @_enabled = nil
+          if !(enabled).nil?
+            enabledStr = enabled
+            @_enabled = enabledStr.downcase() == 'true'
+          end
+          @_ip_address = Saklient::Util::get_by_path_any([obj], [
+            'IPAddress',
+            'ipAddress',
+            'ip_address',
+            'ip'
+          ])
+          weight = Saklient::Util::get_by_path_any([obj], ['Weight', 'weight'])
+          @_weight = nil
+          @_weight = (weight).to_s().to_i(10) if !(weight).nil?
+          @_weight = nil if @_weight == 0
+        end
+
+        # @return [any]
+        def to_raw_settings
+          return {
+            Enabled: (@_enabled).nil? ? nil : (@_enabled ? 'True' : 'False'),
+            IPAddress: @_ip_address,
+            Weight: @_weight
+          }
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -42,6 +42,11 @@ module Saklient
         # @return [String]
         attr_accessor :m_server_id
 
+        # このインタフェースの接続先スイッチのID
+        #
+        # @return [String]
+        attr_accessor :m_swytch_id
+
         # @private
         # @return [String]
         def _api_path
@@ -316,6 +321,47 @@ module Saklient
 
         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
+
+        # (This method is generated in Translator_default#buildImpl)
+        #
+        # @private
+        # @param [String] v
+        # @return [String]
+        def set_swytch_id(v)
+          Saklient::Util::validate_type(v, 'String')
+          raise Saklient::Errors::SaklientException.new('immutable_field', 'Immutable fields cannot be modified after the resource creation: ' + 'Saklient::Cloud::Resources::Iface#swytch_id') if !@is_new
+          @m_swytch_id = v
+          @n_swytch_id = true
+          return @m_swytch_id
+        end
+
+        public
+
+        # このインタフェースの接続先スイッチのID
+        #
+        # @return [String]
+        attr_accessor :swytch_id
+
+        def swytch_id
+          get_swytch_id
+        end
+
+        def swytch_id=(v)
+          set_swytch_id(v)
+        end
+
+        protected
+
         # (This method is generated in Translator_default#buildImpl)
         #
         # @param [any] r
@@ -358,6 +404,13 @@ module Saklient
             @is_incomplete = true
           end
           @n_server_id = 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
@@ -376,6 +429,7 @@ module Saklient
           else
             missing << 'server_id' if @is_new
           end
+          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 Iface creation: ' + missing.join(', ')) if missing.length > 0
           return ret
         end

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

@@ -2,6 +2,7 @@
 
 # This code is automatically transpiled by Saklient Translator
 
+require_relative '../client'
 require_relative 'activity'
 require_relative 'iface_activity_sample'
 
@@ -48,6 +49,17 @@ module Saklient
           return '/monitor'
         end
 
+        public
+
+        # @private
+        # @param [Saklient::Cloud::Client] client
+        def initialize(client)
+          super(client)
+          Saklient::Util::validate_type(client, 'Saklient::Cloud::Client')
+        end
+
+        protected
+
         # @private
         # @param [String] atStr
         # @param [any] data

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

@@ -110,6 +110,13 @@ module Saklient
         def _on_before_save(query)
         end
 
+        # @private
+        # @param [any] r
+        # @param [any] root
+        # @return [void]
+        def _on_before_api_deserialize(r, root)
+        end
+
         # @private
         # @param [any] r
         # @param [any] root
@@ -161,6 +168,7 @@ module Saklient
               record = obj[rkey.to_sym]
             end
           end
+          _on_before_api_deserialize(record, root)
           api_deserialize_impl(record)
           _on_after_api_deserialize(record, root)
         end
@@ -251,8 +259,11 @@ module Saklient
         # @private
         # @return [Resource] this
         def _reload
-          result = request_retry('GET', _api_path + '/' + Saklient::Util::url_encode(_id))
-          api_deserialize(result, true)
+          id = _id
+          if !(id).nil?
+            result = request_retry('GET', _api_path + '/' + Saklient::Util::url_encode(id))
+            api_deserialize(result, true)
+          end
           return self
         end
 

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

@@ -166,19 +166,21 @@ module Saklient
         def sleep_while_creating(timeoutSec = 120)
           Saklient::Util::validate_type(timeoutSec, 'Fixnum')
           step = 3
+          isOk = false
           while 0 < timeoutSec do
             begin
               if exists
                 reload
-                return true
+                isOk = true
               end
             rescue Saklient::Errors::HttpException
               {}
             end
             timeoutSec -= step
+            timeoutSec = 0 if isOk
             sleep(step) if 0 < timeoutSec
           end
-          return false
+          return isOk
         end
 
         # このルータが接続されているスイッチを取得します.

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

@@ -2,6 +2,7 @@
 
 # This code is automatically transpiled by Saklient Translator
 
+require_relative '../client'
 require_relative 'activity'
 require_relative 'router_activity_sample'
 
@@ -42,6 +43,17 @@ module Saklient
           return '/internet'
         end
 
+        public
+
+        # @private
+        # @param [Saklient::Cloud::Client] client
+        def initialize(client)
+          super(client)
+          Saklient::Util::validate_type(client, 'Saklient::Cloud::Client')
+        end
+
+        protected
+
         # @private
         # @param [String] atStr
         # @param [any] data

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

@@ -155,6 +155,26 @@ module Saklient
 
         protected
 
+        # @private
+        # @param [any] r
+        # @param [any] root
+        # @return [void]
+        def _on_before_api_deserialize(r, root)
+          return nil if (r).nil?
+          id = r[:ID]
+          ifaces = r[:Interfaces]
+          if !(ifaces).nil?
+            for iface in ifaces
+              server = iface[:Server]
+              if (server).nil?
+                server = {}
+                iface[:Server] = server
+              end
+              server[:ID] = id
+            end
+          end
+        end
+
         # @private
         # @param [any] r
         # @param [any] root

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

@@ -2,6 +2,7 @@
 
 # This code is automatically transpiled by Saklient Translator
 
+require_relative '../client'
 require_relative 'activity'
 require_relative 'server_activity_sample'
 
@@ -42,6 +43,17 @@ module Saklient
           return '/server'
         end
 
+        public
+
+        # @private
+        # @param [Saklient::Cloud::Client] client
+        def initialize(client)
+          super(client)
+          Saklient::Util::validate_type(client, 'Saklient::Cloud::Client')
+        end
+
+        protected
+
         # @private
         # @param [String] atStr
         # @param [any] data

data/lib/saklient/util.rb

@@ -125,7 +125,7 @@ module Saklient
     # @param [String] s
     # @return [String]
     def self.url_encode(s)
-      return URI.encode(s)
+      return URI.encode(s.to_s)
     end
 
     # @param [Integer] sec

data/lib/saklient/version.rb

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

data/spec/gslb_spec.rb

@@ -0,0 +1,99 @@
+$: << File.dirname(__dir__) + '/lib'
+require 'saklient/cloud/api'
+require 'date'
+require 'SecureRandom'
+
+describe 'GSLB' 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 be CRUDed' do
+    name = '!ruby_rspec-' + DateTime.now.strftime('%Y%m%d_%H%M%S') + '-' + SecureRandom.uuid[0, 8]
+  
+    #
+    puts 'GSLBを作成しています...'
+    gslb = @api.common_service_item.create_gslb("http", 10, true)
+    expect(gslb).to be_an_instance_of Saklient::Cloud::Resources::Gslb
+    gslb.path_to_check = '/index.html'
+    gslb.response_expected = 200
+    gslb.name = name
+    gslb.description = 'This is a test'
+    gslb.save
+    id = gslb.id.to_i
+    expect(id).to be > 0
+    expect(gslb.name).to eq name 
+    expect(gslb.servers.length).to eq 0
+    
+    gslb = @api.common_service_item.get_by_id(id)
+    expect(gslb.id.to_i).to eq id 
+    expect(gslb.path_to_check).to eq '/index.html'
+    expect(gslb.response_expected).to eq 200
+    expect(gslb.name).to eq name 
+    expect(gslb.servers.length).to eq 0
+    
+    server = gslb.add_server
+    server.enabled = true
+    server.weight = 10
+    server.ip_address = "49.212.82.90"
+    gslb.save
+    expect(gslb.servers.length).to eq 1
+
+    gslb = @api.common_service_item.get_by_id(id)
+    expect(gslb.servers.length).to eq 1
+    
+    puts 'GSLBを削除しています...'
+    gslb.destroy
+    
+    ok = false
+    begin
+      gslb = @api.common_service_item.get_by_id(id)
+    rescue Saklient::Errors::HttpNotFoundException
+      ok = true
+    end
+    fail 'GSLBが正しく削除されていません' unless ok
+    
+  end
+  
+  
+  
+  after do
+    @config = nil
+    @api = nil
+  end
+  
+  
+  
+end