saklient 0.0.2.9 → 0.0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ab63f76a21266e18fe5466381967948027fea9d
-  data.tar.gz: 0d9d5dd5a860dc56b56fd6d908d4584fedb87007
+  metadata.gz: b8f956480d46ba84627c6bacddbb2c8acada65f3
+  data.tar.gz: 0058a8cc91a28f7cd58915d10755fea2a892ec01
 SHA512:
-  metadata.gz: c360db4cb3446c9287a06213db05116f1572e0b68170aa50e1487af129a1276ec1f06bb35d8cb51d5d6a9d0ed056f7c9d0ba720cdd41a6d77156b6bac3b0f2f2
-  data.tar.gz: 36a984cb53f0f9eb7fe9fe610da771bdc4bbeca57328c69e671d37d55ad6ab18b77d627874082ed5a36d93ebe81a64506fd4420a46daff0ccfbd826752a413cc
+  metadata.gz: 2987aeb3168cf685611a043fa9297bc5a92bc3b2b9a54f6bdf14c0f8dd6cb4e81db13511037284cf85c1a09fed2c8e49ff13fe944c8ef517439b9e1ee25662db
+  data.tar.gz: ffb11239467def0c4725a4c446e90f744ccc6eac9b195676eac687b512063ca1a981078cb08606b7431fc1b890a421eefa8e2bd5d0fce9efdf8b0951df2cfd4d

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.9 rev-ba6f656e7fdf2e344bc279593970d0d325ad25dd',
+          'User-Agent'       => 'saklient.ruby ver-0.0.2.10 rev-ba6f656e7fdf2e344bc279593970d0d325ad25dd',
           'X-Requested-With' => 'XMLHttpRequest',
           'X-Sakura-HTTP-Method' => method,
           'X-Sakura-Error-Level' => 'warning',

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

@@ -2,6 +2,7 @@
 
 # This code is automatically transpiled by Saklient Translator
 
+require_relative '../../errors/http_exception'
 require_relative '../../errors/saklient_exception'
 require_relative '../client'
 require_relative 'resource'
@@ -221,7 +222,11 @@ module Saklient
           Saklient::Util::validate_type(timeoutSec, 'Fixnum')
           step = 10
           while 0 < timeoutSec do
-            reload
+            begin
+              reload
+            rescue Saklient::Errors::HttpException
+              {}
+            end
             a = get_availability
             return true if a == Saklient::Cloud::Enums::EAvailability::available
             timeoutSec = 0 if a != Saklient::Cloud::Enums::EAvailability::migrating
@@ -262,7 +267,11 @@ module Saklient
           Saklient::Util::validate_type(timeoutSec, 'Fixnum')
           step = 10
           while 0 < timeoutSec do
-            reload
+            begin
+              reload
+            rescue Saklient::Errors::HttpException
+              {}
+            end
             s = get_status
             s = Saklient::Cloud::Enums::EServerInstanceStatus::down if (s).nil?
             return true if s == status

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

@@ -10,6 +10,7 @@ require_relative 'disk_plan'
 require_relative 'server'
 require_relative '../enums/escope'
 require_relative '../enums/eavailability'
+require_relative '../../errors/http_exception'
 require_relative '../../errors/saklient_exception'
 
 module Saklient
@@ -334,7 +335,11 @@ module Saklient
           Saklient::Util::validate_type(timeoutSec, 'Fixnum')
           step = 3
           while 0 < timeoutSec do
-            reload
+            begin
+              reload
+            rescue Saklient::Errors::HttpException
+              {}
+            end
             a = get_availability
             return true if a == Saklient::Cloud::Enums::EAvailability::available
             timeoutSec = 0 if a != Saklient::Cloud::Enums::EAvailability::migrating

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

@@ -3,6 +3,7 @@
 # This code is automatically transpiled by Saklient Translator
 
 require_relative '../../errors/saklient_exception'
+require_relative '../../errors/http_exception'
 require_relative '../client'
 require_relative 'resource'
 require_relative 'icon'
@@ -328,7 +329,11 @@ module Saklient
           Saklient::Util::validate_type(timeoutSec, 'Fixnum')
           step = 10
           while 0 < timeoutSec do
-            reload
+            begin
+              reload
+            rescue Saklient::Errors::HttpException
+              {}
+            end
             a = get_availability
             return true if a == Saklient::Cloud::Enums::EAvailability::available
             timeoutSec = 0 if a != Saklient::Cloud::Enums::EAvailability::migrating

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

@@ -13,6 +13,42 @@ module Saklient
 
         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
@@ -247,6 +283,9 @@ module Saklient
             'health_check',
             'health'
           ])
+          enabled = Saklient::Util::get_by_path_any([obj], ['Enabled', 'enabled'])
+          @_enabled = nil
+          @_enabled = enabled if !(enabled).nil?
           @_ip_address = Saklient::Util::get_by_path_any([obj], [
             'IPAddress',
             'ipAddress',
@@ -280,6 +319,7 @@ module Saklient
         # @return [any]
         def to_raw_settings
           return {
+            Enabled: @_enabled,
             IPAddress: @_ip_address,
             Port: @_port,
             HealthCheck: {

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

@@ -2,6 +2,7 @@
 
 # This code is automatically transpiled by Saklient Translator
 
+require_relative '../../errors/http_exception'
 require_relative '../../errors/saklient_exception'
 require_relative '../client'
 require_relative 'resource'
@@ -166,9 +167,13 @@ module Saklient
           Saklient::Util::validate_type(timeoutSec, 'Fixnum')
           step = 3
           while 0 < timeoutSec do
-            if exists
-              reload
-              return true
+            begin
+              if exists
+                reload
+                return true
+              end
+            rescue Saklient::Errors::HttpException
+              {}
             end
             timeoutSec -= step
             sleep(step) if 0 < timeoutSec

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

@@ -2,6 +2,7 @@
 
 # This code is automatically transpiled by Saklient Translator
 
+require_relative '../../errors/http_exception'
 require_relative '../../errors/saklient_exception'
 require_relative '../client'
 require_relative 'resource'
@@ -241,7 +242,11 @@ module Saklient
           Saklient::Util::validate_type(timeoutSec, 'Fixnum')
           step = 10
           while 0 < timeoutSec do
-            reload
+            begin
+              reload
+            rescue Saklient::Errors::HttpException
+              {}
+            end
             s = nil
             inst = self.instance
             s = inst.status if !(inst).nil?

data/lib/saklient/version.rb

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

data/spec/archive_spec.rb

@@ -78,6 +78,7 @@ describe 'Archive' do
     cmd += "set ftp:ssl-force true;"
     cmd += "set ftp:ssl-protect-data true;"
     cmd += "set ftp:ssl-protect-list true;"
+    cmd += "set ssl:verify-certificate no;"
     cmd += "put #{path};"
     cmd += "exit"
     cmd = "lftp -u #{ftp2.user},#{ftp2.password} -p 21 -e '#{cmd}' #{ftp2.host_name}"

data/spec/iso_image_spec.rb

@@ -78,6 +78,7 @@ describe 'IsoImage' do
     cmd += "set ftp:ssl-force true;"
     cmd += "set ftp:ssl-protect-data true;"
     cmd += "set ftp:ssl-protect-list true;"
+    cmd += "set ssl:verify-certificate no;"
     cmd += "put #{path};"
     cmd += "exit"
     cmd = "lftp -u #{ftp2.user},#{ftp2.password} -p 21 -e '#{cmd}' #{ftp2.host_name}"

data/spec/loadbalancer_spec.rb

@@ -1,4 +1,5 @@
 $: << File.dirname(__dir__) + '/lib'
+require 'saklient/version'
 require 'saklient/cloud/api'
 require 'date'
 require 'SecureRandom'
@@ -48,6 +49,8 @@ describe 'LoadBalancer' do
     description = 'This instance was created by saklient.ruby rspec'
     tag = 'saklient-test'
     
+    puts 'Saklient::VERSION = ' + Saklient::VERSION.to_s
+    
     
     
     # create a LB
@@ -154,12 +157,14 @@ describe 'LoadBalancer' do
     vip2.port = 80
     vip2.delay_loop = 15
     vip2Srv1 = vip2.add_server
+    vip2Srv1.enabled = true
     vip2Srv1.ip_address = vip2SrvIp1
     vip2Srv1.port = 80
     vip2Srv1.protocol = 'http'
     vip2Srv1.path_to_check = '/index.html'
     vip2Srv1.response_expected = 200
     vip2Srv2 = vip2.add_server
+    vip2Srv2.enabled = false
     vip2Srv2.ip_address = vip2SrvIp2
     vip2Srv2.port = 80
     vip2Srv2.protocol = 'tcp'
@@ -169,6 +174,7 @@ describe 'LoadBalancer' do
     expect(lb.virtual_ips.length).to eq 2
     expect(lb.virtual_ips[0].virtual_ip_address).to eq vip1Ip
     expect(lb.virtual_ips[0].servers.length).to eq 3
+    expect(lb.virtual_ips[0].servers[0].enabled).to be_nil
     expect(lb.virtual_ips[0].servers[0].ip_address).to eq vip1SrvIp1
     expect(lb.virtual_ips[0].servers[0].port).to eq 80
     expect(lb.virtual_ips[0].servers[0].protocol).to eq 'http'
@@ -184,11 +190,13 @@ describe 'LoadBalancer' do
     expect(lb.virtual_ips[0].servers[2].protocol).to eq 'tcp'
     expect(lb.virtual_ips[1].virtual_ip_address).to eq vip2Ip
     expect(lb.virtual_ips[1].servers.length).to eq 2
+    expect(lb.virtual_ips[1].servers[0].enabled).to be_truthy
     expect(lb.virtual_ips[1].servers[0].ip_address).to eq vip2SrvIp1
     expect(lb.virtual_ips[1].servers[0].port).to eq 80
     expect(lb.virtual_ips[1].servers[0].protocol).to eq 'http'
     expect(lb.virtual_ips[1].servers[0].path_to_check).to eq '/index.html'
     expect(lb.virtual_ips[1].servers[0].response_expected).to eq 200
+    expect(lb.virtual_ips[1].servers[1].enabled).to be_falsy
     expect(lb.virtual_ips[1].servers[1].ip_address).to eq vip2SrvIp2
     expect(lb.virtual_ips[1].servers[1].port).to eq 80
     expect(lb.virtual_ips[1].servers[1].protocol).to eq 'tcp'
@@ -227,7 +235,7 @@ describe 'LoadBalancer' do
         print ' answers'
         printf ' %d', server.response_expected if server.response_expected
         print "\n"
-        expect(server.status).to eq 'down'
+        # expect(server.status).to eq 'down'
       end
     end
     

data/spec/server_spec.rb

@@ -80,7 +80,7 @@ describe 'Server' do
     # options
     additional_ssh_public_key = File.open(ENV['HOME'] + '/.ssh/id_rsa.pub').read.strip
     tests_disk_expansion = false
-    breaks_after_server_up = true
+    breaks_after_server_up = false
     
     # search archives
     puts 'searching archives...'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saklient
 version: !ruby/object:Gem::Version
-  version: 0.0.2.9
+  version: 0.0.2.10
 platform: ruby
 authors:
 - townewgokgok
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-03 00:00:00.000000000 Z
+date: 2015-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec