You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by mf...@apache.org on 2012/07/18 10:27:46 UTC
[3/4] git commit: Core: Removed obsoleted helper from base driver and
added missing requires to make base_driver work standalone
Core: Removed obsoleted helper from base driver and added missing requires to make base_driver work standalone
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/a4bd0cc2
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/a4bd0cc2
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/a4bd0cc2
Branch: refs/heads/master
Commit: a4bd0cc2d9aabe64654b07aa2dfda609fa51c561
Parents: 3816220
Author: Michal Fojtik <mf...@redhat.com>
Authored: Tue Jul 17 13:06:12 2012 +0200
Committer: Michal fojtik <mf...@redhat.com>
Committed: Wed Jul 18 10:26:38 2012 +0200
----------------------------------------------------------------------
server/lib/deltacloud/drivers/base_driver.rb | 20 ++++++--------------
1 files changed, 6 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/a4bd0cc2/server/lib/deltacloud/drivers/base_driver.rb
----------------------------------------------------------------------
diff --git a/server/lib/deltacloud/drivers/base_driver.rb b/server/lib/deltacloud/drivers/base_driver.rb
index 555a244..21e4382 100644
--- a/server/lib/deltacloud/drivers/base_driver.rb
+++ b/server/lib/deltacloud/drivers/base_driver.rb
@@ -16,6 +16,12 @@
module Deltacloud
+ require_relative '../core_ext.rb'
+ require_relative './exceptions.rb'
+ require_relative './features.rb'
+ require_relative '../models/hardware_profile.rb'
+ require_relative '../models/state_machine.rb'
+
class BaseDriver
include ExceptionHandler
@@ -33,12 +39,6 @@ module Deltacloud
@features ||= {}
end
- def self.features_for(entity)
- features.inject([]) do |result, item|
- result << item[entity] if item.has_key? entity
- result
- end
- end
def self.feature(collection, feature_name)
return if has_feature?(collection, feature_name)
@@ -257,14 +257,6 @@ module Deltacloud
end
end
- def supported_collections
- DEFAULT_COLLECTIONS
- end
-
- def has_collection?(collection)
- supported_collections.include?(collection)
- end
-
def catched_exceptions_list
{ :error => [], :auth => [], :glob => [] }
end