fog-brightbox 1.10.0 → 1.12.0

data/spec/fog/compute/brightbox/database_server_spec.rb

@@ -21,12 +21,12 @@ describe Fog::Brightbox::Compute::DatabaseServer do
 
   describe "when snapshotting with no options" do
     it "returns the database server" do
-      stub_request(:post, "http://localhost/1.0/database_servers/dbs-12345/snapshot").
-        with(:query => hash_including(:account_id),
-             :headers => { "Authorization" => "Bearer FAKECACHEDTOKEN" }).
-        to_return(:status => 202, :body => %q({"id": "dbs-12345"}), :headers => {})
+      stub_request(:post, "http://localhost/1.0/database_servers/dbs-12345/snapshot")
+        .with(query: hash_including(:account_id),
+              headers: { "Authorization" => "Bearer FAKECACHEDTOKEN" })
+        .to_return(status: 202, body: '{"id": "dbs-12345"}', headers: {})
 
-      @database_server = Fog::Brightbox::Compute::DatabaseServer.new(:service => service, :id => "dbs-12345")
+      @database_server = Fog::Brightbox::Compute::DatabaseServer.new(service: service, id: "dbs-12345")
       assert @database_server.snapshot
     end
   end
@@ -35,28 +35,28 @@ describe Fog::Brightbox::Compute::DatabaseServer do
     it "returns the new image" do
       link = "<https://api.gb1.brightbox.com/1.0/database_snapshots/dbi-12345>; rel=snapshot"
 
-      stub_request(:post, "http://localhost/1.0/database_servers/dbs-12345/snapshot").
-        with(:headers => { "Authorization" => "Bearer FAKECACHEDTOKEN" }).
-        to_return(:status => 202, :body => "{}", :headers => { "Link" => link })
+      stub_request(:post, "http://localhost/1.0/database_servers/dbs-12345/snapshot")
+        .with(headers: { "Authorization" => "Bearer FAKECACHEDTOKEN" })
+        .to_return(status: 202, body: "{}", headers: { "Link" => link })
 
-      stub_request(:get, "http://localhost/1.0/database_snapshots/dbi-12345").
-        with(:query => hash_including(:account_id),
-             :headers => { "Authorization" => "Bearer FAKECACHEDTOKEN" }).
-        to_return(:status => 200, :body => %q({"id": "dbs-12345"}))
-      @database_server = Fog::Brightbox::Compute::DatabaseServer.new(:service => service, :id => "dbs-12345")
+      stub_request(:get, "http://localhost/1.0/database_snapshots/dbi-12345")
+        .with(query: hash_including(:account_id),
+              headers: { "Authorization" => "Bearer FAKECACHEDTOKEN" })
+        .to_return(status: 200, body: '{"id": "dbs-12345"}')
+      @database_server = Fog::Brightbox::Compute::DatabaseServer.new(service: service, id: "dbs-12345")
       assert_kind_of Fog::Brightbox::Compute::DatabaseSnapshot, @database_server.snapshot(true)
     end
   end
 
   describe "when building from a snapshot" do
     it "returns the new SQL instance" do
-      stub_request(:post, "http://localhost/1.0/database_servers").
-        with(:query => hash_including(:account_id),
-             :headers => { "Authorization" => "Bearer FAKECACHEDTOKEN" },
-             :body => hash_including(:snapshot => "dbi-lv426")).
-        to_return(:status => 202, :body => %q({"id": "dbs-12345"}))
+      stub_request(:post, "http://localhost/1.0/database_servers")
+        .with(query: hash_including(:account_id),
+              headers: { "Authorization" => "Bearer FAKECACHEDTOKEN" },
+              body: hash_including(snapshot: "dbi-lv426"))
+        .to_return(status: 202, body: '{"id": "dbs-12345"}')
 
-      @database_server = Fog::Brightbox::Compute::DatabaseServer.new(:service => service, :snapshot_id => "dbi-lv426")
+      @database_server = Fog::Brightbox::Compute::DatabaseServer.new(service: service, snapshot_id: "dbi-lv426")
       @database_server.save
       assert_kind_of Fog::Brightbox::Compute::DatabaseServer, @database_server
       assert_equal "dbs-12345", @database_server.id

data/spec/fog/compute/brightbox/image_selector_spec.rb

@@ -6,24 +6,24 @@ describe Fog::Brightbox::Compute::ImageSelector do
   describe "#latest_ubuntu" do
     it do
       image_list = [
-        {"id"=>"img-kppxh", "resource_type"=>"image", "url"=>"https://api.gb1s.brightbox.com/1.0/images/img-kppxh", "name"=>"ubuntu-xenial-16.04-amd64-server", "username"=>"ubuntu", "status"=>"available", "locked"=>false, "description"=>"ID: com.ubuntu.cloud:released:download/com.ubuntu.cloud:server:16.04:amd64/20211001/disk1.img, Release: release", "source"=>"tmp54tt71pg", "arch"=>"x86_64", "created_at"=>"2021-10-02T06:57:09.000Z", "owner"=>"acc-kg71m", "official"=>true, "public"=>true, "compatibility_mode"=>false, "source_type"=>"upload", "source_trigger"=>"manual", "disk_size"=>394, "virtual_size"=>2252, "min_ram"=>nil, "ancestor"=>nil},
-        {"id"=>"img-bugr2", "resource_type"=>"image", "url"=>"https://api.gb1s.brightbox.com/1.0/images/img-bugr2", "name"=>"ubuntu-xenial-16.04-i386-server", "username"=>"ubuntu", "status"=>"available", "locked"=>false, "description"=>"ID: com.ubuntu.cloud:released:download/com.ubuntu.cloud:server:16.04:i386/20211001/disk1.img, Release: release", "source"=>"tmplj717rjf", "arch"=>"i686", "created_at"=>"2021-10-02T06:58:18.000Z", "owner"=>"acc-kg71m", "official"=>true, "public"=>true, "compatibility_mode"=>false, "source_type"=>"upload", "source_trigger"=>"manual", "disk_size"=>385, "virtual_size"=>2252, "min_ram"=>nil, "ancestor"=>nil},
-        {"id"=>"img-6vfpp", "resource_type"=>"image", "url"=>"https://api.gb1s.brightbox.com/1.0/images/img-6vfpp", "name"=>"ubuntu-xenial-daily-amd64-server", "username"=>"ubuntu", "status"=>"available", "locked"=>false, "description"=>"ID: com.ubuntu.cloud:daily:download/com.ubuntu.cloud.daily:server:16.04:amd64/20211001/disk1.img, Release: daily", "source"=>"tmp3aj5trto", "arch"=>"x86_64", "created_at"=>"2021-10-02T06:58:57.000Z", "owner"=>"acc-yw7i0", "official"=>false, "public"=>true, "compatibility_mode"=>false, "source_type"=>"upload", "source_trigger"=>"manual", "disk_size"=>394, "virtual_size"=>2252, "min_ram"=>nil, "ancestor"=>nil},
-        {"id"=>"img-x08p6", "resource_type"=>"image", "url"=>"https://api.gb1s.brightbox.com/1.0/images/img-x08p6", "name"=>"ubuntu-bionic-18.04-amd64-server", "username"=>"ubuntu", "status"=>"available", "locked"=>false, "description"=>"ID: com.ubuntu.cloud:released:download/com.ubuntu.cloud:server:18.04:amd64/20220523/disk1.img, Release: release", "source"=>"tmpcyevpow5", "arch"=>"x86_64", "created_at"=>"2022-05-24T06:57:15.000Z", "owner"=>"acc-kg71m", "official"=>true, "public"=>true, "compatibility_mode"=>false, "source_type"=>"upload", "source_trigger"=>"manual", "disk_size"=>480, "virtual_size"=>2252, "min_ram"=>nil, "ancestor"=>nil},
-        {"id"=>"img-jrbnn", "resource_type"=>"image", "url"=>"https://api.gb1s.brightbox.com/1.0/images/img-jrbnn", "name"=>"ubuntu-bionic-18.04-i386-server", "username"=>"ubuntu", "status"=>"available", "locked"=>false, "description"=>"ID: com.ubuntu.cloud:released:download/com.ubuntu.cloud:server:18.04:i386/20220523/disk1.img, Release: release", "source"=>"tmpw502837r", "arch"=>"i686", "created_at"=>"2022-05-24T06:57:44.000Z", "owner"=>"acc-kg71m", "official"=>true, "public"=>true, "compatibility_mode"=>false, "source_type"=>"upload", "source_trigger"=>"manual", "disk_size"=>450, "virtual_size"=>2252, "min_ram"=>nil, "ancestor"=>nil},
-        {"id"=>"img-1cbbg", "resource_type"=>"image", "url"=>"https://api.gb1s.brightbox.com/1.0/images/img-1cbbg", "name"=>"ubuntu-focal-daily-amd64-server", "username"=>"ubuntu", "status"=>"available", "locked"=>false, "description"=>"ID: com.ubuntu.cloud:daily:download/com.ubuntu.cloud.daily:server:20.04:amd64/20220530/disk1.img, Release: daily", "source"=>"tmpa2iezlb7", "arch"=>"x86_64", "created_at"=>"2022-06-01T07:06:08.000Z", "owner"=>"acc-yw7i0", "official"=>false, "public"=>true, "compatibility_mode"=>false, "source_type"=>"upload", "source_trigger"=>"manual", "disk_size"=>685, "virtual_size"=>2252, "min_ram"=>nil, "ancestor"=>nil},
-        {"id"=>"img-cjc8m", "resource_type"=>"image", "url"=>"https://api.gb1s.brightbox.com/1.0/images/img-cjc8m", "name"=>"ubuntu-focal-20.04-amd64-server", "username"=>"ubuntu", "status"=>"available", "locked"=>false, "description"=>"ID: com.ubuntu.cloud:released:download/com.ubuntu.cloud:server:20.04:amd64/20220530/disk1.img, Release: release", "source"=>"tmppadp2ka9", "arch"=>"x86_64", "created_at"=>"2022-06-02T06:57:21.000Z", "owner"=>"acc-kg71m", "official"=>true, "public"=>true, "compatibility_mode"=>false, "source_type"=>"upload", "source_trigger"=>"manual", "disk_size"=>685, "virtual_size"=>2252, "min_ram"=>nil, "ancestor"=>nil},
-        {"id"=>"img-yes2q", "resource_type"=>"image", "url"=>"https://api.gb1s.brightbox.com/1.0/images/img-yes2q", "name"=>"ubuntu-bionic-daily-amd64-server", "username"=>"ubuntu", "status"=>"available", "locked"=>false, "description"=>"ID: com.ubuntu.cloud:daily:download/com.ubuntu.cloud.daily:server:18.04:amd64/20220530/disk1.img, Release: daily", "source"=>"tmp7b0ty_cz", "arch"=>"x86_64", "created_at"=>"2022-06-02T06:59:06.000Z", "owner"=>"acc-yw7i0", "official"=>false, "public"=>true, "compatibility_mode"=>false, "source_type"=>"upload", "source_trigger"=>"manual", "disk_size"=>480, "virtual_size"=>2252, "min_ram"=>nil, "ancestor"=>nil},
-        {"id"=>"img-44xv2", "resource_type"=>"image", "url"=>"https://api.gb1s.brightbox.com/1.0/images/img-44xv2", "name"=>"ubuntu-bionic-daily-i386-server", "username"=>"ubuntu", "status"=>"available", "locked"=>false, "description"=>"ID: com.ubuntu.cloud:daily:download/com.ubuntu.cloud.daily:server:18.04:i386/20220530/disk1.img, Release: daily", "source"=>"tmpcsk_ejc9", "arch"=>"i686", "created_at"=>"2022-06-02T06:59:33.000Z", "owner"=>"acc-yw7i0", "official"=>false, "public"=>true, "compatibility_mode"=>false, "source_type"=>"upload", "source_trigger"=>"manual", "disk_size"=>450, "virtual_size"=>2252, "min_ram"=>nil, "ancestor"=>nil},
-        {"id"=>"img-axy3r", "resource_type"=>"image", "url"=>"https://api.gb1s.brightbox.com/1.0/images/img-axy3r", "name"=>"ubuntu-impish-daily-amd64-server", "username"=>"ubuntu", "status"=>"available", "locked"=>false, "description"=>"ID: com.ubuntu.cloud:daily:download/com.ubuntu.cloud.daily:server:21.10:amd64/20220604/disk1.img, Release: daily", "source"=>"tmpq4xcgkhd", "arch"=>"x86_64", "created_at"=>"2022-06-05T06:57:52.000Z", "owner"=>"acc-yw7i0", "official"=>false, "public"=>true, "compatibility_mode"=>false, "source_type"=>"upload", "source_trigger"=>"manual", "disk_size"=>699, "virtual_size"=>2252, "min_ram"=>nil, "ancestor"=>nil},
-        {"id"=>"img-5sf6z", "resource_type"=>"image", "url"=>"https://api.gb1s.brightbox.com/1.0/images/img-5sf6z", "name"=>"ubuntu-jammy-daily-amd64-server", "username"=>"ubuntu", "status"=>"available", "locked"=>false, "description"=>"ID: com.ubuntu.cloud:daily:download/com.ubuntu.cloud.daily:server:22.04:amd64/20220604/disk1.img, Release: daily", "source"=>"tmp6lwsv5cb", "arch"=>"x86_64", "created_at"=>"2022-06-05T06:58:33.000Z", "owner"=>"acc-yw7i0", "official"=>false, "public"=>true, "compatibility_mode"=>false, "source_type"=>"upload", "source_trigger"=>"manual", "disk_size"=>709, "virtual_size"=>2252, "min_ram"=>nil, "ancestor"=>nil},
-        {"id"=>"img-vuptu", "resource_type"=>"image", "url"=>"https://api.gb1s.brightbox.com/1.0/images/img-vuptu", "name"=>"ubuntu-kinetic-daily-amd64-server", "username"=>"ubuntu", "status"=>"available", "locked"=>false, "description"=>"ID: com.ubuntu.cloud:daily:download/com.ubuntu.cloud.daily:server:22.10:amd64/20220605/disk1.img, Release: daily", "source"=>"tmpj_k3e6u1", "arch"=>"x86_64", "created_at"=>"2022-06-06T06:57:58.000Z", "owner"=>"acc-yw7i0", "official"=>false, "public"=>true, "compatibility_mode"=>false, "source_type"=>"upload", "source_trigger"=>"manual", "disk_size"=>752, "virtual_size"=>2252, "min_ram"=>nil, "ancestor"=>nil},
-        {"id"=>"img-tqaxd", "resource_type"=>"image", "url"=>"https://api.gb1s.brightbox.com/1.0/images/img-tqaxd", "name"=>"ubuntu-impish-21.10-amd64-server", "username"=>"ubuntu", "status"=>"available", "locked"=>false, "description"=>"ID: com.ubuntu.cloud:released:download/com.ubuntu.cloud:server:21.10:amd64/20220604/disk1.img, Release: release", "source"=>"tmp_xphnxch", "arch"=>"x86_64", "created_at"=>"2022-06-07T06:57:33.000Z", "owner"=>"acc-kg71m", "official"=>true, "public"=>true, "compatibility_mode"=>false, "source_type"=>"upload", "source_trigger"=>"manual", "disk_size"=>699, "virtual_size"=>2252, "min_ram"=>nil, "ancestor"=>nil},
-        {"id"=>"img-7d1e3", "resource_type"=>"image", "url"=>"https://api.gb1s.brightbox.com/1.0/images/img-7d1e3", "name"=>"ubuntu-jammy-22.04-amd64-server", "username"=>"ubuntu", "status"=>"available", "locked"=>false, "description"=>"ID: com.ubuntu.cloud:released:download/com.ubuntu.cloud:server:22.04:amd64/20220604/disk1.img, Release: release", "source"=>"tmp11_42l44", "arch"=>"x86_64", "created_at"=>"2022-06-07T06:58:16.000Z", "owner"=>"acc-kg71m", "official"=>true, "public"=>true, "compatibility_mode"=>false, "source_type"=>"upload", "source_trigger"=>"manual", "disk_size"=>709, "virtual_size"=>2252, "min_ram"=>nil, "ancestor"=>nil},
-        {"id"=>"img-kg2oa", "resource_type"=>"image", "url"=>"https://api.gb1s.brightbox.com/1.0/images/img-kg2oa", "name"=>"ubuntu-bionic-18.04-amd64-minimal", "username"=>"ubuntu", "status"=>"available", "locked"=>false, "description"=>"ID: com.ubuntu.cloud:released:download/com.ubuntu.cloud:minimal:18.04:amd64/20220607/disk1.img, Release: minimal release", "source"=>"tmpd7d5lvyb", "arch"=>"x86_64", "created_at"=>"2022-06-08T07:01:21.000Z", "owner"=>"acc-yw7i0", "official"=>false, "public"=>true, "compatibility_mode"=>false, "source_type"=>"upload", "source_trigger"=>"manual", "disk_size"=>258, "virtual_size"=>2252, "min_ram"=>nil, "ancestor"=>nil},
-        {"id"=>"img-sdofr", "resource_type"=>"image", "url"=>"https://api.gb1s.brightbox.com/1.0/images/img-sdofr", "name"=>"ubuntu-focal-20.04-amd64-minimal", "username"=>"ubuntu", "status"=>"available", "locked"=>false, "description"=>"ID: com.ubuntu.cloud:released:download/com.ubuntu.cloud:minimal:20.04:amd64/20220607/disk1.img, Release: minimal release", "source"=>"tmpl6wvuqu9", "arch"=>"x86_64", "created_at"=>"2022-06-08T07:01:49.000Z", "owner"=>"acc-yw7i0", "official"=>false, "public"=>true, "compatibility_mode"=>false, "source_type"=>"upload", "source_trigger"=>"manual", "disk_size"=>330, "virtual_size"=>2252, "min_ram"=>nil, "ancestor"=>nil},
-        {"id"=>"img-7wwg7", "resource_type"=>"image", "url"=>"https://api.gb1s.brightbox.com/1.0/images/img-7wwg7", "name"=>"ubuntu-impish-21.10-amd64-minimal", "username"=>"ubuntu", "status"=>"available", "locked"=>false, "description"=>"ID: com.ubuntu.cloud:released:download/com.ubuntu.cloud:minimal:21.10:amd64/20220607/disk1.img, Release: minimal release", "source"=>"tmpfkqj3pjo", "arch"=>"x86_64", "created_at"=>"2022-06-08T07:02:13.000Z", "owner"=>"acc-yw7i0", "official"=>false, "public"=>true, "compatibility_mode"=>false, "source_type"=>"upload", "source_trigger"=>"manual", "disk_size"=>328, "virtual_size"=>2252, "min_ram"=>nil, "ancestor"=>nil},
-        {"id"=>"img-ielp9", "resource_type"=>"image", "url"=>"https://api.gb1s.brightbox.com/1.0/images/img-ielp9", "name"=>"ubuntu-jammy-22.04-amd64-minimal", "username"=>"ubuntu", "status"=>"available", "locked"=>false, "description"=>"ID: com.ubuntu.cloud:released:download/com.ubuntu.cloud:minimal:22.04:amd64/20220607/disk1.img, Release: minimal release", "source"=>"tmpd0ctsx1v", "arch"=>"x86_64", "created_at"=>"2022-06-08T07:02:38.000Z", "owner"=>"acc-yw7i0", "official"=>false, "public"=>true, "compatibility_mode"=>false, "source_type"=>"upload", "source_trigger"=>"manual", "disk_size"=>353, "virtual_size"=>2252, "min_ram"=>nil, "ancestor"=>nil}
+        { "id" => "img-kppxh", "resource_type" => "image", "url" => "https://api.gb1s.brightbox.com/1.0/images/img-kppxh", "name" => "ubuntu-xenial-16.04-amd64-server", "username" => "ubuntu", "status" => "available", "locked" => false, "description" => "ID: com.ubuntu.cloud:released:download/com.ubuntu.cloud:server:16.04:amd64/20211001/disk1.img, Release: release", "source" => "tmp54tt71pg", "arch" => "x86_64", "created_at" => "2021-10-02T06:57:09.000Z", "owner" => "acc-kg71m", "official" => true, "public" => true, "compatibility_mode" => false, "source_type" => "upload", "source_trigger" => "manual", "disk_size" => 394, "virtual_size" => 2252, "min_ram" => nil, "ancestor" => nil },
+        { "id" => "img-bugr2", "resource_type" => "image", "url" => "https://api.gb1s.brightbox.com/1.0/images/img-bugr2", "name" => "ubuntu-xenial-16.04-i386-server", "username" => "ubuntu", "status" => "available", "locked" => false, "description" => "ID: com.ubuntu.cloud:released:download/com.ubuntu.cloud:server:16.04:i386/20211001/disk1.img, Release: release", "source" => "tmplj717rjf", "arch" => "i686", "created_at" => "2021-10-02T06:58:18.000Z", "owner" => "acc-kg71m", "official" => true, "public" => true, "compatibility_mode" => false, "source_type" => "upload", "source_trigger" => "manual", "disk_size" => 385, "virtual_size" => 2252, "min_ram" => nil, "ancestor" => nil },
+        { "id" => "img-6vfpp", "resource_type" => "image", "url" => "https://api.gb1s.brightbox.com/1.0/images/img-6vfpp", "name" => "ubuntu-xenial-daily-amd64-server", "username" => "ubuntu", "status" => "available", "locked" => false, "description" => "ID: com.ubuntu.cloud:daily:download/com.ubuntu.cloud.daily:server:16.04:amd64/20211001/disk1.img, Release: daily", "source" => "tmp3aj5trto", "arch" => "x86_64", "created_at" => "2021-10-02T06:58:57.000Z", "owner" => "acc-yw7i0", "official" => false, "public" => true, "compatibility_mode" => false, "source_type" => "upload", "source_trigger" => "manual", "disk_size" => 394, "virtual_size" => 2252, "min_ram" => nil, "ancestor" => nil },
+        { "id" => "img-x08p6", "resource_type" => "image", "url" => "https://api.gb1s.brightbox.com/1.0/images/img-x08p6", "name" => "ubuntu-bionic-18.04-amd64-server", "username" => "ubuntu", "status" => "available", "locked" => false, "description" => "ID: com.ubuntu.cloud:released:download/com.ubuntu.cloud:server:18.04:amd64/20220523/disk1.img, Release: release", "source" => "tmpcyevpow5", "arch" => "x86_64", "created_at" => "2022-05-24T06:57:15.000Z", "owner" => "acc-kg71m", "official" => true, "public" => true, "compatibility_mode" => false, "source_type" => "upload", "source_trigger" => "manual", "disk_size" => 480, "virtual_size" => 2252, "min_ram" => nil, "ancestor" => nil },
+        { "id" => "img-jrbnn", "resource_type" => "image", "url" => "https://api.gb1s.brightbox.com/1.0/images/img-jrbnn", "name" => "ubuntu-bionic-18.04-i386-server", "username" => "ubuntu", "status" => "available", "locked" => false, "description" => "ID: com.ubuntu.cloud:released:download/com.ubuntu.cloud:server:18.04:i386/20220523/disk1.img, Release: release", "source" => "tmpw502837r", "arch" => "i686", "created_at" => "2022-05-24T06:57:44.000Z", "owner" => "acc-kg71m", "official" => true, "public" => true, "compatibility_mode" => false, "source_type" => "upload", "source_trigger" => "manual", "disk_size" => 450, "virtual_size" => 2252, "min_ram" => nil, "ancestor" => nil },
+        { "id" => "img-1cbbg", "resource_type" => "image", "url" => "https://api.gb1s.brightbox.com/1.0/images/img-1cbbg", "name" => "ubuntu-focal-daily-amd64-server", "username" => "ubuntu", "status" => "available", "locked" => false, "description" => "ID: com.ubuntu.cloud:daily:download/com.ubuntu.cloud.daily:server:20.04:amd64/20220530/disk1.img, Release: daily", "source" => "tmpa2iezlb7", "arch" => "x86_64", "created_at" => "2022-06-01T07:06:08.000Z", "owner" => "acc-yw7i0", "official" => false, "public" => true, "compatibility_mode" => false, "source_type" => "upload", "source_trigger" => "manual", "disk_size" => 685, "virtual_size" => 2252, "min_ram" => nil, "ancestor" => nil },
+        { "id" => "img-cjc8m", "resource_type" => "image", "url" => "https://api.gb1s.brightbox.com/1.0/images/img-cjc8m", "name" => "ubuntu-focal-20.04-amd64-server", "username" => "ubuntu", "status" => "available", "locked" => false, "description" => "ID: com.ubuntu.cloud:released:download/com.ubuntu.cloud:server:20.04:amd64/20220530/disk1.img, Release: release", "source" => "tmppadp2ka9", "arch" => "x86_64", "created_at" => "2022-06-02T06:57:21.000Z", "owner" => "acc-kg71m", "official" => true, "public" => true, "compatibility_mode" => false, "source_type" => "upload", "source_trigger" => "manual", "disk_size" => 685, "virtual_size" => 2252, "min_ram" => nil, "ancestor" => nil },
+        { "id" => "img-yes2q", "resource_type" => "image", "url" => "https://api.gb1s.brightbox.com/1.0/images/img-yes2q", "name" => "ubuntu-bionic-daily-amd64-server", "username" => "ubuntu", "status" => "available", "locked" => false, "description" => "ID: com.ubuntu.cloud:daily:download/com.ubuntu.cloud.daily:server:18.04:amd64/20220530/disk1.img, Release: daily", "source" => "tmp7b0ty_cz", "arch" => "x86_64", "created_at" => "2022-06-02T06:59:06.000Z", "owner" => "acc-yw7i0", "official" => false, "public" => true, "compatibility_mode" => false, "source_type" => "upload", "source_trigger" => "manual", "disk_size" => 480, "virtual_size" => 2252, "min_ram" => nil, "ancestor" => nil },
+        { "id" => "img-44xv2", "resource_type" => "image", "url" => "https://api.gb1s.brightbox.com/1.0/images/img-44xv2", "name" => "ubuntu-bionic-daily-i386-server", "username" => "ubuntu", "status" => "available", "locked" => false, "description" => "ID: com.ubuntu.cloud:daily:download/com.ubuntu.cloud.daily:server:18.04:i386/20220530/disk1.img, Release: daily", "source" => "tmpcsk_ejc9", "arch" => "i686", "created_at" => "2022-06-02T06:59:33.000Z", "owner" => "acc-yw7i0", "official" => false, "public" => true, "compatibility_mode" => false, "source_type" => "upload", "source_trigger" => "manual", "disk_size" => 450, "virtual_size" => 2252, "min_ram" => nil, "ancestor" => nil },
+        { "id" => "img-axy3r", "resource_type" => "image", "url" => "https://api.gb1s.brightbox.com/1.0/images/img-axy3r", "name" => "ubuntu-impish-daily-amd64-server", "username" => "ubuntu", "status" => "available", "locked" => false, "description" => "ID: com.ubuntu.cloud:daily:download/com.ubuntu.cloud.daily:server:21.10:amd64/20220604/disk1.img, Release: daily", "source" => "tmpq4xcgkhd", "arch" => "x86_64", "created_at" => "2022-06-05T06:57:52.000Z", "owner" => "acc-yw7i0", "official" => false, "public" => true, "compatibility_mode" => false, "source_type" => "upload", "source_trigger" => "manual", "disk_size" => 699, "virtual_size" => 2252, "min_ram" => nil, "ancestor" => nil },
+        { "id" => "img-5sf6z", "resource_type" => "image", "url" => "https://api.gb1s.brightbox.com/1.0/images/img-5sf6z", "name" => "ubuntu-jammy-daily-amd64-server", "username" => "ubuntu", "status" => "available", "locked" => false, "description" => "ID: com.ubuntu.cloud:daily:download/com.ubuntu.cloud.daily:server:22.04:amd64/20220604/disk1.img, Release: daily", "source" => "tmp6lwsv5cb", "arch" => "x86_64", "created_at" => "2022-06-05T06:58:33.000Z", "owner" => "acc-yw7i0", "official" => false, "public" => true, "compatibility_mode" => false, "source_type" => "upload", "source_trigger" => "manual", "disk_size" => 709, "virtual_size" => 2252, "min_ram" => nil, "ancestor" => nil },
+        { "id" => "img-vuptu", "resource_type" => "image", "url" => "https://api.gb1s.brightbox.com/1.0/images/img-vuptu", "name" => "ubuntu-kinetic-daily-amd64-server", "username" => "ubuntu", "status" => "available", "locked" => false, "description" => "ID: com.ubuntu.cloud:daily:download/com.ubuntu.cloud.daily:server:22.10:amd64/20220605/disk1.img, Release: daily", "source" => "tmpj_k3e6u1", "arch" => "x86_64", "created_at" => "2022-06-06T06:57:58.000Z", "owner" => "acc-yw7i0", "official" => false, "public" => true, "compatibility_mode" => false, "source_type" => "upload", "source_trigger" => "manual", "disk_size" => 752, "virtual_size" => 2252, "min_ram" => nil, "ancestor" => nil },
+        { "id" => "img-tqaxd", "resource_type" => "image", "url" => "https://api.gb1s.brightbox.com/1.0/images/img-tqaxd", "name" => "ubuntu-impish-21.10-amd64-server", "username" => "ubuntu", "status" => "available", "locked" => false, "description" => "ID: com.ubuntu.cloud:released:download/com.ubuntu.cloud:server:21.10:amd64/20220604/disk1.img, Release: release", "source" => "tmp_xphnxch", "arch" => "x86_64", "created_at" => "2022-06-07T06:57:33.000Z", "owner" => "acc-kg71m", "official" => true, "public" => true, "compatibility_mode" => false, "source_type" => "upload", "source_trigger" => "manual", "disk_size" => 699, "virtual_size" => 2252, "min_ram" => nil, "ancestor" => nil },
+        { "id" => "img-7d1e3", "resource_type" => "image", "url" => "https://api.gb1s.brightbox.com/1.0/images/img-7d1e3", "name" => "ubuntu-jammy-22.04-amd64-server", "username" => "ubuntu", "status" => "available", "locked" => false, "description" => "ID: com.ubuntu.cloud:released:download/com.ubuntu.cloud:server:22.04:amd64/20220604/disk1.img, Release: release", "source" => "tmp11_42l44", "arch" => "x86_64", "created_at" => "2022-06-07T06:58:16.000Z", "owner" => "acc-kg71m", "official" => true, "public" => true, "compatibility_mode" => false, "source_type" => "upload", "source_trigger" => "manual", "disk_size" => 709, "virtual_size" => 2252, "min_ram" => nil, "ancestor" => nil },
+        { "id" => "img-kg2oa", "resource_type" => "image", "url" => "https://api.gb1s.brightbox.com/1.0/images/img-kg2oa", "name" => "ubuntu-bionic-18.04-amd64-minimal", "username" => "ubuntu", "status" => "available", "locked" => false, "description" => "ID: com.ubuntu.cloud:released:download/com.ubuntu.cloud:minimal:18.04:amd64/20220607/disk1.img, Release: minimal release", "source" => "tmpd7d5lvyb", "arch" => "x86_64", "created_at" => "2022-06-08T07:01:21.000Z", "owner" => "acc-yw7i0", "official" => false, "public" => true, "compatibility_mode" => false, "source_type" => "upload", "source_trigger" => "manual", "disk_size" => 258, "virtual_size" => 2252, "min_ram" => nil, "ancestor" => nil },
+        { "id" => "img-sdofr", "resource_type" => "image", "url" => "https://api.gb1s.brightbox.com/1.0/images/img-sdofr", "name" => "ubuntu-focal-20.04-amd64-minimal", "username" => "ubuntu", "status" => "available", "locked" => false, "description" => "ID: com.ubuntu.cloud:released:download/com.ubuntu.cloud:minimal:20.04:amd64/20220607/disk1.img, Release: minimal release", "source" => "tmpl6wvuqu9", "arch" => "x86_64", "created_at" => "2022-06-08T07:01:49.000Z", "owner" => "acc-yw7i0", "official" => false, "public" => true, "compatibility_mode" => false, "source_type" => "upload", "source_trigger" => "manual", "disk_size" => 330, "virtual_size" => 2252, "min_ram" => nil, "ancestor" => nil },
+        { "id" => "img-7wwg7", "resource_type" => "image", "url" => "https://api.gb1s.brightbox.com/1.0/images/img-7wwg7", "name" => "ubuntu-impish-21.10-amd64-minimal", "username" => "ubuntu", "status" => "available", "locked" => false, "description" => "ID: com.ubuntu.cloud:released:download/com.ubuntu.cloud:minimal:21.10:amd64/20220607/disk1.img, Release: minimal release", "source" => "tmpfkqj3pjo", "arch" => "x86_64", "created_at" => "2022-06-08T07:02:13.000Z", "owner" => "acc-yw7i0", "official" => false, "public" => true, "compatibility_mode" => false, "source_type" => "upload", "source_trigger" => "manual", "disk_size" => 328, "virtual_size" => 2252, "min_ram" => nil, "ancestor" => nil },
+        { "id" => "img-ielp9", "resource_type" => "image", "url" => "https://api.gb1s.brightbox.com/1.0/images/img-ielp9", "name" => "ubuntu-jammy-22.04-amd64-minimal", "username" => "ubuntu", "status" => "available", "locked" => false, "description" => "ID: com.ubuntu.cloud:released:download/com.ubuntu.cloud:minimal:22.04:amd64/20220607/disk1.img, Release: minimal release", "source" => "tmpd0ctsx1v", "arch" => "x86_64", "created_at" => "2022-06-08T07:02:38.000Z", "owner" => "acc-yw7i0", "official" => false, "public" => true, "compatibility_mode" => false, "source_type" => "upload", "source_trigger" => "manual", "disk_size" => 353, "virtual_size" => 2252, "min_ram" => nil, "ancestor" => nil }
       ]
 
       selector = subject.new(image_list)

data/spec/fog/compute/brightbox/load_balancer_spec.rb

@@ -33,12 +33,12 @@ describe Fog::Brightbox::Compute::LoadBalancer do
         nodes: []
       }
 
-      stub_request(:post, "http://localhost/1.0/load_balancers").
-        with(:query => hash_including(:account_id),
-             :headers => { "Authorization" => "Bearer FAKECACHEDTOKEN" }).
-        to_return(:status => 202, :body => %q({"id": "lba-12345"}), :headers => {})
+      stub_request(:post, "http://localhost/1.0/load_balancers")
+        .with(query: hash_including(:account_id),
+              headers: { "Authorization" => "Bearer FAKECACHEDTOKEN" })
+        .to_return(status: 202, body: '{"id": "lba-12345"}', headers: {})
 
-      @load_balancer = Fog::Brightbox::Compute::LoadBalancer.new({ :service => service }.merge(options))
+      @load_balancer = Fog::Brightbox::Compute::LoadBalancer.new({ service: service }.merge(options))
       assert @load_balancer.save
     end
   end

data/spec/fog/compute/brightbox/server_spec.rb

@@ -26,14 +26,14 @@ describe Fog::Brightbox::Compute::Server do
           image_id: "img-12345"
         }
 
-        stub_request(:post, "http://localhost/1.0/servers").
-          with(:query => hash_including(:account_id),
-               :headers => { "Authorization" => "Bearer FAKECACHEDTOKEN",
-                             "Content-Type" => "application/json" },
-                             :body => hash_including(:image => "img-12345")).
-        to_return(:status => 202, :body => %q({"id":"srv-12345"}), :headers => {})
-
-        @server = Fog::Brightbox::Compute::Server.new({ :service => service }.merge(options))
+        stub_request(:post, "http://localhost/1.0/servers")
+          .with(query: hash_including(:account_id),
+                headers: { "Authorization" => "Bearer FAKECACHEDTOKEN",
+                           "Content-Type" => "application/json" },
+                body: hash_including(image: "img-12345"))
+          .to_return(status: 202, body: '{"id":"srv-12345"}', headers: {})
+
+        @server = Fog::Brightbox::Compute::Server.new({ service: service }.merge(options))
         assert @server.save
       end
     end
@@ -53,14 +53,14 @@ describe Fog::Brightbox::Compute::Server do
           ]
         }
 
-        stub_request(:post, "http://localhost/1.0/servers").
-          with(:query => hash_including(:account_id),
-               :headers => { "Authorization" => "Bearer FAKECACHEDTOKEN",
-                             "Content-Type" => "application/json" },
-                             :body => hash_including(expected_args)).
-        to_return(:status => 202, :body => %q({"id":"srv-12345"}), :headers => {})
+        stub_request(:post, "http://localhost/1.0/servers")
+          .with(query: hash_including(:account_id),
+                headers: { "Authorization" => "Bearer FAKECACHEDTOKEN",
+                           "Content-Type" => "application/json" },
+                body: hash_including(expected_args))
+          .to_return(status: 202, body: '{"id":"srv-12345"}', headers: {})
 
-        @server = Fog::Brightbox::Compute::Server.new({ :service => service }.merge(options))
+        @server = Fog::Brightbox::Compute::Server.new({ service: service }.merge(options))
         assert @server.save
       end
     end
@@ -72,16 +72,16 @@ describe Fog::Brightbox::Compute::Server do
           disk_encrypted: true
         }
 
-        stub_request(:post, "http://localhost/1.0/servers").
-          with(:query => hash_including(:account_id),
-               :headers => { "Authorization" => "Bearer FAKECACHEDTOKEN",
-                             "Content-Type" => "application/json" },
-                             :body => hash_including(:disk_encrypted => true)).
-          to_return(:status => 202,
-                    :body => %q({"id":"srv-12345","disk_encrypted":true}),
-                    :headers => {})
+        stub_request(:post, "http://localhost/1.0/servers")
+          .with(query: hash_including(:account_id),
+                headers: { "Authorization" => "Bearer FAKECACHEDTOKEN",
+                           "Content-Type" => "application/json" },
+                body: hash_including(disk_encrypted: true))
+          .to_return(status: 202,
+                     body: '{"id":"srv-12345","disk_encrypted":true}',
+                     headers: {})
 
-        @server = Fog::Brightbox::Compute::Server.new({ :service => service }.merge(options))
+        @server = Fog::Brightbox::Compute::Server.new({ service: service }.merge(options))
         assert @server.save
         assert @server.disk_encrypted
       end
@@ -97,26 +97,26 @@ describe Fog::Brightbox::Compute::Server do
         volumes: [{ volume: "vol-12345" }]
       }
 
-      stub_request(:post, "http://localhost/1.0/servers").
-        with(:query => hash_including(:account_id),
-             :headers => { "Authorization" => "Bearer FAKECACHEDTOKEN",
-                           "Content-Type" => "application/json" },
-                           :body => hash_including(expected_args)).
-      to_return(:status => 202, :body => %q({"id":"srv-12345"}), :headers => {})
+      stub_request(:post, "http://localhost/1.0/servers")
+        .with(query: hash_including(:account_id),
+              headers: { "Authorization" => "Bearer FAKECACHEDTOKEN",
+                         "Content-Type" => "application/json" },
+              body: hash_including(expected_args))
+        .to_return(status: 202, body: '{"id":"srv-12345"}', headers: {})
 
-      @server = Fog::Brightbox::Compute::Server.new({ :service => service }.merge(options))
+      @server = Fog::Brightbox::Compute::Server.new({ service: service }.merge(options))
       assert @server.save
     end
   end
 
   describe "when snapshotting with no options" do
     it "returns the server" do
-      stub_request(:post, "http://localhost/1.0/servers/srv-12345/snapshot").
-        with(:query => hash_including(:account_id),
-             :headers => { "Authorization" => "Bearer FAKECACHEDTOKEN" }).
-        to_return(:status => 202, :body => %q({"id": "srv-12345"}), :headers => {})
+      stub_request(:post, "http://localhost/1.0/servers/srv-12345/snapshot")
+        .with(query: hash_including(:account_id),
+              headers: { "Authorization" => "Bearer FAKECACHEDTOKEN" })
+        .to_return(status: 202, body: '{"id": "srv-12345"}', headers: {})
 
-      @server = Fog::Brightbox::Compute::Server.new(:service => service, :id => "srv-12345")
+      @server = Fog::Brightbox::Compute::Server.new(service: service, id: "srv-12345")
       assert_kind_of Hash, @server.snapshot
     end
   end
@@ -125,15 +125,15 @@ describe Fog::Brightbox::Compute::Server do
     it "returns the new image" do
       link = "<https://api.gb1.brightbox.com/1.0/images/img-12345>; rel=snapshot"
 
-      stub_request(:post, "http://localhost/1.0/servers/srv-12345/snapshot").
-        with(:headers => { "Authorization" => "Bearer FAKECACHEDTOKEN" }).
-        to_return(:status => 202, :body => "{}", :headers => { "Link" => link })
+      stub_request(:post, "http://localhost/1.0/servers/srv-12345/snapshot")
+        .with(headers: { "Authorization" => "Bearer FAKECACHEDTOKEN" })
+        .to_return(status: 202, body: "{}", headers: { "Link" => link })
 
-      stub_request(:get, "http://localhost/1.0/images/img-12345").
-        with(:query => hash_including(:account_id),
-             :headers => { "Authorization" => "Bearer FAKECACHEDTOKEN" }).
-        to_return(:status => 200, :body => %q({"id": "img-12345"}))
-      @server = Fog::Brightbox::Compute::Server.new(:service => service, :id => "srv-12345")
+      stub_request(:get, "http://localhost/1.0/images/img-12345")
+        .with(query: hash_including(:account_id),
+              headers: { "Authorization" => "Bearer FAKECACHEDTOKEN" })
+        .to_return(status: 200, body: '{"id": "img-12345"}')
+      @server = Fog::Brightbox::Compute::Server.new(service: service, id: "srv-12345")
       assert_kind_of Fog::Brightbox::Compute::Image, @server.snapshot(true)
     end
   end

data/spec/fog/compute/brightbox/volume_spec.rb

@@ -111,14 +111,14 @@ describe Fog::Brightbox::Compute::Volume do
       server = service.servers.new
       server.id = "srv-12345"
 
-      stub_request(:post, "http://localhost/1.0/volumes/vol-12345/attach").
-        with(:query => hash_including(:account_id),
-             :headers => { "Authorization" => "Bearer FAKECACHEDTOKEN",
-                          "Content-Type" => "application/json" },
-             :body => hash_including(:server => "srv-12345")).
-        to_return(:status => 202,
-                  :body => %q({"id":"vol-12345","status":"attached"}),
-                  :headers => {})
+      stub_request(:post, "http://localhost/1.0/volumes/vol-12345/attach")
+        .with(query: hash_including(:account_id),
+              headers: { "Authorization" => "Bearer FAKECACHEDTOKEN",
+                         "Content-Type" => "application/json" },
+              body: hash_including(server: "srv-12345"))
+        .to_return(status: 202,
+                   body: '{"id":"vol-12345","status":"attached"}',
+                   headers: {})
 
       subject.attach(server)
 
@@ -141,14 +141,14 @@ describe Fog::Brightbox::Compute::Volume do
       refute subject.delete_with_server
       assert subject.persisted?
 
-      stub_request(:post, "http://localhost/1.0/volumes/vol-12345/copy").
-        with(:query => hash_including(:account_id),
-             :headers => { "Authorization" => "Bearer FAKECACHEDTOKEN",
-                          "Content-Type" => "application/json" },
-             :body => hash_including(:delete_with_server => true)).
-        to_return(:status => 202,
-                  :body => %q({"id":"vol-abcde","delete_with_server":true,"name":"Copy of vol-12345 (Impish Image)","status":"detached"}),
-                  :headers => {})
+      stub_request(:post, "http://localhost/1.0/volumes/vol-12345/copy")
+        .with(query: hash_including(:account_id),
+              headers: { "Authorization" => "Bearer FAKECACHEDTOKEN",
+                         "Content-Type" => "application/json" },
+              body: hash_including(delete_with_server: true))
+        .to_return(status: 202,
+                   body: '{"id":"vol-abcde","delete_with_server":true,"name":"Copy of vol-12345 (Impish Image)","status":"detached"}',
+                   headers: {})
 
       copy = subject.copy(delete_with_server: true)
 
@@ -166,13 +166,13 @@ describe Fog::Brightbox::Compute::Volume do
 
       assert subject.persisted?
 
-      stub_request(:post, "http://localhost/1.0/volumes/vol-12345/detach").
-        with(:query => hash_including(:account_id),
-             :headers => { "Authorization" => "Bearer FAKECACHEDTOKEN",
-                          "Content-Type" => "application/json" }).
-        to_return(:status => 202,
-                  :body => %q({"id":"vol-12345","status":"detached"}),
-                  :headers => {})
+      stub_request(:post, "http://localhost/1.0/volumes/vol-12345/detach")
+        .with(query: hash_including(:account_id),
+              headers: { "Authorization" => "Bearer FAKECACHEDTOKEN",
+                         "Content-Type" => "application/json" })
+        .to_return(status: 202,
+                   body: '{"id":"vol-12345","status":"detached"}',
+                   headers: {})
 
       subject.detach
 
@@ -185,13 +185,13 @@ describe Fog::Brightbox::Compute::Volume do
       subject.id = "vol-12345"
       assert subject.persisted?
 
-      stub_request(:delete, "http://localhost/1.0/volumes/vol-12345").
-        with(:query => hash_including(:account_id),
-             :headers => { "Authorization" => "Bearer FAKECACHEDTOKEN",
-                           "Content-Type" => "application/json" }).
-        to_return(:status => 202,
-                  :body => %q({"id":"vol-12345","status":"deleting"}),
-                  :headers => {})
+      stub_request(:delete, "http://localhost/1.0/volumes/vol-12345")
+        .with(query: hash_including(:account_id),
+              headers: { "Authorization" => "Bearer FAKECACHEDTOKEN",
+                         "Content-Type" => "application/json" })
+        .to_return(status: 202,
+                   body: '{"id":"vol-12345","status":"deleting"}',
+                   headers: {})
 
       subject.destroy
       assert_equal "deleting", subject.state
@@ -231,14 +231,14 @@ describe Fog::Brightbox::Compute::Volume do
 
       assert subject.persisted?
 
-      stub_request(:post, "http://localhost/1.0/volumes/vol-12345/resize").
-        with(:query => hash_including(:account_id),
-             :headers => { "Authorization" => "Bearer FAKECACHEDTOKEN",
-                          "Content-Type" => "application/json" },
-             :body => hash_including(:from => 40_000, :to => 50_000)).
-        to_return(:status => 202,
-                  :body => %q({"id":"vol-12345","size": 50000}),
-                  :headers => {})
+      stub_request(:post, "http://localhost/1.0/volumes/vol-12345/resize")
+        .with(query: hash_including(:account_id),
+              headers: { "Authorization" => "Bearer FAKECACHEDTOKEN",
+                         "Content-Type" => "application/json" },
+              body: hash_including(from: 40_000, to: 50_000))
+        .to_return(status: 202,
+                   body: '{"id":"vol-12345","size": 50000}',
+                   headers: {})
 
       subject.resize(to: 50_000)
 
@@ -261,7 +261,7 @@ describe Fog::Brightbox::Compute::Volume do
             image_id: "img-12345"
           }
 
-          @volume = Fog::Brightbox::Compute::Volume.new({ :service => service }.merge(options))
+          @volume = Fog::Brightbox::Compute::Volume.new({ service: service }.merge(options))
 
           assert_raises Fog::Errors::Error do
             @volume.save
@@ -276,16 +276,16 @@ describe Fog::Brightbox::Compute::Volume do
             filesystem_type: "ext4"
           }
 
-          stub_request(:post, "http://localhost/1.0/volumes").
-            with(:query => hash_including(:account_id),
-                 :headers => { "Authorization" => "Bearer FAKECACHEDTOKEN",
-                               "Content-Type" => "application/json" },
-                 :body => hash_including(:filesystem_type => "ext4")).
-            to_return(:status => 202,
-                      :body => %q({"id":"vol-12345","image":{"id":"img-blank"}}),
-                      :headers => {})
+          stub_request(:post, "http://localhost/1.0/volumes")
+            .with(query: hash_including(:account_id),
+                  headers: { "Authorization" => "Bearer FAKECACHEDTOKEN",
+                             "Content-Type" => "application/json" },
+                  body: hash_including(filesystem_type: "ext4"))
+            .to_return(status: 202,
+                       body: '{"id":"vol-12345","image":{"id":"img-blank"}}',
+                       headers: {})
 
-          @volume = Fog::Brightbox::Compute::Volume.new({ :service => service }.merge(options))
+          @volume = Fog::Brightbox::Compute::Volume.new({ service: service }.merge(options))
           assert @volume.save
           assert_equal @volume.filesystem_type, "ext4"
           assert_equal @volume.image_id, "img-blank"
@@ -300,17 +300,16 @@ describe Fog::Brightbox::Compute::Volume do
             name: "My Volume"
           }
 
-          stub_request(:post, "http://localhost/1.0/volumes").
-            with(:query => hash_including(:account_id),
-                 :headers => { "Authorization" => "Bearer FAKECACHEDTOKEN",
-                               "Content-Type" => "application/json" },
-                 :body => hash_including(:image => "img-12345")).
-            to_return(:status => 202,
-                      :body => %q({"id":"vol-12345","image":{"id":"img-12345"}}),
-                      :headers => {})
-
+          stub_request(:post, "http://localhost/1.0/volumes")
+            .with(query: hash_including(:account_id),
+                  headers: { "Authorization" => "Bearer FAKECACHEDTOKEN",
+                             "Content-Type" => "application/json" },
+                  body: hash_including(image: "img-12345"))
+            .to_return(status: 202,
+                       body: '{"id":"vol-12345","image":{"id":"img-12345"}}',
+                       headers: {})
 
-          @volume = Fog::Brightbox::Compute::Volume.new({ :service => service }.merge(options))
+          @volume = Fog::Brightbox::Compute::Volume.new({ service: service }.merge(options))
           assert @volume.save
           assert_equal @volume.image_id, "img-12345"
           assert_equal @volume.name, "My Volume"
@@ -329,17 +328,17 @@ describe Fog::Brightbox::Compute::Volume do
         subject.name = "New name"
         subject.serial = "NewSerial"
 
-        stub_request(:put, "http://localhost/1.0/volumes/vol-12345").
-          with(:query => hash_including(:account_id),
-               :headers => { "Authorization" => "Bearer FAKECACHEDTOKEN",
-                             "Content-Type" => "application/json" },
-               :body => hash_including(:delete_with_server => true,
-                                       :description => "Updated description",
-                                       :name => "New name",
-                                       :serial => "NewSerial")).
-          to_return(:status => 202,
-                    :body => %q({"id":"vol-12345"}),
-                    :headers => {})
+        stub_request(:put, "http://localhost/1.0/volumes/vol-12345")
+          .with(query: hash_including(:account_id),
+                headers: { "Authorization" => "Bearer FAKECACHEDTOKEN",
+                           "Content-Type" => "application/json" },
+                body: hash_including(delete_with_server: true,
+                                     description: "Updated description",
+                                     name: "New name",
+                                     serial: "NewSerial"))
+          .to_return(status: 202,
+                     body: '{"id":"vol-12345"}',
+                     headers: {})
 
         subject.save
       end