Return-Path: X-Original-To: apmail-deltacloud-commits-archive@www.apache.org Delivered-To: apmail-deltacloud-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 511DF9A0B for ; Thu, 24 Nov 2011 13:19:28 +0000 (UTC) Received: (qmail 65559 invoked by uid 500); 24 Nov 2011 13:19:28 -0000 Delivered-To: apmail-deltacloud-commits-archive@deltacloud.apache.org Received: (qmail 65542 invoked by uid 500); 24 Nov 2011 13:19:28 -0000 Mailing-List: contact commits-help@deltacloud.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@deltacloud.apache.org Delivered-To: mailing list commits@deltacloud.apache.org Received: (qmail 65534 invoked by uid 99); 24 Nov 2011 13:19:28 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Nov 2011 13:19:28 +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; Thu, 24 Nov 2011 13:19:25 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 052F02388A36 for ; Thu, 24 Nov 2011 13:19:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1205813 - /deltacloud/trunk/server/lib/cimi/server.rb Date: Thu, 24 Nov 2011 13:19:04 -0000 To: commits@deltacloud.apache.org From: mfojtik@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111124131905.052F02388A36@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mfojtik Date: Thu Nov 24 13:19:04 2011 New Revision: 1205813 URL: http://svn.apache.org/viewvc?rev=1205813&view=rev Log: CIMI: Implemented :show operation for :machine_configuration model in Rabbit Modified: deltacloud/trunk/server/lib/cimi/server.rb Modified: deltacloud/trunk/server/lib/cimi/server.rb URL: http://svn.apache.org/viewvc/deltacloud/trunk/server/lib/cimi/server.rb?rev=1205813&r1=1205812&r2=1205813&view=diff ============================================================================== --- deltacloud/trunk/server/lib/cimi/server.rb (original) +++ deltacloud/trunk/server/lib/cimi/server.rb Thu Nov 24 13:19:04 2011 @@ -19,7 +19,7 @@ require 'cimi/helpers/cmwgapp_helper' set :version, '0.1.0' -include Deltacloud::Drivers +include CIMI::Drivers set :drivers, Proc.new { driver_config } STOREROOT = File.join($top_srcdir, 'lib', 'cimi', 'data') @@ -108,9 +108,12 @@ global_collection :machine_configuration end operation :show do - description "Show specific machine configuration." - with_capability :hardware_profile - param :id, :string, :required + + description "The Machine Configuration entity represents the set of configuration values "+ + "that define the (virtual) hardware resources of a to-be-realized Machine Instance.." + + param :id, :string, :required + control do @profile = driver.hardware_profile(credentials, params[:id]) if @profile @@ -127,6 +130,7 @@ global_collection :machine_configuration report_error(404) end end + end end