fog 1.1.1 → 1.1.2

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

@@ -0,0 +1,50 @@
+module Fog
+  module Compute
+    class Clodo
+      class Real
+
+        # List all servers (IDs and names only)
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #   * 'servers'<~Array>:
+        #     * 'id'<~String> - Id of server
+        #     * 'name'<~String> - Name of server
+        #     * 'addresses'<~Hash>:
+        #       * 'public'<~Array>:
+        #         * 'dosprotect'<~Bool> - DDoS protection enabled
+        #         * 'primary_ip'<~Bool> - Is a primary IP-address
+        #         * 'isp'<~Bool> - ISPManager license enabled
+        #         * 'ip'<~String> - IP-address
+        #     * 'imageId'<~String> - ID of OS image installed
+        #     * 'type'<~String> - Type (ScaleServer or Virtual Server)
+        #     * 'status'<~String> - Server's status
+        def list_servers
+          request(
+            :expects  => [200, 203],
+            :method   => 'GET',
+            :path     => 'servers'
+          )
+        end
+
+      end
+
+      class Mock
+
+        def list_servers
+          response = Excon::Response.new
+          data = list_servers_detail.body['servers']
+          servers = []
+          for server in data
+            servers << server.reject { |key, value| !['id', 'name', 'addresses', 'imageId', 'type', 'status', 'state'].include?(key) }
+          end
+          response.status = [200, 203][rand(1)]
+          response.body = { 'servers' => servers }
+          response
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/clodo/requests/compute/list_servers_detail.rb

@@ -0,0 +1,51 @@
+module Fog
+  module Compute
+    class Clodo
+      class Real
+
+        # List all servers details
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #   * 'servers'<~Array>:
+        #     * 'id'<~Integer> - Id of server
+        #     * 'name<~String> - Name of server
+        #     * 'imageId'<~Integer> - Id of image used to boot server
+        #     * 'status'<~String> - Current server status
+        #     * 'addresses'<~Hash>:
+        #       * 'public'<~Array> - public address strings
+        def list_servers_detail
+          request(
+            :expects  => [200, 203],
+            :method   => 'GET',
+            :path     => 'servers/detail'
+          )
+        end
+
+      end
+
+      class Mock
+
+        def list_servers_detail
+          response = Excon::Response.new
+
+          servers = self.data[:servers].values
+          for server in servers
+            case server['status']
+            when 'is_install'
+              if Time.now - self.data[:last_modified][:servers][server['id']] > Fog::Mock.delay * 2
+                server['status'] = 'is_running'
+              end
+            end
+          end
+
+          response.status = [200, 203][rand(1)]
+          response.body = { 'servers' => servers }
+          response
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/clodo/requests/compute/move_ip_address.rb

@@ -0,0 +1,34 @@
+module Fog
+  module Compute
+    class Clodo
+      class Real
+
+        # Move IP-address to specified server.
+        # ==== Paramaters
+        # * server_id<~Integer> - Id of server to move IP to
+        # * ip<~String> - IP-address to move
+        #
+        # ==== Returns
+        # * response<~Excon::Response>
+        #
+
+        def move_ip_address(server_id, ip)
+          request(
+                  :expects  => [204],
+                  :method   => 'GET',
+                  :path     => "servers/#{server_id}/ips/moveip",
+                  :body     => MultiJson.encode({'ip'=>"#{ip}"})
+                  )
+        end
+      end
+
+      class Mock
+        def move_ip_address(server_id, ip)
+          response = Excon::Response.new
+          response.status = [204]
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/clodo/requests/compute/reboot_server.rb

@@ -0,0 +1,19 @@
+module Fog
+  module Compute
+    class Clodo
+      class Real
+        def reboot_server(id, type)
+          body = {'reboot' => {}}
+          server_action(id, body)
+        end
+      end
+
+      class Mock
+        def reboot_server(id, type)
+          body = {'reboot' => {}}
+          server_action(id, body)
+        end
+      end
+    end
+  end
+end

data/lib/fog/clodo/requests/compute/rebuild_server.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Compute
+    class Clodo
+      class Real
+        def rebuild_server(id, image_id, vps_isp = nil)
+          body = {'rebuild' => {'imageId' => image_id}}
+          body['rebuild']['vps_isp'] = vps_isp if vps_isp
+          server_action(id, body)
+        end
+      end
+
+      class Mock
+        def rebuild_server(id, image_id, vps_isp = nil)
+          body = {'rebuild' => {'imageId' => image_id}}
+          body['rebuild']['vps_isp'] = vps_isp if vps_isp
+          server_action(id, body)
+        end
+      end
+    end
+  end
+end

data/lib/fog/clodo/requests/compute/server_action.rb

@@ -0,0 +1,25 @@
+module Fog
+  module Compute
+    class Clodo
+      class Real
+        def server_action(id, action)
+          request(
+                  :body    => MultiJson.encode(action),
+                  :expects => [204],
+                  :method  => 'POST',
+                  :path    => "servers/#{id}/action")
+        end
+      end
+      class Mock
+        def server_action(id, action)
+
+          raise Excon::Errors::BadRequest.new("Invalid server id #{id}.") unless id > 0
+
+          response = Excon::Response.new
+          response.status = 204
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/clodo/requests/compute/start_server.rb

@@ -0,0 +1,19 @@
+module Fog
+  module Compute
+    class Clodo
+      class Real
+        def start_server(id)
+          body = {'start' => {}}
+          server_action(id, body)
+        end
+      end
+
+      class Mock
+        def start_server(id)
+          body = {'start' => {}}
+          server_action(id, body)
+        end
+      end
+    end
+  end
+end

data/lib/fog/clodo/requests/compute/stop_server.rb

@@ -0,0 +1,19 @@
+module Fog
+  module Compute
+    class Clodo
+      class Real
+        def stop_server(id)
+          body = {'stop' => {}}
+          server_action(id, body)
+        end
+      end
+
+      class Mock
+        def stop_server(id)
+          body = {'stop' => {}}
+          server_action(id, body)
+        end
+      end
+    end
+  end
+end

data/lib/fog/compute.rb

@@ -17,6 +17,9 @@ module Fog
       when :brightbox
         require 'fog/brightbox/compute'
         Fog::Compute::Brightbox.new(attributes)
+      when :clodo
+        require 'fog/clodo/compute'
+        Fog::Compute::Clodo.new(attributes)
       when :ecloud
         require 'fog/ecloud/compute'
         Fog::Compute::Ecloud.new(attributes)

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,6 +38,8 @@ 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:

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/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/libvirt/compute.rb

@@ -8,6 +8,8 @@ module Fog
     class Libvirt < Fog::Service
 
       requires :libvirt_uri
+      recognizes :libvirt_username, :libvirt_password
+      recognizes :libvirt_ip_command
 
       model_path 'fog/libvirt/models/compute'
       model       :server

data/lib/fog/libvirt/models/compute/nodes.rb

@@ -26,10 +26,8 @@ module Fog
               node_info[param]=nil
             end
           end
-          node_info[:uri]=connection.connection.uri
+          node_info[:uri]=connection.uri
           data << { :raw => node_info }
-          require 'pp'
-          pp node_info
           load(data)
         end
 

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

@@ -206,6 +206,13 @@ module Fog
             @raw.destroy
           end
           @raw.undefine
+          if options[:destroy_volumes]
+            disk_path = document("domain/devices/disk/source", "file")
+            # volumes.all filters do not handle nil keys well
+            (connection.volumes.all(:path => disk_path) rescue []).each do |vol|
+              vol.destroy
+            end
+          end
         end
 
         def reboot
@@ -282,7 +289,7 @@ module Fog
           ip_command_global=@connection.ip_command.nil? ? 'grep $mac /var/log/arpwatch.log|sed -e "s/new station//"|sed -e "s/changed ethernet address//g" |sed -e "s/reused old ethernet //" |tail -1 |cut -d ":" -f 4-| cut -d " " -f 3' : @connection.ip_command
           ip_command_local=options[:ip_command].nil? ? ip_command_global : options[:ip_command]
 
-          ip_command="mac=#{mac}; "+ip_command_local
+          ip_command="mac=#{mac}; server_name=#{name}; "+ip_command_local
 
           ip_address=nil
 

data/lib/fog/providers.rb

@@ -1,6 +1,7 @@
 require 'fog/aws'
 require 'fog/bluebox'
 require 'fog/brightbox'
+require 'fog/clodo'
 require 'fog/dnsimple'
 require 'fog/dnsmadeeasy'
 require 'fog/dynect'

data/lib/fog/rackspace/dns.rb

@@ -5,12 +5,20 @@ module Fog
   module DNS
     class Rackspace < Fog::Service
 
+      class CallbackError < Fog::Errors::Error
+        attr_reader :response, :message, :details
+        def initialize(response)
+          @response = response
+          @message = response.body['error']['message']
+          @details = response.body['error']['details']
+        end
+      end
+
       US_ENDPOINT = 'https://dns.api.rackspacecloud.com/v1.0'
       UK_ENDPOINT = 'https://lon.dns.api.rackspacecloud.com/v1.0'
 
       requires :rackspace_api_key, :rackspace_username
-      recognizes :rackspace_auth_url
-      recognizes :rackspace_auth_token
+      recognizes :rackspace_auth_url, :rackspace_auth_token, :rackspace_dns_endpoint
 
       model_path 'fog/rackspace/models/dns'
       model       :record

data/lib/fog/rackspace/load_balancers.rb

@@ -62,6 +62,9 @@ module Fog
       request :remove_monitor
       request :get_usage
       request :get_load_balancer_usage
+      request :get_error_page
+      request :set_error_page
+      request :remove_error_page
 
       module Shared
 

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

@@ -9,9 +9,9 @@ module Fog
         identity :id
 
         attribute :addresses
-        attribute :flavor_id,   :aliases => 'flavorId'
+        attribute :flavor_id,   :aliases => 'flavorId', :type => :integer
         attribute :host_id,     :aliases => 'hostId'
-        attribute :image_id,    :aliases => 'imageId'
+        attribute :image_id,    :aliases => 'imageId',  :type => :integer
         attribute :metadata
         attribute :name
         attribute :personality

data/lib/fog/rackspace/models/dns/callback.rb

@@ -11,8 +11,10 @@ module Fog
           response = nil
           Fog.wait_for(timeout, interval) do
             response = connection.callback job_id
-            if response.body['status'] != 'RUNNING'
+            if response.body['status'] == 'COMPLETED'
               true
+            elsif response.body['status'] == 'ERROR'
+              raise Fog::DNS::Rackspace::CallbackError.new(response)
             elsif retries == 0
               raise Fog::Errors::Error.new("Wait on job #{job_id} took too long")
             else

data/lib/fog/rackspace/models/dns/record.rb

@@ -50,6 +50,10 @@ module Fog
             :data => value
           }
 
+          if priority
+            options[:priority] = priority
+          end
+
           response = wait_for_job connection.add_records(@zone.identity, [options]).body['jobId']
           merge_attributes(response.body['response']['records'].select {|record| record['name'] == self.name && record['type'] == self.type && record['data'] == self.value}.first)
           true

data/lib/fog/rackspace/models/load_balancers/load_balancer.rb

@@ -70,10 +70,6 @@ module Fog
           virtual_ips.load(new_virtual_ips)
         end
 
-        def connection_logging
-          attributes[:connection_logging]
-        end
-
         def enable_connection_logging
           requires :identity
           connection.set_connection_logging identity, true
@@ -94,7 +90,7 @@ module Fog
 
         def enable_health_monitor(type, delay, timeout, attempsBeforeDeactivation, options = {})
           requires :identity
-          connection.set_monitor(identity, type, delay, timeout, attempsBeforeDeactivation, options = {})
+          connection.set_monitor(identity, type, delay, timeout, attempsBeforeDeactivation, options)
           true
         end
 
@@ -164,6 +160,21 @@ module Fog
           connection.get_load_balancer_usage(identity, options).body
         end
 
+        def error_page
+          requires :identity
+          connection.get_error_page(identity).body['errorpage']['content']
+        end
+
+        def error_page=(content)
+          requires :identity
+          connection.set_error_page identity, content
+        end
+
+        def reset_error_page
+          requires :identity
+          connection.remove_error_page identity
+        end
+
         private
         def create
           requires :name, :protocol, :port, :virtual_ips, :nodes
@@ -200,16 +211,15 @@ module Fog
         def connection_logging=(new_value)
           if !new_value.nil? and new_value.is_a?(Hash)
             attributes[:connection_logging] = case new_value['enabled']
-                                              when 'true'
+                                              when true,'true'
                                                 true
-                                              when 'false'
+                                              when false,'false'
                                                 false
                                               end
           else
             attributes[:connection_logging] = new_value
           end
         end
-
       end
     end
   end