From d6cc2fa57511c702e58c5fd8e288417cd65d6bdd Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc@redhat.com>
Date: Mon, 19 Aug 2013 21:48:41 +0100
Subject: [PATCH] Fix spice/vnc console api samples tests

Start the consoleauth service, otherwise authorize_console() will fail
if we start timing out call()s in the fake RPC driver when there are no
consumers for a topic.

blueprint: oslo-messaging
Change-Id: Ieee37a0370c0b548c589a0573e6e8a68e10a6fdc
---
 doc/api_samples/os-hosts/hosts-list-resp.json                | 5 +++++
 doc/api_samples/os-hosts/hosts-list-resp.xml                 | 3 ++-
 .../integrated/api_samples/os-hosts/hosts-list-resp.json.tpl | 5 +++++
 .../integrated/api_samples/os-hosts/hosts-list-resp.xml.tpl  | 1 +
 nova/tests/integrated/integrated_helpers.py                  | 3 ++-
 5 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/doc/api_samples/os-hosts/hosts-list-resp.json b/doc/api_samples/os-hosts/hosts-list-resp.json
index 0c4126a7e0..21a7267f9f 100644
--- a/doc/api_samples/os-hosts/hosts-list-resp.json
+++ b/doc/api_samples/os-hosts/hosts-list-resp.json
@@ -29,6 +29,11 @@
             "host_name": "39f55087a1024d1380755951c945ca69",
             "service": "cells",
             "zone": "internal"
+        },
+        {
+            "host_name": "7a9a6cb4701f4dee9048fe0bc25d0ee5",
+            "service": "consoleauth",
+            "zone": "internal"
         }
     ]
 }
diff --git a/doc/api_samples/os-hosts/hosts-list-resp.xml b/doc/api_samples/os-hosts/hosts-list-resp.xml
index 1ba444328c..b651e732cb 100644
--- a/doc/api_samples/os-hosts/hosts-list-resp.xml
+++ b/doc/api_samples/os-hosts/hosts-list-resp.xml
@@ -6,4 +6,5 @@
   <host zone="internal" host_name="ea70b9f0c530497fba8571deb4835ab0" service="network"/>
   <host zone="internal" host_name="7d52ad3988504fb18b0cdfd94dbd267b" service="scheduler"/>
   <host zone="internal" host_name="dc36bce962cc49c2ab916287bcf6c9d3" service="cells"/>
-</hosts>
\ No newline at end of file
+  <host zone="internal" host_name="4bd7bbcc80064d21a5fd0bd53318c6fa" service="consoleauth"/>
+</hosts>
diff --git a/nova/tests/integrated/api_samples/os-hosts/hosts-list-resp.json.tpl b/nova/tests/integrated/api_samples/os-hosts/hosts-list-resp.json.tpl
index 504f66f595..9fb47106db 100644
--- a/nova/tests/integrated/api_samples/os-hosts/hosts-list-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/os-hosts/hosts-list-resp.json.tpl
@@ -29,6 +29,11 @@
             "host_name": "%(host_name)s",
             "service": "cells",
             "zone": "internal"
+        },
+        {
+            "host_name": "%(host_name)s",
+            "service": "consoleauth",
+            "zone": "internal"
         }
     ]
 }
diff --git a/nova/tests/integrated/api_samples/os-hosts/hosts-list-resp.xml.tpl b/nova/tests/integrated/api_samples/os-hosts/hosts-list-resp.xml.tpl
index b5971738c1..a031c9b661 100644
--- a/nova/tests/integrated/api_samples/os-hosts/hosts-list-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/os-hosts/hosts-list-resp.xml.tpl
@@ -6,4 +6,5 @@
   <host host_name="%(host_name)s" service="scheduler" zone="internal"/>
   <host host_name="%(host_name)s" service="conductor" zone="internal"/>
   <host host_name="%(host_name)s" service="cells" zone="internal"/>
+  <host host_name="%(host_name)s" service="consoleauth" zone="internal"/>
 </hosts>
diff --git a/nova/tests/integrated/integrated_helpers.py b/nova/tests/integrated/integrated_helpers.py
index d96e253296..82d0bde374 100644
--- a/nova/tests/integrated/integrated_helpers.py
+++ b/nova/tests/integrated/integrated_helpers.py
@@ -83,7 +83,8 @@ class _IntegratedTestBase(test.TestCase):
         self.conductor = self.start_service('conductor',
                 manager=CONF.conductor.manager)
         self.compute = self.start_service('compute')
-        self.scheduler = self.start_service('cert')
+        self.cert = self.start_service('cert')
+        self.consoleauth = self.start_service('consoleauth')
         self.network = self.start_service('network')
         self.scheduler = self.start_service('scheduler')
         self.cells = self.start_service('cells', manager=CONF.cells.manager)