fog 1.11.1 → 1.12.0

data/lib/fog/riakcs/requests/usage/get_usage.rb

@@ -37,7 +37,7 @@ module Fog
           response = @connection.get_object('riak-cs', ["usage", request_uri(access_key_id, options)].join("/"))
 
           if !response.body.empty?
-            response.body = Fog::JSON.decode(response.body)
+            response.body = MultiJson.decode(response.body)
           end
           response
         end

data/lib/fog/riakcs/usage.rb

@@ -42,6 +42,7 @@ module Fog
 
         def initialize(options = {})
           require 'mime/types'
+          require 'multi_json'
 
           configure_uri_options(options)
           @riakcs_access_key_id     = options[:riakcs_access_key_id]

data/lib/fog/serverlove/compute.rb

@@ -1,15 +1,15 @@
 module Fog
   module Compute
     class Serverlove < Fog::Service
-      
+
       API_HOST = "api.z1-man.serverlove.com"
-      
+
       requires :serverlove_uuid, :serverlove_api_key
-      
+
       recognizes :serverlove_api_url
-      
+
       request_path 'fog/serverlove/requests/compute'
-      
+
       # Image
       request :get_image
       request :get_images
@@ -28,54 +28,57 @@ module Fog
       request :stop_server
       request :shutdown_server
       request :reset_server
-      
+
       model_path 'fog/serverlove/models/compute'
-      
+
       model       :image
       collection  :images
-      
+
       model       :server
       collection  :servers
 
       class Mock
-        
+
         def initialize(options)
           @serverlove_uuid = options[:serverlove_uuid] || Fog.credentials[:serverlove_uuid]
           @serverlove_api_key = options[:serverlove_api_key] || Fog.credentials[:serverlove_api_key]
         end
-        
+
         def request(options)
           raise "Not implemented"
         end
-        
+
       end
-      
+
       class Real
-        
+
         def initialize(options)
           @api_uuid = options[:serverlove_uuid] || Fog.credentials[:serverlove_uuid]
           @api_key = options[:serverlove_api_key] || Fog.credentials[:serverlove_api_key]
           @api_host = options[:serverlove_api_url] || Fog.credentials[:serverlove_api_url] || API_HOST
-          
+
           @connection = Fog::Connection.new("https://#{@api_uuid}:#{@api_key}@#{@api_host}")
         end
-        
+
         def request(params)
           params = params.merge!(
             :headers => {
               "Accept" => "application/json"
             }
           )
-          params[:body] = encode_pairs(params[:options]) unless params[:options].nil?
+          unless params[:options].nil?
+            params[:body] = encode_pairs(params[:options])
+            params.delete(:options)
+          end
           response = @connection.request(params)
-          
+
           raise_if_error!(response)
-          
+
           response.body = Fog::JSON.decode(response.body) if response.body && response.body.length > 0
-          
+
           response
         end
-        
+
         def encode_pairs(params)
           params.keys.collect do |key|
             "#{key} #{params[key]}"
@@ -85,13 +88,13 @@ module Fog
         # TODO
         def raise_if_error!(response)
           case response.status
-          when 400 then 
+          when 400 then
             raise 'omg'
           end
         end
-        
+
       end
-            
+
     end
   end
 end

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

@@ -35,7 +35,7 @@ module Fog
           else
             requires :name
             requires :cpu
-            attributes = service.create_server(self.defaults.merge(allowed_attributes)).body
+            attributes = service.create_server(self.class.defaults.merge(allowed_attributes)).body
           end
 
           merge_attributes(attributes)

data/lib/fog/storage.rb

@@ -11,6 +11,9 @@ module Fog
       when :internetarchive
         require 'fog/internet_archive/storage'
         Fog::Storage::InternetArchive.new(attributes)
+      when :stormondemand
+        require 'fog/storm_on_demand/storage'
+        Fog::Storage::StormOnDemand.new(attributes)
       else
         if self.providers.include?(provider)
           require "fog/#{provider}/storage"

data/lib/fog/storm_on_demand.rb

@@ -6,7 +6,15 @@ module Fog
     extend Fog::Provider
 
     service(:compute, 'storm_on_demand/compute', 'Compute')
-
+    service(:network, 'storm_on_demand/network', 'Network')
+    service(:storage, 'storm_on_demand/storage', 'Storage')
+    service(:dns, 'storm_on_demand/dns', 'DNS')
+    service(:billing, 'storm_on_demand/billing', 'Billing')
+    service(:monitoring, 'storm_on_demand/monitoring', 'Monitoring')
+    service(:support, 'storm_on_demand/support', 'Support')
+    service(:account, 'storm_on_demand/account', 'Account')
+    service(:vpn, 'storm_on_demand/vpn', 'VPN')
+    
   end
 end
 

data/lib/fog/storm_on_demand/README.md

@@ -0,0 +1,49 @@
+# StormOnDemand services examples
+
+This storm_on_demand directory provides code for all storm on demand cloud APIs. All of the APIs are seperated into Compute, Network, Storage, DNS, Monitoring, Account, Billing, Support and Billing services.
+
+
+## Use a service
+Before using APIs of a service, you need to create a service object first. Take Compute for instance:
+
+		c = Fog::Compute.new :provider => :stormondemand,
+							 :storm_on_demand_username => 'username', 
+							 :storm_on_demand_password => 'password'
+Now, you can call API methods for Compute service. For instance:
+
+		c.servers.all
+this will list all servers for the current account.
+
+## Call an API method
+According to Fog, a high level interface is provided through collections, such as images and servers. Each collection has a corresponding model, such as image and server.
+
+APIs like create, list or details reside in the collections. For instance:
+
+		server = c.servers.create :config_id => conf.id,
+								  :template => tpl.name,
+								  :domain => 'example.com',
+								  :password => 'rootpassword'
+Other APIs for specific cloud object will reside in a model. For instance:
+
+		server.reboot :force => 1
+
+All APIs' parameters are the same with the [Storm On Demand API Doc](https://www.stormondemand.com/api/docs/v1/).
+
+#### (p.s. In order to conform to Fog's CRUD operations, some API methods are changed. For instance, 'list' methods are now 'all', 'details' methods are now 'get')
+
+
+## Use a Token
+If you want to use a token instead of password for API calls, instead of creating a new service like Compute, you should create a new Account first and get the token. Then create a new Compute/Network/Storage with the token.
+
+		account = Fog::Account.new :provider => :stormondemand,
+								   :storm_on_demand_username => 'username', 
+							       :storm_on_demand_password => 'password'
+		# create a new token
+		token = account.tokens.create
+		# use the token instead of a password
+		net = Fog::Network.new :provider => :stormondemand,
+							   :storm_on_demand_username = 'username',
+							   :storm_on_demand_password = token.token
+		
+		# if you want to expire the token
+		token.expire

data/lib/fog/storm_on_demand/account.rb

@@ -0,0 +1,58 @@
+require 'fog/storm_on_demand'
+require 'fog/storm_on_demand/shared'
+require 'fog/account'
+
+module Fog
+  module Account
+
+    class StormOnDemand < Fog::Service
+
+      requires :storm_on_demand_username, :storm_on_demand_password
+      recognizes :storm_on_demand_auth_url
+
+      model_path 'fog/storm_on_demand/models/account'
+      model      :token
+      collection :tokens
+
+      request_path 'fog/storm_on_demand/requests/account'
+      request :create_token
+      request :expire_token
+
+      class Mock
+
+        def self.data
+          @data ||= Hash.new
+        end
+
+        def self.reset
+          @data = nil
+        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]
+        end
+
+        def data
+          self.class.data[@storm_on_demand_username]
+        end
+
+        def reset_data
+          self.class.data.delete(@storm_on_demand_username)
+        end
+
+      end
+
+      class Real
+
+        include Fog::StormOnDemand::RealShared
+
+      end
+    end
+  end
+end

data/lib/fog/storm_on_demand/billing.rb

@@ -0,0 +1,61 @@
+require 'fog/billing'
+require 'fog/storm_on_demand'
+require 'fog/storm_on_demand/shared'
+
+module Fog
+  module Billing
+    class StormOnDemand < Fog::Service
+
+      requires :storm_on_demand_username, :storm_on_demand_password
+      recognizes :storm_on_demand_auth_url
+
+      model_path 'fog/storm_on_demand/models/billing'
+      model      :invoice
+      collection :invoices
+      model      :payment
+      collection :payments
+
+      request_path 'fog/storm_on_demand/requests/billing'
+      request :list_invoices
+      request :get_invoice
+      request :next_invoice
+      request :make_payment
+
+      class Mock
+
+        def self.data
+          @data ||= Hash.new
+        end
+
+        def self.reset
+          @data = nil
+        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]
+        end
+
+        def data
+          self.class.data[@storm_on_demand_username]
+        end
+
+        def reset_data
+          self.class.data.delete(@storm_on_demand_username)
+        end
+
+      end
+
+      class Real
+
+        include Fog::StormOnDemand::RealShared
+
+      end
+    end
+  end
+end

data/lib/fog/storm_on_demand/compute.rb

@@ -1,12 +1,11 @@
 require 'fog/storm_on_demand'
 require 'fog/compute'
+require 'fog/storm_on_demand/shared'
 
 module Fog
   module Compute
     class StormOnDemand < Fog::Service
 
-      API_URL = 'https://api.stormondemand.com'
-
       requires :storm_on_demand_username, :storm_on_demand_password
       recognizes :storm_on_demand_auth_url
 
@@ -17,14 +16,12 @@ module Fog
       collection  :images
       model       :server
       collection  :servers
-      model       :balancer
-      collection  :balancers
-      model       :private_ip
-      collection  :private_ips
-      model       :stat
-      collection  :stats
       model       :template
       collection  :templates
+      model       :product
+      collection  :products
+      model       :notification
+      collection  :notifications
 
       request_path 'fog/storm_on_demand/requests/compute'
       request :clone_server
@@ -34,14 +31,36 @@ module Fog
       request :get_server
       request :create_server
       request :resize_server
-      request :remove_balancer_node
-      request :add_balancer_node
-      request :list_balancers
+      request :server_history
+      request :shutdown_server
+      request :start_server
+      request :server_status
+      request :update_server
+
       request :list_configs
+      request :get_config_details
+
       request :list_templates
+      request :get_template_details
+      request :restore_template
+
       request :list_images
-      request :get_stats
-      request :list_private_ips      
+      request :create_image
+      request :delete_image
+      request :get_image_details
+      request :update_image
+      request :restore_image
+
+      request :get_product
+      request :get_product_code
+      request :list_products
+      request :get_product_price
+      request :get_product_starting_price
+
+      request :list_notifications
+      request :current_notifications
+      request :get_notification
+      request :resolve_notification
       
       class Mock
 
@@ -84,51 +103,7 @@ module Fog
 
       class Real
 
-        def initialize(options={})
-          uri = URI.parse(options[:storm_on_demand_auth_url] ||= API_URL)
-          @connection_options = options[:connection_options] || {}
-          @host       = uri.host
-          @path       = uri.path
-          @persistent = options[:persistent] || false
-          @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}", @persistent, @connection_options)
-        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 = Fog::JSON.decode(response.body)
-          end
-          if response.body.has_key?('full_error')
-            raise(Fog::Compute::StormOnDemand::Error, response.body.inspect)
-          end
-          response
-        end
+        include Fog::StormOnDemand::RealShared
 
       end
     end