fog-brightbox 1.4.2 → 1.6.0

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

@@ -0,0 +1,348 @@
+require "spec_helper"
+require "fog/brightbox/models/compute/volume"
+
+describe Fog::Brightbox::Compute::Volume do
+  include ModelSetup
+  include SupportsResourceLocking
+
+  subject { service.volumes.new }
+
+  describe "when state is 'creating'" do
+    it do
+      subject.state = "creating"
+
+      assert subject.creating?
+      refute subject.attached?
+      refute subject.detached?
+      refute subject.deleting?
+      refute subject.deleted?
+      refute subject.failed?
+
+      refute subject.ready?
+      refute subject.finished?
+    end
+  end
+
+  describe "when state is 'attached'" do
+    it do
+      subject.state = "attached"
+
+      refute subject.creating?
+      assert subject.attached?
+      refute subject.detached?
+      refute subject.deleting?
+      refute subject.deleted?
+      refute subject.failed?
+
+      assert subject.ready?
+      refute subject.finished?
+    end
+  end
+
+  describe "when state is 'detached'" do
+    it do
+      subject.state = "detached"
+
+      refute subject.creating?
+      refute subject.attached?
+      assert subject.detached?
+      refute subject.deleting?
+      refute subject.deleted?
+      refute subject.failed?
+
+      assert subject.ready?
+      refute subject.finished?
+    end
+  end
+
+  describe "when state is 'deleting'" do
+    it do
+      subject.state = "deleting"
+
+      refute subject.creating?
+      refute subject.attached?
+      refute subject.detached?
+      assert subject.deleting?
+      refute subject.deleted?
+      refute subject.failed?
+
+      refute subject.ready?
+      refute subject.finished?
+    end
+  end
+
+  describe "when state is 'deleted'" do
+    it do
+      subject.state = "deleted"
+
+      refute subject.creating?
+      refute subject.attached?
+      refute subject.detached?
+      refute subject.deleting?
+      assert subject.deleted?
+      refute subject.failed?
+
+      refute subject.ready?
+      assert subject.finished?
+    end
+  end
+
+  describe "when state is 'failed'" do
+    it do
+      subject.state = "failed"
+
+      refute subject.creating?
+      refute subject.attached?
+      refute subject.detached?
+      refute subject.deleting?
+      refute subject.deleted?
+      assert subject.failed?
+
+      refute subject.ready?
+      assert subject.finished?
+    end
+  end
+
+  describe "#attach" do
+    it do
+      subject.id = "vol-12345"
+      assert subject.persisted?
+
+      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 => {})
+
+      subject.attach(server)
+
+      assert subject.attached?
+    end
+  end
+
+  describe "#collection_name" do
+    it "responds 'volumes'" do
+      assert_equal "volumes", subject.collection_name
+    end
+  end
+
+  describe "#copy" do
+    it do
+      subject.id = "vol-12345"
+      subject.state = "attached"
+      subject.delete_with_server = false
+
+      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 => {})
+
+      copy = subject.copy(delete_with_server: true)
+
+      assert copy.persisted?
+      assert_equal "vol-abcde", copy.id
+      assert copy.delete_with_server
+      assert copy.detached?
+    end
+  end
+
+  describe "#detach" do
+    it do
+      subject.id = "vol-12345"
+      subject.state = "attached"
+
+      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 => {})
+
+      subject.detach
+
+      assert subject.detached?
+    end
+  end
+
+  describe "#destroy" do
+    it 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 => {})
+
+      subject.destroy
+      assert_equal "deleting", subject.state
+    end
+  end
+
+  describe "#ready?" do
+    describe "when state is 'creating'" do
+      it do
+        subject.state = "creating"
+
+        refute subject.ready?
+      end
+    end
+
+    describe "when state is 'attached'" do
+      it do
+        subject.state = "attached"
+
+        assert subject.ready?
+      end
+    end
+
+    describe "when state is 'detached'" do
+      it do
+        subject.state = "detached"
+
+        assert subject.ready?
+      end
+    end
+  end
+
+  describe "#resize" do
+    it do
+      subject.id = "vol-12345"
+      subject.size = 40_000
+
+      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 => {})
+
+      subject.resize(to: 50_000)
+
+      assert 50_000, subject.size
+    end
+  end
+
+  describe "#resource_name" do
+    it "responds 'volume'" do
+      assert_equal "volume", subject.resource_name
+    end
+  end
+
+  describe "#save" do
+    describe "when creating" do
+      describe "with mutually exclusive arguments" do
+        it "raises Fog::Errors::Error" do
+          options = {
+            filesystem_type: "ext4",
+            image_id: "img-12345"
+          }
+
+          @volume = Fog::Brightbox::Compute::Volume.new({ :service => service }.merge(options))
+
+          assert_raises Fog::Errors::Error do
+            @volume.save
+          end
+        end
+      end
+
+      describe "with filesytem type" do
+        it "sends correct JSON" do
+          options = {
+            description: "An ext4 volume",
+            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 => {})
+
+          @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"
+          assert_equal @volume.description, "An ext4 volume"
+        end
+      end
+
+      describe "with image" do
+        it "sends correct JSON" do
+          options = {
+            image_id: "img-12345",
+            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 => {})
+
+
+          @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"
+        end
+      end
+    end
+
+    describe "when updating" do
+      it do
+        subject.id = "vol-12345"
+
+        assert subject.persisted?
+
+        subject.delete_with_server = true
+        subject.description = "Updated description"
+        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 => {})
+
+        subject.save
+      end
+    end
+  end
+end

data/tests/brightbox/compute/schema.rb

@@ -252,6 +252,29 @@ class Brightbox
           "inviter"         => Brightbox::Compute::Formats::Nested::USER
         }
 
+        VOLUME = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "status"          => String,
+          "name"            => Fog::Nullable::String,
+          "delete_with_server" => Fog::Boolean,
+          "description"     => Fog::Nullable::String,
+          "boot"            => Fog::Boolean,
+          "encrypted"       => Fog::Boolean,
+          "filesystem_label" => Fog::Nullable::String,
+          "filesystem_type" => Fog::Nullable::String,
+          "locked"          => Fog::Boolean,
+          "serial"          => String,
+          "size"            => Integer,
+          "source"          => Fog::Nullable::String,
+          "source_type"     => String,
+          "storage_type"    => String,
+          "created_at"      => String,
+          "updated_at"      => String,
+          "deleted_at"      => Fog::Nullable::String
+        }
+
         ZONE = {
           "id"              => String,
           "resource_type"   => String,
@@ -482,6 +505,29 @@ class Brightbox
           "inviter"         => Brightbox::Compute::Formats::Nested::USER
         }
 
+        VOLUME = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "status"          => String,
+          "name"            => Fog::Nullable::String,
+          "delete_with_server" => Fog::Boolean,
+          "description"     => Fog::Nullable::String,
+          "boot"            => Fog::Boolean,
+          "encrypted"       => Fog::Boolean,
+          "filesystem_label" => Fog::Nullable::String,
+          "filesystem_type" => Fog::Nullable::String,
+          "locked"          => Fog::Boolean,
+          "serial"          => String,
+          "size"            => Integer,
+          "source"          => Fog::Nullable::String,
+          "source_type"     => String,
+          "storage_type"    => String,
+          "created_at"      => String,
+          "updated_at"      => String,
+          "deleted_at"      => Fog::Nullable::String
+        }
+
         ZONE = {
           "id"              => String,
           "resource_type"   => String,
@@ -706,6 +752,7 @@ class Brightbox
           "snapshots"       => [Brightbox::Compute::Formats::Nested::IMAGE],
           "server_groups"   => [Brightbox::Compute::Formats::Nested::SERVER_GROUP],
           "interfaces"      => [Brightbox::Compute::Formats::Nested::INTERFACE],
+          "volumes"         => [Brightbox::Compute::Formats::Nested::VOLUME],
           "zone"            => Fog::Brightbox::Nullable::Zone,
           "licence_name"    => Fog::Nullable::String,
           "username"        => Fog::Nullable::String,
@@ -763,6 +810,32 @@ class Brightbox
           "inviter"         => Brightbox::Compute::Formats::Nested::USER
         }
 
+        VOLUME = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "status"          => String,
+          "name"            => Fog::Nullable::String,
+          "delete_with_server" => Fog::Boolean,
+          "description"     => Fog::Nullable::String,
+          "boot"            => Fog::Boolean,
+          "encrypted"       => Fog::Boolean,
+          "filesystem_label" => Fog::Nullable::String,
+          "filesystem_type" => Fog::Nullable::String,
+          "locked"          => Fog::Boolean,
+          "serial"          => String,
+          "size"            => Integer,
+          "source"          => Fog::Nullable::String,
+          "source_type"     => String,
+          "storage_type"    => String,
+          "created_at"      => String,
+          "updated_at"      => String,
+          "deleted_at"      => Fog::Nullable::String,
+          "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT,
+          "image"           => Fog::Brightbox::Nullable::Image,
+          "server"          => Fog::Brightbox::Nullable::Server
+        }
+
         ZONE = {
           "id"              => String,
           "resource_type"   => String,
@@ -787,6 +860,7 @@ class Brightbox
         SERVER_GROUPS = [Brightbox::Compute::Formats::Collected::SERVER_GROUP]
         SERVER_TYPES = [Brightbox::Compute::Formats::Collected::SERVER_TYPE]
         USERS = [Brightbox::Compute::Formats::Collected::USER]
+        VOLUMES = [Brightbox::Compute::Formats::Collected::VOLUME]
         ZONES = [Brightbox::Compute::Formats::Collected::ZONE]
       end
     end

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

@@ -0,0 +1,57 @@
+Shindo.tests("Fog::Compute[:brightbox] | volume requests", ["brightbox"]) do
+  pending if Fog.mocking?
+  image_id = Brightbox::Compute::TestSupport.image_id
+
+  tests("success") do
+    create_options = { image: image_id }
+
+    tests("#create_volume(#{create_options.inspect})") do
+      result = Fog::Compute[:brightbox].create_volume(create_options)
+      @volume_id = result["id"]
+      data_matches_schema(Brightbox::Compute::Formats::Full::VOLUME, :allow_extra_keys => true) { result }
+    end
+
+    tests("#list_volumes") do
+      result = Fog::Compute[:brightbox].list_volumes
+      data_matches_schema(Brightbox::Compute::Formats::Collection::VOLUMES, :allow_extra_keys => true) { result }
+
+      test("#{@volume_id} is listed") do
+        result.any? do |volume|
+          volume["id"] == @volume_id
+        end
+      end
+    end
+
+    tests("#get_volume('#{@volume_id}')") do
+      result = Fog::Compute[:brightbox].get_volume(@volume_id)
+      data_matches_schema(Brightbox::Compute::Formats::Full::VOLUME, :allow_extra_keys => true) { result }
+    end
+
+    update_options = {
+      name: "New name"
+    }
+    tests("#update_volume('#{@volume_id}', ...)") do
+      result = Fog::Compute[:brightbox].update_volume(@volume_id, update_options)
+      data_matches_schema(Brightbox::Compute::Formats::Full::VOLUME, :allow_extra_keys => true) { result }
+
+      test("name has updated") { result["name"] == "New name" }
+    end
+
+    Fog::Compute[:brightbox].volumes.get(@volume_id).wait_for { ready? }
+
+    tests("#delete_volume('#{@volume_id}')") do
+      result = Fog::Compute[:brightbox].delete_volume(@volume_id)
+      data_matches_schema(Brightbox::Compute::Formats::Full::VOLUME, :allow_extra_keys => true) { result }
+    end
+  end
+
+  tests("failure") do
+    tests("create_volume without options").raises(ArgumentError) do
+      Fog::Compute[:brightbox].create_volume
+    end
+
+    tests("get_volume with invalid ID").raises(Excon::Errors::NotFound) do
+      Fog::Compute[:brightbox].get_volume("vol-00000")
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-brightbox
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.6.0
 platform: ruby
 authors:
 - Paul Thornthwaite
@@ -219,6 +219,8 @@ files:
 - lib/fog/brightbox/models/compute/user_collaboration.rb
 - lib/fog/brightbox/models/compute/user_collaborations.rb
 - lib/fog/brightbox/models/compute/users.rb
+- lib/fog/brightbox/models/compute/volume.rb
+- lib/fog/brightbox/models/compute/volumes.rb
 - lib/fog/brightbox/models/compute/zone.rb
 - lib/fog/brightbox/models/compute/zones.rb
 - lib/fog/brightbox/models/storage/directories.rb
@@ -232,6 +234,8 @@ files:
 - lib/fog/brightbox/requests/compute/add_nodes_load_balancer.rb
 - lib/fog/brightbox/requests/compute/add_servers_server_group.rb
 - lib/fog/brightbox/requests/compute/apply_to_firewall_policy.rb
+- lib/fog/brightbox/requests/compute/attach_volume.rb
+- lib/fog/brightbox/requests/compute/copy_volume.rb
 - lib/fog/brightbox/requests/compute/create_api_client.rb
 - lib/fog/brightbox/requests/compute/create_application.rb
 - lib/fog/brightbox/requests/compute/create_cloud_ip.rb
@@ -243,6 +247,7 @@ files:
 - lib/fog/brightbox/requests/compute/create_load_balancer.rb
 - lib/fog/brightbox/requests/compute/create_server.rb
 - lib/fog/brightbox/requests/compute/create_server_group.rb
+- lib/fog/brightbox/requests/compute/create_volume.rb
 - lib/fog/brightbox/requests/compute/delete_api_client.rb
 - lib/fog/brightbox/requests/compute/delete_application.rb
 - lib/fog/brightbox/requests/compute/delete_cloud_ip.rb
@@ -256,6 +261,8 @@ files:
 - lib/fog/brightbox/requests/compute/delete_server.rb
 - lib/fog/brightbox/requests/compute/delete_server_group.rb
 - lib/fog/brightbox/requests/compute/delete_user_collaboration.rb
+- lib/fog/brightbox/requests/compute/delete_volume.rb
+- lib/fog/brightbox/requests/compute/detach_volume.rb
 - lib/fog/brightbox/requests/compute/get_account.rb
 - lib/fog/brightbox/requests/compute/get_api_client.rb
 - lib/fog/brightbox/requests/compute/get_application.rb
@@ -276,6 +283,7 @@ files:
 - lib/fog/brightbox/requests/compute/get_server_type.rb
 - lib/fog/brightbox/requests/compute/get_user.rb
 - lib/fog/brightbox/requests/compute/get_user_collaboration.rb
+- lib/fog/brightbox/requests/compute/get_volume.rb
 - lib/fog/brightbox/requests/compute/get_zone.rb
 - lib/fog/brightbox/requests/compute/list_accounts.rb
 - lib/fog/brightbox/requests/compute/list_api_clients.rb
@@ -294,12 +302,14 @@ files:
 - lib/fog/brightbox/requests/compute/list_servers.rb
 - lib/fog/brightbox/requests/compute/list_user_collaborations.rb
 - lib/fog/brightbox/requests/compute/list_users.rb
+- lib/fog/brightbox/requests/compute/list_volumes.rb
 - lib/fog/brightbox/requests/compute/list_zones.rb
 - lib/fog/brightbox/requests/compute/lock_resource_database_server.rb
 - lib/fog/brightbox/requests/compute/lock_resource_database_snapshot.rb
 - lib/fog/brightbox/requests/compute/lock_resource_image.rb
 - lib/fog/brightbox/requests/compute/lock_resource_load_balancer.rb
 - lib/fog/brightbox/requests/compute/lock_resource_server.rb
+- lib/fog/brightbox/requests/compute/lock_resource_volume.rb
 - lib/fog/brightbox/requests/compute/map_cloud_ip.rb
 - lib/fog/brightbox/requests/compute/move_servers_server_group.rb
 - lib/fog/brightbox/requests/compute/reboot_server.rb
@@ -315,6 +325,7 @@ files:
 - lib/fog/brightbox/requests/compute/reset_secret_api_client.rb
 - lib/fog/brightbox/requests/compute/reset_secret_application.rb
 - lib/fog/brightbox/requests/compute/reset_server.rb
+- lib/fog/brightbox/requests/compute/resize_volume.rb
 - lib/fog/brightbox/requests/compute/shutdown_server.rb
 - lib/fog/brightbox/requests/compute/snapshot_database_server.rb
 - lib/fog/brightbox/requests/compute/snapshot_server.rb
@@ -325,6 +336,7 @@ files:
 - lib/fog/brightbox/requests/compute/unlock_resource_image.rb
 - lib/fog/brightbox/requests/compute/unlock_resource_load_balancer.rb
 - lib/fog/brightbox/requests/compute/unlock_resource_server.rb
+- lib/fog/brightbox/requests/compute/unlock_resource_volume.rb
 - lib/fog/brightbox/requests/compute/unmap_cloud_ip.rb
 - lib/fog/brightbox/requests/compute/update_account.rb
 - lib/fog/brightbox/requests/compute/update_api_client.rb
@@ -340,6 +352,7 @@ files:
 - lib/fog/brightbox/requests/compute/update_server.rb
 - lib/fog/brightbox/requests/compute/update_server_group.rb
 - lib/fog/brightbox/requests/compute/update_user.rb
+- lib/fog/brightbox/requests/compute/update_volume.rb
 - lib/fog/brightbox/requests/storage/copy_object.rb
 - lib/fog/brightbox/requests/storage/delete_container.rb
 - lib/fog/brightbox/requests/storage/delete_multiple_objects.rb
@@ -368,6 +381,9 @@ files:
 - lib/fog/brightbox/storage/not_found.rb
 - lib/fog/brightbox/version.rb
 - spec/fog/brightbox/compute/config_spec.rb
+- spec/fog/brightbox/compute/credentials_spec.rb
+- spec/fog/brightbox/compute/get_access_token_spec.rb
+- spec/fog/brightbox/compute/two_factor_spec.rb
 - spec/fog/brightbox/compute/wrapped_request_spec.rb
 - spec/fog/brightbox/config_spec.rb
 - spec/fog/brightbox/link_helper_spec.rb
@@ -398,6 +414,7 @@ files:
 - spec/fog/compute/brightbox/server_spec.rb
 - spec/fog/compute/brightbox/user_collaboration_spec.rb
 - spec/fog/compute/brightbox/user_spec.rb
+- spec/fog/compute/brightbox/volume_spec.rb
 - spec/fog/compute/brightbox/zone_spec.rb
 - spec/fog/compute/brightbox_spec.rb
 - spec/fog/storage/brightbox_spec.rb
@@ -434,6 +451,7 @@ files:
 - tests/brightbox/requests/compute/server_type_tests.rb
 - tests/brightbox/requests/compute/user_collaboration_tests.rb
 - tests/brightbox/requests/compute/user_tests.rb
+- tests/brightbox/requests/compute/volume_tests.rb
 - tests/brightbox/requests/compute/zone_tests.rb
 - tests/helper.rb
 - tests/helpers/collection_helper.rb
@@ -473,6 +491,9 @@ summary: This library can be used as a module for `fog` or as standalone provide
   to use the Brightbox Cloud in applications
 test_files:
 - spec/fog/brightbox/compute/config_spec.rb
+- spec/fog/brightbox/compute/credentials_spec.rb
+- spec/fog/brightbox/compute/get_access_token_spec.rb
+- spec/fog/brightbox/compute/two_factor_spec.rb
 - spec/fog/brightbox/compute/wrapped_request_spec.rb
 - spec/fog/brightbox/config_spec.rb
 - spec/fog/brightbox/link_helper_spec.rb
@@ -503,6 +524,7 @@ test_files:
 - spec/fog/compute/brightbox/server_spec.rb
 - spec/fog/compute/brightbox/user_collaboration_spec.rb
 - spec/fog/compute/brightbox/user_spec.rb
+- spec/fog/compute/brightbox/volume_spec.rb
 - spec/fog/compute/brightbox/zone_spec.rb
 - spec/fog/compute/brightbox_spec.rb
 - spec/fog/storage/brightbox_spec.rb