fog 1.3.1 → 1.4.0

data/lib/fog/ibm.rb

@@ -1,4 +1,4 @@
-require(File.expand_path(File.join(File.dirname(__FILE__), 'core')))
+require 'fog/core'
 
 module Fog
   module IBM
@@ -18,7 +18,6 @@ module Fog
     class Connection < Fog::Connection
 
       def initialize(user, password)
-        require 'multi_json'
         @user = user
         @password = password
         @endpoint = URI.parse('https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331')
@@ -38,7 +37,7 @@ module Fog
         end
         response = super(options)
         unless response.body.empty?
-          response.body = MultiJson.decode(response.body)
+          response.body = Fog::JSON.decode(response.body)
         end
         response
       end

data/lib/fog/ibm/compute.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'ibm'))
+require 'fog/ibm'
 require 'fog/compute'
 
 module Fog

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

@@ -122,13 +122,13 @@ module Fog
 
         def attach(volume_id)
           requires :id
-          data = connection.modify_instance(id, {'type' => 'attach', 'storageId' => volume_id})
+          data = connection.modify_instance(id, {'type' => 'attach', 'storageID' => volume_id})
           data.body
         end
 
         def detach(volume_id)
           requires :id
-          data = connection.modify_instance(id, {'type' => 'detach', 'storageId' => volume_id})
+          data = connection.modify_instance(id, {'type' => 'detach', 'storageID' => volume_id})
           data.body
         end
 

data/lib/fog/ibm/storage.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'ibm'))
+require 'fog/ibm'
 require 'fog/storage'
 
 module Fog

data/lib/fog/identity.rb

@@ -0,0 +1,24 @@
+module Fog
+  module Identity
+
+    def self.[](provider)
+      self.new(:provider => provider)
+    end
+
+    def self.new(attributes)
+      attributes = attributes.dup # Prevent delete from having side effects
+      case provider = attributes.delete(:provider).to_s.downcase.to_sym
+      when :openstack
+        require 'fog/openstack/identity'
+        Fog::Identity::OpenStack.new(attributes)
+      else
+        raise ArgumentError.new("#{provider} has no identity service")
+      end
+    end
+
+    def self.providers
+      Fog.services[:idenity]
+    end
+
+  end
+end

data/lib/fog/image.rb

@@ -0,0 +1,24 @@
+module Fog
+  module Image
+
+    def self.[](provider)
+      self.new(:provider => provider)
+    end
+
+    def self.new(attributes)
+      attributes = attributes.dup # Prevent delete from having side effects
+      case provider = attributes.delete(:provider).to_s.downcase.to_sym
+      when :openstack
+        require 'fog/openstack/image'
+        Fog::Image::OpenStack.new(attributes)
+      else
+        raise ArgumentError.new("#{provider} has no identity service")
+      end
+    end
+
+    def self.providers
+      Fog.services[:image]
+    end
+
+  end
+end

data/lib/fog/joyent/compute.rb

@@ -1,7 +1,6 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'joyent'))
-require File.expand_path(File.join(File.dirname(__FILE__), 'errors'))
+require 'fog/joyent'
+require 'fog/joyent/errors'
 require 'fog/compute'
-require 'multi_json'
 
 module Fog
   module Compute
@@ -16,7 +15,7 @@ module Fog
       model_path 'fog/joyent/models/compute'
       request_path 'fog/joyent/requests/compute'
 
-      # request :list_datacenters
+      request :list_datacenters
       # request :get_datacenter
 
       # Keys
@@ -114,7 +113,14 @@ module Fog
               @joyent_keyname = options[:joyent_keyname]
               @joyent_key = File.read(options[:joyent_keyfile])
 
-              @rsa = OpenSSL::PKey::RSA.new(@joyent_key)
+              if @joyent_key.lines.first.include?('-----BEGIN DSA PRIVATE KEY-----')
+                @key = OpenSSL::PKey::DSA.new(@joyent_key)
+              elsif @joyent_key.lines.first.include?('-----BEGIN RSA PRIVATE KEY-----')
+                @key = OpenSSL::PKey::RSA.new(@joyent_key)
+              else
+                raise ArgumentError, "options[joyent_keyfile] provided must be an RSA or DSA private key"
+              end
+
 
               @header_method = method(:header_for_signature_auth)
             else
@@ -144,7 +150,7 @@ module Fog
           }.merge(request[:headers] || {}).merge(@header_method.call) 
 
           if request[:body]
-            request[:body] = MultiJson.encode(request[:body])
+            request[:body] = Fog::JSON.encode(request[:body])
           end
 
           response = @connection.request(request)
@@ -161,7 +167,7 @@ module Fog
         private
 
         def json_decode(body)
-          parsed = MultiJson.decode(body)
+          parsed = Fog::JSON.decode(body)
           decode_time_attrs(parsed)
         end
 
@@ -173,7 +179,16 @@ module Fog
 
         def header_for_signature_auth
           date = Time.now.utc.httpdate
-          signature = Base64.encode64(@rsa.sign("sha256", date)).delete("\r\n")
+          begin
+            signature = Base64.encode64(@key.sign("sha256", date)).delete("\r\n")
+          rescue OpenSSL::PKey::PKeyError => e
+            if e.message == 'wrong public key type'
+              puts 'ERROR: Your version of ruby/openssl does not suport DSA key signing'
+              puts 'see: http://bugs.ruby-lang.org/issues/4734'
+              puts 'workaround: Please use an RSA key instead'
+            end
+            raise
+          end
           key_id = "/#{@joyent_username}/keys/#{@joyent_keyname}"
 
           {

data/lib/fog/joyent/models/compute/keys.rb

@@ -22,8 +22,8 @@ module Fog
         end
 
         def create(params = {})
-          raise ArgumentError, "Key name required" unless params.key?(:name)
-          raise ArgumentError, "Key body required" unless params.key?(:body)
+          raise ArgumentError, "option [name] required" unless params.key?(:name)
+          raise ArgumentError, "option [key] required" unless params.key?(:key)
 
           self.connection.create_key(params)
         end

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

@@ -12,7 +12,6 @@ module Fog
         attribute :dataset
         attribute :ips
         attribute :memory
-        attribute :ips
         attribute :disk
         attribute :metadata
 
@@ -50,7 +49,7 @@ module Fog
 
         def resize(flavor)
           requires :id
-          self.connection.resize(id, flavor)
+          self.connection.resize_machine(id, flavor)
           true
         end
 

data/lib/fog/joyent/requests/compute/list_datacenters.rb

@@ -0,0 +1,17 @@
+module Fog
+  module Compute
+    class Joyent
+
+      class Real
+        def list_datacenters
+          request(
+            :expects => 200,
+            :method => :'GET',
+            :path => '/my/datacenters'
+          )
+        end
+      end # Real
+
+    end
+  end
+end

data/lib/fog/libvirt.rb

@@ -1,4 +1,4 @@
-require(File.expand_path(File.join(File.dirname(__FILE__), 'core')))
+require 'fog/core'
 
 module Fog
   module Libvirt

data/lib/fog/libvirt/compute.rb

@@ -1,13 +1,13 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'libvirt'))
+require 'fog/libvirt'
 require 'fog/compute'
-
-require 'fog/libvirt/models/compute/uri'
+require 'fog/libvirt/models/compute/util/util'
+require 'fog/libvirt/models/compute/util/uri'
 
 module Fog
   module Compute
     class Libvirt < Fog::Service
 
-      requires :libvirt_uri
+      requires   :libvirt_uri
       recognizes :libvirt_username, :libvirt_password
       recognizes :libvirt_ip_command
 
@@ -24,18 +24,55 @@ module Fog
       collection  :pools
       model       :node
       collection  :nodes
+      model       :nic
+      collection  :nics
+
+      request_path 'fog/libvirt/requests/compute'
+      request :list_domains
+      request :create_domain
+      request :define_domain
+      request :vm_action
+      request :list_pools
+      request :list_pool_volumes
+      request :define_pool
+      request :pool_action
+      request :list_volumes
+      request :volume_action
+      request :create_volume
+      request :list_networks
+      request :destroy_network
+      request :list_interfaces
+      request :destroy_interface
+      request :get_node_info
+      request :update_display
+
+      module Shared
+        include Fog::Compute::LibvirtUtil
+      end
 
       class Mock
-
+        include Shared
         def initialize(options={})
-          Fog::Mock.not_implemented
+          # libvirt is part of the gem => ruby-libvirt
+          require 'libvirt'
         end
 
+        private
+
+        def client
+          return @client if defined?(@client)
+        end
+
+        #read mocks xml
+        def read_xml(file_name)
+          file_path = File.join(File.dirname(__FILE__),"requests","compute","mock_files",file_name)
+          File.read(file_path)
+        end
       end
 
       class Real
-
-        attr_reader :raw
+        include Shared
+        attr_reader :client
         attr_reader :uri
         attr_reader :ip_command
 
@@ -49,16 +86,16 @@ module Fog
 
           begin
             if options[:libvirt_username] and options[:libvirt_password]
-              @raw = ::Libvirt::open_auth(@uri.uri, [::Libvirt::CRED_AUTHNAME, ::Libvirt::CRED_PASSPHRASE]) do |cred|
-                if cred['type'] == ::Libvirt::CRED_AUTHNAME
-                  res = options[:libvirt_username]
-                elsif cred["type"] == ::Libvirt::CRED_PASSPHRASE
-                  res = options[:libvirt_password]
-                else
+              @client = ::Libvirt::open_auth(uri.uri, [::Libvirt::CRED_AUTHNAME, ::Libvirt::CRED_PASSPHRASE]) do |cred|
+                case cred['type']
+                  when ::Libvirt::CRED_AUTHNAME
+                    options[:libvirt_username]
+                  when ::Libvirt::CRED_PASSPHRASE
+                    options[:libvirt_password]
                 end
               end
             else
-              @raw = ::Libvirt::open(@uri.uri)
+              @client = ::Libvirt::open(uri.uri)
             end
 
           rescue ::Libvirt::ConnectionError
@@ -67,6 +104,10 @@ module Fog
 
         end
 
+        def terminate
+          @client.close if @client and !@client.closed?
+        end
+
         def enhance_uri(uri)
           require 'cgi'
           append=""
@@ -89,19 +130,6 @@ module Fog
           uri+append
         end
 
-        def respond_to?(method, *)
-          super or @connection.respond_to? method
-        end
-
-        # hack to provide 'requests'
-        def method_missing(method_sym, *arguments, &block)
-          if @raw.respond_to?(method_sym)
-            @raw.send(method_sym, *arguments)
-          else
-            super
-          end
-        end
-
       end
     end
   end

data/lib/fog/libvirt/models/compute/interface.rb

@@ -7,42 +7,22 @@ module Fog
       class Interface < Fog::Model
 
         identity :name
-
         attribute :mac
-        attribute :xml
+        attribute :active
 
         def save
           raise Fog::Errors::Error.new('Creating a new interface is not yet implemented. Contributions welcome!')
         end
 
-        def destroy
-          requires :raw
-          raw.delete
-          true
+        def shutdown
+          connection.destroy_interface(mac)
         end
 
-        private
-
-        def raw
-          @raw
+        def active?
+          active
         end
-
-        def raw=(new_raw)
-          @raw = new_raw
-
-          raw_attributes = {
-            :name => new_raw.name,
-            :mac => new_raw.mac,
-            :xml => new_raw.xml_desc,
-          }
-
-          merge_attributes(raw_attributes)
-
-        end
-
       end
 
     end
   end
-
 end

data/lib/fog/libvirt/models/compute/interfaces.rb

@@ -9,54 +9,16 @@ module Fog
 
         model Fog::Compute::Libvirt::Interface
 
-        def all(filter=nil)
-          data=[]
-          if filter.nil?
-            connection.raw.list_interfaces.each do |ifname|
-              interface=connection.raw.lookup_interface_by_name(ifname)
-              data << { :raw => interface }
-            end
-            connection.raw.list_defined_interfaces.each do |ifname|
-              interface=connection.raw.lookup_interface_by_name(ifname)
-              data << { :raw => interface }
-            end
-
-          else
-            interface=nil
-            begin
-              interface=get_by_name(filter[:name]) if filter.has_key?(:name)
-              interface=get_by_mac(filter[:mac]) if filter.has_key?(:mac)
-            rescue ::Libvirt::RetrieveError
-              return nil
-            end
-            data << { :raw => interface}
-          end
-
-          load(data)
+        def all(filter={})
+          load(connection.list_interfaces(filter))
         end
 
-        def get(key)
+        def get(name)
           self.all(:name => name).first
         end
 
-        #private # Making these private, screws up realod
-        # Retrieve the interface by name
-        def get_by_name(name)
-          interface=connection.raw.lookup_interface_by_name(name)
-          return interface
-          #          new(:raw => interface)
-        end
-
-        # Retrieve the interface by name
-        def get_by_mac(mac)
-          interface=connection.raw.lookup_interface_by_mac(mac)
-          return interface
-          #          new(:raw => interface)
-        end
-
-
-      end #class
+      end
 
-    end #Class
-  end #module
-end #module
+    end
+  end
+end