fog-sakuracloud 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f179bb5fe911c507374a15fd4244bcc3a3a8cb5
-  data.tar.gz: ee254916549f9391ef89bf8e87cdd0c40381dba4
+  metadata.gz: 44007b32b6e17b0fe4a28c84c57bc4e8848b4da6
+  data.tar.gz: f091a5cfcd6e290c829dc31502dd3a146bb8c31c
 SHA512:
-  metadata.gz: 9c4d0e4e4bab316d496b91939dea5f1e54032ef83f3aac68262063633d9fa84f0fad382bb7d5c43a7d476644a5a90ca74df0af65034b0729ae1cadb28943a4ef
-  data.tar.gz: 3ce680b80b8855ecf9d192f88978bebcd36e4c545f1f18c910b487f68ab2f8a14eb8bc54ba3a1baab123fa743f2d0b6b085717520e1d57226a7ad175a10a6138
+  metadata.gz: fa9b69bdb76aabcec1945c580ec77bd267562473309101a5920978dc1177df88a032f455dff0fad173918cec77f854efb079cbc1247177f69ce4a91db9c0baf7
+  data.tar.gz: 386799b76c599ba970b03c7d91f3449beaa943775bb798827f0469792d8fa53a6a7cc907f69893ecd56e3f773fd08ac4923862cf829931a9d00604362b93412a

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog of fog-sakuracloud
 
+## v1.5.0
+
+- Feature: # Add new option api_zone to Provider to select zone easily.
+
 ## v1.4.0
 
 - Feature: #17 Support Standard Disk Plan for Disk creation HT: @noralife

data/lib/fog/sakuracloud.rb

@@ -22,8 +22,6 @@ module Fog
     extend Fog::Provider
 
     SAKURACLOUD_API_VERSION = '1.1' unless defined? SAKURACLOUD_API_VERSION
-    SAKURACLOUD_API_ZONE = "is1b" unless defined? SAKURACLOUD_API_ZONE
-    SAKURACLOUD_API_ENDPOINT = "/cloud/zone/#{SAKURACLOUD_API_ZONE}/api/cloud/#{SAKURACLOUD_API_VERSION}/"
 
     # Miscs
     ## Startup Script
@@ -34,5 +32,20 @@ module Fog
     service(:network, 'Network')
     service(:script,  'Script')
     service(:dns,     'DNS')
+
+
+    def self.api_zones
+      @api_zones ||= ['tk1a','is1b', 'is1b', 'tk1v']
+    end
+
+    def self.validate_api_zone!(api_zone, host=nil)
+      if !api_zones.include?(api_zone)
+        raise ArgumentError, "Unknown api_zone: #{api_zone.inspect}"
+      end
+    end
+
+    def self.build_endpoint(api_zone)
+      "/cloud/zone/#{api_zone}/api/cloud/#{SAKURACLOUD_API_VERSION}/"
+    end
   end
 end

data/lib/fog/sakuracloud/compute.rb

@@ -4,7 +4,7 @@ module Fog
       requires     :sakuracloud_api_token
       requires     :sakuracloud_api_token_secret
 
-      recognizes   :sakuracloud_api_url
+      recognizes   :sakuracloud_api_url, :api_zone
 
       model_path 'fog/sakuracloud/models/compute'
       model      :server
@@ -36,6 +36,8 @@ module Fog
           Fog.credentials[:sakuracloud_api_token_secret] = options[:sakuracloud_api_token_secret]
 
           @sakuracloud_api_url = options[:sakuracloud_api_url] || 'https://secure.sakura.ad.jp'
+          @api_zone            = options[:api_zone] || 'is1b'
+          Fog::SakuraCloud.validate_api_zone!(@api_zone)
 
           @connection = Fog::Core::Connection.new(@sakuracloud_api_url)
         end

data/lib/fog/sakuracloud/dns.rb

@@ -4,7 +4,7 @@ module Fog
       requires     :sakuracloud_api_token
       requires     :sakuracloud_api_token_secret
 
-      recognizes   :sakuracloud_api_url
+      recognizes   :sakuracloud_api_url, :api_zone
 
       model_path 'fog/sakuracloud/models/dns'
       model      :zone
@@ -26,6 +26,8 @@ module Fog
           Fog.credentials[:sakuracloud_api_token_secret] = options[:sakuracloud_api_token_secret]
 
           @sakuracloud_api_url = options[:sakuracloud_api_url] || 'https://secure.sakura.ad.jp'
+          @api_zone            = options[:api_zone] || 'is1b'
+          Fog::SakuraCloud.validate_api_zone!(@api_zone)
 
           @connection = Fog::Core::Connection.new(@sakuracloud_api_url)
         end

data/lib/fog/sakuracloud/models/volume/plan.rb

@@ -6,6 +6,7 @@ module Fog
       class Plan < Fog::Model
         identity :id, :aliases => 'ID'
         attribute :name, :aliases => 'Name'
+        attribute :size, :aliases => 'Size'
       end
     end
   end

data/lib/fog/sakuracloud/network.rb

@@ -4,7 +4,7 @@ module Fog
       requires     :sakuracloud_api_token
       requires     :sakuracloud_api_token_secret
 
-      recognizes   :sakuracloud_api_url
+      recognizes   :sakuracloud_api_url, :api_zone
 
       model_path 'fog/sakuracloud/models/network'
       model      :router
@@ -36,6 +36,8 @@ module Fog
           Fog.credentials[:sakuracloud_api_token_secret] = options[:sakuracloud_api_token_secret]
 
           @sakuracloud_api_url = options[:sakuracloud_api_url] || 'https://secure.sakura.ad.jp'
+          @api_zone            = options[:api_zone] || 'is1b'
+          Fog::SakuraCloud.validate_api_zone!(@api_zone)
 
           @connection = Fog::Core::Connection.new(@sakuracloud_api_url)
         end

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

@@ -11,7 +11,7 @@ module Fog
             },
             :expects  => [200],
             :method => 'PUT',
-            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/server/#{id}/power"
+            :path => "#{Fog::SakuraCloud.build_endpoint(@api_zone)}/server/#{id}/power"
           )
           true
         end

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

@@ -32,7 +32,7 @@ module Fog
             },
             :expects  => [201],
             :method => 'POST',
-            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/server",
+            :path => "#{Fog::SakuraCloud.build_endpoint(@api_zone)}/server",
             :body => Fog::JSON.encode(body)
           )
         end

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

@@ -13,7 +13,7 @@ module Fog
             },
             :expects  => [200],
             :method => 'DELETE',
-            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/server/#{id}",
+            :path => "#{Fog::SakuraCloud.build_endpoint(@api_zone)}/server/#{id}",
             :body => Fog::JSON.encode(body)
           )
         end

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

@@ -10,7 +10,7 @@ module Fog
               'Authorization' => "Basic #{@auth_encode}"
             },
             :method => 'GET',
-            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/product/server"
+            :path => "#{Fog::SakuraCloud.build_endpoint(@api_zone)}/product/server"
           )
         end
       end

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

@@ -10,7 +10,7 @@ module Fog
               'Authorization' => "Basic #{@auth_encode}"
             },
             :method => 'GET',
-            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/server"
+            :path => "#{Fog::SakuraCloud.build_endpoint(@api_zone)}/server"
           )
         end
       end

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

@@ -10,7 +10,7 @@ module Fog
               'Authorization' => "Basic #{@auth_encode}"
             },
             :method => 'GET',
-            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/sshkey"
+            :path => "#{Fog::SakuraCloud.build_endpoint(@api_zone)}/sshkey"
           )
         end
       end

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

@@ -10,7 +10,7 @@ module Fog
               'Authorization' => "Basic #{@auth_encode}"
             },
             :method => 'GET',
-            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/zone"
+            :path => "#{Fog::SakuraCloud.build_endpoint(@api_zone)}/zone"
           )
         end
       end

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

@@ -16,7 +16,7 @@ module Fog
             },
             :expects  => [200,202],
             :method => 'DELETE',
-            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/server/#{id}/power",
+            :path => "#{Fog::SakuraCloud.build_endpoint(@api_zone)}/server/#{id}/power",
             :body => Fog::JSON.encode(body)
           )
           true

data/lib/fog/sakuracloud/requests/dns/create_zone.rb

@@ -26,7 +26,7 @@ module Fog
             },
             :expects  => 201,
             :method => 'POST',
-            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/commonserviceitem",
+            :path => "#{Fog::SakuraCloud.build_endpoint(@api_zone)}/commonserviceitem",
             :body => Fog::JSON.encode(body)
           )
         end

data/lib/fog/sakuracloud/requests/dns/delete_zone.rb

@@ -11,7 +11,7 @@ module Fog
             },
             :expects  => [200],
             :method => 'DELETE',
-            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/commonserviceitem/#{id}"
+            :path => "#{Fog::SakuraCloud.build_endpoint(@api_zone)}/commonserviceitem/#{id}"
           )
         end
       end # Real

data/lib/fog/sakuracloud/requests/dns/list_zones.rb

@@ -15,7 +15,7 @@ module Fog
               'Authorization' => "Basic #{@auth_encode}"
             },
             :method => 'GET',
-            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/commonserviceitem",
+            :path => "#{Fog::SakuraCloud.build_endpoint(@api_zone)}/commonserviceitem",
             :query => URI.encode(Fog::JSON.encode(filter))
           )
         end

data/lib/fog/sakuracloud/requests/dns/modify_zone.rb

@@ -17,7 +17,7 @@ module Fog
             },
             :expects  => 200,
             :method => 'PUT',
-            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/commonserviceitem/#{options[:id]}",
+            :path => "#{Fog::SakuraCloud.build_endpoint(@api_zone)}/commonserviceitem/#{options[:id]}",
             :body => Fog::JSON.encode(body)
           )
         end

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

@@ -11,7 +11,7 @@ module Fog
             },
             :expects  => [200],
             :method => 'PUT',
-            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/interface/#{id}/to/switch/#{switch_id}"
+            :path => "#{Fog::SakuraCloud.build_endpoint(@api_zone)}/interface/#{id}/to/switch/#{switch_id}"
           )
           response.body['Interface']['ID']
         end

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

@@ -21,7 +21,7 @@ module Fog
             },
             :expects  => 202,
             :method => 'POST',
-            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/internet",
+            :path => "#{Fog::SakuraCloud.build_endpoint(@api_zone)}/internet",
             :body => Fog::JSON.encode(body)
           )
         end

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

@@ -17,7 +17,7 @@ module Fog
             },
             :expects  => 201,
             :method => 'POST',
-            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/switch",
+            :path => "#{Fog::SakuraCloud.build_endpoint(@api_zone)}/switch",
             :body => Fog::JSON.encode(body)
           )
         end

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

@@ -11,7 +11,7 @@ module Fog
             },
             :expects  => [200],
             :method => 'DELETE',
-            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/interface/#{id}"
+            :path => "#{Fog::SakuraCloud.build_endpoint(@api_zone)}/interface/#{id}"
           )
         end
       end # Real

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

@@ -11,7 +11,7 @@ module Fog
             },
             :expects  => [200],
             :method => 'DELETE',
-            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/internet/#{id}"
+            :path => "#{Fog::SakuraCloud.build_endpoint(@api_zone)}/internet/#{id}"
           )
         end
       end # Real

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

@@ -11,7 +11,7 @@ module Fog
             },
             :expects  => [200],
             :method => 'DELETE',
-            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/switch/#{id}"
+            :path => "#{Fog::SakuraCloud.build_endpoint(@api_zone)}/switch/#{id}"
           )
         end
       end # Real

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

@@ -19,7 +19,7 @@ module Fog
               'Authorization' => "Basic #{@auth_encode}"
             },
             :method => 'GET',
-            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/interface",
+            :path => "#{Fog::SakuraCloud.build_endpoint(@api_zone)}/interface",
             :query => URI.encode(Fog::JSON.encode(filter))
           )
         end

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

@@ -10,7 +10,7 @@ module Fog
               'Authorization' => "Basic #{@auth_encode}"
             },
             :method => 'GET',
-            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/internet"
+            :path => "#{Fog::SakuraCloud.build_endpoint(@api_zone)}/internet"
           )
         end
       end

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

@@ -10,7 +10,7 @@ module Fog
               'Authorization' => "Basic #{@auth_encode}"
             },
             :method => 'GET',
-            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/switch"
+            :path => "#{Fog::SakuraCloud.build_endpoint(@api_zone)}/switch"
           )
         end
       end

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

@@ -19,7 +19,7 @@ module Fog
             },
             :expects  => [201],
             :method => 'POST',
-            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/interface",
+            :path => "#{Fog::SakuraCloud.build_endpoint(@api_zone)}/interface",
             :body => Fog::JSON.encode(body)
           )
           response.body['Interface']['ID']

data/lib/fog/sakuracloud/requests/script/create_note.rb

@@ -18,7 +18,7 @@ module Fog
             },
             :expects  => 201,
             :method => 'POST',
-            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/note",
+            :path => "#{Fog::SakuraCloud.build_endpoint(@api_zone)}/note",
             :body => Fog::JSON.encode(body)
           )
         end

data/lib/fog/sakuracloud/requests/script/delete_note.rb

@@ -11,7 +11,7 @@ module Fog
             },
             :expects  => [200],
             :method => 'DELETE',
-            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/note/#{id}"
+            :path => "#{Fog::SakuraCloud.build_endpoint(@api_zone)}/note/#{id}"
           )
         end
       end # Real

data/lib/fog/sakuracloud/requests/script/list_notes.rb

@@ -10,7 +10,7 @@ module Fog
               'Authorization' => "Basic #{@auth_encode}"
             },
             :method => 'GET',
-            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/note"
+            :path => "#{Fog::SakuraCloud.build_endpoint(@api_zone)}/note"
           )
         end
       end

data/lib/fog/sakuracloud/requests/script/modify_note.rb

@@ -18,7 +18,7 @@ module Fog
             },
             :expects  => [200],
             :method => 'PUT',
-            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/note/#{options[:id]}",
+            :path => "#{Fog::SakuraCloud.build_endpoint(@api_zone)}/note/#{options[:id]}",
             :body => Fog::JSON.encode(body)
           )
         end

data/lib/fog/sakuracloud/requests/volume/associate_ip_to_disk.rb

@@ -19,7 +19,7 @@ module Fog
             },
             :expects  => [200],
             :method => 'PUT',
-            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/disk/#{disk_id.to_s}/config",
+            :path => "#{Fog::SakuraCloud.build_endpoint(@api_zone)}/disk/#{disk_id.to_s}/config",
             :body => Fog::JSON.encode(body)
           )
         end

data/lib/fog/sakuracloud/requests/volume/attach_disk.rb

@@ -11,7 +11,7 @@ module Fog
             },
             :expects  => [200],
             :method => 'PUT',
-            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/disk/#{disk_id.to_s}/to/server/#{server_id.to_s}"
+            :path => "#{Fog::SakuraCloud.build_endpoint(@api_zone)}/disk/#{disk_id.to_s}/to/server/#{server_id.to_s}"
           )
         end
       end # Real

data/lib/fog/sakuracloud/requests/volume/carve_hostname_on_disk.rb

@@ -15,7 +15,7 @@ module Fog
             },
             :expects  => [200],
             :method => 'PUT',
-            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/disk/#{disk_id.to_s}/config",
+            :path => "#{Fog::SakuraCloud.build_endpoint(@api_zone)}/disk/#{disk_id.to_s}/config",
             :body => Fog::JSON.encode(body)
           )
         end

data/lib/fog/sakuracloud/requests/volume/configure_disk.rb

@@ -15,7 +15,7 @@ module Fog
             },
             :expects  => [200],
             :method => 'PUT',
-            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/disk/#{disk_id.to_s}/config",
+            :path => "#{Fog::SakuraCloud.build_endpoint(@api_zone)}/disk/#{disk_id.to_s}/config",
             :body => Fog::JSON.encode(body)
           )
         end

data/lib/fog/sakuracloud/requests/volume/create_disk.rb

@@ -21,7 +21,7 @@ module Fog
             },
             :expects  => [201, 202],
             :method => 'POST',
-            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/disk",
+            :path => "#{Fog::SakuraCloud.build_endpoint(@api_zone)}/disk",
             :body => Fog::JSON.encode(body)
           )
         end

data/lib/fog/sakuracloud/requests/volume/delete_disk.rb

@@ -11,7 +11,7 @@ module Fog
             },
             :expects  => [200],
             :method => 'DELETE',
-            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/disk/#{id}"
+            :path => "#{Fog::SakuraCloud.build_endpoint(@api_zone)}/disk/#{id}"
           )
         end
       end # Real

data/lib/fog/sakuracloud/requests/volume/list_archives.rb

@@ -10,7 +10,7 @@ module Fog
               'Authorization' => "Basic #{@auth_encode}"
             },
             :method => 'GET',
-            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/archive"
+            :path => "#{Fog::SakuraCloud.build_endpoint(@api_zone)}/archive"
           )
         end
       end

data/lib/fog/sakuracloud/requests/volume/list_disks.rb

@@ -10,7 +10,7 @@ module Fog
               'Authorization' => "Basic #{@auth_encode}"
             },
             :method => 'GET',
-            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/disk"
+            :path => "#{Fog::SakuraCloud.build_endpoint(@api_zone)}/disk"
           )
         end
       end

data/lib/fog/sakuracloud/requests/volume/list_plans.rb

@@ -10,7 +10,7 @@ module Fog
               'Authorization' => "Basic #{@auth_encode}"
             },
             :method => 'GET',
-            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/product/disk"
+            :path => "#{Fog::SakuraCloud.build_endpoint(@api_zone)}/product/disk"
           )
         end
       end
@@ -20,16 +20,32 @@ module Fog
           response = Excon::Response.new
           response.status = 200
           response.body = {
-          "DiskPlans" =>
+            "DiskPlans" =>
             [
-            {"Index"=>0,
-              "ID"=>4,
-              "Name"=>"SSDプラン",
-              "Availability"=>"available"},
-            {"Index"=>1,
-              "ID"=>2,
-              "Name"=>"標準プラン",
-              "Availability"=>"available"}
+              {"Index"=>0,
+               "ID"=>4,
+               "Name"=>"SSDプラン",
+               "Availability"=>"available",
+               "Size"=>
+               [{"SizeMB"=>20480, "DisplaySize"=>20, "DisplaySuffix"=>"GB", "Availability"=>"available", "ServiceClass"=>"cloud/disk/ssd/20g"},
+                {"SizeMB"=>102400, "DisplaySize"=>100, "DisplaySuffix"=>"GB", "Availability"=>"available", "ServiceClass"=>"cloud/disk/ssd/100g"},
+                {"SizeMB"=>256000, "DisplaySize"=>250, "DisplaySuffix"=>"GB", "Availability"=>"available", "ServiceClass"=>"cloud/disk/ssd/250g"},
+                {"SizeMB"=>512000, "DisplaySize"=>500, "DisplaySuffix"=>"GB", "Availability"=>"available", "ServiceClass"=>"cloud/disk/ssd/500g"}]},
+              {"Index"=>1,
+               "ID"=>2,
+               "Name"=>"標準プラン",
+               "Availability"=>"available",
+               "Size"=>
+               [{"SizeMB"=>40960, "DisplaySize"=>40, "DisplaySuffix"=>"GB", "Availability"=>"available", "ServiceClass"=>"cloud/disk/iscsi/40g"},
+                {"SizeMB"=>61440, "DisplaySize"=>60, "DisplaySuffix"=>"GB", "Availability"=>"available", "ServiceClass"=>"cloud/disk/iscsi/60g"},
+                {"SizeMB"=>81920, "DisplaySize"=>80, "DisplaySuffix"=>"GB", "Availability"=>"available", "ServiceClass"=>"cloud/disk/iscsi/80g"},
+                {"SizeMB"=>102400, "DisplaySize"=>100, "DisplaySuffix"=>"GB", "Availability"=>"available", "ServiceClass"=>"cloud/disk/iscsi/100g"},
+                {"SizeMB"=>256000, "DisplaySize"=>250, "DisplaySuffix"=>"GB", "Availability"=>"available", "ServiceClass"=>"cloud/disk/iscsi/250g"},
+                {"SizeMB"=>512000, "DisplaySize"=>500, "DisplaySuffix"=>"GB", "Availability"=>"available", "ServiceClass"=>"cloud/disk/iscsi/500g"},
+                {"SizeMB"=>768000, "DisplaySize"=>750, "DisplaySuffix"=>"GB", "Availability"=>"available", "ServiceClass"=>"cloud/disk/iscsi/750g"},
+                {"SizeMB"=>1048576, "DisplaySize"=>1, "DisplaySuffix"=>"TB", "Availability"=>"available", "ServiceClass"=>"cloud/disk/iscsi/1t"},
+                {"SizeMB"=>2097152, "DisplaySize"=>2, "DisplaySuffix"=>"TB", "Availability"=>"available", "ServiceClass"=>"cloud/disk/iscsi/2t"},
+                {"SizeMB"=>4194304, "DisplaySize"=>4, "DisplaySuffix"=>"TB", "Availability"=>"available", "ServiceClass"=>"cloud/disk/iscsi/4t"}]}
             ]
           }
           response

data/lib/fog/sakuracloud/requests/volume/register_note_to_disk.rb

@@ -15,7 +15,7 @@ module Fog
             },
             :expects  => [200],
             :method => 'PUT',
-            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/disk/#{disk_id.to_s}/config",
+            :path => "#{Fog::SakuraCloud.build_endpoint(@api_zone)}/disk/#{disk_id.to_s}/config",
             :body => Fog::JSON.encode(body)
           )
         end

data/lib/fog/sakuracloud/script.rb

@@ -4,7 +4,7 @@ module Fog
       requires     :sakuracloud_api_token
       requires     :sakuracloud_api_token_secret
 
-      recognizes   :sakuracloud_api_url
+      recognizes   :sakuracloud_api_url, :api_zone
 
       model_path 'fog/sakuracloud/models/script'
       model      :note
@@ -26,6 +26,8 @@ module Fog
           Fog.credentials[:sakuracloud_api_token_secret] = options[:sakuracloud_api_token_secret]
 
           @sakuracloud_api_url = options[:sakuracloud_api_url] || 'https://secure.sakura.ad.jp'
+          @api_zone            = options[:api_zone] || 'is1b'
+          Fog::SakuraCloud.validate_api_zone!(@api_zone)
 
           @connection = Fog::Core::Connection.new(@sakuracloud_api_url)
         end

data/lib/fog/sakuracloud/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Sakuracloud
-    VERSION = "1.4.0"
+    VERSION = "1.5.0"
   end
 end

data/lib/fog/sakuracloud/volume.rb

@@ -4,7 +4,7 @@ module Fog
       requires     :sakuracloud_api_token
       requires     :sakuracloud_api_token_secret
 
-      recognizes   :sakuracloud_api_url
+      recognizes   :sakuracloud_api_url, :api_zone
 
       model_path 'fog/sakuracloud/models/volume'
       model      :archive
@@ -36,6 +36,8 @@ module Fog
           Fog.credentials[:sakuracloud_api_token_secret] = options[:sakuracloud_api_token_secret]
 
           @sakuracloud_api_url = options[:sakuracloud_api_url] || 'https://secure.sakura.ad.jp'
+          @api_zone            = options[:api_zone] || 'is1b'
+          Fog::SakuraCloud.validate_api_zone!(@api_zone)
 
           @connection = Fog::Core::Connection.new(@sakuracloud_api_url)
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-sakuracloud
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-18 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core