fog 0.7.2 → 0.8.0

data/lib/fog/compute/requests/aws/describe_instances.rb

@@ -55,7 +55,12 @@ module Fog
             Formatador.display_line("[yellow][WARN] describe_instances with #{filters.class} param is deprecated, use describe_instances('instance-id' => []) instead[/] [light_black](#{caller.first})[/]")
             filters = {'instance-id' => [*filters]}
           end
-          params = AWS.indexed_filters(filters)
+          params = {}
+          # when seeking single instance id, old param style is most up to date
+          if filters['instance-id'] && !filters['instance-id'].is_a?(Array)
+            params.merge('InstanceId' => filters.delete('instance-id'))
+          end
+          params.merge!(AWS.indexed_filters(filters))
 
           request({
             'Action'    => 'DescribeInstances',

data/lib/fog/compute/requests/storm_on_demand/add_balancer_node.rb

@@ -0,0 +1,16 @@
+module Fog
+  module StormOnDemand
+    class Compute
+      class Real
+
+        def add_balancer_node(options = {})
+          request(
+            :path     => "/network/loadbalancer/addnode",
+            :body     => {:params => options}.to_json
+          )
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/compute/requests/storm_on_demand/clone_server.rb

@@ -0,0 +1,16 @@
+module Fog
+  module StormOnDemand
+    class Compute
+      class Real
+
+        def clone_server(options = {})
+          request(
+            :path     => "/storm/server/clone",
+            :body     => {:params => options}.to_json
+          )
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/compute/requests/storm_on_demand/create_server.rb

@@ -0,0 +1,16 @@
+module Fog
+  module StormOnDemand
+    class Compute
+      class Real
+
+        def create_server(options = {})
+          request(
+            :path     => "/storm/server/create",
+            :body     => {:params => options}.to_json
+          )
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/compute/requests/storm_on_demand/delete_server.rb

@@ -0,0 +1,16 @@
+module Fog
+  module StormOnDemand
+    class Compute
+      class Real
+
+        def delete_server(options = {})
+          request(
+            :path     => "/storm/server/destroy",
+            :body     => {:params => options}.to_json
+          )
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/compute/requests/storm_on_demand/get_server.rb

@@ -0,0 +1,16 @@
+module Fog
+  module StormOnDemand
+    class Compute
+      class Real
+
+        def get_server(options = {})
+          request(
+            :path     => "/storm/server/details",
+            :body     => {:params => options}.to_json
+          )
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/compute/requests/storm_on_demand/get_stats.rb

@@ -0,0 +1,16 @@
+module Fog
+  module StormOnDemand
+    class Compute
+      class Real
+
+        def get_stats(options = {})
+          request(
+            :path     => "/monitoring/load/stats",
+            :body     => {:params => options}.to_json
+          )
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/compute/requests/storm_on_demand/list_balancers.rb

@@ -0,0 +1,16 @@
+module Fog
+  module StormOnDemand
+    class Compute
+      class Real
+
+        def list_balancers(options = {})
+          request(
+            :path     => "/network/loadbalancer/list",
+            :body     => options.to_json
+          )
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/compute/requests/storm_on_demand/list_configs.rb

@@ -0,0 +1,16 @@
+module Fog
+  module StormOnDemand
+    class Compute
+      class Real
+
+        def list_configs(options = {})
+          request(
+            :path     => "/storm/config/list",
+            :body     => options.to_json
+          )
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/compute/requests/storm_on_demand/list_images.rb

@@ -0,0 +1,16 @@
+module Fog
+  module StormOnDemand
+    class Compute
+      class Real
+
+        def list_images(options = {})
+          request(
+            :path     => "/server/image/list",
+            :body     => options.to_json
+          )
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/compute/requests/storm_on_demand/list_private_ips.rb

@@ -0,0 +1,16 @@
+module Fog
+  module StormOnDemand
+    class Compute
+      class Real
+
+        def list_private_ips(options = {})
+          request(
+            :path     => "/network/private/get",
+            :body     => options.to_json
+          )
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module Fog
+  module StormOnDemand
+    class Compute
+      class Real
+
+        def list_servers(options = {})
+          request(
+            :path     => "/storm/server/list",
+            :body     => options.to_json
+          )
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/compute/requests/storm_on_demand/list_templates.rb

@@ -0,0 +1,16 @@
+module Fog
+  module StormOnDemand
+    class Compute
+      class Real
+
+        def list_templates(options = {})
+          request(
+            :path     => "/server/template/list",
+            :body     => options.to_json
+          )
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module Fog
+  module StormOnDemand
+    class Compute
+      class Real
+
+        def reboot_server(options = {})
+          request(
+            :path     => "/storm/server/reboot",
+            :body     => {:params => options}.to_json
+          )
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/compute/requests/storm_on_demand/remove_balancer_node.rb

@@ -0,0 +1,16 @@
+module Fog
+  module StormOnDemand
+    class Compute
+      class Real
+
+        def remove_balancer_node(options = {})
+          request(
+            :path     => "/network/loadbalancer/removenode",
+            :body     => {:params => options}.to_json
+          )
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/compute/requests/storm_on_demand/resize_server.rb

@@ -0,0 +1,16 @@
+module Fog
+  module StormOnDemand
+    class Compute
+      class Real
+
+        def resize_server(options = {})
+          request(
+            :path     => "/storm/server/resize",
+            :body     => {:params => options}.to_json
+          )
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/compute/requests/voxel/images_list.rb

@@ -16,10 +16,10 @@ module Fog
             options[:image_id] = image_id
           end
 
-          data = request("voxel.images.list", options).body
+          data = request("voxel.images.list", options)
 
-          if data['stat'] == "ok"
-            data['images']
+          if data.body['stat'] == "ok"
+            data
           else
             raise Fog::Voxel::Compute::NotFound
           end

data/lib/fog/compute/storm_on_demand.rb

@@ -0,0 +1,122 @@
+module Fog
+  module StormOnDemand
+    class Compute < Fog::Service
+      
+      API_URL = 'https://api.stormondemand.com'
+      
+      requires :storm_on_demand_username, :storm_on_demand_password
+      recognizes :storm_on_demand_auth_url
+      recognizes :provider # remove post deprecation
+
+      model_path 'fog/compute/models/storm_on_demand'
+      model       :config
+      collection  :configs
+      model       :image
+      collection  :images
+      model       :server
+      collection  :servers
+      model       :balancer
+      collection  :balancers
+      model       :private_ip
+      collection  :private_ips
+      model       :stat
+      collection  :stats
+      model       :template
+      collection  :templates
+
+      request_path 'fog/compute/requests/storm_on_demand'
+      request :clone_server
+      request :delete_server
+      request :reboot_server
+      request :list_servers
+      request :get_server
+      request :create_server
+      request :resize_server
+      request :remove_balancer_node
+      request :add_balancer_node
+      request :list_balancers
+      request :list_configs
+      request :list_templates
+      request :list_images
+      request :get_stats
+      request :list_private_ips      
+      
+      class Mock
+
+        def self.data
+          @data ||= Hash.new do |hash, key|
+            hash[key] = {
+              :last_modified => {
+                :images  => {},
+                :servers => {}
+              },
+              :images  => {},
+              :servers => {}
+            }
+          end
+        end
+
+        def self.reset_data(keys=data.keys)
+          for key in [*keys]
+            data.delete(key)
+          end
+        end
+
+        def initialize(options={})
+          @storm_on_demand_username = options[:storm_on_demand_username]
+          @data = self.class.data[@storm_on_demand_username]
+        end
+
+      end
+
+      class Real
+
+        def initialize(options={})
+          require 'json'
+          uri = URI.parse(options[:storm_on_demand_auth_url] ||= API_URL)
+          @host   = uri.host
+          @path   = uri.path
+          @port   = uri.port
+          @scheme = uri.scheme
+          @storm_on_demand_username = options[:storm_on_demand_username]
+          @storm_on_demand_password = options[:storm_on_demand_password]
+          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}")
+        end
+
+        def reload
+          @connection.reset
+        end
+
+        def request(params)
+          begin
+            response = @connection.request(params.merge!({
+              :headers  => {
+                'Content-Type' => 'application/json',
+                'Authorization' => 'Basic ' << Base64.encode64("#{@storm_on_demand_username}:#{@storm_on_demand_password}").chomp
+              }.merge!(params[:headers] || {}),
+              :host     => @host,
+              :path     => "#{@path}/#{params[:path]}",
+              :expects  => 200,
+              :method   => :post
+            }))
+          rescue Excon::Errors::HTTPStatusError => error
+            raise case error
+            when Excon::Errors::NotFound
+              Fog::StormOnDemand::Compute::NotFound.slurp(error)
+            else
+              error
+            end
+          end
+          unless response.body.empty?
+            response.body = JSON.parse(response.body)
+          end
+          if response.body.keys.include?('full_error')
+            raise(Fog::StormOnDemand::Compute::Error, response.body.inspect)
+          end
+          response
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/core/attributes.rb

@@ -121,6 +121,12 @@ module Fog
         @attributes ||= {}
       end
 
+      def dup
+        copy = super
+        copy.dup_attributes!
+        copy
+      end
+
       def identity
         send(self.class.instance_variable_get('@identity'))
       end
@@ -165,6 +171,12 @@ module Fog
         end
       end
 
+      protected
+
+      def dup_attributes!
+        @attributes = @attributes.dup
+      end
+
       private
 
       def remap_attributes(attributes, mapping)