saklient 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 888caa1a7e16911a83fc233a258817fe3fd23bf7
-  data.tar.gz: 9886629e6022f3c4a8ea5313fec7039e2f65999c
+  metadata.gz: 5c8d94e9f3de0cbb81a439c7ec8635499bd6847a
+  data.tar.gz: 01f810508d8cc60a666ebb3615876a087ed5a484
 SHA512:
-  metadata.gz: 59cd3006140c4e5c9afa72f6d8c287ede4c20eebf3f99925801ad6ab1623bc9e71dc01d988eab0691c6575b4bebbafbd28e04dbf491d444765c83a38a7092d73
-  data.tar.gz: dd0b47152232d3caae9e29aaa3cbe4043be34b6257851e9cc60fc897c03ba3fa0ce639bca43a2096000954b4e993803cc6466eaa680bd02c895ef62640bafa88
+  metadata.gz: 5506de61e5462b1677ff9bd122240501511fe247575008a8f7e523b7d301b12ee9682af102f6ca271c72020b91ceaa5fdba03a41e76c654ced1eddd0fae5e4fd
+  data.tar.gz: 6e7dd71ce64c6c2900d8cc6ea4b837d4be5c5b61143c13aed8f58da7e9027ceb9e2947ff7212b8aee2b06be1a3d2a83a1ce72dcccd7eba93257af116e3f52c4a

data/lib/saklient/cloud/client.rb

@@ -78,7 +78,7 @@ module Saklient
 
         extra_headers = {
           'Content-Type'     => 'application/x-www-form-urlencoded',
-          'User-Agent'       => 'saklient.ruby ver-0.0.8 rev-bab628f6f4c2a9d37b38c634b4a514cb66467939',
+          'User-Agent'       => 'saklient.ruby ver-0.0.9 rev-bab628f6f4c2a9d37b38c634b4a514cb66467939',
           'X-Requested-With' => 'XMLHttpRequest',
           'X-Sakura-HTTP-Method' => method,
           'X-Sakura-Error-Level' => 'warning',

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

@@ -51,6 +51,10 @@ module Saklient
         # @return [any]
         attr_accessor :m_raw_settings
 
+        # @private
+        # @return [String]
+        attr_accessor :m_raw_settings_hash
+
         # ステータスの生データ
         #
         # @return [any]
@@ -115,6 +119,13 @@ module Saklient
 
         protected
 
+        # @private
+        # @param [any] query
+        # @return [void]
+        def _on_before_save(query)
+          Saklient::Util::set_by_path(query, 'OriginalSettingsHash', get_raw_settings_hash)
+        end
+
         # @return [bool]
         attr_accessor :n_id
 
@@ -364,6 +375,29 @@ module Saklient
 
         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_raw_status
 
@@ -453,6 +487,13 @@ module Saklient
             @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, 'Status')
             @m_raw_status = Saklient::Util::get_by_path(r, 'Status')
           else
@@ -487,6 +528,7 @@ module Saklient
           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
           Saklient::Util::set_by_path(ret, 'CommonServiceProvider', withClean ? ((@m_provider).nil? ? nil : @m_provider.api_serialize(withClean)) : ((@m_provider).nil? ? { ID: '0' } : @m_provider.api_serialize_id)) if withClean || @n_provider
           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, 'Status', @m_raw_status) if withClean || @n_raw_status
           raise Saklient::Errors::SaklientException.new('required_field', 'Required fields must be set before the CommonServiceItem creation: ' + missing.join(', ')) if missing.length > 0
           return ret

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

@@ -122,6 +122,42 @@ module Saklient
 
         protected
 
+        # @private
+        # @return [String]
+        attr_accessor :_sorry_server
+
+        public
+
+        # @private
+        # @return [String]
+        def get_sorry_server
+          return @_sorry_server
+        end
+
+        # @private
+        # @param [String] v
+        # @return [String]
+        def set_sorry_server(v)
+          Saklient::Util::validate_type(v, 'String')
+          @_sorry_server = v
+          return @_sorry_server
+        end
+
+        # ソーリーサーバ
+        #
+        # @return [String]
+        attr_accessor :sorry_server
+
+        def sorry_server
+          get_sorry_server
+        end
+
+        def sorry_server=(v)
+          set_sorry_server(v)
+        end
+
+        protected
+
         # @private
         # @return [Array<LbServer>]
         attr_accessor :_servers
@@ -167,6 +203,14 @@ module Saklient
           @_delay_loop = nil
           @_delay_loop = (delayLoop).to_s().to_i(10) if !(delayLoop).nil?
           @_delay_loop = nil if @_delay_loop == 0
+          sorryServer = Saklient::Util::get_by_path_any([obj], [
+            'SorryServer',
+            'sorryServer',
+            'sorry_server',
+            'sorryserver'
+          ])
+          @_sorry_server = nil
+          @_sorry_server = sorryServer if !(sorryServer).nil?
           @_servers = []
           serversDyn = Saklient::Util::get_by_path_any([obj], ['Servers', 'servers'])
           if !(serversDyn).nil?
@@ -197,6 +241,7 @@ module Saklient
             VirtualIPAddress: @_virtual_ip_address,
             Port: @_port,
             DelayLoop: @_delay_loop,
+            SorryServer: @_sorry_server,
             Servers: servers
           }
         end

data/lib/saklient/version.rb

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

data/spec/loadbalancer_spec.rb

@@ -151,11 +151,13 @@ describe 'LoadBalancer' do
     vip2Ip     = IPAddr.new(IPAddr.new(net.default_route).to_i + 10, Socket::AF_INET).to_s
     vip2SrvIp1 = IPAddr.new(IPAddr.new(net.default_route).to_i + 11, Socket::AF_INET).to_s
     vip2SrvIp2 = IPAddr.new(IPAddr.new(net.default_route).to_i + 12, Socket::AF_INET).to_s
+    vip2SrvIp3 = IPAddr.new(IPAddr.new(net.default_route).to_i + 13, Socket::AF_INET).to_s
     
     vip2 = lb.add_virtual_ip
     vip2.virtual_ip_address = vip2Ip
     vip2.port = 80
     vip2.delay_loop = 15
+    vip2.sorry_server = vip2SrvIp3
     vip2Srv1 = vip2.add_server
     vip2Srv1.enabled = true
     vip2Srv1.ip_address = vip2SrvIp1
@@ -173,6 +175,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].sorry_server).to be_nil
     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
@@ -189,6 +192,7 @@ describe 'LoadBalancer' do
     expect(lb.virtual_ips[0].servers[2].port).to eq 80
     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].sorry_server).to eq vip2SrvIp3
     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
@@ -214,10 +218,12 @@ describe 'LoadBalancer' do
     lb.reload
     
     expect(lb.virtual_ips.length).to eq 2
+    expect(lb.virtual_ips[0].sorry_server).to be_nil
     expect(lb.virtual_ips[0].servers.length).to eq 4
     expect(lb.virtual_ips[0].servers[3].ip_address).to eq vip1SrvIp4
     expect(lb.virtual_ips[0].servers[3].port).to eq 80
     expect(lb.virtual_ips[0].servers[3].protocol).to eq 'ping'
+    expect(lb.virtual_ips[1].sorry_server).to eq vip2SrvIp3
     expect(lb.virtual_ips[1].servers.length).to eq 2
     
     

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saklient
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - townewgokgok
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-09 00:00:00.000000000 Z
+date: 2016-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec