fog 1.6.0 → 1.7.0

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

@@ -3,7 +3,7 @@ module Fog
     class Ecloud
 
       class Real
-        basic_request :get_servers
+        basic_request :get_tasks
       end
 
     end

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

@@ -84,10 +84,6 @@ module Fog
           retry
         end
 
-        def username
-          @username ||= 'root'
-        end
-
         private
 
         def adminPass=(new_admin_pass)

data/lib/fog/google/storage.rb

@@ -243,7 +243,7 @@ DATA
           canonical_resource << "#{params[:path]}"
           canonical_resource << '?'
           for key in (params[:query] || {}).keys
-            if ['acl', 'location', 'logging', 'requestPayment', 'torrent', 'versions', 'versioning'].include?(key)
+            if ['acl', 'cors', 'location', 'logging', 'requestPayment', 'torrent', 'versions', 'versioning'].include?(key)
               canonical_resource << "#{key}&"
             end
           end

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

@@ -31,7 +31,7 @@ module Fog
         attribute :public_ip_address
 
         attr_reader :password
-        attr_writer :private_key, :private_key_path, :public_key, :public_key_path, :username, :image_id, :flavor_id
+        attr_writer :image_id, :flavor_id
 
         def initialize(attributes = {})
           # assign these attributes first to prevent race condition with new_record?
@@ -67,15 +67,6 @@ module Fog
           addr["addr"] if addr
         end
 
-        def private_key_path
-          @private_key_path ||= Fog.credentials[:private_key_path]
-          @private_key_path &&= File.expand_path(@private_key_path)
-        end
-
-        def private_key
-          @private_key ||= private_key_path && File.read(private_key_path)
-        end
-
         def public_ip_address
           # FIX: Both the private and public ips are bundled under "private" network name
           # So hack to get to the public ip address
@@ -92,15 +83,6 @@ module Fog
           end
         end
 
-        def public_key_path
-          @public_key_path ||= Fog.credentials[:public_key_path]
-          @public_key_path &&= File.expand_path(@public_key_path)
-        end
-
-        def public_key
-          @public_key ||= public_key_path && File.read(public_key_path)
-        end
-
         def image_id
           @image_id ||= (image.nil? ? nil : image["id"])
         end
@@ -211,10 +193,6 @@ module Fog
           retry
         end
 
-        def username
-          @username ||= 'root'
-        end
-
         private
 
         def adminPass=(new_admin_pass)

data/lib/fog/hp/storage.rb

@@ -108,7 +108,6 @@ module Fog
 
         def initialize(options={})
           require 'mime/types'
-          puts "Called with #{options}"
           @hp_secret_key = options[:hp_secret_key]
           @hp_account_id = options[:hp_account_id]
         end

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

@@ -18,6 +18,10 @@ module Fog
         attribute :created, :type => :time
         attribute :updated, :type => :time
 
+        def public_ip_address
+          ips.empty? ? nil : ips.first
+        end
+
         def ready?
           self.state == 'running'
         end

data/lib/fog/joyent/models/compute/servers.rb

@@ -15,12 +15,13 @@ module Fog
         def create(params = {})
           data = self.connection.create_machine(params).body
           server = new(data)
-          server.wait_for { ready? }
           server
         end
 
-        def bootstrap
-          # XXX TOXO
+        def bootstrap(new_attributes = {})
+          server = create(new_attributes)
+          server.wait_for { ready? }
+          server
         end
 
         def get(machine_id)

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

@@ -38,7 +38,6 @@ module Fog
         attr_accessor :network_interface_type ,:network_nat_network, :network_bridge_name
         attr_accessor :volume_format_type, :volume_allocation,:volume_capacity, :volume_name, :volume_pool_name, :volume_template_name, :volume_path
         attr_accessor :password
-        attr_writer   :private_key, :private_key_path, :public_key, :public_key_path, :username
 
         # Can be created by passing in :xml => "<xml to create domain/server>"
         # or by providing :template_options => {
@@ -67,10 +66,6 @@ module Fog
           raise Fog::Errors::Error.new("Error saving the server: #{e}")
         end
 
-        def username
-          @username ||= 'root'
-        end
-
         def start
           return true if active?
           connection.vm_action(uuid, :create)
@@ -139,35 +134,14 @@ module Fog
           ip_address(:public)
         end
 
-        def private_key_path
-          @private_key_path ||= Fog.credentials[:private_key_path]
-          @private_key_path &&= File.expand_path(@private_key_path)
-        end
-
-        def private_key
-          @private_key ||= private_key_path && File.read(private_key_path)
-        end
-
-        def public_key_path
-          @public_key_path ||= Fog.credentials[:public_key_path]
-          @public_key_path &&= File.expand_path(@public_key_path)
-        end
-
-        def public_key
-          @public_key ||= public_key_path && File.read(public_key_path)
-        end
-
         def ssh(commands)
           requires :public_ip_address, :username
 
-          #requires :password, :private_key
           ssh_options={}
           ssh_options[:password] = password unless password.nil?
-          ssh_options[:key_data] = [private_key] if private_key
           ssh_options[:proxy]= ssh_proxy unless ssh_proxy.nil?
 
-          Fog::SSH.new(public_ip_address, @username, ssh_options).run(commands)
-
+          super(commands, ssh_options)
         end
 
         def ssh_proxy

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

@@ -5,7 +5,6 @@ module Fog
     class Linode
       class Server < Fog::Compute::Server
         attr_reader :stack_script
-        attr_accessor :private_key, :username
         identity :id
         attribute :name
         attribute :status

data/lib/fog/local/models/storage/directory.rb

@@ -40,7 +40,7 @@ module Fog
         def save
           requires :key
 
-          Dir.mkdir(path)
+          FileUtils.mkpath(path)
           true
         end
 

data/lib/fog/network.rb

@@ -0,0 +1,26 @@
+module Fog
+  module Network
+
+    def self.[](provider)
+      self.new(:provider => provider)
+    end
+
+    def self.new(attributes)
+      attributes = attributes.dup # Prevent delete from having side effects
+      provider = attributes.delete(:provider).to_s.downcase.to_sym
+
+      case provider
+      when :openstack
+        require 'fog/openstack/network'
+        Fog::Network::OpenStack.new(attributes)
+      else
+        raise ArgumentError.new("#{provider} has no network service")
+      end
+    end
+
+    def self.providers
+      Fog.services[:network]
+    end
+
+  end
+end

data/lib/fog/ninefold/compute.rb

@@ -60,6 +60,14 @@ module Fog
       request :create_ip_forwarding_rule
       request :delete_ip_forwarding_rule
       request :list_ip_forwarding_rules
+      # Load Balancers
+      request :create_load_balancer_rule
+      request :delete_load_balancer_rule
+      request :remove_from_load_balancer_rule
+      request :assign_to_load_balancer_rule
+      request :list_load_balancer_rules
+      request :list_load_balancer_rule_instances
+      request :update_load_balancer_rule
 
       class Mock
 

data/lib/fog/ninefold/requests/compute/assign_to_load_balancer_rule.rb

@@ -0,0 +1,13 @@
+module Fog
+  module Compute
+    class Ninefold
+      class Real
+        def assign_to_load_balancer_rule(options={})
+          request 'assignToLoadBalancerRule', options, :expects => [200], :response_prefix => 'assigntoloadbalancerruleresponse', :response_type => Hash
+        end
+      end
+    end
+  end
+end
+
+

data/lib/fog/ninefold/requests/compute/create_load_balancer_rule.rb

@@ -0,0 +1,11 @@
+module Fog
+  module Compute
+    class Ninefold
+      class Real
+        def create_load_balancer_rule(options={})
+          request 'createLoadBalancerRule', options, :expects => [200], :response_prefix => 'createloadbalancerruleresponse', :response_type => Hash
+        end
+      end
+    end
+  end
+end

data/lib/fog/ninefold/requests/compute/delete_load_balancer_rule.rb

@@ -0,0 +1,11 @@
+module Fog
+  module Compute
+    class Ninefold
+      class Real
+        def delete_load_balancer_rule(options={})
+          request 'deleteLoadBalancerRule', options, :expects => [200], :response_prefix => 'deleteloadbalancerruleresponse', :response_type => Hash
+        end
+      end
+    end
+  end
+end

data/lib/fog/ninefold/requests/compute/list_load_balancer_rule_instances.rb

@@ -0,0 +1,15 @@
+module Fog
+  module Compute
+    class Ninefold
+      class Real
+        def list_load_balancer_rule_instances(options={})
+          request 'listLoadBalancerRuleInstances', options, :expects => [200], :response_prefix => 'listloadbalancerruleinstancesresponse', :response_type => Hash
+        end
+      end
+    end
+  end
+end
+
+
+
+

data/lib/fog/ninefold/requests/compute/list_load_balancer_rules.rb

@@ -0,0 +1,14 @@
+module Fog
+  module Compute
+    class Ninefold
+      class Real
+        def list_load_balancer_rules(options={})
+          request 'listLoadBalancerRules', options, :expects => [200], :response_prefix => 'listloadbalancerrulesresponse', :response_type => Hash
+        end
+      end
+    end
+  end
+end
+
+
+

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

@@ -0,0 +1,12 @@
+module Fog
+  module Compute
+    class Ninefold
+      class Real
+        def remove_from_load_balancer_rule(options={})
+          request 'removeFromLoadBalancerRule', options, :expects => [200], :response_prefix => 'removefromloadbalancerruleresponse', :response_type => Hash
+        end
+      end
+    end
+  end
+end
+

data/lib/fog/ninefold/requests/compute/update_load_balancer_rule.rb

@@ -0,0 +1,15 @@
+module Fog
+  module Compute
+    class Ninefold
+      class Real
+        def update_load_balancer_rule(options={})
+          request 'updateLoadBalancerRule', options, :expects => [200], :response_prefix => 'updateloadbalancerruleresponse', :response_type => Hash
+        end
+      end
+    end
+  end
+end
+
+
+
+

data/lib/fog/ninefold/storage.rb

@@ -1,34 +1,28 @@
 require 'fog/ninefold'
 require 'fog/storage'
+require 'fog/atmos'
 
 module Fog
   module Storage
-    class Ninefold < Fog::Service
+    class Ninefold < Fog::Storage::Atmos
       STORAGE_HOST = "onlinestorage.ninefold.com" #"api.ninefold.com"
       STORAGE_PATH = "" #"/storage/v1.0"
       STORAGE_PORT = "80" # "443"
       STORAGE_SCHEME = "http" # "https"
 
       requires :ninefold_storage_token, :ninefold_storage_secret
+      recognizes :persistent
 
-      model_path 'fog/ninefold/models/storage'
+      model_path 'fog/atmos/models/storage'
       model       :directory
       collection  :directories
       model       :file
       collection  :files
 
-      request_path 'fog/ninefold/requests/storage'
-      # request :delete_container
-      request :get_namespace
-      request :head_namespace
-      request :post_namespace
-      request :put_namespace
-      request :delete_namespace
-
       module Utils
       end
 
-      class Mock
+      class Mock < Fog::Storage::Atmos::Mock
         include Utils
 
         def initialize(options={})
@@ -43,111 +37,19 @@ module Fog
 
       end
 
-      class Real
+      class Real < Fog::Storage::Atmos::Real
         include Utils
 
         def initialize(options={})
-          require 'mime/types'
-          @ninefold_storage_token = options[:ninefold_storage_token]
-          @ninefold_storage_secret = options[:ninefold_storage_secret]
-          @ninefold_storage_secret_decoded = Base64.decode64( @ninefold_storage_secret )
-
-          @connection_options = options[:connection_options] || {}
-          @hmac               = Fog::HMAC.new('sha1', @ninefold_storage_secret_decoded)
-          @persistent = options.fetch(:persistent, true)
-
-          @connection = Fog::Connection.new("#{Fog::Storage::Ninefold::STORAGE_SCHEME}://#{Fog::Storage::Ninefold::STORAGE_HOST}:#{Fog::Storage::Ninefold::STORAGE_PORT}", @persistent, @connection_options)
-        end
-
-        def uid
-          @ninefold_storage_token#.split('/')[-1]
-        end
-
-        def sign(string)
-          value = @hmac.sign(string)
-          Base64.encode64( value ).chomp()
-        end
-
-        def reload
-          @connection.reset
+          endpoint = "#{STORAGE_SCHEME}://"\
+                     "#{STORAGE_HOST}:"\
+                     "#{STORAGE_PORT}"\
+                     "#{STORAGE_PATH}"
+          options[:atmos_storage_endpoint] = endpoint
+          options[:atmos_storage_token] = options[:ninefold_storage_token]
+          options[:atmos_storage_secret] = options[:ninefold_storage_secret]
+          super(options)
         end
-
-        def request(params, &block)
-          req_path = params[:path]
-          # Force set host and port
-          params.merge!({
-                          :host     => Fog::Storage::Ninefold::STORAGE_HOST,
-                          :path     => "#{Fog::Storage::Ninefold::STORAGE_PATH}/rest/#{params[:path]}",
-                        })
-          # Set default method and headers
-          params = {:method => 'GET', :headers => {}}.merge params
-
-          params[:headers]["Content-Type"] ||= "application/octet-stream"
-
-          # Add request date
-          params[:headers]["date"] = Time.now().httpdate()
-          params[:headers]["x-emc-uid"] = @ninefold_storage_token
-
-          # Build signature string
-          signstring = ""
-          signstring += params[:method]
-          signstring += "\n"
-          signstring += params[:headers]["Content-Type"]
-          signstring += "\n"
-          if( params[:headers]["range"] )
-            signstring += params[:headers]["range"]
-          end
-          signstring += "\n"
-          signstring += params[:headers]["date"]
-          signstring += "\n"
-
-          signstring += "/rest/" + URI.unescape( req_path ).downcase
-          query_str = params[:query].map{|k,v| "#{k}=#{v}"}.join('&')
-          signstring += '?' + query_str unless query_str.empty?
-          signstring += "\n"
-
-          customheaders = {}
-          params[:headers].each { |key,value|
-            case key
-            when 'x-emc-date', 'x-emc-signature'
-              #skip
-            when /^x-emc-/
-              customheaders[ key.downcase ] = value
-            end
-          }
-          header_arr = customheaders.sort()
-
-          header_arr.each { |key,value|
-            # Values are lowercase and whitespace-normalized
-            signstring += key + ":" + value.strip.chomp.squeeze( " " ) + "\n"
-          }
-
-          digest = @hmac.sign(signstring.chomp())
-          signature = Base64.encode64( digest ).chomp()
-          params[:headers]["x-emc-signature"] = signature
-
-          begin
-            response = @connection.request(params, &block)
-          rescue Excon::Errors::HTTPStatusError => error
-            raise case error
-            when Excon::Errors::NotFound
-              Fog::Storage::Ninefold::NotFound.slurp(error)
-            else
-              error
-            end
-          end
-          unless response.body.empty?
-            if params[:parse]
-              document = Fog::ToHashDocument.new
-              parser = Nokogiri::XML::SAX::PushParser.new(document)
-              parser << response.body
-              parser.finish
-              response.body = document.body
-            end
-          end
-          response
-        end
-
       end
     end
   end