From 324ae560c33610f8fc741ada8fff8de9e09a68e5 Mon Sep 17 00:00:00 2001
From: Yolanda Robla <yolanda.robla@canonical.com>
Date: Sun, 25 Nov 2012 09:25:48 +0000
Subject: [PATCH] Renaming xml test class in sample tests of consoles API.

Partially implements blueprint nova-api-samples
Fixes bug 1083642

Change-Id: I9ed16780e9a75a1fa34afac5c7861a0595180596
---
 doc/api_samples/os-consoles/get-vnc-console-post-resp.xml     | 4 ++--
 .../api_samples/os-consoles/get-vnc-console-post-req.xml.tpl  | 4 +++-
 nova/tests/integrated/test_api_samples.py                     | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/doc/api_samples/os-consoles/get-vnc-console-post-resp.xml b/doc/api_samples/os-consoles/get-vnc-console-post-resp.xml
index 2d74fffa873d..3c7e0c4a38e7 100644
--- a/doc/api_samples/os-consoles/get-vnc-console-post-resp.xml
+++ b/doc/api_samples/os-consoles/get-vnc-console-post-resp.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <console>
-	<type>novnc</type>
-	<url>http://example.com:6080/vnc_auto.html?token=f9906a48-b71e-4f18-baca-c987da3ebdb3&title=dafa(75ecef58-3b8e-4659-ab3b-5501454188e9)</url>
+  <type>novnc</type>
+  <url>http://example.com:6080/vnc_auto.html?token=f9906a48-b71e-4f18-baca-c987da3ebdb3</url>
 </console>
diff --git a/nova/tests/integrated/api_samples/os-consoles/get-vnc-console-post-req.xml.tpl b/nova/tests/integrated/api_samples/os-consoles/get-vnc-console-post-req.xml.tpl
index 00f32c6b92c6..c1f73180e83f 100644
--- a/nova/tests/integrated/api_samples/os-consoles/get-vnc-console-post-req.xml.tpl
+++ b/nova/tests/integrated/api_samples/os-consoles/get-vnc-console-post-req.xml.tpl
@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<os-getVNCConsole type="novnc" />
+<os-getVNCConsole>
+  <type>novnc</type>
+</os-getVNCConsole>
diff --git a/nova/tests/integrated/test_api_samples.py b/nova/tests/integrated/test_api_samples.py
index 841faeb005a0..9fe4cec834bf 100644
--- a/nova/tests/integrated/test_api_samples.py
+++ b/nova/tests/integrated/test_api_samples.py
@@ -1660,5 +1660,5 @@ class ConsolesSampleJsonTests(ServersSampleBase):
                                        subs, response)
 
 
-class ConsoleOutputSampleXmlTests(ConsoleOutputSampleJsonTest):
+class ConsolesSampleXmlTests(ConsolesSampleJsonTests):
         ctype = 'xml'