Use zaqar v2 in integration tests
zaqar v1/1.1 has been deprecated since long. Though it's enabled
in the devstack plugin[1], this may cause some issues and potential
data loss. Better remove all it's usage.
[1] https://git.openstack.org/cgit/openstack/zaqar/tree/devstack/plugin.sh#n88
Change-Id: Ifa1636dcf296747735dc8d28c2feb108919c094d
diff --git a/functional/test_event_sinks.py b/functional/test_event_sinks.py
index 5d9f566..95d0d1a 100644
--- a/functional/test_event_sinks.py
+++ b/functional/test_event_sinks.py
@@ -12,7 +12,7 @@
import uuid
-from zaqarclient.queues.v1 import client as zaqarclient
+from zaqarclient.queues.v2 import client as zaqarclient
from heat_integrationtests.functional import functional_base
@@ -52,7 +52,7 @@
}
}
- zaqar = zaqarclient.Client(conf=conf, version=1.1)
+ zaqar = zaqarclient.Client(conf=conf)
queue = zaqar.queue(queue_id)
messages = list(queue.messages())
self.assertEqual(4, len(messages))
diff --git a/functional/test_waitcondition.py b/functional/test_waitcondition.py
index fd5399f..f79d49b 100644
--- a/functional/test_waitcondition.py
+++ b/functional/test_waitcondition.py
@@ -13,7 +13,7 @@
import json
from keystoneclient.v3 import client as keystoneclient
-from zaqarclient.queues.v1 import client as zaqarclient
+from zaqarclient.queues.v2 import client as zaqarclient
from heat_integrationtests.functional import functional_base
@@ -63,7 +63,7 @@
}
}
- zaqar = zaqarclient.Client(endpoint, conf=conf, version=1.1)
+ zaqar = zaqarclient.Client(endpoint, conf=conf)
queue = zaqar.queue(signal['queue_id'])
queue.post({'body': {'data': 'here!', 'id': 'data_id'}, 'ttl': 600})