Commit 21c06e75 authored by aikchar's avatar aikchar

Fix delete request content & update tests

parent d2a9ba1a
......@@ -50,7 +50,7 @@ class RequestCmd:
:param name: Name of exchange to create
:type name: str
:param type_: Type of exchange to create
Possible values are fanout, ...?
Possible values are: direct, fanout, topic?
:type type_: str
:param strict: Whether command should fail when unrecognized properties are provided
Not used by QMFv2
......@@ -116,7 +116,9 @@ class RequestCmd:
"""
content = {"_object_id": {"_object_name": self.object_name},
"_method_name": "delete",
"options": {"type": "queue", "name": name, "options": dict()}}
"_arguments": {"type": "queue",
"name": name,
"options": dict()}}
logger.debug("Message content -> {0}".format(content))
return content, self.method_properties
......@@ -131,7 +133,7 @@ class RequestCmd:
"""
content = {"_object_id": {"_object_name": self.object_name},
"_method_name": "delete",
"options": {"type": "exchange", "name": name, "options": dict()}}
"_arguments": {"type": "exchange", "name": name, "options": dict()}}
logger.debug("Message content -> {0}".format(content))
return content, self.method_properties
......@@ -146,7 +148,7 @@ class RequestCmd:
"""
content = {"_object_id": {"_object_name": self.object_name},
"_method_name": "delete",
"options": {"type": "binding", "name": name, "options": dict()}}
"_arguments": {"type": "binding", "name": name, "options": dict()}}
logger.debug("Message content -> {0}".format(content))
return content, self.method_properties
......
......@@ -46,7 +46,7 @@ class TestRequestBinding:
expected_content = {"_object_id": {"_object_name": "org.apache.qpid.broker:broker:amqp-broker"},
"_method_name": "delete",
"options": {"type": "binding", "name": binding, "options": dict()}}
"_arguments": {"type": "binding", "name": binding, "options": dict()}}
logger.debug("Expected content -> {0}".format(expected_content))
expected_properties = {"x-amqp-0-10.app-id": "qmf2", "qmf.opcode": "_method_request", "method": "request"}
......
......@@ -48,7 +48,7 @@ class TestRequestExchange:
expected_content = {"_object_id": {"_object_name": "org.apache.qpid.broker:broker:amqp-broker"},
"_method_name": "delete",
"options": {"type": "exchange", "name": exchange, "options": dict()}}
"_arguments": {"type": "exchange", "name": exchange, "options": dict()}}
logger.debug("Expected content -> {0}".format(expected_content))
expected_properties = {"x-amqp-0-10.app-id": "qmf2", "qmf.opcode": "_method_request", "method": "request"}
......
......@@ -46,7 +46,7 @@ class TestRequestQueue:
expected_content = {"_object_id": {"_object_name": "org.apache.qpid.broker:broker:amqp-broker"},
"_method_name": "delete",
"options": {"type": "queue", "name": queue, "options": dict()}}
"_arguments": {"type": "queue", "name": queue, "options": dict()}}
logger.debug("Expected content -> {0}".format(expected_content))
expected_properties = {"x-amqp-0-10.app-id": "qmf2", "qmf.opcode": "_method_request", "method": "request"}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment