You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by lu...@apache.org on 2010/07/09 01:26:21 UTC
svn commit: r962151 - in /incubator/deltacloud/trunk/framework: config/
lib/deltacloud/drivers/ lib/deltacloud/drivers/ec2/
lib/deltacloud/drivers/mock/ lib/deltacloud/drivers/rackspace/
lib/deltacloud/drivers/rhevm/
Author: lutter
Date: Thu Jul 8 23:26:20 2010
New Revision: 962151
URL: http://svn.apache.org/viewvc?rev=962151&view=rev
Log:
Place each driver in its own module to accomodate multi-sourcefile driver designs (ie, Rackspace).
Added:
incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/ec2/
incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/ec2/ec2_driver.rb
- copied, changed from r962150, incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/ec2_driver.rb
incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/mock/
incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/mock/mock_driver.rb
- copied, changed from r962150, incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/mock_driver.rb
incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rackspace/
incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rackspace/rackspace_client.rb
- copied, changed from r962150, incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rackspace_client.rb
incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rackspace/rackspace_driver.rb
- copied, changed from r962150, incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rackspace_driver.rb
incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rhevm/
incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rhevm/rhevm_driver.rb
- copied, changed from r962150, incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rhevm_driver.rb
Removed:
incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/ec2_driver.rb
incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/mock_driver.rb
incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rackspace_client.rb
incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rackspace_driver.rb
incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rhevm_driver.rb
Modified:
incubator/deltacloud/trunk/framework/config/environment.rb
Modified: incubator/deltacloud/trunk/framework/config/environment.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/framework/config/environment.rb?rev=962151&r1=962150&r2=962151&view=diff
==============================================================================
--- incubator/deltacloud/trunk/framework/config/environment.rb (original)
+++ incubator/deltacloud/trunk/framework/config/environment.rb Thu Jul 8 23:26:20 2010
@@ -95,9 +95,9 @@ case DRIVER
DRIVER_CLASS_NAME = "Deltacloud::Drivers::MockDriver"
MOCK_STORAGE_ROOT = File.dirname( __FILE__ ) + "/../../client-ruby/specs/data"
when :ec2
- DRIVER_CLASS_NAME = "Deltacloud::Drivers::Ec2Driver"
+ DRIVER_CLASS_NAME = "Deltacloud::Drivers::EC2::EC2Driver"
when :rackspace
- DRIVER_CLASS_NAME = "Deltacloud::Drivers::Ec2Driver"
+ DRIVER_CLASS_NAME = "Deltacloud::Drivers::Rackspace::RackspaceDriver"
when :rhevm
- DRIVER_CLASS_NAME = "Deltacloud::Drivers::RHEVMDriver"
+ DRIVER_CLASS_NAME = "Deltacloud::Drivers::RHEVM::RHEVMDriver"
end
Copied: incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/ec2/ec2_driver.rb (from r962150, incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/ec2_driver.rb)
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/ec2/ec2_driver.rb?p2=incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/ec2/ec2_driver.rb&p1=incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/ec2_driver.rb&r1=962150&r2=962151&rev=962151&view=diff
==============================================================================
--- incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/ec2_driver.rb (original)
+++ incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/ec2/ec2_driver.rb Thu Jul 8 23:26:20 2010
@@ -21,7 +21,8 @@ require 'right_aws'
module Deltacloud
module Drivers
-class Ec2Driver < DeltaCloud::BaseDriver
+ module EC2
+class EC2Driver < DeltaCloud::BaseDriver
#
# Flavors
@@ -328,6 +329,7 @@ class Ec2Driver < DeltaCloud::BaseDriver
end
+ end
end
end
Copied: incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/mock/mock_driver.rb (from r962150, incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/mock_driver.rb)
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/mock/mock_driver.rb?p2=incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/mock/mock_driver.rb&p1=incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/mock_driver.rb&r1=962150&r2=962151&rev=962151&view=diff
==============================================================================
--- incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/mock_driver.rb (original)
+++ incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/mock/mock_driver.rb Thu Jul 8 23:26:20 2010
@@ -20,7 +20,7 @@ require 'deltacloud/base_driver'
module Deltacloud
module Drivers
-
+ module Mock
class MockDriver < DeltaCloud::BaseDriver
( STORAGE_ROOT = MOCK_STORAGE_ROOT ) unless defined?( STORAGE_ROOT )
@@ -283,5 +283,6 @@ class MockDriver < DeltaCloud::BaseDrive
end
+ end
end
end
Copied: incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rackspace/rackspace_client.rb (from r962150, incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rackspace_client.rb)
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rackspace/rackspace_client.rb?p2=incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rackspace/rackspace_client.rb&p1=incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rackspace_client.rb&r1=962150&r2=962151&rev=962151&view=diff
==============================================================================
--- incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rackspace_client.rb (original)
+++ incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rackspace/rackspace_client.rb Thu Jul 8 23:26:20 2010
@@ -26,6 +26,7 @@ require 'json'
#
module Deltacloud
module Drivers
+ module Rackspace
class RackspaceClient
@@ -84,6 +85,7 @@ class RackspaceClient
end
+ end
end
end
Copied: incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rackspace/rackspace_driver.rb (from r962150, incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rackspace_driver.rb)
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rackspace/rackspace_driver.rb?p2=incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rackspace/rackspace_driver.rb&p1=incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rackspace_driver.rb&r1=962150&r2=962151&rev=962151&view=diff
==============================================================================
--- incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rackspace_driver.rb (original)
+++ incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rackspace/rackspace_driver.rb Thu Jul 8 23:26:20 2010
@@ -20,6 +20,7 @@ require 'rackspace_client'
module Deltacloud
module Drivers
+ module Rackspace
class RackspaceDriver < DeltaCloud::BaseDriver
@@ -162,5 +163,6 @@ class RackspaceDriver < DeltaCloud::Base
end
+ end
end
end
Copied: incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rhevm/rhevm_driver.rb (from r962150, incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rhevm_driver.rb)
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rhevm/rhevm_driver.rb?p2=incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rhevm/rhevm_driver.rb&p1=incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rhevm_driver.rb&r1=962150&r2=962151&rev=962151&view=diff
==============================================================================
--- incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rhevm_driver.rb (original)
+++ incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rhevm/rhevm_driver.rb Thu Jul 8 23:26:20 2010
@@ -20,6 +20,7 @@ require 'yaml'
module Deltacloud
module Drivers
+ module RHEVM
class RHEVMDriver < DeltaCloud::BaseDriver
@@ -270,5 +271,6 @@ class RHEVMDriver < DeltaCloud::BaseDriv
end
+ end
end
end