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 A956ADD35 for ; Thu, 7 Feb 2013 12:42:24 +0000 (UTC) Received: (qmail 42500 invoked by uid 500); 7 Feb 2013 12:42:24 -0000 Delivered-To: apmail-deltacloud-commits-archive@deltacloud.apache.org Received: (qmail 42394 invoked by uid 500); 7 Feb 2013 12:42:21 -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 42367 invoked by uid 99); 7 Feb 2013 12:42:21 -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 12:42:21 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D19E524BAD; Thu, 7 Feb 2013 12:42:20 +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: [1/2] git commit: The CIMI spec does not permit providers setting properties on their own. They are strictly for use by the client. Message-Id: <20130207124220.D19E524BAD@tyr.zones.apache.org> Date: Thu, 7 Feb 2013 12:42:20 +0000 (UTC) The CIMI spec does not permit providers setting properties on their own. They are strictly for use by the client. Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/23e7678c Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/23e7678c Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/23e7678c Branch: refs/heads/master Commit: 23e7678c86bfc1d7030315072c5ce393757b63b5 Parents: 06f042d Author: David Lutterkort Authored: Thu Feb 7 11:43:06 2013 +0100 Committer: Michal fojtik Committed: Thu Feb 7 11:43:06 2013 +0100 ---------------------------------------------------------------------- server/lib/cimi/models/machine.rb | 14 -------------- 1 files changed, 0 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltacloud/blob/23e7678c/server/lib/cimi/models/machine.rb ---------------------------------------------------------------------- diff --git a/server/lib/cimi/models/machine.rb b/server/lib/cimi/models/machine.rb index 6e075e8..214af42 100644 --- a/server/lib/cimi/models/machine.rb +++ b/server/lib/cimi/models/machine.rb @@ -145,11 +145,6 @@ class CIMI::Model::Machine < CIMI::Model::Base cpu = memory = (instance.instance_profile.id == "opaque")? "n/a" : nil machine_conf = CIMI::Model::MachineConfiguration.find(instance.instance_profile.name, context) stored_attributes ||= load_attributes_for(instance) - if stored_attributes[:property] - stored_attributes[:property].merge!(convert_instance_properties(instance, context)) - else - stored_attributes[:property] = convert_instance_properties(instance, context) - end machine_spec = { :name => instance.name, :created => instance.launch_time.nil? ? Time.now.xmlschema : Time.parse(instance.launch_time.to_s).xmlschema, @@ -186,15 +181,6 @@ class CIMI::Model::Machine < CIMI::Model::Base end end - def self.convert_instance_properties(instance, context) - properties = {} - properties["machine_image"] = context.machine_image_url(instance.image_id) - if instance.respond_to? :keyname - properties["credential"] = context.credential_url(instance.keyname) - end - properties - end - def self.convert_instance_cpu(profile, context) cpu_override = profile.overrides.find { |p, v| p == :cpu } if cpu_override.nil?