fog-brightbox 1.0.0.rc1 → 1.3.0

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

@@ -1,7 +1,7 @@
 require "spec_helper"
 require "fog/brightbox/models/compute/event"
 
-describe Fog::Compute::Brightbox::Event do
+describe Fog::Brightbox::Compute::Event do
   include ModelSetup
 
   subject { service.events.new }

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

@@ -1,7 +1,7 @@
 require "spec_helper"
 require "fog/brightbox/models/compute/firewall_policy"
 
-describe Fog::Compute::Brightbox::FirewallPolicy do
+describe Fog::Brightbox::Compute::FirewallPolicy do
   include ModelSetup
 
   subject { service.firewall_policies.new }

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

@@ -1,7 +1,7 @@
 require "spec_helper"
 require "fog/brightbox/models/compute/flavor"
 
-describe Fog::Compute::Brightbox::Flavor do
+describe Fog::Brightbox::Compute::Flavor do
   include ModelSetup
 
   subject { service.flavors.new }

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

@@ -1,7 +1,7 @@
 require "spec_helper"
 require "fog/brightbox/models/compute/image"
 
-describe Fog::Compute::Brightbox::Image do
+describe Fog::Brightbox::Compute::Image do
   include ModelSetup
   include SupportsResourceLocking
 

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

@@ -1,7 +1,7 @@
 require "spec_helper"
 require "fog/brightbox/models/compute/load_balancer"
 
-describe Fog::Compute::Brightbox::LoadBalancer do
+describe Fog::Brightbox::Compute::LoadBalancer do
   include ModelSetup
   include SupportsResourceLocking
 
@@ -18,4 +18,28 @@ describe Fog::Compute::Brightbox::LoadBalancer do
       assert_equal "load_balancer", subject.resource_name
     end
   end
+
+  describe "when creating" do
+    it "send correct JSON" do
+      options = {
+        healthcheck: {},
+        listeners: [
+          {
+            protocol: "http",
+            in: 80,
+            out: 80
+          }
+        ],
+        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 => {})
+
+      @load_balancer = Fog::Brightbox::Compute::LoadBalancer.new({ :service => service }.merge(options))
+      assert @load_balancer.save
+    end
+  end
 end

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

@@ -1,7 +1,7 @@
 require "spec_helper"
 require "fog/brightbox/models/compute/server_group"
 
-describe Fog::Compute::Brightbox::ServerGroup do
+describe Fog::Brightbox::Compute::ServerGroup do
   include ModelSetup
 
   subject { service.server_groups.new }

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

@@ -1,7 +1,7 @@
 require "spec_helper"
 require "fog/brightbox/models/compute/server"
 
-describe Fog::Compute::Brightbox::Server do
+describe Fog::Brightbox::Compute::Server do
   include ModelSetup
   include SupportsResourceLocking
 
@@ -19,14 +19,56 @@ describe Fog::Compute::Brightbox::Server do
     end
   end
 
-  describe "when snapshotting withi no options" do
+  describe "when creating" do
+    describe "with required image_id" do
+      it "sends correct JSON" do
+        options = {
+          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))
+        assert @server.save
+      end
+    end
+
+    describe "with additional disk_encrypted" do
+      it "sends correct JSON" do
+        options = {
+          image_id: "img-12345",
+          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 => {})
+
+        @server = Fog::Brightbox::Compute::Server.new({ :service => service }.merge(options))
+        assert @server.save
+        assert @server.disk_encrypted
+      end
+    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 => {})
 
-      @server = Fog::Compute::Brightbox::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
@@ -43,8 +85,8 @@ describe Fog::Compute::Brightbox::Server do
         with(:query => hash_including(:account_id),
              :headers => { "Authorization" => "Bearer FAKECACHEDTOKEN" }).
         to_return(:status => 200, :body => %q({"id": "img-12345"}))
-      @server = Fog::Compute::Brightbox::Server.new(:service => service, :id => "srv-12345")
-      assert_kind_of Fog::Compute::Brightbox::Image, @server.snapshot(true)
+      @server = Fog::Brightbox::Compute::Server.new(:service => service, :id => "srv-12345")
+      assert_kind_of Fog::Brightbox::Compute::Image, @server.snapshot(true)
     end
   end
 end

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

@@ -1,7 +1,7 @@
 require "spec_helper"
 require "fog/brightbox/models/compute/user_collaboration"
 
-describe Fog::Compute::Brightbox::UserCollaboration do
+describe Fog::Brightbox::Compute::UserCollaboration do
   include ModelSetup
 
   subject { service.user_collaborations.new }

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

@@ -1,7 +1,7 @@
 require "spec_helper"
 require "fog/brightbox/models/compute/user"
 
-describe Fog::Compute::Brightbox::User do
+describe Fog::Brightbox::Compute::User do
   include ModelSetup
 
   subject { service.users.new }

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

@@ -1,7 +1,7 @@
 require "spec_helper"
 require "fog/brightbox/models/compute/zone"
 
-describe Fog::Compute::Brightbox::Zone do
+describe Fog::Brightbox::Compute::Zone do
   include ModelSetup
 
   subject { service.zones.new }

data/spec/fog/compute/brightbox_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Fog::Compute::Brightbox do
+describe Fog::Brightbox::Compute do
   describe "when global config is available" do
     before do
       @arguments = {
@@ -19,7 +19,7 @@ describe Fog::Compute::Brightbox do
       end
 
       Fog.stub :credentials, @credential_guard do
-        @service = Fog::Compute::Brightbox.new(@arguments)
+        @service = Fog::Brightbox::Compute.new(@arguments)
       end
     end
 
@@ -40,7 +40,7 @@ describe Fog::Compute::Brightbox do
     it "raises an error" do
       Fog.stub :credentials, {} do
         assert_raises ArgumentError do
-          Fog::Compute::Brightbox.new({})
+          Fog::Brightbox::Compute.new({})
         end
       end
     end
@@ -53,7 +53,7 @@ describe Fog::Compute::Brightbox do
         :brightbox_secret => "1234567890"
       }
       @config = Fog::Brightbox::Config.new(@options)
-      @service = Fog::Compute::Brightbox.new(@config)
+      @service = Fog::Brightbox::Compute.new(@config)
       pass
     end
   end
@@ -62,7 +62,7 @@ describe Fog::Compute::Brightbox do
     it "raises ArgumentError"do
       @config = Fog::Brightbox::Config.new({})
       assert_raises ArgumentError do
-        @service = Fog::Compute::Brightbox.new(@config)
+        @service = Fog::Brightbox::Compute.new(@config)
       end
     end
   end

data/spec/fog/storage/brightbox_spec.rb

@@ -1,16 +1,16 @@
 require "spec_helper"
 
-describe Fog::Storage::Brightbox do
+describe Fog::Brightbox::Storage do
   include StockStorageResponses
 
   let(:config) { Fog::Brightbox::Config.new(settings) }
-  let(:service) { Fog::Storage::Brightbox.new(config) }
+  let(:service) { Fog::Brightbox::Storage.new(config) }
 
   describe "when created without required arguments" do
     it "raises an error" do
       Fog.stub :credentials, {} do
         assert_raises ArgumentError do
-          Fog::Storage::Brightbox.new({})
+          Fog::Brightbox::Storage.new({})
         end
       end
     end
@@ -35,7 +35,7 @@ describe Fog::Storage::Brightbox do
 
     it "raises ArgumentError" do
       assert_raises ArgumentError do
-        Fog::Storage::Brightbox.new(config)
+        Fog::Brightbox::Storage.new(config)
       end
     end
   end
@@ -89,7 +89,7 @@ describe Fog::Storage::Brightbox do
       {
         :brightbox_client_id => "app-12345",
         :brightbox_secret => "12345",
-        :brightbox_username => "user@example.com",
+        :brightbox_username => "user@example.test",
         :brightbox_password => "abcde",
         :brightbox_account => "acc-abcde"
       }
@@ -111,7 +111,7 @@ describe Fog::Storage::Brightbox do
       {
         :brightbox_client_id => "app-12345",
         :brightbox_secret => "12345",
-        :brightbox_username => "user@example.com",
+        :brightbox_username => "user@example.test",
         :brightbox_password => "abcde"
       }
     end
@@ -204,7 +204,7 @@ describe Fog::Storage::Brightbox do
       {
         :brightbox_client_id => "app-12345",
         :brightbox_secret => "12345",
-        :brightbox_username => "user@example.com",
+        :brightbox_username => "user@example.test",
         :brightbox_password => "12345",
         :brightbox_access_token => "1234567890abcdefghijklmnopqrstuvwxyz",
         :brightbox_refresh_token => "1234567890abcdefghijklmnopqrstuvwxyz",
@@ -221,7 +221,7 @@ describe Fog::Storage::Brightbox do
 
       # The reauthentication
       stub_request(:get, "https://files.gb2.brightbox.com/v1").
-        with(:headers => { "X-Auth-User" => "user@example.com", "X-Auth-Key" => "12345" }).
+        with(:headers => { "X-Auth-User" => "user@example.test", "X-Auth-Key" => "12345" }).
         to_return(authorized_response)
 
       # Repeated request

data/spec/model_setup.rb

@@ -16,7 +16,7 @@ module ModelSetup
       end
 
       let(:config) { Fog::Brightbox::Config.new(configuration) }
-      let(:service) { Fog::Compute::Brightbox.new(config) }
+      let(:service) { Fog::Brightbox::Compute.new(config) }
     end
   end
 end

data/tests/brightbox/compute/schema.rb

@@ -46,7 +46,7 @@ Hash.send :include, Fog::Brightbox::Nullable::Zone
 NilClass.send :include, Fog::Brightbox::Nullable::Zone
 
 class Brightbox
-  module Compute
+  class Compute
     module Formats
       module Struct
         CIP_PORT_TRANSLATOR = {

data/tests/brightbox/compute_tests.rb

@@ -9,8 +9,8 @@ end
 Shindo.tests("Fog::Compute.new", ["brightbox"]) do
   tests("service options") do
     {
-      :brightbox_api_url => "https://example.com",
-      :brightbox_auth_url => "https://example.com",
+      :brightbox_api_url => "https://example.test",
+      :brightbox_auth_url => "https://example.test",
       :brightbox_client_id => "app-12345",
       :brightbox_secret => "12345abdef6789",
       :brightbox_username => "user-12345",

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

@@ -38,9 +38,9 @@ Shindo.tests("Fog::Compute[:brightbox] | api client requests", ["brightbox"]) do
       test("new secret is visible") { !result["secret"].nil? }
     end
 
-    tests("#destroy_api_client('#{@api_client_id}')") do
+    tests("#delete_api_client('#{@api_client_id}')") do
       pending if Fog.mocking?
-      result = Fog::Compute[:brightbox].destroy_api_client(@api_client_id)
+      result = Fog::Compute[:brightbox].delete_api_client(@api_client_id)
       data_matches_schema(Brightbox::Compute::Formats::Full::API_CLIENT, :allow_extra_keys => true) { result }
     end
   end

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

@@ -37,9 +37,9 @@ Shindo.tests("Fog::Compute[:brightbox] | api client requests", ["brightbox"]) do
       test("new secret is visible") { !result["secret"].nil? }
     end
 
-    tests("#destroy_application('#{@application_id}')") do
+    tests("#delete_application('#{@application_id}')") do
       pending if Fog.mocking?
-      result = Fog::Compute[:brightbox].destroy_application(@application_id)
+      result = Fog::Compute[:brightbox].delete_application(@application_id)
       data_matches_schema(Brightbox::Compute::Formats::Full::APPLICATION, :allow_extra_keys => true) { result }
     end
   end

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

@@ -54,9 +54,9 @@ Shindo.tests("Fog::Compute[:brightbox] | cloud ip requests", ["brightbox"]) do
       result = Fog::Compute[:brightbox].update_cloud_ip(@cloud_ip_id, :reverse_dns => "")
     end
 
-    tests("#destroy_cloud_ip('#{@cloud_ip_id}')") do
+    tests("#delete_cloud_ip('#{@cloud_ip_id}')") do
       pending if Fog.mocking?
-      result = Fog::Compute[:brightbox].destroy_cloud_ip(@cloud_ip_id)
+      result = Fog::Compute[:brightbox].delete_cloud_ip(@cloud_ip_id)
       data_matches_schema(Brightbox::Compute::Formats::Full::CLOUD_IP, :allow_extra_keys => true) { result }
     end
 

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

@@ -1,8 +1,11 @@
 Shindo.tests("Fog::Compute[:brightbox] | collaboration requests", ["brightbox"]) do
   tests("success") do
+    @test_collaborator_email = ENV["FOG_TEST_COLLABORATOR_EMAIL"]
+    pending unless @test_collaborator_email
+
     tests("#create_collaboration") do
       pending if Fog.mocking?
-      collaboration = Fog::Compute[:brightbox].create_collaboration(:email => "paul@example.com", :role => "admin")
+      collaboration = Fog::Compute[:brightbox].create_collaboration(:email => @test_collaborator_email, :role => "admin")
       @collaboration_id = collaboration["id"]
       formats(Brightbox::Compute::Formats::Full::COLLABORATION, false) { collaboration }
     end
@@ -20,9 +23,9 @@ Shindo.tests("Fog::Compute[:brightbox] | collaboration requests", ["brightbox"])
       formats(Brightbox::Compute::Formats::Full::COLLABORATION, false) { result }
     end
 
-    tests("#destroy_collaboration") do
+    tests("#delete_collaboration") do
       pending if Fog.mocking?
-      result = Fog::Compute[:brightbox].destroy_collaboration(@collaboration_id)
+      result = Fog::Compute[:brightbox].delete_collaboration(@collaboration_id)
       formats(Brightbox::Compute::Formats::Full::COLLABORATION, false) { result }
     end
   end

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

@@ -35,8 +35,8 @@ Shindo.tests("Fog::Compute[:brightbox] | database server requests", ["brightbox"
       test("new password is visible") { !result["admin_password"].nil? }
     end
 
-    tests("#destroy_database_server('#{@database_server_id}')") do
-      result = Fog::Compute[:brightbox].destroy_database_server(@database_server_id)
+    tests("#delete_database_server('#{@database_server_id}')") do
+      result = Fog::Compute[:brightbox].delete_database_server(@database_server_id)
       data_matches_schema(Brightbox::Compute::Formats::Full::DATABASE_SERVER, :allow_extra_keys => true) { result }
     end
   end

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

@@ -32,8 +32,8 @@ Shindo.tests("Fog::Compute[:brightbox] | database snapshot requests", ["brightbo
       data_matches_schema(Brightbox::Compute::Formats::Full::DATABASE_SNAPSHOT, :allow_extra_keys => true) { result }
     end
 
-    tests("#destroy_database_snapshot('#{@database_snapshot_id}')") do
-      result = service.destroy_database_snapshot(@database_snapshot_id)
+    tests("#delete_database_snapshot('#{@database_snapshot_id}')") do
+      result = service.delete_database_snapshot(@database_snapshot_id)
       data_matches_schema(Brightbox::Compute::Formats::Full::DATABASE_SNAPSHOT, :allow_extra_keys => true) { result }
     end
   end

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

@@ -31,8 +31,8 @@ Shindo.tests("Fog::Compute[:brightbox] | firewall policy requests", ["brightbox"
       returns("Fog test policy B") { result["name"] }
     end
 
-    tests("#destroy_firewall_policy('#{@firewall_policy_id}')") do
-      result = Fog::Compute[:brightbox].destroy_firewall_policy(@firewall_policy_id)
+    tests("#delete_firewall_policy('#{@firewall_policy_id}')") do
+      result = Fog::Compute[:brightbox].delete_firewall_policy(@firewall_policy_id)
       data_matches_schema(Brightbox::Compute::Formats::Full::FIREWALL_POLICY, :allow_extra_keys => true) { result }
     end
   end

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

@@ -30,8 +30,8 @@ Shindo.tests("Fog::Compute[:brightbox] | firewall rule requests", ["brightbox"])
       end
     end
 
-    tests("#destroy_firewall_rule('#{@firewall_rule_id}')") do
-      result = Fog::Compute[:brightbox].destroy_firewall_rule(@firewall_rule_id)
+    tests("#delete_firewall_rule('#{@firewall_rule_id}')") do
+      result = Fog::Compute[:brightbox].delete_firewall_rule(@firewall_rule_id)
       data_matches_schema(Brightbox::Compute::Formats::Full::FIREWALL_RULE, :allow_extra_keys => true) { result }
     end
 

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

@@ -1,5 +1,5 @@
 class Brightbox
-  module Compute
+  class Compute
     module TestSupport
       # Find a suitable image for testing with
       # For speed of server building we're using an empty image