Merge "Deprecate the amqp1 driver and Remove qpid functional tests"
This commit is contained in:
commit
fa15630041
oslo_messaging/_drivers
releasenotes/notes
tools
@ -25,7 +25,9 @@ import logging
|
|||||||
import os
|
import os
|
||||||
import threading
|
import threading
|
||||||
import uuid
|
import uuid
|
||||||
|
import warnings
|
||||||
|
|
||||||
|
from debtcollector import removals
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
from oslo_messaging.target import Target
|
from oslo_messaging.target import Target
|
||||||
from oslo_serialization import jsonutils
|
from oslo_serialization import jsonutils
|
||||||
@ -38,6 +40,7 @@ from oslo_messaging._drivers import base
|
|||||||
from oslo_messaging._drivers import common
|
from oslo_messaging._drivers import common
|
||||||
|
|
||||||
|
|
||||||
|
warnings.simplefilter('always')
|
||||||
proton = importutils.try_import('proton')
|
proton = importutils.try_import('proton')
|
||||||
controller = importutils.try_import(
|
controller = importutils.try_import(
|
||||||
'oslo_messaging._drivers.amqp1_driver.controller'
|
'oslo_messaging._drivers.amqp1_driver.controller'
|
||||||
@ -103,6 +106,7 @@ def unmarshal_request(message):
|
|||||||
return (msg, data.get("context"), data.get("call_monitor_timeout"))
|
return (msg, data.get("context"), data.get("call_monitor_timeout"))
|
||||||
|
|
||||||
|
|
||||||
|
@removals.removed_class("ProtonIncomingMessage")
|
||||||
class ProtonIncomingMessage(base.RpcIncomingMessage):
|
class ProtonIncomingMessage(base.RpcIncomingMessage):
|
||||||
def __init__(self, listener, message, disposition):
|
def __init__(self, listener, message, disposition):
|
||||||
request, ctxt, client_timeout = unmarshal_request(message)
|
request, ctxt, client_timeout = unmarshal_request(message)
|
||||||
@ -165,6 +169,7 @@ class ProtonIncomingMessage(base.RpcIncomingMessage):
|
|||||||
self.listener.driver._ctrl.add_task(task)
|
self.listener.driver._ctrl.add_task(task)
|
||||||
|
|
||||||
|
|
||||||
|
@removals.removed_class("Queue")
|
||||||
class Queue(object):
|
class Queue(object):
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
self._queue = collections.deque()
|
self._queue = collections.deque()
|
||||||
@ -194,6 +199,7 @@ class Queue(object):
|
|||||||
self._pop_wake_condition.notify_all()
|
self._pop_wake_condition.notify_all()
|
||||||
|
|
||||||
|
|
||||||
|
@removals.removed_class("ProtonListener")
|
||||||
class ProtonListener(base.PollStyleListener):
|
class ProtonListener(base.PollStyleListener):
|
||||||
def __init__(self, driver):
|
def __init__(self, driver):
|
||||||
super(ProtonListener, self).__init__(driver.prefetch_size)
|
super(ProtonListener, self).__init__(driver.prefetch_size)
|
||||||
@ -214,6 +220,7 @@ class ProtonListener(base.PollStyleListener):
|
|||||||
qentry['disposition'])
|
qentry['disposition'])
|
||||||
|
|
||||||
|
|
||||||
|
@removals.removed_class("ProtonDriver")
|
||||||
class ProtonDriver(base.BaseDriver):
|
class ProtonDriver(base.BaseDriver):
|
||||||
"""AMQP 1.0 Driver
|
"""AMQP 1.0 Driver
|
||||||
|
|
||||||
|
@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
deprecations:
|
||||||
|
- |
|
||||||
|
The AMQP1 driver is now deprecated. Its related functional tests are also
|
||||||
|
disabled. Neither debian nor ubuntu in the latest releases have any binary
|
||||||
|
built for qpid server, not even 3rd party. Only qpid proton, the client
|
||||||
|
lib, is available.
|
@ -50,19 +50,6 @@ case $SCENARIO in
|
|||||||
export NOTIFY_TRANSPORT_URL=kafka://127.0.0.1:9092/
|
export NOTIFY_TRANSPORT_URL=kafka://127.0.0.1:9092/
|
||||||
RUN="--env-prefix RABBITMQ run rabbitmq -- pifpaf --env-prefix KAFKA run kafka"
|
RUN="--env-prefix RABBITMQ run rabbitmq -- pifpaf --env-prefix KAFKA run kafka"
|
||||||
;;
|
;;
|
||||||
scenario03)
|
|
||||||
_setup_global_site_package_path
|
|
||||||
export RPC_TRANSPORT_URL=amqp://stackqpid:secretqpid@127.0.0.1:5692/
|
|
||||||
export NOTIFY_TRANSPORT_URL=rabbit://pifpaf:secret@127.0.0.1:5682/
|
|
||||||
RUN="--env-prefix RABBITMQ run rabbitmq -- pifpaf --debug --env-prefix QDR run qdrouterd --username stackqpid --password secretqpid --port 5692"
|
|
||||||
;;
|
|
||||||
scenario04)
|
|
||||||
_setup_global_site_package_path
|
|
||||||
_setup_kafka
|
|
||||||
export RPC_TRANSPORT_URL=amqp://stackqpid:secretqpid@127.0.0.1:5692/
|
|
||||||
export NOTIFY_TRANSPORT_URL=kafka://127.0.0.1:9092/
|
|
||||||
RUN="--env-prefix KAFKA run kafka -- pifpaf --debug --env-prefix QDR run qdrouterd --username stackqpid --password secretqpid --port 5692"
|
|
||||||
;;
|
|
||||||
*) ;;
|
*) ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user