Return-Path: X-Original-To: apmail-incubator-deltacloud-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-deltacloud-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 750E4358 for ; Fri, 6 May 2011 12:11:28 +0000 (UTC) Received: (qmail 82368 invoked by uid 500); 6 May 2011 12:11:28 -0000 Delivered-To: apmail-incubator-deltacloud-commits-archive@incubator.apache.org Received: (qmail 82026 invoked by uid 500); 6 May 2011 12:11:27 -0000 Mailing-List: contact deltacloud-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: deltacloud-dev@incubator.apache.org Delivered-To: mailing list deltacloud-commits@incubator.apache.org Received: (qmail 81883 invoked by uid 99); 6 May 2011 12:11:27 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 May 2011 12:11:27 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 May 2011 12:11:20 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0F07D2388980; Fri, 6 May 2011 12:11:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1100184 - /incubator/deltacloud/trunk/server/lib/deltacloud/drivers/rhevm/rhevm_client.rb Date: Fri, 06 May 2011 12:11:00 -0000 To: deltacloud-commits@incubator.apache.org From: mfojtik@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110506121100.0F07D2388980@eris.apache.org> Author: mfojtik Date: Fri May 6 12:10:59 2011 New Revision: 1100184 URL: http://svn.apache.org/viewvc?rev=1100184&view=rev Log: Fixed wrong memory calculation when hwp_memory parameter in RHEV-M driver Modified: incubator/deltacloud/trunk/server/lib/deltacloud/drivers/rhevm/rhevm_client.rb Modified: incubator/deltacloud/trunk/server/lib/deltacloud/drivers/rhevm/rhevm_client.rb URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/lib/deltacloud/drivers/rhevm/rhevm_client.rb?rev=1100184&r1=1100183&r2=1100184&view=diff ============================================================================== --- incubator/deltacloud/trunk/server/lib/deltacloud/drivers/rhevm/rhevm_client.rb (original) +++ incubator/deltacloud/trunk/server/lib/deltacloud/drivers/rhevm/rhevm_client.rb Fri May 6 12:10:59 2011 @@ -58,7 +58,7 @@ module RHEVM template_(:id => template_id) cluster(:id => opts[:realm_id] || clusters.first.id) type_ opts[:hwp_id] || 'desktop' - memory opts[:hwp_memory] || (512*1024*1024).to_s + memory opts[:hwp_memory] ? (opts[:hwp_memory].to_i*1024*1024).to_s || (512*1024*1024).to_s cpu { topology( :cores => (opts[:hwp_cpu] || '1'), :sockets => '1' ) }