fog 1.1.0 → 1.2.0

data/tests/brightbox/requests/compute/helper.rb

@@ -2,6 +2,7 @@ module Fog
   module Brightbox
     module Nullable
       module Account; end
+      module FirewallPolicy; end
       module Image; end
       module Interface; end
       module LoadBalancer; end
@@ -14,6 +15,9 @@ end
 Hash.send :include, Fog::Brightbox::Nullable::Account
 NilClass.send :include, Fog::Brightbox::Nullable::Account
 
+Hash.send :include, Fog::Brightbox::Nullable::FirewallPolicy
+NilClass.send :include, Fog::Brightbox::Nullable::FirewallPolicy
+
 Hash.send :include, Fog::Brightbox::Nullable::Image
 NilClass.send :include, Fog::Brightbox::Nullable::Image
 
@@ -32,14 +36,36 @@ NilClass.send :include, Fog::Brightbox::Nullable::Zone
 class Brightbox
   module Compute
     module TestSupport
-      IMAGE_IDENTIFER = "img-2ab98" # Ubuntu Lucid 10.04 server (i686)
+      # Find a suitable image for testing with
+      # For speed of server building we're using an empty image
+      def self.image_id
+        return @image_id unless @image_id.nil?
+        images = Fog::Compute[:brightbox].list_images
+        raise "No available images!" if images.empty?
+        image = images.select {|img| img.size == 0 }.first
+        image = images.first if image.nil?
+        @image_id = image["id"]
+      end
+
+      # Prepare a test server, wait for it to be usable but raise if it fails
+      def self.get_test_server
+        test_server_options = {:image_id => image_id}
+        server = Fog::Compute[:brightbox].servers.create(test_server_options)
+        server.wait_for {
+          raise "Test server failed to build" if state == "failed"
+          ready?
+        }
+        server
+      end
+
     end
     module Formats
       module Struct
         LB_LISTENER = {
           "in"              => Integer,
           "out"             => Integer,
-          "protocol"        => String
+          "protocol"        => String,
+          "timeout"         => Integer
         }
         LB_HEALTHCHECK = {
           "type"            => String,
@@ -84,7 +110,9 @@ class Brightbox
           "resource_type"   => String,
           "url"             => String,
           "name"            => String,
-          "default"         => Fog::Boolean
+          "default"         => Fog::Boolean,
+          "created_at"      => String,
+          "description"     => Fog::Nullable::String
         }
 
         FIREWALL_RULE = {
@@ -111,7 +139,7 @@ class Brightbox
           "source"          => String,
           "status"          => String,
           "owner"           => String,
-          "username"        => Fog::Nullable::String,
+          "username"        => Fog::Nullable::String
         }
 
         INTERFACE = {
@@ -123,6 +151,16 @@ class Brightbox
           "mac_address"     => String
         }
 
+        LOAD_BALANCER = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => String,
+          "status"          => String,
+          "created_at"      => String,
+          "deleted_at"      => Fog::Nullable::String
+        }
+
         SERVER = {
           "id"              => String,
           "resource_type"   => String,
@@ -143,7 +181,8 @@ class Brightbox
           "name"            => String,
           "created_at"      => String,
           "default"         => Fog::Boolean,
-          "description"     => Fog::Nullable::String
+          "description"     => Fog::Nullable::String,
+          "created_at"      => String
         }
 
         SERVER_TYPE = {
@@ -235,17 +274,18 @@ class Brightbox
           "source_type"     => String,
           "status"          => String,
           "owner"           => String,
+          "username"        => Fog::Nullable::String,
           "public"          => Fog::Boolean,
           "official"        => Fog::Boolean,
           "compatibility_mode" => Fog::Boolean,
           "virtual_size"    => Integer,
           "disk_size"       => Integer,
+          "min_ram"         => Fog::Nullable::Integer,
           "ancestor"        => Fog::Brightbox::Nullable::Image,
           "username"        => Fog::Nullable::String
         }
 
         LOAD_BALANCER = {
-          "cloud_ips"       => Array,
           "id"              => String,
           "resource_type"   => String,
           "url"             => String,
@@ -253,9 +293,10 @@ class Brightbox
           "status"          => String,
           "created_at"      => String,
           "deleted_at"      => Fog::Nullable::String,
+          "cloud_ips"       => [Brightbox::Compute::Formats::Nested::CLOUD_IP],
           "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT,
-          "nodes"           => [Brightbox::Compute::Formats::Nested::SERVER],
-          "cloud_ips"       => [Brightbox::Compute::Formats::Nested::CLOUD_IP]
+          "listeners"       => [Brightbox::Compute::Formats::Struct::LB_LISTENER],
+          "nodes"           => [Brightbox::Compute::Formats::Nested::SERVER]
         }
 
         SERVER = {
@@ -287,8 +328,10 @@ class Brightbox
           "name"            => String,
           "description"     => Fog::Nullable::String,
           "default"         => Fog::Boolean,
+          "created_at"      => String,
           "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT,
-          "servers"         => [Brightbox::Compute::Formats::Nested::SERVER]
+          "servers"         => [Brightbox::Compute::Formats::Nested::SERVER],
+          "firewall_policy" => Fog::Brightbox::Nullable::FirewallPolicy
         }
 
         SERVER_TYPE = {
@@ -357,6 +400,10 @@ class Brightbox
           "users"           => [Brightbox::Compute::Formats::Nested::USER],
           "clients"         => [Brightbox::Compute::Formats::Nested::API_CLIENT],
           "servers"         => [Brightbox::Compute::Formats::Nested::SERVER],
+          "load_balancers"  => [Brightbox::Compute::Formats::Nested::LOAD_BALANCER],
+          "cloud_ips"       => [Brightbox::Compute::Formats::Nested::CLOUD_IP],
+          "server_groups"   => [Brightbox::Compute::Formats::Nested::SERVER_GROUP],
+          "firewall_policies" => [Brightbox::Compute::Formats::Nested::FIREWALL_POLICY],
           "images"          => [Brightbox::Compute::Formats::Nested::IMAGE],
           "zones"           => [Brightbox::Compute::Formats::Nested::ZONE]
         }
@@ -421,11 +468,13 @@ class Brightbox
           "source_type"     => String,
           "status"          => String,
           "owner"           => String, # Account ID not object
+          "username"        => Fog::Nullable::String,
           "public"          => Fog::Boolean,
           "official"        => Fog::Boolean,
           "compatibility_mode"   => Fog::Boolean,
           "virtual_size"    => Integer,
           "disk_size"       => Integer,
+          "min_ram"         => Fog::Nullable::Integer,
           "ancestor"        => Fog::Brightbox::Nullable::Image,
           "username"        => Fog::Nullable::String
         }
@@ -477,7 +526,7 @@ class Brightbox
           "snapshots"       => [Brightbox::Compute::Formats::Nested::IMAGE],
           "server_groups"   => [Brightbox::Compute::Formats::Nested::SERVER_GROUP],
           "interfaces"      => [Brightbox::Compute::Formats::Nested::INTERFACE],
-          "zone"            => Brightbox::Compute::Formats::Nested::ZONE,
+          "zone"            => Fog::Brightbox::Nullable::Zone,
           "username"        => Fog::Nullable::String
         }
 
@@ -489,8 +538,10 @@ class Brightbox
           "name"            => String,
           "description"     => Fog::Nullable::String,
           "default"         => Fog::Boolean,
+          "created_at"      => String,
           "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT,
-          "servers"         => [Brightbox::Compute::Formats::Nested::SERVER]
+          "servers"         => [Brightbox::Compute::Formats::Nested::SERVER],
+          "firewall_policy" => Fog::Brightbox::Nullable::FirewallPolicy
         }
 
         SERVER_TYPE = {

data/tests/brightbox/requests/compute/image_tests.rb

@@ -7,35 +7,38 @@ Shindo.tests('Fog::Compute[:brightbox] | image requests', ['brightbox']) do
     #   "arch" => "i686",
     #   "source" => "fnord"
     # }
-    # tests("#create_image(#{creation_options.inspect})").formats(Brightbox::Compute::Formats::Full::IMAGE) do
-    #   data = Fog::Compute[:brightbox].create_image(creation_options)
-    #   @image_id = data["id"]
-    #   data
+    # tests("#create_image(#{creation_options.inspect})")
+    #   result = Fog::Compute[:brightbox].create_image(creation_options)
+    #   @image_id = result["id"]
+    #   formats(Brightbox::Compute::Formats::Full::IMAGE) { result }
     # end
 
     # Fog::Compute[:brightbox].images.get(@image_id).wait_for { ready? }
 
-    tests("#list_images").formats(Brightbox::Compute::Formats::Collection::IMAGES) do
+    tests("#list_images") do
       pending if Fog.mocking?
-      data = Fog::Compute[:brightbox].list_images
-      @image_id = data.first["id"]
-      data
+      result = Fog::Compute[:brightbox].list_images
+      @image_id = result.first["id"]
+      formats(Brightbox::Compute::Formats::Collection::IMAGES, false) { result }
     end
 
-    tests("#get_image('#{@image_id}')").formats(Brightbox::Compute::Formats::Full::IMAGE) do
+    tests("#get_image('#{@image_id}')") do
       pending if Fog.mocking?
-      Fog::Compute[:brightbox].get_image(@image_id)
+      result = Fog::Compute[:brightbox].get_image(@image_id)
+      formats(Brightbox::Compute::Formats::Full::IMAGE, false) { result }
     end
 
     ## Until Image creation can be automated, we shouldn't be updating Images randomly
     # update_options = {}
-    # tests("#update_image('#{@image_id}', #{update_options.inspect})").formats(Brightbox::Compute::Formats::Full::IMAGE) do
-    #   Fog::Compute[:brightbox].update_image(@image_id, :name => "New name from Fog test")
+    # tests("#update_image('#{@image_id}', #{update_options.inspect})") do
+    #   result = Fog::Compute[:brightbox].update_image(@image_id, :name => "New name from Fog test")
+    #   formats(Brightbox::Compute::Formats::Full::IMAGE) { result }
     # end
 
     ## Same as other tests - can't be deleting them unless part of the test run
-    # tests("#destroy_server('#{@image_id}')").formats(Brightbox::Compute::Formats::Full::IMAGE) do
-    #   Fog::Compute[:brightbox].destroy_image(@image_id)
+    # tests("#destroy_server('#{@image_id}')") do
+    #   result = Fog::Compute[:brightbox].destroy_image(@image_id)
+    #   formats(Brightbox::Compute::Formats::Full::IMAGE) { result }
     # end
 
   end

data/tests/brightbox/requests/compute/interface_tests.rb

@@ -7,9 +7,10 @@ Shindo.tests('Fog::Compute[:brightbox] | interface requests', ['brightbox']) do
       @interface_id = server.interfaces.first["id"]
     end
 
-    tests("#get_interface('#{@interface_id}')").formats(Brightbox::Compute::Formats::Full::INTERFACE) do
+    tests("#get_interface('#{@interface_id}')") do
       pending if Fog.mocking?
-      Fog::Compute[:brightbox].get_interface(@interface_id)
+      result = Fog::Compute[:brightbox].get_interface(@interface_id)
+      formats(Brightbox::Compute::Formats::Full::INTERFACE, false) { result }
     end
 
   end

data/tests/brightbox/requests/compute/load_balancer_tests.rb

@@ -3,7 +3,7 @@ Shindo.tests('Fog::Compute[:brightbox] | load balancer requests', ['brightbox'])
   tests('success') do
 
     unless Fog.mocking?
-      @node = Fog::Compute[:brightbox].servers.create(:image_id => Brightbox::Compute::TestSupport::IMAGE_IDENTIFER)
+      @node = Brightbox::Compute::TestSupport.get_test_server
       node_id = @node.id
     end
 
@@ -22,34 +22,80 @@ Shindo.tests('Fog::Compute[:brightbox] | load balancer requests', ['brightbox'])
       }
     }
 
-    tests("#create_load_balancer(#{create_options.inspect})").formats(Brightbox::Compute::Formats::Full::LOAD_BALANCER) do
+    tests("#create_load_balancer(#{create_options.inspect})") do
       pending if Fog.mocking?
-      data = Fog::Compute[:brightbox].create_load_balancer(create_options)
-      @load_balancer_id = data["id"]
-      data
+      result = Fog::Compute[:brightbox].create_load_balancer(create_options)
+      @load_balancer_id = result["id"]
+      formats(Brightbox::Compute::Formats::Full::LOAD_BALANCER, false) { result }
     end
 
     unless Fog.mocking?
       Fog::Compute[:brightbox].load_balancers.get(@load_balancer_id).wait_for { ready? }
     end
 
-    tests("#list_load_balancers()").formats(Brightbox::Compute::Formats::Collection::LOAD_BALANCERS) do
+    tests("#list_load_balancers()") do
       pending if Fog.mocking?
-      Fog::Compute[:brightbox].list_load_balancers
+      result = Fog::Compute[:brightbox].list_load_balancers
+      formats(Brightbox::Compute::Formats::Collection::LOAD_BALANCERS, false) { result }
     end
 
-    tests("#get_load_balancer('#{@load_balancer_id}')").formats(Brightbox::Compute::Formats::Full::LOAD_BALANCER) do
+    tests("#get_load_balancer('#{@load_balancer_id}')") do
       pending if Fog.mocking?
-      Fog::Compute[:brightbox].get_load_balancer(@load_balancer_id)
+      result = Fog::Compute[:brightbox].get_load_balancer(@load_balancer_id)
+      formats(Brightbox::Compute::Formats::Full::LOAD_BALANCER, false) { result }
     end
 
-    tests("#destroy_load_balancer('#{@load_balancer_id}')").formats(Brightbox::Compute::Formats::Full::LOAD_BALANCER) do
+    update_options = {:name => "New name"}
+    tests("#update_load_balancer('#{@load_balancer_id}', #{update_options.inspect})") do
       pending if Fog.mocking?
-      Fog::Compute[:brightbox].destroy_load_balancer(@load_balancer_id)
+      result = Fog::Compute[:brightbox].update_load_balancer(@load_balancer_id, update_options)
+      formats(Brightbox::Compute::Formats::Full::LOAD_BALANCER, false) { result }
+    end
+
+    add_listeners_options = {:listeners=>[{:out=>28080, :in=>8080, :protocol=>"http"}]}
+    tests("#add_listeners_load_balancer('#{@load_balancer_id}', #{add_listeners_options.inspect})") do
+      pending if Fog.mocking?
+      result = Fog::Compute[:brightbox].add_listeners_load_balancer(@load_balancer_id, add_listeners_options)
+      formats(Brightbox::Compute::Formats::Full::LOAD_BALANCER, false) { result }
+    end
+
+    remove_listeners_options = {:listeners=>[{:out=>28080, :in=>8080, :protocol=>"http"}]}
+    tests("#remove_listeners_load_balancer('#{@load_balancer_id}', #{remove_listeners_options.inspect})") do
+      pending if Fog.mocking?
+      result = Fog::Compute[:brightbox].remove_listeners_load_balancer(@load_balancer_id, remove_listeners_options)
+      formats(Brightbox::Compute::Formats::Full::LOAD_BALANCER, false) { result }
+    end
+
+    unless Fog.mocking?
+      @node2 = Brightbox::Compute::TestSupport.get_test_server
+      second_node_id = @node2.id
+    end
+
+    # Can't remove the last node so we need to add a second...
+    add_nodes_options = {:nodes => [{:node => second_node_id}]}
+    tests("#add_nodes_load_balancer('#{@load_balancer_id}', #{add_nodes_options.inspect})") do
+      pending if Fog.mocking?
+      result = Fog::Compute[:brightbox].add_nodes_load_balancer(@load_balancer_id, add_nodes_options)
+      formats(Brightbox::Compute::Formats::Full::LOAD_BALANCER, false) { result }
+    end
+
+    # ...before we can attempt to remove either
+    remove_nodes_options = {:nodes => [{:node => node_id}]}
+    tests("#remove_nodes_load_balancer('#{@load_balancer_id}', #{remove_nodes_options.inspect})") do
+      pending if Fog.mocking?
+      result = Fog::Compute[:brightbox].remove_nodes_load_balancer(@load_balancer_id, remove_nodes_options)
+      formats(Brightbox::Compute::Formats::Full::LOAD_BALANCER, false) { result }
+    end
+
+    tests("#destroy_load_balancer('#{@load_balancer_id}')") do
+      pending if Fog.mocking?
+      result = Fog::Compute[:brightbox].destroy_load_balancer(@load_balancer_id)
+      formats(Brightbox::Compute::Formats::Full::LOAD_BALANCER, false) { result }
     end
 
     unless Fog.mocking?
       @node.destroy
+      @node2.destroy
     end
 
   end

data/tests/brightbox/requests/compute/server_group_tests.rb

@@ -3,7 +3,7 @@ Shindo.tests('Fog::Compute[:brightbox] | server group requests', ['brightbox'])
   tests('success') do
 
     unless Fog.mocking?
-      @server = Fog::Compute[:brightbox].servers.create(:image_id => Brightbox::Compute::TestSupport::IMAGE_IDENTIFER)
+      @server = Brightbox::Compute::TestSupport.get_test_server
       server_id = @server.id
     end
 
@@ -14,55 +14,62 @@ Shindo.tests('Fog::Compute[:brightbox] | server group requests', ['brightbox'])
       }]
     }
 
-    tests("#create_server_group(#{create_options.inspect})").formats(Brightbox::Compute::Formats::Full::SERVER_GROUP) do
+    tests("#create_server_group(#{create_options.inspect})") do
       pending if Fog.mocking?
-      data = Fog::Compute[:brightbox].create_server_group(create_options)
-      @server_group_id = data["id"]
-      data
+      result = Fog::Compute[:brightbox].create_server_group(create_options)
+      @server_group_id = result["id"]
+      formats(Brightbox::Compute::Formats::Full::SERVER_GROUP, false) { result }
     end
 
-    tests("#list_server_groups").formats(Brightbox::Compute::Formats::Collection::SERVER_GROUPS) do
+    tests("#list_server_groups") do
       pending if Fog.mocking?
-      Fog::Compute[:brightbox].list_server_groups
+      result = Fog::Compute[:brightbox].list_server_groups
+      formats(Brightbox::Compute::Formats::Collection::SERVER_GROUPS, false) { result }
+      @default_group_id = result.select {|grp| grp["default"] == true }.first["id"]
     end
 
-    tests("#get_server_group('#{@server_group_id}')").formats(Brightbox::Compute::Formats::Full::SERVER_GROUP) do
+    tests("#get_server_group('#{@server_group_id}')") do
       pending if Fog.mocking?
-      Fog::Compute[:brightbox].get_server_group(@server_group_id)
+      result = Fog::Compute[:brightbox].get_server_group(@server_group_id)
+      formats(Brightbox::Compute::Formats::Full::SERVER_GROUP, false) { result }
     end
 
     update_options = {:name => "Fog@#{Time.now.iso8601}"}
-    tests("#update_server_group(#{update_options.inspect})").formats(Brightbox::Compute::Formats::Full::SERVER_GROUP) do
+    tests("#update_server_group('#{@server_group_id}', #{update_options.inspect})") do
       pending if Fog.mocking?
-      Fog::Compute[:brightbox].update_server_group(@server_group_id, update_options)
+      result = Fog::Compute[:brightbox].update_server_group(@server_group_id, update_options)
+      formats(Brightbox::Compute::Formats::Full::SERVER_GROUP, false) { result }
     end
 
     remove_options = {:servers => [{:server => server_id}]}
-    tests("#remove_servers_server_group(#{remove_options.inspect})").formats(Brightbox::Compute::Formats::Full::SERVER_GROUP) do
+    tests("#remove_servers_server_group('#{@server_group_id}', #{remove_options.inspect})") do
       pending if Fog.mocking?
-      Fog::Compute[:brightbox].remove_servers_server_group(@server_group_id, remove_options)
+      result = Fog::Compute[:brightbox].remove_servers_server_group(@server_group_id, remove_options)
+      formats(Brightbox::Compute::Formats::Full::SERVER_GROUP, false) { result }
     end
 
     add_options = {:servers => [{:server => server_id}]}
-    tests("#add_servers_server_group(#{remove_options.inspect})").formats(Brightbox::Compute::Formats::Full::SERVER_GROUP) do
+    tests("#add_servers_server_group('#{@server_group_id}', #{remove_options.inspect})") do
       pending if Fog.mocking?
-      Fog::Compute[:brightbox].add_servers_server_group(@server_group_id, add_options)
+      result = Fog::Compute[:brightbox].add_servers_server_group(@server_group_id, add_options)
+      formats(Brightbox::Compute::Formats::Full::SERVER_GROUP, false) { result }
     end
 
-    # Server Group must be empty to delete so we need to remove it again
-    remove_options = {:servers => [{:server => server_id}]}
-    tests("#remove_servers_server_group(#{remove_options.inspect})").formats(Brightbox::Compute::Formats::Full::SERVER_GROUP) do
+    move_options = {:destination => @default_group_id, :servers => [{:server => server_id}]}
+    tests("#move_servers_server_group('#{@server_group_id}', #{move_options.inspect})") do
       pending if Fog.mocking?
-      Fog::Compute[:brightbox].remove_servers_server_group(@server_group_id, remove_options)
+      result = Fog::Compute[:brightbox].move_servers_server_group(@server_group_id, move_options)
+      formats(Brightbox::Compute::Formats::Full::SERVER_GROUP, false) { result }
+      test("group is emptied") { result["servers"].empty? }
     end
 
-    tests("#destroy_server_group('#{@server_group_id}')").formats(Brightbox::Compute::Formats::Full::SERVER_GROUP) do
+    tests("#destroy_server_group('#{@server_group_id}')") do
       pending if Fog.mocking?
-      Fog::Compute[:brightbox].destroy_server_group(@server_group_id)
+      result = Fog::Compute[:brightbox].destroy_server_group(@server_group_id)
+      formats(Brightbox::Compute::Formats::Full::SERVER_GROUP, false) { result }
     end
 
     unless Fog.mocking?
-      @server.wait_for { ready? }
       @server.destroy
     end
 

data/tests/brightbox/requests/compute/server_tests.rb

@@ -2,58 +2,79 @@ Shindo.tests('Fog::Compute[:brightbox] | server requests', ['brightbox']) do
 
   tests('success') do
 
-    image_id = Brightbox::Compute::TestSupport::IMAGE_IDENTIFER
-    server_id = nil
+    unless Fog.mocking?
+      image_id = Brightbox::Compute::TestSupport.image_id
+      server_id = nil
+    end
 
-    tests("#create_server(:image => '#{image_id}')").formats(Brightbox::Compute::Formats::Full::SERVER) do
+    tests("#create_server(:image => '#{image_id}')") do
       pending if Fog.mocking?
-      data = Fog::Compute[:brightbox].create_server(:image => image_id)
-      server_id = data["id"]
-      data
+      result = Fog::Compute[:brightbox].create_server(:image => image_id)
+      server_id = result["id"]
+      formats(Brightbox::Compute::Formats::Full::SERVER, false) { result }
     end
 
     unless Fog.mocking?
       Fog::Compute[:brightbox].servers.get(server_id).wait_for { ready? }
     end
 
-    tests("#list_servers").formats(Brightbox::Compute::Formats::Collection::SERVERS) do
+    tests("#list_servers") do
+      pending if Fog.mocking?
+      result = Fog::Compute[:brightbox].list_servers
+      formats(Brightbox::Compute::Formats::Collection::SERVERS, false) { result }
+    end
+
+    tests("#get_server('#{server_id}')") do
       pending if Fog.mocking?
-      Fog::Compute[:brightbox].list_servers
+      result = Fog::Compute[:brightbox].get_server(server_id)
+      formats(Brightbox::Compute::Formats::Full::SERVER, false) { result }
     end
 
-    tests("#get_server('#{server_id}')").formats(Brightbox::Compute::Formats::Full::SERVER) do
+    tests("#update_server('#{server_id}')") do
       pending if Fog.mocking?
-      Fog::Compute[:brightbox].get_server(server_id)
+      result = Fog::Compute[:brightbox].update_server(server_id, :name => "Fog@#{Time.now.iso8601}")
+      formats(Brightbox::Compute::Formats::Full::SERVER, false) { result }
     end
 
-    tests("#update_server('#{server_id}')").formats(Brightbox::Compute::Formats::Full::SERVER) do
+    tests("#activate_console_server('#{server_id}')") do
       pending if Fog.mocking?
-      Fog::Compute[:brightbox].update_server(server_id, :name => "Fog@#{Time.now.iso8601}")
+      result = Fog::Compute[:brightbox].activate_console_server(server_id)
+      formats(Brightbox::Compute::Formats::Full::SERVER, false) { result }
     end
 
-    tests("#activate_console_server('#{server_id}')").formats(Brightbox::Compute::Formats::Full::SERVER) do
+    tests("#stop_server('#{server_id}')") do
       pending if Fog.mocking?
-      Fog::Compute[:brightbox].activate_console_server(server_id)
+      result = Fog::Compute[:brightbox].stop_server(server_id)
+      formats(Brightbox::Compute::Formats::Full::SERVER, false) { result }
     end
 
-    tests("#stop_server('#{server_id}')").formats(Brightbox::Compute::Formats::Full::SERVER) do
+    tests("#start_server('#{server_id}')") do
       pending if Fog.mocking?
-      Fog::Compute[:brightbox].stop_server(server_id)
+      result = Fog::Compute[:brightbox].start_server(server_id)
+      formats(Brightbox::Compute::Formats::Full::SERVER, false) { result }
     end
 
-    tests("#start_server('#{server_id}')").formats(Brightbox::Compute::Formats::Full::SERVER) do
+    tests("#shutdown_server('#{server_id}')") do
       pending if Fog.mocking?
-      Fog::Compute[:brightbox].start_server(server_id)
+      result = Fog::Compute[:brightbox].shutdown_server(server_id)
+      formats(Brightbox::Compute::Formats::Full::SERVER, false) { result }
     end
 
-    tests("#shutdown_server('#{server_id}')").formats(Brightbox::Compute::Formats::Full::SERVER) do
+    tests("#snapshot_server('#{server_id}')") do
       pending if Fog.mocking?
-      Fog::Compute[:brightbox].shutdown_server(server_id)
+      result = Fog::Compute[:brightbox].snapshot_server(server_id)
+      formats(Brightbox::Compute::Formats::Full::SERVER, false) { result }
+      # Server should be exclusively for our test so assume we can delete the snapshot
+      snapshot_id = result["snapshots"].first["id"]
+      @snapshot = Fog::Compute[:brightbox].images.get(snapshot_id)
+      @snapshot.wait_for { ready? }
+      @snapshot.destroy
     end
 
-    tests("#destroy_server('#{server_id}')").formats(Brightbox::Compute::Formats::Full::SERVER) do
+    tests("#destroy_server('#{server_id}')") do
       pending if Fog.mocking?
-      Fog::Compute[:brightbox].destroy_server(server_id)
+      result = Fog::Compute[:brightbox].destroy_server(server_id)
+      formats(Brightbox::Compute::Formats::Full::SERVER, false) { result }
     end
 
   end

data/tests/brightbox/requests/compute/server_type_tests.rb

@@ -2,16 +2,17 @@ Shindo.tests('Fog::Compute[:brightbox] | server type requests', ['brightbox']) d
 
   tests('success') do
 
-    tests("#list_server_types").formats(Brightbox::Compute::Formats::Collection::SERVER_TYPES) do
+    tests("#list_server_types") do
       pending if Fog.mocking?
-      data = Fog::Compute[:brightbox].list_server_types
-      @server_type_id = data.first["id"]
-      data
+      result = Fog::Compute[:brightbox].list_server_types
+      @server_type_id = result.first["id"]
+      formats(Brightbox::Compute::Formats::Collection::SERVER_TYPES, false) { result }
     end
 
-    tests("#get_server_type('#{@server_type_id}')").formats(Brightbox::Compute::Formats::Full::SERVER_TYPE) do
+    tests("#get_server_type('#{@server_type_id}')") do
       pending if Fog.mocking?
-      Fog::Compute[:brightbox].get_server_type(@server_type_id)
+      result = Fog::Compute[:brightbox].get_server_type(@server_type_id)
+      formats(Brightbox::Compute::Formats::Full::SERVER_TYPE, false) { result }
     end
 
   end

data/tests/brightbox/requests/compute/user_tests.rb

@@ -2,29 +2,24 @@ Shindo.tests('Fog::Compute[:brightbox] | user requests', ['brightbox']) do
 
   tests('success') do
 
-    tests("#list_users").formats(Brightbox::Compute::Formats::Collection::USERS) do
+    tests("#list_users") do
       pending if Fog.mocking?
-      data = Fog::Compute[:brightbox].list_users
-      @user_id = data.first["id"]
-      data
+      result = Fog::Compute[:brightbox].list_users
+      @user_id = result.first["id"]
+      formats(Brightbox::Compute::Formats::Collection::USERS, false) { result }
     end
 
-    tests("#get_user('#{@user_id}')").formats(Brightbox::Compute::Formats::Full::USER) do
+    tests("#get_user('#{@user_id}')") do
       pending if Fog.mocking?
-      data = Fog::Compute[:brightbox].get_user(@user_id)
-      @original_name = data["name"]
-      data
+      result = Fog::Compute[:brightbox].get_user(@user_id)
+      formats(Brightbox::Compute::Formats::Full::USER, false) { result }
     end
 
-    update_options = { :name => "Fog@#{Time.now.iso8601}" }
-
-    tests("#update_user('#{@user_id}', #{update_options.inspect})").formats(Brightbox::Compute::Formats::Full::USER) do
+    update_options = { :name => "Example User" }
+    tests("#update_user('#{@user_id}', #{update_options.inspect})") do
       pending if Fog.mocking?
-      Fog::Compute[:brightbox].update_user(@user_id, update_options)
-    end
-
-    unless Fog.mocking?
-      Fog::Compute[:brightbox].update_user(@user_id, :name => @original_name)
+      result = Fog::Compute[:brightbox].update_user(@user_id, update_options)
+      formats(Brightbox::Compute::Formats::Full::USER, false) { result }
     end
 
   end

data/tests/brightbox/requests/compute/zone_tests.rb

@@ -2,16 +2,17 @@ Shindo.tests('Fog::Compute[:brightbox] | zone requests', ['brightbox']) do
 
   tests('success') do
 
-    tests("#list_zones").formats(Brightbox::Compute::Formats::Collection::ZONES) do
+    tests("#list_zones") do
       pending if Fog.mocking?
-      data = Fog::Compute[:brightbox].list_zones
-      @zone_id = data.first["id"]
-      data
+      result = Fog::Compute[:brightbox].list_zones
+      @zone_id = result.first["id"]
+      formats(Brightbox::Compute::Formats::Collection::ZONES, false) { result }
     end
 
-    tests("#get_zone('#{@zone_id}')").formats(Brightbox::Compute::Formats::Full::ZONE) do
+    tests("#get_zone('#{@zone_id}')") do
       pending if Fog.mocking?
-      Fog::Compute[:brightbox].get_zone(@zone_id)
+      result = Fog::Compute[:brightbox].get_zone(@zone_id)
+      formats(Brightbox::Compute::Formats::Full::ZONE, false) { result }
     end
 
   end