fog 1.1.0 → 1.2.0

data/lib/fog/cloudstack/requests/compute/remove_from_load_balancer_rule.rb

@@ -0,0 +1,25 @@
+module Fog
+  module Compute
+    class Cloudstack
+      class Real
+
+        # Removes a virtual machine or a list of virtual machines from a load balancer rule.
+        #
+        # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.12/global_admin/removeFromLoadBalancerRule.html]
+        def remove_from_load_balancer_rule(id,virtualmachineids=[])
+          virtualmachineids = [*virtualmachineids]
+          
+          options = {
+            'command' => 'removeFromLoadBalancerRule',
+            'id' => id,
+            'virtualmachineids' => virtualmachineids.join(',')
+          }
+
+          request(options)
+        end
+
+      end
+    end
+  end
+end
+

data/lib/fog/cloudstack/requests/compute/reset_password_for_virtual_machine.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Compute
+    class Cloudstack
+      class Real
+
+        # Returns an encrypted password for the VM
+        #
+        # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/resetPasswordForVirtualMachine.html]
+        def reset_password_for_virtual_machine(id)
+          options = {
+            'command' => 'resetPasswordForVirtualMachine',
+            'id' => id
+          }
+          
+          request(options)
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/cloudstack/requests/compute/revoke_security_group_ingress.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Compute
+    class Cloudstack
+      class Real
+
+        # Creates an account.
+        #
+        # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/authorizeSecurityGroupIngress.html]
+        def revoke_security_group_ingress(options={})
+          options.merge!(
+            'command' => 'revokeSecurityGroupIngress'
+          )
+
+          request(options)
+        end
+
+      end
+    end
+  end
+end
+

data/lib/fog/cloudstack/requests/compute/start_virtual_machine.rb

@@ -0,0 +1,20 @@
+module Fog
+  module Compute
+    class Cloudstack
+      class Real
+
+        # Updates account information for the authenticated user.
+        #
+        # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/startVirtualMachine.html]
+        def start_virtual_machine(options={})
+          options.merge!(
+            'command' => 'startVirtualMachine'
+          )
+
+          request(options)
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/cloudstack/requests/compute/stop_virtual_machine.rb

@@ -0,0 +1,20 @@
+module Fog
+  module Compute
+    class Cloudstack
+      class Real
+
+        # Updates account information for the authenticated user.
+        #
+        # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/stopVirtualMachine.html]
+        def stop_virtual_machine(options={})
+          options.merge!(
+            'command' => 'stopVirtualMachine'
+          )
+
+          request(options)
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/cloudstack/requests/compute/update_account.rb

@@ -0,0 +1,20 @@
+module Fog
+  module Compute
+    class Cloudstack
+      class Real
+
+        # Updates account information for the authenticated user.
+        #
+        # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/updateAccount.html]
+        def update_account(options={})
+          options.merge!(
+            'command' => 'updateAccount'
+          )
+
+          request(options)
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/cloudstack/requests/compute/update_domain.rb

@@ -0,0 +1,20 @@
+module Fog
+  module Compute
+    class Cloudstack
+      class Real
+
+        # Updates a domain with a new name.
+        #
+        # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/updateDomain.html]
+        def update_domain(options={})
+          options.merge!(
+            'command' => 'updateDomain'
+          )
+
+          request(options)
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/cloudstack/requests/compute/update_resource_count.rb

@@ -0,0 +1,20 @@
+module Fog
+  module Compute
+    class Cloudstack
+      class Real
+
+        # Updates a user account.
+        #
+        # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/updateResourceCount.html]
+        def update_resource_count(options={})
+          options.merge!(
+            'command' => 'updateResourceCount'
+          )
+
+          request(options)
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/cloudstack/requests/compute/update_user.rb

@@ -0,0 +1,20 @@
+module Fog
+  module Compute
+    class Cloudstack
+      class Real
+
+        # Updates a user account.
+        #
+        # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/updateUser.html]
+        def update_user(options={})
+          options.merge!(
+            'command' => 'updateUser'
+          )
+
+          request(options)
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/cloudstack/requests/compute/update_virtual_machine.rb

@@ -0,0 +1,20 @@
+module Fog
+  module Compute
+    class Cloudstack
+      class Real
+
+        # Updates account information for the authenticated user.
+        #
+        # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/updateAccount.html]
+        def update_virtual_machine(options={})
+          options.merge!(
+            'command' => 'updateVirtualMachine'
+          )
+
+          request(options)
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/cloudstack.rb

@@ -0,0 +1,28 @@
+require 'fog/core'
+require 'uri'
+
+module Fog
+  module Cloudstack
+
+    extend Fog::Provider
+
+    service(:compute, 'cloudstack/compute','Compute')
+
+    @@digest  = OpenSSL::Digest::Digest.new('sha1')
+
+    def self.escape(string)
+      string = CGI::escape(string)
+      string = string.gsub("+","%20")
+      string
+    end
+
+    def self.signed_params(key,params)
+      query = params.to_a.sort.collect{|c| "#{c[0]}=#{escape(c[1].to_s)}"}.join('&').downcase
+
+      signed_string = Base64.encode64(OpenSSL::HMAC.digest(@@digest,key,query)).strip
+
+      signed_string
+    end
+  end
+end
+

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

@@ -13,6 +13,17 @@ module Fog
         Fog::SCP.new(public_ip_address, username, scp_options).upload(local_path, remote_path, upload_options)
       end
 
+      alias_method :scp_upload, :scp
+
+      def scp_download(remote_path, local_path, download_options = {})
+        require 'net/scp'
+        requires :public_ip_address, :username
+
+        scp_options = {}
+        scp_options[:key_data] = [private_key] if private_key
+        Fog::SCP.new(public_ip_address, username, scp_options).download(remote_path, local_path, download_options)
+      end
+
       def ssh(commands, options={})
         require 'net/ssh'
         requires :public_ip_address, :username

data/lib/fog/compute.rb

@@ -17,6 +17,12 @@ module Fog
       when :brightbox
         require 'fog/brightbox/compute'
         Fog::Compute::Brightbox.new(attributes)
+      when :cloudstack
+        require 'fog/cloudstack/compute'
+        Fog::Compute::Cloudstack.new(attributes)
+      when :clodo
+        require 'fog/clodo/compute'
+        Fog::Compute::Clodo.new(attributes)
       when :ecloud
         require 'fog/ecloud/compute'
         Fog::Compute::Ecloud.new(attributes)
@@ -26,25 +32,36 @@ module Fog
       when :gogrid
         require 'fog/go_grid/compute'
         Fog::Compute::GoGrid.new(attributes)
+      when :joyent
+        require 'fog/joyent/compute'
+        Fog::Compute::Joyent.new(attributes)
       when :libvirt
         require 'fog/libvirt/compute'
         Fog::Compute::Libvirt.new(attributes)
       when :linode
         require 'fog/linode/compute'
         Fog::Compute::Linode.new(attributes)
-      when :newservers
-        require 'fog/new_servers/compute'
-        Fog::Compute::NewServers.new(attributes)
+      when :new_servers
+        require 'fog/bare_metal_cloud/compute'
+        warn "[DEPRECATION] `new_servers` is deprecated. Please use `bare_metal_cloud` instead."
+        Fog::Compute::BareMetalCloud.new(attributes)
+      when :baremetalcloud
+        require 'fog/bare_metal_cloud/compute'
+        Fog::Compute::BareMetalCloud.new(attributes)
       when :ninefold
         require 'fog/ninefold/compute'
         Fog::Compute::Ninefold.new(attributes)
       when :openstack
         require 'fog/openstack/compute'
         Fog::Compute::OpenStack.new(attributes)
+      when :ovirt
+        require 'fog/ovirt/compute'
+        Fog::Compute::Ovirt.new(attributes)
       when :rackspace
         require 'fog/rackspace/compute'
         Fog::Compute::Rackspace.new(attributes)
       when :slicehost
+        warn "[DEPRECATION] `slicehost` is deprecated. Please use `rackspace` instead."
         require 'fog/slicehost/compute'
         Fog::Compute::Slicehost.new(attributes)
       when :stormondemand

data/lib/fog/core/connection.rb

@@ -13,12 +13,12 @@ module Fog
       unless block_given?
         if (parser = params.delete(:parser))
           body = Nokogiri::XML::SAX::PushParser.new(parser)
-          block = lambda { |chunk, remaining, total| body << chunk }
+          params[:response_block] = lambda { |chunk, remaining, total| body << chunk }
         end
       end
 
       response = @excon.request(params, &block)
-      
+
       if parser
         body.finish
         response.body = parser.response

data/lib/fog/core/credentials.rb

@@ -5,15 +5,15 @@ module Fog
 
   # Assign a new credential to use from configuration file
   #   @param [String, Symbol] new_credential name of new credential to use
-  #   @ return [String, Symbol] name of the new credential
+  #   @ return [Symbol] name of the new credential
   def self.credential=(new_credential)
     @credentials = nil
-    @credential = new_credential
+    @credential = new_credential && new_credential.to_sym
   end
 
   # @return [String, Symbol] The credential to use in Fog
   def self.credential
-    @credential ||= ENV["FOG_CREDENTIAL"] || :default
+    @credential ||= ( ENV["FOG_CREDENTIAL"] && ENV["FOG_CREDENTIAL"].to_sym ) || :default
   end
 
   # @return [String] The path for configuration_file

data/lib/fog/core/errors.rb

@@ -38,20 +38,25 @@ An alternate file may be used by placing its path in the FOG_RC environment vari
   :bluebox_customer_id:
   :brightbox_client_id:
   :brightbox_secret:
+  :clodo_api_key:
+  :clodo_username:
   :go_grid_api_key:
   :go_grid_shared_secret:
   :google_storage_access_key_id:
   :google_storage_secret_access_key:
   :linode_api_key:
   :local_root:
-  :new_servers_password:
-  :new_servers_username:
+  :bare_metal_cloud_password:
+  :bare_metal_cloud_username:
   :public_key_path:
   :private_key_path:
   :openstack_api_key:
   :openstack_username:
   :openstack_auth_url:
   :openstack_tenant:
+  :ovirt_username:
+  :ovirt_password:
+  :ovirt_url:
   :rackspace_api_key:
   :rackspace_username:
   :rackspace_servicenet:
@@ -69,6 +74,9 @@ An alternate file may be used by placing its path in the FOG_RC environment vari
   :dnsimple_password:
   :dnsmadeeasy_api_key:
   :dnsmadeeasy_secret_key:
+  :cloudstack_host:
+  :cloudstack_api_key:
+  :cloudstack_secret_access_key:
   :vsphere_server:
   :vsphere_username:
   :vsphere_password:

data/lib/fog/core/model.rb

@@ -42,6 +42,14 @@ module Fog
       MultiJson.encode(attributes)
     end
 
+    def symbolize_keys(hash)
+      return nil if hash.nil?
+      hash.inject({}) do |options, (key, value)|
+        options[(key.to_sym rescue key) || key] = value
+        options
+      end
+    end
+
     def wait_for(timeout=Fog.timeout, interval=1, &block)
       reload
       retries = 3

data/lib/fog/core/scp.rb

@@ -27,6 +27,10 @@ module Fog
         Fog::Mock.not_implemented
       end
 
+      def download(remote_path, local_path, download_options = {})
+        Fog::Mock.not_implemented
+      end
+
     end
 
     class Real
@@ -45,10 +49,22 @@ module Fog
         @options  = { :paranoid => false }.merge(options)
       end
 
-      def upload(local_path, remote_path, upload_options = {} )
+      def upload(local_path, remote_path, upload_options = {})
+        begin
+          Net::SCP.start(@address, @username, @options) do |scp|
+            scp.upload!(local_path, remote_path, upload_options) do |ch, name, sent, total|
+              # TODO: handle progress display?
+            end
+          end
+        rescue Exception => error
+          raise error
+        end
+      end
+
+      def download(remote_path, local_path, download_options = {})
         begin
           Net::SCP.start(@address, @username, @options) do |scp|
-            scp.upload!(local_path, remote_path, upload_options ) do |ch, name, sent, total|
+            scp.download!(remote_path, local_path, download_options) do |ch, name, sent, total|
               # TODO: handle progress display?
             end
           end

data/lib/fog/core/wait_for.rb

@@ -4,7 +4,7 @@ module Fog
     duration = 0
     start = Time.now
     until yield || duration > timeout
-      sleep(interval)
+      sleep(interval.to_f)
       duration = Time.now - start
     end
     if duration > timeout

data/lib/fog/core.rb

@@ -1,11 +1,9 @@
 __LIB_DIR__ = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 
 $LOAD_PATH.unshift __LIB_DIR__ unless
-  $LOAD_PATH.include?(__LIB_DIR__) ||
-  $LOAD_PATH.include?(File.expand_path(__LIB_DIR__))
+  $LOAD_PATH.include?(__LIB_DIR__)
 
 # external core dependencies
-require 'rubygems'
 require 'base64'
 require 'cgi'
 require 'uri'

data/lib/fog/dns.rb

@@ -27,6 +27,7 @@ module Fog
         require 'fog/linode/dns'
         Fog::DNS::Linode.new(attributes)
       when :slicehost
+        warn "[DEPRECATION] `slicehost` is deprecated. Please use `racksace` instead."
         require 'fog/slicehost/dns'
         Fog::DNS::Slicehost.new(attributes)
       when :zerigo

data/lib/fog/dnsimple/dns.rb

@@ -80,7 +80,7 @@ module Fog
         def request(params)
           params[:headers] ||= {}
           key = "#{@dnsimple_email}:#{@dnsimple_password}"
-          params[:headers].merge!({ "Authorization" => "Basic " + Base64.encode64(key).chomp,
+          params[:headers].merge!({ "Authorization" => "Basic " + Base64.encode64(key).gsub("\n",''),
                                     "Accept" => "application/json",
                                     "Content-Type" => "application/json" })
 

data/lib/fog/dnsmadeeasy/dns.rb

@@ -68,7 +68,7 @@ module Fog
         # :dnsmadeeasy_secret_key in order to create a connection
         #
         # ==== Examples
-        #   dns = Fog::DNSMadeEasy::DNS.new(
+        #   dns = Fog::DNS::DNSMadeEasy.new(
         #     :dnsmadeeasy_api_key => your_dnsmadeeasy_api_key,
         #     :dnsmadeeasy_secret_key => your_dnsmadeeasy_secret_key
         #   )

data/lib/fog/dynect/models/dns/records.rb

@@ -11,10 +11,10 @@ module Fog
 
         model Fog::DNS::Dynect::Record
 
-        def all
+        def all(options = {})
           requires :zone
           data = []
-          connection.get_node_list(zone.domain).body['data'].each do |fqdn|
+          connection.get_node_list(zone.domain, options).body['data'].each do |fqdn|
             records = connection.get_record('ANY', zone.domain, fqdn).body['data']
 
             # data in format ['/REST/xRecord/domain/fqdn/identity]

data/lib/fog/dynect/requests/dns/get_node_list.rb

@@ -11,10 +11,11 @@ module Fog
         #   * fqdn<~String> - fully qualified domain name of node to lookup
 
         def get_node_list(zone, options = {})
+          requested_fqdn = options['fqdn'] || options[:fqdn]
           request(
             :expects  => 200,
             :method   => :get,
-            :path     => ['NodeList', zone, options['fqdn']].compact.join('/')
+            :path     => ['NodeList', zone, requested_fqdn].compact.join('/')
           )
         end
       end

data/lib/fog/ecloud/compute.rb

@@ -1184,7 +1184,7 @@ module Fog
         end
 
         def supporting_versions
-          ["v0.8b-ext2.6", "0.8b-ext2.6"]
+          ["v0.8b-ext2.6", "0.8b-ext2.6", "v0.8b-ext2.8" , "0.8b-ext2.8"]
         end
 
         private

data/lib/fog/ecloud/requests/compute/add_backup_internet_service.rb

@@ -7,7 +7,7 @@ module Fog
           if configure
             required_opts + [ :id, :href, :timeout ]
           end
-          unless required_opts.all? { |opt| service_data.keys.include?(opt) }
+          unless required_opts.all? { |opt| service_data.has_key?(opt) }
             raise ArgumentError.new("Required Backup Internet Service data missing: #{(required_opts - service_data.keys).map(&:inspect).join(", ")}")
           end
         end

data/lib/fog/ecloud/requests/compute/add_internet_service.rb

@@ -15,7 +15,7 @@ module Fog
                             [:type, :url_send_string, :http_headers, :receive_string, :is_enabled]
                           end
 
-          unless required_opts.all? { |opt| monitor.keys.include?(opt) && monitor[opt] }
+          unless required_opts.all? { |opt| monitor.has_key?(opt) && monitor[opt] }
             raise ArgumentError.new("Required Monitor data missing: #{(required_opts - monitor.keys).map(&:inspect).join(", ")}")
           end
 
@@ -36,7 +36,7 @@ module Fog
           if configure
             required_opts + [ :id, :href, :timeout ]
           end
-          unless required_opts.all? { |opt| service_data.keys.include?(opt) }
+          unless required_opts.all? { |opt| service_data.has_key?(opt) }
             raise ArgumentError.new("Required Internet Service data missing: #{(required_opts - service_data.keys).map(&:inspect).join(", ")}")
           end
         end

data/lib/fog/ecloud/requests/compute/add_node.rb

@@ -20,7 +20,7 @@ module Fog
           if configure
             valid_opts.delete_if { |opt| ![:name, :enabled, :description].include?(opt) }
           end
-          unless valid_opts.all? { |opt| node_data.keys.include?(opt) }
+          unless valid_opts.all? { |opt| node_data.has_key?(opt) }
             raise ArgumentError.new("Required data missing: #{(valid_opts - node_data.keys).map(&:inspect).join(", ")}")
           end
         end

data/lib/fog/ecloud/requests/compute/clone_vapp.rb

@@ -5,7 +5,7 @@ module Fog
 
         def validate_clone_vapp_options(options)
           valid_opts = [:name, :poweron]
-          unless valid_opts.all? { |opt| options.keys.include?(opt) }
+          unless valid_opts.all? { |opt| options.has_key?(opt) }
             raise ArgumentError.new("Required data missing: #{(valid_opts - options.keys).map(&:inspect).join(", ")}")
           end
         end

data/lib/fog/ecloud/requests/compute/configure_internet_service.rb

@@ -6,7 +6,7 @@ module Fog
 
         def validate_public_ip_address_data(ip_address_data)
           valid_opts = [:name, :href, :id]
-          unless valid_opts.all? { |opt| ip_address_data.keys.include?(opt) }
+          unless valid_opts.all? { |opt| ip_address_data.has_key?(opt) }
             raise ArgumentError.new("Required Internet Service data missing: #{(valid_opts - ip_address_data.keys).map(&:inspect).join(", ")}")
           end
         end

data/lib/fog/ecloud/requests/compute/configure_network.rb

@@ -5,7 +5,7 @@ module Fog
 
         def validate_network_data(network_data, configure=false)
           valid_opts = [:id, :href, :name, :rnat, :address, :broadcast, :gateway]
-          unless valid_opts.all? { |opt| network_data.keys.include?(opt) }
+          unless valid_opts.all? { |opt| network_data.has_key?(opt) }
             raise ArgumentError.new("Required data missing: #{(valid_opts - network_data.keys).map(&:inspect).join(", ")}")
           end
         end

data/lib/fog/ecloud/requests/compute/configure_network_ip.rb

@@ -6,7 +6,7 @@ module Fog
 
         def validate_network_ip_data(network_ip_data)
           valid_opts = [:id, :href, :name, :status, :server, :rnat]
-          unless valid_opts.all? { |opt| network_ip_data.keys.include?(opt) }
+          unless valid_opts.all? { |opt| network_ip_data.has_key?(opt) }
             raise ArgumentError.new("Required data missing: #{(valid_opts - network_ip_data.keys).map(&:inspect).join(", ")}")
           end
         end

data/lib/fog/ecloud/requests/compute/configure_vapp.rb

@@ -6,7 +6,7 @@ module Fog
 
         def validate_vapp_data(vapp_data)
           valid_opts = [:name, :cpus, :memory, :disks]
-          unless valid_opts.all? { |opt| vapp_data.keys.include?(opt) }
+          unless valid_opts.all? { |opt| vapp_data.has_key?(opt) }
             raise ArgumentError.new("Required Vapp data missing: #{(valid_opts - vapp_data.keys).map(&:inspect).join(", ")}")
           end
         end

data/lib/fog/ecloud/requests/compute/instantiate_vapp_template.rb

@@ -6,7 +6,7 @@ module Fog
 
         def validate_instantiate_vapp_template_options(catalog_item_uri, options)
           valid_opts = [:name, :vdc_uri, :network_uri, :cpus, :memory, :row, :group]
-          unless valid_opts.all? { |opt| options.keys.include?(opt) }
+          unless valid_opts.all? { |opt| options.has_key?(opt) }
             raise ArgumentError.new("Required data missing: #{(valid_opts - options.keys).map(&:inspect).join(", ")}")
           end
 

data/lib/fog/glesys/compute.rb

@@ -79,7 +79,7 @@ module Fog
         def request(method_name, options = {}) 
 
           options.merge!( {:format => 'json'})
-          
+
           begin
             parser = options.delete(:parser)
             data = @connection.request(
@@ -96,7 +96,9 @@ module Fog
 
             data.body = MultiJson.decode(data.body)
 
-            unless data.body['response']['status']['code'] == '200'
+            response_code =  data.body['response']['status']['code']
+
+            unless response_code.to_i == 200
               raise Fog::Compute::Glesys::Error, "#{data.body['response']['status']['text']}"
             end
             data