brightbox-cli 0.16.0 → 0.17.0

data/lib/brightbox-cli/vendor/fog/tests/brightbox/requests/compute/api_client_tests.rb

@@ -7,32 +7,43 @@ Shindo.tests('Fog::Compute[:brightbox] | api client requests', ['brightbox']) do
       :description => "Description from Fog test"
     }
 
-    tests("#create_api_client(#{create_options.inspect})").formats(Brightbox::Compute::Formats::Full::API_CLIENT) do
+    tests("#create_api_client(#{create_options.inspect})") do
       pending if Fog.mocking?
-      data = Fog::Compute[:brightbox].create_api_client(create_options)
-      @api_client_id = data["id"]
-      data
+      result = Fog::Compute[:brightbox].create_api_client(create_options)
+      @api_client_id = result["id"]
+      formats(Brightbox::Compute::Formats::Full::API_CLIENT) { result }
     end
 
-    tests("#list_api_clients").formats(Brightbox::Compute::Formats::Collection::API_CLIENTS) do
+    tests("#list_api_clients") do
       pending if Fog.mocking?
-      Fog::Compute[:brightbox].list_api_clients
+      result = Fog::Compute[:brightbox].list_api_clients
+      formats(Brightbox::Compute::Formats::Collection::API_CLIENTS) { result }
     end
 
-    tests("#get_api_client('#{@api_client_id}')").formats(Brightbox::Compute::Formats::Full::API_CLIENT) do
+    tests("#get_api_client('#{@api_client_id}')") do
       pending if Fog.mocking?
-      Fog::Compute[:brightbox].get_api_client(@api_client_id)
+      result = Fog::Compute[:brightbox].get_api_client(@api_client_id)
+      formats(Brightbox::Compute::Formats::Full::API_CLIENT) { result }
     end
 
     update_options = {:name => "Fog@#{Time.now.iso8601}"}
-    tests("#update_api_client('#{@api_client_id}')").formats(Brightbox::Compute::Formats::Full::API_CLIENT) do
+    tests("#update_api_client('#{@api_client_id}', #{update_options.inspect})") do
       pending if Fog.mocking?
-      Fog::Compute[:brightbox].update_api_client(@api_client_id, update_options)
+      result = Fog::Compute[:brightbox].update_api_client(@api_client_id, update_options)
+      formats(Brightbox::Compute::Formats::Full::API_CLIENT) { result }
     end
 
-    tests("#destroy_api_client('#{@api_client_id}')").formats(Brightbox::Compute::Formats::Full::API_CLIENT) do
+    tests("#reset_secret_api_client('#{@api_client_id}')") do
       pending if Fog.mocking?
-      Fog::Compute[:brightbox].destroy_api_client(@api_client_id)
+      result = Fog::Compute[:brightbox].reset_secret_api_client(@api_client_id)
+      formats(Brightbox::Compute::Formats::Full::API_CLIENT) { result }
+      test("new secret is visible") { ! result["secret"].nil?  }
+    end
+
+    tests("#destroy_api_client('#{@api_client_id}')") do
+      pending if Fog.mocking?
+      result = Fog::Compute[:brightbox].destroy_api_client(@api_client_id)
+      formats(Brightbox::Compute::Formats::Full::API_CLIENT) { result }
     end
 
   end

data/lib/brightbox-cli/vendor/fog/tests/brightbox/requests/compute/cloud_ip_tests.rb

@@ -3,48 +3,57 @@ Shindo.tests('Fog::Compute[:brightbox] | cloud ip requests', ['brightbox']) do
   tests('success') do
 
     unless Fog.mocking?
-      @server = Fog::Compute[:brightbox].servers.create(compute_providers[:brightbox][:server_attributes])
+      @server = Brightbox::Compute::TestSupport.get_test_server
     end
 
-    tests("#create_cloud_ip").formats(Brightbox::Compute::Formats::Full::CLOUD_IP) do
+    tests("#create_cloud_ip") do
       pending if Fog.mocking?
-      data = Fog::Compute[:brightbox].create_cloud_ip
-      @cloud_ip_id = data["id"]
-      data
+      result = Fog::Compute[:brightbox].create_cloud_ip
+      @cloud_ip_id = result["id"]
+      formats(Brightbox::Compute::Formats::Full::CLOUD_IP) { result }
     end
 
-    tests("#list_cloud_ips").formats(Brightbox::Compute::Formats::Collection::CLOUD_IPS) do
+    tests("#list_cloud_ips") do
       pending if Fog.mocking?
-      Fog::Compute[:brightbox].list_cloud_ips
+      result = Fog::Compute[:brightbox].list_cloud_ips
+      formats(Brightbox::Compute::Formats::Collection::CLOUD_IPS) { result }
     end
 
-    tests("#get_cloud_ip('#{@cloud_ip_id}')").formats(Brightbox::Compute::Formats::Full::CLOUD_IP) do
+    tests("#get_cloud_ip('#{@cloud_ip_id}')") do
       pending if Fog.mocking?
-      Fog::Compute[:brightbox].get_cloud_ip(@cloud_ip_id)
+      result = Fog::Compute[:brightbox].get_cloud_ip(@cloud_ip_id)
+      formats(Brightbox::Compute::Formats::Full::CLOUD_IP) { result }
     end
 
-    unless Fog.mocking?
-      @server.wait_for { ready? }
-      map_options = {:interface => @server.interfaces.first["id"]}
-    end
-
-    tests("#map_cloud_ip('#{@cloud_ip_id}', #{map_options.inspect})").formats(Brightbox::Compute::Formats::Full::CLOUD_IP) do
+    map_options = {:destination => @server.interfaces.first["id"]}
+    tests("#map_cloud_ip('#{@cloud_ip_id}', #{map_options.inspect})") do
       pending if Fog.mocking?
-      Fog::Compute[:brightbox].map_cloud_ip(@cloud_ip_id, map_options)
+      result = Fog::Compute[:brightbox].map_cloud_ip(@cloud_ip_id, map_options)
+      formats(Brightbox::Compute::Formats::Full::CLOUD_IP) { result }
     end
 
     unless Fog.mocking?
       Fog::Compute[:brightbox].cloud_ips.get(@cloud_ip_id).wait_for { mapped? }
     end
 
-    tests("#unmap_cloud_ip('#{@cloud_ip_id}')").formats(Brightbox::Compute::Formats::Full::CLOUD_IP) do
+    tests("#unmap_cloud_ip('#{@cloud_ip_id}')") do
+      pending if Fog.mocking?
+      result = Fog::Compute[:brightbox].unmap_cloud_ip(@cloud_ip_id)
+      formats(Brightbox::Compute::Formats::Full::CLOUD_IP) { result }
+    end
+
+    update_options = {:reverse_dns => "public.#{@server.id}.gb1.brightbox.com"}
+    tests("#update_cloud_ip('#{@cloud_ip_id}', #{update_options.inspect})") do
       pending if Fog.mocking?
-      Fog::Compute[:brightbox].unmap_cloud_ip(@cloud_ip_id)
+      result = Fog::Compute[:brightbox].update_cloud_ip(@cloud_ip_id, update_options)
+      formats(Brightbox::Compute::Formats::Full::CLOUD_IP) { result }
+      result = Fog::Compute[:brightbox].update_cloud_ip(@cloud_ip_id, {:reverse_dns => ""})
     end
 
-    tests("#destroy_cloud_ip('#{@cloud_ip_id}')").formats(Brightbox::Compute::Formats::Full::CLOUD_IP) do
+    tests("#destroy_cloud_ip('#{@cloud_ip_id}')") do
       pending if Fog.mocking?
-      Fog::Compute[:brightbox].destroy_cloud_ip(@cloud_ip_id)
+      result = Fog::Compute[:brightbox].destroy_cloud_ip(@cloud_ip_id)
+      formats(Brightbox::Compute::Formats::Full::CLOUD_IP) { result }
     end
 
     unless Fog.mocking?

data/lib/brightbox-cli/vendor/fog/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,7 +36,28 @@ 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
@@ -84,7 +109,9 @@ class Brightbox
           "resource_type"   => String,
           "url"             => String,
           "name"            => String,
-          "default"         => Fog::Boolean
+          "default"         => Fog::Boolean,
+          "created_at"      => String,
+          "description"     => String
         }
 
         FIREWALL_RULE = {
@@ -110,7 +137,8 @@ class Brightbox
           "description"     => String,
           "source"          => String,
           "status"          => String,
-          "owner"           => String
+          "owner"           => String,
+          "username"        => Fog::Nullable::String
         }
 
         INTERFACE = {
@@ -122,6 +150,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,
@@ -131,7 +169,8 @@ class Brightbox
           "hostname"        => String,
           "created_at"      => String,
           "started_at"      => Fog::Nullable::String,
-          "deleted_at"      => Fog::Nullable::String
+          "deleted_at"      => Fog::Nullable::String,
+          "username"        => Fog::Nullable::String
         }
 
         SERVER_GROUP = {
@@ -139,8 +178,10 @@ class Brightbox
           "resource_type"   => String,
           "url"             => String,
           "name"            => String,
+          "created_at"      => String,
           "default"         => Fog::Boolean,
-          "description"     => Fog::Nullable::String
+          "description"     => Fog::Nullable::String,
+          "created_at"      => String
         }
 
         SERVER_TYPE = {
@@ -232,16 +273,17 @@ 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,
-          "ancestor"        => Fog::Brightbox::Nullable::Image
+          "ancestor"        => Fog::Brightbox::Nullable::Image,
+          "username"        => Fog::Nullable::String
         }
 
         LOAD_BALANCER = {
-          "cloud_ips"       => Array,
           "id"              => String,
           "resource_type"   => String,
           "url"             => String,
@@ -249,9 +291,9 @@ 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]
+          "nodes"           => [Brightbox::Compute::Formats::Nested::SERVER]
         }
 
         SERVER = {
@@ -271,18 +313,22 @@ class Brightbox
           "server_groups"   => [Brightbox::Compute::Formats::Nested::SERVER_GROUP],
           "snapshots"       => [Brightbox::Compute::Formats::Nested::IMAGE],
           "interfaces"      => [Brightbox::Compute::Formats::Nested::INTERFACE],
-          "zone"            => Fog::Brightbox::Nullable::Zone
+          "zone"            => Fog::Brightbox::Nullable::Zone,
+          "username"        => Fog::Nullable::String
         }
 
         SERVER_GROUP = {
+          "created_at"      => String,
           "id"              => String,
           "resource_type"   => String,
           "url"             => String,
           "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 = {
@@ -351,6 +397,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]
         }
@@ -415,12 +465,14 @@ 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,
-          "ancestor"        => Fog::Brightbox::Nullable::Image
+          "ancestor"        => Fog::Brightbox::Nullable::Image,
+          "username"        => Fog::Nullable::String
         }
 
         INTERFACE = {
@@ -470,18 +522,22 @@ 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
         }
 
         SERVER_GROUP = {
+          "created_at"      => String,
           "id"              => String,
           "resource_type"   => String,
           "url"             => String,
           "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/lib/brightbox-cli/vendor/fog/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) { 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) { 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/lib/brightbox-cli/vendor/fog/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) { result }
     end
 
   end

data/lib/brightbox-cli/vendor/fog/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) { 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) { 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) { 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) { 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) { 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) { 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) { 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) { 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) { result }
     end
 
     unless Fog.mocking?
       @node.destroy
+      @node2.destroy
     end
 
   end

data/lib/brightbox-cli/vendor/fog/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) { 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) { 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) { 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) { 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) { 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) { 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) { 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) { result }
     end
 
     unless Fog.mocking?
-      @server.wait_for { ready? }
       @server.destroy
     end