fog-sakuracloud 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4ca4b284c86d687ba0fd58a9cde3cc139756975
-  data.tar.gz: 643b55776babe15ae42a98eb9e0ed110a55edf8f
+  metadata.gz: ed03013c914dcb9864ddd15863a8ea6ff53bcae8
+  data.tar.gz: df5058d91da52223655eeb3a7a144441a0c4b3b0
 SHA512:
-  metadata.gz: a504046c33349ca9b072d2e1cb4c99b123c484d83d95dad8249f383ae7d6de4684f4929d64b976d57aea4a68e7fd6f64b481325bdbc8025ff24fff67a0669aed
-  data.tar.gz: 7a23c5ec208e4f75e61babd6d2d809bc2543c5b04d336281fbb2adf5d5854a8d79361d358d9f4188e8d17519db3c350dc745c91746ed880ad26be429a44b9da8
+  metadata.gz: 1d5e6e195d81ef2f071fe2e840580fab2b89add0f19954f5f68f37882364e39309bfddafbda62ab6517d444e683f0fc539bc4948c8568814dd2a885c86571b48
+  data.tar.gz: a16f37c56c3e38e89c205495f43f518f114be8e7f3d19bebda581fff2694b46984d09486c2b444b6af87c22a113126c55e7ecd89d1287b5dfcaa2dea6b652be8

data/.gitmodules

@@ -1,3 +1,3 @@
 [submodule "fog"]
 	path = fog
-	url = https://github.com/fog/fog.git
+	url = https://github.com/higanworks/fog.git

data/.travis.yml

@@ -7,3 +7,5 @@ rvm:
   - 2.1.1
   - 2.0.0
   - 1.9.3
+gemfile:
+  - Gemfile.edge

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog of fog-sakuracloud
 
+## v0.1.0
+
+- Add: Network resources
+    - switch
+    - router
+- API change: create server requires options type.
+
 ## v0.0.4
 
 - move lib/fog/bin/sakuracloud.rb from fog.

data/Gemfile.edge

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in fog-sakuracloud.gemspec
+gemspec
+gem 'fog', :path => './fog'

data/README.md

@@ -1,6 +1,9 @@
 # Fog::Sakuracloud
 
-[![Build Status](https://travis-ci.org/higanworks/fog-sakuracloud.svg?branch=master)](https://travis-ci.org/higanworks/fog-sakuracloud)
+[![Gem Version](https://badge.fury.io/rb/fog-sakuracloud.svg)](http://badge.fury.io/rb/fog-sakuracloud)
+[![Build Status](https://travis-ci.org/fog/fog-sakuracloud.svg?branch=master)](https://travis-ci.org/fog/fog-sakuracloud)
+[![Stories in Ready](https://badge.waffle.io/fog/fog-sakuracloud.svg?label=ready&title=Ready)](http://waffle.io/fog/fog-sakuracloud) 
+[![Stories in Progress](https://badge.waffle.io/fog/fog-sakuracloud.svg?label=In%20Progress&title=In%20Progress')](http://waffle.io/fog/fog-sakuracloud) 
 
 This gem is a module for the fog gem that allows you to manage resources in the Sakura no Cloud.
 

data/Rakefile

@@ -6,7 +6,6 @@ require 'rubygems'
 require 'rubygems/package_task'
 require 'yard'
 require 'fog'
-# require File.dirname(__FILE__) + '/fog/lib/fog'
 
 #############################################################################
 #

data/lib/fog/bin/sakuracloud.rb

@@ -6,6 +6,8 @@ class SakuraCloud < Fog::Bin
         Fog::Compute::SakuraCloud
       when :volume
         Fog::Volume::SakuraCloud
+      when :network
+        Fog::Network::SakuraCloud
       else
         raise ArgumentError, "Unrecognized service: #{key}"
       end
@@ -15,11 +17,14 @@ class SakuraCloud < Fog::Bin
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
         when :compute
-          Fog::Logger.warning("SakuraCloud[:compute] is not recommended, use Compute[:sakuracloud] for portability")
+          Fog::Logger.warning("SakuraCloud[:compute] is not recommended, use Fog::Compute[:sakuracloud] for portability")
           Fog::Compute.new(:provider => 'SakuraCloud')
         when :volume
-          Fog::Logger.warning("SakuraCloud[:compute] is not recommended, use Compute[:SakuraCloud] for portability")
-          Fog::Compute.new(:provider => 'SakuraCloud')
+          Fog::Logger.warning("SakuraCloud[:volume] is not recommended, use Fog::Volume[:sakuracloud] for portability")
+          Fog::Volume.new(:provider => 'SakuraCloud')
+        when :network
+          Fog::Logger.warning("SakuraCloud[:network] is not recommended, use Fog::Network[:sakuracloud] for portability")
+          Fog::Network.new(:provider => 'SakuraCloud')
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"
         end

data/lib/fog/sakuracloud.rb

@@ -1,6 +1,7 @@
 require 'fog/core'
 require 'fog/sakuracloud/compute'
 require 'fog/sakuracloud/volume'
+require 'fog/sakuracloud/network'
 
 module Fog
   module SakuraCloud
@@ -12,5 +13,6 @@ module Fog
 
     service(:compute, 'Compute')
     service(:volume, 'Volume')
+    service(:network, 'Network')
   end
 end

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

@@ -13,7 +13,7 @@ module Fog
 
         def save
           requires :name, :server_plan
-          data = service.create_server(@attributes[:name], @attributes[:server_plan]).body["Server"]
+          data = service.create_server(@attributes).body["Server"]
           merge_attributes(data)
           true
         end

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

@@ -20,7 +20,8 @@ module Fog
         def create(options = {})
           user = options[:user] || 'root'
           Fog::Logger.warning("Create Server")
-          data = service.create_server(Fog::UUID.uuid, options[:serverplan]).body["Server"]
+          name = options[:name] ? options[:name] : Fog::UUID.uuid
+          data = service.create_server(options).body["Server"]
           server = service.servers.new
           server.merge_attributes(data)
 

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

@@ -0,0 +1,45 @@
+require 'fog/core/model'
+
+module Fog
+  module Network
+    class SakuraCloud
+      class Router < Fog::Model
+        identity :id, :aliases => 'ID'
+        attribute :name, :aliases => 'Name'
+        attribute :description, :aliases => 'Description'
+        attribute :server_count, :aliases => 'ServerCount'
+        attribute :appliance_count, :aliases => 'ApplianceCount'
+        attribute :subnets, :aliases => 'Subnets'
+        attribute :ipv6nets, :aliases => 'IPv6Nets'
+        attribute :internet, :aliases => 'Internet'
+        attribute :bridge, :aliases => 'Bridge'
+        attribute :networkmasklen
+
+
+        def delete
+          service.delete_router(identity)
+          true
+        end
+        alias_method :destroy, :delete
+
+        def save
+          requires :name, :networkmasklen
+          Fog::Logger.warning("Create Router with public subnet")
+          data = service.create_router(@attributes).body["Internet"]
+          Fog::Logger.warning("Waiting available new router...")
+          new_data = router_available?(service, data["ID"])
+          merge_attributes(new_data)
+          true
+        end
+
+        def router_available?(network, router_id)
+          until network.switches.find {|r| r.internet != nil && r.internet["ID"] == router_id}
+            print '.'
+            sleep 2
+          end
+          ::JSON.parse((network.switches.find {|r| r.internet != nil && r.internet["ID"] == router_id}).to_json)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+require 'fog/core/collection'
+require 'fog/sakuracloud/models/network/router'
+
+module Fog
+  module Network
+    class SakuraCloud
+      class Routers < Fog::Collection
+        model Fog::Network::SakuraCloud::Router
+
+        def all
+          load service.list_routers.body['Internet']
+        end
+
+        def get(id)
+          all.find { |f| f.id == id }
+        rescue Fog::Errors::NotFound
+          nil
+        end
+
+        def delete(id)
+          service.delete_router(id)
+          true
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,35 @@
+require 'fog/core/model'
+
+module Fog
+  module Network
+    class SakuraCloud
+      class Switch < Fog::Model
+        identity :id, :aliases => 'ID'
+        attribute :name, :aliases => 'Name'
+        attribute :description, :aliases => 'Description'
+        attribute :server_count, :aliases => 'ServerCount'
+        attribute :appliance_count, :aliases => 'ApplianceCount'
+        attribute :subnets, :aliases => 'Subnets'
+        attribute :ipv6nets, :aliases => 'IPv6Nets'
+        attribute :internet, :aliases => 'Internet'
+        attribute :bridge, :aliases => 'Bridge'
+
+
+        def delete
+          service.delete_switch(identity)
+          true
+        end
+        alias_method :destroy, :delete
+
+        def save
+          requires :name
+          Fog::Logger.warning("Create Switch")
+          data = service.create_switch(@attributes).body["Switch"]
+          merge_attributes(data)
+          true
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+require 'fog/core/collection'
+require 'fog/sakuracloud/models/network/switch'
+
+module Fog
+  module Network
+    class SakuraCloud
+      class Switches < Fog::Collection
+        model Fog::Network::SakuraCloud::Switch
+
+        def all
+          load service.list_switches.body['Switches']
+        end
+
+        def get(id)
+          all.find { |f| f.id == id }
+        rescue Fog::Errors::NotFound
+          nil
+        end
+
+        def delete(id)
+          service.delete_switch(id)
+          true
+        end
+      end
+    end
+  end
+end

data/lib/fog/sakuracloud/network.rb

@@ -0,0 +1,83 @@
+require 'fog/sakuracloud'
+require 'fog/network'
+
+module Fog
+  module Network
+    class SakuraCloud < Fog::Service
+      requires     :sakuracloud_api_token
+      requires     :sakuracloud_api_token_secret
+
+      recognizes   :sakuracloud_api_url
+
+      model_path 'fog/sakuracloud/models/network'
+      model      :router
+      collection :routers
+      model      :switch
+      collection :switches
+
+      request_path 'fog/sakuracloud/requests/network'
+      request      :list_routers
+      request      :create_router
+      request      :delete_router
+      request      :list_switches
+      request      :create_switch
+      request      :delete_switch
+
+      class Real
+        def initialize(options = {})
+          @auth_encord = Base64.strict_encode64([
+            options[:sakuracloud_api_token],
+            options[:sakuracloud_api_token_secret]
+          ].join(':'))
+          Fog.credentials[:sakuracloud_api_token]        = options[:sakuracloud_api_token]
+          Fog.credentials[:sakuracloud_api_token_secret] = options[:sakuracloud_api_token_secret]
+
+          @sakuracloud_api_url = options[:sakuracloud_api_url] || 'https://secure.sakura.ad.jp'
+
+          @connection = Fog::Core::Connection.new(@sakuracloud_api_url)
+        end
+
+        def request(params)
+          response = parse @connection.request(params)
+          response
+        end
+
+        private
+        def parse(response)
+          return response if response.body.empty?
+          response.body = Fog::JSON.decode(response.body)
+          response
+        end
+      end
+
+      class Mock
+        def self.data
+          @data ||= Hash.new do |hash, key|
+            hash[key] = {
+              :routers => []
+            }
+          end
+        end
+
+        def self.reset
+          @data = nil
+        end
+
+        def initialize(options={})
+          @sakuracloud_api_token        = options[:sakuracloud_api_token]
+          @sakuracloud_api_token_secret = options[:sakuracloud_api_token_secret]
+        end
+
+        def data
+          self.class.data[@sakuracloud_api_token]
+          self.class.data[@sakuracloud_api_token_secret]
+        end
+
+        def reset_data
+          self.class.data.delete(@sakuracloud_api_token)
+          self.class.data.delete(@sakuracloud_api_token_secret)
+        end
+      end
+    end #SakuraCloud
+  end #Network
+end

data/lib/fog/sakuracloud/requests/compute/create_server.rb

@@ -4,14 +4,25 @@ module Fog
   module Compute
     class SakuraCloud
       class Real
-        def create_server( name, serverplan )
+        def create_server(options)
+          if options[:switch]
+            switchs = options[:switch].split(',')
+            connectedswitches = switchs.map do |sw_id|
+              {
+                "ID" => sw_id
+              }
+            end
+          else
+            connectedswitches = [{"Scope"=>"shared", "BandWidthMbps"=>100}]
+          end
+
           body = {
             "Server" => {
-              "Name" => name,
+              "Name" => options[:name],
               "ServerPlan" => {
-                "ID" => serverplan.to_i
+                "ID" => options[:serverplan].to_i
               },
-              "ConnectedSwitches"=>[{"Scope"=>"shared", "BandWidthMbps"=>100}]
+              "ConnectedSwitches" => connectedswitches
             }
           }
 
@@ -28,7 +39,7 @@ module Fog
       end # Real
 
       class Mock
-        def create_server( name, serverplan )
+        def create_server(options)
           response = Excon::Response.new
           response.status = 201
           response.body = {

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

@@ -0,0 +1,41 @@
+# coding: utf-8
+
+module Fog
+  module Network
+    class SakuraCloud
+      class Real
+        def create_router(options)
+          bandwidthmbps = options[:bandwidthmbps] ? options[:bandwidthmbps].to_i : 100
+
+          body = {
+            "Internet" => {
+              "Name" => options[:name],
+              "NetworkMaskLen"=> options[:networkmasklen].to_i,
+              "BandWidthMbps"=> bandwidthmbps
+            }
+          }
+
+          request(
+            :headers => {
+              'Authorization' => "Basic #{@auth_encord}"
+            },
+            :expects  => 202,
+            :method => 'POST',
+            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/internet",
+            :body => Fog::JSON.encode(body)
+          )
+        end
+      end # Real
+
+      class Mock
+        def create_router(options)
+          response = Excon::Response.new
+          response.status = 202
+          response.body = {
+          }
+          response
+        end
+      end
+    end # SakuraCloud
+  end # Network
+end # Fog

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

@@ -0,0 +1,37 @@
+# coding: utf-8
+
+module Fog
+  module Network
+    class SakuraCloud
+      class Real
+        def create_switch(options)
+          body = {
+            "Switch" => {
+              "Name" => options[:name]
+            }
+          }
+
+          request(
+            :headers => {
+              'Authorization' => "Basic #{@auth_encord}"
+            },
+            :expects  => 201,
+            :method => 'POST',
+            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/switch",
+            :body => Fog::JSON.encode(body)
+          )
+        end
+      end # Real
+
+      class Mock
+        def create_switch(options)
+          response = Excon::Response.new
+          response.status = 201
+          response.body = {
+          }
+          response
+        end
+      end
+    end # SakuraCloud
+  end # Network
+end # Fog

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

@@ -0,0 +1,30 @@
+# coding: utf-8
+
+module Fog
+  module Network
+    class SakuraCloud
+      class Real
+        def delete_router( id )
+          request(
+            :headers => {
+              'Authorization' => "Basic #{@auth_encord}"
+            },
+            :expects  => [200],
+            :method => 'DELETE',
+            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/internet/#{id}"
+          )
+        end
+      end # Real
+
+      class Mock
+        def delete_router( 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/delete_switch.rb

@@ -0,0 +1,30 @@
+# coding: utf-8
+
+module Fog
+  module Network
+    class SakuraCloud
+      class Real
+        def delete_switch( id )
+          request(
+            :headers => {
+              'Authorization' => "Basic #{@auth_encord}"
+            },
+            :expects  => [200],
+            :method => 'DELETE',
+            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/switch/#{id}"
+          )
+        end
+      end # Real
+
+      class Mock
+        def delete_switch( 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_routers.rb

@@ -0,0 +1,39 @@
+# coding: utf-8
+
+module Fog
+  module Network
+    class SakuraCloud
+      class Real
+        def list_routers(options = {})
+          request(
+            :headers => {
+              'Authorization' => "Basic #{@auth_encord}"
+            },
+            :method => 'GET',
+            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/internet"
+          )
+        end
+      end
+
+      class Mock
+        def list_routers(options = {})
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            "Internet"=>[
+              {"Index"=>0,
+               "ID"=>"112600707538",
+               "Switch"=>{
+                 "ID"=>"112600707539",
+                 "Name"=>"router2"
+               }
+            }
+            ],
+            "is_ok"=>true
+          }
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,74 @@
+# coding: utf-8
+
+module Fog
+  module Network
+    class SakuraCloud
+      class Real
+        def list_switches(options = {})
+          request(
+            :headers => {
+              'Authorization' => "Basic #{@auth_encord}"
+            },
+            :method => 'GET',
+            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/switch"
+          )
+        end
+      end
+
+      class Mock
+        def list_switches(options = {})
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            "Switches"=>
+            [{"Index"=>0,
+              "ID"=>"112600703732",
+              "Name"=>"foobar1",
+              "Description"=>"",
+              "ServerCount"=>0,
+              "ApplianceCount"=>0,
+              "HybridConnection"=>nil,
+              "ServiceClass"=>"cloud/switch/default",
+              "CreatedAt"=>"2014-09-05T16:35:41+09:00",
+              "Subnets"=>
+            [{"ID"=>nil,
+              "NetworkAddress"=>nil,
+              "NetworkMaskLen"=>nil,
+              "DefaultRoute"=>nil,
+              "NextHop"=>nil,
+              "StaticRoute"=>nil,
+              "ServiceClass"=>nil,
+              "IPAddresses"=>{"Min"=>nil, "Max"=>nil},
+              "Internet"=>{"ID"=>nil, "Name"=>nil, "BandWidthMbps"=>nil, "ServiceClass"=>nil}}],
+            "IPv6Nets"=>[],
+            "Internet"=>nil,
+            "Bridge"=>nil},
+            {"Index"=>1,
+             "ID"=>"112600703734",
+             "Name"=>"foobar2",
+             "Description"=>"",
+             "ServerCount"=>1,
+             "ApplianceCount"=>0,
+             "HybridConnection"=>nil,
+             "ServiceClass"=>"cloud/switch/default",
+             "CreatedAt"=>"2014-09-05T16:36:13+09:00",
+             "Subnets"=>
+            [{"ID"=>1036,
+              "NetworkAddress"=>"133.242.241.240",
+              "NetworkMaskLen"=>28,
+              "DefaultRoute"=>"133.242.241.241",
+              "NextHop"=>nil,
+              "StaticRoute"=>nil,
+              "ServiceClass"=>"cloud/global-ipaddress-v4/28",
+              "IPAddresses"=>{"Min"=>"133.242.241.244", "Max"=>"133.242.241.254"},
+              "Internet"=>{"ID"=>"112600703733", "Name"=>"hogehoge2", "BandWidthMbps"=>100, "ServiceClass"=>"cloud/internet/router/100m"}}],
+            "IPv6Nets"=>[],
+            "Internet"=>{"ID"=>"112600703733", "Name"=>"hogehoge2", "BandWidthMbps"=>100, "Scope"=>"user", "ServiceClass"=>"cloud/internet/router/100m"},
+            "Bridge"=>nil}]
+          }
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/sakuracloud/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Sakuracloud
-    VERSION = "0.0.4"
+    VERSION = "0.1.0"
   end
 end

data/tests/helper.rb

@@ -1,3 +1,6 @@
+## Initialize credentials
+ENV['FOG_RC'] = ENV['FOG_RC'] || File.expand_path('../.fog', __FILE__)
+
 ## From fog-core
 require 'fog/test_helpers/formats_helper'
 
@@ -6,3 +9,15 @@ require File.expand_path('../../fog/tests/helper', __FILE__)
 helpers = Dir.glob(File.expand_path('../../', __FILE__) + '/fog/tests/helpers/**/*.rb')
 helpers.map {|h| load h}
 
+## SakuraCloud Helpers
+def sakuracloud_volume_service
+  Fog::Volume[:sakuracloud]
+end
+
+def sakuracloud_compute_service
+  Fog::Compute[:sakuracloud]
+end
+
+def sakuracloud_network_service
+  Fog::Network[:sakuracloud]
+end

data/tests/sakuracloud/requests/compute/plans_tests.rb

@@ -13,7 +13,7 @@ Shindo.tests('Fog::Compute[:sakuracloud] | list_plans request', ['sakuracloud',
   tests('success') do
 
     tests('#list_plans') do
-      serverplans = compute_service.list_plans
+      serverplans = sakuracloud_compute_service.list_plans
       test 'returns a Hash' do
         serverplans.body.is_a? Hash
       end

data/tests/sakuracloud/requests/compute/servers_tests.rb

@@ -13,7 +13,7 @@ Shindo.tests('Fog::Compute[:sakuracloud] | list_servers request', ['sakuracloud'
   tests('success') do
 
     tests('#list_servers') do
-      servers = compute_service.list_servers
+      servers = sakuracloud_compute_service.list_servers
       test 'returns a Hash' do
         servers.body.is_a? Hash
       end
@@ -32,7 +32,7 @@ end
 Shindo.tests('Fog::Compute[:sakuracloud] | create_servers request', ['sakuracloud', 'compute']) do
   tests('success') do
     tests('#create_servers') do
-      servers = compute_service.create_server('foobar', 2001)
+      servers = sakuracloud_compute_service.create_server(:name => 'foobar', :serverplan => 2001)
       test 'returns a Hash' do
         servers.body.is_a? Hash
       end

data/tests/sakuracloud/requests/compute/ssh_keys_tests.rb

@@ -11,7 +11,7 @@ Shindo.tests('Fog::Compute[:sakuracloud] | list_ssh_keys request', ['sakuracloud
   tests('success') do
 
     tests('#list_ssh_keys') do
-      sshkeys = compute_service.list_ssh_keys
+      sshkeys = sakuracloud_compute_service.list_ssh_keys
       test 'returns a Hash' do
         sshkeys.body.is_a? Hash
       end

data/tests/sakuracloud/requests/compute/zones_tests.rb

@@ -11,7 +11,7 @@ Shindo.tests('Fog::Compute[:sakuracloud] | list_zones request', ['sakuracloud',
   tests('success') do
 
     tests('#list_zones') do
-      zones = compute_service.list_zones
+      zones = sakuracloud_compute_service.list_zones
       test 'returns a Hash' do
         zones.body.is_a? Hash
       end

data/tests/sakuracloud/requests/network/routers_tests.rb

@@ -0,0 +1,52 @@
+# coding: utf-8
+Shindo.tests('Fog::Network[:sakuracloud] | list_routers request', ['sakuracloud', 'network']) do
+
+  @routers_create_format = {
+    'Index'          => Integer,
+    'ID'             => String,
+    'Name'           => String,
+    'ServerCount'    => Integer,
+    'ApplianceCount' => Integer,
+    'Subnets'        => Array
+  }
+
+  @routers_list_format = {
+    'Index'          => Integer,
+    'ID'             => String,
+    'Switch'         => Hash
+  }
+
+  tests('success') do
+
+    tests('#list_routers') do
+      routers = sakuracloud_network_service.list_routers
+      test 'returns a Hash' do
+        routers.body.is_a? Hash
+      end
+      if Fog.mock?
+        tests('Routers').formats(@routers_list_format, false) do
+          routers.body['Internet'].first
+        end
+      else
+        returns(200) { routers.status }
+        returns(true) { routers.body.is_a? Hash }
+      end
+    end
+  end
+end
+
+Shindo.tests('Fog::Network[:sakuracloud] | create_router request', ['sakuracloud', 'network']) do
+  tests('success') do
+    tests('#create_router_with_internet_access') do
+      router = sakuracloud_network_service.create_router(:name => 'foobar', :networkmasklen => 28)
+      test 'returns a Hash' do
+        router.body.is_a? Hash
+      end
+
+      unless Fog.mock?
+        returns(202) { router.status }
+        returns(true) { router.body.is_a? Hash }
+      end
+    end
+  end
+end

data/tests/sakuracloud/requests/network/switches_tests.rb

@@ -0,0 +1,46 @@
+# coding: utf-8
+Shindo.tests('Fog::Network[:sakuracloud] | list_switches request', ['sakuracloud', 'network']) do
+
+  @switches_format = {
+    'Index'          => Integer,
+    'ID'             => String,
+    'Name'           => String,
+    'ServerCount'    => Integer,
+    'ApplianceCount' => Integer,
+    'Subnets'        => Array
+  }
+
+  tests('success') do
+
+    tests('#list_switches') do
+      switches = sakuracloud_network_service.list_switches
+      test 'returns a Hash' do
+        switches.body.is_a? Hash
+      end
+      if Fog.mock?
+        tests('Switches').formats(@switches_format, false) do
+          switches.body['Switches'].first
+        end
+      else
+        returns(200) { switches.status }
+        returns(true) { switches.body.is_a? Hash }
+      end
+    end
+  end
+end
+
+Shindo.tests('Fog::Network[:sakuracloud] | create_switch request', ['sakuracloud', 'network']) do
+  tests('success') do
+    tests('#create_simple_switch') do
+      switch = sakuracloud_network_service.create_switch(:name => 'foobar')
+      test 'returns a Hash' do
+        switch.body.is_a? Hash
+      end
+
+      unless Fog.mock?
+        returns(201) { switch.status }
+        returns(true) { switch.body.is_a? Hash }
+      end
+    end
+  end
+end

data/tests/sakuracloud/requests/volume/archives_tests.rb

@@ -12,7 +12,7 @@ Shindo.tests('Fog::Volume[:sakuracloud] | list_archives request', ['sakuracloud'
   tests('success') do
 
     tests('#list_archives') do
-      archives = volume_service.list_archives
+      archives = sakuracloud_volume_service.list_archives
       test 'returns a Hash' do
         archives.body.is_a? Hash
       end

data/tests/sakuracloud/requests/volume/disks_tests.rb

@@ -14,7 +14,7 @@ Shindo.tests('Fog::Volume[:sakuracloud] | list_disks request', ['sakuracloud', '
   tests('success') do
 
     tests('#list_disks') do
-      disks = volume_service.list_disks
+      disks = sakuracloud_volume_service.list_disks
       test 'returns a Hash' do
         disks.body.is_a? Hash
       end
@@ -33,7 +33,7 @@ end
 Shindo.tests('Fog::Volume[:sakuracloud] | create_disks request', ['sakuracloud', 'volume']) do
   tests('success') do
     tests('#create_disks') do
-      disks = volume_service.create_disk('foobar', 4, 112500463685)
+      disks = sakuracloud_volume_service.create_disk('foobar', 4, 112500463685)
       test 'returns a Hash' do
         disks.body.is_a? Hash
       end

data/tests/sakuracloud/requests/volume/plans_tests.rb

@@ -11,7 +11,7 @@ Shindo.tests('Fog::Volume[:sakuracloud] | list_plans request', ['sakuracloud', '
   tests('success') do
 
     tests('#list_plans') do
-      diskplans = volume_service.list_plans
+      diskplans = sakuracloud_volume_service.list_plans
       test 'returns a Hash' do
         diskplans.body.is_a? Hash
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-sakuracloud
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-08 00:00:00.000000000 Z
+date: 2014-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -252,6 +252,7 @@ files:
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
+- Gemfile.edge
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -268,12 +269,17 @@ 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/router.rb
+- lib/fog/sakuracloud/models/network/routers.rb
+- lib/fog/sakuracloud/models/network/switch.rb
+- lib/fog/sakuracloud/models/network/switches.rb
 - lib/fog/sakuracloud/models/volume/archive.rb
 - lib/fog/sakuracloud/models/volume/archives.rb
 - lib/fog/sakuracloud/models/volume/disk.rb
 - lib/fog/sakuracloud/models/volume/disks.rb
 - lib/fog/sakuracloud/models/volume/plan.rb
 - lib/fog/sakuracloud/models/volume/plans.rb
+- lib/fog/sakuracloud/network.rb
 - lib/fog/sakuracloud/requests/compute/boot_server.rb
 - lib/fog/sakuracloud/requests/compute/create_server.rb
 - lib/fog/sakuracloud/requests/compute/delete_server.rb
@@ -282,6 +288,12 @@ 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/create_router.rb
+- lib/fog/sakuracloud/requests/network/create_switch.rb
+- lib/fog/sakuracloud/requests/network/delete_router.rb
+- lib/fog/sakuracloud/requests/network/delete_switch.rb
+- lib/fog/sakuracloud/requests/network/list_routers.rb
+- lib/fog/sakuracloud/requests/network/list_switches.rb
 - lib/fog/sakuracloud/requests/volume/attach_disk.rb
 - lib/fog/sakuracloud/requests/volume/configure_disk.rb
 - lib/fog/sakuracloud/requests/volume/create_disk.rb
@@ -292,11 +304,12 @@ files:
 - lib/fog/sakuracloud/version.rb
 - lib/fog/sakuracloud/volume.rb
 - tests/helper.rb
-- tests/sakuracloud/helper.rb
 - tests/sakuracloud/requests/compute/plans_tests.rb
 - tests/sakuracloud/requests/compute/servers_tests.rb
 - tests/sakuracloud/requests/compute/ssh_keys_tests.rb
 - tests/sakuracloud/requests/compute/zones_tests.rb
+- tests/sakuracloud/requests/network/routers_tests.rb
+- tests/sakuracloud/requests/network/switches_tests.rb
 - tests/sakuracloud/requests/volume/archives_tests.rb
 - tests/sakuracloud/requests/volume/disks_tests.rb
 - tests/sakuracloud/requests/volume/plans_tests.rb

data/tests/sakuracloud/helper.rb

@@ -1,7 +0,0 @@
-def volume_service
-  Fog::Volume[:sakuracloud]
-end
-
-def compute_service
-  Fog::Compute[:sakuracloud]
-end