git commit: CIMI: Fix failing black box tests (volume_config is now dbase - none by default)

[ma...@apache.org]

Updated Branches:
  refs/heads/master 46374925e -> 182cca6eb


CIMI: Fix failing black box tests (volume_config is now dbase - none by default)


Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/182cca6e
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/182cca6e
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/182cca6e

Branch: refs/heads/master
Commit: 182cca6eb5817862e8d7f336608c5fb337f2b6b7
Parents: 4637492
Author: marios <ma...@redhat.com>
Authored: Fri Jan 11 18:07:34 2013 +0200
Committer: marios <ma...@redhat.com>
Committed: Fri Jan 11 18:07:34 2013 +0200

----------------------------------------------------------------------
 tests/cimi/part4_test.rb |   13 +++++++++++++
 tests/config.yaml        |    1 -
 2 files changed, 13 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltacloud/blob/182cca6e/tests/cimi/part4_test.rb
----------------------------------------------------------------------
diff --git a/tests/cimi/part4_test.rb b/tests/cimi/part4_test.rb
index a58d5de..7da6191 100644
--- a/tests/cimi/part4_test.rb
+++ b/tests/cimi/part4_test.rb
@@ -71,6 +71,19 @@ class AddVolumeToMachine < CIMI::Test::Spec
     rescue RuntimeError =>e
     end
 
+
+  #need to create a new VolumeConfiguration before creating the Volume:
+  cep_json = cep(:accept => :json)
+  volume_config_add_uri = discover_uri_for("add", "volumeConfigs")
+  volume_config_resp = post(volume_config_add_uri,
+     "<VolumeConfigurationCreate xmlns=\"#{CIMI::Test::CIMI_NAMESPACE}\">" +
+       "<name>marios_volume_config</name>" +
+       "<description>a volume configuration</description>"+
+       "<format>ext3</format>"+
+       " <capacity>1</capacity>" +
+     "</VolumeConfigurationCreate>", {:accept => :json, :content_type => :xml})
+  log.info("just created volume_configuration " + volume_config_resp.json["id"])
+
   # 4.3:  Create a new Volume
   model :volume, :cache => true do |fmt|
     volume_add_uri = discover_uri_for("add", "volumes")

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/182cca6e/tests/config.yaml
----------------------------------------------------------------------
diff --git a/tests/config.yaml b/tests/config.yaml
index 8c90dc6..2f18caa 100644
--- a/tests/config.yaml
+++ b/tests/config.yaml
@@ -7,7 +7,6 @@ mock:
   preferred:
     machineImage: "img2"
     machineConfig: "m1-small"
-    volumeConfig: "2"
 #OPENSTACK DRIVER CONFIG
 openstack:
   user: