kotovalexarian-likes-github/fog--fog
1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00
Code Releases Activity

[brightbox|compute] Merged outstanding work from Brightbox's fork

Browse source
This commit is contained in:
Paul Thornthwaite 2012-08-15 11:57:58 +01:00
commit cb1357252a
7 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/fog/brightbox/compute.rb
View file

@ -181,6 +181,7 @@ module Fog
@connection.request(options)
end
end
end
end
end

2
lib/fog/brightbox/models/compute/cloud_ip.rb
View file

@ -22,6 +22,8 @@ module Fog
attribute :interface_id, :aliases => "interface", :squash => "id"
attribute :server_id, :aliases => "server", :squash => "id"
attribute :load_balancer, :alias => "load_balancer", :squash => "id"
attribute :port_translators
attribute :name
def map(destination)
requires :identity

1
lib/fog/brightbox/models/compute/image.rb
View file

@ -20,6 +20,7 @@ module Fog
attribute :arch
attribute :virtual_size
attribute :disk_size
attribute :licence_name
# Boolean flags
attribute :public

1
lib/fog/brightbox/models/compute/server.rb
View file

@ -17,6 +17,7 @@ module Fog
attribute :fqdn
attribute :user_data
attribute :console_url
attribute :fqdn
attribute :console_token
# Times

6
lib/fog/brightbox/requests/compute/create_cloud_ip.rb
View file

@ -3,11 +3,11 @@ module Fog
class Brightbox
class Real
def create_cloud_ip
request("post", "/1.0/cloud_ips", [201])
def create_cloud_ip(options = nil)
request("post", "/1.0/cloud_ips", [201],options)
end
end
end
end
end
end

5
tests/brightbox/requests/compute/helper.rb
View file

@ -189,7 +189,7 @@ class Brightbox
"id" => String,
"resource_type" => String,
"url" => String,
"name" => String,
"name" => Fog::Nullable::String,
"created_at" => String,
"default" => Fog::Boolean,
"description" => Fog::Nullable::String,
@ -340,7 +340,7 @@ class Brightbox
"id" => String,
"resource_type" => String,
"url" => String,
"name" => String,
"name" => Fog::Nullable::String,
"description" => Fog::Nullable::String,
"default" => Fog::Boolean,
"created_at" => String,
@ -547,6 +547,7 @@ class Brightbox
"server_groups" => [Brightbox::Compute::Formats::Nested::SERVER_GROUP],
"interfaces" => [Brightbox::Compute::Formats::Nested::INTERFACE],
"zone" => Fog::Brightbox::Nullable::Zone,
"licence_name" => Fog::Nullable::String,
"username" => Fog::Nullable::String
}

2
tests/compute/helper.rb
View file

@ -15,7 +15,7 @@ def compute_providers
},
:brightbox => {
:server_attributes => {
:image_id => 'img-wwgbb' # Ubuntu Lucid 10.04 server (i686)
:image_id => (Brightbox::Compute::TestSupport.image_id rescue 'img-wwgbb') # Ubuntu Lucid 10.04 server (i686)
},
:mocked => false
},