You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by ma...@apache.org on 2013/04/22 18:35:11 UTC
[3/7] git commit: CIMI: CIMI Systems - convert returned Model::System
to Service::System & typo on SystemCreate
CIMI: CIMI Systems - convert returned Model::System to Service::System & typo on SystemCreate
(CIMI::Service::SystemCreate was not using resolved template)
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/84c7bbd8
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/84c7bbd8
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/84c7bbd8
Branch: refs/heads/master
Commit: 84c7bbd876ec2c2aef2c21e7fd6ca609d09ad883
Parents: ac2495e
Author: marios <ma...@redhat.com>
Authored: Mon Apr 22 19:29:44 2013 +0300
Committer: marios <ma...@redhat.com>
Committed: Mon Apr 22 19:29:44 2013 +0300
----------------------------------------------------------------------
server/lib/cimi/service/system.rb | 3 ++-
server/lib/cimi/service/system_create.rb | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/84c7bbd8/server/lib/cimi/service/system.rb
----------------------------------------------------------------------
diff --git a/server/lib/cimi/service/system.rb b/server/lib/cimi/service/system.rb
index 21a8dfe..550d452 100644
--- a/server/lib/cimi/service/system.rb
+++ b/server/lib/cimi/service/system.rb
@@ -17,10 +17,11 @@ class CIMI::Service::System < CIMI::Service::Base
def self.find(id, context)
if id == :all
systems = context.driver.systems(context.credentials, {:env=>context})
+ systems.collect {|e| CIMI::Service::System.new(context, :model => e)}
else
systems = context.driver.systems(context.credentials, {:env=>context, :id=>id})
raise CIMI::Model::NotFound unless systems.first
- systems.first
+ CIMI::Service::System.new(context, :model=>systems.first)
end
end
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/84c7bbd8/server/lib/cimi/service/system_create.rb
----------------------------------------------------------------------
diff --git a/server/lib/cimi/service/system_create.rb b/server/lib/cimi/service/system_create.rb
index 5e58445..f2c9e77 100644
--- a/server/lib/cimi/service/system_create.rb
+++ b/server/lib/cimi/service/system_create.rb
@@ -23,7 +23,7 @@ class CIMI::Service::SystemCreate < CIMI::Service::Base
# tries to override some aspect of the system template ?
end
params = {
- :system_template => system_template,
+ :system_template => template,
:name => name,
:description => description,
:env => context