fog 0.8.2 → 0.9.0

data/lib/fog/compute/models/virtual_box/medium.rb

@@ -2,8 +2,8 @@ require 'fog/core/model'
 require 'fog/compute/models/virtual_box/medium_format'
 
 module Fog
-  module VirtualBox
-    class Compute
+  module Compute
+    class VirtualBox
 
       class Medium < Fog::Model
 
@@ -38,7 +38,7 @@ module Fog
 
         undef_method :medium_format
         def medium_format
-          Fog::VirtualBox::Compute::MediumFormat.new(
+          Fog::Compute::VirtualBox::MediumFormat.new(
             :connection => connection,
             :raw        => raw.medium_format
           )

data/lib/fog/compute/models/virtual_box/medium_format.rb

@@ -1,8 +1,8 @@
 require 'fog/core/model'
 
 module Fog
-  module VirtualBox
-    class Compute
+  module Compute
+    class VirtualBox
 
       class MediumFormat < Fog::Model
 

data/lib/fog/compute/models/virtual_box/mediums.rb

@@ -2,12 +2,12 @@ require 'fog/core/collection'
 require 'fog/compute/models/virtual_box/medium'
 
 module Fog
-  module VirtualBox
-    class Compute
+  module Compute
+    class VirtualBox
 
       class Mediums < Fog::Collection
 
-        model Fog::VirtualBox::Compute::Medium
+        model Fog::Compute::VirtualBox::Medium
 
         def all
           data = []

data/lib/fog/compute/models/virtual_box/nat_engine.rb

@@ -1,8 +1,8 @@
 require 'fog/core/model'
 
 module Fog
-  module VirtualBox
-    class Compute
+  module Compute
+    class VirtualBox
 
       class NATEngine < Fog::Model
 
@@ -35,7 +35,7 @@ module Fog
 
         undef_method :redirects
         def redirects
-          Fog::VirtualBox::Compute::NATRedirects.new(
+          Fog::Compute::VirtualBox::NATRedirects.new(
             :connection => connection,
             :machine    => machine,
             :nat_engine => self

data/lib/fog/compute/models/virtual_box/nat_redirect.rb

@@ -1,8 +1,8 @@
 require 'fog/core/model'
 
 module Fog
-  module VirtualBox
-    class Compute
+  module Compute
+    class VirtualBox
 
       class NATRedirect < Fog::Model
 

data/lib/fog/compute/models/virtual_box/nat_redirects.rb

@@ -2,12 +2,12 @@ require 'fog/core/collection'
 require 'fog/compute/models/virtual_box/nat_redirect'
 
 module Fog
-  module VirtualBox
-    class Compute
+  module Compute
+    class VirtualBox
 
       class NATRedirects < Fog::Collection
 
-        model Fog::VirtualBox::Compute::NATRedirect
+        model Fog::Compute::VirtualBox::NATRedirect
 
         attr_accessor :machine, :nat_engine
 

data/lib/fog/compute/models/virtual_box/network_adapter.rb

@@ -2,8 +2,8 @@ require 'fog/core/model'
 require 'fog/compute/models/virtual_box/nat_engine'
 
 module Fog
-  module VirtualBox
-    class Compute
+  module Compute
+    class VirtualBox
 
       class NetworkAdapter < Fog::Model
 
@@ -40,7 +40,7 @@ module Fog
 
         undef_method :nat_driver
         def nat_driver
-          Fog::VirtualBox::Compute::NATEngine.new(
+          Fog::Compute::VirtualBox::NATEngine.new(
             :connection       => connection,
             :machine          => machine,
             :network_adapter  => self,

data/lib/fog/compute/models/virtual_box/network_adapters.rb

@@ -2,12 +2,12 @@ require 'fog/core/collection'
 require 'fog/compute/models/virtual_box/network_adapter'
 
 module Fog
-  module VirtualBox
-    class Compute
+  module Compute
+    class VirtualBox
 
       class NetworkAdapters < Fog::Collection
 
-        model Fog::VirtualBox::Compute::NetworkAdapter
+        model Fog::Compute::VirtualBox::NetworkAdapter
 
         attr_accessor :machine
 

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

@@ -1,8 +1,8 @@
 require 'fog/core/model'
 
 module Fog
-  module VirtualBox
-    class Compute
+  module Compute
+    class VirtualBox
 
       class Server < Fog::Model
 
@@ -92,7 +92,7 @@ module Fog
         end
 
         def network_adapters
-          Fog::VirtualBox::Compute::NetworkAdapters.new(
+          Fog::Compute::VirtualBox::NetworkAdapters.new(
             :connection => connection,
             :machine => self
           )
@@ -151,13 +151,13 @@ module Fog
           end
         end
 
-        def scp(local_path, remote_path)
+        def scp(local_path, remote_path, upload_options = {})
           raise 'Not Implemented'
           # requires :addresses, :username
-          # 
+          #
           # options = {}
           # options[:key_data] = [private_key] if private_key
-          # Fog::SCP.new(addresses['public'].first, username, options).upload(local_path, remote_path)
+          # Fog::SCP.new(addresses['public'].first, username, options).upload(local_path, remote_path, scp_options)
         end
 
         def setup(credentials = {})
@@ -178,7 +178,7 @@ module Fog
         def ssh(commands)
           raise 'Not Implemented'
           # requires :addresses, :identity, :username
-          # 
+          #
           # options = {}
           # options[:key_data] = [private_key] if private_key
           # Fog::SSH.new(addresses['public'].first, username, options).run(commands)
@@ -198,7 +198,7 @@ module Fog
         end
 
         def storage_controllers
-          Fog::VirtualBox::Compute::StorageControllers.new(
+          Fog::Compute::VirtualBox::StorageControllers.new(
             :connection => connection,
             :machine    => self
           )

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

@@ -2,12 +2,12 @@ require 'fog/core/collection'
 require 'fog/compute/models/virtual_box/server'
 
 module Fog
-  module VirtualBox
-    class Compute
+  module Compute
+    class VirtualBox
 
       class Servers < Fog::Collection
 
-        model Fog::VirtualBox::Compute::Server
+        model Fog::Compute::VirtualBox::Server
 
         def all
           data = connection.machines.map do |machine|

data/lib/fog/compute/models/virtual_box/storage_controller.rb

@@ -1,8 +1,8 @@
 require 'fog/core/model'
 
 module Fog
-  module VirtualBox
-    class Compute
+  module Compute
+    class VirtualBox
 
       class StorageController < Fog::Model
 

data/lib/fog/compute/models/virtual_box/storage_controllers.rb

@@ -2,12 +2,12 @@ require 'fog/core/collection'
 require 'fog/compute/models/virtual_box/storage_controller'
 
 module Fog
-  module VirtualBox
-    class Compute
+  module Compute
+    class VirtualBox
 
       class StorageControllers < Fog::Collection
 
-        model Fog::VirtualBox::Compute::StorageController
+        model Fog::Compute::VirtualBox::StorageController
 
         attr_accessor :machine
 

data/lib/fog/compute/models/voxel/image.rb

@@ -1,8 +1,8 @@
 require 'fog/core/model'
 
 module Fog
-  module Voxel
-    class Compute
+  module Compute
+    class Voxel
       class Image < Fog::Model
 
         identity :id

data/lib/fog/compute/models/voxel/images.rb

@@ -2,12 +2,12 @@ require 'fog/core/collection'
 require 'fog/compute/models/voxel/image'
 
 module Fog
-  module Voxel
-    class Compute
+  module Compute
+    class Voxel
 
       class Images < Fog::Collection
 
-        model Fog::Voxel::Compute::Image
+        model Fog::Compute::Voxel::Image
 
         def all
           data = connection.images_list.body['images']

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

@@ -1,8 +1,8 @@
 require 'fog/core/model'
 
 module Fog
-  module Voxel
-    class Compute
+  module Compute
+    class Voxel
 
       class Server < Fog::Model
 

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

@@ -2,11 +2,11 @@ require 'fog/core/collection'
 require 'fog/compute/models/voxel/server'
 
 module Fog
-  module Voxel
-    class Compute
+  module Compute
+    class Voxel
       class Servers < Fog::Collection
 
-        model Fog::Voxel::Compute::Server
+        model Fog::Compute::Voxel::Server
 
         def all
           data = connection.devices_list.body['devices'].select {|device| device['type']['id'] == '3'}

data/lib/fog/compute/new_servers.rb

@@ -1,10 +1,9 @@
 module Fog
-  module NewServers
-    class Compute < Fog::Service
+  module Compute
+    class NewServers < Fog::Service
 
       requires :new_servers_password, :new_servers_username
       recognizes :host, :port, :scheme, :persistent
-      recognizes :provider # remove post deprecation
 
       model_path 'fog/compute/models/new_servers'
 
@@ -30,13 +29,6 @@ module Fog
         end
 
         def initialize(options={})
-          unless options.delete(:provider)
-            location = caller.first
-            warning = "[yellow][WARN] Fog::NewServers::Compute.new is deprecated, use Fog::Compute.new(:provider => 'NewServers') instead[/]"
-            warning << " [light_black](" << location << ")[/] "
-            Formatador.display_line(warning)
-          end
-
           @new_server_username = options[:new_servers_username]
         end
 
@@ -53,13 +45,6 @@ module Fog
       class Real
 
         def initialize(options={})
-          unless options.delete(:provider)
-            location = caller.first
-            warning = "[yellow][WARN] Fog::NewServers::Compute.new is deprecated, use Fog::Compute.new(:provider => 'NewServers') instead[/]"
-            warning << " [light_black](" << location << ")[/] "
-            Formatador.display_line(warning)
-          end
-
           require 'fog/core/parser'
 
           @new_servers_password = options[:new_servers_password]
@@ -93,7 +78,7 @@ module Fog
           rescue Excon::Errors::HTTPStatusError => error
             raise case error
             when Excon::Errors::NotFound
-              Fog::NewServers::Compute::NotFound.slurp(error)
+              Fog::Compute::NewServers::NotFound.slurp(error)
             else
               error
             end

data/lib/fog/compute/ninefold.rb

@@ -0,0 +1,139 @@
+module Fog
+  module Compute
+    class Ninefold < Fog::Service
+
+      API_URL = "http://api.ninefold.com/compute/v1.0/"
+
+      requires :ninefold_compute_key, :ninefold_compute_secret
+
+      model_path 'fog/compute/models/ninefold'
+      model       :server
+      collection  :servers
+      model       :flavor
+      collection  :flavors
+      model       :image
+      collection  :images
+      model       :address
+      collection  :addresses
+      model       :ip_forwarding_rule
+      collection  :ip_forwarding_rules
+
+      request_path 'fog/compute/requests/ninefold'
+      # General list-only stuff
+      request :list_accounts
+      request :list_events
+      request :list_service_offerings
+      request :list_disk_offerings
+      request :list_capabilities
+      request :list_hypervisors
+      request :list_zones
+      request :list_network_offerings
+      request :list_resource_limits
+      # Templates
+      request :list_templates
+      # Virtual Machines
+      request :deploy_virtual_machine
+      request :destroy_virtual_machine
+      request :list_virtual_machines
+      request :reboot_virtual_machine
+      request :stop_virtual_machine
+      request :start_virtual_machine
+      request :change_service_for_virtual_machine
+      request :reset_password_for_virtual_machine
+      request :update_virtual_machine
+      # Jobs
+      request :list_async_jobs
+      request :query_async_job_result
+      # Networks
+      request :list_networks
+      # Addresses
+      request :associate_ip_address
+      request :list_public_ip_addresses
+      request :disassociate_ip_address
+      # NAT
+      request :enable_static_nat
+      request :disable_static_nat
+      request :create_ip_forwarding_rule
+      request :delete_ip_forwarding_rule
+      request :list_ip_forwarding_rules
+
+      class Mock
+
+        def initialize(options)
+          require "json"
+
+          @api_url = options[:ninefold_api_url] || Fog.credentials[:ninefold_api_url] || API_URL
+          @ninefold_compute_key = options[:ninefold_compute_key] || Fog.credentials[:ninefold_compute_key]
+          @ninefold_compute_secret = options[:ninefold_compute_secret] || Fog.credentials[:ninefold_compute_secret]
+          @connection = Fog::Connection.new(@api_url)
+        end
+
+        def request(options)
+          raise "Not implemented"
+        end
+      end
+
+      class Real
+
+        def initialize(options)
+          require "json"
+
+          @api_url = options[:ninefold_api_url] || Fog.credentials[:ninefold_api_url] || API_URL
+          @ninefold_compute_key = options[:ninefold_compute_key] || Fog.credentials[:ninefold_compute_key]
+          @ninefold_compute_secret = options[:ninefold_compute_secret] || Fog.credentials[:ninefold_compute_secret]
+          @connection = Fog::Connection.new(@api_url)
+        end
+
+        def request(command, params, options)
+          params['response'] = "json"
+          req = "apiKey=#{@ninefold_compute_key}&command=#{command}&"
+          # convert params to strings for sort
+          req += URI.escape(params.sort_by{|k,v| k.to_s }.collect{|e| "#{e[0].to_s}=#{e[1].to_s}"}.join('&'))
+          encoded_signature = url_escape(encode_signature(req))
+
+          options = {
+            :expects => 200,
+            :method => 'GET',
+            :query => "#{req}&signature=#{encoded_signature}"
+          }.merge(options)
+
+          begin
+            response = @connection.request(options)
+          end
+          unless response.body.empty?
+            # Because the response is some weird xml-json thing, we need to try and mung
+            # the values out with a prefix, and if there is an empty data entry return an
+            # empty version of the expected type (if provided)
+            response = JSON.parse(response.body)
+            if options.has_key? :response_prefix
+              keys = options[:response_prefix].split('/')
+              keys.each do |k|
+                if response[k]
+                  response = response[k]
+                elsif options[:response_type]
+                  response = options[:response_type].new
+                  break
+                else
+                end
+              end
+              response
+            else
+              response
+            end
+          end
+        end
+
+      private
+        def url_escape(string)
+          string.gsub(/([^ a-zA-Z0-9_.-]+)/n) do
+            '%' + $1.unpack('H2' * $1.size).join('%').upcase
+          end.tr(' ', '+')
+        end
+
+        def encode_signature(data)
+          Base64.encode64(OpenSSL::HMAC.digest('sha1', @ninefold_compute_secret, URI.encode(data.downcase).gsub('+', '%20'))).chomp
+        end
+      end
+    end
+  end
+end