vagrant-sakura 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5d2e7d9a658717576fbeea2ae64172521419c3b66e5e0235c6f175d76406376
-  data.tar.gz: fa60c01b3fec7e7287954b1f8bddeeadd6ae3c2150292d9dae879f34de929028
+  metadata.gz: d22e25b1c8c50029c3ef7f7a0bbbea128e7a00c2c757cc1ae409130b4ffaf31f
+  data.tar.gz: eb8dc65a8d9a2db5a84f301d40992f8a3e2304b91b5728eb2a8ace1365e9d62d
 SHA512:
-  metadata.gz: c54c6ad3a43e1b77fd5dbcaf3af8070c33a2aa01ee5bddd1fd0ae475b72bf654543848500740d201c15d69e5b411895e32c07b1cf3d044e15f884935e8247ad4
-  data.tar.gz: aa62290db7c612547abbad5f7e0d25bc7316f5bce6dc80edd65d00c1768dedfce1df480c6e5af1581d442d7ec768849ac0ae11bcf21e6d9ba01b3d5f1615e021
+  metadata.gz: f047c7707680c375c5e475746eba2378e1f6c19f93a89729556db79fdba26fd7077c9bf11c197e43815de1eba51fe630e30312761521af5259b4f8fc5f3d8283
+  data.tar.gz: 83d44513679b2afc8b004b7184366e11af83c36e0cb5e3237d242abb6c1328ea3094e660da8f6af65ed56fc98ec17523776c0efbddb8acd39ee297f2d54e5b59

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.3.0 (2018/11/5)
+
+- Use new disk-edit API (#40)
+
 ## 0.2.1 (2018/09/27)
 
 - Re-released due to maintainer's error.  This release as the same commit as v0.2.0.

data/README.md

@@ -195,7 +195,9 @@ $ vagrant sakura-list-id
 
 - ``disk_source_archive`` - サーバで利用するディスクのベースとするアーカイブのID (※`os_type`とは同時に指定できません)
 - ``server_name`` - サーバ名
-- ``server_plan`` - 作成するサーバのプラン ID
+- ``server_plan`` - 作成するサーバのプラン ID(**非推奨** 代わりに`server_core`と`server_memory`を利用してください)
+- ``server_core`` - 作成するサーバのコア数(デフォルト: `1`)
+- ``server_memory`` - 作成するサーバのメモリサイズ(GB単位、デフォルト: `1`)
 - ``packet_filter`` - 作成するサーバに適用するパケットフィルタ ID
 - ``startup_scripts`` - 作成するサーバに適用するスタートアップスクリプト ID(リスト)
 - ``enable_pw_auth`` - パスワード認証の有効化(デフォルト: `false`)

data/lib/vagrant-sakura/action/run_instance.rb

@@ -19,8 +19,9 @@ module VagrantPlugins
           server_name = env[:machine].provider_config.server_name
           server_name ||= env[:machine].name
           server_plan = env[:machine].provider_config.server_plan
+          server_core = env[:machine].provider_config.server_core
+          server_memory = env[:machine].provider_config.server_memory
           disk_plan = env[:machine].provider_config.disk_plan
-          disk_source_mode = env[:machine].provider_config.disk_source_mode
           os_type = env[:machine].provider_config.os_type
           disk_source_archive = env[:machine].provider_config.disk_source_archive
           sshkey_id = env[:machine].provider_config.sshkey_id
@@ -34,7 +35,12 @@ module VagrantPlugins
 
           env[:ui].info(I18n.t("vagrant_sakura.creating_instance"))
           env[:ui].info(" -- Server Name: #{server_name}")
-          env[:ui].info(" -- Server Plan: #{server_plan}")
+          if server_plan
+            env[:ui].info(" -- Server Plan: #{server_plan}")
+          else
+            env[:ui].info(" -- Server Core: #{server_core}")
+            env[:ui].info(" -- Server Memory: #{server_memory}")
+          end
           env[:ui].info(" -- Disk Plan: #{disk_plan}")
           env[:ui].info(" -- Disk Source OS Type: #{os_type}") if os_type
           env[:ui].info(" -- Disk Source Archive: #{disk_source_archive}")
@@ -45,8 +51,55 @@ module VagrantPlugins
 
           api = env[:sakura_api]
 
+          data = {
+              "Server" => {
+                  "Name" => server_name,
+                  "ServerPlan" => { "ID" => server_plan },
+                  "ConnectedSwitches" => [
+                      { "Scope" => "shared", "BandWidthMbps" => 100 }
+                  ],
+                  "Tags" => tags,
+                  "Description" => description
+              }
+          }
+          if server_plan
+            data["Server"]["ServerPlan"] = { "ID" => server_plan }
+          else
+            data["Server"]["ServerPlan"] = {
+                "CPU" => server_core,
+                "MemoryMB" => server_memory * 1024
+            }
+          end
+          unless env[:machine].provider_config.disk_id
+            data["Server"]["WaitDiskMigration"] = true
+          end
+
+          response = api.post("/server", data)
+          unless response["Server"]["ID"]
+            raise 'no Server ID returned'
+          end
+          env[:machine].id = serverid = response["Server"]["ID"]
+          interface_id = response["Server"]["Interfaces"][0]["ID"]
+          # Server Created
+
+          unless packet_filter.empty?
+            response = api.put("/interface/#{interface_id}/to/packetfilter/#{packet_filter}")
+            # Packet Filter connected to Server
+          end
+
           if env[:machine].provider_config.disk_id
             diskid = env[:machine].provider_config.disk_id
+
+            begin
+              response = api.put("/disk/#{diskid}/to/server/#{serverid}")
+                # Disk mounted to Server
+            rescue VagrantPlugins::Sakura::Driver::NotFoundError
+              terminate(env)
+              raise
+            end
+
+            # Power On
+            response = api.put("/server/#{serverid}/power")
           else
             data = {
               "Disk" => {
@@ -56,10 +109,32 @@ module VagrantPlugins
                 "SourceArchive" => {
                   "ID" => disk_source_archive
                 },
+                "Server" => {
+                    "ID" => serverid
+                },
                 "Tags" => tags,
                 "Description" => description
-              }
+              },
+              "BootAtAvailable" => true
             }
+
+            config = {
+                "UserSubnet" => {},
+                "Notes" => startup_scripts,
+                "DisablePWAuth" => !enable_pw_auth
+            }
+            if sshkey_id
+              config["SSHKey"] = { "ID" => sshkey_id }
+            elsif public_key_path
+              config["SSHKey"] = { "PublicKey" => File.read(public_key_path) }
+            elsif use_insecure_key
+              pubkey = Vagrant.source_root.join("keys", "vagrant.pub").read.chomp
+              config["SSHKey"] = { "PublicKey" => pubkey }
+            else
+              raise 'failsafe'
+            end
+            data["Config"] = config
+
             response = api.post("/disk", data)
             unless response["Disk"]["ID"]
               raise 'no Disk ID returned'
@@ -83,59 +158,6 @@ module VagrantPlugins
             end
           end
 
-          data = {
-            "Server" => {
-              "Name" => server_name,
-              "ServerPlan" => { "ID" => server_plan },
-              "ConnectedSwitches" => [
-                { "Scope" => "shared", "BandWidthMbps" => 100 }
-              ],
-              "Tags" => tags,
-              "Description" => description
-            }
-          }
-          response = api.post("/server", data)
-          unless response["Server"]["ID"]
-            raise 'no Server ID returned'
-          end
-          env[:machine].id = serverid = response["Server"]["ID"]
-          interface_id = response["Server"]["Interfaces"][0]["ID"]
-          # Server Created
-
-          unless packet_filter.empty?
-            response = api.put("/interface/#{interface_id}/to/packetfilter/#{packet_filter}")
-            # Packet Filter connected to Server
-          end
-
-          begin
-            response = api.put("/disk/#{diskid}/to/server/#{serverid}")
-            # Disk mounted to Server
-          rescue VagrantPlugins::Sakura::Driver::NotFoundError
-            terminate(env)
-            raise
-          end
-
-          data = {
-            "UserSubnet" => {},
-            "Notes" => startup_scripts,
-            "DisablePWAuth" => !enable_pw_auth
-          }
-          if sshkey_id
-            data["SSHKey"] = { "ID" => sshkey_id }
-          elsif public_key_path
-            data["SSHKey"] = { "PublicKey" => File.read(public_key_path) }
-          elsif use_insecure_key
-            pubkey = Vagrant.source_root.join("keys", "vagrant.pub").read.chomp
-            data["SSHKey"] = { "PublicKey" => pubkey }
-          else
-            raise 'failsafe'
-          end
-
-          response = api.put("/disk/#{diskid}/config", data)
-          # Config
-
-          response = api.put("/server/#{serverid}/power")
-          # Power On
 
           if !env[:interrupted]
             # Wait for SSH to be ready.

data/lib/vagrant-sakura/config.rb

@@ -47,10 +47,23 @@ module VagrantPlugins
       attr_accessor :server_name
 
       # The Plan ID of the server.
-      # 
+      #
+      # @deprecated Use {#server_core} and {#server_memory} instead.
       # @return [Fixnum]
       attr_accessor :server_plan
 
+      # The number of cores.
+      #
+      # @return [Fixnum]
+      attr_accessor :server_core
+
+      # The number of memories.
+      # unit: GB
+      #
+      # @deprecated Use {#server_core} and {#server_memory} instead.
+      # @return [Fixnum]
+      attr_accessor :server_memory
+
       # The resource ID of the SSH public key to login the server.
       # 
       # @return [String]
@@ -104,6 +117,8 @@ module VagrantPlugins
         @public_key_path     = UNSET_VALUE
         @server_name         = UNSET_VALUE
         @server_plan         = UNSET_VALUE
+        @server_core         = UNSET_VALUE
+        @server_memory       = UNSET_VALUE
         @sshkey_id           = UNSET_VALUE
         @use_insecure_key    = UNSET_VALUE
         @enable_pw_auth      = UNSET_VALUE
@@ -167,7 +182,13 @@ module VagrantPlugins
         end
 
         if @server_plan == UNSET_VALUE
-          @server_plan = 1001  # 1Core-1GB - cheapest
+          @server_plan = nil
+        end
+        if @server_core == UNSET_VALUE
+          @server_core = 1
+        end
+        if @server_memory == UNSET_VALUE
+          @server_memory = 1
         end
 
         @sshkey_id = nil if @sshkey_id == UNSET_VALUE

data/lib/vagrant-sakura/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Sakura
-    VERSION = "0.2.1"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-sakura
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Tomoyuki Sahara
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-27 00:00:00.000000000 Z
+date: 2018-11-05 00:00:00.000000000 Z
 dependencies: []
 description: Enables Vagrant to manage machines in Sakura Cloud.
 email:
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Enables Vagrant to manage machines in Sakura Cloud.