fog 1.0.0 → 1.5.0

data/lib/fog/bin/rackspace.rb

@@ -13,6 +13,10 @@ class Rackspace < Fog::Bin
         Fog::Rackspace::LoadBalancers
       when :dns
         Fog::DNS::Rackspace
+      when :identity
+        Fog::Rackspace::Identity
+      when :databases
+        Fog::Rackspace::Databases
       else
         raise ArgumentError, "Unrecognized service: #{key}"
       end
@@ -22,17 +26,17 @@ class Rackspace < Fog::Bin
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
         when :cdn
-          Fog::Logger.warning("Rackspace[:cdn] is deprecated, use CDN[:rackspace] instead")
+          Fog::Logger.warning("Rackspace[:cdn] is not recommended, use CDN[:rackspace] for portability")
           Fog::CDN.new(:provider => 'Rackspace')
         when :compute
-          Fog::Logger.warning("Rackspace[:compute] is deprecated, use Compute[:rackspace] instead")
+          Fog::Logger.warning("Rackspace[:compute] is not recommended, use Compute[:rackspace] for portability")
           Fog::Compute.new(:provider => 'Rackspace')
         when :dns
           Fog::DNS.new(:provider => 'Rackspace')
         when :load_balancers
           Fog::Rackspace::LoadBalancers.new
         when :storage
-          Fog::Logger.warning("Rackspace[:storage] is deprecated, use Storage[:rackspace] instead")
+          Fog::Logger.warning("Rackspace[:storage] is not recommended, use Storage[:rackspace] for portability")
           Fog::Storage.new(:provider => 'Rackspace')
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"

data/lib/fog/bin/stormondemand.rb

@@ -14,7 +14,7 @@ class StormOnDemand < Fog::Bin
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
         when :compute
-          Fog::Logger.warning("StormOnDemand[:compute] is deprecated, use Compute[:stormondemand] instead")
+          Fog::Logger.warning("StormOnDemand[:compute] is not recommended, use Compute[:stormondemand] for portability")
           Fog::Compute.new(:provider => 'StormOnDemand')
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"

data/lib/fog/bin/virtual_box.rb

@@ -14,7 +14,7 @@ module VirtualBox # deviates from other bin stuff to accomodate gem
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
         when :compute
-          Fog::Logger.warning("VirtualBox[:compute] is deprecated, use Compute[:virtualbox] instead")
+          Fog::Logger.warning("VirtualBox[:compute] is not recommended, use Compute[:virtualbox] for portability")
           Fog::Compute.new(:provider => 'VirtualBox')
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"

data/lib/fog/bin/vmfusion.rb

@@ -14,7 +14,7 @@ module Vmfusion # deviates from other bin stuff to accomodate gem
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
         when :compute
-          Fog::Logger.warning("Vmfusion[:compute] is deprecated, use Compute[:Vmfusion] instead")
+          Fog::Logger.warning("Vmfusion[:compute] is not recommended, use Compute[:vmfusion] for portability")
           Fog::Compute.new(:provider => 'Vmfusion')
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"

data/lib/fog/bin/voxel.rb

@@ -14,7 +14,7 @@ class Voxel < Fog::Bin
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
         when :compute
-          Fog::Logger.warning("Voxel[:compute] is deprecated, use Compute[:voxel] instead")
+          Fog::Logger.warning("Voxel[:compute] is not recommended, use Compute[:voxel] for portability")
           Fog::Compute.new(:provider => 'Voxel')
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"

data/lib/fog/bin/xenserver.rb

@@ -0,0 +1,31 @@
+class XenServer < Fog::Bin
+  class << self
+
+    def class_for(key)
+      case key
+      when :compute
+        Fog::Compute::XenServer
+      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("XenServer[:compute] is not recommended, use Compute[:xenserver] for portability")
+          Fog::Compute.new(:provider => 'XenServer')
+        else
+          raise ArgumentError, "Unrecognized service: #{key.inspect}"
+        end
+      end
+      @@connections[service]
+    end
+
+    def services
+      Fog::XenServer.services
+    end
+
+  end
+end

data/lib/fog/bin/zerigo.rb

@@ -14,7 +14,7 @@ class Zerigo < Fog::Bin
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
         when :dns
-          Fog::Logger.warning("Zerigo[:dns] is deprecated, use Storage[:zerigo] instead")
+          Fog::Logger.warning("Zerigo[:dns] is not recommended, use DNS[:zerigo] for portability")
           Fog::DNS.new(:provider => 'Zerigo')
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"

data/lib/fog/bin.rb

@@ -4,7 +4,7 @@ module Fog
   class << self
 
     def available_providers
-      @available_providers ||= @providers.select {|provider| Kernel.const_get(provider).available?}.sort
+      @available_providers ||= Fog.providers.values.select {|provider| Kernel.const_get(provider).available?}.sort
     end
 
   end
@@ -55,6 +55,8 @@ end
 require 'fog/bin/aws'
 require 'fog/bin/bluebox'
 require 'fog/bin/brightbox'
+require 'fog/bin/cloudstack'
+require 'fog/bin/clodo'
 require 'fog/bin/dnsimple'
 require 'fog/bin/dnsmadeeasy'
 require 'fog/bin/dynect'
@@ -62,14 +64,17 @@ require 'fog/bin/ecloud'
 require 'fog/bin/glesys'
 require 'fog/bin/go_grid'
 require 'fog/bin/google'
+require 'fog/bin/hp'
+require 'fog/bin/ibm'
+require 'fog/bin/joyent'
 require 'fog/bin/libvirt'
 require 'fog/bin/linode'
 require 'fog/bin/local'
-require 'fog/bin/new_servers'
+require 'fog/bin/bare_metal_cloud'
 require 'fog/bin/ninefold'
 require 'fog/bin/rackspace'
 require 'fog/bin/openstack'
-require 'fog/bin/slicehost'
+require 'fog/bin/ovirt'
 require 'fog/bin/stormondemand'
 require 'fog/bin/terremark'
 require 'fog/bin/vcloud'
@@ -77,4 +82,5 @@ require 'fog/bin/virtual_box'
 require 'fog/bin/vmfusion'
 require 'fog/bin/vsphere'
 require 'fog/bin/voxel'
+require 'fog/bin/xenserver'
 require 'fog/bin/zerigo'

data/lib/fog/bluebox/compute.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'bluebox'))
+require 'fog/bluebox'
 require 'fog/compute'
 
 module Fog
@@ -15,12 +15,16 @@ module Fog
       collection  :images
       model       :server
       collection  :servers
+      model       :location
+      collection  :locations
 
       request_path 'fog/bluebox/requests/compute'
       request :create_block
       request :destroy_block
       request :get_block
       request :get_blocks
+      request :get_location
+      request :get_locations
       request :get_product
       request :get_products
       request :get_template
@@ -58,7 +62,6 @@ module Fog
       class Real
 
         def initialize(options={})
-          require 'multi_json'
           @bluebox_api_key      = options[:bluebox_api_key]
           @bluebox_customer_id  = options[:bluebox_customer_id]
           @connection_options   = options[:connection_options] || {}
@@ -90,7 +93,7 @@ module Fog
             end
           end
           unless response.body.empty?
-            response.body = MultiJson.decode(response.body)
+            response.body = Fog::JSON.decode(response.body)
           end
           response
         end

data/lib/fog/bluebox/dns.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'bluebox'))
+require 'fog/bluebox'
 require 'fog/dns'
 
 module Fog
@@ -101,4 +101,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/bluebox/models/compute/location.rb

@@ -0,0 +1,17 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class Bluebox
+
+      class Location < Fog::Model
+
+        identity :id
+        
+        attribute :description
+
+      end
+
+    end
+  end
+end

data/lib/fog/bluebox/models/compute/locations.rb

@@ -0,0 +1,28 @@
+require 'fog/core/collection'
+require 'fog/bluebox/models/compute/location'
+
+module Fog
+  module Compute
+    class Bluebox
+
+      class Locations < Fog::Collection
+
+        model Fog::Compute::Bluebox::Location
+
+        def all
+          data = connection.get_locations.body
+          load(data)
+        end
+
+        def get(location_id)
+          response = connection.get_location(location_id)
+          new(response.body)
+        rescue Fog::Compute::Bluebox::NotFound
+          nil
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -15,6 +15,7 @@ module Fog
         attribute :flavor_id,   :aliases => :product, :squash => 'id'
         attribute :hostname
         attribute :image_id
+        attribute :location_id
         attribute :ips
         attribute :memory
         attribute :state,       :aliases => "status"
@@ -25,8 +26,9 @@ module Fog
         attr_writer :private_key, :private_key_path, :public_key, :public_key_path, :username
 
         def initialize(attributes={})
-          self.flavor_id  ||= '94fd37a7-2606-47f7-84d5-9000deda52ae' # Block 1GB Virtual Server
-          self.image_id   ||= '03807e08-a13d-44e4-b011-ebec7ef2c928' # Ubuntu LTS 10.04 64bit
+          self.flavor_id    ||= '94fd37a7-2606-47f7-84d5-9000deda52ae' # Block 1GB Virtual Server
+          self.image_id     ||= 'a8f05200-7638-47d1-8282-2474ef57c4c3' # Scientific Linux 6
+          self.location_id  ||= '37c2bd9a-3e81-46c9-b6e2-db44a25cc675' # Seattle, WA
           super
         end
 
@@ -45,6 +47,11 @@ module Fog
           requires :image_id
           connection.images.get(image_id)
         end
+        
+        def location
+          requires :location_id
+          connection.locations.get(location_id)
+        end
 
         def private_ip_address
           nil
@@ -84,7 +91,7 @@ module Fog
 
         def save
           raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
-          requires :flavor_id, :image_id
+          requires :flavor_id, :image_id, :location_id
           options = {}
 
           if identity.nil?  # new record
@@ -100,10 +107,10 @@ module Fog
           elsif @lb_applications
             options['lb_applications'] = lb_applications
           end
-
+          
           options['username'] = username
           options['hostname'] = hostname if @hostname
-          data = connection.create_block(flavor_id, image_id, options)
+          data = connection.create_block(flavor_id, image_id, location_id, options)
           merge_attributes(data.body)
           true
         end
@@ -114,7 +121,7 @@ module Fog
             %{mkdir .ssh},
             %{echo "#{public_key}" >> ~/.ssh/authorized_keys},
             %{passwd -l #{username}},
-            %{echo "#{MultiJson.encode(attributes)}" >> ~/attributes.json}
+            %{echo "#{Fog::JSON.encode(attributes)}" >> ~/attributes.json}
           ])
         rescue Errno::ECONNREFUSED
           sleep(1)

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

@@ -18,12 +18,12 @@ module Fog
         # * response<~Excon::Response>:
         #   * body<~Hash>:
         # TODO
-        def create_block(product_id, template_id, options = {})
+        def create_block(product_id, template_id, location_id, options = {})
           request(
             :expects  => 200,
             :method   => 'POST',
             :path     => '/api/blocks.json',
-            :query    => {'product' => product_id, 'template' => template_id}.merge!(options)
+            :query    => {'product' => product_id, 'template' => template_id, 'location' => location_id}.merge!(options)
           )
         end
 

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

@@ -0,0 +1,26 @@
+module Fog
+  module Compute
+    class Bluebox
+      class Real
+
+        # Get details of a location
+        #
+        # ==== Parameters
+        # * location_id<~Integer> - Id of location to lookup
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Array>:
+        # TODO
+        def get_location(location_id)
+          request(
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => "api/locations/#{location_id}.json"
+          )
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+module Fog
+  module Compute
+    class Bluebox
+      class Real
+
+        # Get list of locations
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Array>:
+        #     * 'id'<~String> - UUID of the location
+        #     * 'description'<~String> - Description of the location
+        def get_locations
+          request(
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => 'api/locations.json'
+          )
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/bluebox.rb

@@ -1,4 +1,4 @@
-require(File.expand_path(File.join(File.dirname(__FILE__), 'core')))
+require 'fog/core'
 
 module Fog
   module Bluebox

data/lib/fog/brightbox/compute.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'brightbox'))
+require 'fog/brightbox'
 require 'fog/compute'
 
 module Fog
@@ -16,6 +16,10 @@ module Fog
       model       :server
       collection  :server_groups
       model       :server_group
+      collection  :firewall_policies
+      model       :firewall_policy
+      collection  :firewall_rules
+      model       :firewall_rule
       collection  :flavors
       model       :flavor
       collection  :images
@@ -35,6 +39,7 @@ module Fog
       request :add_nodes_load_balancer
       request :add_servers_server_group
       request :apply_to_firewall_policy
+      request :remove_firewall_policy
       request :create_api_client
       request :create_cloud_ip
       request :create_firewall_policy
@@ -80,7 +85,7 @@ module Fog
       request :remove_nodes_load_balancer
       request :remove_servers_server_group
       request :reset_ftp_password_account
-      request :resize_server
+      request :reset_secret_api_client
       request :shutdown_server
       request :snapshot_server
       request :start_server
@@ -88,6 +93,8 @@ module Fog
       request :unmap_cloud_ip
       request :update_account
       request :update_api_client
+      request :update_cloud_ip
+      request :update_firewall_rule
       request :update_image
       request :update_load_balancer
       request :update_server
@@ -109,7 +116,6 @@ module Fog
       class Real
 
         def initialize(options)
-          require 'multi_json'
           # Currently authentication and api endpoints are the same but may change
           @auth_url             = options[:brightbox_auth_url] || Fog.credentials[:brightbox_auth_url] || API_URL
           @api_url              = options[:brightbox_api_url] || Fog.credentials[:brightbox_api_url] || API_URL
@@ -126,7 +132,7 @@ module Fog
             :path     => url,
             :expects  => expected_responses
           }
-          request_options[:body] = MultiJson.encode(options) unless options.nil?
+          request_options[:body] = Fog::JSON.encode(options) unless options.nil?
           make_request(request_options)
         end
 
@@ -139,7 +145,7 @@ module Fog
           auth_url = options[:brightbox_auth_url] || @auth_url
 
           connection = Fog::Connection.new(auth_url)
-          @authentication_body = MultiJson.encode({'client_id' => @brightbox_client_id, 'grant_type' => 'none'})
+          @authentication_body = Fog::JSON.encode({'client_id' => @brightbox_client_id, 'grant_type' => 'none'})
 
           response = connection.request({
             :path => "/token",
@@ -151,7 +157,7 @@ module Fog
             :method   => 'POST',
             :body     => @authentication_body
           })
-          @oauth_token = MultiJson.decode(response.body)["access_token"]
+          @oauth_token = Fog::JSON.decode(response.body)["access_token"]
           return @oauth_token
         end
 
@@ -159,12 +165,12 @@ module Fog
           begin
             get_oauth_token if @oauth_token.nil?
             response = authenticated_request(params)
-          rescue Excon::Errors::Unauthorized => e
+          rescue Excon::Errors::Unauthorized
             get_oauth_token
             response = authenticated_request(params)
           end
           unless response.body.empty?
-            response = MultiJson.decode(response.body)
+            response = Fog::JSON.decode(response.body)
           end
         end
 

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

@@ -53,7 +53,7 @@ module Fog
 
         def reset_ftp_password
           requires :identity
-          connection.reset_ftp_password_account(identity)["library_ftp_password"]
+          connection.reset_ftp_password_account["library_ftp_password"]
         end
 
       end

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

@@ -23,9 +23,17 @@ module Fog
         attribute :server_id, :aliases => "server", :squash => "id"
         attribute :load_balancer, :alias => "load_balancer", :squash => "id"
 
-        def map(interface_to_map)
+        def map(destination)
           requires :identity
-          connection.map_cloud_ip(identity, :interface => interface_to_map)
+          case destination
+          when Fog::Compute::Brightbox::Server
+            final_destination = destination.interfaces.first["id"]
+          when Fog::Compute::Brightbox::LoadBalancer
+            final_destination = destination.id
+          else
+            final_destination = destination
+          end
+          connection.map_cloud_ip(identity, :destination => final_destination)
         end
 
         def mapped?

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

@@ -0,0 +1,29 @@
+require 'fog/core/collection'
+require 'fog/brightbox/models/compute/firewall_policy'
+
+module Fog
+  module Compute
+    class Brightbox
+
+      class FirewallPolicies < Fog::Collection
+
+        model Fog::Compute::Brightbox::FirewallPolicy
+
+        def all
+          data = connection.list_firewall_policies
+          load(data)
+        end
+
+        def get(identifier)
+          return nil if identifier.nil? || identifier == ""
+          data = connection.get_firewall_policy(identifier)
+          new(data)
+        rescue Excon::Errors::NotFound
+          nil
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,65 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class Brightbox
+
+      class FirewallPolicy < Fog::Model
+
+        identity :id
+        attribute :url
+        attribute :resource_type
+
+        attribute :name
+        attribute :description
+
+        attribute :default
+
+        attribute :server_group_id, :aliases => "server_group", :squash => "id"
+        attribute :created_at, :type => :time
+        attribute :rules
+
+        # 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
+          options = {
+            :server_group => server_group_id,
+            :name => name,
+            :description => description
+          }.delete_if {|k,v| v.nil? || v == "" }
+          data = connection.create_firewall_policy(options)
+          merge_attributes(data)
+          true
+        end
+
+        def apply_to(server_group_id)
+          requires :identity
+          options = {
+            :server_group => server_group_id
+          }
+          data = connection.apply_to_firewall_policy(identity, options)
+          merge_attributes(data)
+          true
+        end
+
+        def remove(server_group_id)
+          requires :identity
+          options = {
+            :server_group => server_group_id
+          }
+          data = connection.remove_firewall_policy(identity, options)
+          merge_attributes(data)
+          true
+        end
+
+        def destroy
+          requires :identity
+          data = connection.destroy_firewall_policy(identity)
+          true
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,54 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class Brightbox
+
+      class FirewallRule < Fog::Model
+
+        identity :id
+        attribute :url
+        attribute :resource_type
+
+        attribute :description
+
+        attribute :source
+        attribute :source_port
+        attribute :destination
+        attribute :destination_port
+        attribute :protocol
+        attribute :icmp_type_name
+        attribute :created_at, :type => :time
+
+        attribute :firewall_policy_id, :aliases => "firewall_policy", :squash => "id"
+
+        # 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
+          requires :firewall_policy_id
+          options = {
+            :firewall_policy => firewall_policy_id,
+            :protocol => protocol,
+            :description => description,
+            :source => source,
+            :source_port => source_port,
+            :destination => destination,
+            :destination_port => destination_port,
+            :icmp_type_name => icmp_type_name
+          }.delete_if {|k,v| v.nil? || v == "" }
+          data = connection.create_firewall_rule(options)
+          merge_attributes(data)
+          true
+        end
+
+        def destroy
+          requires :identity
+          connection.destroy_firewall_rule(identity)
+          true
+        end
+
+      end
+
+    end
+  end
+end