You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@deltacloud.apache.org by mf...@redhat.com on 2010/11/15 13:46:54 UTC

[PATCH core 12/14] Updated EC2 mock driver to support AWS gem

From: Michal Fojtik <mf...@redhat.com>

---
 server/lib/deltacloud/base_driver/mock_driver.rb |   62 +++++++---------------
 1 files changed, 19 insertions(+), 43 deletions(-)

diff --git a/server/lib/deltacloud/base_driver/mock_driver.rb b/server/lib/deltacloud/base_driver/mock_driver.rb
index e356211..8635685 100644
--- a/server/lib/deltacloud/base_driver/mock_driver.rb
+++ b/server/lib/deltacloud/base_driver/mock_driver.rb
@@ -4,75 +4,51 @@ require 'deltacloud/method_serializer'
 
 module Mock
 
-  class S3 < RightAws::S3
-    include MethodSerializer::Cache
-
-    def self.cached_methods
-      [
-        :buckets
-      ]
-    end
-
-    MethodSerializer::Cache::wrap_methods(self, :cache_dir => File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'tests', 'ec2', 'support'))
-  end
-
-  class ELB < AWS::ELB::Base
-    include MethodSerializer::Cache
-
-    def self.cached_methods
-      [
-        :describe_load_balancers
-      ]
-    end
-
-    MethodSerializer::Cache::wrap_methods(self, :cache_dir => File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'tests', 'ec2', 'support'))
-
-  end
-
-  class EC2 < AWS::EC2::Base
+  class Ec2 < Aws::Ec2
 
     include MethodSerializer::Cache
 
     def self.cached_methods
       [
         :describe_images,
+        :describe_images_by_owner,
         :describe_availability_zones,
-        :describe_keypairs,
-        :create_keypair,
-        :run_instances,
+        :launch_instances,
         :describe_instances,
         :reboot_instances,
         :terminate_instances,
-        :delete_keypair
+        :describe_key_pairs,
+        :create_key_pair,
+        :delete_key_pair,
+        :create_volume,
+        :describe_volumes,
+        :delete_volume,
+        :attach_volume,
+        :detach_volume,
+        :describe_snapshots,
+        :try_create_snapshot,
       ]
     end
 
     MethodSerializer::Cache::wrap_methods(self, :cache_dir => File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'tests', 'ec2', 'support'))
   end
+  
 end
 
 
 # Replace original client with mock client
 Deltacloud::Drivers::EC2::EC2Driver.class_eval do
   alias_method :original_new_client, :new_client
-  alias_method :original_s3_client, :s3_client
 
   def new_client(credentials, provider = :ec2)
+    auth_credentials = { :access_key_id => credentials.user, :secret_access_key => credentials.password}
     if provider == :elb
-      Mock::ELB.new(
-        :access_key_id => credentials.user,
-        :secret_access_key => credentials.password
-      )
+      Mock::ELB.new(auth_credentials)
+    elsif provider == :s3
+      Mock::S3.new(auth_credentials)
     else
-      Mock::EC2.new(
-        :access_key_id => credentials.user,
-        :secret_access_key => credentials.password
-      )
+      Mock::Ec2.new(auth_credentials[:access_key_id], auth_credentials[:secret_access_key])
     end
   end
 
-  def s3_client(credentials)
-    Mock::S3.new(credentials.user, credentials.password)
-  end
-
 end
-- 
1.7.3.2