fog 1.5.0 → 1.6.0

data/lib/fog/aws/sqs.rb

@@ -83,12 +83,8 @@ module Fog
           setup_credentials(options)
           @connection_options     = options[:connection_options] || {}
           options[:region] ||= 'us-east-1'
-          @host = options[:host] || case options[:region]
-          when 'us-east-1'
-            'queue.amazonaws.com'
-          else
-            "#{options[:region]}.queue.amazonaws.com"
-          end
+          @host = options[:host] || "sqs.#{options[:region]}.amazonaws.com"
+
           @path       = options[:path]        || '/'
           @persistent = options[:persistent]  || false
           @port       = options[:port]        || 443

data/lib/fog/bare_metal_cloud/compute.rb

@@ -12,11 +12,13 @@ module Fog
 
       request_path 'fog/bare_metal_cloud/requests/compute'
       request :add_server
+      request :add_server_by_configuration
       request :cancel_server
       request :get_server
       request :list_images
       request :list_plans
       request :list_servers
+      request :list_configurations
       request :reboot_server
 
       class Mock
@@ -53,7 +55,7 @@ module Fog
           @bare_metal_cloud_password = options[:bare_metal_cloud_password]
           @bare_metal_cloud_username = options[:bare_metal_cloud_username]
           @connection_options = options[:connection_options] || {}
-          @host       = options[:host]        || "noc.baremetalcloud.com"
+          @host       = options[:host]        || "noc.newservers.com"
           @persistent = options[:persistent]  || false
           @port       = options[:port]        || 443
           @scheme     = options[:scheme]      || 'https'

data/lib/fog/bare_metal_cloud/requests/compute/add_server_by_configuration.rb

@@ -0,0 +1,33 @@
+module Fog
+  module Compute
+    class BareMetalCloud
+      class Real
+
+        # Boot a new server by configuration
+        #
+        # ==== Parameters
+        # * config<~String> - The Hardware configuration string
+        # * options<~Hash>: optional extra arguments
+        #   * imageName<~String>  - Optional imageName to be installed
+        #   * name<~String>     - Optional server Name
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'server'<~Hash>:
+        #       * 'id'<~String> - Id of the image
+        #
+        def add_server_by_configuration(config, options = {})
+          request(
+            :expects  => 200,
+            :method   => 'GET',
+            :parser   => Fog::ToHashDocument.new,
+            :path     => 'api/addServerByConfiguration',
+            :query    => {'configuration' => config}.merge!(options)
+          )
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/bare_metal_cloud/requests/compute/get_server.rb

@@ -5,20 +5,25 @@ module Fog
 
         # List servers
         #
+        # ==== Parameters
+        # * serverId<~String> - Id of the server
+        #
         # ==== Returns
         # * response<~Excon::Response>:
-        #   * server<~Hash>:
-        #     * 'id'<~String>     - Id of the server
-        #     * 'ip'<~Hash>:
-        #       * 'address'<~String>  - Address of the ip
-        #       * 'name'<~String>     - Name of the ip
-        #     * 'login'<~Hash>:
-        #       * 'name'<~String>     - Name of the login
-        #       * 'password'<~String> - Password of the login
-        #       * 'username'<~String> - Username of the login
-        #     * 'name'<~String>   - Name of the server
-        #     * 'notes'<~String>  - Notes about the server
-        #     * 'state'<~String>  - State of the server
+        #   * body<~Has>:
+        #     * server<~Hash>:
+        #       * 'id'<~String> - Id of the server
+        #       * 'mac-address'<~String>  - mac-address of the server
+        #       * 'ip'<~Hash>:
+        #         * 'address'<~String>  - Address of the ip
+        #         * 'name'<~String>     - Name of the ip
+        #       * 'login'<~Hash>:
+        #         * 'name'<~String>     - Name of the login
+        #         * 'password'<~String> - Password of the login
+        #         * 'username'<~String> - Username of the login
+        #       * 'name'<~String>   - Name of the server
+        #       * 'notes'<~String>  - Notes about the server
+        #       * 'state'<~String>  - State of the server
         #
         def get_server(server_id)
           request(

data/lib/fog/bare_metal_cloud/requests/compute/list_configurations.rb

@@ -0,0 +1,27 @@
+module Fog
+  module Compute
+    class BareMetalCloud
+      class Real
+
+        # List Configurations
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * available-server<~Array>:
+        #       * 'configuration'<~String>     - Hardware Configuration string
+        #       * 'quantity'<~String>:  - quantity of servers to a certain configuration
+        #
+        def list_configurations
+          request(
+            :expects  => 200,
+            :method   => 'GET',
+            :parser   => Fog::ToHashDocument.new,
+            :path     => 'api/listConfigurations'
+          )
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/bare_metal_cloud/requests/compute/list_images.rb

@@ -7,10 +7,10 @@ module Fog
         #
         # ==== Returns
         # * response<~Excon::Response>:
-        #   * body<~Array>:
-        #     * 'id'<~String>  - Id of the image
-        #     * 'name'<~String> - Name of the image
-        #     * 'size'<~String> - Size of the image
+        #   * body<~Hash>:
+        #     * 'image'<~Array>        
+        #       * 'Size'<~String>  - Size of the image
+        #       * 'Name'<~String>  - Name of the image
         #
         def list_images
           request(

data/lib/fog/bare_metal_cloud/requests/compute/list_plans.rb

@@ -7,13 +7,13 @@ module Fog
         #
         # ==== Returns
         # * response<~Excon::Response>:
-        #   * body<~Array>:
-        #     * 'description'<~String> - Description of the plan
-        #     * 'id'<~String>     - Id of the plan
-        #     * 'name'<~String>   - Name of the plan
-        #     * 'rate'<~String>   - Cost per hour of the plan
-        #     * 'os'<~String>     - Operating system of the plan
-        #     * 'config'<~String> - Configuration of the plan
+        #   * body<~Hash>:
+        #     * 'plan'<~Array>
+        #       * 'id'<~String>     - Id of the plan
+        #       * 'name'<~String>   - Name of the plan
+        #       * 'rate'<~String>   - Cost per hour of the plan
+        #       * 'os'<~String>     - Operating system of the plan
+        #       * 'config'<~String> - Configuration of the plan
         #
         def list_plans
           request(

data/lib/fog/bare_metal_cloud/requests/compute/list_servers.rb

@@ -7,8 +7,8 @@ module Fog
         #
         # ==== Returns
         # * response<~Excon::Response>:
-        #   * body<~Array>:
-        #     * server<~Hash>:
+        #   * body<~Hash>:
+        #     * server<~Array>:
         #       * 'id'<~String>     - Id of the server
         #       * 'ip'<~Hash>:
         #         * 'address'<~String>  - Address of the ip

data/lib/fog/bin.rb

@@ -4,9 +4,14 @@ module Fog
   class << self
 
     def available_providers
+	  Kernel.const_get('Ninefold')
       @available_providers ||= Fog.providers.values.select {|provider| Kernel.const_get(provider).available?}.sort
     end
 
+    def registered_providers
+      @registered_providers ||= Fog.providers.values.sort
+    end
+
   end
 
   class Bin
@@ -52,6 +57,7 @@ module Fog
 
 end
 
+require 'fog/bin/atmos'
 require 'fog/bin/aws'
 require 'fog/bin/bluebox'
 require 'fog/bin/brightbox'
@@ -75,6 +81,7 @@ require 'fog/bin/ninefold'
 require 'fog/bin/rackspace'
 require 'fog/bin/openstack'
 require 'fog/bin/ovirt'
+require 'fog/bin/serverlove'
 require 'fog/bin/stormondemand'
 require 'fog/bin/terremark'
 require 'fog/bin/vcloud'

data/lib/fog/bin/atmos.rb

@@ -0,0 +1,31 @@
+class Atmos < Fog::Bin
+  class << self
+
+    def class_for(key)
+      case key
+      when :storage
+        Fog::Storage::Atmos
+      else
+        raise ArgumentError, "Unsupported #{self} service: #{key}"
+      end
+    end
+
+    def [](service)
+      @@connections ||= Hash.new do |hash, key|
+        hash[key] = case key
+        when :storage
+          Fog::Logger.warning("Atmos[:storage] is not recommended, use Storage[:atmos] for portability")
+          Fog::Storage.new(:provider => 'Atmos')
+        else
+          raise ArgumentError, "Unrecognized service: #{service}"
+        end
+      end
+      @@connections[service]
+    end
+
+    def services
+      Fog::Atmos.services
+    end
+
+  end
+end

data/lib/fog/bin/aws.rb

@@ -25,6 +25,8 @@ class AWS < Fog::Bin
         Fog::AWS::ELB
       when :emr
         Fog::AWS::EMR
+      when :glacier
+        Fog::AWS::Glacier
       when :iam
         Fog::AWS::IAM
       when :sdb, :simpledb
@@ -77,6 +79,8 @@ class AWS < Fog::Bin
           Fog::AWS::ELB.new
         when :emr
           Fog::AWS::EMR.new
+        when :glacier
+          Fog::AWS::Glacier.new
         when :iam
           Fog::AWS::IAM.new
         when :rds

data/lib/fog/bin/ecloud.rb

@@ -1,6 +1,10 @@
 class Ecloud < Fog::Bin
   class << self
 
+    def available?
+      Fog::Ecloud::ECLOUD_OPTIONS.all? {|requirement| Fog.credentials.include?(requirement)}
+    end
+
     def class_for(key)
       case key
       when :compute

data/lib/fog/bin/rackspace.rb

@@ -3,10 +3,14 @@ class Rackspace < Fog::Bin
 
     def class_for(key)
       case key
+      when :block_storage
+        Fog::Rackspace::BlockStorage 
       when :cdn
         Fog::CDN::Rackspace
       when :compute
         Fog::Compute::Rackspace
+      when :compute_v2
+        Fog::Compute::RackspaceV2
       when :storage
         Fog::Storage::Rackspace
       when :load_balancers
@@ -31,6 +35,9 @@ class Rackspace < Fog::Bin
         when :compute
           Fog::Logger.warning("Rackspace[:compute] is not recommended, use Compute[:rackspace] for portability")
           Fog::Compute.new(:provider => 'Rackspace')
+        when :compute_v2
+          Fog::Logger.warning("Rackspace[:compute] is not recommended, use Compute[:rackspace] for portability")
+          Fog::Compute.new(:provider => 'Rackspace', :version => 'v2')
         when :dns
           Fog::DNS.new(:provider => 'Rackspace')
         when :load_balancers

data/lib/fog/bin/serverlove.rb

@@ -0,0 +1,31 @@
+class Serverlove < Fog::Bin
+  class << self
+
+    def class_for(key)
+      case key
+      when :compute
+        Fog::Compute::Serverlove
+      else
+        raise ArgumentError, "Unrecognized service: #{key}"
+      end
+    end
+
+    def [](service)
+      @@connections ||= Hash.new do |hash, key|
+        hash[key] = case key
+        when :compute
+          Fog::Logger.warning("Serverlove[:compute] is not recommended, use Compute[:serverlove] for portability")
+          Fog::Compute.new(:provider => 'Serverlove')
+        else
+          raise ArgumentError, "Unrecognized service: #{key.inspect}"
+        end
+      end
+      @@connections[service]
+    end
+
+    def services
+      Fog::Serverlove.services
+    end
+
+  end
+end

data/lib/fog/bluebox/requests/compute/create_block.rb

@@ -6,8 +6,9 @@ module Fog
         # Create a new block
         #
         # ==== Parameters
-        # * product_id<~Integer> - Id of product to create block with
-        # * template_id<~Integer> - Id of template to create block with
+        # * product_id<~String> - ID of product to create block with
+        # * template_id<~String> - ID of template to create block with
+        # * location_id<~String> - ID of location to create block in
         # * options<~Hash>:
         #     * password<~String> - Password for block
         #   or
@@ -17,13 +18,26 @@ module Fog
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~Hash>:
-        # TODO
         def create_block(product_id, template_id, location_id, options = {})
+
+          unless options.has_key?(:password) || options.has_key?(:ssh_key)
+            raise ArgumentError, 'Either password or ssh_key must be supplied'
+          end
+
+          query = {
+            'product'  => product_id,
+            'template' => template_id,
+            'location' => location_id
+          }
+
+          body = URI.encode options.map {|k,v| "#{k}=#{v}"}.join('&')
+
           request(
             :expects  => 200,
             :method   => 'POST',
             :path     => '/api/blocks.json',
-            :query    => {'product' => product_id, 'template' => template_id, 'location' => location_id}.merge!(options)
+            :query    => query,
+            :body     => URI.encode(body)
           )
         end
 

data/lib/fog/brightbox/compute.rb

@@ -101,7 +101,24 @@ module Fog
       request :update_server_group
       request :update_user
 
+      module Shared
+        # Returns an identifier for the default image for use
+        #
+        # Currently tries to find the latest version Ubuntu LTS (i686) widening
+        # up to the latest, official version of Ubuntu available.
+        #
+        # Highly recommended that you actually select the image you want to run
+        # on your servers yourself!
+        #
+        # @return [String, nil]
+        def default_image
+          return @default_image_id unless @default_image_id.nil?
+          @default_image_id = Fog.credentials[:brightbox_default_image] || select_default_image
+        end
+      end
+
       class Mock
+        include Shared
 
         def initialize(options)
           @brightbox_client_id = options[:brightbox_client_id] || Fog.credentials[:brightbox_client_id]
@@ -111,9 +128,15 @@ module Fog
         def request(options)
           raise "Not implemented"
         end
+
+      private
+        def select_default_image
+          "img-mockd"
+        end
       end
 
       class Real
+        include Shared
 
         def initialize(options)
           # Currently authentication and api endpoints are the same but may change
@@ -180,7 +203,36 @@ module Fog
           options[:headers] = headers
           @connection.request(options)
         end
+
+        # Queries the API and tries to select the most suitable official Image
+        # to use if the user chooses not to select their own.
+        def select_default_image
+          return @default_image_id unless @default_image_id.nil?
+
+          all_images = Fog::Compute[:brightbox].list_images
+          official_images = all_images.select {|img| img["official"] == true}
+          ubuntu_lts_images = official_images.select {|img| img["name"] =~ /Ubuntu.*LTS/}
+          ubuntu_lts_i686_images = ubuntu_lts_images.select {|img| img["arch"] == "i686"}
+
+          if ubuntu_lts_i686_images.empty?
+            # Accept other architectures
+            if ubuntu_lts_images.empty?
+              # Accept non-LTS versions of Ubuntu
+              unsorted_images = official_images.select {|img| img["name"] =~ /Ubuntu/}
+            else
+              unsorted_images = ubuntu_lts_images
+            end
+          else
+            unsorted_images = ubuntu_lts_i686_images
+          end
+
+          # Get the latest and use it's ID for the default image
+          @default_image_id = unsorted_images.sort {|a,b| a["created_at"] <=> b["created_at"]}.first["id"]
+        rescue
+          nil
+        end
       end
+
     end
   end
 end