You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by lu...@apache.org on 2013/03/01 01:24:28 UTC
git commit: CIMI - Tests - modifying tests to use *Create
Updated Branches:
refs/heads/master 0faa7b99c -> 2266f813c
CIMI - Tests - modifying tests to use *Create
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/2266f813
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/2266f813
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/2266f813
Branch: refs/heads/master
Commit: 2266f813cc6a73edbe9888bec2871d13abc9c690
Parents: 0faa7b9
Author: Ronelle Landy <rl...@redhat.com>
Authored: Thu Feb 28 16:20:11 2013 -0500
Committer: David Lutterkort <lu...@redhat.com>
Committed: Thu Feb 28 16:23:42 2013 -0800
----------------------------------------------------------------------
tests/cimi/machine_test.rb | 4 ++--
tests/cimi/part5_test.rb | 4 ++--
tests/cimi/rmd3_test.rb | 6 +++---
tests/cimi/rmd4_test.rb | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/2266f813/tests/cimi/machine_test.rb
----------------------------------------------------------------------
diff --git a/tests/cimi/machine_test.rb b/tests/cimi/machine_test.rb
index 7b99557..8dfc0fb 100644
--- a/tests/cimi/machine_test.rb
+++ b/tests/cimi/machine_test.rb
@@ -44,12 +44,12 @@ class MachineBehavior < CIMI::Test::Spec
capture_uri = discover_uri_for("capture", "machines", machine.json["operations"])
#now create the image:
resp = post(capture_uri,
- "<MachineImage>"+
+ "<MachineImageCreate>"+
"<name>image_from_#{machine_id.split("/").last}</name>"+
"<description>my new machine image for machine_test.rb</description>"+
"<type>IMAGE</type>"+
"<imageLocation>#{machine_id}</imageLocation>"+
- "</MachineImage>", {:accept=> :json, :content_type => :xml})
+ "</MachineImageCreate>", {:accept=> :json, :content_type => :xml})
#checks:
resp.code.must_equal 201
resp.headers[:location].must_be_uri
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/2266f813/tests/cimi/part5_test.rb
----------------------------------------------------------------------
diff --git a/tests/cimi/part5_test.rb b/tests/cimi/part5_test.rb
index 8f2eea2..d91df69 100644
--- a/tests/cimi/part5_test.rb
+++ b/tests/cimi/part5_test.rb
@@ -35,7 +35,7 @@ class ManipulateAMachine < CIMI::Test::Spec
#discover machine create URI:
machine_add_uri = discover_uri_for("add", "machines")
machine_created = post(machine_add_uri,
- "<Machine>" +
+ "<MachineCreate>" +
"<name>cimi_machine_part5</name>" +
"<description> created as part of tests/cimi/part5_test </description>" +
"<machineTemplate>" +
@@ -44,7 +44,7 @@ class ManipulateAMachine < CIMI::Test::Spec
"<machineImage " +
"href=\"" + get_a(cep_json, "machineImage") + "\"/>" +
"</machineTemplate>" +
- "</Machine>",
+ "</MachineCreate>",
:accept => :json, :content_type => :xml)
model :machine do |fmt|
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/2266f813/tests/cimi/rmd3_test.rb
----------------------------------------------------------------------
diff --git a/tests/cimi/rmd3_test.rb b/tests/cimi/rmd3_test.rb
index 7efec39..d4de0be 100644
--- a/tests/cimi/rmd3_test.rb
+++ b/tests/cimi/rmd3_test.rb
@@ -82,7 +82,7 @@ class MachinesRMDDefaultInitialState < CIMI::Test::Spec
# discover the 'addURI' for creating Machine
add_uri = discover_uri_for("add", "machines")
resp = post(add_uri,
- "<Machine>" +
+ "<MachineCreate>" +
"<name>cimi_machine_" + rand(6).to_s + "</name>" +
"<machineTemplate>" +
"<machineConfig " +
@@ -90,7 +90,7 @@ class MachinesRMDDefaultInitialState < CIMI::Test::Spec
"<machineImage " +
"href=\"" + get_a(cep_json, "machineImage") + "\"/>" +
"</machineTemplate>" +
- "</Machine>", :accept => :json, :content_type => :xml)
+ "</MachineCreate>", :accept => :json, :content_type => :xml)
model :machine do |fmt|
get resp.json["id"], :accept => fmt
@@ -126,4 +126,4 @@ class MachinesRMDDefaultInitialState < CIMI::Test::Spec
# 3.5: Cleanup
# see @created_resources
-end
+end
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/2266f813/tests/cimi/rmd4_test.rb
----------------------------------------------------------------------
diff --git a/tests/cimi/rmd4_test.rb b/tests/cimi/rmd4_test.rb
index d08a24d..ebc3c29 100644
--- a/tests/cimi/rmd4_test.rb
+++ b/tests/cimi/rmd4_test.rb
@@ -105,7 +105,7 @@ class MachinesRMDInitialStates < CIMI::Test::Spec
end
resp = post(add_uri,
- "<Machine>" +
+ "<MachineCreate>" +
"<name>cimi_machine_initial:" + state + "</name>" +
"<machineTemplate>" +
"<initialState>" + state + "</initialState>" +
@@ -114,7 +114,7 @@ class MachinesRMDInitialStates < CIMI::Test::Spec
"<machineImage " +
"href=\"" + get_a(cep_json, "machineImage") + "\"/>" +
"</machineTemplate>" +
- "</Machine>", :accept => :json, :content_type => :xml)
+ "</MachineCreate>", :accept => :json, :content_type => :xml)
@@rmd4_created_machines[state] = resp.json["id"]