saklient 0.0.2.3 → 0.0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbbdaf09c98095e51cab1badda0f43a9ec1b8da6
-  data.tar.gz: 5fb32beceb6f5b6166b787d614c8364ab315a6d7
+  metadata.gz: a9c0814de498b9ba0c287cf796ec4db49262344d
+  data.tar.gz: 38ba8a9e76602f1d7693544bde3050def0fc7072
 SHA512:
-  metadata.gz: 5b75f6ddbb1f866837675c117c08598b8c09a2a69cf2d5a140519e8234d0d7fb178d35c9877c579423178afd0c3204b4cbe557fd67075a1b45efbce8bf9192be
-  data.tar.gz: 48bdb7d3eaed8a7d66fa153430c913463a13e8d505cb836580fc0b6bc6f04fe34088d1d6ca3bc648f8356753854d6a9b44340309abb2a482da19c21c77369953
+  metadata.gz: c8863f52fd5d859c29ab80eb2ab63e5e044f401f9c33fc16d0547e7c38a22d8e61e839275589c37b1f45547b080d5396e14160e116099d84484b8d85e1a82027
+  data.tar.gz: 069c1c54f95521e23e1a075a232ba8b1d4de1aa05d725484ef92b038d6ed53a86a5db470a2c38a34b9906685161cc2bf820c2a93ae7c6800fcaa3aad3b6e3d5c

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

data/lib/saklient/cloud/models/model_license_info.rb

@@ -119,7 +119,7 @@ module Saklient
         #
         # @todo Implement test case
         # @param [bool] reverse
-        # @return [Model_Archive]
+        # @return [Model_LicenseInfo]
         def sort_by_name(reverse = false)
           Saklient::Util::validate_type(reverse, 'bool')
           return _sort_by_name(reverse)

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

@@ -3,7 +3,6 @@
 require_relative '../../errors/saklient_exception'
 require_relative '../client'
 require_relative 'resource'
-require_relative 'license_info'
 
 module Saklient
   module Cloud

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

@@ -7,6 +7,7 @@ require_relative 'icon'
 require_relative 'router'
 require_relative 'ipv4_net'
 require_relative 'ipv6_net'
+require_relative 'bridge'
 
 module Saklient
   module Cloud
@@ -57,6 +58,11 @@ module Saklient
         # @return [Router]
         attr_accessor :m_router
 
+        # 接続されているブリッジ
+        #
+        # @return [Bridge]
+        attr_accessor :m_bridge
+
         # IPv4ネットワーク（ルータによる自動割当） {Ipv4Net} の配列
         #
         # @return [Array<Ipv4Net>]
@@ -178,6 +184,26 @@ module Saklient
           return self
         end
 
+        # このルータ＋スイッチをブリッジに接続します.
+        #
+        # @param [Bridge] bridge
+        # @return [Swytch] this
+        def connect_to_bridge(bridge)
+          Saklient::Util::validate_type(bridge, 'Saklient::Cloud::Resources::Bridge')
+          result = @_client.request('PUT', _api_path + '/' + _id + '/to/bridge/' + bridge._id)
+          reload
+          return self
+        end
+
+        # このルータ＋スイッチをブリッジから切断します.
+        #
+        # @return [Swytch] this
+        def disconnect_from_bridge
+          result = @_client.request('DELETE', _api_path + '/' + _id + '/to/bridge')
+          reload
+          return self
+        end
+
         protected
 
         # @return [bool]
@@ -437,6 +463,30 @@ module Saklient
 
         protected
 
+        # @return [bool]
+        attr_accessor :n_bridge
+
+        # (This method is generated in Translator_default#buildImpl)
+        #
+        # @private
+        # @return [Bridge]
+        def get_bridge
+          return @m_bridge
+        end
+
+        public
+
+        # 接続されているブリッジ
+        #
+        # @return [Bridge]
+        attr_reader :bridge
+
+        def bridge
+          get_bridge
+        end
+
+        protected
+
         # @return [bool]
         attr_accessor :n_ipv4_nets
 
@@ -557,6 +607,13 @@ module Saklient
             @is_incomplete = true
           end
           @n_router = false
+          if Saklient::Util::exists_path(r, 'Bridge')
+            @m_bridge = (Saklient::Util::get_by_path(r, 'Bridge')).nil? ? nil : Saklient::Cloud::Resources::Bridge.new(@_client, Saklient::Util::get_by_path(r, 'Bridge'))
+          else
+            @m_bridge = nil
+            @is_incomplete = true
+          end
+          @n_bridge = false
           if Saklient::Util::exists_path(r, 'Subnets')
             if (Saklient::Util::get_by_path(r, 'Subnets')).nil?
               @m_ipv4_nets = []
@@ -617,6 +674,7 @@ module Saklient
           Saklient::Util::set_by_path(ret, 'UserSubnet.DefaultRoute', @m_user_default_route) if withClean || @n_user_default_route
           Saklient::Util::set_by_path(ret, 'UserSubnet.NetworkMaskLen', @m_user_mask_len) if withClean || @n_user_mask_len
           Saklient::Util::set_by_path(ret, 'Internet', withClean ? ((@m_router).nil? ? nil : @m_router.api_serialize(withClean)) : ((@m_router).nil? ? { ID: '0' } : @m_router.api_serialize_id)) if withClean || @n_router
+          Saklient::Util::set_by_path(ret, 'Bridge', withClean ? ((@m_bridge).nil? ? nil : @m_bridge.api_serialize(withClean)) : ((@m_bridge).nil? ? { ID: '0' } : @m_bridge.api_serialize_id)) if withClean || @n_bridge
           if withClean || @n_ipv4_nets
             Saklient::Util::set_by_path(ret, 'Subnets', [])
             for r2 in @m_ipv4_nets

data/lib/saklient/version.rb

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

data/spec/bridge_spec.rb

@@ -57,10 +57,24 @@ describe 'Bridge' do
     bridge.description = description
     bridge.region = regions[0]
     bridge.save
-    
     expect(bridge).to be_an_instance_of Saklient::Cloud::Resources::Bridge
     
-    #
+    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 'スイッチをブリッジに接続しています...'
+    swytch.connect_to_bridge(bridge)
+    
+    puts 'スイッチをブリッジから切断しています...'
+    swytch.disconnect_from_bridge
+    
+    puts 'スイッチを削除しています...'
+    swytch.destroy
+    
     puts 'ブリッジを削除しています...'
     bridge.destroy
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: saklient
 version: !ruby/object:Gem::Version
-  version: 0.0.2.3
+  version: 0.0.2.4
 platform: ruby
 authors:
 - townewgokgok
@@ -298,3 +298,4 @@ test_files:
 - spec/router_spec.rb
 - spec/server_spec.rb
 - spec/util_spec.rb
+has_rdoc: