svn commit: r1231960 - /deltacloud/trunk/server/lib/deltacloud/drivers/rhevm/rhevm_client.rb

[mf...@apache.org]

Author: mfojtik
Date: Mon Jan 16 11:57:34 2012
New Revision: 1231960

URL: http://svn.apache.org/viewvc?rev=1231960&view=rev
Log:
RHEV-M: Choose the image realm when no realm is being specified upon instance creation (DTACLOUD-126)

Modified:
    deltacloud/trunk/server/lib/deltacloud/drivers/rhevm/rhevm_client.rb

Modified: deltacloud/trunk/server/lib/deltacloud/drivers/rhevm/rhevm_client.rb
URL: http://svn.apache.org/viewvc/deltacloud/trunk/server/lib/deltacloud/drivers/rhevm/rhevm_client.rb?rev=1231960&r1=1231959&r2=1231960&view=diff
==============================================================================
--- deltacloud/trunk/server/lib/deltacloud/drivers/rhevm/rhevm_client.rb (original)
+++ deltacloud/trunk/server/lib/deltacloud/drivers/rhevm/rhevm_client.rb Mon Jan 16 11:57:34 2012
@@ -121,12 +121,13 @@ module RHEVM
 
     def create_vm(template_id, opts={})
       opts ||= {}
-      raise RHEVMBackendException::new("Requested VM not found in datacenter #{self.current_datacenter.id}") unless template(template_id)
+      templ = template(template_id)
+      raise RHEVMBackendException::new("Requested VM not found in datacenter #{self.current_datacenter.id}") unless templ
       builder = Nokogiri::XML::Builder.new do
         vm {
           name opts[:name] || "i-#{Time.now.to_i}"
           template_(:id => template_id)
-          cluster_(:id => opts[:realm_id].empty? ? clusters.first.id : opts[:realm_id])
+          cluster_(:id => opts[:realm_id].nil? ? templ.cluster.id : opts[:realm_id])
           type_ opts[:hwp_id] || 'desktop'
           memory opts[:hwp_memory] ? (opts[:hwp_memory].to_i*1024*1024).to_s : (512*1024*1024).to_s
           cpu {