diff --git a/compile_definitions.py b/compile_definitions.py
index 54a53e238f743f46e362fd43ab2a9d96769eef94..8ab87e2f054719f9ce33ba4a462b17d1973c5b75 100644
--- a/compile_definitions.py
+++ b/compile_definitions.py
@@ -532,7 +532,7 @@ REPLY_REASONS_FOR = {\n''')
# Methods that are replies for other, ie. ConnectionOpenOk: ConnectionOpen
# a method may be a reply for ONE or NONE other methods
# if a method has no replies, it will have an empty list as value here
-REPLIES_FOR= {\n''')
+REPLIES_FOR = {\n''')
for k, v in methods_that_are_replies_for.items():
line(u' %s: [%s],\n' % (k, u', '.join(map(str, v))))
diff --git a/coolamqp/framing/definitions.py b/coolamqp/framing/definitions.py
index 5fc8c9cf82cd6f687c5552fbb3baf1cae53177a1..e72b596923b92a5b00b935070b2fc92687ce5fac 100644
--- a/coolamqp/framing/definitions.py
+++ b/coolamqp/framing/definitions.py
@@ -130,8 +130,8 @@ INTERNAL_ERROR = 541
# resume
# normal operations.
-HARD_ERRORS = [CONNECTION_FORCED, INVALID_PATH, FRAME_ERROR, SYNTAX_ERROR, COMMAND_INVALID, CHANNEL_ERROR, UNEXPECTED_FRAME, RESOURCE_ERROR, NOT_ALLOWED, NOT_IMPLEMENTED, INTERNAL_ERROR]
SOFT_ERRORS = [CONTENT_TOO_LARGE, NO_CONSUMERS, ACCESS_REFUSED, NOT_FOUND, RESOURCE_LOCKED, PRECONDITION_FAILED]
+HARD_ERRORS = [CONNECTION_FORCED, INVALID_PATH, FRAME_ERROR, SYNTAX_ERROR, COMMAND_INVALID, CHANNEL_ERROR, UNEXPECTED_FRAME, RESOURCE_ERROR, NOT_ALLOWED, NOT_IMPLEMENTED, INTERNAL_ERROR]
DOMAIN_TO_BASIC_TYPE = {
@@ -4559,134 +4559,134 @@ class ConfirmSelectOk(AMQPMethodPayload):
IDENT_TO_METHOD = {
- (90, 21): TxCommitOk,
- (60, 100): BasicRecoverAsync,
+ (10, 60): ConnectionBlocked,
+ (10, 50): ConnectionClose,
+ (10, 51): ConnectionCloseOk,
+ (10, 40): ConnectionOpen,
+ (10, 41): ConnectionOpenOk,
+ (10, 10): ConnectionStart,
+ (10, 20): ConnectionSecure,
(10, 11): ConnectionStartOk,
- (60, 40): BasicPublish,
- (60, 50): BasicReturn,
- (40, 21): ExchangeDeleteOk,
- (20, 20): ChannelFlow,
- (40, 31): ExchangeBindOk,
- (60, 21): BasicConsumeOk,
(10, 21): ConnectionSecureOk,
- (90, 30): TxRollback,
- (90, 10): TxSelect,
- (85, 11): ConfirmSelectOk,
- (10, 61): ConnectionUnblocked,
- (50, 11): QueueDeclareOk,
- (60, 70): BasicGet,
- (90, 11): TxSelectOk,
(10, 30): ConnectionTune,
- (60, 11): BasicQosOk,
- (60, 80): BasicAck,
- (20, 21): ChannelFlowOk,
- (60, 60): BasicDeliver,
- (90, 31): TxRollbackOk,
- (60, 20): BasicConsume,
- (85, 10): ConfirmSelect,
- (20, 40): ChannelClose,
- (60, 71): BasicGetOk,
- (50, 30): QueuePurge,
(10, 31): ConnectionTuneOk,
- (10, 40): ConnectionOpen,
- (60, 30): BasicCancel,
- (50, 50): QueueUnbind,
- (40, 10): ExchangeDeclare,
- (10, 50): ConnectionClose,
- (20, 10): ChannelOpen,
+ (10, 61): ConnectionUnblocked,
+ (20, 40): ChannelClose,
(20, 41): ChannelCloseOk,
- (60, 110): BasicRecover,
- (60, 90): BasicReject,
- (50, 31): QueuePurgeOk,
- (50, 40): QueueDelete,
- (40, 20): ExchangeDelete,
- (50, 20): QueueBind,
- (10, 41): ConnectionOpenOk,
- (60, 120): BasicNack,
- (60, 31): BasicCancelOk,
- (90, 20): TxCommit,
- (10, 10): ConnectionStart,
- (60, 10): BasicQos,
- (40, 11): ExchangeDeclareOk,
- (10, 51): ConnectionCloseOk,
- (40, 51): ExchangeUnbindOk,
+ (20, 20): ChannelFlow,
+ (20, 21): ChannelFlowOk,
+ (20, 10): ChannelOpen,
(20, 11): ChannelOpenOk,
- (60, 72): BasicGetEmpty,
(40, 30): ExchangeBind,
- (60, 111): BasicRecoverOk,
+ (40, 31): ExchangeBindOk,
+ (40, 10): ExchangeDeclare,
+ (40, 20): ExchangeDelete,
+ (40, 11): ExchangeDeclareOk,
+ (40, 21): ExchangeDeleteOk,
(40, 40): ExchangeUnbind,
- (10, 20): ConnectionSecure,
- (50, 41): QueueDeleteOk,
- (50, 51): QueueUnbindOk,
+ (40, 51): ExchangeUnbindOk,
+ (50, 20): QueueBind,
(50, 21): QueueBindOk,
- (10, 60): ConnectionBlocked,
(50, 10): QueueDeclare,
+ (50, 40): QueueDelete,
+ (50, 11): QueueDeclareOk,
+ (50, 41): QueueDeleteOk,
+ (50, 30): QueuePurge,
+ (50, 31): QueuePurgeOk,
+ (50, 50): QueueUnbind,
+ (50, 51): QueueUnbindOk,
+ (60, 80): BasicAck,
+ (60, 20): BasicConsume,
+ (60, 30): BasicCancel,
+ (60, 21): BasicConsumeOk,
+ (60, 31): BasicCancelOk,
+ (60, 60): BasicDeliver,
+ (60, 70): BasicGet,
+ (60, 71): BasicGetOk,
+ (60, 72): BasicGetEmpty,
+ (60, 120): BasicNack,
+ (60, 40): BasicPublish,
+ (60, 10): BasicQos,
+ (60, 11): BasicQosOk,
+ (60, 50): BasicReturn,
+ (60, 90): BasicReject,
+ (60, 100): BasicRecoverAsync,
+ (60, 110): BasicRecover,
+ (60, 111): BasicRecoverOk,
+ (90, 20): TxCommit,
+ (90, 21): TxCommitOk,
+ (90, 30): TxRollback,
+ (90, 31): TxRollbackOk,
+ (90, 10): TxSelect,
+ (90, 11): TxSelectOk,
+ (85, 10): ConfirmSelect,
+ (85, 11): ConfirmSelectOk,
}
BINARY_HEADER_TO_METHOD = {
- b'\x00\x5A\x00\x15': TxCommitOk,
- b'\x00\x3C\x00\x64': BasicRecoverAsync,
+ b'\x00\x0A\x00\x3C': ConnectionBlocked,
+ b'\x00\x0A\x00\x32': ConnectionClose,
+ b'\x00\x0A\x00\x33': ConnectionCloseOk,
+ b'\x00\x0A\x00\x28': ConnectionOpen,
+ b'\x00\x0A\x00\x29': ConnectionOpenOk,
+ b'\x00\x0A\x00\x0A': ConnectionStart,
+ b'\x00\x0A\x00\x14': ConnectionSecure,
b'\x00\x0A\x00\x0B': ConnectionStartOk,
- b'\x00\x3C\x00\x28': BasicPublish,
- b'\x00\x3C\x00\x32': BasicReturn,
- b'\x00\x28\x00\x15': ExchangeDeleteOk,
- b'\x00\x14\x00\x14': ChannelFlow,
- b'\x00\x28\x00\x1F': ExchangeBindOk,
- b'\x00\x3C\x00\x15': BasicConsumeOk,
b'\x00\x0A\x00\x15': ConnectionSecureOk,
- b'\x00\x5A\x00\x1E': TxRollback,
- b'\x00\x5A\x00\x0A': TxSelect,
- b'\x00\x55\x00\x0B': ConfirmSelectOk,
- b'\x00\x0A\x00\x3D': ConnectionUnblocked,
- b'\x00\x32\x00\x0B': QueueDeclareOk,
- b'\x00\x3C\x00\x46': BasicGet,
- b'\x00\x5A\x00\x0B': TxSelectOk,
b'\x00\x0A\x00\x1E': ConnectionTune,
- b'\x00\x3C\x00\x0B': BasicQosOk,
- b'\x00\x3C\x00\x50': BasicAck,
- b'\x00\x14\x00\x15': ChannelFlowOk,
- b'\x00\x3C\x00\x3C': BasicDeliver,
- b'\x00\x5A\x00\x1F': TxRollbackOk,
- b'\x00\x3C\x00\x14': BasicConsume,
- b'\x00\x55\x00\x0A': ConfirmSelect,
- b'\x00\x14\x00\x28': ChannelClose,
- b'\x00\x3C\x00\x47': BasicGetOk,
- b'\x00\x32\x00\x1E': QueuePurge,
b'\x00\x0A\x00\x1F': ConnectionTuneOk,
- b'\x00\x0A\x00\x28': ConnectionOpen,
- b'\x00\x3C\x00\x1E': BasicCancel,
- b'\x00\x32\x00\x32': QueueUnbind,
- b'\x00\x28\x00\x0A': ExchangeDeclare,
- b'\x00\x0A\x00\x32': ConnectionClose,
- b'\x00\x14\x00\x0A': ChannelOpen,
+ b'\x00\x0A\x00\x3D': ConnectionUnblocked,
+ b'\x00\x14\x00\x28': ChannelClose,
b'\x00\x14\x00\x29': ChannelCloseOk,
- b'\x00\x3C\x00\x6E': BasicRecover,
- b'\x00\x3C\x00\x5A': BasicReject,
- b'\x00\x32\x00\x1F': QueuePurgeOk,
- b'\x00\x32\x00\x28': QueueDelete,
- b'\x00\x28\x00\x14': ExchangeDelete,
- b'\x00\x32\x00\x14': QueueBind,
- b'\x00\x0A\x00\x29': ConnectionOpenOk,
- b'\x00\x3C\x00\x78': BasicNack,
- b'\x00\x3C\x00\x1F': BasicCancelOk,
- b'\x00\x5A\x00\x14': TxCommit,
- b'\x00\x0A\x00\x0A': ConnectionStart,
- b'\x00\x3C\x00\x0A': BasicQos,
- b'\x00\x28\x00\x0B': ExchangeDeclareOk,
- b'\x00\x0A\x00\x33': ConnectionCloseOk,
- b'\x00\x28\x00\x33': ExchangeUnbindOk,
+ b'\x00\x14\x00\x14': ChannelFlow,
+ b'\x00\x14\x00\x15': ChannelFlowOk,
+ b'\x00\x14\x00\x0A': ChannelOpen,
b'\x00\x14\x00\x0B': ChannelOpenOk,
- b'\x00\x3C\x00\x48': BasicGetEmpty,
b'\x00\x28\x00\x1E': ExchangeBind,
- b'\x00\x3C\x00\x6F': BasicRecoverOk,
+ b'\x00\x28\x00\x1F': ExchangeBindOk,
+ b'\x00\x28\x00\x0A': ExchangeDeclare,
+ b'\x00\x28\x00\x14': ExchangeDelete,
+ b'\x00\x28\x00\x0B': ExchangeDeclareOk,
+ b'\x00\x28\x00\x15': ExchangeDeleteOk,
b'\x00\x28\x00\x28': ExchangeUnbind,
- b'\x00\x0A\x00\x14': ConnectionSecure,
- b'\x00\x32\x00\x29': QueueDeleteOk,
- b'\x00\x32\x00\x33': QueueUnbindOk,
+ b'\x00\x28\x00\x33': ExchangeUnbindOk,
+ b'\x00\x32\x00\x14': QueueBind,
b'\x00\x32\x00\x15': QueueBindOk,
- b'\x00\x0A\x00\x3C': ConnectionBlocked,
b'\x00\x32\x00\x0A': QueueDeclare,
+ b'\x00\x32\x00\x28': QueueDelete,
+ b'\x00\x32\x00\x0B': QueueDeclareOk,
+ b'\x00\x32\x00\x29': QueueDeleteOk,
+ b'\x00\x32\x00\x1E': QueuePurge,
+ b'\x00\x32\x00\x1F': QueuePurgeOk,
+ b'\x00\x32\x00\x32': QueueUnbind,
+ b'\x00\x32\x00\x33': QueueUnbindOk,
+ b'\x00\x3C\x00\x50': BasicAck,
+ b'\x00\x3C\x00\x14': BasicConsume,
+ b'\x00\x3C\x00\x1E': BasicCancel,
+ b'\x00\x3C\x00\x15': BasicConsumeOk,
+ b'\x00\x3C\x00\x1F': BasicCancelOk,
+ b'\x00\x3C\x00\x3C': BasicDeliver,
+ b'\x00\x3C\x00\x46': BasicGet,
+ b'\x00\x3C\x00\x47': BasicGetOk,
+ b'\x00\x3C\x00\x48': BasicGetEmpty,
+ b'\x00\x3C\x00\x78': BasicNack,
+ b'\x00\x3C\x00\x28': BasicPublish,
+ b'\x00\x3C\x00\x0A': BasicQos,
+ b'\x00\x3C\x00\x0B': BasicQosOk,
+ b'\x00\x3C\x00\x32': BasicReturn,
+ b'\x00\x3C\x00\x5A': BasicReject,
+ b'\x00\x3C\x00\x64': BasicRecoverAsync,
+ b'\x00\x3C\x00\x6E': BasicRecover,
+ b'\x00\x3C\x00\x6F': BasicRecoverOk,
+ b'\x00\x5A\x00\x14': TxCommit,
+ b'\x00\x5A\x00\x15': TxCommitOk,
+ b'\x00\x5A\x00\x1E': TxRollback,
+ b'\x00\x5A\x00\x1F': TxRollbackOk,
+ b'\x00\x5A\x00\x0A': TxSelect,
+ b'\x00\x5A\x00\x0B': TxSelectOk,
+ b'\x00\x55\x00\x0A': ConfirmSelect,
+ b'\x00\x55\x00\x0B': ConfirmSelectOk,
}
@@ -4698,98 +4698,98 @@ CLASS_ID_TO_CONTENT_PROPERTY_LIST = {
# if a method is NOT a reply, it will not be in this dict
# a method may be a reply for AT MOST one method
REPLY_REASONS_FOR = {
- BasicGetEmpty: BasicGet,
- BasicGetOk: BasicGet,
+ ConnectionCloseOk: ConnectionClose,
+ ConnectionOpenOk: ConnectionOpen,
+ ConnectionStartOk: ConnectionStart,
+ ConnectionSecureOk: ConnectionSecure,
+ ConnectionTuneOk: ConnectionTune,
+ ChannelCloseOk: ChannelClose,
+ ChannelFlowOk: ChannelFlow,
+ ChannelOpenOk: ChannelOpen,
+ ExchangeBindOk: ExchangeBind,
+ ExchangeDeclareOk: ExchangeDeclare,
ExchangeDeleteOk: ExchangeDelete,
- TxSelectOk: TxSelect,
+ ExchangeUnbindOk: ExchangeUnbind,
QueueBindOk: QueueBind,
+ QueueDeclareOk: QueueDeclare,
+ QueueDeleteOk: QueueDelete,
+ QueuePurgeOk: QueuePurge,
+ QueueUnbindOk: QueueUnbind,
BasicConsumeOk: BasicConsume,
BasicCancelOk: BasicCancel,
- TxRollbackOk: TxRollback,
- TxCommitOk: TxCommit,
- ChannelOpenOk: ChannelOpen,
- QueueDeleteOk: QueueDelete,
- ExchangeUnbindOk: ExchangeUnbind,
- ExchangeBindOk: ExchangeBind,
- ChannelCloseOk: ChannelClose,
+ BasicGetOk: BasicGet,
+ BasicGetEmpty: BasicGet,
BasicQosOk: BasicQos,
- ConnectionStartOk: ConnectionStart,
- QueueUnbindOk: QueueUnbind,
+ TxCommitOk: TxCommit,
+ TxRollbackOk: TxRollback,
+ TxSelectOk: TxSelect,
ConfirmSelectOk: ConfirmSelect,
- ConnectionCloseOk: ConnectionClose,
- QueuePurgeOk: QueuePurge,
- QueueDeclareOk: QueueDeclare,
- ExchangeDeclareOk: ExchangeDeclare,
- ConnectionTuneOk: ConnectionTune,
- ConnectionSecureOk: ConnectionSecure,
- ConnectionOpenOk: ConnectionOpen,
- ChannelFlowOk: ChannelFlow,
}
# Methods that are replies for other, ie. ConnectionOpenOk: ConnectionOpen
# a method may be a reply for ONE or NONE other methods
# if a method has no replies, it will have an empty list as value here
-REPLIES_FOR= {
- BasicGetEmpty: [],
- BasicRecoverOk: [],
- BasicReturn: [],
- QueueDeclare: [QueueDeclareOk],
- BasicGetOk: [],
+REPLIES_FOR = {
+ ConnectionBlocked: [],
+ ConnectionClose: [ConnectionCloseOk],
+ ConnectionCloseOk: [],
+ ConnectionOpen: [ConnectionOpenOk],
+ ConnectionOpenOk: [],
+ ConnectionStart: [ConnectionStartOk],
ConnectionSecure: [ConnectionSecureOk],
+ ConnectionStartOk: [],
+ ConnectionSecureOk: [],
ConnectionTune: [ConnectionTuneOk],
- TxRollback: [TxRollbackOk],
- TxSelectOk: [],
- QueueBindOk: [],
+ ConnectionTuneOk: [],
+ ConnectionUnblocked: [],
+ ChannelClose: [ChannelCloseOk],
+ ChannelCloseOk: [],
ChannelFlow: [ChannelFlowOk],
- BasicConsumeOk: [],
- BasicConsume: [BasicConsumeOk],
- BasicRecover: [],
- BasicCancelOk: [],
- ConfirmSelect: [ConfirmSelectOk],
- BasicGet: [BasicGetOk, BasicGetEmpty],
- TxRollbackOk: [],
- QueueBind: [QueueBindOk],
- ExchangeDelete: [ExchangeDeleteOk],
- BasicAck: [],
- ConnectionClose: [ConnectionCloseOk],
+ ChannelFlowOk: [],
+ ChannelOpen: [ChannelOpenOk],
ChannelOpenOk: [],
- QueueDeleteOk: [],
- ExchangeUnbindOk: [],
- ConnectionStart: [ConnectionStartOk],
- BasicQos: [BasicQosOk],
- QueueUnbind: [QueueUnbindOk],
- BasicQosOk: [],
- BasicReject: [],
+ ExchangeBind: [ExchangeBindOk],
ExchangeBindOk: [],
- ChannelCloseOk: [],
ExchangeDeclare: [ExchangeDeclareOk],
- ConnectionBlocked: [],
- BasicPublish: [],
- ExchangeUnbind: [ExchangeUnbindOk],
+ ExchangeDelete: [ExchangeDeleteOk],
+ ExchangeDeclareOk: [],
ExchangeDeleteOk: [],
- BasicNack: [],
- ConnectionStartOk: [],
- ExchangeBind: [ExchangeBindOk],
+ ExchangeUnbind: [ExchangeUnbindOk],
+ ExchangeUnbindOk: [],
+ QueueBind: [QueueBindOk],
+ QueueBindOk: [],
+ QueueDeclare: [QueueDeclareOk],
QueueDelete: [QueueDeleteOk],
- ConfirmSelectOk: [],
- ConnectionCloseOk: [],
+ QueueDeclareOk: [],
+ QueueDeleteOk: [],
QueuePurge: [QueuePurgeOk],
- QueueUnbindOk: [],
- ChannelOpen: [ChannelOpenOk],
- ChannelClose: [ChannelCloseOk],
QueuePurgeOk: [],
- QueueDeclareOk: [],
+ QueueUnbind: [QueueUnbindOk],
+ QueueUnbindOk: [],
+ BasicAck: [],
+ BasicConsume: [BasicConsumeOk],
BasicCancel: [BasicCancelOk],
- ExchangeDeclareOk: [],
- TxCommitOk: [],
- ConnectionTuneOk: [],
- ConnectionSecureOk: [],
- ConnectionUnblocked: [],
- ConnectionOpenOk: [],
- ChannelFlowOk: [],
- BasicRecoverAsync: [],
- TxSelect: [TxSelectOk],
+ BasicConsumeOk: [],
+ BasicCancelOk: [],
BasicDeliver: [],
+ BasicGet: [BasicGetOk, BasicGetEmpty],
+ BasicGetOk: [],
+ BasicGetEmpty: [],
+ BasicNack: [],
+ BasicPublish: [],
+ BasicQos: [BasicQosOk],
+ BasicQosOk: [],
+ BasicReturn: [],
+ BasicReject: [],
+ BasicRecoverAsync: [],
+ BasicRecover: [],
+ BasicRecoverOk: [],
TxCommit: [TxCommitOk],
- ConnectionOpen: [ConnectionOpenOk],
+ TxCommitOk: [],
+ TxRollback: [TxRollbackOk],
+ TxRollbackOk: [],
+ TxSelect: [TxSelectOk],
+ TxSelectOk: [],
+ ConfirmSelect: [ConfirmSelectOk],
+ ConfirmSelectOk: [],
}