fog 1.4.0 → 1.5.0

data/lib/fog/cloudstack/requests/compute/revoke_security_group_ingress.rb

@@ -3,9 +3,6 @@ module Fog
     class Cloudstack
       class Real
 
-        # Creates an account.
-        #
-        # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/authorizeSecurityGroupIngress.html]
         def revoke_security_group_ingress(options={})
           options.merge!(
             'command' => 'revokeSecurityGroupIngress'
@@ -14,6 +11,35 @@ module Fog
           request(options)
         end
 
+      end # Real
+
+      class Mock
+        def revoke_security_group_ingress(options={})
+          unless security_group_rule_id = options['id']
+            raise Fog::Compute::Cloudstack::BadRequest.new('Unable to execute API command missing parameter id')
+          end
+
+          security_group = self.data[:security_groups].values.find do |group|
+            (rule = (group['ingressrule'] || []).find{|r| r['ruleid'] == security_group_rule_id}) && group['ingressrule'].delete(rule)
+          end
+
+          job_id = Fog::Cloudstack.uuid
+          job = {
+            "cmd"           => "com.cloud.api.commands.revokeSecurityGroupIngress",
+            "created"       => Time.now.iso8601,
+            "jobid"         => job_id,
+            "jobstatus"     => 1,
+            "jobprocstatus" => 0,
+            "jobresultcode" => 0,
+            "jobresulttype" => "object",
+            "jobresult"     => { "securitygroup" => security_group }
+          }
+
+          self.data[:jobs][job_id]= job
+
+          {"revokesecuritygroupingress" => { "jobid" => job_id }}
+        end
+
       end
     end
   end

data/lib/fog/core.rb

@@ -19,6 +19,7 @@ require 'fog/core/attributes'
 require 'fog/core/collection'
 require 'fog/core/connection'
 require 'fog/core/credentials'
+require 'fog/core/current_machine'
 require 'fog/core/deprecation'
 require 'fog/core/errors'
 require 'fog/core/hmac'

data/lib/fog/core/attributes.rb

@@ -186,7 +186,7 @@ module Fog
       end
 
       def dup_attributes!
-        @attributes = @attributes.dup
+        @attributes = @attributes.dup if @attributes
       end
 
       private

data/lib/fog/core/current_machine.rb

@@ -1,4 +1,4 @@
-
+require 'thread'
 module Fog
   class CurrentMachine
     @@lock = Mutex.new
@@ -24,7 +24,7 @@ module Fog
     #     puts "Service timeout"
     #   end
     #
-    # @raise [Net::HTTPExceptions] if the net/http request fails.
+    # @raise [Excon::Errors::Error] if the net/http request fails.
     def self.ip_address
       @@lock.synchronize do
         @@ip_address ||= Excon.get(AMAZON_AWS_CHECK_IP).body.chomp

data/lib/fog/core/scp.rb

@@ -52,6 +52,14 @@ module Fog
           raise ArgumentError.new(':key_data, :keys, :password or a loaded ssh-agent is required to initialize SSH')
         end
 
+        if options[:key_data] || options[:keys]
+          options[:keys_only] = true
+          #Explicitly set these so net-ssh doesn't add the default keys
+          #as seen at https://github.com/net-ssh/net-ssh/blob/master/lib/net/ssh/authentication/session.rb#L131-146
+          options[:keys] = [] unless options[:keys]
+          options[:key_data] = [] unless options[:key_data]
+        end
+
         @address  = address
         @username = username
         @options  = { :paranoid => false }.merge(options)

data/lib/fog/core/ssh.rb

@@ -46,6 +46,14 @@ module Fog
           raise ArgumentError.new(':key_data, :keys, :password or a loaded ssh-agent is required to initialize SSH')
         end
 
+        if options[:key_data] || options[:keys]
+          options[:keys_only] = true
+          #Explicitly set these so net-ssh doesn't add the default keys
+          #as seen at https://github.com/net-ssh/net-ssh/blob/master/lib/net/ssh/authentication/session.rb#L131-146
+          options[:keys] = [] unless options[:keys]
+          options[:key_data] = [] unless options[:key_data]
+        end
+
         @address  = address
         @username = username
         @options  = { :paranoid => false }.merge(options)

data/lib/fog/dynect/dns.rb

@@ -65,7 +65,7 @@ module Fog
           @dynect_password = options[:dynect_password]
 
           @connection_options = options[:connection_options] || {}
-          @host       = "api2.dynect.net"
+          @host       = 'api2.dynect.net'
           @port       = options[:port]        || 443
           @path       = options[:path]        || '/REST'
           @persistent = options[:persistent]  || false
@@ -86,16 +86,25 @@ module Fog
             params[:headers] ||= {}
             params[:headers]['Content-Type'] = 'application/json'
             params[:headers]['API-Version'] = @version
-            params[:headers]['Auth-Token'] = auth_token unless params[:path] == "Session"
+            params[:headers]['Auth-Token'] = auth_token unless params[:path] == 'Session'
             params[:path] = "#{@path}/#{params[:path]}" unless params[:path] =~ %r{^#{Regexp.escape(@path)}/}
+
             response = @connection.request(params.merge!({:host => @host}))
 
-            if response.status == 307
-              response = poll_job(response)
-            elsif !response.body.empty?
+            if response.body.empty?
+              response.body = {}
+            else
               response.body = Fog::JSON.decode(response.body)
             end
 
+            if response.body['status'] == 'failure'
+              raise Error, response.body['msgs'].first['INFO']
+            end
+
+            if response.status == 307 && params[:path] !~ %r{^/REST/Job/}
+              response = poll_job(response)
+            end
+
             response
           rescue Excon::Errors::HTTPStatusError => error
             if @auth_token && error.message =~ /login: (Bad or expired credentials|inactivity logout)/

data/lib/fog/ibm/requests/compute/create_instance.rb

@@ -46,7 +46,7 @@ module Fog
               'volumeID'                => options[:volume_id],
               'vlanID'                  => options[:vlan_id],
               'SecondaryIP'             => options[:secondary_ip],
-              'isMiniEphemermal'        => options[:is_mini_ephemeral],
+              'isMiniEphemeral'        => options[:is_mini_ephemeral],
               'Configuration Data'      => options[:configuration_data],
               'antiCollocationInstance' => options[:anti_collocation_instance],
             }

data/lib/fog/libvirt/requests/compute/create_volume.rb

@@ -8,7 +8,7 @@ module Fog
       end
 
       class Mock
-        def create_volume(xml)
+        def create_volume(pool_name, xml)
 
         end
       end

data/lib/fog/libvirt/requests/compute/list_volumes.rb

@@ -20,7 +20,7 @@ module Fog
 
         def volume_to_attributes(vol)
 
-          format_type = xml_element(vol.xml_desc, "/volume/target/format", "type")
+          format_type = xml_element(vol.xml_desc, "/volume/target/format", "type") rescue nil # not all volumes have types, e.g. LVM
           return nil if format_type == "dir"
 
           {

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

@@ -12,6 +12,8 @@ module Fog
         # attribute :content_type,    :aliases => 'Content-Type'
         attribute :last_modified,   :aliases => 'Last-Modified'
 
+        require 'uri'
+
         def body
           attributes[:body] ||= if last_modified
             collection.get(identity).body
@@ -73,7 +75,16 @@ module Fog
         end
 
         def public_url
-          nil
+          requires :directory, :key
+
+          if connection.endpoint
+            escaped_directory = URI.escape(directory.key)
+            escaped_key = URI.escape(key)
+
+            ::File.join(connection.endpoint, escaped_directory, escaped_key)
+          else
+            nil
+          end
         end
 
         def save(options = {})

data/lib/fog/local/storage.rb

@@ -6,6 +6,7 @@ module Fog
     class Local < Fog::Service
 
       requires :local_root
+      recognizes :endpoint, :scheme, :host, :port, :path
 
       model_path 'fog/local/models/storage'
       collection  :directories
@@ -13,8 +14,12 @@ module Fog
       model       :file
       collection  :files
 
+      require 'uri'
+
       class Mock
 
+        attr_reader :endpoint
+
         def self.data
           @data ||= Hash.new do |hash, key|
             hash[key] = {}
@@ -30,6 +35,8 @@ module Fog
 
           require 'mime/types'
           @local_root = ::File.expand_path(options[:local_root])
+
+          @endpoint = options[:endpoint] || build_endpoint_from_options(options)
         end
 
         def data
@@ -48,13 +55,23 @@ module Fog
           self.class.data.delete(@local_root)
         end
 
+        private
+        def build_endpoint_from_options(options)
+          return unless options[:host]
+
+          URI::Generic.build(options).to_s
+        end
       end
 
       class Real
 
+        attr_reader :endpoint
+
         def initialize(options={})
           require 'mime/types'
           @local_root = ::File.expand_path(options[:local_root])
+
+          @endpoint = options[:endpoint] || build_endpoint_from_options(options)
         end
 
         def local_root
@@ -69,9 +86,16 @@ module Fog
           require 'fileutils'
           source_path = path_to(::File.join(source_directory_name, source_object_name))
           target_path = path_to(::File.join(target_directory_name, target_object_name))
-          ::FileUtils.mkdir_p(::File.dirname(source_path))
+          ::FileUtils.mkdir_p(::File.dirname(target_path))
           ::FileUtils.copy_file(source_path, target_path)
         end
+
+        private
+        def build_endpoint_from_options(options)
+          return unless options[:host]
+
+          URI::Generic.build(options).to_s
+        end
       end
 
     end

data/lib/fog/ninefold/compute.rb

@@ -8,6 +8,7 @@ module Fog
       API_URL = "http://api.ninefold.com/compute/v1.0/"
 
       requires :ninefold_compute_key, :ninefold_compute_secret
+      recognizes :ninefold_api_url  # allow us to specify non-prod environments
 
       model_path 'fog/ninefold/models/compute'
       model       :server

data/lib/fog/openstack.rb

@@ -50,6 +50,7 @@ module Fog
       connection = Fog::Connection.new(uri.to_s, false, connection_options)
       @openstack_api_key  = options[:openstack_api_key]
       @openstack_username = options[:openstack_username]
+
       response = connection.request({
         :expects  => [200, 204],
         :headers  => {
@@ -63,7 +64,8 @@ module Fog
 
       return {
         :token => response.headers['X-Auth-Token'],
-        :server_management_url => response.headers['X-Server-Management-Url']
+        :server_management_url => response.headers['X-Server-Management-Url'],
+        :identity_public_endpoint => response.headers['X-Keystone']
       }
     end
 

data/lib/fog/openstack/compute.rb

@@ -176,13 +176,24 @@ module Fog
                   'minRam'    => 0,
                   'minDisk'   => 0,
                   'metadata'  => {},
-                  'links'     => []
+                  'links'     => [{"href"=>"http://nova1:8774/v1.1/admin/images/1", "rel"=>"self"}, {"href"=>"http://nova1:8774/admin/images/2", "rel"=>"bookmark"}]
                 }
               },
               :servers => {},
               :key_pairs => {},
               :security_groups => {},
-              :addresses => {}
+              :addresses => {},
+              :quota => {
+                'metadata_items' => 128,
+                'injected_file_content_bytes' => 10240,
+                'injected_files' => 5,
+                'gigabytes' => 1000,
+                'ram' => 51200,
+                'floating_ips' => 10,
+                'instances' => 10,
+                'volumes' => 10,
+                'cores' => 20,
+              }
             }
           end
         end

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

@@ -7,10 +7,18 @@ module Fog
 
       class Servers < Fog::Collection
 
+        attribute :filters
+
         model Fog::Compute::OpenStack::Server
 
-        def all
-          data = connection.list_servers_detail.body['servers']
+        def initialize(attributes)
+          self.filters ||= {}
+          super
+        end
+
+        def all(filters = filters)
+          self.filters = filters
+          data = connection.list_servers_detail(filters).body['servers']
           load(data)
         end
 

data/lib/fog/openstack/requests/compute/create_flavor.rb

@@ -55,7 +55,7 @@ module Fog
           response.body = {
             "flavor" => {
               "vcpus" => attributes[:vcpus],
-              "disk" => attributes[:disc],
+              "disk" => attributes[:disk],
               "name" => attributes[:name],
               "links" => [
                 {
@@ -70,7 +70,7 @@ module Fog
               "rxtx_factor" => attributes[:rxtx_factor] || 1,
               "OS-FLV-EXT-DATA:ephemeral" => attributes[:ephemeral] || 0,
               "ram" => attributes[:ram],
-              "id" => 11,
+              "id" => "11",
               "swap" => attributes[:swap] || ""
             }
           }

data/lib/fog/openstack/requests/compute/create_security_group.rb

@@ -31,7 +31,7 @@ module Fog
             "Content-Length" => "139",
             "Date" => Date.new}
           response.body = {
-            "security_groups" => [{
+            "security_group" => [{
               "rules" => [],
               "tenant_id" => "d5183375ab0343f3a0b4b05f547aefc2",
               "id" => 999,

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

@@ -14,7 +14,7 @@ module Fog
 
           vanilla_options = ['metadata', 'accessIPv4', 'accessIPv6',
                              'availability_zone', 'user_data', 'key_name',
-                             'security_groups']
+                             'security_groups', 'adminPass']
           vanilla_options.select{|o| options[o]}.each do |key|
             data['server'][key] = options[key]
           end

data/lib/fog/openstack/requests/compute/create_volume.rb

@@ -42,7 +42,7 @@ module Fog
               'volumeType'         => nil,
               'availabilityZone'   => 'nova',
               'createdAt'          => Time.now,
-              'attchments'         => []
+              'attachments'         => []
             }
           }
           response

data/lib/fog/openstack/requests/compute/get_flavor_details.rb

@@ -18,13 +18,13 @@ module Fog
         def get_flavor_details(flavor_ref)
           response = Excon::Response.new
           flavor = {
-            '1' => { 'id' => '1', 'name' => '256 server', 'ram' => 256, 'disk' => 10, 'links' => [] },
-            '2' => { 'id' => '2', 'name' => '512 server', 'ram' => 512, 'disk' => 20, 'links' => [] },
-            '3' => { 'id' => '3', 'name' => '1GB server', 'ram' => 1024, 'disk' => 40, 'links' => [] },
-            '4' => { 'id' => '4', 'name' => '2GB server', 'ram' => 2048, 'disk' => 80, 'links' => [] },
-            '5' => { 'id' => '5', 'name' => '4GB server', 'ram' => 4096, 'disk' => 160, 'links' => [] },
-            '6' => { 'id' => '6', 'name' => '8GB server', 'ram' => 8192, 'disk' => 320, 'links' => [] },
-            '7' => { 'id' => '7', 'name' => '15.5GB server', 'ram' => 15872, 'disk' => 620, 'links' => [] }
+            '1' => { 'id' => '1', 'name' => '256 server', 'ram' => 256, 'disk' => 10, 'swap' => '1', 'vcpus' => 1, 'OS-FLV-EXT-DATA:ephemeral' => 1, 'links' => [] },
+            '2' => { 'id' => '2', 'name' => '512 server', 'ram' => 512, 'disk' => 20, 'swap' => '1', 'vcpus' => 2, 'OS-FLV-EXT-DATA:ephemeral' => 1, 'links' => [] },
+            '3' => { 'id' => '3', 'name' => '1GB server', 'ram' => 1024, 'disk' => 40, 'swap' => '2', 'vcpus' => 2, 'OS-FLV-EXT-DATA:ephemeral' => 1, 'links' => [] },
+            '4' => { 'id' => '4', 'name' => '2GB server', 'ram' => 2048, 'disk' => 80, 'swap' => '4', 'vcpus' => 4, 'OS-FLV-EXT-DATA:ephemeral' => 1, 'links' => [] },
+            '5' => { 'id' => '5', 'name' => '4GB server', 'ram' => 4096, 'disk' => 160, 'swap' => '8', 'vcpus' => 8, 'OS-FLV-EXT-DATA:ephemeral' => 1, 'links' => [] },
+            '6' => { 'id' => '6', 'name' => '8GB server', 'ram' => 8192, 'disk' => 320, 'swap' => '16', 'vcpus' => 16, 'OS-FLV-EXT-DATA:ephemeral' => 1, 'links' => [] },
+            '7' => { 'id' => '7', 'name' => '15.5GB server', 'ram' => 15872, 'disk' => 620, 'swap' => '32', 'vcpus' => 32, 'OS-FLV-EXT-DATA:ephemeral' => 1, 'links' => [] }
           }[flavor_ref]
           if flavor
             response.status = 200

data/lib/fog/openstack/requests/compute/get_quota.rb

@@ -19,18 +19,7 @@ module Fog
           response = Excon::Response.new
           response.status = 200
           response.body = {
-            'quota_set' => {
-              'metadata_items' => 128,
-              'injected_file_content_bytes' => 10240,
-              'injected_files' => 5,
-              'gigabytes' => 1000,
-              'ram' => 51200,
-              'floating_ips' => 10,
-              'instances' => 10,
-              'volumes' => 10,
-              'cores' => 20,
-              'id' => tenant_id
-            }
+            'quota_set' => (self.data[:quota_updated] or self.data[:quota]).merge({'id' => tenant_id})
           }
           response
         end