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:11 UTC
svn commit: r962149 - in /incubator/deltacloud/trunk: drivers/ec2/
drivers/ec2/lib/ drivers/mock/ drivers/mock/lib/ drivers/rackspace/
drivers/rackspace/lib/ drivers/rhevm/ drivers/rhevm/config/
drivers/rhevm/lib/ drivers/rhevm/scripts/ framework/confi...
Author: lutter
Date: Thu Jul 8 23:26:10 2010
New Revision: 962149
URL: http://svn.apache.org/viewvc?rev=962149&view=rev
Log:
Perform tighter merge of drivers into framework.
Added:
incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/
incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/ec2_driver.rb
- copied, changed from r962148, incubator/deltacloud/trunk/drivers/ec2/lib/ec2_driver.rb
incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/mock_driver.rb
- copied, changed from r962148, incubator/deltacloud/trunk/drivers/mock/lib/mock_driver.rb
incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rackspace_client.rb
- copied, changed from r962148, incubator/deltacloud/trunk/drivers/rackspace/lib/rackspace_client.rb
incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rackspace_driver.rb
- copied, changed from r962148, incubator/deltacloud/trunk/drivers/rackspace/lib/rackspace_driver.rb
incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rhevm_driver.rb
- copied, changed from r962148, incubator/deltacloud/trunk/drivers/rhevm/lib/rhevm_driver.rb
Removed:
incubator/deltacloud/trunk/drivers/ec2/.gitignore
incubator/deltacloud/trunk/drivers/ec2/COPYING
incubator/deltacloud/trunk/drivers/ec2/lib/ec2_driver.rb
incubator/deltacloud/trunk/drivers/mock/.gitignore
incubator/deltacloud/trunk/drivers/mock/COPYING
incubator/deltacloud/trunk/drivers/mock/lib/mock_driver.rb
incubator/deltacloud/trunk/drivers/rackspace/.gitignore
incubator/deltacloud/trunk/drivers/rackspace/COPYING
incubator/deltacloud/trunk/drivers/rackspace/lib/rackspace_client.rb
incubator/deltacloud/trunk/drivers/rackspace/lib/rackspace_driver.rb
incubator/deltacloud/trunk/drivers/rhevm/.gitignore
incubator/deltacloud/trunk/drivers/rhevm/COPYING
incubator/deltacloud/trunk/drivers/rhevm/config/rhevm_config.yaml.EXAMPLE
incubator/deltacloud/trunk/drivers/rhevm/lib/rhevm_driver.rb
incubator/deltacloud/trunk/drivers/rhevm/scripts/addVM.ps1
incubator/deltacloud/trunk/drivers/rhevm/scripts/common.ps1
incubator/deltacloud/trunk/drivers/rhevm/scripts/deleteVm.ps1
incubator/deltacloud/trunk/drivers/rhevm/scripts/rebootVm.ps1
incubator/deltacloud/trunk/drivers/rhevm/scripts/startVm.ps1
incubator/deltacloud/trunk/drivers/rhevm/scripts/stopVm.ps1
incubator/deltacloud/trunk/drivers/rhevm/scripts/storageDomains.ps1
incubator/deltacloud/trunk/drivers/rhevm/scripts/templateById.ps1
incubator/deltacloud/trunk/drivers/rhevm/scripts/templates.ps1
incubator/deltacloud/trunk/drivers/rhevm/scripts/vmById.ps1
incubator/deltacloud/trunk/drivers/rhevm/scripts/vms.ps1
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=962149&r1=962148&r2=962149&view=diff
==============================================================================
--- incubator/deltacloud/trunk/framework/config/environment.rb (original)
+++ incubator/deltacloud/trunk/framework/config/environment.rb Thu Jul 8 23:26:10 2010
@@ -92,10 +92,12 @@ $: << DRIVER_ROOT+'/lib'
case DRIVER
when :mock
- DRIVER_CLASS_NAME = "MockDriver"
+ DRIVER_CLASS_NAME = "Deltacloud::Drivers::MockDriver"
MOCK_STORAGE_ROOT = File.dirname( __FILE__ ) + "/../../client-ruby/specs/data"
when :ec2
- DRIVER_CLASS_NAME = "Ec2Driver"
+ DRIVER_CLASS_NAME = "Deltacloud::Drivers::Ec2Driver"
+ when :rackspace
+ DRIVER_CLASS_NAME = "Deltacloud::Drivers::Ec2Driver"
when :rhevm
- DRIVER_CLASS_NAME = "RHEVMDriver"
+ DRIVER_CLASS_NAME = "Deltacloud::Drivers::RHEVMDriver"
end
Copied: incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/ec2_driver.rb (from r962148, incubator/deltacloud/trunk/drivers/ec2/lib/ec2_driver.rb)
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/ec2_driver.rb?p2=incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/ec2_driver.rb&p1=incubator/deltacloud/trunk/drivers/ec2/lib/ec2_driver.rb&r1=962148&r2=962149&rev=962149&view=diff
==============================================================================
--- incubator/deltacloud/trunk/drivers/ec2/lib/ec2_driver.rb (original)
+++ incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/ec2_driver.rb Thu Jul 8 23:26:10 2010
@@ -19,6 +19,8 @@
require 'deltacloud/base_driver'
require 'right_aws'
+module Deltacloud
+ module Drivers
class Ec2Driver < DeltaCloud::BaseDriver
#
@@ -324,5 +326,8 @@ class Ec2Driver < DeltaCloud::BaseDriver
end
end
+end
+ end
end
+
Copied: incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/mock_driver.rb (from r962148, incubator/deltacloud/trunk/drivers/mock/lib/mock_driver.rb)
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/mock_driver.rb?p2=incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/mock_driver.rb&p1=incubator/deltacloud/trunk/drivers/mock/lib/mock_driver.rb&r1=962148&r2=962149&rev=962149&view=diff
==============================================================================
--- incubator/deltacloud/trunk/drivers/mock/lib/mock_driver.rb (original)
+++ incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/mock_driver.rb Thu Jul 8 23:26:10 2010
@@ -18,6 +18,9 @@
require 'deltacloud/base_driver'
+module Deltacloud
+ module Drivers
+
class MockDriver < DeltaCloud::BaseDriver
( STORAGE_ROOT = MOCK_STORAGE_ROOT ) unless defined?( STORAGE_ROOT )
@@ -279,3 +282,6 @@ class MockDriver < DeltaCloud::BaseDrive
end
+
+ end
+end
Copied: incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rackspace_client.rb (from r962148, incubator/deltacloud/trunk/drivers/rackspace/lib/rackspace_client.rb)
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rackspace_client.rb?p2=incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rackspace_client.rb&p1=incubator/deltacloud/trunk/drivers/rackspace/lib/rackspace_client.rb&r1=962148&r2=962149&rev=962149&view=diff
==============================================================================
--- incubator/deltacloud/trunk/drivers/rackspace/lib/rackspace_client.rb (original)
+++ incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rackspace_client.rb Thu Jul 8 23:26:10 2010
@@ -24,6 +24,9 @@ require 'json'
# author: Michael Neale
# TODO: catch generic errors in JSON response and throw (probably)
#
+module Deltacloud
+ module Drivers
+
class RackspaceClient
@@AUTH_API = URI.parse('https://auth.api.rackspacecloud.com/v1.0')
@@ -79,10 +82,9 @@ class RackspaceClient
{"Accept" => "application/json", "X-Auth-Token" => @auth_token, "Content-Type" => "application/json"}
end
+end
-
-
-
+ end
end
Copied: incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rackspace_driver.rb (from r962148, incubator/deltacloud/trunk/drivers/rackspace/lib/rackspace_driver.rb)
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rackspace_driver.rb?p2=incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rackspace_driver.rb&p1=incubator/deltacloud/trunk/drivers/rackspace/lib/rackspace_driver.rb&r1=962148&r2=962149&rev=962149&view=diff
==============================================================================
--- incubator/deltacloud/trunk/drivers/rackspace/lib/rackspace_driver.rb (original)
+++ incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rackspace_driver.rb Thu Jul 8 23:26:10 2010
@@ -18,6 +18,9 @@
require 'deltacloud/base_driver'
require 'rackspace_client'
+module Deltacloud
+ module Drivers
+
class RackspaceDriver < DeltaCloud::BaseDriver
def flavors(credentials, opts=nil)
@@ -158,3 +161,6 @@ class RackspaceDriver < DeltaCloud::Base
#RUNNING
end
+
+ end
+end
Copied: incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rhevm_driver.rb (from r962148, incubator/deltacloud/trunk/drivers/rhevm/lib/rhevm_driver.rb)
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rhevm_driver.rb?p2=incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rhevm_driver.rb&p1=incubator/deltacloud/trunk/drivers/rhevm/lib/rhevm_driver.rb&r1=962148&r2=962149&rev=962149&view=diff
==============================================================================
--- incubator/deltacloud/trunk/drivers/rhevm/lib/rhevm_driver.rb (original)
+++ incubator/deltacloud/trunk/framework/lib/deltacloud/drivers/rhevm_driver.rb Thu Jul 8 23:26:10 2010
@@ -18,6 +18,9 @@
require 'deltacloud/base_driver'
require 'yaml'
+module Deltacloud
+ module Drivers
+
class RHEVMDriver < DeltaCloud::BaseDriver
SCRIPT_DIR = File.dirname(__FILE__) + '/../scripts'
@@ -265,4 +268,7 @@ class RHEVMDriver < DeltaCloud::BaseDriv
snapshots
end
-end
\ No newline at end of file
+end
+
+ end
+end