fog-brightbox 0.6.1 → 0.7.0

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

@@ -12,7 +12,6 @@ module Fog
         def list_user_collaborations
           wrapped_request("get", "/1.0/user/collaborations", [200])
         end
-
       end
     end
   end

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

@@ -12,7 +12,6 @@ module Fog
         def list_users
           wrapped_request("get", "/1.0/users", [200])
         end
-
       end
     end
   end

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

@@ -12,7 +12,6 @@ module Fog
         def list_zones
           wrapped_request("get", "/1.0/zones", [200])
         end
-
       end
     end
   end

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

@@ -12,7 +12,6 @@ module Fog
           return nil if identifier.nil? || identifier == ""
           wrapped_request("put", "/1.0/database_servers/#{identifier}/lock_resource", [200])
         end
-
       end
     end
   end

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

@@ -12,7 +12,6 @@ module Fog
           return nil if identifier.nil? || identifier == ""
           wrapped_request("put", "/1.0/database_snapshots/#{identifier}/lock_resource", [200])
         end
-
       end
     end
   end

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

@@ -12,7 +12,6 @@ module Fog
           return nil if identifier.nil? || identifier == ""
           wrapped_request("put", "/1.0/images/#{identifier}/lock_resource", [200])
         end
-
       end
     end
   end

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

@@ -12,7 +12,6 @@ module Fog
           return nil if identifier.nil? || identifier == ""
           wrapped_request("put", "/1.0/load_balancers/#{identifier}/lock_resource", [200])
         end
-
       end
     end
   end

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

@@ -12,7 +12,6 @@ module Fog
           return nil if identifier.nil? || identifier == ""
           wrapped_request("put", "/1.0/servers/#{identifier}/lock_resource", [200])
         end
-
       end
     end
   end

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

@@ -17,7 +17,6 @@ module Fog
           return nil if identifier.nil? || identifier == ""
           wrapped_request("post", "/1.0/cloud_ips/#{identifier}/map", [202], options)
         end
-
       end
     end
   end

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

@@ -29,7 +29,6 @@ module Fog
           return nil if identifier.nil? || identifier == ""
           wrapped_request("post", "/1.0/server_groups/#{identifier}/move_servers", [202], options)
         end
-
       end
     end
   end

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

@@ -14,7 +14,6 @@ module Fog
           return nil if identifier.nil? || identifier == ""
           wrapped_request("post", "/1.0/servers/#{identifier}/reboot", [202])
         end
-
       end
     end
   end

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

@@ -14,7 +14,6 @@ module Fog
           return nil if identifier.nil? || identifier == ""
           wrapped_request("post", "/1.0/user/collaborations/#{identifier}/reject", [200])
         end
-
       end
     end
   end

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

@@ -17,7 +17,6 @@ module Fog
           return nil if identifier.nil? || identifier == ""
           wrapped_request("post", "/1.0/firewall_policies/#{identifier}/remove", [202], options)
         end
-
       end
     end
   end

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

@@ -17,7 +17,6 @@ module Fog
           return nil if identifier.nil? || identifier == ""
           wrapped_request("post", "/1.0/load_balancers/#{identifier}/remove_listeners", [202], options)
         end
-
       end
     end
   end

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

@@ -17,7 +17,6 @@ module Fog
           return nil if identifier.nil? || identifier == ""
           wrapped_request("post", "/1.0/load_balancers/#{identifier}/remove_nodes", [202], options)
         end
-
       end
     end
   end

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

@@ -27,7 +27,6 @@ module Fog
           return nil if identifier.nil? || identifier == ""
           wrapped_request("post", "/1.0/server_groups/#{identifier}/remove_servers", [202], options)
         end
-
       end
     end
   end

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

@@ -14,7 +14,6 @@ module Fog
           return nil if identifier.nil? || identifier == ""
           wrapped_request("post", "/1.0/collaborations/#{identifier}/resend", [200])
         end
-
       end
     end
   end

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

@@ -2,7 +2,6 @@ module Fog
   module Compute
     class Brightbox
       class Real
-
         # Reset the image library ftp password for the account.
         #
         # @note The response is the only time the new password is available in plaintext.
@@ -25,7 +24,6 @@ module Fog
             wrapped_request("post", "/1.0/accounts/#{identifier}/reset_ftp_password", [200])
           end
         end
-
       end
     end
   end

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

@@ -12,7 +12,6 @@ module Fog
           wrapped_request("post", "/1.0/account/reset_ftp_password", [200])
         end
       end
-
     end
   end
 end

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

@@ -12,7 +12,6 @@ module Fog
           return nil if identifier.nil? || identifier == ""
           wrapped_request("post", "/1.0/database_servers/#{identifier}/reset_password", [202])
         end
-
       end
     end
   end

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

@@ -18,7 +18,6 @@ module Fog
           return nil if identifier.nil? || identifier == ""
           wrapped_request("post", "/1.0/api_clients/#{identifier}/reset_secret", [200])
         end
-
       end
     end
   end

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

@@ -14,7 +14,6 @@ module Fog
           return nil if identifier.nil? || identifier == ""
           wrapped_request("post", "/1.0/applications/#{identifier}/reset_secret", [200])
         end
-
       end
     end
   end

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

@@ -14,7 +14,6 @@ module Fog
           return nil if identifier.nil? || identifier == ""
           wrapped_request("post", "/1.0/servers/#{identifier}/reset", [202])
         end
-
       end
     end
   end

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

@@ -14,7 +14,6 @@ module Fog
           return nil if identifier.nil? || identifier == ""
           wrapped_request("post", "/1.0/servers/#{identifier}/shutdown", [202])
         end
-
       end
     end
   end

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

@@ -3,16 +3,32 @@ module Fog
     class Brightbox
       class Real
         # @param [String] identifier Unique reference to identify the resource
+        # @param [Hash] options
+        # @option options [Boolean] :return_link Return the Link header as a second return value
         #
         # @return [Hash] if successful Hash version of JSON object
         #
         # @see https://api.gb1.brightbox.com/1.0/#database_server_snapshot_database_server
         #
-        def snapshot_database_server(identifier)
+        def snapshot_database_server(identifier, options = {})
           return nil if identifier.nil? || identifier == ""
-          wrapped_request("post", "/1.0/database_servers/#{identifier}/snapshot", [202])
-        end
 
+          method = "POST"
+          path = "/1.0/database_servers/#{identifier}/snapshot"
+          expected = [202]
+
+          if options[:return_link]
+            request_parameters = {
+              :method => method, :path => path, :expects => expected
+            }
+            response = request(request_parameters)
+            data = Fog::JSON.decode(response.body)
+            image_id = Fog::Brightbox::LinkHelper.new(response.headers["Link"]).identifier
+            return data, image_id
+          else
+            wrapped_request(method, path, expected)
+          end
+        end
       end
     end
   end

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

@@ -5,16 +5,32 @@ module Fog
         # Will issue a request to snapshot the Server
         #
         # @param [String] identifier Unique reference to identify the resource
+        # @param [Hash] options
+        # @option options [Boolean] :return_link Return the Link header as a second return value
         #
         # @return [Hash] if successful Hash version of JSON object
         #
         # @see https://api.gb1.brightbox.com/1.0/#server_snapshot_server
         #
-        def snapshot_server(identifier)
+        def snapshot_server(identifier, options = {})
           return nil if identifier.nil? || identifier == ""
-          wrapped_request("post", "/1.0/servers/#{identifier}/snapshot", [202])
-        end
 
+          method = "POST"
+          path = "/1.0/servers/#{identifier}/snapshot"
+          expected = [202]
+
+          if options[:return_link]
+            request_parameters = {
+              :method => method, :path => path, :expects => expected
+            }
+            response = request(request_parameters)
+            data = Fog::JSON.decode(response.body)
+            image_id = Fog::Brightbox::LinkHelper.new(response.headers["Link"]).identifier
+            return data, image_id
+          else
+            wrapped_request(method, path, expected)
+          end
+        end
       end
     end
   end

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

@@ -14,7 +14,6 @@ module Fog
           return nil if identifier.nil? || identifier == ""
           wrapped_request("post", "/1.0/servers/#{identifier}/start", [202])
         end
-
       end
     end
   end

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

@@ -14,7 +14,6 @@ module Fog
           return nil if identifier.nil? || identifier == ""
           wrapped_request("post", "/1.0/servers/#{identifier}/stop", [202])
         end
-
       end
     end
   end

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

@@ -12,7 +12,6 @@ module Fog
           return nil if identifier.nil? || identifier == ""
           wrapped_request("put", "/1.0/database_servers/#{identifier}/unlock_resource", [200])
         end
-
       end
     end
   end

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

@@ -12,7 +12,6 @@ module Fog
           return nil if identifier.nil? || identifier == ""
           wrapped_request("put", "/1.0/database_snapshots/#{identifier}/unlock_resource", [200])
         end
-
       end
     end
   end

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

@@ -12,7 +12,6 @@ module Fog
           return nil if identifier.nil? || identifier == ""
           wrapped_request("put", "/1.0/images/#{identifier}/unlock_resource", [200])
         end
-
       end
     end
   end

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

@@ -12,7 +12,6 @@ module Fog
           return nil if identifier.nil? || identifier == ""
           wrapped_request("put", "/1.0/load_balancers/#{identifier}/unlock_resource", [200])
         end
-
       end
     end
   end

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

@@ -12,7 +12,6 @@ module Fog
           return nil if identifier.nil? || identifier == ""
           wrapped_request("put", "/1.0/servers/#{identifier}/unlock_resource", [200])
         end
-
       end
     end
   end

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

@@ -14,7 +14,6 @@ module Fog
           return nil if identifier.nil? || identifier == ""
           wrapped_request("post", "/1.0/cloud_ips/#{identifier}/unmap", [202])
         end
-
       end
     end
   end

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

@@ -54,7 +54,6 @@ module Fog
             wrapped_request("put", "/1.0/accounts/#{identifier}", [200], options)
           end
         end
-
       end
     end
   end

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

@@ -19,7 +19,6 @@ module Fog
           return nil if options.empty? || options.nil?
           wrapped_request("put", "/1.0/api_clients/#{identifier}", [200], options)
         end
-
       end
     end
   end

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

@@ -19,7 +19,6 @@ module Fog
           return nil if options.empty? || options.nil?
           wrapped_request("put", "/1.0/applications/#{identifier}", [200], options)
         end
-
       end
     end
   end

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

@@ -20,7 +20,6 @@ module Fog
           return nil if options.empty? || options.nil?
           wrapped_request("put", "/1.0/cloud_ips/#{identifier}", [200], options)
         end
-
       end
     end
   end

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

@@ -18,7 +18,6 @@ module Fog
           return nil if options.empty? || options.nil?
           wrapped_request("put", "/1.0/database_servers/#{identifier}", [200], options)
         end
-
       end
     end
   end

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

@@ -19,7 +19,6 @@ module Fog
           return nil if options.empty? || options.nil?
           wrapped_request("put", "/1.0/database_snapshots/#{identifier}", [200], options)
         end
-
       end
     end
   end

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

@@ -19,7 +19,6 @@ module Fog
           return nil if options.empty? || options.nil?
           wrapped_request("put", "/1.0/firewall_policies/#{identifier}", [200], options)
         end
-
       end
     end
   end

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

@@ -24,7 +24,6 @@ module Fog
           return nil if options.empty? || options.nil?
           wrapped_request("put", "/1.0/firewall_rules/#{identifier}", [202], options)
         end
-
       end
     end
   end