deltacloud-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cgoncal...@av.it.pt
Subject [PATCH] CIMI: update XML namespace URL
Date Wed, 03 Oct 2012 17:21:55 GMT
From: Carlos Goncalves <cgoncalves@av.it.pt>

Update to be in accordance with CIMI v1.0.0 specification (document
number DSP0263, section 4.1.1 "XML namespaces")
---
 clients/cimi/app.rb                                            | 2 +-
 clients/cimi/lib/entities/machine.rb                           | 6 +++---
 server/lib/cimi/data/collections/machine.col.xml               | 2 +-
 server/lib/cimi/data/collections/machine_configuration.col.xml | 2 +-
 server/lib/cimi/data/collections/machine_image.col.xml         | 2 +-
 server/lib/cimi/data/collections/volume.col.xml                | 2 +-
 server/lib/cimi/data/default_res/machine.col.xml               | 4 ++--
 server/lib/cimi/data/default_res/machine_configuration.col.xml | 2 +-
 server/lib/cimi/data/default_res/machine_image.col.xml         | 2 +-
 server/lib/cimi/data/default_res/volume.col.xml                | 2 +-
 server/lib/cimi/dependencies.rb                                | 2 +-
 server/lib/cimi/helpers/cimi_helper.rb                         | 2 +-
 server/lib/cimi/models/base.rb                                 | 2 +-
 server/lib/cimi/models/machine.rb                              | 2 +-
 server/lib/cimi/server.rb                                      | 2 +-
 server/public/javascripts/cmwgapp.js                           | 4 ++--
 server/tests/cimi/spec/cimi/data/credential.xml                | 2 +-
 server/tests/cimi/spec/cimi/data/machine.json                  | 4 ++--
 server/tests/cimi/spec/cimi/data/machine.xml                   | 6 +++---
 server/tests/cimi/spec/cimi/data/machine_configuration.xml     | 2 +-
 server/tests/cimi/spec/cimi/data/machine_image.xml             | 2 +-
 server/tests/cimi/spec/cimi/data/machine_template.xml          | 2 +-
 server/tests/cimi/spec/cimi/data/volume.xml                    | 2 +-
 server/tests/cimi/spec/cimi/data/volume_configuration.xml      | 2 +-
 server/tests/cimi/spec/cimi/data/volume_image.xml              | 2 +-
 server/tests/cimi/spec/cimi/data/volume_template.xml           | 2 +-
 server/views/cimi/machine_configurations/show.html.haml        | 2 +-
 server/views/cimi/machine_images/show.html.haml                | 2 +-
 server/views/cimi/machines/show.html.haml                      | 2 +-
 server/views/cimi/volumes/show.html.haml                       | 2 +-
 tests/cimi/test_helper.rb                                      | 2 +-
 31 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/clients/cimi/app.rb b/clients/cimi/app.rb
index d9423f9..e26f2b9 100644
--- a/clients/cimi/app.rb
+++ b/clients/cimi/app.rb
@@ -15,7 +15,7 @@
 
 module CIMI::Frontend
 
-  CMWG_NAMESPACE = "http://www.dmtf.org/cimi"
+  CMWG_NAMESPACE = "http://schemas.dmtf.org/cimi/1"
 
   class Application < Sinatra::Base
 
diff --git a/clients/cimi/lib/entities/machine.rb b/clients/cimi/lib/entities/machine.rb
index 67e5802..d6f7a5f 100644
--- a/clients/cimi/lib/entities/machine.rb
+++ b/clients/cimi/lib/entities/machine.rb
@@ -52,7 +52,7 @@ class CIMI::Frontend::Machine < CIMI::Frontend::Entity
   post '/cimi/machines/:id/stop' do
     action_xml = Nokogiri::XML::Builder.new do |xml|
       xml.Action(:xmlns => CIMI::Frontend::CMWG_NAMESPACE) {
-        xml.action "http://www.dmtf.org/cimi/action/stop"
+        xml.action "http://schemas.dmtf.org/cimi/1/action/stop"
       }
     end.to_xml
     result = entity_action(:machines, :stop, params[:id], action_xml, credentials)
@@ -63,7 +63,7 @@ class CIMI::Frontend::Machine < CIMI::Frontend::Entity
   post '/cimi/machines/:id/start' do
     action_xml = Nokogiri::XML::Builder.new do |xml|
       xml.Action(:xmlns => CIMI::Frontend::CMWG_NAMESPACE) {
-        xml.action "http://www.dmtf.org/cimi/action/start"
+        xml.action "http://schemas.dmtf.org/cimi/1/action/start"
       }
     end.to_xml
     result = entity_action(:machines, :start, params[:id], action_xml, credentials)
@@ -74,7 +74,7 @@ class CIMI::Frontend::Machine < CIMI::Frontend::Entity
   post '/cimi/machines/:id/restart' do
     action_xml = Nokogiri::XML::Builder.new do |xml|
       xml.Action(:xmlns => CIMI::Frontend::CMWG_NAMESPACE) {
-        xml.action "http://www.dmtf.org/cimi/action/restart"
+        xml.action "http://schemas.dmtf.org/cimi/1/action/restart"
       }
     end.to_xml
     result = entity_action(:machines, :restart, params[:id], action_xml, credentials)
diff --git a/server/lib/cimi/data/collections/machine.col.xml b/server/lib/cimi/data/collections/machine.col.xml
index 622a6fe..1e13197 100644
--- a/server/lib/cimi/data/collections/machine.col.xml
+++ b/server/lib/cimi/data/collections/machine.col.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<MachineCollection xmlns="http://www.dmtf.org/cimi">
+<MachineCollection xmlns="http://schemas.dmtf.org/cimi/1">
  <uri>machine</uri>
  <name>Machine collection </name>
  <description>The machine collection</description>
diff --git a/server/lib/cimi/data/collections/machine_configuration.col.xml b/server/lib/cimi/data/collections/machine_configuration.col.xml
index 99af7fb..84df773 100644
--- a/server/lib/cimi/data/collections/machine_configuration.col.xml
+++ b/server/lib/cimi/data/collections/machine_configuration.col.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<MachineConfigurationCollection xmlns="http://www.dmtf.org/cimi">
+<MachineConfigurationCollection xmlns="http://schemas.dmtf.org/cimi/1">
  <uri>machineConfiguration</uri>
  <name>Machine Configuration collection </name>
  <description>That is jsut a test</description>
diff --git a/server/lib/cimi/data/collections/machine_image.col.xml b/server/lib/cimi/data/collections/machine_image.col.xml
index c4be389..864ebe8 100644
--- a/server/lib/cimi/data/collections/machine_image.col.xml
+++ b/server/lib/cimi/data/collections/machine_image.col.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<MachineImageCollection xmlns="http://www.dmtf.org/cimi">
+<MachineImageCollection xmlns="http://schemas.dmtf.org/cimi/1">
  <uri>machineImage</uri>
  <name>Machine Image collection </name>
  <description>The machine image collection</description>
diff --git a/server/lib/cimi/data/collections/volume.col.xml b/server/lib/cimi/data/collections/volume.col.xml
index e2d2b4a..dcc68ff 100644
--- a/server/lib/cimi/data/collections/volume.col.xml
+++ b/server/lib/cimi/data/collections/volume.col.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<VolumeCollection xmlns="http://www.dmtf.org/cimi">
+<VolumeCollection xmlns="http://schemas.dmtf.org/cimi/1">
  <uri>volume</uri>
  <name>Volume collection </name>
  <description>The volume collection</description>
diff --git a/server/lib/cimi/data/default_res/machine.col.xml b/server/lib/cimi/data/default_res/machine.col.xml
index 7c2bab1..8a5b146 100644
--- a/server/lib/cimi/data/default_res/machine.col.xml
+++ b/server/lib/cimi/data/default_res/machine.col.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<Machine xmlns="http://www.dmtf.org/cimi">
+<Machine xmlns="http://schemas.dmtf.org/cimi/1">
   <uri>machine</uri>
   <name>Default machine name </name>
   <description>Default machine description</description>
@@ -31,5 +31,5 @@
   <eventLog href="eventLog" />
   <operation rel="edit" href="/machine"/>
   <operation rel="delete" href="/machine"/>
-  <operation rel="http://www.dmtf.org/cimi/stop" href="/machine/stop"/>
+  <operation rel="http://schemas.dmtf.org/cimi/1/stop" href="/machine/stop"/>
 </Machine>
\ No newline at end of file
diff --git a/server/lib/cimi/data/default_res/machine_configuration.col.xml b/server/lib/cimi/data/default_res/machine_configuration.col.xml
index db91861..5ce3a7d 100644
--- a/server/lib/cimi/data/default_res/machine_configuration.col.xml
+++ b/server/lib/cimi/data/default_res/machine_configuration.col.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<MachineConfiguration xmlns="http://www.dmtf.org/cimi">
+<MachineConfiguration xmlns="http://schemas.dmtf.org/cimi/1">
   <uri>machineConfiguration</uri>
   <name>Default machine configuration name </name>
   <description>Default description</description>
diff --git a/server/lib/cimi/data/default_res/machine_image.col.xml b/server/lib/cimi/data/default_res/machine_image.col.xml
index e7de5e7..e2b1a5c 100644
--- a/server/lib/cimi/data/default_res/machine_image.col.xml
+++ b/server/lib/cimi/data/default_res/machine_image.col.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<MachineImage xmlns="http://www.dmtf.org/cimi">
+<MachineImage xmlns="http://schemas.dmtf.org/cimi/1">
   <uri>machineImage</uri>
   <name>Default machine image name </name>
   <description>Default machine image description</description>
diff --git a/server/lib/cimi/data/default_res/volume.col.xml b/server/lib/cimi/data/default_res/volume.col.xml
index 21b9d65..32d7040 100644
--- a/server/lib/cimi/data/default_res/volume.col.xml
+++ b/server/lib/cimi/data/default_res/volume.col.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<Volume xmlns="http://www.dmtf.org/cimi">
+<Volume xmlns="http://schemas.dmtf.org/cimi/1">
   <uri>volume</uri>
   <name>Default volume name </name>
   <description>Default volume description</description>
diff --git a/server/lib/cimi/dependencies.rb b/server/lib/cimi/dependencies.rb
index e8d5bdf..d02ff30 100644
--- a/server/lib/cimi/dependencies.rb
+++ b/server/lib/cimi/dependencies.rb
@@ -60,4 +60,4 @@ require 'sinatra/rack_matrix_params'
 require 'sinatra/rack_syslog'
 require 'sinatra/sinatra_verbose'
 
-CMWG_NAMESPACE = "http://www.dmtf.org/cimi"
+CMWG_NAMESPACE = "http://schemas.dmtf.org/cimi/1"
diff --git a/server/lib/cimi/helpers/cimi_helper.rb b/server/lib/cimi/helpers/cimi_helper.rb
index ea1e89e..a7f76cf 100644
--- a/server/lib/cimi/helpers/cimi_helper.rb
+++ b/server/lib/cimi/helpers/cimi_helper.rb
@@ -44,7 +44,7 @@ class Array
   def to_xml_cimi_collection(_self)
     model_name = first.class.xml_tag_name
     XmlSimple.xml_out({
-      "xmlns" => "http://www.dmtf.org/cimi",
+      "xmlns" => "http://schemas.dmtf.org/cimi/1",
       "uri" => [ _self.send(:"#{model_name.underscore.pluralize}_url") ],
       "name" => [ "default" ],
       "created" => [ Time.now.to_s ],
diff --git a/server/lib/cimi/models/base.rb b/server/lib/cimi/models/base.rb
index e36ad6e..bb4a055 100644
--- a/server/lib/cimi/models/base.rb
+++ b/server/lib/cimi/models/base.rb
@@ -211,7 +211,7 @@ class CIMI::Model::Base
 
   def self.to_xml(model)
     xml = @schema.to_xml(model)
-    xml["xmlns"] = "http://www.dmtf.org/cimi"
+    xml["xmlns"] = "http://schemas.dmtf.org/cimi/1"
     XmlSimple.xml_out(xml, :root_name => xml_tag_name)
   end
 
diff --git a/server/lib/cimi/models/machine.rb b/server/lib/cimi/models/machine.rb
index da67eb7..c605d2a 100644
--- a/server/lib/cimi/models/machine.rb
+++ b/server/lib/cimi/models/machine.rb
@@ -182,7 +182,7 @@ class CIMI::Model::Machine < CIMI::Model::Base
     instance.actions.collect do |action|
       action = :destroy if action == :delete # In CIMI destroy operation become delete
       action = :restart if action == :reboot  # In CIMI reboot operation become restart
-      { :href => context.send(:"#{action}_machine_url", instance.id), :rel => "http://www.dmtf.org/cimi/action/#{action}"
}
+      { :href => context.send(:"#{action}_machine_url", instance.id), :rel => "http://schemas.dmtf.org/cimi/1/action/#{action}"
}
     end
   end
 
diff --git a/server/lib/cimi/server.rb b/server/lib/cimi/server.rb
index 86aaf3c..27ba849 100644
--- a/server/lib/cimi/server.rb
+++ b/server/lib/cimi/server.rb
@@ -25,7 +25,7 @@ require_relative '../sinatra'
 require_relative './helpers'
 require_relative './collections'
 
-CMWG_NAMESPACE = "http://www.dmtf.org/cimi"
+CMWG_NAMESPACE = "http://schemas.dmtf.org/cimi/1"
 
 module CIMI
   class API < Collections::Base
diff --git a/server/public/javascripts/cmwgapp.js b/server/public/javascripts/cmwgapp.js
index 5ec7041..708c3ee 100644
--- a/server/public/javascripts/cmwgapp.js
+++ b/server/public/javascripts/cmwgapp.js
@@ -29,7 +29,7 @@ function doXmlPut(theNode, addId, func)
   }
   else {
     xmlData = "<?xml version='1.0' encoding='utf-8' ?>";
-    xmlData += "<" + $(theNode.form).attr("xmlRootNode").value + " xmlns='http://www.dmtf.org/cimi'>";
+    xmlData += "<" + $(theNode.form).attr("xmlRootNode").value + " xmlns='http://schemas.dmtf.org/cimi/1'>";
     xmlData += getStandardData(theNode);
     xmlData += "</" + $(theNode.form).attr("xmlRootNode").value + ">";
   }
@@ -72,7 +72,7 @@ function doXmlPost(theNode, func)
   }
   else {
     xmlData = "<?xml version='1.0' encoding='utf-8' ?>";
-    xmlData += "<" + $(theNode.form).attr("xmlRootNode").value + " xmlns='http://www.dmtf.org/cimi'>";
+    xmlData += "<" + $(theNode.form).attr("xmlRootNode").value + " xmlns='http://schemas.dmtf.org/cimi/1'>";
     xmlData += getStandardData(theNode)
     xmlData += "</" + $(theNode.form).attr("xmlRootNode").value + ">";
   }
diff --git a/server/tests/cimi/spec/cimi/data/credential.xml b/server/tests/cimi/spec/cimi/data/credential.xml
index fb813db..7942ff6 100644
--- a/server/tests/cimi/spec/cimi/data/credential.xml
+++ b/server/tests/cimi/spec/cimi/data/credential.xml
@@ -1,4 +1,4 @@
-<Credential xmlns="http://www.dmtf.org/cimi">
+<Credential xmlns="http://schemas.dmtf.org/cimi/1">
   <id>http://cimi.example.org/machine_admins/1</id>
   <name>credentials1</name>
   <description>Machine Admin One</description>
diff --git a/server/tests/cimi/spec/cimi/data/machine.json b/server/tests/cimi/spec/cimi/data/machine.json
index 0c1bdbd..3b1a574 100644
--- a/server/tests/cimi/spec/cimi/data/machine.json
+++ b/server/tests/cimi/spec/cimi/data/machine.json
@@ -18,9 +18,9 @@
       "href": "http://cimi.example.org/machines/1/edit" },
     { "rel": "delete",
       "href": "http://cimi.example.org/machines/1/delete" },
-    { "rel": "http://www.dmtf.org/cimi/action/stop",
+    { "rel": "http://schemas.dmtf.org/cimi/1/action/stop",
       "href": "http://cimi.example.org/machines/1/stop" },
-    { "rel": "http://www.dmtf.org/cimi/action/restart",
+    { "rel": "http://schemas.dmtf.org/cimi/1/action/restart",
       "href": "http://cimi.example.org/machines/1/restart" }
   ]
 }
diff --git a/server/tests/cimi/spec/cimi/data/machine.xml b/server/tests/cimi/spec/cimi/data/machine.xml
index e536013..163c272 100644
--- a/server/tests/cimi/spec/cimi/data/machine.xml
+++ b/server/tests/cimi/spec/cimi/data/machine.xml
@@ -1,4 +1,4 @@
-<Machine xmlns="http://www.dmtf.org/cimi">
+<Machine xmlns="http://schemas.dmtf.org/cimi/1">
   <id>http://cimi.example.org/machines/1</id>
   <name>machine1</name>
   <description>Machine one description</description>
@@ -14,6 +14,6 @@
   <eventLog href="http://cimi.example.org/event_logs/1"/>
   <operation rel="edit" href="http://cimi.example.org/machines/1/edit"/>
   <operation rel="delete" href="http://cimi.example.org/machines/1/delete"/>
-  <operation rel="http://www.dmtf.org/cimi/action/stop" href="http://cimi.example.org/machines/1/stop"/>
-  <operation rel="http://www.dmtf.org/cimi/action/restart" href="http://cimi.example.org/machines/1/restart"/>
+  <operation rel="http://schemas.dmtf.org/cimi/1/action/stop" href="http://cimi.example.org/machines/1/stop"/>
+  <operation rel="http://schemas.dmtf.org/cimi/1/action/restart" href="http://cimi.example.org/machines/1/restart"/>
 </Machine>
diff --git a/server/tests/cimi/spec/cimi/data/machine_configuration.xml b/server/tests/cimi/spec/cimi/data/machine_configuration.xml
index 095d0aa..9f451a6 100644
--- a/server/tests/cimi/spec/cimi/data/machine_configuration.xml
+++ b/server/tests/cimi/spec/cimi/data/machine_configuration.xml
@@ -1,4 +1,4 @@
-<MachineConfiguration xmlns="http://www.dmtf.org/cimi">
+<MachineConfiguration xmlns="http://schemas.dmtf.org/cimi/1">
   <id>http://cimi.example.org/machine_configurations/1</id>
   <name>MachineConfiguration1</name>
   <description>Example MachineConfiguration One</description>
diff --git a/server/tests/cimi/spec/cimi/data/machine_image.xml b/server/tests/cimi/spec/cimi/data/machine_image.xml
index e1d4452..1f7b46c 100644
--- a/server/tests/cimi/spec/cimi/data/machine_image.xml
+++ b/server/tests/cimi/spec/cimi/data/machine_image.xml
@@ -1,4 +1,4 @@
-<MachineImage xmlns="http://www.dmtf.org/cimi">
+<MachineImage xmlns="http://schemas.dmtf.org/cimi/1">
   <id>http://cimi.example.org/machine_images/1</id>
   <name>img1</name>
   <description>Machine Image One</description>
diff --git a/server/tests/cimi/spec/cimi/data/machine_template.xml b/server/tests/cimi/spec/cimi/data/machine_template.xml
index 1386460..fed655c 100644
--- a/server/tests/cimi/spec/cimi/data/machine_template.xml
+++ b/server/tests/cimi/spec/cimi/data/machine_template.xml
@@ -1,4 +1,4 @@
-<MachineTemplate xmlns="http://www.dmtf.org/cimi">
+<MachineTemplate xmlns="http://schemas.dmtf.org/cimi/1">
   <id>http://cimi.example.org/machine_templates/1</id>
   <name>My First Template</name>
   <description>A template for testing</description>
diff --git a/server/tests/cimi/spec/cimi/data/volume.xml b/server/tests/cimi/spec/cimi/data/volume.xml
index 65e6e06..6178234 100644
--- a/server/tests/cimi/spec/cimi/data/volume.xml
+++ b/server/tests/cimi/spec/cimi/data/volume.xml
@@ -1,4 +1,4 @@
-<Volume xmlns="http://www.dmtf.org/cimi">
+<Volume xmlns="http://schemas.dmtf.org/cimi/1">
   <id>http://cimi.example.org/volumes/1</id>
   <name>volume1</name>
   <description>Volume One</description>
diff --git a/server/tests/cimi/spec/cimi/data/volume_configuration.xml b/server/tests/cimi/spec/cimi/data/volume_configuration.xml
index 120e8a6..f150700 100644
--- a/server/tests/cimi/spec/cimi/data/volume_configuration.xml
+++ b/server/tests/cimi/spec/cimi/data/volume_configuration.xml
@@ -1,4 +1,4 @@
-<VolumeConfiguration xmlns="http://www.dmtf.org/cimi">
+<VolumeConfiguration xmlns="http://schemas.dmtf.org/cimi/1">
   <id>http://cimi.example.org/volume_configurations/1</id>
   <name>volume_config_1</name>
   <description>Volume Configuration One</description>
diff --git a/server/tests/cimi/spec/cimi/data/volume_image.xml b/server/tests/cimi/spec/cimi/data/volume_image.xml
index c6ba575..b3f25f6 100644
--- a/server/tests/cimi/spec/cimi/data/volume_image.xml
+++ b/server/tests/cimi/spec/cimi/data/volume_image.xml
@@ -1,4 +1,4 @@
-<VolumeImage xmlns="http://www.dmtf.org/cimi">
+<VolumeImage xmlns="http://schemas.dmtf.org/cimi/1">
   <id>http://cimi.example.org/volume_images/1</id>
   <name>volume_image_1</name>
   <description>Volume Image One</description>
diff --git a/server/tests/cimi/spec/cimi/data/volume_template.xml b/server/tests/cimi/spec/cimi/data/volume_template.xml
index 47113b5..b93c5dd 100644
--- a/server/tests/cimi/spec/cimi/data/volume_template.xml
+++ b/server/tests/cimi/spec/cimi/data/volume_template.xml
@@ -1,4 +1,4 @@
-<VolumeTemplate xmlns="http://www.dmtf.org/cimi">
+<VolumeTemplate xmlns="http://schemas.dmtf.org/cimi/1">
   <id>http://cimi.example.org/volume_templates/1</id>
   <name>volume_template_1</name>
   <description>Volume Template One</description>
diff --git a/server/views/cimi/machine_configurations/show.html.haml b/server/views/cimi/machine_configurations/show.html.haml
index c59242e..0ab4971 100644
--- a/server/views/cimi/machine_configurations/show.html.haml
+++ b/server/views/cimi/machine_configurations/show.html.haml
@@ -95,7 +95,7 @@
 :javascript
   function fixupXml(theNode) {
     var xmlData = "<?xml version='1.0' encoding='utf-8' ?>";
-    xmlData += "<" + $(theNode.form).attr("xmlRootNode").value + " xmlns='http://www.dmtf.org/cimi'>";
+    xmlData += "<" + $(theNode.form).attr("xmlRootNode").value + " xmlns='http://schemas.dmtf.org/cimi/1'>";
     xmlData += getStandardData(theNode);
     xmlData += "<cpu>" + $(theNode.form).attr("cpu").value + "</cpu>";
     xmlData += "<memory quantity='" + $(theNode.form).attr("memory_quantity").value +
"' units='";
diff --git a/server/views/cimi/machine_images/show.html.haml b/server/views/cimi/machine_images/show.html.haml
index 202291e..68cecc3 100644
--- a/server/views/cimi/machine_images/show.html.haml
+++ b/server/views/cimi/machine_images/show.html.haml
@@ -63,7 +63,7 @@
 :javascript
   function fixupXml(theNode) {
     var xmlData = "<?xml version='1.0' encoding='utf-8' ?>";
-    xmlData += "<" + $(theNode.form).attr("xmlRootNode").value + " xmlns='http://www.dmtf.org/cimi'>";
+    xmlData += "<" + $(theNode.form).attr("xmlRootNode").value + " xmlns='http://schemas.dmtf.org/cimi/1'>";
     xmlData += getStandardData(theNode);
     xmlData += "<imageLocation href='" + $(theNode.form).attr("imageLocation").value +
"' />";
     xmlData += "<imageData>" + $(theNode.form).attr("imageData").value + "</imageData>";
diff --git a/server/views/cimi/machines/show.html.haml b/server/views/cimi/machines/show.html.haml
index 569caeb..8ba662a 100644
--- a/server/views/cimi/machines/show.html.haml
+++ b/server/views/cimi/machines/show.html.haml
@@ -107,7 +107,7 @@
 :javascript
   function fixupXml(theNode) {
     var xmlData = "<?xml version='1.0' encoding='utf-8' ?>";
-    xmlData += "<" + $(theNode.form).attr("xmlRootNode").value + " xmlns='http://www.dmtf.org/cimi'>";
+    xmlData += "<" + $(theNode.form).attr("xmlRootNode").value + " xmlns='http://schemas.dmtf.org/cimi/1'>";
     xmlData += getStandardData(theNode);
     xmlData += "<cpu>" + $(theNode.form).attr("cpu").value + "</cpu>";
     xmlData += "<memory quantity='" + $(theNode.form).attr("memory_quantity").value +
"' units='";
diff --git a/server/views/cimi/volumes/show.html.haml b/server/views/cimi/volumes/show.html.haml
index c91c540..ba675eb 100644
--- a/server/views/cimi/volumes/show.html.haml
+++ b/server/views/cimi/volumes/show.html.haml
@@ -54,7 +54,7 @@
 :javascript
   function fixupXml(theNode) {
     var xmlData = "<?xml version='1.0' encoding='utf-8' ?>";
-    xmlData += "<" + $(theNode.form).attr("xmlRootNode").value + " xmlns='http://www.dmtf.org/cimi'>";
+    xmlData += "<" + $(theNode.form).attr("xmlRootNode").value + " xmlns='http://schemas.dmtf.org/cimi/1'>";
     xmlData += getStandardData(theNode);
     xmlData += "<cpu>" + $(theNode.form).attr("cpu").value + "</cpu>";
     xmlData += "<memory quantity='" + $(theNode.form).attr("memory_quantity").value +
"' units='";
diff --git a/tests/cimi/test_helper.rb b/tests/cimi/test_helper.rb
index 8e3ed9f..8fd850a 100644
--- a/tests/cimi/test_helper.rb
+++ b/tests/cimi/test_helper.rb
@@ -46,7 +46,7 @@ module CIMI
       end
 
       def ns
-        { "c" => "http://www.dmtf.org/cimi" }
+        { "c" => "http://schemas.dmtf.org/cimi/1" }
       end
 
       private
-- 
1.7.12.1


Mime
View raw message