Commit c5726116 authored by Federico Sismondi's avatar Federico Sismondi

renaming agent defaults

parent bdbbc1f4
...@@ -71,7 +71,7 @@ export FINTEROP_CONNECTOR_BAUDRATE=115200 ...@@ -71,7 +71,7 @@ export FINTEROP_CONNECTOR_BAUDRATE=115200
then execute (e.g. for a coap_server running under the agent): then execute (e.g. for a coap_server running under the agent):
` `
python -m agent connect --url $AMQP_URL --name coap_server_agent --serial python -m agent connect --url $AMQP_URL --name coap_server --serial
` `
``` ```
...@@ -183,7 +183,7 @@ The command for executing it will be provided to you by F-Interop web ...@@ -183,7 +183,7 @@ The command for executing it will be provided to you by F-Interop web
GUI,it should look something like this: GUI,it should look something like this:
``` ```
sudo python -m agent connect --url amqp://someUser:somePassword@f-interop.rennes.inria.fr/sessionXX --name coap_client_agent sudo python -m agent connect --url amqp://someUser:somePassword@f-interop.rennes.inria.fr/sessionXX --name coap_client
``` ```
for more info for more info
......
...@@ -69,7 +69,7 @@ Please use the following format to connect to the f-interop server: ...@@ -69,7 +69,7 @@ Please use the following format to connect to the f-interop server:
sudo python -m agent connect sudo python -m agent connect
--url amqp://alfredo:zitarrosa@exampleRmqHost[:port]/sessionXX --url amqp://alfredo:zitarrosa@exampleRmqHost[:port]/sessionXX
--exchange myExchange --exchange myExchange
--name coap_client_agent --name coap_client
For more information, visit: http://doc.f-interop.eu For more information, visit: http://doc.f-interop.eu
""", """,
......
...@@ -14,8 +14,8 @@ AMQP_URL = str(os.environ['AMQP_URL']) ...@@ -14,8 +14,8 @@ AMQP_URL = str(os.environ['AMQP_URL'])
AMQP_EXCHANGE = str(os.environ['AMQP_EXCHANGE']) AMQP_EXCHANGE = str(os.environ['AMQP_EXCHANGE'])
COMPONENT_ID = 'packet_router_snippet' COMPONENT_ID = 'packet_router_snippet'
AGENT_1_ID = 'coap_client_agent' AGENT_1_ID = 'coap_client'
AGENT_2_ID = 'coap_server_agent' AGENT_2_ID = 'coap_server'
AGENT_TT_ID = 'agent_TT' AGENT_TT_ID = 'agent_TT'
# init logging to stnd output and log files # init logging to stnd output and log files
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
...@@ -46,8 +46,8 @@ def publish_message(channel, message): ...@@ -46,8 +46,8 @@ def publish_message(channel, message):
class PacketRouter(threading.Thread): class PacketRouter(threading.Thread):
AGENT_1_ID = 'coap_client_agent' AGENT_1_ID = 'coap_client'
AGENT_2_ID = 'coap_server_agent' AGENT_2_ID = 'coap_server'
AGENT_TT_ID = 'agent_TT' AGENT_TT_ID = 'agent_TT'
DEFAULT_ROUTING = {'data.tun.fromAgent.%s' % AGENT_1_ID: ['data.tun.toAgent.%s' % AGENT_2_ID, DEFAULT_ROUTING = {'data.tun.fromAgent.%s' % AGENT_1_ID: ['data.tun.toAgent.%s' % AGENT_2_ID,
'data.tun.toAgent.%s' % AGENT_TT_ID 'data.tun.toAgent.%s' % AGENT_TT_ID
......
...@@ -57,10 +57,10 @@ def launch_amqp_data_to_pcap_dumper(amqp_url=None, amqp_exchange=None, topics=No ...@@ -57,10 +57,10 @@ def launch_amqp_data_to_pcap_dumper(amqp_url=None, amqp_exchange=None, topics=No
if topics: if topics:
pcap_amqp_topic_subscriptions = topics pcap_amqp_topic_subscriptions = topics
else: else:
pcap_amqp_topic_subscriptions = ['data.serial.fromAgent.coap_client_agent', pcap_amqp_topic_subscriptions = ['data.serial.fromAgent.coap_client',
'data.serial.fromAgent.coap_server_agent', 'data.serial.fromAgent.coap_server',
'data.tun.fromAgent.coap_server_agent', 'data.tun.fromAgent.coap_server',
'data.tun.fromAgent.coap_client_agent', 'data.tun.fromAgent.coap_client',
] ]
# init pcap_dumper # init pcap_dumper
......
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