deltacloud-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mfoj...@apache.org
Subject git commit: Fixed couple syntax typos in tests and code
Date Mon, 21 Jan 2013 09:59:34 GMT
Updated Branches:
  refs/heads/master 9111b93a2 -> 0df936b95


Fixed couple syntax typos in tests and code


Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/0df936b9
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/0df936b9
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/0df936b9

Branch: refs/heads/master
Commit: 0df936b95342ca6467e2641300afb4ea58e584c2
Parents: 9111b93
Author: Michal Fojtik <mfojtik@redhat.com>
Authored: Mon Jan 21 10:58:46 2013 +0100
Committer: Michal fojtik <mfojtik@redhat.com>
Committed: Mon Jan 21 10:58:46 2013 +0100

----------------------------------------------------------------------
 server/lib/cimi/helpers/database_helper.rb     |    2 +-
 server/lib/cimi/models/address_template.rb     |    4 ++--
 server/lib/cimi/models/machine_template.rb     |    4 ++--
 server/lib/cimi/models/volume_configuration.rb |    4 ++--
 server/lib/cimi/models/volume_template.rb      |    2 +-
 server/tests/cimi/db/schema_test.rb            |    2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltacloud/blob/0df936b9/server/lib/cimi/helpers/database_helper.rb
----------------------------------------------------------------------
diff --git a/server/lib/cimi/helpers/database_helper.rb b/server/lib/cimi/helpers/database_helper.rb
index e6f73fe..31459f4 100644
--- a/server/lib/cimi/helpers/database_helper.rb
+++ b/server/lib/cimi/helpers/database_helper.rb
@@ -33,7 +33,7 @@ module Deltacloud
       def get_entity(model)
         current_db.entities_dataset.first(
           :be_kind => model.to_entity,
-          :be_id => model.id,
+          :be_id => model.id
         )
       end
 

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/0df936b9/server/lib/cimi/models/address_template.rb
----------------------------------------------------------------------
diff --git a/server/lib/cimi/models/address_template.rb b/server/lib/cimi/models/address_template.rb
index 1e28602..41d86f6 100644
--- a/server/lib/cimi/models/address_template.rb
+++ b/server/lib/cimi/models/address_template.rb
@@ -67,7 +67,7 @@ class CIMI::Model::AddressTemplate < CIMI::Model::Base
       :dns => json['dns'],
       :protocol => json['protocol'],
       :mask => json['mask'],
-      :ent_properties => json['properties'].to_json,
+      :ent_properties => json['properties'].to_json
     )
     from_db(new_template, context)
   end
@@ -85,7 +85,7 @@ class CIMI::Model::AddressTemplate < CIMI::Model::Base
       :dns => xml['dns'].first,
       :protocol => xml['protocol'].nil? ? nil : xml['protocol'].first,
       :mask => xml['mask'].first,
-      :ent_properties => JSON::dump(xml['property'].inject({}) { |r, p| r[p['key']]=p['content'];
r }),
+      :ent_properties => JSON::dump(xml['property'].inject({}) { |r, p| r[p['key']]=p['content'];
r })
     )
     from_db(new_template, context)
   end

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/0df936b9/server/lib/cimi/models/machine_template.rb
----------------------------------------------------------------------
diff --git a/server/lib/cimi/models/machine_template.rb b/server/lib/cimi/models/machine_template.rb
index 675f709..32d2c13 100644
--- a/server/lib/cimi/models/machine_template.rb
+++ b/server/lib/cimi/models/machine_template.rb
@@ -59,7 +59,7 @@ class CIMI::Model::MachineTemplate < CIMI::Model::Base
         :description => json['description'],
         :machine_config => json['machineConfig']['href'],
         :machine_image => json['machineImage']['href'],
-        :ent_properties => json['properties'].to_json,
+        :ent_properties => json['properties'].to_json
       )
       from_db(new_template, context)
     end
@@ -71,7 +71,7 @@ class CIMI::Model::MachineTemplate < CIMI::Model::Base
         :description => xml['description'].first,
         :machine_config => xml['machineConfig'].first['href'],
         :machine_image => xml['machineImage'].first['href'],
-        :ent_properties => JSON::dump(xml['property'].inject({}) { |r, p| r[p['key']]=p['content'];
r }),
+        :ent_properties => JSON::dump(xml['property'].inject({}) { |r, p| r[p['key']]=p['content'];
r })
       )
       from_db(new_template, context)
     end

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/0df936b9/server/lib/cimi/models/volume_configuration.rb
----------------------------------------------------------------------
diff --git a/server/lib/cimi/models/volume_configuration.rb b/server/lib/cimi/models/volume_configuration.rb
index 12a3198..9f15635 100644
--- a/server/lib/cimi/models/volume_configuration.rb
+++ b/server/lib/cimi/models/volume_configuration.rb
@@ -32,7 +32,7 @@ class CIMI::Model::VolumeConfiguration < CIMI::Model::Base
       :description => json['description'],
       :format => json['format'],
       :capacity => json['capacity'],
-      :ent_properties => json['properties'].to_json,
+      :ent_properties => json['properties'].to_json
     )
     from_db(new_config, context)
   end
@@ -45,7 +45,7 @@ class CIMI::Model::VolumeConfiguration < CIMI::Model::Base
       :description => xml['description'].first,
       :format => xml['format'].first,
       :capacity => xml['capacity'].first,
-      :ent_properties => JSON::dump(xml['property'].inject({}) { |r, p| r[p['key']]=p['content'];
r }),
+      :ent_properties => JSON::dump(xml['property'].inject({}) { |r, p| r[p['key']]=p['content'];
r })
     )
     from_db(new_config, context)
   end

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/0df936b9/server/lib/cimi/models/volume_template.rb
----------------------------------------------------------------------
diff --git a/server/lib/cimi/models/volume_template.rb b/server/lib/cimi/models/volume_template.rb
index 47bbb3f..3a98128 100644
--- a/server/lib/cimi/models/volume_template.rb
+++ b/server/lib/cimi/models/volume_template.rb
@@ -56,7 +56,7 @@ class CIMI::Model::VolumeTemplate < CIMI::Model::Base
       :description => input['description'],
       :volume_config => input['volumeConfig']['href'],
       :volume_image => vol_image,
-      :ent_properties => JSON::dump(input['property'].inject({}) { |r, p| r[p['key']]=p['content'];
r }),
+      :ent_properties => JSON::dump(input['property'].inject({}) { |r, p| r[p['key']]=p['content'];
r })
     )
     from_db(new_template, context)
   end

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/0df936b9/server/tests/cimi/db/schema_test.rb
----------------------------------------------------------------------
diff --git a/server/tests/cimi/db/schema_test.rb b/server/tests/cimi/db/schema_test.rb
index db5e71c..a7984d8 100644
--- a/server/tests/cimi/db/schema_test.rb
+++ b/server/tests/cimi/db/schema_test.rb
@@ -86,7 +86,7 @@ describe Deltacloud::Database do
       new_entity = entity_provider.add_machine_template(
         :name => 'testMachineTemplate1',
         :description => 'testMachineTemplate1 description',
-        :ent_properties => JSON::dump(:key => 'value'),
+        :ent_properties => JSON::dump(:key => 'value')
       )
     }.must_raise Sequel::ValidationFailed
   end


Mime
View raw message