From 08ba371994055685934861ddc4ab2ead2f60348e Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Mon, 18 Jul 2016 14:04:30 -0400
Subject: [PATCH] Merge deployments data for zaqar collectors

This is required so that a the TripleO undercloud can
switch to polling for metadata from a Zaqar rather than Heat or
Swift.

Change-Id: Ieb076185314a7aeadd8a708ab01b48dfbccef006
Closes-bug: 1604098
---
 os_collect_config/tests/test_zaqar.py | 42 +++++++++++++++++++++++++++
 os_collect_config/zaqar.py            |  6 +++-
 2 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/os_collect_config/tests/test_zaqar.py b/os_collect_config/tests/test_zaqar.py
index be3acd0..58f877d 100644
--- a/os_collect_config/tests/test_zaqar.py
+++ b/os_collect_config/tests/test_zaqar.py
@@ -57,6 +57,30 @@ class FakeQueue(object):
             queue=self, ttl=10, age=10, body=test_heat.META_DATA, href='')])
 
 
+class FakeZaqarClientSoftwareConfig(object):
+
+    def __init__(self, testcase):
+        self._test = testcase
+
+    def Client(self, endpoint, conf, version):
+        self._test.assertEqual(1.1, version)
+        self._test.assertEqual('http://127.0.0.1:8888/', endpoint)
+        return self
+
+    def queue(self, queue_id):
+        self._test.assertEqual(
+            '4f3f46d3-09f1-42a7-8c13-f91a5457192c', queue_id)
+        return FakeQueueSoftwareConfig()
+
+
+class FakeQueueSoftwareConfig(object):
+
+    def pop(self):
+        return iter([message.Message(
+            queue=self, ttl=10, age=10, body=test_heat.SOFTWARE_CONFIG_DATA,
+            href='')])
+
+
 class TestZaqar(testtools.TestCase):
     def setUp(self):
         super(TestZaqar, self).setUp()
@@ -85,6 +109,24 @@ class TestZaqar(testtools.TestCase):
             self.assertIn(k, zaqar_md)
             self.assertEqual(zaqar_md[k], test_heat.META_DATA[k])
 
+    @mock.patch.object(ks_discover.Discover, '__init__')
+    @mock.patch.object(ks_discover.Discover, 'url_for')
+    def test_collect_zaqar_deployments(self, mock_url_for, mock___init__):
+        mock___init__.return_value = None
+        mock_url_for.return_value = cfg.CONF.zaqar.auth_url
+        zaqar_md = zaqar.Collector(
+            keystoneclient=FakeKeystoneClient(self, cfg.CONF.zaqar),
+            zaqarclient=FakeZaqarClientSoftwareConfig(self)).collect()
+        self.assertThat(zaqar_md, matchers.IsInstance(list))
+        self.assertEqual('zaqar', zaqar_md[0][0])
+        self.assertEqual(2, len(zaqar_md))
+        self.assertEqual('zaqar', zaqar_md[0][0])
+        self.assertEqual(
+            test_heat.SOFTWARE_CONFIG_DATA['deployments'],
+            zaqar_md[0][1]['deployments'])
+        self.assertEqual(
+            ('dep-name1', {'config1': 'value1'}), zaqar_md[1])
+
     @mock.patch.object(ks_discover.Discover, '__init__')
     @mock.patch.object(ks_discover.Discover, 'url_for')
     def test_collect_zaqar_fail(self, mock_url_for, mock___init__):
diff --git a/os_collect_config/zaqar.py b/os_collect_config/zaqar.py
index 66a88fc..54060bc 100644
--- a/os_collect_config/zaqar.py
+++ b/os_collect_config/zaqar.py
@@ -20,6 +20,7 @@ from zaqarclient.queues.v1 import client as zaqarclient
 
 from os_collect_config import exc
 from os_collect_config import keystone
+from os_collect_config import merger
 
 CONF = cfg.CONF
 logger = log.getLogger(__name__)
@@ -88,7 +89,10 @@ class Collector(object):
             queue = zaqar.queue(CONF.zaqar.queue_id)
             r = six.next(queue.pop())
 
-            return [('zaqar', r.body)]
+            final_list = merger.merged_list_from_content(
+                r.body, cfg.CONF.deployment_key, name)
+            return final_list
+
         except Exception as e:
             logger.warn(str(e))
             raise exc.ZaqarMetadataNotAvailable()