[PATCH 1/2] CIMI: remove prefilled properties from machine

[lutter]

From: David Lutterkort <lut...@redhat.com>

The CIMI spec does not permit providers setting properties on their
own. They are strictly for use by the client.
---
 server/lib/cimi/models/machine.rb | 14 --------------
 1 file changed, 14 deletions(-)

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?
-- 
1.8.1