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/24 13:38:51 UTC
[1/3] git commit: CIMI tests: sent auth headers for CEP, too
Updated Branches:
refs/heads/master 1d9177495 -> 92876691b
CIMI tests: sent auth headers for CEP, too
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/92876691
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/92876691
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/92876691
Branch: refs/heads/master
Commit: 92876691bb6d5fa4a372eecf2add0ce1f6f6c5b5
Parents: bff0086
Author: David Lutterkort <lu...@redhat.com>
Authored: Tue Apr 23 16:43:05 2013 -0700
Committer: marios <ma...@redhat.com>
Committed: Wed Apr 24 14:34:57 2013 +0300
----------------------------------------------------------------------
tests/cimi/test_helper.rb | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/92876691/tests/cimi/test_helper.rb
----------------------------------------------------------------------
diff --git a/tests/cimi/test_helper.rb b/tests/cimi/test_helper.rb
index c4bedac..778bb8f 100644
--- a/tests/cimi/test_helper.rb
+++ b/tests/cimi/test_helper.rb
@@ -88,7 +88,9 @@ module CIMI
private
def xml
unless @xml
- @xml = RestClient.get(cep_url, "Accept" => "application/xml").xml
+ h = auth_header
+ h['Accept'] = 'application/xml'
+ @xml = RestClient.get(cep_url, h).xml
end
@xml
end
[3/3] git commit: CIMI CEP: driver/provider should not be mandatory
Posted by ma...@apache.org.
CIMI CEP: driver/provider should not be mandatory
Otherwise, we can't use this against non-Deltacloud CEP's
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/61b46432
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/61b46432
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/61b46432
Branch: refs/heads/master
Commit: 61b46432cb31dcdc11e21f8c69b451ba8b2be69f
Parents: 1d91774
Author: David Lutterkort <lu...@redhat.com>
Authored: Tue Apr 23 16:37:56 2013 -0700
Committer: marios <ma...@redhat.com>
Committed: Wed Apr 24 14:34:57 2013 +0300
----------------------------------------------------------------------
server/lib/cimi/models/cloud_entry_point.rb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/61b46432/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 a1ec0a7..adadb62 100644
--- a/server/lib/cimi/models/cloud_entry_point.rb
+++ b/server/lib/cimi/models/cloud_entry_point.rb
@@ -15,8 +15,8 @@
class CIMI::Model::CloudEntryPoint < CIMI::Model::Base
- text :driver, :required => true
- text :provider, :required => true
+ text :driver
+ text :provider
# All possible CIMI collections, in the order in which they should appear
# in the CEP
[2/3] git commit: CIMI tests: fix minor nits
Posted by ma...@apache.org.
CIMI tests: fix minor nits
Some of the XML sent to the server was not correct
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/bff00865
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/bff00865
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/bff00865
Branch: refs/heads/master
Commit: bff0086533ad17b00c802358718c848bc60f4564
Parents: 61b4643
Author: David Lutterkort <lu...@redhat.com>
Authored: Tue Apr 23 16:40:34 2013 -0700
Committer: marios <ma...@redhat.com>
Committed: Wed Apr 24 14:34:57 2013 +0300
----------------------------------------------------------------------
tests/cimi/system1_test.rb | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/bff00865/tests/cimi/system1_test.rb
----------------------------------------------------------------------
diff --git a/tests/cimi/system1_test.rb b/tests/cimi/system1_test.rb
index 6102c37..6371653 100644
--- a/tests/cimi/system1_test.rb
+++ b/tests/cimi/system1_test.rb
@@ -71,10 +71,10 @@ class SystemTemplate < CIMI::Test::Spec
system_add_uri = discover_uri_for("add", "systems")
# 1.4 Create a new system from the systemTemplate
system_created = post(system_add_uri,
- "<systemCreate xmlns=\"#{CIMI::Test::CIMI_NAMESPACE}\">" +
+ "<SystemCreate xmlns=\"#{CIMI::Test::CIMI_NAMESPACE}\">" +
"<name>test_system</name>" +
"<systemTemplate href=\"" + get_a(cep_json, "systemTemplate") + "\"/>" +
- "</systemCreate>", :content_type => :xml)
+ "</SystemCreate>", :content_type => :xml)
end
model :systems do |fmt|
@@ -137,7 +137,7 @@ class SystemTemplate < CIMI::Test::Spec
uri = discover_uri_for("start", "", test_system_created.json["operations"])
response = post( uri,
"<Action xmlns=\"http://schemas.dmtf.org/cimi/1\">" +
- "<action> http://http://schemas.dmtf.org/cimi/1/action/start</action>" +
+ "<action>http://schemas.dmtf.org/cimi/1/action/start</action>" +
"</Action>",
:accept => :xml, :content_type => :xml)
response.code.must_equal 202