saklient 0.0.2.2 → 0.0.2.3

data/lib/saklient/version.rb

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

data/spec/archive_spec.rb

@@ -106,6 +106,7 @@ describe 'Archive' do
     disk.description = description
     disk.tags = [tag]
     disk.size_gib = 20
+    disk.plan = @api.product.disk.ssd
     disk.save
     
     archive = @api.archive.create

data/spec/bridge_spec.rb

@@ -0,0 +1,78 @@
+$: << File.dirname(__dir__) + '/lib'
+require 'saklient/cloud/api'
+require 'date'
+require 'SecureRandom'
+
+describe 'Bridge' 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]
+    description = 'This instance was created by saklient.ruby rspec'
+  
+    #
+    puts 'リージョンを検索しています...'
+    regions = @api.facility.region.with_name_like('石狩').find
+    for region in regions do
+      expect(region).to be_an_instance_of Saklient::Cloud::Resources::Region
+    end
+    
+    puts 'ブリッジを作成しています...'
+    bridge = @api.bridge.create
+    bridge.name = name
+    bridge.description = description
+    bridge.region = regions[0]
+    bridge.save
+    
+    expect(bridge).to be_an_instance_of Saklient::Cloud::Resources::Bridge
+    
+    #
+    puts 'ブリッジを削除しています...'
+    bridge.destroy
+    
+  end
+  
+  
+  
+  after do
+    @config = nil
+    @api = nil
+  end
+  
+  
+  
+end

data/spec/exception_spec.rb

@@ -1,5 +1,5 @@
 $: << File.dirname(__dir__) + '/lib'
-require 'saklient/cloud/errors/exception_factory'
+require 'saklient/errors/exception_factory'
 
 ExceptionFactory = Saklient::Errors::ExceptionFactory
 HttpException = Saklient::Errors::HttpException

data/spec/iso_image_spec.rb

@@ -104,7 +104,7 @@ describe 'IsoImage' do
     # search iso images
     puts 'searching iso images...'
     isos = @api.iso_image.
-      with_name_like('CentOS 6.5 64bit').
+      with_name_like('CentOS 64bit').
       with_shared_scope.
       limit(1).
       find

data/spec/license_spec.rb

@@ -0,0 +1,73 @@
+$: << File.dirname(__dir__) + '/lib'
+require 'saklient/cloud/api'
+require 'date'
+require 'SecureRandom'
+
+describe 'License' 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 'ライセンス種別情報を検索しています...'
+    infos = @api.product.license.with_name_like('Office').find
+    for info in infos do
+      expect(info).to be_an_instance_of Saklient::Cloud::Resources::LicenseInfo
+    end
+    
+    puts 'ライセンスを作成しています...'
+    license = @api.license.create
+    license.name = name
+    license.info = infos[0]
+    license.save
+      
+    puts 'ライセンスを削除しています...'
+    license.destroy
+    
+  end
+  
+  
+  
+  after do
+    @config = nil
+    @api = nil
+  end
+  
+  
+  
+end

data/spec/loadbalancer_spec.rb

@@ -8,7 +8,8 @@ describe 'LoadBalancer' do
   
   
 	
-  TESTS_CONFIG_READYMADE_LB_ID = '112600809060'
+  TESTS_CONFIG_READYMADE_LB_ID = nil #'112600809060'
+  TESTS_CONFIG_READYMADE_SWYTCH_ID = '112500447075' #'112600553094'
   
   before do
     
@@ -55,9 +56,9 @@ describe 'LoadBalancer' do
       
       # search a switch
       puts 'searching a swytch...'
-      swytches = @api.swytch.with_tag('lb-attached').limit(1).find()
-      expect(swytches.length).to be > 0
-      swytch = swytches[0]
+      swytch = @api.swytch.get_by_id(TESTS_CONFIG_READYMADE_SWYTCH_ID)
+      # expect(swytches.length).to be > 0
+      # swytch = swytches[0]
       expect(swytch).to be_an_instance_of Saklient::Cloud::Resources::Swytch
       expect(swytch.ipv4_nets.length).to be > 0
       net = swytch.ipv4_nets[0]
@@ -66,7 +67,9 @@ describe 'LoadBalancer' do
       # create a loadbalancer
       puts 'creating a LB...'
       vrid = 123
-      lb = @api.appliance.create_load_balancer(swytch, vrid, ['133.242.255.244', '133.242.255.245'], true)
+      real_ip1 = IPAddr.new(IPAddr.new(net.default_route).to_i + 3, Socket::AF_INET).to_s
+      real_ip2 = IPAddr.new(IPAddr.new(net.default_route).to_i + 4, Socket::AF_INET).to_s
+      lb = @api.appliance.create_load_balancer(swytch, vrid, [real_ip1, real_ip2], true)
       
       ok = false
       begin

data/spec/server_spec.rb

@@ -78,9 +78,11 @@ describe 'Server' do
     
     # search archives
     puts 'searching archives...'
-    archives = @api.archive.with_name_like('CentOS 6.5 64bit').with_size_gib(20).with_shared_scope.limit(1).find
+    archives = @api.archive.with_name_like('CentOS 64bit').with_size_gib(20).with_shared_scope.limit(1).find
+    expect(archives.length).to be > 0
     # printf "found %d archive(s)\n", archives.length
     archive = archives[0]
+    expect(archive.id.to_i).to be > 0
     # p archive.dump
     
     # search scripts

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saklient
 version: !ruby/object:Gem::Version
-  version: 0.0.2.2
+  version: 0.0.2.3
 platform: ruby
 authors:
 - townewgokgok
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-14 00:00:00.000000000 Z
+date: 2014-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -166,15 +166,20 @@ files:
 - lib/saklient/cloud/errors/unsupported_res_class_exception.rb
 - lib/saklient/cloud/errors/user_not_specified_exception.rb
 - lib/saklient/cloud/errors/vnc_proxy_request_failure_exception.rb
+- lib/saklient/cloud/facility.rb
 - lib/saklient/cloud/models/model.rb
 - lib/saklient/cloud/models/model_appliance.rb
 - lib/saklient/cloud/models/model_archive.rb
+- lib/saklient/cloud/models/model_bridge.rb
 - lib/saklient/cloud/models/model_disk.rb
 - lib/saklient/cloud/models/model_disk_plan.rb
 - lib/saklient/cloud/models/model_icon.rb
 - lib/saklient/cloud/models/model_iface.rb
 - lib/saklient/cloud/models/model_ipv6_net.rb
 - lib/saklient/cloud/models/model_iso_image.rb
+- lib/saklient/cloud/models/model_license.rb
+- lib/saklient/cloud/models/model_license_info.rb
+- lib/saklient/cloud/models/model_region.rb
 - lib/saklient/cloud/models/model_router.rb
 - lib/saklient/cloud/models/model_router_plan.rb
 - lib/saklient/cloud/models/model_script.rb
@@ -185,6 +190,7 @@ files:
 - lib/saklient/cloud/product.rb
 - lib/saklient/cloud/resources/appliance.rb
 - lib/saklient/cloud/resources/archive.rb
+- lib/saklient/cloud/resources/bridge.rb
 - lib/saklient/cloud/resources/disk.rb
 - lib/saklient/cloud/resources/disk_config.rb
 - lib/saklient/cloud/resources/disk_plan.rb
@@ -196,7 +202,10 @@ files:
 - lib/saklient/cloud/resources/iso_image.rb
 - lib/saklient/cloud/resources/lb_server.rb
 - lib/saklient/cloud/resources/lb_virtual_ip.rb
+- lib/saklient/cloud/resources/license.rb
+- lib/saklient/cloud/resources/license_info.rb
 - lib/saklient/cloud/resources/load_balancer.rb
+- lib/saklient/cloud/resources/region.rb
 - lib/saklient/cloud/resources/resource.rb
 - lib/saklient/cloud/resources/router.rb
 - lib/saklient/cloud/resources/router_plan.rb
@@ -244,9 +253,11 @@ files:
 - lib/saklient/version.rb
 - saklient.gemspec
 - spec/archive_spec.rb
+- spec/bridge_spec.rb
 - spec/enum_spec.rb
 - spec/exception_spec.rb
 - spec/iso_image_spec.rb
+- spec/license_spec.rb
 - spec/loadbalancer_spec.rb
 - spec/router_spec.rb
 - spec/server_spec.rb
@@ -272,17 +283,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: SAKURA Internet API Client Library for Ruby
 test_files:
 - spec/archive_spec.rb
+- spec/bridge_spec.rb
 - spec/enum_spec.rb
 - spec/exception_spec.rb
 - spec/iso_image_spec.rb
+- spec/license_spec.rb
 - spec/loadbalancer_spec.rb
 - spec/router_spec.rb
 - spec/server_spec.rb
 - spec/util_spec.rb
-has_rdoc: