From 7964f4557c628cf753572df3e792d183056b4357 Mon Sep 17 00:00:00 2001
From: Diane Fleming <diane.fleming@rackspace.com>
Date: Thu, 30 Jan 2014 15:20:07 -0600
Subject: [PATCH] Fix requests/responses for set server metadata

Closes-Bug: #1268952

Change-Id: Ic7e0d15095ffc235272202621e86dea6870711ef
author: diane fleming
---
 .../src/api_samples/server-metadata-req.json          |  6 +++---
 .../src/api_samples/server-metadata-req.xml           |  7 ++++---
 .../src/api_samples/server-metadata-resp.json         |  7 ++++---
 .../src/api_samples/server-metadata-resp.xml          |  4 +++-
 .../src/wadls/compute-api/src/wadl/os-compute-2.wadl  | 11 ++++++-----
 5 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/api-ref/src/wadls/compute-api/src/api_samples/server-metadata-req.json b/api-ref/src/wadls/compute-api/src/api_samples/server-metadata-req.json
index 7124bb237..fc0d47938 100644
--- a/api-ref/src/wadls/compute-api/src/api_samples/server-metadata-req.json
+++ b/api-ref/src/wadls/compute-api/src/api_samples/server-metadata-req.json
@@ -1,5 +1,5 @@
 {
-  "meta" : {
-    "foo" : "Bar Value"
-  }
+   "metadata":{
+      "name":"test_server"
+   }
 }
\ No newline at end of file
diff --git a/api-ref/src/wadls/compute-api/src/api_samples/server-metadata-req.xml b/api-ref/src/wadls/compute-api/src/api_samples/server-metadata-req.xml
index f237b2b36..effa27520 100644
--- a/api-ref/src/wadls/compute-api/src/api_samples/server-metadata-req.xml
+++ b/api-ref/src/wadls/compute-api/src/api_samples/server-metadata-req.xml
@@ -1,3 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<meta xmlns="http://docs.openstack.org/compute/api/v1.1" key="foo">Bar Value</meta>
\ No newline at end of file
+<?xml version='1.0' encoding='UTF-8'?>
+<metadata xmlns="http://docs.openstack.org/compute/api/v1.1">
+    <meta key="type">staging_server</meta>
+</metadata>
diff --git a/api-ref/src/wadls/compute-api/src/api_samples/server-metadata-resp.json b/api-ref/src/wadls/compute-api/src/api_samples/server-metadata-resp.json
index 802b37d7f..feff81eb7 100644
--- a/api-ref/src/wadls/compute-api/src/api_samples/server-metadata-resp.json
+++ b/api-ref/src/wadls/compute-api/src/api_samples/server-metadata-resp.json
@@ -1,5 +1,6 @@
 {
-    "meta": {
-        "foo": "Bar Value"
-    }
+   "metadata":{
+      "name":"test_server",
+      "server_type":"test"
+   }
 }
\ No newline at end of file
diff --git a/api-ref/src/wadls/compute-api/src/api_samples/server-metadata-resp.xml b/api-ref/src/wadls/compute-api/src/api_samples/server-metadata-resp.xml
index c01e16a47..effa27520 100644
--- a/api-ref/src/wadls/compute-api/src/api_samples/server-metadata-resp.xml
+++ b/api-ref/src/wadls/compute-api/src/api_samples/server-metadata-resp.xml
@@ -1,2 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<meta xmlns="http://docs.openstack.org/compute/api/v1.1" key="foo">Bar Value</meta>
\ No newline at end of file
+<metadata xmlns="http://docs.openstack.org/compute/api/v1.1">
+    <meta key="type">staging_server</meta>
+</metadata>
diff --git a/api-ref/src/wadls/compute-api/src/wadl/os-compute-2.wadl b/api-ref/src/wadls/compute-api/src/wadl/os-compute-2.wadl
index 2f4bf6a92..1d1117ef6 100644
--- a/api-ref/src/wadls/compute-api/src/wadl/os-compute-2.wadl
+++ b/api-ref/src/wadls/compute-api/src/wadl/os-compute-2.wadl
@@ -1354,11 +1354,12 @@
             title="Create or replace metadata">
             <para role="shortdesc">Sets metadata for the specified
                 resource.</para>
-            <para>Replaces items that match the specified keys and
-                removes items not specified in the request.</para>
-            <para>An overLimit (<errorcode>413</errorcode>) fault
-                might be thrown if the operation causes the quota for
-                metadata items to be exceeded.</para>
+            <para>Replaces items that match the specified keys. If you
+                omit a key that already exists, this key retains its
+                value.</para>
+            <para>If the number of metadata items exceeds the quota for metadata
+                items, an overLimit (<errorcode>413</errorcode>) fault
+                might be thrown.</para>
         </wadl:doc>
         <request>
             <representation mediaType="application/json">