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:38:15 UTC

svn commit: r962230 - in /incubator/deltacloud/trunk/server/libexec/lib/deltacloud: base_driver.rb base_driver/ base_driver/base_driver.rb

Author: lutter
Date: Thu Jul  8 23:38:14 2010
New Revision: 962230

URL: http://svn.apache.org/viewvc?rev=962230&view=rev
Log:
* lib/deltacloud/base_driver: move into separate directory

Set up the structure for adding feature support to the base driver

Added:
    incubator/deltacloud/trunk/server/libexec/lib/deltacloud/base_driver/
    incubator/deltacloud/trunk/server/libexec/lib/deltacloud/base_driver/base_driver.rb
      - copied, changed from r962229, incubator/deltacloud/trunk/server/libexec/lib/deltacloud/base_driver.rb
Modified:
    incubator/deltacloud/trunk/server/libexec/lib/deltacloud/base_driver.rb

Modified: incubator/deltacloud/trunk/server/libexec/lib/deltacloud/base_driver.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/libexec/lib/deltacloud/base_driver.rb?rev=962230&r1=962229&r2=962230&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/libexec/lib/deltacloud/base_driver.rb (original)
+++ incubator/deltacloud/trunk/server/libexec/lib/deltacloud/base_driver.rb Thu Jul  8 23:38:14 2010
@@ -15,140 +15,4 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-
-module Deltacloud
-
-  class AuthException < Exception
-  end
-
-  class BaseDriver
-
-    def self.define_hardware_profile(name,&block)
-      @hardware_profiles ||= []
-      hw_profile = @hardware_profiles.find{|e| e.name == name}
-      return if hw_profile
-      hw_profile = ::Deltacloud::HardwareProfile.new( name, &block )
-      puts hw_profile.inspect
-      @hardware_profiles << hw_profile
-    end
-
-    def self.hardware_profiles
-      @hardware_profiles ||= []
-      @hardware_profiles
-    end
-
-    def hardware_profiles
-      self.class.hardware_profiles
-    end
-
-    def hardware_profile(name)
-      self.class.hardware_profiles.find{|e| e.name == name }
-    end
-
-    def self.define_instance_states(&block)
-      machine = ::Deltacloud::StateMachine.new(&block)
-      @instance_state_machine = machine
-    end
-
-    def self.instance_state_machine
-      @instance_state_machine
-    end
-
-    def instance_state_machine
-      self.class.instance_state_machine
-    end
-
-    def instance_actions_for(state)
-      actions = []
-      state_key = state.downcase.to_sym
-      states = instance_state_machine.states()
-      current_state = states.find{|e| e.name == state.underscore.to_sym }
-      if ( current_state )
-        actions = current_state.transitions.collect{|e|e.action}
-        actions.reject!{|e| e.nil?}
-      end
-      actions
-    end
-
-    def flavor(credentials, opts)
-      flavors = flavors(credentials, opts)
-      return flavors.first unless flavors.empty?
-      nil
-    end
-
-    def flavors(credentials, ops)
-      []
-    end
-
-    def flavors_by_architecture(credentials, architecture)
-      flavors(credentials, :architecture => architecture)
-    end
-
-    def realm(credentials, opts)
-      realms = realms(credentials, opts)
-      return realms.first unless realms.empty?
-      nil
-    end
-
-    def realms(credentials, opts=nil)
-      []
-    end
-
-    def image(credentials, opts)
-      images = images(credentials, opts)
-      return images.first unless images.empty?
-      nil
-    end
-
-    def images(credentials, ops)
-      []
-    end
-
-    def instance(credentials, opts)
-      instances = instances(credentials, opts)
-      return instances.first unless instances.empty?
-      nil
-    end
-
-    def instances(credentials, ops)
-      []
-    end
-
-    def create_instance(credentials, image_id, opts)
-    end
-    def start_instance(credentials, id)
-    end
-    def stop_instance(credentials, id)
-    end
-    def reboot_instance(credentials, id)
-    end
-
-    def storage_volume(credentials, opts)
-      volumes = storage_volumes(credentials, opts)
-      return volumes.first unless volumes.empty?
-      nil
-    end
-
-    def storage_snapshot(credentials, opts)
-      snapshots = snapshots(credentials, opts)
-      return snapshots.first unless snapshots.empty?
-      nil
-    end
-
-    def snapshots(credentials, ops)
-      []
-    end
-
-    def filter_on(collection, attribute, opts)
-      return collection if opts.nil?
-      return collection if opts[attribute].nil?
-      filter = opts[attribute]
-      if ( filter.is_a?( Array ) )
-        return collection.select{|e| filter.include?( e.send(attribute) ) }
-      else
-        return collection.select{|e| filter == e.send(attribute) }
-      end
-    end
-  end
-
-end
+require 'deltacloud/base_driver/base_driver'

Copied: incubator/deltacloud/trunk/server/libexec/lib/deltacloud/base_driver/base_driver.rb (from r962229, incubator/deltacloud/trunk/server/libexec/lib/deltacloud/base_driver.rb)
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/libexec/lib/deltacloud/base_driver/base_driver.rb?p2=incubator/deltacloud/trunk/server/libexec/lib/deltacloud/base_driver/base_driver.rb&p1=incubator/deltacloud/trunk/server/libexec/lib/deltacloud/base_driver.rb&r1=962229&r2=962230&rev=962230&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/libexec/lib/deltacloud/base_driver.rb (original)
+++ incubator/deltacloud/trunk/server/libexec/lib/deltacloud/base_driver/base_driver.rb Thu Jul  8 23:38:14 2010
@@ -15,7 +15,6 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-
 module Deltacloud
 
   class AuthException < Exception
@@ -129,13 +128,17 @@ module Deltacloud
       nil
     end
 
+    def storage_volumes(credentials, ops)
+      []
+    end
+
     def storage_snapshot(credentials, opts)
-      snapshots = snapshots(credentials, opts)
+      snapshots = storage_snapshots(credentials, opts)
       return snapshots.first unless snapshots.empty?
       nil
     end
 
-    def snapshots(credentials, ops)
+    def storage_snapshots(credentials, ops)
       []
     end