Switch to messaging v2 API

messaging v1(.1) API was already removed.

Switch to the current version.

Change-Id: Id2ea014d77b3689ad8aa1dac70c5a4a8d88f7b88
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>

os_collect_config/tests/test_zaqar.py

@@ -21,7 +21,7 @@ from oslo_config import cfg
 from oslo_config import fixture as config_fixture
 import testtools
 from testtools import matchers
-from zaqarclient.queues.v1 import message
+from zaqarclient.queues.v2 import message
 from zaqarclient import transport
 from zaqarclient.transport import response
 
@@ -53,7 +53,7 @@ class FakeZaqarClient:
         self._test = testcase
 
     def Client(self, endpoint, conf, version):
-        self._test.assertEqual(1.1, version)
+        self._test.assertEqual(2, version)
         self._test.assertEqual('http://192.0.2.1:8888/', endpoint)
         return self
 
@@ -101,7 +101,7 @@ class FakeZaqarClientSoftwareConfig:
         self._test = testcase
 
     def Client(self, endpoint, conf, version):
-        self._test.assertEqual(1.1, version)
+        self._test.assertEqual(2, version)
         self._test.assertEqual('http://192.0.2.1:8888/', endpoint)
         return self
 

os_collect_config/zaqar.py

@@ -17,7 +17,7 @@ import json
 from keystoneclient.v3 import client as keystoneclient
 from oslo_config import cfg
 from oslo_log import log
-from zaqarclient.queues.v1 import client as zaqarclient
+from zaqarclient.queues.v2 import client as zaqarclient
 from zaqarclient import transport
 from zaqarclient.transport import request
 
@@ -70,7 +70,7 @@ class Collector:
             kwargs['region_name'] = CONF.zaqar.region_name
         endpoint = ks.service_catalog.url_for(**kwargs)
         logger.debug('Fetching metadata from %s' % endpoint)
-        zaqar = self.zaqarclient.Client(endpoint, conf=conf, version=1.1)
+        zaqar = self.zaqarclient.Client(endpoint, conf=conf, version=2)
 
         queue = zaqar.queue(CONF.zaqar.queue_id)
         r = next(queue.pop())

releasenotes/notes/messaging-v2-b4310b93ffcd1c01.yaml

@@ -0,0 +1,4 @@
+---
+fixes:
+  - |
+    Zaqar collector now uses v2 messaging API, instead of v1.1 messaging API.