deltacloud-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mfoj...@apache.org
Subject [2/35] git commit: CIMI - fix failing server (spec) tests
Date Wed, 07 Nov 2012 15:36:35 GMT
CIMI - fix failing server (spec) tests

Signed-off-by: marios <marios@redhat.com>
TrackedAt: http://tracker-mfojtik.rhcloud.com/patch/e8e691bcc488d7a0b720a7a35e4c03d07f0c9918


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

Branch: refs/heads/master
Commit: 278128d7afc84bb660dd84611b1556191a07e219
Parents: 131d538
Author: marios <marios@redhat.com>
Authored: Wed Nov 7 16:39:01 2012 +0200
Committer: Michal fojtik <mfojtik@redhat.com>
Committed: Wed Nov 7 16:36:09 2012 +0100

----------------------------------------------------------------------
 server/lib/cimi/models/base.rb                     |    2 ++
 server/tests/cimi/spec/cimi/data/credential.json   |    1 +
 server/tests/cimi/spec/cimi/data/machine.json      |    4 +++-
 .../cimi/spec/cimi/data/machine_configuration.json |    1 +
 .../tests/cimi/spec/cimi/data/machine_image.json   |    1 +
 .../cimi/spec/cimi/data/machine_template.json      |    1 +
 server/tests/cimi/spec/cimi/data/volume.json       |    1 +
 .../cimi/spec/cimi/data/volume_configuration.json  |    1 +
 server/tests/cimi/spec/cimi/data/volume_image.json |    1 +
 .../tests/cimi/spec/cimi/data/volume_template.json |    1 +
 10 files changed, 13 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltacloud/blob/278128d7/server/lib/cimi/models/base.rb
----------------------------------------------------------------------
diff --git a/server/lib/cimi/models/base.rb b/server/lib/cimi/models/base.rb
index d217d4e..9217939 100644
--- a/server/lib/cimi/models/base.rb
+++ b/server/lib/cimi/models/base.rb
@@ -98,6 +98,8 @@ class CIMI::Model::Base
   #
   attr_reader :attribute_values
 
+  CMWG_NAMESPACE = "http://schemas.dmtf.org/cimi/1"
+
   # Keep the list of all attributes in an array +attributes+; for each
   # attribute, we also define a getter and a setter to access/change the
   # value for that attribute

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/278128d7/server/tests/cimi/spec/cimi/data/credential.json
----------------------------------------------------------------------
diff --git a/server/tests/cimi/spec/cimi/data/credential.json b/server/tests/cimi/spec/cimi/data/credential.json
index 35ab04b..1813446 100644
--- a/server/tests/cimi/spec/cimi/data/credential.json
+++ b/server/tests/cimi/spec/cimi/data/credential.json
@@ -1,4 +1,5 @@
 {
+  "resourceURI": "http://schemas.dmtf.org/cimi/1/Credential",
   "id": "http://cimi.example.org/machine_admins/1",
   "name": "credentials1",
   "description": "Machine Admin One",

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/278128d7/server/tests/cimi/spec/cimi/data/machine.json
----------------------------------------------------------------------
diff --git a/server/tests/cimi/spec/cimi/data/machine.json b/server/tests/cimi/spec/cimi/data/machine.json
index bf9c464..9e332c8 100644
--- a/server/tests/cimi/spec/cimi/data/machine.json
+++ b/server/tests/cimi/spec/cimi/data/machine.json
@@ -1,4 +1,6 @@
-{ "id": "http://cimi.example.org/machines/1",
+{
+ "resourceURI": "http://schemas.dmtf.org/cimi/1/Machine",
+ "id": "http://cimi.example.org/machines/1",
   "name": "machine1",
   "description": "Machine one description",
   "created": "2011-11-21",

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/278128d7/server/tests/cimi/spec/cimi/data/machine_configuration.json
----------------------------------------------------------------------
diff --git a/server/tests/cimi/spec/cimi/data/machine_configuration.json b/server/tests/cimi/spec/cimi/data/machine_configuration.json
index 3f28c22..0ecf095 100644
--- a/server/tests/cimi/spec/cimi/data/machine_configuration.json
+++ b/server/tests/cimi/spec/cimi/data/machine_configuration.json
@@ -1,4 +1,5 @@
 {
+  "resourceURI": "http://schemas.dmtf.org/cimi/1/MachineConfiguration",
   "id": "http://cimi.example.org/machine_configurations/1",
   "name": "MachineConfiguration1",
   "description": "Example MachineConfiguration One",

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/278128d7/server/tests/cimi/spec/cimi/data/machine_image.json
----------------------------------------------------------------------
diff --git a/server/tests/cimi/spec/cimi/data/machine_image.json b/server/tests/cimi/spec/cimi/data/machine_image.json
index cee0a52..ae83460 100644
--- a/server/tests/cimi/spec/cimi/data/machine_image.json
+++ b/server/tests/cimi/spec/cimi/data/machine_image.json
@@ -1,4 +1,5 @@
 {
+  "resourceURI": "http://schemas.dmtf.org/cimi/1/MachineImage",
   "id": "http://cimi.example.org/machine_images/1",
   "name": "img1",
   "description": "Machine Image One",

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/278128d7/server/tests/cimi/spec/cimi/data/machine_template.json
----------------------------------------------------------------------
diff --git a/server/tests/cimi/spec/cimi/data/machine_template.json b/server/tests/cimi/spec/cimi/data/machine_template.json
index 1be6592..816541c 100644
--- a/server/tests/cimi/spec/cimi/data/machine_template.json
+++ b/server/tests/cimi/spec/cimi/data/machine_template.json
@@ -1,4 +1,5 @@
 {
+  "resourceURI": "http://schemas.dmtf.org/cimi/1/MachineTemplate",
   "id": "http://cimi.example.org/machine_templates/1",
   "name": "My First Template",
   "description": "A template for testing",

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/278128d7/server/tests/cimi/spec/cimi/data/volume.json
----------------------------------------------------------------------
diff --git a/server/tests/cimi/spec/cimi/data/volume.json b/server/tests/cimi/spec/cimi/data/volume.json
index e8364dd..63a05a3 100644
--- a/server/tests/cimi/spec/cimi/data/volume.json
+++ b/server/tests/cimi/spec/cimi/data/volume.json
@@ -1,4 +1,5 @@
 {
+  "resourceURI": "http://schemas.dmtf.org/cimi/1/Volume",
   "id": "http://cimi.example.org/volumes/1",
   "name": "volume1",
   "description": "Volume One",

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/278128d7/server/tests/cimi/spec/cimi/data/volume_configuration.json
----------------------------------------------------------------------
diff --git a/server/tests/cimi/spec/cimi/data/volume_configuration.json b/server/tests/cimi/spec/cimi/data/volume_configuration.json
index 817e20c..ce3ad14 100644
--- a/server/tests/cimi/spec/cimi/data/volume_configuration.json
+++ b/server/tests/cimi/spec/cimi/data/volume_configuration.json
@@ -1,4 +1,5 @@
 {
+  "resourceURI": "http://schemas.dmtf.org/cimi/1/VolumeConfiguration",
   "id": "http://cimi.example.org/volume_configurations/1",
   "name": "volume_config_1",
   "description": "Volume Configuration One",

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/278128d7/server/tests/cimi/spec/cimi/data/volume_image.json
----------------------------------------------------------------------
diff --git a/server/tests/cimi/spec/cimi/data/volume_image.json b/server/tests/cimi/spec/cimi/data/volume_image.json
index 8c6ac04..47f52d1 100644
--- a/server/tests/cimi/spec/cimi/data/volume_image.json
+++ b/server/tests/cimi/spec/cimi/data/volume_image.json
@@ -1,4 +1,5 @@
 {
+  "resourceURI": "http://schemas.dmtf.org/cimi/1/VolumeImage",
   "id": "http://cimi.example.org/volume_images/1",
   "name": "volume_image_1",
   "description": "Volume Image One",

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/278128d7/server/tests/cimi/spec/cimi/data/volume_template.json
----------------------------------------------------------------------
diff --git a/server/tests/cimi/spec/cimi/data/volume_template.json b/server/tests/cimi/spec/cimi/data/volume_template.json
index bddb5dc..b5e5b05 100644
--- a/server/tests/cimi/spec/cimi/data/volume_template.json
+++ b/server/tests/cimi/spec/cimi/data/volume_template.json
@@ -1,4 +1,5 @@
 {
+  "resourceURI": "http://schemas.dmtf.org/cimi/1/VolumeTemplate",
   "id": "http://cimi.example.org/volume_templates/1",
   "name": "volume_template_1",
   "description": "Volume Template One",


Mime
View raw message