fog-sakuracloud 1.3.3 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc87e35240b373e929ee71398d01f06ad7823e9c
-  data.tar.gz: 636eace3ef92c43bf63f8bd5c087333e2416f1e4
+  metadata.gz: 0f179bb5fe911c507374a15fd4244bcc3a3a8cb5
+  data.tar.gz: ee254916549f9391ef89bf8e87cdd0c40381dba4
 SHA512:
-  metadata.gz: f0b3d8c49c7fa7dc74fe291c8272672a8ac655979743cd94388f7603f110c0c03fb2b059d672fc6658938b21775d8e8cdb9a656f31781c990cab6ed5c652982b
-  data.tar.gz: 37e9719543fa6a7f990c7d4fff6ef330b0ec899d995659a9fbb68ebfd35bcd0c79525b41eb96e2ddcbcb5ea4e7e9b76c68bd4141bc2c585e5b06f6ba4a21aa82
+  metadata.gz: 9c4d0e4e4bab316d496b91939dea5f1e54032ef83f3aac68262063633d9fa84f0fad382bb7d5c43a7d476644a5a90ca74df0af65034b0729ae1cadb28943a4ef
+  data.tar.gz: 3ce680b80b8855ecf9d192f88978bebcd36e4c545f1f18c910b487f68ab2f8a14eb8bc54ba3a1baab123fa743f2d0b6b085717520e1d57226a7ad175a10a6138

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog of fog-sakuracloud
 
+## v1.4.0
+
+- Feature: #17 Support Standard Disk Plan for Disk creation HT: @noralife
+- Feature: #18 Add attach feature to Disk Model HT: @noralife
+
 ## v1.3.3
 
 - Typo: Fix typo ( auth_encord -> auth_encode ) #16 HT: @mazgi

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

@@ -44,10 +44,12 @@ module Fog
             Fog::Logger.warning("Create Volume")
             sakuracloud_api_token        = options[:sakuracloud_api_token] || Fog.credentials[:sakuracloud_api_token]
             sakuracloud_api_token_secret = options[:sakuracloud_api_token_secret] || Fog.credentials[:sakuracloud_api_token_secret]
+            size_mb = options[:volume][:size_mb].to_i || 20480
             volume = Fog::Volume::SakuraCloud.new(:sakuracloud_api_token => sakuracloud_api_token, :sakuracloud_api_token_secret => sakuracloud_api_token_secret)
             disk = volume.disks.create :name => Fog::UUID.uuid,
                                 :plan  => options[:volume][:diskplan].to_i,
-                                :source_archive => options[:volume][:sourcearchive].to_s
+                                :source_archive => options[:volume][:sourcearchive].to_s,
+                                :size_mb => size_mb
             Fog::Logger.warning("Waiting disk until available")
             disk.wait_for { availability == 'available' }
             volume.attach_disk(disk.id, server.id)

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

@@ -20,8 +20,12 @@ module Fog
         alias_method :destroy, :delete
 
         def save
-          requires :name, :plan, :source_archive
-          data = service.create_disk(@attributes[:name], @attributes[:plan], @attributes[:source_archive]).body["Disk"]
+          requires :name, :plan
+          options = {
+            :source_archive => source_archive,
+            :size_mb => size_mb
+          } 
+          data = service.create_disk(name, plan, options).body["Disk"]
           merge_attributes(data)
           true
         end
@@ -38,6 +42,11 @@ module Fog
           true
         end
 
+        def attach(server_id)
+          service.attach_disk(id, server_id)
+          true
+        end
+
         def associate_ip(ipaddress, networkmasklen, defaultroute)
           subnet ={
             :ipaddress => ipaddress,

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

@@ -4,24 +4,22 @@ module Fog
   module Volume
     class SakuraCloud
       class Real
-        def create_disk( name, plan, sourcearchive )
-          body = {
-           "Disk" => {
-             "Name" => name,
-             "SourceArchive" => {
-               "ID" => sourcearchive.to_s
-              },
-              "Plan" => {
-                "ID" => plan.to_i
-              }
-            }
-          }
+        def create_disk( name, plan, options = {} )
+          body = { "Disk" => { "Name" => name, "Plan" => { "ID" => plan.to_i } } }
+
+          if !options[:source_archive].nil?
+            body["Disk"]["SourceArchive"] = { "ID"=>options[:source_archive].to_s }
+          end
+
+          if !options[:size_mb].nil?
+            body["Disk"]["SizeMB"] = options[:size_mb].to_i
+          end
 
           request(
             :headers => {
               'Authorization' => "Basic #{@auth_encode}"
             },
-            :expects  => [202],
+            :expects  => [201, 202],
             :method => 'POST',
             :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/disk",
             :body => Fog::JSON.encode(body)
@@ -30,7 +28,7 @@ module Fog
       end # Real
 
       class Mock
-        def create_disk( name, plan, sourcearchive )
+        def create_disk( name, plan, options = {} )
           response = Excon::Response.new
           response.status = 202
           response.body = {

data/lib/fog/sakuracloud/version.rb

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

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

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

metadata

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