fog-brightbox 1.0.0.rc1 → 1.3.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.travis.yml +2 -2
- data/CHANGELOG.md +58 -2
- data/README.md +3 -4
- data/fog-brightbox.gemspec +2 -2
- data/lib/fog/brightbox.rb +4 -24
- data/lib/fog/brightbox/compute.rb +18 -33
- data/lib/fog/brightbox/compute/config.rb +1 -1
- data/lib/fog/brightbox/compute/image_selector.rb +5 -3
- data/lib/fog/brightbox/compute/resource_locking.rb +1 -1
- data/lib/fog/brightbox/compute/shared.rb +3 -3
- data/lib/fog/brightbox/models/compute/account.rb +2 -2
- data/lib/fog/brightbox/models/compute/accounts.rb +3 -3
- data/lib/fog/brightbox/models/compute/api_client.rb +3 -3
- data/lib/fog/brightbox/models/compute/api_clients.rb +3 -3
- data/lib/fog/brightbox/models/compute/application.rb +2 -2
- data/lib/fog/brightbox/models/compute/applications.rb +3 -3
- data/lib/fog/brightbox/models/compute/cloud_ip.rb +3 -3
- data/lib/fog/brightbox/models/compute/cloud_ips.rb +3 -3
- data/lib/fog/brightbox/models/compute/collaboration.rb +3 -3
- data/lib/fog/brightbox/models/compute/collaborations.rb +5 -5
- data/lib/fog/brightbox/models/compute/database_server.rb +6 -3
- data/lib/fog/brightbox/models/compute/database_servers.rb +3 -3
- data/lib/fog/brightbox/models/compute/database_snapshot.rb +3 -3
- data/lib/fog/brightbox/models/compute/database_snapshots.rb +3 -3
- data/lib/fog/brightbox/models/compute/database_type.rb +2 -2
- data/lib/fog/brightbox/models/compute/database_types.rb +3 -3
- data/lib/fog/brightbox/models/compute/event.rb +2 -2
- data/lib/fog/brightbox/models/compute/events.rb +3 -3
- data/lib/fog/brightbox/models/compute/firewall_policies.rb +3 -3
- data/lib/fog/brightbox/models/compute/firewall_policy.rb +3 -3
- data/lib/fog/brightbox/models/compute/firewall_rule.rb +3 -3
- data/lib/fog/brightbox/models/compute/firewall_rules.rb +3 -3
- data/lib/fog/brightbox/models/compute/flavor.rb +2 -2
- data/lib/fog/brightbox/models/compute/flavors.rb +3 -3
- data/lib/fog/brightbox/models/compute/image.rb +3 -3
- data/lib/fog/brightbox/models/compute/images.rb +3 -3
- data/lib/fog/brightbox/models/compute/load_balancer.rb +6 -3
- data/lib/fog/brightbox/models/compute/load_balancers.rb +3 -3
- data/lib/fog/brightbox/models/compute/server.rb +6 -3
- data/lib/fog/brightbox/models/compute/server_group.rb +3 -3
- data/lib/fog/brightbox/models/compute/server_groups.rb +3 -3
- data/lib/fog/brightbox/models/compute/servers.rb +4 -4
- data/lib/fog/brightbox/models/compute/user.rb +2 -2
- data/lib/fog/brightbox/models/compute/user_collaboration.rb +3 -3
- data/lib/fog/brightbox/models/compute/user_collaborations.rb +4 -4
- data/lib/fog/brightbox/models/compute/users.rb +3 -3
- data/lib/fog/brightbox/models/compute/zone.rb +2 -2
- data/lib/fog/brightbox/models/compute/zones.rb +3 -3
- data/lib/fog/brightbox/models/storage/directories.rb +4 -4
- data/lib/fog/brightbox/models/storage/directory.rb +3 -3
- data/lib/fog/brightbox/models/storage/file.rb +2 -2
- data/lib/fog/brightbox/models/storage/files.rb +6 -6
- data/lib/fog/brightbox/requests/compute/accept_user_collaboration.rb +2 -2
- data/lib/fog/brightbox/requests/compute/activate_console_server.rb +2 -2
- data/lib/fog/brightbox/requests/compute/add_listeners_load_balancer.rb +2 -2
- data/lib/fog/brightbox/requests/compute/add_nodes_load_balancer.rb +2 -2
- data/lib/fog/brightbox/requests/compute/add_servers_server_group.rb +2 -2
- data/lib/fog/brightbox/requests/compute/apply_to_firewall_policy.rb +2 -2
- data/lib/fog/brightbox/requests/compute/create_api_client.rb +2 -2
- data/lib/fog/brightbox/requests/compute/create_application.rb +2 -2
- data/lib/fog/brightbox/requests/compute/create_cloud_ip.rb +2 -2
- data/lib/fog/brightbox/requests/compute/create_collaboration.rb +2 -2
- data/lib/fog/brightbox/requests/compute/create_database_server.rb +2 -2
- data/lib/fog/brightbox/requests/compute/create_firewall_policy.rb +2 -2
- data/lib/fog/brightbox/requests/compute/create_firewall_rule.rb +2 -2
- data/lib/fog/brightbox/requests/compute/create_image.rb +2 -2
- data/lib/fog/brightbox/requests/compute/create_load_balancer.rb +2 -2
- data/lib/fog/brightbox/requests/compute/create_server.rb +2 -2
- data/lib/fog/brightbox/requests/compute/create_server_group.rb +2 -2
- data/lib/fog/brightbox/requests/compute/delete_api_client.rb +2 -10
- data/lib/fog/brightbox/requests/compute/delete_application.rb +2 -10
- data/lib/fog/brightbox/requests/compute/delete_cloud_ip.rb +2 -10
- data/lib/fog/brightbox/requests/compute/delete_collaboration.rb +2 -10
- data/lib/fog/brightbox/requests/compute/delete_database_server.rb +2 -10
- data/lib/fog/brightbox/requests/compute/delete_database_snapshot.rb +2 -10
- data/lib/fog/brightbox/requests/compute/delete_firewall_policy.rb +2 -10
- data/lib/fog/brightbox/requests/compute/delete_firewall_rule.rb +2 -10
- data/lib/fog/brightbox/requests/compute/delete_image.rb +2 -10
- data/lib/fog/brightbox/requests/compute/delete_load_balancer.rb +2 -10
- data/lib/fog/brightbox/requests/compute/delete_server.rb +2 -10
- data/lib/fog/brightbox/requests/compute/delete_server_group.rb +2 -10
- data/lib/fog/brightbox/requests/compute/delete_user_collaboration.rb +2 -10
- data/lib/fog/brightbox/requests/compute/get_account.rb +6 -15
- data/lib/fog/brightbox/requests/compute/get_api_client.rb +2 -2
- data/lib/fog/brightbox/requests/compute/get_application.rb +2 -2
- data/lib/fog/brightbox/requests/compute/get_authenticated_user.rb +2 -2
- data/lib/fog/brightbox/requests/compute/get_cloud_ip.rb +2 -2
- data/lib/fog/brightbox/requests/compute/get_collaboration.rb +2 -2
- data/lib/fog/brightbox/requests/compute/get_database_server.rb +2 -2
- data/lib/fog/brightbox/requests/compute/get_database_snapshot.rb +2 -2
- data/lib/fog/brightbox/requests/compute/get_database_type.rb +2 -2
- data/lib/fog/brightbox/requests/compute/get_firewall_policy.rb +2 -2
- data/lib/fog/brightbox/requests/compute/get_firewall_rule.rb +2 -2
- data/lib/fog/brightbox/requests/compute/get_image.rb +2 -2
- data/lib/fog/brightbox/requests/compute/get_interface.rb +2 -2
- data/lib/fog/brightbox/requests/compute/get_load_balancer.rb +2 -2
- data/lib/fog/brightbox/requests/compute/get_scoped_account.rb +2 -2
- data/lib/fog/brightbox/requests/compute/get_server.rb +2 -2
- data/lib/fog/brightbox/requests/compute/get_server_group.rb +2 -2
- data/lib/fog/brightbox/requests/compute/get_server_type.rb +2 -2
- data/lib/fog/brightbox/requests/compute/get_user.rb +6 -15
- data/lib/fog/brightbox/requests/compute/get_user_collaboration.rb +2 -2
- data/lib/fog/brightbox/requests/compute/get_zone.rb +2 -2
- data/lib/fog/brightbox/requests/compute/list_accounts.rb +2 -2
- data/lib/fog/brightbox/requests/compute/list_api_clients.rb +2 -2
- data/lib/fog/brightbox/requests/compute/list_applications.rb +2 -2
- data/lib/fog/brightbox/requests/compute/list_cloud_ips.rb +2 -2
- data/lib/fog/brightbox/requests/compute/list_collaborations.rb +2 -2
- data/lib/fog/brightbox/requests/compute/list_database_servers.rb +2 -2
- data/lib/fog/brightbox/requests/compute/list_database_snapshots.rb +2 -2
- data/lib/fog/brightbox/requests/compute/list_database_types.rb +2 -2
- data/lib/fog/brightbox/requests/compute/list_events.rb +2 -2
- data/lib/fog/brightbox/requests/compute/list_firewall_policies.rb +2 -2
- data/lib/fog/brightbox/requests/compute/list_images.rb +2 -2
- data/lib/fog/brightbox/requests/compute/list_load_balancers.rb +2 -2
- data/lib/fog/brightbox/requests/compute/list_server_groups.rb +2 -2
- data/lib/fog/brightbox/requests/compute/list_server_types.rb +2 -2
- data/lib/fog/brightbox/requests/compute/list_servers.rb +2 -2
- data/lib/fog/brightbox/requests/compute/list_user_collaborations.rb +2 -2
- data/lib/fog/brightbox/requests/compute/list_users.rb +2 -2
- data/lib/fog/brightbox/requests/compute/list_zones.rb +2 -2
- data/lib/fog/brightbox/requests/compute/lock_resource_database_server.rb +2 -2
- data/lib/fog/brightbox/requests/compute/lock_resource_database_snapshot.rb +2 -2
- data/lib/fog/brightbox/requests/compute/lock_resource_image.rb +2 -2
- data/lib/fog/brightbox/requests/compute/lock_resource_load_balancer.rb +2 -2
- data/lib/fog/brightbox/requests/compute/lock_resource_server.rb +2 -2
- data/lib/fog/brightbox/requests/compute/map_cloud_ip.rb +2 -2
- data/lib/fog/brightbox/requests/compute/move_servers_server_group.rb +2 -2
- data/lib/fog/brightbox/requests/compute/reboot_server.rb +2 -2
- data/lib/fog/brightbox/requests/compute/reject_user_collaboration.rb +2 -2
- data/lib/fog/brightbox/requests/compute/remove_firewall_policy.rb +2 -2
- data/lib/fog/brightbox/requests/compute/remove_listeners_load_balancer.rb +2 -2
- data/lib/fog/brightbox/requests/compute/remove_nodes_load_balancer.rb +2 -2
- data/lib/fog/brightbox/requests/compute/remove_servers_server_group.rb +2 -2
- data/lib/fog/brightbox/requests/compute/resend_collaboration.rb +2 -2
- data/lib/fog/brightbox/requests/compute/reset_ftp_password_account.rb +6 -15
- data/lib/fog/brightbox/requests/compute/reset_ftp_password_scoped_account.rb +2 -2
- data/lib/fog/brightbox/requests/compute/reset_password_database_server.rb +2 -2
- data/lib/fog/brightbox/requests/compute/reset_secret_api_client.rb +2 -2
- data/lib/fog/brightbox/requests/compute/reset_secret_application.rb +2 -2
- data/lib/fog/brightbox/requests/compute/reset_server.rb +2 -2
- data/lib/fog/brightbox/requests/compute/shutdown_server.rb +2 -2
- data/lib/fog/brightbox/requests/compute/snapshot_database_server.rb +2 -2
- data/lib/fog/brightbox/requests/compute/snapshot_server.rb +2 -2
- data/lib/fog/brightbox/requests/compute/start_server.rb +2 -2
- data/lib/fog/brightbox/requests/compute/stop_server.rb +2 -2
- data/lib/fog/brightbox/requests/compute/unlock_resource_database_server.rb +2 -2
- data/lib/fog/brightbox/requests/compute/unlock_resource_database_snapshot.rb +2 -2
- data/lib/fog/brightbox/requests/compute/unlock_resource_image.rb +2 -2
- data/lib/fog/brightbox/requests/compute/unlock_resource_load_balancer.rb +2 -2
- data/lib/fog/brightbox/requests/compute/unlock_resource_server.rb +2 -2
- data/lib/fog/brightbox/requests/compute/unmap_cloud_ip.rb +2 -2
- data/lib/fog/brightbox/requests/compute/update_account.rb +15 -36
- data/lib/fog/brightbox/requests/compute/update_api_client.rb +2 -2
- data/lib/fog/brightbox/requests/compute/update_application.rb +2 -2
- data/lib/fog/brightbox/requests/compute/update_cloud_ip.rb +2 -2
- data/lib/fog/brightbox/requests/compute/update_database_server.rb +2 -2
- data/lib/fog/brightbox/requests/compute/update_database_snapshot.rb +2 -2
- data/lib/fog/brightbox/requests/compute/update_firewall_policy.rb +2 -2
- data/lib/fog/brightbox/requests/compute/update_firewall_rule.rb +2 -2
- data/lib/fog/brightbox/requests/compute/update_image.rb +2 -2
- data/lib/fog/brightbox/requests/compute/update_load_balancer.rb +2 -2
- data/lib/fog/brightbox/requests/compute/update_scoped_account.rb +2 -2
- data/lib/fog/brightbox/requests/compute/update_server.rb +2 -2
- data/lib/fog/brightbox/requests/compute/update_server_group.rb +2 -2
- data/lib/fog/brightbox/requests/compute/update_user.rb +2 -2
- data/lib/fog/brightbox/requests/storage/copy_object.rb +3 -3
- data/lib/fog/brightbox/requests/storage/delete_container.rb +3 -3
- data/lib/fog/brightbox/requests/storage/delete_multiple_objects.rb +2 -2
- data/lib/fog/brightbox/requests/storage/delete_object.rb +3 -3
- data/lib/fog/brightbox/requests/storage/delete_static_large_object.rb +3 -3
- data/lib/fog/brightbox/requests/storage/get_container.rb +3 -3
- data/lib/fog/brightbox/requests/storage/get_containers.rb +2 -2
- data/lib/fog/brightbox/requests/storage/get_object.rb +3 -3
- data/lib/fog/brightbox/requests/storage/get_object_http_url.rb +2 -2
- data/lib/fog/brightbox/requests/storage/get_object_https_url.rb +2 -2
- data/lib/fog/brightbox/requests/storage/head_container.rb +3 -3
- data/lib/fog/brightbox/requests/storage/head_containers.rb +2 -2
- data/lib/fog/brightbox/requests/storage/head_object.rb +3 -3
- data/lib/fog/brightbox/requests/storage/post_set_meta_temp_url_key.rb +2 -2
- data/lib/fog/brightbox/requests/storage/put_container.rb +3 -3
- data/lib/fog/brightbox/requests/storage/put_dynamic_obj_manifest.rb +5 -5
- data/lib/fog/brightbox/requests/storage/put_object.rb +3 -3
- data/lib/fog/brightbox/requests/storage/put_object_manifest.rb +2 -2
- data/lib/fog/brightbox/requests/storage/put_static_obj_manifest.rb +4 -4
- data/lib/fog/brightbox/storage.rb +12 -5
- data/lib/fog/brightbox/storage/authentication_request.rb +1 -1
- data/lib/fog/brightbox/storage/authentication_required.rb +1 -1
- data/lib/fog/brightbox/storage/config.rb +1 -1
- data/lib/fog/brightbox/storage/connection.rb +2 -2
- data/lib/fog/brightbox/storage/management_url_unknown.rb +1 -1
- data/lib/fog/brightbox/storage/not_found.rb +8 -0
- data/lib/fog/brightbox/version.rb +1 -1
- data/spec/fog/brightbox/compute/wrapped_request_spec.rb +4 -4
- data/spec/fog/brightbox/config_spec.rb +3 -3
- data/spec/fog/brightbox/link_helper_spec.rb +1 -1
- data/spec/fog/brightbox/storage/authentication_request_spec.rb +4 -4
- data/spec/fog/brightbox/storage/connection_errors_spec.rb +1 -1
- data/spec/fog/brightbox/storage/connection_spec.rb +2 -2
- data/spec/fog/compute/brightbox/account_spec.rb +1 -1
- data/spec/fog/compute/brightbox/api_client_spec.rb +1 -1
- data/spec/fog/compute/brightbox/application_spec.rb +1 -1
- data/spec/fog/compute/brightbox/cloud_ip_spec.rb +1 -1
- data/spec/fog/compute/brightbox/collaboration_spec.rb +1 -1
- data/spec/fog/compute/brightbox/database_server_spec.rb +20 -5
- data/spec/fog/compute/brightbox/database_snapshot_spec.rb +1 -1
- data/spec/fog/compute/brightbox/database_type_spec.rb +1 -1
- data/spec/fog/compute/brightbox/event_spec.rb +1 -1
- data/spec/fog/compute/brightbox/firewall_policy_spec.rb +1 -1
- data/spec/fog/compute/brightbox/flavor_spec.rb +1 -1
- data/spec/fog/compute/brightbox/image_spec.rb +1 -1
- data/spec/fog/compute/brightbox/load_balancer_spec.rb +25 -1
- data/spec/fog/compute/brightbox/server_group_spec.rb +1 -1
- data/spec/fog/compute/brightbox/server_spec.rb +47 -5
- data/spec/fog/compute/brightbox/user_collaboration_spec.rb +1 -1
- data/spec/fog/compute/brightbox/user_spec.rb +1 -1
- data/spec/fog/compute/brightbox/zone_spec.rb +1 -1
- data/spec/fog/compute/brightbox_spec.rb +5 -5
- data/spec/fog/storage/brightbox_spec.rb +8 -8
- data/spec/model_setup.rb +1 -1
- data/tests/brightbox/compute/schema.rb +1 -1
- data/tests/brightbox/compute_tests.rb +2 -2
- data/tests/brightbox/requests/compute/api_client_tests.rb +2 -2
- data/tests/brightbox/requests/compute/application_test.rb +2 -2
- data/tests/brightbox/requests/compute/cloud_ip_tests.rb +2 -2
- data/tests/brightbox/requests/compute/collaboration_tests.rb +6 -3
- data/tests/brightbox/requests/compute/database_server_tests.rb +2 -2
- data/tests/brightbox/requests/compute/database_snapsnot_tests.rb +2 -2
- data/tests/brightbox/requests/compute/firewall_policy_tests.rb +2 -2
- data/tests/brightbox/requests/compute/firewall_rule_tests.rb +2 -2
- data/tests/brightbox/requests/compute/helper.rb +1 -1
- data/tests/brightbox/requests/compute/image_tests.rb +2 -2
- data/tests/brightbox/requests/compute/load_balancer_tests.rb +2 -2
- data/tests/brightbox/requests/compute/server_group_tests.rb +2 -2
- data/tests/brightbox/requests/compute/server_tests.rb +2 -2
- metadata +20 -14
@@ -1,6 +1,6 @@
|
|
1
1
|
module Fog
|
2
|
-
module
|
3
|
-
class
|
2
|
+
module Brightbox
|
3
|
+
class Storage
|
4
4
|
class Real
|
5
5
|
# Create a new dynamic large object manifest
|
6
6
|
#
|
@@ -12,21 +12,21 @@ module Fog
|
|
12
12
|
# All segments must be stored in the same container, but may be in a different container than the manifest object.
|
13
13
|
# The default +X-Object-Manifest+ header is set to "+container+/+object+", but may be overridden in +options+
|
14
14
|
# to specify the prefix and/or the container where segments were stored.
|
15
|
-
# If overridden, names should be CGI escaped (excluding spaces) if needed (see {Fog::Storage
|
15
|
+
# If overridden, names should be CGI escaped (excluding spaces) if needed (see {Fog::Brightbox::Storage.escape}).
|
16
16
|
#
|
17
17
|
# @param container [String] Name for container where +object+ will be stored. Should be < 256 bytes and must not contain '/'
|
18
18
|
# @param object [String] Name for manifest object.
|
19
19
|
# @param options [Hash] Config headers for +object+.
|
20
20
|
# @option options [String] 'X-Object-Manifest' ("container/object") "<container>/<prefix>" for segment objects.
|
21
21
|
#
|
22
|
-
# @raise [Fog::Storage::
|
22
|
+
# @raise [Fog::Brightbox::Storage::NotFound] HTTP 404
|
23
23
|
# @raise [Excon::Errors::BadRequest] HTTP 400
|
24
24
|
# @raise [Excon::Errors::Unauthorized] HTTP 401
|
25
25
|
# @raise [Excon::Errors::HTTPStatusError]
|
26
26
|
#
|
27
27
|
# @see http://docs.brightbox.org/api/brightbox-object-storage/1.0/content/dynamic-large-object-creation.html
|
28
28
|
def put_dynamic_obj_manifest(container, object, options = {})
|
29
|
-
path = "#{Fog::Storage
|
29
|
+
path = "#{Fog::Brightbox::Storage.escape(container)}/#{Fog::Brightbox::Storage.escape(object)}"
|
30
30
|
headers = { "X-Object-Manifest" => path }.merge(options)
|
31
31
|
request(
|
32
32
|
:expects => 201,
|
@@ -1,6 +1,6 @@
|
|
1
1
|
module Fog
|
2
|
-
module
|
3
|
-
class
|
2
|
+
module Brightbox
|
3
|
+
class Storage
|
4
4
|
class Real
|
5
5
|
# Create a new object
|
6
6
|
#
|
@@ -30,7 +30,7 @@ module Fog
|
|
30
30
|
:idempotent => !params[:request_block],
|
31
31
|
:headers => headers,
|
32
32
|
:method => "PUT",
|
33
|
-
:path => "#{Fog::Storage
|
33
|
+
:path => "#{Fog::Brightbox::Storage.escape(container)}/#{Fog::Brightbox::Storage.escape(object)}"
|
34
34
|
)
|
35
35
|
|
36
36
|
request(params)
|
@@ -1,6 +1,6 @@
|
|
1
1
|
module Fog
|
2
|
-
module
|
3
|
-
class
|
2
|
+
module Brightbox
|
3
|
+
class Storage
|
4
4
|
class Real
|
5
5
|
# Create a new static large object manifest.
|
6
6
|
#
|
@@ -33,7 +33,7 @@ module Fog
|
|
33
33
|
# @param segments [Array<Hash>] Segment data for the object.
|
34
34
|
# @param options [Hash] Config headers for +object+.
|
35
35
|
#
|
36
|
-
# @raise [Fog::Storage::
|
36
|
+
# @raise [Fog::Brightbox::Storage::NotFound] HTTP 404
|
37
37
|
# @raise [Excon::Errors::BadRequest] HTTP 400
|
38
38
|
# @raise [Excon::Errors::Unauthorized] HTTP 401
|
39
39
|
# @raise [Excon::Errors::HTTPStatusError]
|
@@ -45,7 +45,7 @@ module Fog
|
|
45
45
|
:method => "PUT",
|
46
46
|
:headers => options,
|
47
47
|
:body => Fog::JSON.encode(segments),
|
48
|
-
:path => "#{Fog::Storage
|
48
|
+
:path => "#{Fog::Brightbox::Storage.escape(container)}/#{Fog::Brightbox::Storage.escape(object)}",
|
49
49
|
:query => { "multipart-manifest" => "put" }
|
50
50
|
)
|
51
51
|
end
|
@@ -1,6 +1,13 @@
|
|
1
1
|
module Fog
|
2
|
-
module
|
3
|
-
class
|
2
|
+
module Brightbox
|
3
|
+
class Storage < Fog::Service
|
4
|
+
autoload :AuthenticationRequest, File.expand_path("../storage/authentication_request", __FILE__)
|
5
|
+
autoload :AuthenticationRequired, File.expand_path("../storage/authentication_required", __FILE__)
|
6
|
+
autoload :Connection, File.expand_path("../storage/connection", __FILE__)
|
7
|
+
autoload :Config, File.expand_path("../storage/config", __FILE__)
|
8
|
+
autoload :ManagementUrlUnknown, File.expand_path("../storage/management_url_unknown", __FILE__)
|
9
|
+
autoload :NotFound, File.expand_path("../storage/not_found", __FILE__)
|
10
|
+
|
4
11
|
requires :brightbox_client_id,
|
5
12
|
:brightbox_secret
|
6
13
|
recognizes :persistent, :brightbox_service_name,
|
@@ -99,7 +106,7 @@ module Fog
|
|
99
106
|
rescue Excon::Errors::HTTPStatusError => error
|
100
107
|
raise case error
|
101
108
|
when Excon::Errors::NotFound
|
102
|
-
Fog::Storage::
|
109
|
+
Fog::Brightbox::Storage::NotFound.slurp(error)
|
103
110
|
else
|
104
111
|
error
|
105
112
|
end
|
@@ -161,8 +168,8 @@ module Fog
|
|
161
168
|
destination_url.scheme = options[:scheme] if options[:scheme]
|
162
169
|
destination_url.port = options[:port] if options[:port]
|
163
170
|
|
164
|
-
object_path_escaped = "#{object_path}/#{Fog::Storage
|
165
|
-
object_path_unescaped = "#{object_path}/#{Fog::Storage
|
171
|
+
object_path_escaped = "#{object_path}/#{Fog::Brightbox::Storage.escape(container)}/#{Fog::Brightbox::Storage.escape(object, "/")}"
|
172
|
+
object_path_unescaped = "#{object_path}/#{Fog::Brightbox::Storage.escape(container)}/#{object}"
|
166
173
|
|
167
174
|
expiry_timestamp = expires_at.to_i
|
168
175
|
string_to_sign = [method, expiry_timestamp, object_path_unescaped].join("\n")
|
@@ -1,6 +1,6 @@
|
|
1
1
|
module Fog
|
2
2
|
module Brightbox
|
3
|
-
|
3
|
+
class Storage
|
4
4
|
class Connection < Fog::Core::Connection
|
5
5
|
def initialize(config)
|
6
6
|
@config = config
|
@@ -23,7 +23,7 @@ module Fog
|
|
23
23
|
rescue Excon::Errors::Unauthorized => error
|
24
24
|
raise AuthenticationRequired.slurp(error)
|
25
25
|
rescue Excon::Errors::NotFound => error
|
26
|
-
raise Fog::Storage::
|
26
|
+
raise Fog::Brightbox::Storage::NotFound.slurp(error)
|
27
27
|
rescue Excon::Errors::HTTPStatusError => error
|
28
28
|
raise error
|
29
29
|
end
|
@@ -1,6 +1,6 @@
|
|
1
1
|
require "spec_helper"
|
2
2
|
|
3
|
-
describe Fog::Compute
|
3
|
+
describe Fog::Brightbox::Compute do
|
4
4
|
describe "#wrapped_request" do
|
5
5
|
describe "when nested option passed as true" do
|
6
6
|
before do
|
@@ -9,7 +9,7 @@ describe Fog::Compute::Brightbox do
|
|
9
9
|
:brightbox_secret => "1234567890",
|
10
10
|
:brightbox_access_token => "TESTVALUE"
|
11
11
|
}
|
12
|
-
@service = Fog::Compute
|
12
|
+
@service = Fog::Brightbox::Compute.new(@options)
|
13
13
|
end
|
14
14
|
|
15
15
|
it "makes correct request" do
|
@@ -30,7 +30,7 @@ describe Fog::Compute::Brightbox do
|
|
30
30
|
:brightbox_secret => "1234567890",
|
31
31
|
:brightbox_access_token => "TESTVALUE"
|
32
32
|
}
|
33
|
-
@service = Fog::Compute
|
33
|
+
@service = Fog::Brightbox::Compute.new(@options)
|
34
34
|
end
|
35
35
|
|
36
36
|
it "makes correct request" do
|
@@ -51,7 +51,7 @@ describe Fog::Compute::Brightbox do
|
|
51
51
|
:brightbox_secret => "1234567890",
|
52
52
|
:brightbox_access_token => "TESTVALUE"
|
53
53
|
}
|
54
|
-
@service = Fog::Compute
|
54
|
+
@service = Fog::Brightbox::Compute.new(@options)
|
55
55
|
end
|
56
56
|
|
57
57
|
it "makes correct request" do
|
@@ -220,7 +220,7 @@ describe Fog::Brightbox::Config do
|
|
220
220
|
@options = {
|
221
221
|
:brightbox_client_id => "app-12345",
|
222
222
|
:brightbox_secret => "12345",
|
223
|
-
:brightbox_username => "user@example.
|
223
|
+
:brightbox_username => "user@example.test",
|
224
224
|
:brightbox_password => "12345"
|
225
225
|
}
|
226
226
|
@config = Fog::Brightbox::Config.new(@options)
|
@@ -241,7 +241,7 @@ describe Fog::Brightbox::Config do
|
|
241
241
|
|
242
242
|
describe "when setting management_url with URI" do
|
243
243
|
it "sets it correctly" do
|
244
|
-
uri = URI.parse("https://example.
|
244
|
+
uri = URI.parse("https://example.test")
|
245
245
|
@config = Fog::Brightbox::Config.new
|
246
246
|
@config.storage_management_url = uri
|
247
247
|
assert_equal @config.storage_management_url, uri
|
@@ -250,7 +250,7 @@ describe Fog::Brightbox::Config do
|
|
250
250
|
|
251
251
|
describe "when setting management_url with String" do
|
252
252
|
it "raises ArgumentError" do
|
253
|
-
uri = "http://example.
|
253
|
+
uri = "http://example.test/wrong"
|
254
254
|
assert_raises(ArgumentError) { Fog::Brightbox::Config.new.storage_management_url = uri }
|
255
255
|
end
|
256
256
|
end
|
@@ -3,7 +3,7 @@ require "spec_helper"
|
|
3
3
|
describe Fog::Brightbox::LinkHelper do
|
4
4
|
describe "when initialized with an RFC5988 value" do
|
5
5
|
before do
|
6
|
-
@header = "<https://www.example.
|
6
|
+
@header = "<https://www.example.test/1.0/images/img-12345>; rel=snapshot"
|
7
7
|
@helper = Fog::Brightbox::LinkHelper.new(@header)
|
8
8
|
end
|
9
9
|
|
@@ -47,7 +47,7 @@ describe Fog::Brightbox::Storage::AuthenticationRequest do
|
|
47
47
|
stub_request(:get, "https://orbit.brightbox.com/v1").
|
48
48
|
with(:headers => {
|
49
49
|
"Host" => "orbit.brightbox.com:443",
|
50
|
-
"X-Auth-User" => "user@example.
|
50
|
+
"X-Auth-User" => "user@example.test",
|
51
51
|
"X-Auth-Key" => "abcde"
|
52
52
|
}).to_return(authorized_response)
|
53
53
|
end
|
@@ -56,7 +56,7 @@ describe Fog::Brightbox::Storage::AuthenticationRequest do
|
|
56
56
|
settings = {
|
57
57
|
:brightbox_client_id => "app-12345",
|
58
58
|
:brightbox_secret => "12345",
|
59
|
-
:brightbox_username => "user@example.
|
59
|
+
:brightbox_username => "user@example.test",
|
60
60
|
:brightbox_password => "abcde"
|
61
61
|
}
|
62
62
|
@config = Fog::Brightbox::Config.new(settings)
|
@@ -70,7 +70,7 @@ describe Fog::Brightbox::Storage::AuthenticationRequest do
|
|
70
70
|
stub_request(:get, "https://orbit.brightbox.com/v1").
|
71
71
|
with(:headers => {
|
72
72
|
"Host" => "orbit.brightbox.com:443",
|
73
|
-
"X-Auth-User" => "user@example.
|
73
|
+
"X-Auth-User" => "user@example.test",
|
74
74
|
"X-Auth-Key" => "abcde"
|
75
75
|
}).to_return(unauthorized_response)
|
76
76
|
end
|
@@ -79,7 +79,7 @@ describe Fog::Brightbox::Storage::AuthenticationRequest do
|
|
79
79
|
settings = {
|
80
80
|
:brightbox_client_id => "app-12345",
|
81
81
|
:brightbox_secret => "12345",
|
82
|
-
:brightbox_username => "user@example.
|
82
|
+
:brightbox_username => "user@example.test",
|
83
83
|
:brightbox_password => "abcde"
|
84
84
|
}
|
85
85
|
@config = Fog::Brightbox::Config.new(settings)
|
@@ -22,7 +22,7 @@ describe Fog::Brightbox::Storage::Connection do
|
|
22
22
|
401 => Fog::Brightbox::Storage::AuthenticationRequired,
|
23
23
|
402 => Excon::Errors::PaymentRequired,
|
24
24
|
403 => Excon::Errors::Forbidden,
|
25
|
-
404 => Fog::Storage::
|
25
|
+
404 => Fog::Brightbox::Storage::NotFound,
|
26
26
|
405 => Excon::Errors::MethodNotAllowed,
|
27
27
|
406 => Excon::Errors::NotAcceptable,
|
28
28
|
407 => Excon::Errors::ProxyAuthenticationRequired,
|
@@ -95,14 +95,14 @@ describe Fog::Brightbox::Storage::Connection do
|
|
95
95
|
end
|
96
96
|
|
97
97
|
describe "when container is not found" do
|
98
|
-
it "raises Fog::Storage::
|
98
|
+
it "raises Fog::Brightbox::Storage::NotFound" do
|
99
99
|
stub_request(:get, "https://files.gb2.brightbox.com/v1/acc-12345/fnord").
|
100
100
|
to_return(:status => 404,
|
101
101
|
:body => "<html><h1>Not Found</h1><p>The resource could not be found.</p></html>",
|
102
102
|
:headers => {
|
103
103
|
"Content-Type" => "text/html"
|
104
104
|
})
|
105
|
-
assert_raises(Fog::Storage::
|
105
|
+
assert_raises(Fog::Brightbox::Storage::NotFound) { connection.request(params) }
|
106
106
|
end
|
107
107
|
end
|
108
108
|
|
@@ -1,7 +1,7 @@
|
|
1
1
|
require "spec_helper"
|
2
2
|
require "fog/brightbox/models/compute/database_server"
|
3
3
|
|
4
|
-
describe Fog::Compute::
|
4
|
+
describe Fog::Brightbox::Compute::DatabaseServer do
|
5
5
|
include ModelSetup
|
6
6
|
include SupportsResourceLocking
|
7
7
|
|
@@ -19,14 +19,14 @@ describe Fog::Compute::Brightbox::DatabaseServer do
|
|
19
19
|
end
|
20
20
|
end
|
21
21
|
|
22
|
-
describe "when snapshotting
|
22
|
+
describe "when snapshotting with no options" do
|
23
23
|
it "returns the database server" do
|
24
24
|
stub_request(:post, "http://localhost/1.0/database_servers/dbs-12345/snapshot").
|
25
25
|
with(:query => hash_including(:account_id),
|
26
26
|
:headers => { "Authorization" => "Bearer FAKECACHEDTOKEN" }).
|
27
27
|
to_return(:status => 202, :body => %q({"id": "dbs-12345"}), :headers => {})
|
28
28
|
|
29
|
-
@database_server = Fog::Compute::
|
29
|
+
@database_server = Fog::Brightbox::Compute::DatabaseServer.new(:service => service, :id => "dbs-12345")
|
30
30
|
assert @database_server.snapshot
|
31
31
|
end
|
32
32
|
end
|
@@ -43,8 +43,23 @@ describe Fog::Compute::Brightbox::DatabaseServer do
|
|
43
43
|
with(:query => hash_including(:account_id),
|
44
44
|
:headers => { "Authorization" => "Bearer FAKECACHEDTOKEN" }).
|
45
45
|
to_return(:status => 200, :body => %q({"id": "dbs-12345"}))
|
46
|
-
@database_server = Fog::Compute::
|
47
|
-
assert_kind_of Fog::Compute::
|
46
|
+
@database_server = Fog::Brightbox::Compute::DatabaseServer.new(:service => service, :id => "dbs-12345")
|
47
|
+
assert_kind_of Fog::Brightbox::Compute::DatabaseSnapshot, @database_server.snapshot(true)
|
48
|
+
end
|
49
|
+
end
|
50
|
+
|
51
|
+
describe "when building from a snapshot" do
|
52
|
+
it "returns the new SQL instance" do
|
53
|
+
stub_request(:post, "http://localhost/1.0/database_servers").
|
54
|
+
with(:query => hash_including(:account_id),
|
55
|
+
:headers => { "Authorization" => "Bearer FAKECACHEDTOKEN" },
|
56
|
+
:body => hash_including(:snapshot => "dbi-lv426")).
|
57
|
+
to_return(:status => 202, :body => %q({"id": "dbs-12345"}))
|
58
|
+
|
59
|
+
@database_server = Fog::Brightbox::Compute::DatabaseServer.new(:service => service, :snapshot_id => "dbi-lv426")
|
60
|
+
@database_server.save
|
61
|
+
assert_kind_of Fog::Brightbox::Compute::DatabaseServer, @database_server
|
62
|
+
assert_equal "dbs-12345", @database_server.id
|
48
63
|
end
|
49
64
|
end
|
50
65
|
end
|