svn commit: r962046 - /incubator/deltacloud/trunk/drivers/rhevm/lib/rhevm_driver.rb

[lu...@apache.org]

Author: lutter
Date: Thu Jul  8 23:19:11 2010
New Revision: 962046

URL: http://svn.apache.org/viewvc?rev=962046&view=rev
Log:
death to resource_id

Modified:
    incubator/deltacloud/trunk/drivers/rhevm/lib/rhevm_driver.rb

Modified: incubator/deltacloud/trunk/drivers/rhevm/lib/rhevm_driver.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/drivers/rhevm/lib/rhevm_driver.rb?rev=962046&r1=962045&r2=962046&view=diff
==============================================================================
--- incubator/deltacloud/trunk/drivers/rhevm/lib/rhevm_driver.rb (original)
+++ incubator/deltacloud/trunk/drivers/rhevm/lib/rhevm_driver.rb Thu Jul  8 23:19:11 2010
@@ -15,7 +15,7 @@ class RHEVMDriver < DeltaCloud::BaseDriv
   # 
   FLAVORS = [
     Flavor.new({ 
-      :resource_id=>"rhevm",
+      :id=>"rhevm",
       :memory=>"Any",
       :storage=>"Any",
       :architecture=>"Any",
@@ -24,7 +24,7 @@ class RHEVMDriver < DeltaCloud::BaseDriv
   
   def flavors(credentials, opts=nil)
     return FLAVORS if ( opts.nil? )
-    FLAVORS.select{|f| opts[:id] == f.resource_id}
+    FLAVORS.select{|f| opts[:id] == f.id}
   end
 
   #
@@ -88,7 +88,7 @@ class RHEVMDriver < DeltaCloud::BaseDriv
   
   def template_to_image(templ)
     Image.new({
-      :resource_id => templ["TemplateId"],
+      :id => templ["TemplateId"],
       :name => templ["Name"],
       :description => templ["Description"],
       :architecture => templ["OperatingSystem"],
@@ -122,7 +122,7 @@ class RHEVMDriver < DeltaCloud::BaseDriv
   
   def vm_to_instance(vm)
     Instance.new({
-      :resource_id => vm["VmId"],
+      :id => vm["VmId"],
       :description => vm["Description"],
       :name => vm["Name"],      
       :architecture => vm["OperatingSystem"],