Commit e1a5d145 authored by Federico Sismondi's avatar Federico Sismondi

version ++

parent 064e742c
Pipeline #2647 failed with stage
in 0 seconds
...@@ -30,7 +30,7 @@ Essentially it allows you to: ...@@ -30,7 +30,7 @@ Essentially it allows you to:
>>> from messages import * >>> from messages import *
>>> m = MsgTestCaseSkip(testcase_id = 'some_testcase_id') >>> m = MsgTestCaseSkip(testcase_id = 'some_testcase_id')
>>> m >>> m
MsgTestCaseSkip(_api_version = 1.1.3, description = Skip testcase, node = someNode, testcase_id = some_testcase_id, ) MsgTestCaseSkip(_api_version = 1.2.0, description = Skip testcase, node = someNode, testcase_id = some_testcase_id, )
>>> m.routing_key >>> m.routing_key
'testsuite.testcase.skip' 'testsuite.testcase.skip'
>>> m.message_id # doctest: +SKIP >>> m.message_id # doctest: +SKIP
...@@ -41,24 +41,24 @@ MsgTestCaseSkip(_api_version = 1.1.3, description = Skip testcase, node = someNo ...@@ -41,24 +41,24 @@ MsgTestCaseSkip(_api_version = 1.1.3, description = Skip testcase, node = someNo
# also we can modify some of the fields (rewrite the default ones) # also we can modify some of the fields (rewrite the default ones)
>>> m = MsgTestCaseSkip(testcase_id = 'TD_COAP_CORE_03') >>> m = MsgTestCaseSkip(testcase_id = 'TD_COAP_CORE_03')
>>> m >>> m
MsgTestCaseSkip(_api_version = 1.1.3, description = Skip testcase, node = someNode, testcase_id = TD_COAP_CORE_03, ) MsgTestCaseSkip(_api_version = 1.2.0, description = Skip testcase, node = someNode, testcase_id = TD_COAP_CORE_03, )
>>> m.testcase_id >>> m.testcase_id
'TD_COAP_CORE_03' 'TD_COAP_CORE_03'
# and even export the message in json format (for example for sending the message though the amqp event bus) # and even export the message in json format (for example for sending the message though the amqp event bus)
>>> m.to_json() >>> m.to_json()
'{"_api_version": "1.1.3", "description": "Skip testcase", "node": "someNode", "testcase_id": "TD_COAP_CORE_03"}' '{"_api_version": "1.2.0", "description": "Skip testcase", "node": "someNode", "testcase_id": "TD_COAP_CORE_03"}'
# We can use the Message class to import json into Message objects: # We can use the Message class to import json into Message objects:
>>> m=MsgTestSuiteStart() >>> m=MsgTestSuiteStart()
>>> m.routing_key >>> m.routing_key
'testsuite.start' 'testsuite.start'
>>> m.to_json() >>> m.to_json()
'{"_api_version": "1.1.3", "description": "Test suite START command"}' '{"_api_version": "1.2.0", "description": "Test suite START command"}'
>>> json_message = m.to_json() >>> json_message = m.to_json()
>>> obj=Message.load(json_message,'testsuite.start', None ) >>> obj=Message.load(json_message,'testsuite.start', None )
>>> obj >>> obj
MsgTestSuiteStart(_api_version = 1.1.3, description = Test suite START command, ) MsgTestSuiteStart(_api_version = 1.2.0, description = Test suite START command, )
>>> type(obj) # doctest: +SKIP >>> type(obj) # doctest: +SKIP
<class 'messages.MsgTestSuiteStart'> <class 'messages.MsgTestSuiteStart'>
...@@ -70,7 +70,7 @@ MsgTestSuiteStart(_api_version = 1.1.3, description = Test suite START command, ...@@ -70,7 +70,7 @@ MsgTestSuiteStart(_api_version = 1.1.3, description = Test suite START command,
# the error reply (note that we pass the message of the request to build the reply): # the error reply (note that we pass the message of the request to build the reply):
>>> err = MsgErrorReply(m) >>> err = MsgErrorReply(m)
>>> err >>> err
MsgErrorReply(_api_version = 1.1.3, error_code = None, error_message = None, ok = False, ) MsgErrorReply(_api_version = 1.2.0, error_code = None, error_message = None, ok = False, )
# properties of the message are auto-generated: # properties of the message are auto-generated:
>>> m.reply_to >>> m.reply_to
...@@ -96,10 +96,10 @@ MsgErrorReply(_api_version = 1.1.3, error_code = None, error_message = None, ok ...@@ -96,10 +96,10 @@ MsgErrorReply(_api_version = 1.1.3, error_code = None, error_message = None, ok
>>> m.routing_key >>> m.routing_key
'sniffing.getcapture.request' 'sniffing.getcapture.request'
>>> m.to_json() >>> m.to_json()
'{"_api_version": "1.1.3", "capture_id": "TD_COAP_CORE_01"}' '{"_api_version": "1.2.0", "capture_id": "TD_COAP_CORE_01"}'
>>> json_message = m.to_json() >>> json_message = m.to_json()
>>> json_message >>> json_message
'{"_api_version": "1.1.3", "capture_id": "TD_COAP_CORE_01"}' '{"_api_version": "1.2.0", "capture_id": "TD_COAP_CORE_01"}'
>>> obj=Message.load(json_message,'testsuite.start', None ) >>> obj=Message.load(json_message,'testsuite.start', None )
>>> type(obj) # doctest >>> type(obj) # doctest
<class 'messages.MsgTestSuiteStart'> <class 'messages.MsgTestSuiteStart'>
...@@ -116,7 +116,7 @@ Build a message from a pika's returned values on consume: ...@@ -116,7 +116,7 @@ Build a message from a pika's returned values on consume:
>>> m.routing_key >>> m.routing_key
'sniffing.getcapture.request' 'sniffing.getcapture.request'
>>> m.to_json() >>> m.to_json()
'{"_api_version": "1.1.3", "capture_id": "TD_COAP_CORE_01"}' '{"_api_version": "1.2.0", "capture_id": "TD_COAP_CORE_01"}'
``` ```
...@@ -161,7 +161,7 @@ Sending message.. ...@@ -161,7 +161,7 @@ Sending message..
[Event bus message] [<class 'messages.messages.MsgTestSuiteStart'>] [Event bus message] [<class 'messages.messages.MsgTestSuiteStart'>]
------------ ------------------------ ------------ ------------------------
_api_version 1.1.3 _api_version 1.2.0
description Test suite START command description Test suite START command
------------ ------------------------ ------------ ------------------------
...@@ -172,22 +172,22 @@ but also for testing internal services provided by the tools ...@@ -172,22 +172,22 @@ but also for testing internal services provided by the tools
``` ```
> _send_MsgTestSuiteGetTestCases > _send_MsgTestSuiteGetTestCases
[User input] trying to send message: MsgTestSuiteGetTestCases(_api_version = 1.1.3, ) [User input] trying to send message: MsgTestSuiteGetTestCases(_api_version = 1.2.0, )
Sending message.. Sending message..
[Event bus message] [<class 'messages.messages.MsgTestSuiteGetTestCases'>] [Event bus message] [<class 'messages.messages.MsgTestSuiteGetTestCases'>]
------------ ----- ------------ -----
_api_version 1.1.3 _api_version 1.2.0
------------ ----- ------------ -----
[log][test_coordinator|amqp_connector] RECEIVED request: <class 'ioppytest.utils.messages.messages.MsgTestSuiteGetTestCases'> [log][test_coordinator|amqp_connector] RECEIVED request: <class 'ioppytest.utils.messages.messages.MsgTestSuiteGetTestCases'>
[log][test_coordinator|amqp_connector] HANDLING request: <class 'ioppytest.utils.messages.messages.MsgTestSuiteGetTestCases'> [log][test_coordinator|amqp_connector] HANDLING request: <class 'ioppytest.utils.messages.messages.MsgTestSuiteGetTestCases'>
[log][test_coordinator|amqp_connector] PUBLISHING to routing_key: testsuite.testcases.list.reply, msg: MsgReply(_api_version = 1.1.3, ok = True, tc_list = [OrderedDict([('te [log][test_coordinator|amqp_connector] PUBLISHING to routing_key: testsuite.testcases.list.reply, msg: MsgReply(_api_version = 1.2.0, ok = True, tc_list = [OrderedDict([('te
[Event bus message] [<class 'messages.messages.MsgTestSuiteGetTestCasesReply'>] [Event bus message] [<class 'messages.messages.MsgTestSuiteGetTestCasesReply'>]
------------ -------------------------------------------------------------------------------------------------------------------- ------------ --------------------------------------------------------------------------------------------------------------------
_api_version 1.1.3 _api_version 1.2.0
ok True ok True
tc_list {'testcase_id': 'TD_COAP_CORE_01', 'testcase_ref': 'http://doc.f-interop.eu/tests/TD_COAP_CORE_01', 'state': None} tc_list {'testcase_id': 'TD_COAP_CORE_01', 'testcase_ref': 'http://doc.f-interop.eu/tests/TD_COAP_CORE_01', 'state': None}
{'testcase_id': 'TD_COAP_CORE_02', 'testcase_ref': 'http://doc.f-interop.eu/tests/TD_COAP_CORE_02', 'state': None} {'testcase_id': 'TD_COAP_CORE_02', 'testcase_ref': 'http://doc.f-interop.eu/tests/TD_COAP_CORE_02', 'state': None}
...@@ -221,13 +221,13 @@ other example: ...@@ -221,13 +221,13 @@ other example:
``` ```
> _send_MsgAgentTunStart > _send_MsgAgentTunStart
[User input] trying to send message: MsgAgentTunStart(_api_version = 1.1.3, ipv4_host = None, ipv4_netmask = None, ipv4_network = None, ipv6_host = :3, ipv6_no_forwarding = False, ipv6_prefix = bbbb, name = agent_TT, re_route_packets_host = None, re_route_packets_if = None, re_route_packets_prefix = None, ) [User input] trying to send message: MsgAgentTunStart(_api_version = 1.2.0, ipv4_host = None, ipv4_netmask = None, ipv4_network = None, ipv6_host = :3, ipv6_no_forwarding = False, ipv6_prefix = bbbb, name = agent_TT, re_route_packets_host = None, re_route_packets_if = None, re_route_packets_prefix = None, )
Sending message.. Sending message..
[Event bus message] [<class 'messages.messages.MsgAgentTunStart'>] [Event bus message] [<class 'messages.messages.MsgAgentTunStart'>]
----------------------- -------- ----------------------- --------
_api_version 1.1.3 _api_version 1.2.0
ipv4_host ipv4_host
ipv4_netmask ipv4_netmask
ipv4_network ipv4_network
...@@ -281,7 +281,7 @@ and the message properties into Message python objects ...@@ -281,7 +281,7 @@ and the message properties into Message python objects
[Event bus message] [<class 'messages.messages.MsgTestingToolComponentReady'>] [Event bus message] [<class 'messages.messages.MsgTestingToolComponentReady'>]
------------ ------------------------------- ------------ -------------------------------
_api_version 1.1.3 _api_version 1.2.0
component amqp_listener_b49d7db4 component amqp_listener_b49d7db4
description amqp_listener_b49d7db4 is READY description amqp_listener_b49d7db4 is READY
------------ ------------------------------- ------------ -------------------------------
...@@ -304,7 +304,7 @@ No conversion from json to python objects, no data validation ...@@ -304,7 +304,7 @@ No conversion from json to python objects, no data validation
routing_key : testsuite.testcases.list.request routing_key : testsuite.testcases.list.request
------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------
{ {
"_api_version": "1.1.3", "_api_version": "1.2.0",
"content_type": "application/json", "content_type": "application/json",
"correlation_id": "00393e9e-d255-4309-8a9b-18ec608602f3", "correlation_id": "00393e9e-d255-4309-8a9b-18ec608602f3",
"message_id": "00393e9e-d255-4309-8a9b-18ec608602f3", "message_id": "00393e9e-d255-4309-8a9b-18ec608602f3",
...@@ -336,13 +336,13 @@ routing_key : log.info.test_coordinator|amqp_connector ...@@ -336,13 +336,13 @@ routing_key : log.info.test_coordinator|amqp_connector
"_api_version": "1.0.8", "_api_version": "1.0.8",
"component": "test_coordinator|amqp_connector", "component": "test_coordinator|amqp_connector",
"content_type": "application/json", "content_type": "application/json",
"message": "PUBLISHING to routing_key: testsuite.testcases.list.reply, msg: MsgReply(_api_version = 1.1.3, ok = True, tc_list = [OrderedDict([('te" "message": "PUBLISHING to routing_key: testsuite.testcases.list.reply, msg: MsgReply(_api_version = 1.2.0, ok = True, tc_list = [OrderedDict([('te"
} }
------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------
routing_key : testsuite.testcases.list.reply routing_key : testsuite.testcases.list.reply
------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------
{ {
"_api_version": "1.1.3", "_api_version": "1.2.0",
"content_type": "application/json", "content_type": "application/json",
"correlation_id": "00393e9e-d255-4309-8a9b-18ec608602f3", "correlation_id": "00393e9e-d255-4309-8a9b-18ec608602f3",
"message_id": "619283ab-c6a1-4b91-8a65-8697b665e3a1", "message_id": "619283ab-c6a1-4b91-8a65-8697b665e3a1",
......
...@@ -26,7 +26,7 @@ Usage: ...@@ -26,7 +26,7 @@ Usage:
------ ------
>>> m = MsgTestCaseSkip(testcase_id = 'some_testcase_id') >>> m = MsgTestCaseSkip(testcase_id = 'some_testcase_id')
>>> m >>> m
MsgTestCaseSkip(_api_version = 1.1.3, description = Skip testcase, node = someNode, testcase_id = some_testcase_id, ) MsgTestCaseSkip(_api_version = 1.2.0, description = Skip testcase, node = someNode, testcase_id = some_testcase_id, )
>>> m.routing_key >>> m.routing_key
'testsuite.testcase.skip' 'testsuite.testcase.skip'
>>> m.message_id # doctest: +SKIP >>> m.message_id # doctest: +SKIP
...@@ -37,24 +37,24 @@ MsgTestCaseSkip(_api_version = 1.1.3, description = Skip testcase, node = someNo ...@@ -37,24 +37,24 @@ MsgTestCaseSkip(_api_version = 1.1.3, description = Skip testcase, node = someNo
# also we can modify some of the fields (rewrite the default ones) # also we can modify some of the fields (rewrite the default ones)
>>> m = MsgTestCaseSkip(testcase_id = 'TD_COAP_CORE_03') >>> m = MsgTestCaseSkip(testcase_id = 'TD_COAP_CORE_03')
>>> m >>> m
MsgTestCaseSkip(_api_version = 1.1.3, description = Skip testcase, node = someNode, testcase_id = TD_COAP_CORE_03, ) MsgTestCaseSkip(_api_version = 1.2.0, description = Skip testcase, node = someNode, testcase_id = TD_COAP_CORE_03, )
>>> m.testcase_id >>> m.testcase_id
'TD_COAP_CORE_03' 'TD_COAP_CORE_03'
# and even export the message in json format (for example for sending the message though the amqp event bus) # and even export the message in json format (for example for sending the message though the amqp event bus)
>>> m.to_json() >>> m.to_json()
'{"_api_version": "1.1.3", "description": "Skip testcase", "node": "someNode", "testcase_id": "TD_COAP_CORE_03"}' '{"_api_version": "1.2.0", "description": "Skip testcase", "node": "someNode", "testcase_id": "TD_COAP_CORE_03"}'
# We can use the Message class to import json into Message objects: # We can use the Message class to import json into Message objects:
>>> m=MsgTestSuiteStart() >>> m=MsgTestSuiteStart()
>>> m.routing_key >>> m.routing_key
'testsuite.start' 'testsuite.start'
>>> m.to_json() >>> m.to_json()
'{"_api_version": "1.1.3", "description": "Test suite START command"}' '{"_api_version": "1.2.0", "description": "Test suite START command"}'
>>> json_message = m.to_json() >>> json_message = m.to_json()
>>> obj=Message.load(json_message,'testsuite.start', None ) >>> obj=Message.load(json_message,'testsuite.start', None )
>>> obj >>> obj
MsgTestSuiteStart(_api_version = 1.1.3, description = Test suite START command, ) MsgTestSuiteStart(_api_version = 1.2.0, description = Test suite START command, )
>>> type(obj) # doctest: +SKIP >>> type(obj) # doctest: +SKIP
<class 'messages.MsgTestSuiteStart'> <class 'messages.MsgTestSuiteStart'>
...@@ -66,7 +66,7 @@ MsgTestSuiteStart(_api_version = 1.1.3, description = Test suite START command, ...@@ -66,7 +66,7 @@ MsgTestSuiteStart(_api_version = 1.1.3, description = Test suite START command,
# the error reply (note that we pass the message of the request to build the reply): # the error reply (note that we pass the message of the request to build the reply):
>>> err = MsgErrorReply(m) >>> err = MsgErrorReply(m)
>>> err >>> err
MsgErrorReply(_api_version = 1.1.3, error_code = None, error_message = None, ok = False, ) MsgErrorReply(_api_version = 1.2.0, error_code = None, error_message = None, ok = False, )
# properties of the message are auto-generated: # properties of the message are auto-generated:
>>> m.reply_to >>> m.reply_to
...@@ -91,7 +91,7 @@ import time ...@@ -91,7 +91,7 @@ import time
import json import json
import uuid import uuid
API_VERSION = '1.1.3' API_VERSION = '1.2.0'
class NonCompliantMessageFormatError(Exception): class NonCompliantMessageFormatError(Exception):
...@@ -201,10 +201,10 @@ class Message(object): ...@@ -201,10 +201,10 @@ class Message(object):
>>> m.routing_key >>> m.routing_key
'sniffing.getcapture.request' 'sniffing.getcapture.request'
>>> m.to_json() >>> m.to_json()
'{"_api_version": "1.1.3", "capture_id": "TD_COAP_CORE_01"}' '{"_api_version": "1.2.0", "capture_id": "TD_COAP_CORE_01"}'
>>> json_message = m.to_json() >>> json_message = m.to_json()
>>> json_message >>> json_message
'{"_api_version": "1.1.3", "capture_id": "TD_COAP_CORE_01"}' '{"_api_version": "1.2.0", "capture_id": "TD_COAP_CORE_01"}'
>>> obj=Message.load(json_message,'testsuite.start', None ) >>> obj=Message.load(json_message,'testsuite.start', None )
>>> type(obj) # doctest >>> type(obj) # doctest
<class 'messages.MsgTestSuiteStart'> <class 'messages.MsgTestSuiteStart'>
......
...@@ -5,8 +5,8 @@ import io ...@@ -5,8 +5,8 @@ import io
from setuptools import setup, find_packages from setuptools import setup, find_packages
MAJOR = 1 MAJOR = 1
MINOR = 1 MINOR = 2
PATCH = 3 PATCH = 0
VERSION = "{}.{}.{}".format(MAJOR, MINOR, PATCH) VERSION = "{}.{}.{}".format(MAJOR, MINOR, PATCH)
name = 'ioppytest-utils' name = 'ioppytest-utils'
......
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