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 2012/12/04 16:39:56 UTC
[4/6] git commit: CIMI: base_uri must end in a slash
CIMI: base_uri must end in a slash
TrackedAt: http://tracker.deltacloud.org/patch/575c5fb6f6b0f3aa33570fcf82f2cda0738548ba
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/0c8e828a
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/0c8e828a
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/0c8e828a
Branch: refs/heads/master
Commit: 0c8e828a7d132dd6bec1ce248329d9ee2dcdea85
Parents: 775cbdf
Author: David Lutterkort <lu...@redhat.com>
Authored: Mon Dec 3 23:19:27 2012 -0800
Committer: marios <ma...@redhat.com>
Committed: Tue Dec 4 17:26:39 2012 +0200
----------------------------------------------------------------------
server/lib/cimi/models/cloud_entry_point.rb | 2 +-
tests/cimi/test_helper.rb | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/0c8e828a/server/lib/cimi/models/cloud_entry_point.rb
----------------------------------------------------------------------
diff --git a/server/lib/cimi/models/cloud_entry_point.rb b/server/lib/cimi/models/cloud_entry_point.rb
index c03c524..52a3015 100644
--- a/server/lib/cimi/models/cloud_entry_point.rb
+++ b/server/lib/cimi/models/cloud_entry_point.rb
@@ -39,7 +39,7 @@ class CIMI::Model::CloudEntryPoint < CIMI::Model::Base
:name => context.driver.name,
:description => "Cloud Entry Point for the Deltacloud #{context.driver.name} driver",
:id => context.cloudEntryPoint_url,
- :base_uri => context.base_uri,
+ :base_uri => context.base_uri + "/",
:created => Time.now.xmlschema
}))
end
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/0c8e828a/tests/cimi/test_helper.rb
----------------------------------------------------------------------
diff --git a/tests/cimi/test_helper.rb b/tests/cimi/test_helper.rb
index 9e5f6a3..009bac6 100644
--- a/tests/cimi/test_helper.rb
+++ b/tests/cimi/test_helper.rb
@@ -157,9 +157,9 @@ module CIMI::Test::Methods
if path.start_with?("http")
path
elsif path.start_with?("/")
- api.base_uri + path
+ api.base_uri + path[1, path.size]
else
- api.base_uri + "/#{path}"
+ api.base_uri + "#{path}"
end
end