fog-brightbox 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ba0fd5a2af49de6bfd1c985302496ca96f0368c
-  data.tar.gz: 59f4dec412be2a7f9bd2f77585e4c045f62741a0
+  metadata.gz: 9c828f450aae49fe5ef940159c7cdaee50804594
+  data.tar.gz: 6ab4e5663ebb90199b0e01b8d38cf117479c4d27
 SHA512:
-  metadata.gz: 6df22c1e489650cbf363a0c12f1a382235293108dc145ca089fb996d1720fed5a0e0de11e0120374102d75c4980541db203f681169f8af40ec0aa0729250017a
-  data.tar.gz: 8c186b06909f62c6d395a4ce85bfaa190ece428d761859dee413bc1b883ae4145282e15bb114d330bdadbad57ef495d30dde860d68c98b520b0915af371c929b
+  metadata.gz: d7ba85e84d50f9689c9262836196c02629e470613d26cbd403c0319f16cc513bc09d06ca8d7f0e4762cbe2dec4f0dc4212058bb9289e35702c3d27a20e480381
+  data.tar.gz: 19d9f5dfac3c1825c9bc21749a1baf5ff68c4f0b87a3a210c519dd90837c2e0fcf19a008a6c037ed4ebf106cbbf4d9543873d798abf2a3b29f124a17b1849e9b

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+### 0.3.0 / 2014-08-12
+
+Enhancements:
+
+* Use improved reset and reboot requests for the `Server#reboot` method
+  allowing requests without having to fake restarts with a start/stop. This
+  keeps the VNC console active.
+
 ### 0.2.0 / 2014-08-07
 
 Enhancements:

data/lib/fog/brightbox/compute.rb

@@ -144,6 +144,7 @@ module Fog
       request :lock_resource_server
       request :map_cloud_ip
       request :move_servers_server_group
+      request :reboot_server
       request :reject_user_collaboration
       request :remove_listeners_load_balancer
       request :remove_nodes_load_balancer
@@ -154,6 +155,7 @@ module Fog
       request :reset_password_database_server
       request :reset_secret_api_client
       request :reset_secret_application
+      request :reset_server
       request :resend_collaboration
       request :reject_user_collaboration
       request :shutdown_server

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

@@ -74,21 +74,26 @@ module Fog
           service.snapshot_server(identity)
         end
 
-        # Directly requesting a server reboot is not supported in the API
-        # so needs to attempt a shutdown/stop, wait and start again.
+        # Issues a hard reset to the server (or an OS level reboot command)
         #
         # Default behaviour is a hard reboot because it is more reliable
         # because the state of the server's OS is irrelevant.
         #
+        # @example Hard reset
+        #   @server.reboot
+        #
+        # @example Soft reset
+        #   @server.reboot(false)
+        #
         # @param [Boolean] use_hard_reboot
         # @return [Boolean]
         def reboot(use_hard_reboot = true)
           requires :identity
           if ready?
             if use_hard_reboot
-              hard_reboot
+              service.reset_server(identity)
             else
-              soft_reboot
+              service.reboot_server(identity)
             end
           else
             # Not able to reboot if not ready in the first place
@@ -188,30 +193,6 @@ module Fog
         def mapping_identity
           interfaces.first["id"]
         end
-
-        private
-
-        # Hard reboots are fast, avoiding the OS by doing a "power off"
-        def hard_reboot
-          stop
-          wait_for { !ready? }
-          start
-        end
-
-        # Soft reboots often timeout if the OS missed the request so we do more
-        # error checking trying to detect the timeout
-        #
-        # @todo Needs cleaner error handling when the OS times out
-        def soft_reboot
-          shutdown
-          # FIXME: Using side effect of wait_for's (evaluated block) to detect timeouts
-          begin
-            wait_for(20) { !ready? }
-            start
-          rescue Fog::Errors::Timeout
-            false
-          end
-        end
       end
     end
   end

data/lib/fog/brightbox/requests/compute/reboot_server.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Compute
+    class Brightbox
+      class Real
+        # Shuts down and resets the server without disconnecting the console.
+        #
+        # @param [String] identifier Unique reference to identify the resource
+        #
+        # @return [Hash] if successful Hash version of JSON object
+        #
+        # @see https://api.gb1.brightbox.com/1.0/#server_reboot_server
+        #
+        def reboot_server(identifier)
+          return nil if identifier.nil? || identifier == ""
+          wrapped_request("post", "/1.0/servers/#{identifier}/reboot", [202])
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/brightbox/requests/compute/reset_server.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Compute
+    class Brightbox
+      class Real
+        # Resets the server without disconnecting the console.
+        #
+        # @param [String] identifier Unique reference to identify the resource
+        #
+        # @return [Hash] if successful Hash version of JSON object
+        #
+        # @see https://api.gb1.brightbox.com/1.0/#server_reset_server
+        #
+        def reset_server(identifier)
+          return nil if identifier.nil? || identifier == ""
+          wrapped_request("post", "/1.0/servers/#{identifier}/reset", [202])
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/brightbox/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Brightbox
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-brightbox
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Paul Thornthwaite
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-07 00:00:00.000000000 Z
+date: 2014-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -263,6 +263,7 @@ files:
 - lib/fog/brightbox/requests/compute/lock_resource_server.rb
 - lib/fog/brightbox/requests/compute/map_cloud_ip.rb
 - lib/fog/brightbox/requests/compute/move_servers_server_group.rb
+- lib/fog/brightbox/requests/compute/reboot_server.rb
 - lib/fog/brightbox/requests/compute/reject_user_collaboration.rb
 - lib/fog/brightbox/requests/compute/remove_firewall_policy.rb
 - lib/fog/brightbox/requests/compute/remove_listeners_load_balancer.rb
@@ -274,6 +275,7 @@ files:
 - lib/fog/brightbox/requests/compute/reset_password_database_server.rb
 - lib/fog/brightbox/requests/compute/reset_secret_api_client.rb
 - lib/fog/brightbox/requests/compute/reset_secret_application.rb
+- lib/fog/brightbox/requests/compute/reset_server.rb
 - lib/fog/brightbox/requests/compute/shutdown_server.rb
 - lib/fog/brightbox/requests/compute/snapshot_database_server.rb
 - lib/fog/brightbox/requests/compute/snapshot_server.rb