From a8578b23ccdbc37e86d790480e1d0afaab21d514 Mon Sep 17 00:00:00 2001
From: Paul Thornthwaite <paul@brightbox.co.uk>
Date: Wed, 27 Apr 2011 10:53:34 +0100
Subject: [PATCH 1/2] Fixed typo in Bluebox test

---
 tests/compute/requests/bluebox/block_tests.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/compute/requests/bluebox/block_tests.rb b/tests/compute/requests/bluebox/block_tests.rb
index 60609859f..daac406fc 100644
--- a/tests/compute/requests/bluebox/block_tests.rb
+++ b/tests/compute/requests/bluebox/block_tests.rb
@@ -6,7 +6,7 @@ Shindo.tests('Bluebox::Compute | block requests', ['bluebox']) do
     'hostname'    => String,
     'id'          => String,
     'ips'         => [{'address' => String}],
-    'lb_applications' => [{'lb_application_name' => String, 'lb_application_id' => String}]
+    'lb_applications' => [{'lb_application_name' => String, 'lb_application_id' => String}],
     'memory'      => Integer,
     'product'     => Bluebox::Compute::Formats::PRODUCT,
     'status'      => String,

From 3b766bd0c254b089bc5042b3472b7ef90d874a26 Mon Sep 17 00:00:00 2001
From: Paul Thornthwaite <paul@brightbox.co.uk>
Date: Wed, 27 Apr 2011 11:02:58 +0100
Subject: [PATCH 2/2] [brightbox|compute] Updated Image identifiers to match
 latest available Ubuntu Lucid 10.04 LTS 64bit image

---
 lib/fog/compute/models/brightbox/server.rb | 2 +-
 tests/compute/helper.rb                    | 2 +-
 tests/compute/requests/brightbox/helper.rb | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/fog/compute/models/brightbox/server.rb b/lib/fog/compute/models/brightbox/server.rb
index 18609e4f1..2dfb9b5b2 100644
--- a/lib/fog/compute/models/brightbox/server.rb
+++ b/lib/fog/compute/models/brightbox/server.rb
@@ -30,7 +30,7 @@ module Fog
 
         def initialize(attributes={})
           self.flavor_id  ||= 'typ-4nssg' # Nano
-          self.image_id   ||= 'img-tjjt6' # Lucid 10.04 LTS 64bit
+          self.image_id   ||= 'img-2ab98' # Ubuntu Lucid 10.04 server (i686)
           super
         end
 
diff --git a/tests/compute/helper.rb b/tests/compute/helper.rb
index 2df6c0297..9e4191975 100644
--- a/tests/compute/helper.rb
+++ b/tests/compute/helper.rb
@@ -16,7 +16,7 @@ def compute_providers
     },
     Brightbox => {
       :server_attributes => {
-        :image_id => 'img-9vxqi' # image img-9vxqi = Ubuntu Maverick 10.10 server
+        :image_id => 'img-2ab98' # Ubuntu Lucid 10.04 server (i686)
       },
       :mocked => false
     },
diff --git a/tests/compute/requests/brightbox/helper.rb b/tests/compute/requests/brightbox/helper.rb
index 91d2d3fee..423a51ff9 100644
--- a/tests/compute/requests/brightbox/helper.rb
+++ b/tests/compute/requests/brightbox/helper.rb
@@ -32,8 +32,7 @@ NilClass.send :include, Fog::Brightbox::Nullable::Zone
 class Brightbox
   module Compute
     module TestSupport
-      # image img-9vxqi = Ubuntu Maverick 10.10 server
-      IMAGE_IDENTIFER = "img-9vxqi"
+      IMAGE_IDENTIFER = "img-2ab98" # Ubuntu Lucid 10.04 server (i686)
     end
     module Formats
       module Struct