On 02/25, [email protected] wrote: ACK. Two minor non-review-blockers issues found below :)
-- Michal > From: Dies Koper <[email protected]> > > --- > server/lib/cimi/data/default_res/machine.col.xml | 4 ++-- I just discovered this directory :-) I think we should move all sample CIMI XML/JSON to server/support/cimi. I use this directory to store various CIMI XML files I used for entity creation during testing/etc. > server/lib/cimi/models/base.rb | 4 ++-- > server/lib/cimi/models/machine.rb | 2 +- > server/lib/cimi/models/machine_configuration.rb | 2 +- > server/lib/cimi/models/machine_template.rb | 6 ++---- > server/lib/cimi/models/volume.rb | 4 ++-- > server/tests/cimi/data/machine_template.json | 3 +-- > server/tests/cimi/data/machine_template.xml | 2 +- > 8 files changed, 12 insertions(+), 15 deletions(-) > <snip/> > +++ b/server/lib/cimi/models/volume.rb > @@ -77,13 +77,13 @@ class CIMI::Model::Volume < CIMI::Model::Base > def self.find_to_attach_from_json(json_in, context) > json = JSON.parse(json_in) > json["volumes"].map{|v| > {:volume=>self.find(v["volume"]["href"].split("/volumes/").last, context), > - :attachment_point=>v["attachmentPoint"] }} > + :initial_location=>v["initialLocation"] }} > end > > def self.find_to_attach_from_xml(xml_in, context) > xml = XmlSimple.xml_in(xml_in) > xml["volume"].map{|v| {:volume => > self.find(v["href"].split("/volumes/").last, context), > - :attachment_point=>v["attachmentPoint"] }} > + :initial_location=>v["initialLocation"] }} > end I tried to locate where we use these two method in code but no luck :( ~/code/core/server › ack find_to_attach_from_json lib/cimi/models/volume.rb 77: def self.find_to_attach_from_json(json_in, context) lib/cimi/models/machine_volume.rb 64: def self.find_to_attach_from_json(json_in, context) lib/cimi/collections/machines.rb 175: volume_to_attach, location = MachineVolume.find_to_attach_from_json(request.body.read, self) I think this method was obsoleted and so should be removed. -- Michal -- Michal Fojtik <[email protected]> Deltacloud API, CloudForms
