fog-sakuracloud 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 897104786361cfe690b7b1f2578965818d31ad6f
-  data.tar.gz: 0541082923de0d63f41810c91082a669e0cf50ac
+  metadata.gz: 3713f5daf69fb6aeff433b4b744b57c8d8ca5236
+  data.tar.gz: 5554058a97ba7bdb41a6113b572c6edc39ddadbb
 SHA512:
-  metadata.gz: 464144e6b2575d09c15de82220f4044780d1c19fac34e546ae297bac95efa0796d5174b0fe9334c1ca14e546701a110f70fd8f837648b173baf5767f15e9ef86
-  data.tar.gz: ff5d5db70886fa695d67aa8fa03da6ed2b28ce1fb031e47c3c27fd82ac3993e595e776a2ca95a4a81434c756f36ea8ef6e7345b51a1cb7ffaac12fdc4d4994c0
+  metadata.gz: 86709dec8f30c696e647f59a118f411bef6b5fcac34db1c65aeeeecd645e76cd697d5f87a69462dbef5a6a85f50f1b22c516c760075faf2c031b95257a7cb9f1
+  data.tar.gz: c8dd0f52ec47ecaf8ef876c8f4e6dc14667b231e8d958e22c0a4d45cbf6c292a6fca910380c35abd5320477032db7db77fd5bc63dfdb2f89298dd1da0ce4b1cb

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog of fog-sakuracloud
 
+## v1.7.0
+
+- Change: Rebuild router model from internet resource.
+
 ## v1.6.0
 
 - Miscs: Wrap request for error messages to be readable. #22

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

@@ -7,13 +7,9 @@ module Fog
         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
+        attribute :networkmasklen, :aliases => 'NetworkMaskLen'
+        attribute :bandwidthmbps, :aliases => 'BandWidthMbps'
+        attribute :switch, :aliases => 'Switch'
 
 
         def delete
@@ -25,10 +21,13 @@ module Fog
         def save
           requires :name, :networkmasklen
           Fog::Logger.warning("Create Router with public subnet")
-          data = service.create_router(@attributes).body["Internet"]
+          attached_switch = service.create_router(@attributes).body["Internet"]
           Fog::Logger.warning("Waiting available new router...")
-          new_data = router_available?(service, data["ID"])
-          merge_attributes(new_data)
+          new_data = switch_available?(service, attached_switch["ID"])
+          puts ::JSON.pretty_generate new_data
+          id = new_data['internet']['ID']
+          merge_attributes(new_data['internet'])
+          self.reload
           true
         end
 
@@ -36,7 +35,11 @@ module Fog
           service.collect_monitor_router(identity, start_time, end_time).body["Data"]
         end
 
-        def router_available?(network, router_id)
+        def change_bandwidth(bandwidth)
+          service.change_router_bandwidth(identity, bandwidth).body["Success"]
+        end
+
+        def switch_available?(network, router_id)
           until network.switches.find {|r| r.internet != nil && r.internet["ID"] == router_id}
             print '.'
             sleep 2

data/lib/fog/sakuracloud/network.rb

@@ -19,6 +19,7 @@ module Fog
       request      :create_router
       request      :delete_router
       request      :collect_monitor_router
+      request      :change_router_bandwidth
       request      :list_switches
       request      :create_switch
       request      :delete_switch

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

@@ -0,0 +1,40 @@
+# coding: utf-8
+
+module Fog
+  module Network
+    class SakuraCloud
+      class Real
+        def change_router_bandwidth( id, bandwidthmbps )
+          body = {
+            "Internet" => {
+              "BandWidthMbps" => bandwidthmbps
+            }
+          }
+
+          request(
+            :headers => {
+              'Authorization' => "Basic #{@auth_encode}"
+            },
+            :expects  => [200],
+            :method => 'PUT',
+            :path => "#{Fog::SakuraCloud.build_endpoint(@api_zone)}/internet/#{id}/bandwidth",
+            :body => Fog::JSON.encode(body)
+          )
+        end
+      end # Real
+
+      class Mock
+        def change_router_bandwidth( id, bandwidthmbps )
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            "Internet"=>{"ID"=>"112701091977"},
+            "Success"=>true,
+            "is_ok"=>true
+          }
+          response
+        end
+      end # Mock
+    end # SakuraCloud
+  end # Network
+end # Fog

data/lib/fog/sakuracloud/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Sakuracloud
-    VERSION = "1.6.0"
+    VERSION = "1.7.0"
   end
 end

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

@@ -5,9 +5,9 @@ Shindo.tests('Fog::Network[:sakuracloud] | list_routers request', ['sakuracloud'
     'Index'          => Integer,
     'ID'             => String,
     'Name'           => String,
-    'ServerCount'    => Integer,
-    'ApplianceCount' => Integer,
-    'Subnets'        => Array
+    'BandWidthMbps'  => Integer,
+    'NetworkMaskLen' => Integer,
+    'Switch'         => Hash
   }
 
   @routers_list_format = {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-sakuracloud
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-20 00:00:00.000000000 Z
+date: 2015-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -251,6 +251,7 @@ files:
 - lib/fog/sakuracloud/requests/dns/delete_zone.rb
 - lib/fog/sakuracloud/requests/dns/list_zones.rb
 - lib/fog/sakuracloud/requests/dns/modify_zone.rb
+- lib/fog/sakuracloud/requests/network/change_router_bandwidth.rb
 - lib/fog/sakuracloud/requests/network/collect_monitor_router.rb
 - lib/fog/sakuracloud/requests/network/connect_interface_to_switch.rb
 - lib/fog/sakuracloud/requests/network/create_router.rb