[ecloud] improvements and some mocking

lib/fog/core/collection.rb

@@ -103,10 +103,10 @@ def new(attributes = {})
         raise(ArgumentError.new("Initialization parameters must be an attributes hash, got #{attributes.class} #{attributes.inspect}"))
       end
       model.new(
-        attributes.merge(
+        {
           :collection => self,
           :connection => connection
-        )
+        }.merge(attributes)
       )
     end
 

lib/fog/ecloud.rb

@@ -2,16 +2,30 @@
 
 module Fog
   module Ecloud
+    ECLOUD_OPTIONS = [:ecloud_authentication_method]
 
     extend Fog::Provider
 
     service(:compute, 'ecloud/compute', 'Compute')
 
-  end
-end
+    def self.keep(hash, *keys)
+      {}.tap do |kept|
+        keys.each{|k| kept[k]= hash[k] if hash.key?(k)}
+      end
+    end
 
-module Fog
-  module Ecloud
-    ECLOUD_OPTIONS = [:ecloud_authentication_method]
+    def self.slice(hash, *keys)
+      hash.dup.tap do |sliced|
+        keys.each{|k| sliced.delete(k)}
+      end
+    end
+
+    def self.ip_address
+      4.times.map{ Fog::Mock.random_numbers(3) }.join(".")
+    end
+
+    def self.mac_address
+      6.times.map{ Fog::Mock.random_numbers(2) }.join(":")
+    end
   end
 end