fog-maestrodev 1.7.0.20121114190951 → 1.8.0.20130109172219

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

@@ -32,7 +32,7 @@ module Fog
         attribute :load_balancers_used
         attribute :library_ftp_host
         attribute :library_ftp_user
-        # This is always returned as null/nil unless performing a reset_ftp_password request
+        # This is always returned as nil unless after a call to reset_ftp_password
         attribute :library_ftp_password
 
         # Boolean flags
@@ -51,13 +51,19 @@ module Fog
         attribute :users
         attribute :zones
 
+        # Resets the account's image library FTP password returning the new value
+        #
+        # @return [String] Newly issue FTP password
+        #
         def reset_ftp_password
           requires :identity
-          connection.reset_ftp_password_account["library_ftp_password"]
+          data = service.reset_ftp_password_account(identity)
+          merge_attributes(data)
+          library_ftp_password
         end
 
       end
 
     end
   end
-end
+end

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

@@ -10,13 +10,13 @@ module Fog
         model Fog::Compute::Brightbox::Account
 
         def all
-          data = connection.list_accounts
+          data = service.list_accounts
           load(data)
         end
 
         def get(identifier)
           return nil if identifier.nil? || identifier == ""
-          data = connection.get_account(identifier)
+          data = service.get_account(identifier)
           new(data)
         rescue Excon::Errors::NotFound
           nil
@@ -26,4 +26,4 @@ module Fog
 
     end
   end
-end
+end

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

@@ -10,25 +10,25 @@ module Fog
         attribute :account_id
 
         def save
-          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
           options = {
             :name => name,
             :description => description
           }.delete_if {|k,v| v.nil? || v == "" }
-          data = connection.create_api_client(options)
+          data = service.create_api_client(options)
           merge_attributes(data)
           true
         end
 
         def destroy
           requires :identity
-          connection.destroy_api_client(identity)
+          service.destroy_api_client(identity)
           true
         end
 
         def reset_secret
           requires :identity
-          connection.reset_secret_api_client(identity)
+          service.reset_secret_api_client(identity)
           true
         end
       end

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

@@ -8,12 +8,12 @@ module Fog
         model Fog::Compute::Brightbox::ApiClient
 
         def all
-          data = connection.list_api_clients
+          data = service.list_api_clients
           load(data)
         end
 
         def get(identifier = nil)
-          data = connection.get_api_client(identifier)
+          data = service.get_api_client(identifier)
           new(data)
         rescue Excon::Errors::NotFound
           nil

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

@@ -12,11 +12,11 @@ module Fog
         attribute :secret
 
         def save
-          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
           options = {
             :name => name
           }.delete_if {|k,v| v.nil? || v == "" }
-          data = connection.create_application(options)
+          data = service.create_application(options)
           merge_attributes(data)
           true
         end

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

@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Brightbox::Application
 
         def all
-          data = connection.list_applications
+          data = service.list_applications
           load(data)
         end
 
         def get(identifier)
-          data = connection.get_application(identifier)
+          data = service.get_application(identifier)
           new(data)
         rescue Excon::Errors::NotFound
           nil
@@ -25,4 +25,4 @@ module Fog
 
     end
   end
-end
+end

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

@@ -22,6 +22,7 @@ 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 :server_group, :alias => "server_group", :squash => "id"
         attribute :port_translators
         attribute :name
 
@@ -35,7 +36,7 @@ module Fog
           else
             final_destination = destination
           end
-          connection.map_cloud_ip(identity, :destination => final_destination)
+          service.map_cloud_ip(identity, :destination => final_destination)
         end
 
         def mapped?
@@ -44,12 +45,12 @@ module Fog
 
         def unmap
           requires :identity
-          connection.unmap_cloud_ip(identity)
+          service.unmap_cloud_ip(identity)
         end
 
         def destroy
           requires :identity
-          connection.destroy_cloud_ip(identity)
+          service.destroy_cloud_ip(identity)
         end
 
       end

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

@@ -10,20 +10,20 @@ module Fog
         model Fog::Compute::Brightbox::CloudIp
 
         def all
-          data = connection.list_cloud_ips
+          data = service.list_cloud_ips
           load(data)
         end
 
         def get(identifier)
           return nil if identifier.nil? || identifier == ""
-          data = connection.get_cloud_ip(identifier)
+          data = service.get_cloud_ip(identifier)
           new(data)
         rescue Excon::Errors::NotFound
           nil
         end
 
         def allocate
-          data = connection.create_cloud_ip
+          data = service.create_cloud_ip
           new(data)
         end
 
@@ -31,4 +31,4 @@ module Fog
 
     end
   end
-end
+end

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

@@ -10,13 +10,13 @@ module Fog
         model Fog::Compute::Brightbox::FirewallPolicy
 
         def all
-          data = connection.list_firewall_policies
+          data = service.list_firewall_policies
           load(data)
         end
 
         def get(identifier)
           return nil if identifier.nil? || identifier == ""
-          data = connection.get_firewall_policy(identifier)
+          data = service.get_firewall_policy(identifier)
           new(data)
         rescue Excon::Errors::NotFound
           nil
@@ -26,4 +26,4 @@ module Fog
 
     end
   end
-end
+end

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

@@ -21,13 +21,13 @@ module Fog
 
         # Sticking with existing Fog behaviour, save does not update but creates a new resource
         def save
-          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
           options = {
             :server_group => server_group_id,
             :name => name,
             :description => description
           }.delete_if {|k,v| v.nil? || v == "" }
-          data = connection.create_firewall_policy(options)
+          data = service.create_firewall_policy(options)
           merge_attributes(data)
           true
         end
@@ -37,7 +37,7 @@ module Fog
           options = {
             :server_group => server_group_id
           }
-          data = connection.apply_to_firewall_policy(identity, options)
+          data = service.apply_to_firewall_policy(identity, options)
           merge_attributes(data)
           true
         end
@@ -47,14 +47,14 @@ module Fog
           options = {
             :server_group => server_group_id
           }
-          data = connection.remove_firewall_policy(identity, options)
+          data = service.remove_firewall_policy(identity, options)
           merge_attributes(data)
           true
         end
 
         def destroy
           requires :identity
-          data = connection.destroy_firewall_policy(identity)
+          data = service.destroy_firewall_policy(identity)
           true
         end
 

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

@@ -24,7 +24,7 @@ module Fog
 
         # Sticking with existing Fog behaviour, save does not update but creates a new resource
         def save
-          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
           requires :firewall_policy_id
           options = {
             :firewall_policy => firewall_policy_id,
@@ -36,14 +36,14 @@ module Fog
             :destination_port => destination_port,
             :icmp_type_name => icmp_type_name
           }.delete_if {|k,v| v.nil? || v == "" }
-          data = connection.create_firewall_rule(options)
+          data = service.create_firewall_rule(options)
           merge_attributes(data)
           true
         end
 
         def destroy
           requires :identity
-          connection.destroy_firewall_rule(identity)
+          service.destroy_firewall_rule(identity)
           true
         end
 

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

@@ -11,7 +11,7 @@ module Fog
 
         def get(identifier)
           return nil if identifier.nil? || identifier == ""
-          data = connection.get_firewall_rule(identifier)
+          data = service.get_firewall_rule(identifier)
           new(data)
         rescue Excon::Errors::NotFound
           nil
@@ -21,4 +21,4 @@ module Fog
 
     end
   end
-end
+end

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

@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Brightbox::Flavor
 
         def all
-          data = connection.list_server_types
+          data = service.list_server_types
           load(data)
         end
 
         def get(identifier)
-          data = connection.get_server_type(identifier)
+          data = service.get_server_type(identifier)
           new(data)
         rescue Excon::Errors::NotFound
           nil
@@ -25,4 +25,4 @@ module Fog
 
     end
   end
-end
+end

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

@@ -39,7 +39,7 @@ module Fog
         end
 
         def save
-          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
           requires :source, :arch
           options = {
             :source => source,
@@ -48,14 +48,14 @@ module Fog
             :username => username,
             :description => description
           }.delete_if {|k,v| v.nil? || v == "" }
-          data = connection.create_image(options)
+          data = service.create_image(options)
           merge_attributes(data)
           true
         end
 
         def destroy
           requires :identity
-          connection.destroy_image(identity)
+          service.destroy_image(identity)
           true
         end
 

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

@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Brightbox::Image
 
         def all
-          data = connection.list_images
+          data = service.list_images
           load(data)
         end
 
         def get(identifier)
-          data = connection.get_image(identifier)
+          data = service.get_image(identifier)
           new(data)
         rescue Excon::Errors::NotFound
           nil

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

@@ -32,7 +32,7 @@ module Fog
         end
 
         def save
-          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
           requires :nodes, :listeners, :healthcheck
           options = {
             :nodes => nodes,
@@ -41,14 +41,14 @@ module Fog
             :policy => policy,
             :name => name
           }.delete_if {|k,v| v.nil? || v == "" }
-          data = connection.create_load_balancer(options)
+          data = service.create_load_balancer(options)
           merge_attributes(data)
           true
         end
 
         def destroy
           requires :identity
-          connection.destroy_load_balancer(identity)
+          service.destroy_load_balancer(identity)
           true
         end
 

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

@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Brightbox::LoadBalancer
 
         def all
-          data = connection.list_load_balancers
+          data = service.list_load_balancers
           load(data)
         end
 
         def get(identifier)
-          data = connection.get_load_balancer(identifier)
+          data = service.get_load_balancer(identifier)
           new(data)
         rescue Excon::Errors::NotFound
           nil

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

@@ -38,10 +38,9 @@ module Fog
         attribute :server_type
 
         def initialize(attributes={})
-          # Call super first to initialize the 'connection' object for our default image
+          # Call super first to initialize the service object for our default image
           super
-          # FIXME connection is actually <Fog::Compute::Brightbox::Real> not <Fog::Connection>
-          self.image_id ||= connection.default_image
+          self.image_id ||= service.default_image
         end
 
         def zone_id
@@ -70,7 +69,7 @@ module Fog
 
         def snapshot
           requires :identity
-          connection.snapshot_server(identity)
+          service.snapshot_server(identity)
         end
 
         # Directly requesting a server reboot is not supported in the API
@@ -97,36 +96,44 @@ module Fog
 
         def start
           requires :identity
-          connection.start_server(identity)
+          service.start_server(identity)
           true
         end
 
         def stop
           requires :identity
-          connection.stop_server(identity)
+          service.stop_server(identity)
           true
         end
 
         def shutdown
           requires :identity
-          connection.shutdown_server(identity)
+          service.shutdown_server(identity)
           true
         end
 
         def destroy
           requires :identity
-          connection.destroy_server(identity)
+          service.destroy_server(identity)
           true
         end
 
         def flavor
           requires :flavor_id
-          connection.flavors.get(flavor_id)
+          service.flavors.get(flavor_id)
         end
 
         def image
           requires :image_id
-          connection.images.get(image_id)
+          service.images.get(image_id)
+        end
+
+        # Returns the public DNS name of the server
+        #
+        # @return [String]
+        #
+        def dns_name
+          ["public", fqdn].join(".")
         end
 
         def private_ip_address
@@ -151,12 +158,12 @@ module Fog
 
         def activate_console
           requires :identity
-          response = connection.activate_console_server(identity)
+          response = service.activate_console_server(identity)
           [response["console_url"], response["console_token"], response["console_token_expires"]]
         end
 
         def save
-          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
           requires :image_id
           options = {
             :image => image_id,
@@ -168,7 +175,7 @@ module Fog
           unless flavor_id.nil? || flavor_id == ""
             options.merge!(:server_type => flavor_id)
           end
-          data = connection.create_server(options)
+          data = service.create_server(options)
           merge_attributes(data)
           true
         end
@@ -184,14 +191,14 @@ module Fog
         # Soft reboots often timeout if the OS missed the request so we do more
         # error checking trying to detect the timeout
         #
-        # @fixme - Using side effect of wait_for's (evaluated block) to detect timeouts
+        # @todo Needs cleaner error handling when the OS times out
         def soft_reboot
           shutdown
-          if wait_for(20) { ! ready? }
-            # Server is now down, start it up again
+          # FIXME Using side effect of wait_for's (evaluated block) to detect timeouts
+          begin
+            wait_for(20) { ! ready? }
             start
-          else
-            # We timed out
+          rescue Fog::Errors::Timeout => e
             false
           end
         end