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 87DBAEF4D for ; Thu, 7 Feb 2013 14:01:04 +0000 (UTC) Received: (qmail 4281 invoked by uid 500); 7 Feb 2013 14:01:04 -0000 Delivered-To: apmail-deltacloud-commits-archive@deltacloud.apache.org Received: (qmail 4247 invoked by uid 500); 7 Feb 2013 14:01:03 -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 4226 invoked by uid 99); 7 Feb 2013 14:01:03 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Feb 2013 14:01:03 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B7C9824C13; Thu, 7 Feb 2013 14:01:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mfojtik@apache.org To: commits@deltacloud.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: passing realm option when creating a new VM Message-Id: <20130207140102.B7C9824C13@tyr.zones.apache.org> Date: Thu, 7 Feb 2013 14:01:02 +0000 (UTC) Updated Branches: refs/heads/master 92a313b7f -> 49d668b00 passing realm option when creating a new VM Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/49d668b0 Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/49d668b0 Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/49d668b0 Branch: refs/heads/master Commit: 49d668b00abb7171078e613c599dea783ab0e2ca Parents: 92a313b Author: Oved Ourfali Authored: Thu Feb 7 15:20:18 2013 +0200 Committer: Michal fojtik Committed: Thu Feb 7 15:00:48 2013 +0100 ---------------------------------------------------------------------- server/lib/cimi/models/machine.rb | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltacloud/blob/49d668b0/server/lib/cimi/models/machine.rb ---------------------------------------------------------------------- diff --git a/server/lib/cimi/models/machine.rb b/server/lib/cimi/models/machine.rb index a44332a..0e180ce 100644 --- a/server/lib/cimi/models/machine.rb +++ b/server/lib/cimi/models/machine.rb @@ -70,6 +70,7 @@ class CIMI::Model::Machine < CIMI::Model::Base additional_params[:initial_state] = machine_template["initialState"].strip end additional_params[:name] = json['name'] if json['name'] + additional_params[:realm_id] = json['realm'] if json['realm'] instance = context.driver.create_instance(context.credentials, image_id, { :hwp_id => hardware_profile_id }.merge(additional_params)) @@ -103,6 +104,7 @@ class CIMI::Model::Machine < CIMI::Model::Base additional_params[:initial_state] = xml["machineTemplate"][0]["initialState"].first.strip end additional_params[:name] = xml['name'][0] if xml['name'] + additional_params[:realm_id] = xml['realm'][0] if xml['realm'] instance = context.driver.create_instance(context.credentials, image_id, { :hwp_id => hardware_profile_id }.merge(additional_params))