saklient 0.0.2.6 → 0.0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4452225f5c19ef63758c70c0332415d3a0a9bc71
-  data.tar.gz: 34c349f3d12de616bafe96305381a11e7de963a2
+  metadata.gz: 3fc3dcacb443ef9fb88e18864b25b6e983233659
+  data.tar.gz: 1cc5f3a9323e2634ca191c523bb0975c62b6ce4b
 SHA512:
-  metadata.gz: 8948ac21bbcd87ad1b0a6330dc6acaadc48acb87b926286eba3710a3651451ab6809badd44c26140cebf6a34fd2f7215c7774d12c5463630beda7e17f0b9a001
-  data.tar.gz: 1f57759c4078a35ed822a89b57967e2e785dae3eed4be9b16a1f0a345a476551dec75ef5dff44cdceecbf8381a7e05450cb3da454f9ec6f0f51fa2e41b0581e4
+  metadata.gz: 8ee4c6080b8ea97b6fc138d99b51d83aaef7473d47efec2ac696869cc18e336c5a4a47fefc16ffd8de49c19af1a27bcaaa70f7d079a51686d5ae97f26e8d2230
+  data.tar.gz: 13b55667084a18e62dc41441f751592da315998aba2975af3c9507589c51e5e7031fae5dfa4d5e3fd033673ecea8a32155fe6ac3889c76ac388f11267e390487

data/.gitignore

@@ -19,3 +19,5 @@ config.sh
 testok
 .project
 .settings
+vendor
+

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.6 rev-ea935ca9d640e87509db882d9fd06ec2bf75fe23',
+          'User-Agent'       => 'saklient.ruby ver-0.0.2.7 rev-3f3b3b7ce4b10e7ebcd77c17497763ba558bf424',
           'X-Requested-With' => 'XMLHttpRequest',
           'X-Sakura-HTTP-Method' => method,
           'X-Sakura-Error-Level' => 'warning',

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

@@ -3,6 +3,7 @@
 require_relative '../client'
 require_relative 'resource'
 require_relative 'swytch'
+require_relative 'ipv4_range'
 
 module Saklient
   module Cloud
@@ -38,6 +39,29 @@ module Saklient
         # @return [String]
         attr_accessor :m_next_hop
 
+        # @private
+        # @return [Ipv4Range]
+        attr_accessor :_range
+
+        public
+
+        # @private
+        # @return [Ipv4Range]
+        def get_range
+          return @_range
+        end
+
+        # 利用可能なIPアドレス範囲
+        #
+        # @return [Ipv4Range]
+        attr_reader :range
+
+        def range
+          get_range
+        end
+
+        protected
+
         # @private
         # @return [String]
         def _api_path
@@ -90,6 +114,16 @@ module Saklient
 
         protected
 
+        # @private
+        # @param [any] r
+        # @param [any] root
+        # @return [void]
+        def _on_after_api_deserialize(r, root)
+          @_range = nil
+          addresses = r[:IPAddresses]
+          @_range = Saklient::Cloud::Resources::Ipv4Range.new(addresses) if !(addresses).nil?
+        end
+
         # @return [bool]
         attr_accessor :n_id
 

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

@@ -0,0 +1,106 @@
+# -*- encoding: UTF-8 -*-
+
+require_relative '../../util'
+
+module Saklient
+  module Cloud
+    module Resources
+
+      # IPv4ネットワークのIPアドレス範囲.
+      class Ipv4Range
+
+        protected
+
+        # @private
+        # @return [String]
+        attr_accessor :_first
+
+        public
+
+        # @private
+        # @return [String]
+        def get_first
+          return @_first
+        end
+
+        # 開始アドレス
+        #
+        # @return [String]
+        attr_reader :first
+
+        def first
+          get_first
+        end
+
+        protected
+
+        # @private
+        # @return [String]
+        attr_accessor :_last
+
+        public
+
+        # @private
+        # @return [String]
+        def get_last
+          return @_last
+        end
+
+        # 終了アドレス
+        #
+        # @return [String]
+        attr_reader :last
+
+        def last
+          get_last
+        end
+
+        protected
+
+        # @private
+        # @return [Array<String>]
+        attr_accessor :_as_array
+
+        public
+
+        # @private
+        # @return [Array<String>]
+        def get_as_array
+          ret = []
+          i = Saklient::Util::ip2long(@_first)
+          i1 = Saklient::Util::ip2long(@_last)
+          while i <= i1 do
+            ret << Saklient::Util::long2ip(i)
+            i += 1
+          end
+          return ret
+        end
+
+        # この範囲に属するIPv4アドレスの一覧を取得します.
+        #
+        # @return [Array<String>]
+        attr_reader :as_array
+
+        def as_array
+          get_as_array
+        end
+
+        # @private
+        # @param [any] obj
+        def initialize(obj = nil)
+          obj = {} if (obj).nil?
+          first = Saklient::Util::get_by_path_any([obj], ['Min', 'min'])
+          @_first = nil
+          @_first = first if !(first).nil?
+          @_first = nil if @_first == ''
+          last = Saklient::Util::get_by_path_any([obj], ['Max', 'max'])
+          @_last = nil
+          @_last = last if !(last).nil?
+          @_last = nil if @_last == ''
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -215,7 +215,7 @@ module Saklient
           r = api_serialize
           query = @_query
           @_query = {}
-          keys = query.keys
+          keys = query.keys.map{|k| k.to_s}
           for k in keys
             v = query[k.to_sym]
             r[k.to_sym] = v

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

@@ -207,6 +207,57 @@ module Saklient
 
         protected
 
+        # @private
+        # @return [any]
+        def _used_ipv4_address_hash
+          filter = {}
+          filter[('Switch' + '.ID').to_sym] = _id
+          query = {}
+          Saklient::Util::set_by_path(query, 'Count', 0)
+          Saklient::Util::set_by_path(query, 'Filter', filter)
+          Saklient::Util::set_by_path(query, 'Include', ['IPAddress', 'UserIPAddress'])
+          result = @_client.request('GET', '/interface', query)
+          return nil if (result).nil?
+          result = result[:Interfaces]
+          return nil if (result).nil?
+          ifaces = result
+          return nil if (ifaces).nil?
+          found = {}
+          for iface in ifaces
+            ip = iface[:IPAddress]
+            userIp = iface[:UserIPAddress]
+            ip = userIp if (ip).nil?
+            found[ip.to_sym] = true if !(ip).nil?
+          end
+          return found
+        end
+
+        public
+
+        # このルータ＋スイッチに接続中のインタフェースに割り当てられているIPアドレスを収集します.
+        #
+        # @return [Array<String>]
+        def collect_used_ipv4_addresses
+          found = _used_ipv4_address_hash
+          return found.keys.map{|k| k.to_s}.sort()
+        end
+
+        # このルータ＋スイッチで利用できる未使用のIPアドレスを収集します.
+        #
+        # @return [Array<String>]
+        def collect_unused_ipv4_addresses
+          nets = get_ipv4_nets
+          return nil if nets.length < 1
+          used = _used_ipv4_address_hash
+          ret = []
+          for ip in nets[0].range.as_array
+            ret << ip if !(!used.nil? && used.key?(ip.to_sym))
+          end
+          return ret.sort()
+        end
+
+        protected
+
         # @return [bool]
         attr_accessor :n_id
 

data/lib/saklient/util.rb

@@ -78,7 +78,7 @@ module Saklient
       raise Exception.new('Could not create class instance of ' + classPath) if (ret).nil?
       return ret
     end
-
+    
     # @param [String] s
     # @return [NativeDate]
     def self.str2date(s)
@@ -93,6 +93,35 @@ module Saklient
       return d.to_s
     end
 
+    # @param [String] ip
+    # @return [Integer]
+    def self.ip2long(s)
+      return nil unless s.is_a? String
+      return nil unless /^\d+\.\d+\.\d+\.\d+$/.match(s)
+      ret = 0
+      s.split(/\./).each{|o|
+        v = o.to_i
+        ret = nil unless 0<=v && v<=255
+        ret = ret<<8 | v if !ret.nil?
+      }
+      return ret
+    end
+    
+    # @param [Integer] long
+    # @return [String]
+    def self.long2ip(v)
+      v = v.to_i if v.is_a? String
+      return nil unless v.is_a? Integer
+      ret = []
+      v += (1<<32) if v<0
+      4.times{||
+        ret.unshift(v & 255)
+        v >>= 8
+      }
+      return nil if v != 0
+      return ret.join(".")
+    end
+    
     # @param [String] s
     # @return [String]
     def self.url_encode(s)

data/lib/saklient/version.rb

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

data/spec/ipv4net_spec.rb

@@ -0,0 +1,61 @@
+$: << File.dirname(__dir__) + '/lib'
+require 'saklient/util'
+require 'saklient/cloud/api'
+
+describe 'Ipv4Net' 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 access objects by path' do
+    
+    @api.router.find.each{|router|
+      router.get_swytch.ipv4_nets.each{|net|
+        if !net.range.nil?
+          p net.range.first
+          p net.range.last
+          # p net.range.as_array
+        end
+      }
+      p router.get_swytch.collect_used_ipv4_addresses
+      p router.get_swytch.collect_unused_ipv4_addresses
+      p
+    }
+    
+  end
+  
+  
+  
+end

data/spec/router_spec.rb

@@ -45,6 +45,9 @@ describe 'Router' do
     name = '!ruby_rspec-' + DateTime.now.strftime('%Y%m%d_%H%M%S') + '-' + SecureRandom.uuid[0, 8]
     description = 'This instance was created by saklient.ruby rspec'
     mask_len = 28
+    mask_len_cnt = 1<<32-mask_len
+    sroute_mask_len = 28
+    sroute_mask_len_cnt = 1<<32-sroute_mask_len
   
     #
     swytch = nil
@@ -77,8 +80,38 @@ describe 'Router' do
     end
     
     expect(swytch).to be_an_instance_of Saklient::Cloud::Resources::Swytch
-    expect(swytch.ipv4_nets.length).to be > 0
+    expect(swytch.ipv4_nets.length).to eq 1
     expect(swytch.ipv4_nets[0]).to be_an_instance_of Saklient::Cloud::Resources::Ipv4Net
+    expect(swytch.ipv4_nets[0].range.as_array.length).to eq mask_len_cnt-5
+    expect(swytch.collect_used_ipv4_addresses.length).to eq 0
+    expect(swytch.collect_unused_ipv4_addresses.length).to eq mask_len_cnt-5
+    
+    #
+    puts 'サーバを作成しています...'
+    server = @api.server.create
+    expect(server).to be_an_instance_of Saklient::Cloud::Resources::Server
+    server.name = name
+    server.description = description
+    server.plan = @api.product.server.get_by_spec(1, 1)
+    server.save
+    expect(server.id.to_i).to be > 0
+     
+    #
+    puts 'インタフェースを増設しています...'
+    iface = server.add_iface()
+    expect(iface).to be_an_instance_of Saklient::Cloud::Resources::Iface
+    expect(iface.id.to_i).to be > 0
+    
+    #
+    puts 'インタフェースをルータ＋スイッチに接続しています...'
+    iface.connect_to_swytch(swytch)
+    
+    #
+    puts 'インタフェースにIPアドレスを設定しています...'
+    iface.user_ip_address = swytch.ipv4_nets[0].range.as_array[1]
+    iface.save
+    expect(swytch.collect_used_ipv4_addresses.length).to eq 1
+    expect(swytch.collect_unused_ipv4_addresses.length).to eq mask_len_cnt-6
     
     #
     puts 'ルータ＋スイッチの帯域プランを変更しています...'
@@ -87,15 +120,20 @@ describe 'Router' do
     expect(swytch.router.id).not_to eq router_id_before
     
     #
-    if 0 < swytch.ipv6_nets.length then
-      puts 'ルータ＋スイッチからIPv6ネットワークの割当を解除しています...'
-      swytch.remove_ipv6_net
-    end
     puts 'ルータ＋スイッチにIPv6ネットワークを割り当てています...'
     v6net = swytch.add_ipv6_net
     expect(v6net).to be_an_instance_of Saklient::Cloud::Resources::Ipv6Net
     expect(swytch.ipv6_nets.length).to eq 1
     
+    #
+    puts 'ルータ＋スイッチにスタティックルートを割り当てています...'
+    net0 = swytch.ipv4_nets[0]
+    next_hop = IPAddr.new(IPAddr.new(net0.address).to_i + 4, Socket::AF_INET).to_s
+    sroute = swytch.add_static_route(sroute_mask_len, next_hop)
+    expect(sroute).to be_an_instance_of Saklient::Cloud::Resources::Ipv4Net
+    expect(swytch.ipv4_nets.length).to eq 2
+    expect(swytch.ipv4_nets[1].range.as_array.length).to eq sroute_mask_len_cnt
+    
     #
     (swytch.ipv4_nets.length - 1).downto(1) do |i|
       puts 'ルータ＋スイッチからスタティックルートの割当を解除しています...'
@@ -103,12 +141,17 @@ describe 'Router' do
       swytch.remove_static_route(net)
     end
     
-    puts 'ルータ＋スイッチにスタティックルートを割り当てています...'
-    net0 = swytch.ipv4_nets[0]
-    next_hop = IPAddr.new(IPAddr.new(net0.address).to_i + 4, Socket::AF_INET).to_s
-    sroute = swytch.add_static_route(28, next_hop)
-    expect(sroute).to be_an_instance_of Saklient::Cloud::Resources::Ipv4Net
-    expect(swytch.ipv4_nets.length).to eq 2
+    #
+    if 0 < swytch.ipv6_nets.length then
+      puts 'ルータ＋スイッチからIPv6ネットワークの割当を解除しています...'
+      swytch.remove_ipv6_net
+    end
+
+    #
+    puts 'サーバを削除しています...'
+    server.destroy
+    
+    #
     
   end
   

data/spec/swytch_spec.rb

@@ -46,7 +46,7 @@ describe 'Swytch' do
     description = 'This instance was created by saklient.ruby rspec'
   
     #
-    puts 'ルータ＋スイッチを作成しています...'
+    puts 'スイッチを作成しています...'
     swytch = @api.swytch.create
     swytch.name = name
     swytch.description = description

data/spec/util_spec.rb

@@ -67,6 +67,34 @@ describe 'Util' do
     end
     fail '未定義または読み取り専用フィールドへのset時は NoMethodError がスローされなければなりません' unless ok
     
+    #
+    expect(Util::ip2long('0.0.0.0')).to eq 0
+    expect(Util::ip2long('127.255.255.255')).to eq 0x7FFFFFFF
+    expect(Util::ip2long('128.0.0.0')).to eq 0x80000000
+    expect(Util::ip2long('255.255.255.255')).to eq 0xFFFFFFFF
+    expect(Util::ip2long('222.173.190.239')).to eq 0xDEADBEEF
+    #
+    expect(Util::long2ip(0)).to eq '0.0.0.0'
+    expect(Util::long2ip(0x7FFFFFFF)).to eq '127.255.255.255'
+    expect(Util::long2ip(0x80000000)).to eq '128.0.0.0'
+    expect(Util::long2ip(0xFFFFFFFF)).to eq '255.255.255.255'
+    expect(Util::long2ip(0xDEADBEEF)).to eq '222.173.190.239'
+    expect(Util::long2ip(Util::ip2long('127.255.255.255') + 1)).to eq '128.0.0.0'
+    #
+    expect(Util::ip2long(nil)).to be_nil
+    expect(Util::ip2long(0)).to be_nil
+    expect(Util::ip2long('')).to be_nil
+    expect(Util::ip2long('x')).to be_nil
+    expect(Util::ip2long('0.0.0')).to be_nil
+    expect(Util::ip2long('0.0.0.x')).to be_nil
+    expect(Util::ip2long('0.0.0.0.0')).to be_nil
+    expect(Util::ip2long('255.255.255.256')).to be_nil
+    expect(Util::ip2long('256.255.255.255')).to be_nil
+    expect(Util::long2ip(nil)).to be_nil
+    expect(Util::long2ip('0')).to eq '0.0.0.0'
+    expect(Util::long2ip(Util::ip2long('0.0.0.0') - 1)).to eq '255.255.255.255'
+    expect(Util::long2ip(Util::ip2long('255.255.255.255') + 1)).to be_nil
+    
   end
   
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saklient
 version: !ruby/object:Gem::Version
-  version: 0.0.2.6
+  version: 0.0.2.7
 platform: ruby
 authors:
 - townewgokgok
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-10 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -198,6 +198,7 @@ files:
 - lib/saklient/cloud/resources/icon.rb
 - lib/saklient/cloud/resources/iface.rb
 - lib/saklient/cloud/resources/ipv4_net.rb
+- lib/saklient/cloud/resources/ipv4_range.rb
 - lib/saklient/cloud/resources/ipv6_net.rb
 - lib/saklient/cloud/resources/iso_image.rb
 - lib/saklient/cloud/resources/lb_server.rb
@@ -256,6 +257,7 @@ files:
 - spec/bridge_spec.rb
 - spec/enum_spec.rb
 - spec/exception_spec.rb
+- spec/ipv4net_spec.rb
 - spec/iso_image_spec.rb
 - spec/license_spec.rb
 - spec/loadbalancer_spec.rb
@@ -293,6 +295,7 @@ test_files:
 - spec/bridge_spec.rb
 - spec/enum_spec.rb
 - spec/exception_spec.rb
+- spec/ipv4net_spec.rb
 - spec/iso_image_spec.rb
 - spec/license_spec.rb
 - spec/loadbalancer_spec.rb
@@ -300,4 +303,3 @@ test_files:
 - spec/server_spec.rb
 - spec/swytch_spec.rb
 - spec/util_spec.rb
-has_rdoc: