You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@deltacloud.apache.org by lu...@redhat.com on 2012/12/04 09:42:30 UTC

[PATCH 2/6] CIMI: base_uri must end in a slash

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

---
 server/lib/cimi/models/cloud_entry_point.rb |    2 +-
 tests/cimi/test_helper.rb                   |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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
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
 
-- 
1.7.7.6