Makes scheduler hints and disk config xml correct

The scheduler hints and disk config extensions were not using
proper prefixes when deserializing xml. This patch modifes
them to deserialize properly. It leaves the old deserialization
in place as well so anyone using the broken implementation
will continue to work.

It also updates the api samples to use the new format. Note that
the proper fix required changing the alias for the scheduler hints
extension, since the alias is used for xml, so the samples had
to be moved.

Finally it fixes an issue with deserialization, allowing it to
support multiple hints with the same name.

Part of bug 1050997

Change-Id: I9969582d65d44de25388f07b6d2013fb7d093fb2

7 files changed, 25 insertions, 23 deletions

diff --git a/doc/api_samples/os-scheduler-hints/scheduler-hints-post-req.json b/doc/api_samples/OS-SCH-HNT/scheduler-hints-post-req.json
index 3e437e63f..3e437e63f 100644
--- a/doc/api_samples/os-scheduler-hints/scheduler-hints-post-req.json
+++ b/doc/api_samples/OS-SCH-HNT/scheduler-hints-post-req.json
diff --git a/doc/api_samples/OS-SCH-HNT/scheduler-hints-post-req.xml b/doc/api_samples/OS-SCH-HNT/scheduler-hints-post-req.xml
new file mode 100644
index 000000000..66843fae3
--- /dev/null
+++ b/doc/api_samples/OS-SCH-HNT/scheduler-hints-post-req.xml
@@ -0,0 +1,12 @@
+<server
+        xmlns="http://docs.openstack.org/compute/api/v1.1"
+        xmlns:OS-SCH-HNT="http://docs.openstack.org/compute/ext/scheduler-hints/api/v2"
+        name='new-server-test'
+        imageRef='70a599e0-31e7-49b7-b260-868f441e862b'
+        flavorRef='1'
+>
+        <OS-SCH-HNT:scheduler_hints>
+                <hypervisor>xen</hypervisor>
+                <near>eb999657-dd6b-464e-8713-95c532ac3b18</near>
+        </OS-SCH-HNT:scheduler_hints>
+</server>
diff --git a/doc/api_samples/os-scheduler-hints/scheduler-hints-post-resp.json b/doc/api_samples/OS-SCH-HNT/scheduler-hints-post-resp.json
index cc3a87316..cc3a87316 100644
--- a/doc/api_samples/os-scheduler-hints/scheduler-hints-post-resp.json
+++ b/doc/api_samples/OS-SCH-HNT/scheduler-hints-post-resp.json
diff --git a/doc/api_samples/os-scheduler-hints/scheduler-hints-post-resp.xml b/doc/api_samples/OS-SCH-HNT/scheduler-hints-post-resp.xml
index 59929d808..59929d808 100644
--- a/doc/api_samples/os-scheduler-hints/scheduler-hints-post-resp.xml
+++ b/doc/api_samples/OS-SCH-HNT/scheduler-hints-post-resp.xml
diff --git a/doc/api_samples/all_extensions/extensions-get-resp.json b/doc/api_samples/all_extensions/extensions-get-resp.json
index 22eb1e207..e459340d5 100644
--- a/doc/api_samples/all_extensions/extensions-get-resp.json
+++ b/doc/api_samples/all_extensions/extensions-get-resp.json
@@ -49,6 +49,14 @@
             "updated": "2011-09-14T00:00:00+00:00"
         },
         {
+            "alias": "OS-SCH-HNT",
+            "description": "Pass arbitrary key/value pairs to the scheduler",
+            "links": [],
+            "name": "SchedulerHints",
+            "namespace": "http://docs.openstack.org/compute/ext/scheduler-hints/api/v2",
+            "updated": "2011-07-19T00:00:00+00:00"
+        },
+        {
             "alias": "os-admin-actions",
             "description": "Enable admin-only server actions\n\n    Actions include: pause, unpause, suspend, resume, migrate,\n    resetNetwork, injectNetworkInfo, lock, unlock, createBackup\n    ",
             "links": [],
@@ -265,14 +273,6 @@
             "updated": "2011-08-18T00:00:00+00:00"
         },
         {
-            "alias": "os-scheduler-hints",
-            "description": "Pass arbitrary key/value pairs to the scheduler",
-            "links": [],
-            "name": "SchedulerHints",
-            "namespace": "http://docs.openstack.org/compute/ext/scheduler-hints/api/v2",
-            "updated": "2011-07-19T00:00:00+00:00"
-        },
-        {
             "alias": "os-security-groups",
             "description": "Security group support",
             "links": [],
@@ -345,4 +345,4 @@
             "updated": "2011-03-25T00:00:00+00:00"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/api_samples/all_extensions/extensions-get-resp.xml b/doc/api_samples/all_extensions/extensions-get-resp.xml
index 4532244d9..0ecb97c6f 100644
--- a/doc/api_samples/all_extensions/extensions-get-resp.xml
+++ b/doc/api_samples/all_extensions/extensions-get-resp.xml
@@ -18,6 +18,9 @@
   <extension alias="OS-FLV-EXT-DATA" updated="2011-09-14T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1" name="FlavorExtraData">
     <description>Provide additional data for flavors</description>
   </extension>
+  <extension alias="OS-SCH-HNT" updated="2011-07-19T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/scheduler-hints/api/v2" name="SchedulerHints">
+    <description>Pass arbitrary key/value pairs to the scheduler</description>
+  </extension>
   <extension alias="os-admin-actions" updated="2011-09-20T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/admin-actions/api/v1.1" name="AdminActions">
     <description>Enable admin-only server actions
 
@@ -113,9 +116,6 @@
   <extension alias="os-rescue" updated="2011-08-18T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/rescue/api/v1.1" name="Rescue">
     <description>Instance rescue mode</description>
   </extension>
-  <extension alias="os-scheduler-hints" updated="2011-07-19T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/scheduler-hints/api/v2" name="SchedulerHints">
-    <description>Pass arbitrary key/value pairs to the scheduler</description>
-  </extension>
   <extension alias="os-security-groups" updated="2011-07-21T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/securitygroups/api/v1.1" name="SecurityGroups">
     <description>Security group support</description>
   </extension>
@@ -143,4 +143,4 @@
   <extension alias="os-volumes" updated="2011-03-25T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/volumes/api/v1.1" name="Volumes">
     <description>Volumes support</description>
   </extension>
-</extensions>
\ No newline at end of file
+</extensions>
diff --git a/doc/api_samples/os-scheduler-hints/scheduler-hints-post-req.xml b/doc/api_samples/os-scheduler-hints/scheduler-hints-post-req.xml
deleted file mode 100644
index 079289de0..000000000
--- a/doc/api_samples/os-scheduler-hints/scheduler-hints-post-req.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<server
-        name='new-server-test'
-        imageRef='70a599e0-31e7-49b7-b260-868f441e862b'
-        flavorRef='1'
->
-        <scheduler_hints>
-                <hypervisor>xen</hypervisor>
-                <near>eb999657-dd6b-464e-8713-95c532ac3b18</near>
-        </scheduler_hints>
-</server>
\ No newline at end of file