[PATCH core 38/51] CIMI: Fixed feature loading in entity_metadata model

[mf...@redhat.com]

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


Signed-off-by: Michal fojtik <mf...@redhat.com>
---
 server/lib/cimi/helpers.rb                |    2 +-
 server/lib/cimi/models/entity_metadata.rb |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/server/lib/cimi/helpers.rb b/server/lib/cimi/helpers.rb
index 05d2621..5fe8cf8 100644
--- a/server/lib/cimi/helpers.rb
+++ b/server/lib/cimi/helpers.rb
@@ -26,7 +26,7 @@ module CIMI
 
   class FakeCollection
     extend Sinatra::Rabbit::Features
-    include Deltacloud::InstanceFeatures
+    include Deltacloud::Features
   end
 end
 
diff --git a/server/lib/cimi/models/entity_metadata.rb b/server/lib/cimi/models/entity_metadata.rb
index 5455c75..c14f3c2 100644
--- a/server/lib/cimi/models/entity_metadata.rb
+++ b/server/lib/cimi/models/entity_metadata.rb
@@ -52,7 +52,8 @@ class CIMI::Model::EntityMetadata < CIMI::Model::Base
   end
 
   def self.metadata_from_deltacloud_features(cimi_entity, dcloud_entity, context)
-    deltacloud_features = context.driver.class.features_for(dcloud_entity)
+    deltacloud_features = context.driver.class.features[dcloud_entity]
+    puts deltacloud_features.inspect
     metadata_attributes = deltacloud_features.map{|f| attributes_from_feature(f)}
     from_feature(cimi_entity, context, metadata_attributes.flatten!)
   end
-- 
1.7.10.1