Return-Path: 
 <deltacloud-dev-return-947-apmail-incubator-deltacloud-dev-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-deltacloud-dev-archive@minotaur.apache.org
Received: (qmail 27439 invoked from network); 4 Jan 2011 12:06:50 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 4 Jan 2011 12:06:50 -0000
Received: (qmail 85892 invoked by uid 500); 4 Jan 2011 12:06:50 -0000
Delivered-To: apmail-incubator-deltacloud-dev-archive@incubator.apache.org
Received: (qmail 85844 invoked by uid 500); 4 Jan 2011 12:06:50 -0000
Mailing-List: contact deltacloud-dev-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:deltacloud-dev-help@incubator.apache.org>
List-Unsubscribe: <mailto:deltacloud-dev-unsubscribe@incubator.apache.org>
List-Post: <mailto:deltacloud-dev@incubator.apache.org>
List-Id: <deltacloud-dev.incubator.apache.org>
Reply-To: deltacloud-dev@incubator.apache.org
Delivered-To: mailing list deltacloud-dev@incubator.apache.org
Received: (qmail 85836 invoked by uid 99); 4 Jan 2011 12:06:50 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Jan 2011 12:06:50 +0000
X-ASF-Spam-Status: No, hits=-5.0 required=10.0
	tests=RCVD_IN_DNSWL_HI,SPF_HELO_PASS,SPF_PASS
X-Spam-Check-By: apache.org
Received-SPF: pass (nike.apache.org: domain of mfojtik@redhat.com designates
 209.132.183.28 as permitted sender)
Received: from [209.132.183.28] (HELO mx1.redhat.com) (209.132.183.28)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Jan 2011 12:06:43 +0000
Received: from int-mx01.intmail.prod.int.phx2.redhat.com
 (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id p04C6LuU004568
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
	for <deltacloud-dev@incubator.apache.org>; Tue, 4 Jan 2011 07:06:21 -0500
Received: from patashnik.brq.redhat.com (dhcp-2-138.brq.redhat.com
 [10.34.2.138])
	by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id
 p04C6GCT027869
	for <deltacloud-dev@incubator.apache.org>; Tue, 4 Jan 2011 07:06:20 -0500
From: mfojtik@redhat.com
To: deltacloud-dev@incubator.apache.org
Subject: [PATCH core 3/5] Fixed specifying a memory and cpu cores for instance
Date: Tue,  4 Jan 2011 13:06:14 +0100
Message-Id: <1294142776-15709-4-git-send-email-mfojtik@redhat.com>
In-Reply-To: <1294142776-15709-1-git-send-email-mfojtik@redhat.com>
References: <1294142776-15709-1-git-send-email-mfojtik@redhat.com>
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11
X-Virus-Checked: Checked by ClamAV on apache.org

From: Michal Fojtik <mfojtik@redhat.com>

---
 .../lib/deltacloud/drivers/rhevm/rhevm_driver.rb   |   21 ++++++++++---------
 1 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/server/lib/deltacloud/drivers/rhevm/rhevm_driver.rb b/server/lib/deltacloud/drivers/rhevm/rhevm_driver.rb
index af0a32e..d3c9918 100644
--- a/server/lib/deltacloud/drivers/rhevm/rhevm_driver.rb
+++ b/server/lib/deltacloud/drivers/rhevm/rhevm_driver.rb
@@ -182,9 +182,9 @@ class RHEVMDriver < Deltacloud::BaseDriver
       vm_template = "<template id='#{image_id}'/>"
       vm_cluster = opts[:realm_id] ? "<cluster id='#{opts[:realm_id]}'/>" : "<cluster id='0'/>"
       vm_type = opts[:hwp_id] ? "<type>#{opts[:hwp_id]}</type>" : "<type>DESKTOP</type>"
-      # FIXME: Setting a memory from RHEV-API leads to Internal Server Error on
-      # RHEV-M API side
       vm_memory = opts[:hwp_memory] ? "<memory>#{opts[:hwp_memory].to_i*1024}</memory>"  : ''
+      vm_cpus = opts[:hwp_cpu] ? "<cpu><topology cores='#{opts[:hwp_cpu]}' sockets='1'/></cpu>"  : ''
+      puts vm_cpus.inspect
       # TODO: Add storage here (it isn't supported by RHEV-M API so far)
       convert_instance(client, ::RHEVM::Vm::new(client, client.create_vm(
         "<vm>"+
@@ -192,7 +192,8 @@ class RHEVMDriver < Deltacloud::BaseDriver
         vm_template +
         vm_cluster +
         vm_type +
-        # vm_memory +
+        vm_memory +
+        vm_cpus +
         "</vm>"
       ).xpath('vm')))
     end
@@ -283,13 +284,13 @@ class RHEVMDriver < Deltacloud::BaseDriver
   # Disabling this error catching will lead to more verbose messages
   # on console (eg. response from RHEV-M API (so far I didn't figure our
   # how to pass those message to our exception handling tool)
-  def catched_exceptions_list
-    {
-      :auth => RestClient::Unauthorized,
-      :error => RestClient::InternalServerError,
-      :glob => [ /RestClient::(\w+)/ ]
-    }
-  end
+  #def catched_exceptions_list
+  #  {
+  #    :auth => RestClient::Unauthorized,
+  #    :error => RestClient::InternalServerError,
+  #    :glob => [ /RestClient::(\w+)/ ]
+  #  }
+  #end
 
 end
 
-- 
1.7.3.3