beremiz

Fixed WAMP test (crossbar confile upgrade and use same ID on both PLC and IDE side)

2018-01-10, Edouard Tisserant
876ce4e492a1
Parents f224383cc883
Children 2081de16e726
Fixed WAMP test (crossbar confile upgrade and use same ID on both PLC and IDE side)
2 files changed, 51 insertions(+), 40 deletions(-)
  • +50 -39
    tests/wamp/.crossbar/config.json
  • +1 -1
    tests/wamp/beremiz.xml
    • --- a/tests/wamp/.crossbar/config.json Wed Jan 10 13:21:42 2018 +0100
    +++ b/tests/wamp/.crossbar/config.json Wed Jan 10 13:23:40 2018 +0100
    @@ -1,43 +1,54 @@
    -
    {
    - "controller": {
    - },
    - "workers": [
    - {
    - "type": "router",
    - "options": {
    - "pythonpath": [".."]
    - },
    - "realms": [
    - {
    - "name": "Automation",
    - "roles": [
    - {
    - "name": "anonymous",
    - "permissions": [
    + "version": 2,
    + "controller": {},
    + "workers": [
    + {
    + "type": "router",
    + "options": {
    + "pythonpath": [
    + ".."
    + ]
    + },
    + "realms": [
    + {
    + "name": "Automation",
    + "roles": [
    {
    - "uri": "*",
    - "publish": true,
    - "subscribe": true,
    - "call": true,
    - "register": true
    + "name": "anonymous",
    + "permissions": [
    + {
    + "uri": "",
    + "match": "prefix",
    + "allow": {
    + "call": true,
    + "register": true,
    + "publish": true,
    + "subscribe": true
    + },
    + "disclose": {
    + "caller": false,
    + "publisher": false
    + },
    + "cache": true
    + }
    + ]
    }
    - ]
    - }
    - ]
    - }
    - ],
    - "transports": [
    - {
    - "type": "websocket",
    - "endpoint": {
    - "type": "tcp",
    - "port": 8888
    - },
    - "url": "ws://127.0.0.1:8888/",
    - "serializers" : ["msgpack"]
    - }
    - ]
    - }
    - ]
    + ]
    + }
    + ],
    + "transports": [
    + {
    + "type": "websocket",
    + "endpoint": {
    + "type": "tcp",
    + "port": 8888
    + },
    + "url": "ws://127.0.0.1:8888/",
    + "serializers": [
    + "msgpack"
    + ]
    + }
    + ]
    + }
    + ]
    }
    --- a/tests/wamp/beremiz.xml Wed Jan 10 13:21:42 2018 +0100
    +++ b/tests/wamp/beremiz.xml Wed Jan 10 13:23:40 2018 +0100
    @@ -1,4 +1,4 @@
    <?xml version='1.0' encoding='utf-8'?>
    -<BeremizRoot xmlns:xsd="http://www.w3.org/2001/XMLSchema" URI_location="WAMP://127.0.0.1:8888#Automation#2534667845">
    +<BeremizRoot xmlns:xsd="http://www.w3.org/2001/XMLSchema" URI_location="WAMP://127.0.0.1:8888#Automation#wamptest">
    <TargetType/>
    </BeremizRoot>