[PATCH 4/8] CIMI: toplevel collections must have a resourceURI attr in XML

[lutter]

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

---
 server/lib/cimi/models/base.rb   |    1 +
 server/tests/cimi/spec_helper.rb |    5 ++++-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/server/lib/cimi/models/base.rb b/server/lib/cimi/models/base.rb
index 63b24ae..6a73cf6 100644
--- a/server/lib/cimi/models/base.rb
+++ b/server/lib/cimi/models/base.rb
@@ -235,6 +235,7 @@ class CIMI::Model::Resource
   def self.to_xml(model)
     xml = @schema.to_xml(model)
     xml["xmlns"] = CMWG_NAMESPACE
+    xml["resourceURI"] = resource_uri
     XmlSimple.xml_out(xml, :root_name => xml_tag_name)
   end
 
diff --git a/server/tests/cimi/spec_helper.rb b/server/tests/cimi/spec_helper.rb
index e1f2ee4..e86eaee 100644
--- a/server/tests/cimi/spec_helper.rb
+++ b/server/tests/cimi/spec_helper.rb
@@ -32,6 +32,9 @@ def parse_xml(xml, opts = {})
 end
 
 class HashCmp
+
+  IGNORED_KEYS = [ "resourceURI" ]
+
   def initialize(exp, act)
     @exp = exp
     @act = act
@@ -77,7 +80,7 @@ class HashCmp
       unless (missing = exp.keys - act.keys).empty?
         error "Missing key(s) at /#{path.join("/")}: #{missing.inspect}"
       end
-      unless (excess = act.keys - exp.keys).empty?
+      unless (excess = act.keys - exp.keys - IGNORED_KEYS).empty?
         error "Excess key(s) at /#{path.join("/")}: #{excess.inspect}"
       end
       (exp.keys - missing - excess).each do |k|
-- 
1.7.7.6