saklient 0.0.2.4 → 0.0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9c0814de498b9ba0c287cf796ec4db49262344d
-  data.tar.gz: 38ba8a9e76602f1d7693544bde3050def0fc7072
+  metadata.gz: 950d3224ffc0b0dcd5b574e28ac96bde7fc96943
+  data.tar.gz: d5b980c1ea8b7c78868ccb8b04963b5d2cc1db57
 SHA512:
-  metadata.gz: c8863f52fd5d859c29ab80eb2ab63e5e044f401f9c33fc16d0547e7c38a22d8e61e839275589c37b1f45547b080d5396e14160e116099d84484b8d85e1a82027
-  data.tar.gz: 069c1c54f95521e23e1a075a232ba8b1d4de1aa05d725484ef92b038d6ed53a86a5db470a2c38a34b9906685161cc2bf820c2a93ae7c6800fcaa3aad3b6e3d5c
+  metadata.gz: 535fa1ff83ba2cf15754fda12ea80a58f4189b8dc1d05e0891e9f24088976d4b5eec99ce5fbfdb6ad4423c0141bb39761df3f233e1b1aa6fd1d3934f57a03bdc
+  data.tar.gz: 4b3a4ef1a50ffe6c8173336d8f7537c978bbff1441014914e58df9d5e5e4f9fb8adb1ed1df209e0ea1e9a99bd2c79bc72b46e34e675dab5d1b6db7fe7d510d7e

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

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

@@ -3,6 +3,7 @@
 require_relative '../../errors/saklient_exception'
 require_relative '../client'
 require_relative 'resource'
+require_relative 'swytch'
 
 module Saklient
   module Cloud
@@ -95,6 +96,16 @@ module Saklient
           api_deserialize(obj, wrapped)
         end
 
+        # スイッチに接続します.
+        #
+        # @param [Swytch] swytch 接続先のスイッチ.
+        # @return [Iface] this
+        def connect_to_swytch(swytch)
+          Saklient::Util::validate_type(swytch, 'Saklient::Cloud::Resources::Swytch')
+          @_client.request('PUT', _api_path + '/' + Saklient::Util::url_encode(_id) + '/to/switch/' + Saklient::Util::url_encode(swytch._id))
+          return reload
+        end
+
         # 共有セグメントに接続します.
         #
         # @return [Iface] this
@@ -103,6 +114,14 @@ module Saklient
           return reload
         end
 
+        # スイッチから切断します.
+        #
+        # @return [Iface] this
+        def disconnect_from_swytch
+          @_client.request('DELETE', _api_path + '/' + Saklient::Util::url_encode(_id) + '/to/switch')
+          return reload
+        end
+
         protected
 
         # @return [bool]

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

@@ -175,7 +175,7 @@ module Saklient
 
         # このルータ＋スイッチの帯域プランを変更します.
         #
-        # @param [Fixnum] bandWidthMbps
+        # @param [Fixnum] bandWidthMbps 帯域幅（api.product.router.find() から取得できる {RouterPlan} の bandWidthMbps を指定）.
         # @return [Swytch] this
         def change_plan(bandWidthMbps)
           Saklient::Util::validate_type(bandWidthMbps, 'Fixnum')
@@ -186,6 +186,7 @@ module Saklient
 
         # このルータ＋スイッチをブリッジに接続します.
         #
+        # @param swytch 接続先のブリッジ.
         # @param [Bridge] bridge
         # @return [Swytch] this
         def connect_to_bridge(bridge)

data/lib/saklient/version.rb

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

data/spec/swytch_spec.rb

@@ -0,0 +1,99 @@
+$: << File.dirname(__dir__) + '/lib'
+require 'saklient/cloud/api'
+require 'date'
+require 'SecureRandom'
+require 'ipaddr'
+
+describe 'Swytch' 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 'ルータ＋スイッチを作成しています...'
+    swytch = @api.swytch.create
+    swytch.name = name
+    swytch.description = description
+    swytch.save
+    expect(swytch).to be_an_instance_of Saklient::Cloud::Resources::Swytch
+        
+    #
+    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 'インタフェースをスイッチから切断しています...'
+    iface.disconnect_from_swytch
+    
+    #
+    puts 'サーバを削除しています...'
+    server.destroy
+    
+    #
+    puts 'スイッチを削除しています...'
+    swytch.destroy
+    
+  end
+  
+  
+  
+  after do
+    @config = nil
+    @api = nil
+  end
+  
+  
+  
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saklient
 version: !ruby/object:Gem::Version
-  version: 0.0.2.4
+  version: 0.0.2.5
 platform: ruby
 authors:
 - townewgokgok
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-15 00:00:00.000000000 Z
+date: 2014-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -261,6 +261,7 @@ files:
 - spec/loadbalancer_spec.rb
 - spec/router_spec.rb
 - spec/server_spec.rb
+- spec/swytch_spec.rb
 - spec/util_spec.rb
 - test-sshkey.txt
 homepage: http://sakura-internet.github.io/saklient.doc/
@@ -297,5 +298,5 @@ test_files:
 - spec/loadbalancer_spec.rb
 - spec/router_spec.rb
 - spec/server_spec.rb
+- spec/swytch_spec.rb
 - spec/util_spec.rb
-has_rdoc: