fog-brightbox 1.0.0.rc1 → 1.3.0

data/lib/fog/brightbox/models/compute/database_server.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Brightbox
+  module Brightbox
+    class Compute
       class DatabaseServer < Fog::Brightbox::Model
         include Fog::Brightbox::Compute::ResourceLocking
 
@@ -34,6 +34,8 @@ module Fog
         attribute :flavor_id, "alias" => "database_server_type", :squash => "id"
         attribute :zone_id, "alias" => "zone", :squash => "id"
 
+        attribute :snapshot_id
+
         attribute :cloud_ips
 
         def save
@@ -54,6 +56,7 @@ module Fog
             options[:version] = database_version if database_version
             options[:database_type] = flavor_id if flavor_id
             options[:zone] = zone_id if zone_id
+            options[:snapshot] = snapshot_id if snapshot_id
 
             data = create_database_server(options)
           end
@@ -81,7 +84,7 @@ module Fog
 
         def destroy
           requires :identity
-          merge_attributes(service.destroy_database_server(identity))
+          merge_attributes(service.delete_database_server(identity))
           true
         end
 

data/lib/fog/brightbox/models/compute/database_servers.rb

@@ -1,10 +1,10 @@
 require "fog/brightbox/models/compute/database_server"
 
 module Fog
-  module Compute
-    class Brightbox
+  module Brightbox
+    class Compute
       class DatabaseServers < Fog::Collection
-        model Fog::Compute::Brightbox::DatabaseServer
+        model Fog::Brightbox::Compute::DatabaseServer
 
         def all
           data = service.list_database_servers

data/lib/fog/brightbox/models/compute/database_snapshot.rb

@@ -1,8 +1,8 @@
 require "fog/brightbox/compute/resource_locking"
 
 module Fog
-  module Compute
-    class Brightbox
+  module Brightbox
+    class Compute
       class DatabaseSnapshot < Fog::Brightbox::Model
         include Fog::Brightbox::Compute::ResourceLocking
 
@@ -39,7 +39,7 @@ module Fog
 
         def destroy
           requires :identity
-          merge_attributes(service.destroy_database_snapshot(identity))
+          merge_attributes(service.delete_database_snapshot(identity))
           true
         end
 

data/lib/fog/brightbox/models/compute/database_snapshots.rb

@@ -1,10 +1,10 @@
 require "fog/brightbox/models/compute/database_snapshot"
 
 module Fog
-  module Compute
-    class Brightbox
+  module Brightbox
+    class Compute
       class DatabaseSnapshots < Fog::Collection
-        model Fog::Compute::Brightbox::DatabaseSnapshot
+        model Fog::Brightbox::Compute::DatabaseSnapshot
 
         def all
           data = service.list_database_snapshots

data/lib/fog/brightbox/models/compute/database_type.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Brightbox
+  module Brightbox
+    class Compute
       class DatabaseType < Fog::Brightbox::Model
         identity :id
         attribute :url

data/lib/fog/brightbox/models/compute/database_types.rb

@@ -1,10 +1,10 @@
 require "fog/brightbox/models/compute/database_type"
 
 module Fog
-  module Compute
-    class Brightbox
+  module Brightbox
+    class Compute
       class DatabaseTypes < Fog::Collection
-        model Fog::Compute::Brightbox::DatabaseType
+        model Fog::Brightbox::Compute::DatabaseType
 
         def all
           data = service.list_database_types

data/lib/fog/brightbox/models/compute/event.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Brightbox
+  module Brightbox
+    class Compute
       # @api private
       class Event < Fog::Brightbox::Model
         identity :id

data/lib/fog/brightbox/models/compute/events.rb

@@ -1,10 +1,10 @@
 require "fog/brightbox/models/compute/event"
 
 module Fog
-  module Compute
-    class Brightbox
+  module Brightbox
+    class Compute
       class Events < Fog::Collection
-        model Fog::Compute::Brightbox::Event
+        model Fog::Brightbox::Compute::Event
 
         def all
           data = service.list_events

data/lib/fog/brightbox/models/compute/firewall_policies.rb

@@ -1,10 +1,10 @@
 require "fog/brightbox/models/compute/firewall_policy"
 
 module Fog
-  module Compute
-    class Brightbox
+  module Brightbox
+    class Compute
       class FirewallPolicies < Fog::Collection
-        model Fog::Compute::Brightbox::FirewallPolicy
+        model Fog::Brightbox::Compute::FirewallPolicy
 
         def all
           data = service.list_firewall_policies

data/lib/fog/brightbox/models/compute/firewall_policy.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Brightbox
+  module Brightbox
+    class Compute
       class FirewallPolicy < Fog::Brightbox::Model
         identity :id
         attribute :url
@@ -50,7 +50,7 @@ module Fog
 
         def destroy
           requires :identity
-          service.destroy_firewall_policy(identity)
+          service.delete_firewall_policy(identity)
           true
         end
       end

data/lib/fog/brightbox/models/compute/firewall_rule.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Brightbox
+  module Brightbox
+    class Compute
       class FirewallRule < Fog::Brightbox::Model
         identity :id
         attribute :url
@@ -39,7 +39,7 @@ module Fog
 
         def destroy
           requires :identity
-          service.destroy_firewall_rule(identity)
+          service.delete_firewall_rule(identity)
           true
         end
       end

data/lib/fog/brightbox/models/compute/firewall_rules.rb

@@ -1,10 +1,10 @@
 require "fog/brightbox/models/compute/firewall_rule"
 
 module Fog
-  module Compute
-    class Brightbox
+  module Brightbox
+    class Compute
       class FirewallRules < Fog::Collection
-        model Fog::Compute::Brightbox::FirewallRule
+        model Fog::Brightbox::Compute::FirewallRule
 
         def get(identifier)
           return nil if identifier.nil? || identifier == ""

data/lib/fog/brightbox/models/compute/flavor.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Brightbox
+  module Brightbox
+    class Compute
       class Flavor < Fog::Brightbox::Model
         identity :id
         attribute :url

data/lib/fog/brightbox/models/compute/flavors.rb

@@ -1,10 +1,10 @@
 require "fog/brightbox/models/compute/flavor"
 
 module Fog
-  module Compute
-    class Brightbox
+  module Brightbox
+    class Compute
       class Flavors < Fog::Collection
-        model Fog::Compute::Brightbox::Flavor
+        model Fog::Brightbox::Compute::Flavor
 
         def all
           data = service.list_server_types

data/lib/fog/brightbox/models/compute/image.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Brightbox
+  module Brightbox
+    class Compute
       class Image < Fog::Brightbox::Model
         include Fog::Brightbox::Compute::ResourceLocking
 
@@ -53,7 +53,7 @@ module Fog
 
         def destroy
           requires :identity
-          service.destroy_image(identity)
+          service.delete_image(identity)
           true
         end
       end

data/lib/fog/brightbox/models/compute/images.rb

@@ -1,10 +1,10 @@
 require "fog/brightbox/models/compute/image"
 
 module Fog
-  module Compute
-    class Brightbox
+  module Brightbox
+    class Compute
       class Images < Fog::Collection
-        model Fog::Compute::Brightbox::Image
+        model Fog::Brightbox::Compute::Image
 
         def all
           data = service.list_images

data/lib/fog/brightbox/models/compute/load_balancer.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Brightbox
+  module Brightbox
+    class Compute
       class LoadBalancer < Fog::Brightbox::Model
         include Fog::Brightbox::Compute::ResourceLocking
 
@@ -18,6 +18,8 @@ module Fog
         attribute :healthcheck
         attribute :listeners
 
+        attribute :ssl_minimum_version
+
         # These SSL attributes act only as setters. You can not read certs or keys via the API
         attribute :certificate_pem
         attribute :certificate_private_key
@@ -58,6 +60,7 @@ module Fog
             :buffer_size => buffer_size,
             :certificate_pem => certificate_pem,
             :certificate_private_key => certificate_private_key,
+            :ssl_minimum_version => ssl_minimum_version,
             :sslv3 => ssl3?
           }.delete_if { |_k, v| v.nil? || v == "" }
           data = service.create_load_balancer(options)
@@ -67,7 +70,7 @@ module Fog
 
         def destroy
           requires :identity
-          service.destroy_load_balancer(identity)
+          service.delete_load_balancer(identity)
           true
         end
 

data/lib/fog/brightbox/models/compute/load_balancers.rb

@@ -1,10 +1,10 @@
 require "fog/brightbox/models/compute/load_balancer"
 
 module Fog
-  module Compute
-    class Brightbox
+  module Brightbox
+    class Compute
       class LoadBalancers < Fog::Collection
-        model Fog::Compute::Brightbox::LoadBalancer
+        model Fog::Brightbox::Compute::LoadBalancer
 
         def all
           data = service.list_load_balancers

data/lib/fog/brightbox/models/compute/server.rb

@@ -1,8 +1,8 @@
 require "fog/compute/models/server"
 
 module Fog
-  module Compute
-    class Brightbox
+  module Brightbox
+    class Compute
       class Server < Fog::Compute::Server
         include Fog::Brightbox::ModelHelper
         include Fog::Brightbox::Compute::ResourceLocking
@@ -21,6 +21,8 @@ module Fog
         attribute :fqdn
         attribute :console_token
 
+        attribute :disk_encrypted
+
         # Times
         attribute :created_at, :type => :time
         attribute :started_at, :type => :time
@@ -127,7 +129,7 @@ module Fog
 
         def destroy
           requires :identity
-          service.destroy_server(identity)
+          service.delete_server(identity)
           true
         end
 
@@ -188,6 +190,7 @@ module Fog
 
           options.merge!(:server_type => flavor_id) unless flavor_id.nil? || flavor_id == ""
           options.merge!(:cloud_ip => cloud_ip) unless cloud_ip.nil? || cloud_ip == ""
+          options.merge!(:disk_encrypted => disk_encrypted) if disk_encrypted
 
           data = service.create_server(options)
           merge_attributes(data)

data/lib/fog/brightbox/models/compute/server_group.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Brightbox
+  module Brightbox
+    class Compute
       # A server group is a collection of servers
       #
       # Certain actions can accept a server group and affect all members
@@ -76,7 +76,7 @@ module Fog
 
         def destroy
           requires :identity
-          service.destroy_server_group(identity)
+          service.delete_server_group(identity)
           true
         end
 

data/lib/fog/brightbox/models/compute/server_groups.rb

@@ -1,10 +1,10 @@
 require "fog/brightbox/models/compute/server_group"
 
 module Fog
-  module Compute
-    class Brightbox
+  module Brightbox
+    class Compute
       class ServerGroups < Fog::Collection
-        model Fog::Compute::Brightbox::ServerGroup
+        model Fog::Brightbox::Compute::ServerGroup
 
         def all
           data = service.list_server_groups

data/lib/fog/brightbox/models/compute/servers.rb

@@ -1,10 +1,10 @@
 require "fog/brightbox/models/compute/server"
 
 module Fog
-  module Compute
-    class Brightbox
+  module Brightbox
+    class Compute
       class Servers < Fog::Collection
-        model Fog::Compute::Brightbox::Server
+        model Fog::Brightbox::Compute::Server
 
         def all
           data = service.list_servers
@@ -26,7 +26,7 @@ module Fog
         # @option options [String] zone_id   Identifer for preferred zone to locate server in
         # @option options [Array<String>] server_groups List of group identifiers for the server to join
         #
-        # @return Fog::Compute::Brightbox::Server
+        # @return Fog::Brightbox::Compute::Server
         #
         def bootstrap(options = {})
           server = create(options)

data/lib/fog/brightbox/models/compute/user.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Brightbox
+  module Brightbox
+    class Compute
       class User < Fog::Brightbox::Model
         identity :id
         attribute :resource_type

data/lib/fog/brightbox/models/compute/user_collaboration.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Brightbox
+  module Brightbox
+    class Compute
       class UserCollaboration < Fog::Brightbox::Model
         identity :id
         attribute :status
@@ -31,7 +31,7 @@ module Fog
 
         def destroy
           requires :identity
-          data = service.destroy_user_collaboration(identity)
+          data = service.delete_user_collaboration(identity)
           merge_attributes(data)
           true
         end

data/lib/fog/brightbox/models/compute/user_collaborations.rb

@@ -1,10 +1,10 @@
 require "fog/brightbox/models/compute/user_collaboration"
 
 module Fog
-  module Compute
-    class Brightbox
+  module Brightbox
+    class Compute
       class UserCollaborations < Fog::Collection
-        model Fog::Compute::Brightbox::UserCollaboration
+        model Fog::Brightbox::Compute::UserCollaboration
 
         def all
           data = service.list_user_collaborations
@@ -21,7 +21,7 @@ module Fog
 
         def destroy
           requires :identity
-          service.destroy_user_collaboration(identity)
+          service.delete_user_collaboration(identity)
           true
         end
       end