fog-sakuracloud 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e8ecce349b459ae043fccf7ea8dc8b2c8fa3506
-  data.tar.gz: d9e7e949951398b3d728890f4d9e2314455cf0d0
+  metadata.gz: 2c091507bd4319e29aaec68ccec48639442edba9
+  data.tar.gz: ef1f332eeed7a16ceb330d8eb9510b87d5ece2bb
 SHA512:
-  metadata.gz: 155277ba5e70df4e104729a176faa23551db0e30738d91b1a78f901cf1ce7e9f9a01ec411258f9f647bfbdb44693bd95b49a9ef2e26b0be97796f133c50eab75
-  data.tar.gz: 404a55f1caa65bad24c81a9d048afc8003e287d3779626e231d2fb7016139a575f658fd5fe6e11c414534f037afba8a28d9809b8304548376552ac7a1d86f5d5
+  metadata.gz: 8edf9a260ef6f5990ade711a07478f3761e6cde29e9cde6a0353777f87627e9e74b994a2960c5de981ff40aaf7d22a9b7538cd30da030f15003dc2d3603ddf35
+  data.tar.gz: 10dcd3507057780c9959c70e5b4b250f510e3cbad3ce1f684bb7b4c17ae50fb0a1231ab3d3ec59c16c023e88679f2e8a398aaf0757369ce29e66a081dfc4f420

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog of fog-sakuracloud
 
+## v1.2.0
+
+- Feature: Manage Interface.
+
 ## v1.1.1
 
 - Bugfix: Delete Server

data/lib/fog/sakuracloud/compute.rb

@@ -25,6 +25,7 @@ module Fog
       request      :list_plans
       request      :list_ssh_keys
       request      :list_zones
+      request      :regist_interface_to_server
 
       class Real
         def initialize(options = {})

data/lib/fog/sakuracloud/models/compute/servers.rb

@@ -17,6 +17,12 @@ module Fog
           nil
         end
 
+        def regist_interface_to_server(id)
+          sv = get(id)
+          sv.regist_interface
+          sv
+        end
+
         def create(options = {})
           user = options[:user] || 'root'
           Fog::Logger.warning("Create Server")

data/lib/fog/sakuracloud/models/network/interface.rb

@@ -0,0 +1,27 @@
+require 'fog/core/model'
+
+module Fog
+  module Network
+    class SakuraCloud
+      class Interface < Fog::Model
+        identity :id, :aliases => 'ID'
+        attribute :macaddress, :aliases => 'MACAddress'
+        attribute :ipaddress, :aliases => 'IPAddress'
+        attribute :user_ipaddress, :aliases => 'UserIPAddress'
+        attribute :switch, :aliases => 'Switch'
+        attribute :server, :aliases => 'Server'
+
+        def delete
+          service.delete_interface(identity)
+          true
+        end
+        alias_method :destroy, :delete
+
+        def connect_to_switch(switch_id)
+          service.connect_interface_to_switch(identity, switch_id)
+          true
+        end
+      end
+    end
+  end
+end

data/lib/fog/sakuracloud/models/network/interfaces.rb

@@ -0,0 +1,37 @@
+require 'fog/core/collection'
+require 'fog/sakuracloud/models/network/interface'
+
+module Fog
+  module Network
+    class SakuraCloud
+      class Interfaces < Fog::Collection
+        model Fog::Network::SakuraCloud::Interface
+
+        def all
+          load service.list_interfaces.body['Interfaces']
+        end
+
+        def get(id)
+          all.find { |f| f.id == id }
+        rescue Fog::Errors::NotFound
+          nil
+        end
+
+        def regist_onto_server(server_id)
+          id = service.regist_interface_to_server(server_id)
+          get(id)
+        end
+
+        def connect_to_switch(id, switch_id)
+          id = service.connect_interface_to_switch(id, switch_id)
+          get(id)
+        end
+
+        def delete(id)
+          service.delete_interface(id)
+          true
+        end
+      end
+    end
+  end
+end

data/lib/fog/sakuracloud/network.rb

@@ -11,6 +11,8 @@ module Fog
       collection :routers
       model      :switch
       collection :switches
+      model      :interface
+      collection :interfaces
 
       request_path 'fog/sakuracloud/requests/network'
       request      :list_routers
@@ -19,6 +21,10 @@ module Fog
       request      :list_switches
       request      :create_switch
       request      :delete_switch
+      request      :list_interfaces
+      request      :regist_interface_to_server
+      request      :connect_interface_to_switch
+      request      :delete_interface
 
       class Real
         def initialize(options = {})

data/lib/fog/sakuracloud/requests/network/connect_interface_to_switch.rb

@@ -0,0 +1,31 @@
+# coding: utf-8
+
+module Fog
+  module Network
+    class SakuraCloud
+      class Real
+        def connect_interface_to_switch( id, switch_id )
+          response = request(
+            :headers => {
+              'Authorization' => "Basic #{@auth_encord}"
+            },
+            :expects  => [200],
+            :method => 'PUT',
+            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/interface/#{id}/to/switch/#{switch_id}"
+          )
+          response.body['Interface']['ID']
+        end
+      end # Real
+
+      class Mock
+        def regist_interface_to_server( id, switch_id )
+          response = Excon::Response.new
+          response.status = 20
+          response.body = {
+          }
+          response
+        end
+      end
+    end # SakuraCloud
+  end # Network0
+end # Fog

data/lib/fog/sakuracloud/requests/network/delete_interface.rb

@@ -0,0 +1,30 @@
+# coding: utf-8
+
+module Fog
+  module Network
+    class SakuraCloud
+      class Real
+        def delete_interface( id )
+          request(
+            :headers => {
+              'Authorization' => "Basic #{@auth_encord}"
+            },
+            :expects  => [200],
+            :method => 'DELETE',
+            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/interface/#{id}"
+          )
+        end
+      end # Real
+
+      class Mock
+        def delete_interface( id )
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+          }
+          response
+        end
+      end
+    end # SakuraCloud
+  end # Network
+end # Fog

data/lib/fog/sakuracloud/requests/network/list_interfaces.rb

@@ -0,0 +1,39 @@
+# coding: utf-8
+
+module Fog
+  module Network
+    class SakuraCloud
+      class Real
+        def list_interfaces(options = {})
+          filter = {
+            "Include" => [
+              "ID",
+              "MACAddress",
+              "IPAddress",
+              "UserIPAddress",
+              "Switch.ID",
+              "Server.ID"]
+          }
+          request(
+            :headers => {
+              'Authorization' => "Basic #{@auth_encord}"
+            },
+            :method => 'GET',
+            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/interface",
+            :query => URI.encode(Fog::JSON.encode(filter))
+          )
+        end
+      end
+
+      class Mock
+        def list_interfaces(options = {})
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+          }
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/sakuracloud/requests/network/regist_interface_to_server.rb

@@ -0,0 +1,40 @@
+# coding: utf-8
+
+module Fog
+  module Network
+    class SakuraCloud
+      class Real
+        def regist_interface_to_server( server_id )
+          body = {
+            "Interface" => {
+              "Server" => {
+                "ID" => server_id
+              }
+            }
+          }
+
+          response = request(
+            :headers => {
+              'Authorization' => "Basic #{@auth_encord}"
+            },
+            :expects  => [201],
+            :method => 'POST',
+            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/interface",
+            :body => Fog::JSON.encode(body)
+          )
+          response.body['Interface']['ID']
+        end
+      end # Real
+
+      class Mock
+        def regist_interface_to_server( id )
+          response = Excon::Response.new
+          response.status = 201
+          response.body = {
+          }
+          response
+        end
+      end
+    end # SakuraCloud
+  end # Network
+end # Fog

data/lib/fog/sakuracloud/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Sakuracloud
-    VERSION = "1.1.1"
+    VERSION = "1.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-sakuracloud
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-09 00:00:00.000000000 Z
+date: 2015-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -221,6 +221,8 @@ files:
 - lib/fog/sakuracloud/models/compute/ssh_keys.rb
 - lib/fog/sakuracloud/models/compute/zone.rb
 - lib/fog/sakuracloud/models/compute/zones.rb
+- lib/fog/sakuracloud/models/network/interface.rb
+- lib/fog/sakuracloud/models/network/interfaces.rb
 - lib/fog/sakuracloud/models/network/router.rb
 - lib/fog/sakuracloud/models/network/routers.rb
 - lib/fog/sakuracloud/models/network/switch.rb
@@ -242,12 +244,16 @@ files:
 - lib/fog/sakuracloud/requests/compute/list_ssh_keys.rb
 - lib/fog/sakuracloud/requests/compute/list_zones.rb
 - lib/fog/sakuracloud/requests/compute/stop_server.rb
+- lib/fog/sakuracloud/requests/network/connect_interface_to_switch.rb
 - lib/fog/sakuracloud/requests/network/create_router.rb
 - lib/fog/sakuracloud/requests/network/create_switch.rb
+- lib/fog/sakuracloud/requests/network/delete_interface.rb
 - lib/fog/sakuracloud/requests/network/delete_router.rb
 - lib/fog/sakuracloud/requests/network/delete_switch.rb
+- lib/fog/sakuracloud/requests/network/list_interfaces.rb
 - lib/fog/sakuracloud/requests/network/list_routers.rb
 - lib/fog/sakuracloud/requests/network/list_switches.rb
+- lib/fog/sakuracloud/requests/network/regist_interface_to_server.rb
 - lib/fog/sakuracloud/requests/script/create_note.rb
 - lib/fog/sakuracloud/requests/script/delete_note.rb
 - lib/fog/sakuracloud/requests/script/list_notes.rb