fog-maestrodev 1.19.0.20140212012611 → 1.20.0.20140305101305

data/lib/fog/aws/requests/storage/upload_part.rb

@@ -36,6 +36,24 @@ module Fog
         end
 
       end # Real
+
+      class Mock # :nodoc:all
+        require 'fog/aws/requests/storage/shared_mock_methods'
+        include Fog::Storage::AWS::SharedMockMethods
+
+        def upload_part(bucket_name, object_name, upload_id, part_number, data, options = {})
+          data = parse_mock_data(data)
+          verify_mock_bucket_exists(bucket_name)
+          upload_info = get_upload_info(bucket_name, upload_id)
+          upload_info[:parts][part_number] = data[:body]
+
+          response = Excon::Response.new
+          response.status = 200
+          # just use the part number as the ETag, for simplicity
+          response.headers["ETag"] = part_number.to_s
+          response
+        end
+      end # Mock
     end # Storage
   end # AWS
 end # Fog

data/lib/fog/aws/ses.rb

@@ -1,4 +1,4 @@
-require 'fog/aws'
+require 'fog/aws/core'
 
 module Fog
   module AWS

data/lib/fog/aws/simpledb.rb

@@ -1,4 +1,4 @@
-require 'fog/aws'
+require 'fog/aws/core'
 
 module Fog
   module AWS

data/lib/fog/aws/sns.rb

@@ -1,4 +1,4 @@
-require 'fog/aws'
+require 'fog/aws/core'
 
 module Fog
   module AWS
@@ -102,7 +102,6 @@ module Fog
             :expects    => 200,
             :idempotent => idempotent,
             :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
-            :host       => @host,
             :method     => 'POST',
             :parser     => parser
           })

data/lib/fog/aws/sqs.rb

@@ -1,10 +1,10 @@
-require 'fog/aws'
+require 'fog/aws/core'
 
 module Fog
   module AWS
     class SQS < Fog::Service
       extend Fog::AWS::CredentialFetcher::ServiceMethods
-
+      
       requires :aws_access_key_id, :aws_secret_access_key
       recognizes :region, :host, :path, :port, :scheme, :persistent, :aws_session_token, :use_iam_profile, :aws_credentials_expire_at
 
@@ -30,7 +30,7 @@ module Fog
             end
           end
         end
-
+        
         def self.reset
           @data = nil
         end
@@ -123,7 +123,9 @@ module Fog
               :aws_access_key_id  => @aws_access_key_id,
               :aws_session_token  => @aws_session_token,
               :hmac               => @hmac,
+              :host               => @host,
               :path               => path || @path,
+              :port               => @port,
               :version            => '2009-02-01'
             }
           )
@@ -133,7 +135,6 @@ module Fog
             :expects    => 200,
             :idempotent => idempotent,
             :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
-            :host       => @host,
             :method     => 'POST',
             :parser     => parser
           }

data/lib/fog/aws/storage.rb

@@ -1,4 +1,4 @@
-require 'fog/aws'
+require 'fog/aws/core'
 require 'fog/storage'
 
 module Fog
@@ -349,7 +349,8 @@ module Fog
                 :cors => {
                   :bucket => {}
                 },
-                :bucket_tagging => {}
+                :bucket_tagging => {},
+                :multipart_uploads => {}
               }
             end
           end
@@ -362,9 +363,18 @@ module Fog
         def initialize(options={})
           @use_iam_profile = options[:use_iam_profile]
           setup_credentials(options)
-          @region = options[:region] || DEFAULT_REGION
-          @host   = options[:host]   || region_to_host(@region)
-          @scheme = options[:scheme] || DEFAULT_SCHEME
+          if @endpoint = options[:endpoint]
+            endpoint = URI.parse(@endpoint)
+            @host = endpoint.host
+            @scheme = endpoint.scheme
+            @port = endpoint.port
+          else
+            @region     = options[:region]      || DEFAULT_REGION
+            @host       = options[:host]        || region_to_host(@region)
+            @scheme     = options[:scheme]      || DEFAULT_SCHEME
+            @port       = options[:port]        || DEFAULT_SCHEME_PORT[@scheme]
+          end
+          @path_style = options[:path_style] || false
         end
 
         def data

data/lib/fog/aws/sts.rb

@@ -1,4 +1,4 @@
-require 'fog/aws'
+require 'fog/aws/core'
 
 module Fog
   module AWS

data/lib/fog/bare_metal_cloud.rb

@@ -1,11 +1 @@
-require 'fog/core'
-
-module Fog
-  module BareMetalCloud
-
-    extend Fog::Provider
-
-    service(:compute, 'bare_metal_cloud/compute', 'Compute')
-
-  end
-end
+require 'fog/bare_metal_cloud/compute'

data/lib/fog/bare_metal_cloud/compute.rb

@@ -1,4 +1,4 @@
-require 'fog/bare_metal_cloud'
+require 'fog/bare_metal_cloud/core'
 require 'fog/compute'
 
 module Fog

data/lib/fog/bare_metal_cloud/core.rb

@@ -0,0 +1,11 @@
+require 'fog/core'
+
+module Fog
+  module BareMetalCloud
+
+    extend Fog::Provider
+
+    service(:compute, 'Compute')
+
+  end
+end

data/lib/fog/bin.rb

@@ -81,6 +81,7 @@ require 'fog/bin/local'
 require 'fog/bin/bare_metal_cloud'
 require 'fog/bin/ninefold'
 require 'fog/bin/rackspace'
+require 'fog/bin/rage4'
 require 'fog/bin/riakcs'
 require 'fog/bin/openstack'
 require 'fog/bin/ovirt'

data/lib/fog/bin/rage4.rb

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

data/lib/fog/bluebox.rb

@@ -1,13 +1,3 @@
-require 'fog/core'
-
-module Fog
-  module Bluebox
-
-    extend Fog::Provider
-
-    service(:blb,     'bluebox/blb',      'BLB')
-    service(:compute, 'bluebox/compute',  'Compute')
-    service(:dns,     'bluebox/dns',      'DNS')
-
-  end
-end
+require 'fog/bluebox/blb'
+require 'fog/bluebox/compute'
+require 'fog/bluebox/dns'

data/lib/fog/bluebox/blb.rb

@@ -1,4 +1,4 @@
-require 'fog/bluebox'
+require 'fog/bluebox/core'
 
 module Fog
   module Bluebox
@@ -64,7 +64,7 @@ module Fog
           })
 
           begin
-            response = @connection.request(params.merge!({:host => @host}))
+            response = @connection.request(params)
           rescue Excon::Errors::HTTPStatusError => error
             raise case error
             when Excon::Errors::NotFound

data/lib/fog/bluebox/compute.rb

@@ -1,4 +1,4 @@
-require 'fog/bluebox'
+require 'fog/bluebox/core'
 require 'fog/compute'
 
 module Fog

data/lib/fog/bluebox/core.rb

@@ -0,0 +1,13 @@
+require 'fog/core'
+
+module Fog
+  module Bluebox
+
+    extend Fog::Provider
+
+    service(:blb,     'BLB')
+    service(:compute, 'Compute')
+    service(:dns,     'DNS')
+
+  end
+end

data/lib/fog/bluebox/dns.rb

@@ -1,4 +1,4 @@
-require 'fog/bluebox'
+require 'fog/bluebox/core'
 require 'fog/dns'
 
 module Fog
@@ -79,7 +79,7 @@ module Fog
           end
 
           begin
-            response = @connection.request(params.merge!({:host => @host}))
+            response = @connection.request(params)
           rescue Excon::Errors::HTTPStatusError => error
             raise case error
             when Excon::Errors::NotFound

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

@@ -100,7 +100,7 @@ module Fog
 
         def setup(credentials = {})
           requires :identity, :ips, :public_key, :username
-          Fog::SSH.new(public_ip_address, username, credentials).run([
+          Fog::SSH.new(ssh_ip_address, username, credentials).run([
             %{mkdir .ssh},
             %{echo "#{public_key}" >> ~/.ssh/authorized_keys},
             %{passwd -l #{username}},

data/lib/fog/brightbox.rb

@@ -1,10 +1 @@
-require 'fog/core'
-
-module Fog
-  module Brightbox
-    extend Fog::Provider
-
-    service(:compute, 'brightbox/compute', 'Compute')
-
-  end
-end
+require 'fog/brightbox/compute'

data/lib/fog/brightbox/compute.rb

@@ -1,4 +1,4 @@
-require 'fog/brightbox'
+require 'fog/brightbox/core'
 require 'fog/compute'
 require 'fog/brightbox/compute/shared'
 require 'fog/brightbox/compute/image_selector'
@@ -48,6 +48,12 @@ module Fog
       model       :image
       collection  :load_balancers
       model       :load_balancer
+      collection  :database_servers
+      model       :database_server
+      collection  :database_snapshots
+      model       :database_snapshot
+      collection  :database_types
+      model       :database_type
       collection  :zones
       model       :zone
       collection  :cloud_ips
@@ -74,6 +80,7 @@ module Fog
       request :create_firewall_rule
       request :create_image
       request :create_load_balancer
+      request :create_database_server
       request :create_server
       request :create_server_group
       request :delete_api_client
@@ -84,6 +91,8 @@ module Fog
       request :delete_firewall_rule
       request :delete_image
       request :delete_load_balancer
+      request :delete_database_server
+      request :delete_database_snapshot
       request :delete_server
       request :delete_server_group
       request :delete_user_collaboration
@@ -98,6 +107,9 @@ module Fog
       request :get_image
       request :get_interface
       request :get_load_balancer
+      request :get_database_server
+      request :get_database_snapshot
+      request :get_database_type
       request :get_scoped_account
       request :get_server
       request :get_server_group
@@ -113,6 +125,9 @@ module Fog
       request :list_firewall_policies
       request :list_images
       request :list_load_balancers
+      request :list_database_servers
+      request :list_database_snapshots
+      request :list_database_types
       request :list_server_groups
       request :list_server_types
       request :list_servers
@@ -128,11 +143,13 @@ module Fog
       request :resend_collaboration
       request :reset_ftp_password_account
       request :reset_ftp_password_scoped_account
+      request :reset_password_database_server
       request :reset_secret_api_client
       request :reset_secret_application
       request :resend_collaboration
       request :reject_user_collaboration
       request :shutdown_server
+      request :snapshot_database_server
       request :snapshot_server
       request :start_server
       request :stop_server
@@ -145,6 +162,8 @@ module Fog
       request :update_firewall_rule
       request :update_image
       request :update_load_balancer
+      request :update_database_server
+      request :update_database_snapshot
       request :update_scoped_account
       request :update_server
       request :update_server_group

data/lib/fog/brightbox/core.rb

@@ -0,0 +1,10 @@
+require 'fog/core'
+
+module Fog
+  module Brightbox
+    extend Fog::Provider
+
+    service(:compute, 'Compute')
+
+  end
+end

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

@@ -23,6 +23,7 @@ module Fog
         attribute :server_id, :aliases => "server", :squash => "id"
         attribute :load_balancer, :alias => "load_balancer", :squash => "id"
         attribute :server_group, :alias => "server_group", :squash => "id"
+        attribute :database_server, :alias => "database_server", :squash => "id"
         attribute :port_translators
         attribute :name
 
@@ -56,6 +57,10 @@ module Fog
           service.destroy_cloud_ip(identity)
         end
 
+        def destination_id
+          server_id || load_balancer || server_group || database_server || interface_id
+        end
+
       end
 
     end

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

@@ -0,0 +1,91 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class Brightbox
+      class DatabaseServer < Fog::Model
+        identity :id
+        attribute :url
+        attribute :resource_type
+
+        attribute :name
+        attribute :description
+        attribute :state, :aliases => "status"
+
+        attribute :admin_username
+        attribute :admin_password
+
+        attribute :database_engine
+        attribute :database_version
+
+        attribute :created_at, :type => :time
+        attribute :updated_at, :type => :time
+        attribute :deleted_at, :type => :time
+
+        attribute :allow_access
+
+        attribute :flavor_id, "alias" => "database_server_type", :squash => "id"
+        attribute :snapshot_id
+        attribute :zone_id, "alias" => "zone", :squash => "id"
+
+        attribute :cloud_ips
+
+        def save
+          options = {
+            :name => name,
+            :description => description
+          }
+
+          options[:allow_access] = allow_access if allow_access
+
+          if persisted?
+            data = update_database_server(options)
+          else
+            options[:snapshot] = snapshot_id if snapshot_id
+            options[:engine] = database_engine if database_engine
+            options[:version] = database_version if database_version
+            options[:database_type] = flavor_id if flavor_id
+            options[:zone] = zone_id if zone_id
+
+            data = create_database_server(options)
+          end
+
+          merge_attributes(data)
+          true
+        end
+
+        def ready?
+          state == "active"
+        end
+
+        def snapshot
+          requires :identity
+          merge_attributes(service.snapshot_database_server(identity))
+          true
+        end
+
+        def destroy
+          requires :identity
+          merge_attributes(service.destroy_database_server(identity))
+          true
+        end
+
+        def reset_password
+          requires :identity
+          merge_attributes(service.reset_password_database_server(identity))
+          true
+        end
+
+        private
+
+        def create_database_server(options)
+          service.create_database_server(options)
+        end
+
+        def update_database_server(options)
+          service.update_database_server(identity, options)
+        end
+      end
+    end
+  end
+end