From 371265a7e6fc4e85d367a9810f0c843104899794 Mon Sep 17 00:00:00 2001 From: Ganesh Murthy Date: Thu, 5 May 2016 13:34:19 -0400 Subject: [PATCH] DISPATCH-306 - Deprecated addr and routerId and introduce host and id instead --- doc/book/auto_links.rst | 8 +++--- doc/book/console_installation.rst | 2 +- doc/book/link_routing.rst | 2 +- doc/man/qdrouterd_conf_man.py | 2 +- etc/qdrouterd.conf | 4 +-- python/qpid_dispatch/management/qdrouter.json | 22 +++++++++++---- .../management/agent.py | 22 +++++++-------- python/qpid_dispatch_internal/router/node.py | 4 +-- src/connection_manager.c | 5 +++- src/dispatch.c | 5 +++- tests/config-1/A.conf | 4 +-- tests/config-1/A.json | 4 +-- tests/config-2-broker/A.conf | 8 +++--- tests/config-2-broker/B.conf | 6 ++-- tests/config-2/A-ssl.conf.in | 4 +-- tests/config-2/A.conf | 13 ++++++--- tests/config-2/B-ssl.conf.in | 4 +-- tests/config-2/B.conf | 6 ++-- tests/config-3-linear/A.conf | 6 ++-- tests/config-3-linear/B.conf | 6 ++-- tests/config-3-linear/C.conf | 4 +-- tests/config-6/A.conf | 10 +++---- tests/config-6/B.conf | 8 +++--- tests/config-6/C.conf | 6 ++-- tests/config-6/D.conf | 4 +-- tests/config-6/X.conf | 8 +++--- tests/config-6/Y.conf | 8 +++--- tests/management/qdrouter.py | 8 +++--- tests/management/schema.py | 10 +++---- .../test-policy-conf-includes-folder.conf.in | 4 +-- .../policy-2/test-router-with-policy.json.in | 6 ++-- tests/system_test.py | 22 +++++++-------- tests/system_tests_broker.py | 2 +- tests/system_tests_link_routes.py | 18 ++++++------ tests/system_tests_management.py | 26 ++++++++--------- tests/system_tests_one_router.py | 2 +- tests/system_tests_policy.py | 6 ++-- tests/system_tests_protocol_family.py | 28 +++++++++---------- tests/system_tests_qdmanage.py | 12 ++++---- tests/system_tests_qdstat.py | 6 ++-- tests/system_tests_sasl_plain.py | 24 ++++++++-------- tests/system_tests_two_routers.py | 2 +- tests/system_tests_user_id.py | 2 +- tests/threads4.conf | 2 +- tools/qdstat | 2 +- 45 files changed, 195 insertions(+), 172 deletions(-) diff --git a/doc/book/auto_links.rst b/doc/book/auto_links.rst index 52e4b19c02..822cbdd771 100644 --- a/doc/book/auto_links.rst +++ b/doc/book/auto_links.rst @@ -48,7 +48,7 @@ through a pair of queues on a broker: connector { name: broker role: route-container - addr: + host: port: sasl-mechanisms: ANONYMOUS } @@ -188,7 +188,7 @@ multiple brokers share the message-queueing load. connector { name: broker1 role: route-container - addr: + host: port: sasl-mechanisms: ANONYMOUS } @@ -196,7 +196,7 @@ multiple brokers share the message-queueing load. connector { name: broker2 role: route-container - addr: + host: port: sasl-mechanisms: ANONYMOUS } @@ -245,7 +245,7 @@ using *qdmanage*: :: - qdmanage create --type org.apache.qpid.dispatch.connector addr= port= name=broker3 + qdmanage create --type org.apache.qpid.dispatch.connector host= port= name=broker3 qdmanage create --type org.apache.qpid.dispatch.router.config.autoLink addr=queue.first dir=in connection=broker3 qdmanage create --type org.apache.qpid.dispatch.router.config.autoLink addr=queue.first dir=out connection=broker3 diff --git a/doc/book/console_installation.rst b/doc/book/console_installation.rst index 52a7332ae1..76a885e260 100644 --- a/doc/book/console_installation.rst +++ b/doc/book/console_installation.rst @@ -37,7 +37,7 @@ This will start the proxy listening to ws traffic on port 5673 and translating i One of the routers in the network needs to have a listener configured on port 5672. That listener's role should be 'normal'. For example:: listener { - addr: 0.0.0.0 + host: 0.0.0.0 role: normal port: amqp saslMechanisms: ANONYMOUS diff --git a/doc/book/link_routing.rst b/doc/book/link_routing.rst index 7f65a4a166..f9a023ebcf 100644 --- a/doc/book/link_routing.rst +++ b/doc/book/link_routing.rst @@ -97,7 +97,7 @@ broker B2: connector { name: broker role: route-container - addr: + host: port: sasl-mechanisms: ANONYMOUS } diff --git a/doc/man/qdrouterd_conf_man.py b/doc/man/qdrouterd_conf_man.py index 934debec21..10b83d1e35 100644 --- a/doc/man/qdrouterd_conf_man.py +++ b/doc/man/qdrouterd_conf_man.py @@ -84,7 +84,7 @@ def man_page(self): listener { ssl-profile: ssl-profile-one - addr: 0.0.0.0 + host: 0.0.0.0 port: 20102 sasl-mechanisms: ANONYMOUS } diff --git a/etc/qdrouterd.conf b/etc/qdrouterd.conf index c3d1dd8f6d..507098e0c2 100644 --- a/etc/qdrouterd.conf +++ b/etc/qdrouterd.conf @@ -22,11 +22,11 @@ router { mode: standalone - routerId: Router.A + id: Router.A } listener { - addr: 0.0.0.0 + host: 0.0.0.0 port: amqp authenticatePeer: no } diff --git a/python/qpid_dispatch/management/qdrouter.json b/python/qpid_dispatch/management/qdrouter.json index c804f72133..f39181e8b4 100644 --- a/python/qpid_dispatch/management/qdrouter.json +++ b/python/qpid_dispatch/management/qdrouter.json @@ -9,11 +9,17 @@ "description": "Attributes for internet address and port.", "attributes": { "addr": { - "description":"IP address: ipv4 or ipv6 literal or a host name.", + "description":"(DEPRECATED)IP address: ipv4 or ipv6 literal or a host name. This attribute has been deprecated. Use host instead", "type": "string", "default": "127.0.0.1", "create": true }, + "host": { + "description":"IP address: ipv4 or ipv6 literal or a host name", + "type": "string", + "default": "127.0.0.1", + "create": true + }, "port": { "description": "Port number or symbolic service name.", "type": "string", @@ -518,9 +524,15 @@ "singleton": true, "attributes": { "routerId": { - "description":"Router's unique identity.", + "description":"(DEPRECATED) Router's unique identity. This attribute has been deprecated. Use id instead", "type": "string", - "required": true, + "required": false, + "create": true + }, + "id": { + "description":"Router's unique identity. One of id or routerId is required. The router will fail to start without id or routerId", + "type": "string", + "required": false, "create": true }, "mode": { @@ -1175,10 +1187,10 @@ "description": "Remote router node connected to this router.", "extends": "operationalEntity", "attributes": { - "routerId": { + "id": { "description": "Remote node identifier.", "type": "string" - }, + }, "instance": { "description": "Remote node boot number.", "type": "integer" diff --git a/python/qpid_dispatch_internal/management/agent.py b/python/qpid_dispatch_internal/management/agent.py index f8fed29fce..e6c664c46e 100644 --- a/python/qpid_dispatch_internal/management/agent.py +++ b/python/qpid_dispatch_internal/management/agent.py @@ -256,7 +256,7 @@ def __init__(self, agent, entity_type, attributes=None): self._add_implementation( CImplementation(agent.qd, entity_type, self._dispatch)) - def _identifier(self): return self.attributes.get('routerId') + def _identifier(self): return self.attributes.get('id') def create(self): self._qd.qd_dispatch_configure_router(self._dispatch, self) @@ -319,11 +319,11 @@ def _identifier(self): return self.attributes.get('applicationName') -def _addr_port_identifier(entity): - for attr in ['addr', 'port']: # Set default values if need be +def _host_port_identifier(entity): + for attr in ['host', 'port']: # Set default values if need be entity.attributes.setdefault( attr, entity.entity_type.attribute(attr).missing_value()) - return "%s:%s" % (entity.attributes['addr'], entity.attributes['port']) + return "%s:%s" % (entity.attributes['host'], entity.attributes['port']) class ListenerEntity(EntityAdapter): @@ -333,7 +333,7 @@ def create(self): return config_listener def _identifier(self): - return _addr_port_identifier(self) + return _host_port_identifier(self) def __str__(self): return super(ListenerEntity, self).__str__().replace("Entity(", "ListenerEntity(") @@ -341,7 +341,7 @@ def __str__(self): def _delete(self): self._qd.qd_connection_manager_delete_listener(self._dispatch, self._implementations[0].key) - def _identifier(self): return _addr_port_identifier(self) + def _identifier(self): return _host_port_identifier(self) class ConnectorEntity(EntityAdapter): def create(self): @@ -353,7 +353,7 @@ def _delete(self): self._qd.qd_connection_manager_delete_connector(self._dispatch, self._implementations[0].key) def _identifier(self): - return _addr_port_identifier(self) + return _host_port_identifier(self) def __str__(self): return super(ConnectorEntity, self).__str__().replace("Entity(", "ConnectorEntity(") @@ -407,7 +407,7 @@ def __str__(self): return super(ConsoleEntity, self).__str__().replace("Entity(", "ConsoleEntity(") def create(self): - # if a named listener is present, use its addr:port + # if a named listener is present, use its host:port name = self.attributes.get('listener') if name: listeners = self._agent.find_entity_by_type("listener") @@ -415,7 +415,7 @@ def create(self): if listener.name == name: try: #required - host = listener.attributes['addr'] + host = listener.attributes['host'] port = listener.attributes['port'] #optional wsport = self.attributes.get('wsport') @@ -453,7 +453,7 @@ def __str__(self): class RouterNodeEntity(EntityAdapter): def _identifier(self): - return self.attributes.get('routerId') + return self.attributes.get('id') def __str__(self): return super(RouterNodeEntity, self).__str__().replace("Entity(", "RouterNodeEntity(") @@ -656,7 +656,7 @@ def get_mgmt_nodes(self, request): router = self._agent.entities.map_type(None, 'router')[0] area = router.attributes['area'] def node_address(node): - return str(Address.topological(node.attributes['routerId'], "$management", area)) + return str(Address.topological(node.attributes['id'], "$management", area)) return (OK, self._agent.entities.map_type(node_address, 'router.node')) def get_schema(self, request): diff --git a/python/qpid_dispatch_internal/router/node.py b/python/qpid_dispatch_internal/router/node.py index f08cb5c6c1..231e3f2298 100644 --- a/python/qpid_dispatch_internal/router/node.py +++ b/python/qpid_dispatch_internal/router/node.py @@ -54,7 +54,7 @@ def __init__(self, container, max_routers): def refresh_entity(self, attributes): """Refresh management attributes""" attributes.update({ - "routerId": self.my_id, + "id": self.my_id, "instance": self.container.instance, # Boot number, integer "linkState": [ls for ls in self.link_state.peers], # List of neighbour nodes "nextHop": "(self)", @@ -383,7 +383,7 @@ def __init__(self, parent, node_id, instance): def refresh_entity(self, attributes): """Refresh management attributes""" attributes.update({ - "routerId": self.id, + "id": self.id, "instance": self.instance, # Boot number, integer "linkState": [ls for ls in self.link_state.peers], # List of neighbour nodes "nextHop": self.next_hop_router and self.next_hop_router.id, diff --git a/src/connection_manager.c b/src/connection_manager.c index 2479189d0e..1e09683eec 100644 --- a/src/connection_manager.c +++ b/src/connection_manager.c @@ -135,7 +135,6 @@ static qd_error_t load_server_config(qd_dispatch_t *qd, qd_server_config_t *conf bool depAllowUnsecured = qd_entity_opt_bool(entity, "allowUnsecured", !requireSsl); CHECK(); memset(config, 0, sizeof(*config)); - config->host = qd_entity_get_string(entity, "addr"); CHECK(); config->port = qd_entity_get_string(entity, "port"); CHECK(); config->name = qd_entity_opt_string(entity, "name", 0); CHECK(); config->role = qd_entity_get_string(entity, "role"); CHECK(); @@ -148,6 +147,10 @@ static qd_error_t load_server_config(qd_dispatch_t *qd, qd_server_config_t *conf config->sasl_mechanisms = qd_entity_opt_string(entity, "saslMechanisms", 0); CHECK(); config->ssl_enabled = has_attrs(entity, ssl_attributes, ssl_attributes_count); config->link_capacity = qd_entity_opt_long(entity, "linkCapacity", 0); CHECK(); + config->host = qd_entity_opt_string(entity, "host", 0); QD_ERROR_RET(); + if (! config->host) + config->host = qd_entity_opt_string(entity, "addr", 0); CHECK(); + assert(config->host); // // Handle the defaults for link capacity. diff --git a/src/dispatch.c b/src/dispatch.c index b3dcc0a768..d200532bdc 100644 --- a/src/dispatch.c +++ b/src/dispatch.c @@ -117,7 +117,10 @@ qd_error_t qd_dispatch_configure_container(qd_dispatch_t *qd, qd_entity_t *entit qd_error_t qd_dispatch_configure_router(qd_dispatch_t *qd, qd_entity_t *entity) { - qd->router_id = qd_entity_get_string(entity, "routerId"); QD_ERROR_RET(); + qd->router_id = qd_entity_opt_string(entity, "routerId", 0); QD_ERROR_RET(); + if (! qd->router_id) + qd->router_id = qd_entity_opt_string(entity, "id", 0); QD_ERROR_RET(); + assert(qd->router_id); qd->router_mode = qd_entity_get_long(entity, "mode"); QD_ERROR_RET(); qd->thread_count = qd_entity_opt_long(entity, "workerThreads", 4); QD_ERROR_RET(); diff --git a/tests/config-1/A.conf b/tests/config-1/A.conf index f2a6b49f9f..ea3ea7e0f7 100644 --- a/tests/config-1/A.conf +++ b/tests/config-1/A.conf @@ -20,7 +20,7 @@ router { mode: standalone - routerId: QDR + id: QDR } @@ -28,7 +28,7 @@ router { ## Listeners and Connectors ## listener { - addr: 0.0.0.0 + host: 0.0.0.0 port: 20000 saslMechanisms: ANONYMOUS } diff --git a/tests/config-1/A.json b/tests/config-1/A.json index 01d62e1b17..467c14bc39 100644 --- a/tests/config-1/A.json +++ b/tests/config-1/A.json @@ -45,14 +45,14 @@ ["router", { "mode": "standalone", - "routerId": "QDR" + "id": "QDR" }], ## ## Listeners and Connectors ## ["listener", { - "addr": "0.0.0.0", + "host": "0.0.0.0", "port": 20000, "saslMechanisms": "ANONYMOUS" }], diff --git a/tests/config-2-broker/A.conf b/tests/config-2-broker/A.conf index f043f60473..f8b8216048 100644 --- a/tests/config-2-broker/A.conf +++ b/tests/config-2-broker/A.conf @@ -20,21 +20,21 @@ router { mode: interior - routerId: QDR.A + id: QDR.A } ## ## Listeners and Connectors ## listener { - addr: 0.0.0.0 + host: 0.0.0.0 port: amqp saslMechanisms: ANONYMOUS } listener { role: inter-router - addr: 0.0.0.0 + host: 0.0.0.0 port: 20102 saslMechanisms: ANONYMOUS } @@ -42,7 +42,7 @@ listener { connector { name: broker role: on-demand - addr: 127.0.0.1 + host: 127.0.0.1 port: 11000 saslMechanisms: ANONYMOUS } diff --git a/tests/config-2-broker/B.conf b/tests/config-2-broker/B.conf index 3cca510f54..59266603ef 100644 --- a/tests/config-2-broker/B.conf +++ b/tests/config-2-broker/B.conf @@ -20,7 +20,7 @@ router { mode: interior - routerId: QDR.B + id: QDR.B } @@ -28,14 +28,14 @@ router { ## Listeners and Connectors ## listener { - addr: 0.0.0.0 + host: 0.0.0.0 port: 20101 saslMechanisms: ANONYMOUS } connector { role: inter-router - addr: 127.0.0.1 + host: 127.0.0.1 port: 20102 saslMechanisms: ANONYMOUS } diff --git a/tests/config-2/A-ssl.conf.in b/tests/config-2/A-ssl.conf.in index 6cae30dd2a..97a04eac59 100644 --- a/tests/config-2/A-ssl.conf.in +++ b/tests/config-2/A-ssl.conf.in @@ -40,14 +40,14 @@ ssl-profile { ## Listeners and Connectors ## listener { - addr: 0.0.0.0 + host: 0.0.0.0 port: 20100 sasl-mechanisms: ANONYMOUS } listener { role: inter-router - addr: 0.0.0.0 + host: 0.0.0.0 port: 20102 sasl-mechanisms: EXTERNAL ssl-profile: ssl-profile-name diff --git a/tests/config-2/A.conf b/tests/config-2/A.conf index 6f8fb33a7d..ff3fb1afec 100644 --- a/tests/config-2/A.conf +++ b/tests/config-2/A.conf @@ -19,21 +19,21 @@ router { mode: interior - routerId: QDR.A + id: QDR.A } ## ## Listeners and Connectors ## listener { - addr: 0.0.0.0 + host: 0.0.0.0 port: 20100 saslMechanisms: ANONYMOUS } listener { role: inter-router - addr: 0.0.0.0 + host: 0.0.0.0 port: 20102 saslMechanisms: ANONYMOUS } @@ -66,7 +66,12 @@ log { } log { - module: ROUTER + module: ROUTER_MA + enable: trace+ +} + +log { + module: ROUTER_HELLO enable: trace+ } diff --git a/tests/config-2/B-ssl.conf.in b/tests/config-2/B-ssl.conf.in index 15d33611b0..f37235938c 100644 --- a/tests/config-2/B-ssl.conf.in +++ b/tests/config-2/B-ssl.conf.in @@ -35,14 +35,14 @@ ssl-profile { ## Listeners and Connectors ## listener { - addr: 0.0.0.0 + host: 0.0.0.0 port: 20101 sasl-mechanisms: ANONYMOUS } connector { role: inter-router - addr: 0.0.0.0 + host: 0.0.0.0 port: 20102 sasl-mechanisms: EXTERNAL ssl-profile: ssl-profile-name diff --git a/tests/config-2/B.conf b/tests/config-2/B.conf index 3dc92cc537..32c64416e6 100644 --- a/tests/config-2/B.conf +++ b/tests/config-2/B.conf @@ -20,21 +20,21 @@ router { mode: interior - routerId: QDR.B + id: QDR.B } ## ## Listeners and Connectors ## listener { - addr: 0.0.0.0 + host: 0.0.0.0 port: 20101 saslMechanisms: ANONYMOUS } connector { role: inter-router - addr: 0.0.0.0 + host: 0.0.0.0 port: 20102 saslMechanisms: ANONYMOUS } diff --git a/tests/config-3-linear/A.conf b/tests/config-3-linear/A.conf index 131c216e00..52983f7878 100644 --- a/tests/config-3-linear/A.conf +++ b/tests/config-3-linear/A.conf @@ -19,21 +19,21 @@ router { mode: interior - routerId: QDR.A + id: QDR.A } ## ## Listeners and Connectors ## listener { - addr: 0.0.0.0 + host: 0.0.0.0 port: 20001 saslMechanisms: ANONYMOUS } connector { role: inter-router - addr: 0.0.0.0 + host: 0.0.0.0 port: 20002 saslMechanisms: ANONYMOUS } diff --git a/tests/config-3-linear/B.conf b/tests/config-3-linear/B.conf index dd9f742461..27291d0abb 100644 --- a/tests/config-3-linear/B.conf +++ b/tests/config-3-linear/B.conf @@ -19,7 +19,7 @@ router { mode: interior - routerId: QDR.B + id: QDR.B } ## @@ -27,14 +27,14 @@ router { ## listener { role: inter-router - addr: 0.0.0.0 + host: 0.0.0.0 port: 20002 saslMechanisms: ANONYMOUS } connector { role: inter-router - addr: 0.0.0.0 + host: 0.0.0.0 port: 20003 saslMechanisms: ANONYMOUS } diff --git a/tests/config-3-linear/C.conf b/tests/config-3-linear/C.conf index 09facce249..e2fdecc25b 100644 --- a/tests/config-3-linear/C.conf +++ b/tests/config-3-linear/C.conf @@ -19,7 +19,7 @@ router { mode: interior - routerId: QDR.C + id: QDR.C } @@ -28,7 +28,7 @@ router { ## listener { role: inter-router - addr: 0.0.0.0 + host: 0.0.0.0 port: 20003 saslMechanisms: ANONYMOUS } diff --git a/tests/config-6/A.conf b/tests/config-6/A.conf index 7b53a69aaa..5f79a1ccae 100644 --- a/tests/config-6/A.conf +++ b/tests/config-6/A.conf @@ -21,7 +21,7 @@ router { mode: interior area: A - routerId: QDR.A + id: QDR.A } ## @@ -29,28 +29,28 @@ router { ## listener { role: inter-router - addr: 0.0.0.0 + host: 0.0.0.0 port: 20001 saslMechanisms: ANONYMOUS } connector { role: inter-router - addr: 0.0.0.0 + host: 0.0.0.0 port: 20002 saslMechanisms: ANONYMOUS } connector { role: inter-router - addr: 0.0.0.0 + host: 0.0.0.0 port: 20003 saslMechanisms: ANONYMOUS } connector { role: inter-router - addr: 0.0.0.0 + host: 0.0.0.0 port: 20004 saslMechanisms: ANONYMOUS } diff --git a/tests/config-6/B.conf b/tests/config-6/B.conf index 94c25b6498..20da36a2bf 100644 --- a/tests/config-6/B.conf +++ b/tests/config-6/B.conf @@ -20,7 +20,7 @@ router { mode: interior area: A - routerId: QDR.B + id: QDR.B } ## @@ -28,21 +28,21 @@ router { ## listener { role: inter-router - addr: 0.0.0.0 + host: 0.0.0.0 port: 20002 saslMechanisms: ANONYMOUS } connector { role: inter-router - addr: 0.0.0.0 + host: 0.0.0.0 port: 20003 saslMechanisms: ANONYMOUS } connector { role: inter-router - addr: 0.0.0.0 + host: 0.0.0.0 port: 20004 saslMechanisms: ANONYMOUS } diff --git a/tests/config-6/C.conf b/tests/config-6/C.conf index 499c2ecade..ba99ab5f5b 100644 --- a/tests/config-6/C.conf +++ b/tests/config-6/C.conf @@ -20,7 +20,7 @@ router { mode: interior area: A - routerId: QDR.C + id: QDR.C } ## @@ -28,14 +28,14 @@ router { ## listener { role: inter-router - addr: 0.0.0.0 + host: 0.0.0.0 port: 20003 saslMechanisms: ANONYMOUS } connector { role: inter-router - addr: 0.0.0.0 + host: 0.0.0.0 port: 20004 saslMechanisms: ANONYMOUS } diff --git a/tests/config-6/D.conf b/tests/config-6/D.conf index df079b736b..3005d4dda2 100644 --- a/tests/config-6/D.conf +++ b/tests/config-6/D.conf @@ -20,7 +20,7 @@ router { mode: interior area: A - routerId: QDR.D + id: QDR.D } ## @@ -28,7 +28,7 @@ router { ## listener { role: inter-router - addr: 0.0.0.0 + host: 0.0.0.0 port: 20004 saslMechanisms: ANONYMOUS } diff --git a/tests/config-6/X.conf b/tests/config-6/X.conf index 4e14428cc7..d0ea52eb31 100644 --- a/tests/config-6/X.conf +++ b/tests/config-6/X.conf @@ -20,28 +20,28 @@ router { mode: interior area: A - routerId: QDR.X + id: QDR.X } ## ## Listeners and Connectors ## listener { - addr: 0.0.0.0 + host: 0.0.0.0 port: amqp saslMechanisms: ANONYMOUS } connector { role: inter-router - addr: 0.0.0.0 + host: 0.0.0.0 port: 20001 saslMechanisms: ANONYMOUS } connector { role: inter-router - addr: 0.0.0.0 + host: 0.0.0.0 port: 20002 saslMechanisms: ANONYMOUS } diff --git a/tests/config-6/Y.conf b/tests/config-6/Y.conf index ab0cd855a5..5351df7870 100644 --- a/tests/config-6/Y.conf +++ b/tests/config-6/Y.conf @@ -20,28 +20,28 @@ router { mode: interior area: A - routerId: QDR.Y + id: QDR.Y } ## ## Listeners and Connectors ## listener { - addr: 0.0.0.0 + host: 0.0.0.0 port: 20005 saslMechanisms: ANONYMOUS } connector { role: inter-router - addr: 0.0.0.0 + host: 0.0.0.0 port: 20003 saslMechanisms: ANONYMOUS } connector { role: inter-router - addr: 0.0.0.0 + host: 0.0.0.0 port: 20004 saslMechanisms: ANONYMOUS } diff --git a/tests/management/qdrouter.py b/tests/management/qdrouter.py index d03321ff75..6ae3ba7b1b 100644 --- a/tests/management/qdrouter.py +++ b/tests/management/qdrouter.py @@ -26,7 +26,7 @@ conf_text = """ # Line comment router { - routerId: QDR + id: QDR mode: standalone # End of line comment } ssl-profile { @@ -53,7 +53,7 @@ confText = """ # Line comment router { - routerId: QDR + id: QDR mode: standalone # End of line comment } sslProfile { @@ -84,7 +84,7 @@ def do_test_qdrouter_parse(self, text): content = conf._parse(text.split("\n")) self.maxDiff = None expect = [ - [u'router', {u'mode': u'standalone', u'routerId': u'QDR'}], + [u'router', {u'mode': u'standalone', u'id': u'QDR'}], [u'sslProfile', {u'password': u'secret', u'name': u'test-profile'}], [u'listener', {u'sslProfile': u'test-profile', u'name': u'l0', u'saslMechanisms': u'ANONYMOUS'}], [u'listener', {u'saslMechanisms': u'ANONYMOUS', u'identity': u'l1', u'port': u'1234'}], @@ -94,7 +94,7 @@ def do_test_qdrouter_parse(self, text): content = conf._expand(content) expect = [ - [u'router', {u'mode': u'standalone', u'routerId': u'QDR'}], + [u'router', {u'mode': u'standalone', u'id': u'QDR'}], [u'listener', {u'password': u'secret', u'name': u'l0', u'sslProfileName': u'test-profile', u'saslMechanisms': u'ANONYMOUS'}], [u'listener', {u'port': u'1234', u'identity': u'l1', u'saslMechanisms': u'ANONYMOUS'}], [u'listener', {u'port': u'4567', u'saslMechanisms': u'ANONYMOUS'}] diff --git a/tests/management/schema.py b/tests/management/schema.py index d703d4b336..8e88437219 100644 --- a/tests/management/schema.py +++ b/tests/management/schema.py @@ -54,13 +54,13 @@ def replace_od(thing): "listener": { "annotations" : ["entityId"], "attributes": { - "addr" : {"type":"string"} + "host" : {"type":"string"} } }, "connector": { "annotations" : ["entityId"], "attributes": { - "addr" : {"type":"string"} + "host" : {"type":"string"} } } } @@ -149,9 +149,9 @@ def test_schema_entity(self): s = Schema(**SCHEMA_1) self.assertRaises(ValidationError, s.entity, {'type': 'nosuch'}) self.assertRaises(ValidationError, s.entity, {'type': 'listener', 'nosuch': 'x'}) - e = s.entity({'type': 'listener', 'name':'x', 'addr':'foo'}) - self.assertEqual(e.attributes, {'type': 'org.example.listener', 'name':'x', 'addr':'foo'}) - self.assertEqual(e['addr'], 'foo') + e = s.entity({'type': 'listener', 'name':'x', 'host':'foo'}) + self.assertEqual(e.attributes, {'type': 'org.example.listener', 'name':'x', 'host':'foo'}) + self.assertEqual(e['host'], 'foo') self.assertRaises(ValidationError, e.__setitem__, 'nosuch', 'x') try: e.nosuch = 'x' diff --git a/tests/policy-1/test-policy-conf-includes-folder.conf.in b/tests/policy-1/test-policy-conf-includes-folder.conf.in index 1aaf28561a..3dbcc77557 100644 --- a/tests/policy-1/test-policy-conf-includes-folder.conf.in +++ b/tests/policy-1/test-policy-conf-includes-folder.conf.in @@ -20,7 +20,7 @@ router { mode: standalone - routerId: QDR + id: QDR } @@ -28,7 +28,7 @@ router { ## Listeners and Connectors ## listener { - addr: 0.0.0.0 + host: 0.0.0.0 port: 22000 saslMechanisms: ANONYMOUS } diff --git a/tests/policy-2/test-router-with-policy.json.in b/tests/policy-2/test-router-with-policy.json.in index 6b2fb859b9..1ec3ef11b9 100644 --- a/tests/policy-2/test-router-with-policy.json.in +++ b/tests/policy-2/test-router-with-policy.json.in @@ -1,19 +1,19 @@ [ ["router", { - "routerId": "dispatch", + "id": "dispatch", "saslConfigName": "policy-photoserver-sasl", "saslConfigPath": "${CMAKE_CURRENT_BINARY_DIR}/policy-2", "debugDump": "qddebug.txt" }], ["listener", { - "addr": "0.0.0.0", + "host": "0.0.0.0", "saslMechanisms": "ANONYMOUS PLAIN", "authenticatePeer": "no", "idleTimeoutSeconds": "120", "port": 21000 }], ["listener", { - "addr": "0.0.0.0", + "host": "0.0.0.0", "saslMechanisms": "PLAIN", "authenticatePeer": "no", "idleTimeoutSeconds": "120", diff --git a/tests/system_test.py b/tests/system_test.py index dc21c189d3..9bbcc004a3 100755 --- a/tests/system_test.py +++ b/tests/system_test.py @@ -317,9 +317,9 @@ class Config(list, Config): """ DEFAULTS = { - 'listener': {'addr':'0.0.0.0', 'saslMechanisms':'ANONYMOUS', 'idleTimeoutSeconds': '120', 'authenticatePeer': 'no'}, - 'connector': {'addr':'127.0.0.1', 'saslMechanisms':'ANONYMOUS', 'idleTimeoutSeconds': '120', 'role':'on-demand'}, - 'router': {'mode': 'standalone', 'routerId': 'QDR', 'debugDump': 'qddebug.txt', 'workerThreads': 1} + 'listener': {'host':'0.0.0.0', 'saslMechanisms':'ANONYMOUS', 'idleTimeoutSeconds': '120', 'authenticatePeer': 'no'}, + 'connector': {'host':'127.0.0.1', 'saslMechanisms':'ANONYMOUS', 'idleTimeoutSeconds': '120', 'role':'on-demand'}, + 'router': {'mode': 'standalone', 'id': 'QDR', 'debugDump': 'qddebug.txt', 'workerThreads': 1} } def sections(self, name): @@ -327,7 +327,7 @@ def sections(self, name): return [p for n, p in self if n == name] @property - def router_id(self): return self.sections("router")[0]["routerId"] + def router_id(self): return self.sections("router")[0]["id"] def defaults(self): """Fill in default values in gconfiguration""" @@ -346,7 +346,7 @@ def props(p): def __init__(self, name=None, config=Config(), pyinclude=None, wait=True): """ - @param name: name used for for output files, default to routerId from config. + @param name: name used for for output files, default to id from config. @param config: router configuration @keyword wait: wait for router to be ready (call self.wait_ready()) """ @@ -411,12 +411,12 @@ def addresses(self): for l in self.config.sections('listener'): protocol_family = l.get('protocolFamily') if protocol_family == 'IPv6': - address_list.append("amqp://[%s]:%s"%(l['addr'], l['port'])) + address_list.append("amqp://[%s]:%s"%(l['host'], l['port'])) elif protocol_family == 'IPv4': - address_list.append("amqp://%s:%s"%(l['addr'], l['port'])) + address_list.append("amqp://%s:%s"%(l['host'], l['port'])) else: # Default to IPv4 - address_list.append("amqp://%s:%s"%(l['addr'], l['port'])) + address_list.append("amqp://%s:%s"%(l['host'], l['port'])) return address_list @@ -427,12 +427,12 @@ def hostports(self): for l in self.config.sections('listener'): protocol_family = l.get('protocolFamily') if protocol_family == 'IPv6': - address_list.append("[%s]:%s"%(l['addr'], l['port'])) + address_list.append("[%s]:%s"%(l['host'], l['port'])) elif protocol_family == 'IPv4': - address_list.append("%s:%s"%(l['addr'], l['port'])) + address_list.append("%s:%s"%(l['host'], l['port'])) else: # Default to IPv4 - address_list.append("%s:%s"%(l['addr'], l['port'])) + address_list.append("%s:%s"%(l['host'], l['port'])) return address_list diff --git a/tests/system_tests_broker.py b/tests/system_tests_broker.py index ca42085aff..a620bd9012 100644 --- a/tests/system_tests_broker.py +++ b/tests/system_tests_broker.py @@ -52,7 +52,7 @@ def setUp(self): def common_router_conf(self, name, mode='standalone'): """Common router configuration for the tests""" return Qdrouterd.Config([ - ('router', {'mode': mode, 'routerId': name}) + ('router', {'mode': mode, 'id': name}) ]) def verify_equal_spread(self, send_addresses, receive_addresses): diff --git a/tests/system_tests_link_routes.py b/tests/system_tests_link_routes.py index ce44bc25b3..8f2ee8d723 100644 --- a/tests/system_tests_link_routes.py +++ b/tests/system_tests_link_routes.py @@ -60,7 +60,7 @@ def setUpClass(cls): def router(name, connection): config = [ - ('router', {'mode': 'interior', 'routerId': 'QDR.%s'%name}), + ('router', {'mode': 'interior', 'id': 'QDR.%s'%name}), ('fixedAddress', {'prefix': '/closest/', 'fanout': 'single', 'bias': 'closest'}), ('fixedAddress', {'prefix': '/spread/', 'fanout': 'single', 'bias': 'spread'}), ('fixedAddress', {'prefix': '/multicast/', 'fanout': 'multiple'}), @@ -79,18 +79,18 @@ def router(name, connection): router('A', [ - ('listener', {'role': 'normal', 'addr': '0.0.0.0', 'port': a_listener_port, 'saslMechanisms': 'ANONYMOUS'}), + ('listener', {'role': 'normal', 'host': '0.0.0.0', 'port': a_listener_port, 'saslMechanisms': 'ANONYMOUS'}), ]) router('B', [ - ('listener', {'role': 'normal', 'addr': '0.0.0.0', 'port': b_listener_port, 'saslMechanisms': 'ANONYMOUS'}), - ('listener', {'name': 'test-tag', 'role': 'route-container', 'addr': '0.0.0.0', 'port': test_tag_listener_port, 'saslMechanisms': 'ANONYMOUS'}), + ('listener', {'role': 'normal', 'host': '0.0.0.0', 'port': b_listener_port, 'saslMechanisms': 'ANONYMOUS'}), + ('listener', {'name': 'test-tag', 'role': 'route-container', 'host': '0.0.0.0', 'port': test_tag_listener_port, 'saslMechanisms': 'ANONYMOUS'}), # This is an on-demand connection made from QDR.B's ephemeral port to a_listener_port - ('connector', {'name': 'broker', 'role': 'route-container', 'addr': '0.0.0.0', 'port': a_listener_port, 'saslMechanisms': 'ANONYMOUS'}), + ('connector', {'name': 'broker', 'role': 'route-container', 'host': '0.0.0.0', 'port': a_listener_port, 'saslMechanisms': 'ANONYMOUS'}), # Only inter router communication must happen on 'inter-router' connectors. This connector makes # a connection from the router B's ephemeral port to c_listener_port - ('connector', {'role': 'inter-router', 'addr': '0.0.0.0', 'port': c_listener_port}), + ('connector', {'role': 'inter-router', 'host': '0.0.0.0', 'port': c_listener_port}), ('linkRoutePattern', {'prefix': 'org.apache', 'connector': 'broker'}), ('linkRoute', {'prefix': 'pulp.task', 'connection': 'test-tag', 'dir': 'in'}), ('linkRoute', {'prefix': 'pulp.task', 'connection': 'test-tag', 'dir': 'out'}) @@ -98,9 +98,9 @@ def router(name, connection): ) router('C', [ - ('listener', {'addr': '0.0.0.0', 'role': 'inter-router', 'port': c_listener_port, 'saslMechanisms': 'ANONYMOUS'}), + ('listener', {'host': '0.0.0.0', 'role': 'inter-router', 'port': c_listener_port, 'saslMechanisms': 'ANONYMOUS'}), # The client will exclusively use the following listener to connect to QDR.C - ('listener', {'addr': '0.0.0.0', 'role': 'normal', 'port': cls.tester.get_port(), 'saslMechanisms': 'ANONYMOUS'}), + ('listener', {'host': '0.0.0.0', 'role': 'normal', 'port': cls.tester.get_port(), 'saslMechanisms': 'ANONYMOUS'}), # Note here that the linkRoutePattern is set to org.apache. which makes it backward compatible. # The dot(.) at the end is ignored by the address hashing scheme. ('linkRoutePattern', {'prefix': 'org.apache.'}), @@ -213,7 +213,7 @@ def test_ddd_partial_link_route_match(self): # Connect to the router acting like the broker (QDR.A) and check the deliveriesIngress and deliveriesEgress local_node = Node.connect(self.routers[0].addresses[0], timeout=TIMEOUT) self.assertEqual(u'QDR.A', local_node.query(type='org.apache.qpid.dispatch.router', - attribute_names=['routerId']).results[0][0]) + attribute_names=['id']).results[0][0]) self.assertEqual(1, local_node.read(type='org.apache.qpid.dispatch.router.address', name='M0org.apache.dev').deliveriesEgress) diff --git a/tests/system_tests_management.py b/tests/system_tests_management.py index ead40acca9..1f6d4860d3 100644 --- a/tests/system_tests_management.py +++ b/tests/system_tests_management.py @@ -55,7 +55,7 @@ def setUpClass(cls): super(ManagementTest, cls).setUpClass() # Stand-alone router conf0=Qdrouterd.Config([ - ('router', { 'mode': 'standalone', 'routerId': 'solo'}), + ('router', { 'mode': 'standalone', 'id': 'solo'}), ('listener', {'name': 'l0', 'port':cls.get_port(), 'role':'normal'}), # Extra listeners to exercise managment query ('listener', {'name': 'l1', 'port':cls.get_port(), 'role':'normal'}), @@ -65,18 +65,18 @@ def setUpClass(cls): # Trio of interior routers linked in a line so we can see some next-hop values. conf0 = Qdrouterd.Config([ - ('router', { 'mode': 'interior', 'routerId': 'router0'}), + ('router', { 'mode': 'interior', 'id': 'router0'}), ('listener', {'port':cls.get_port(), 'role':'normal'}), ('listener', {'port':cls.get_port(), 'role':'inter-router'}) ]) conf1 = Qdrouterd.Config([ - ('router', { 'mode': 'interior', 'routerId': 'router1'}), + ('router', { 'mode': 'interior', 'id': 'router1'}), ('listener', {'port':cls.get_port(), 'role':'normal'}), ('connector', {'port':conf0.sections('listener')[1]['port'], 'role':'inter-router'}), ('listener', {'port':cls.get_port(), 'role':'inter-router'}) ]) conf2 = Qdrouterd.Config([ - ('router', { 'mode': 'interior', 'routerId': 'router2'}), + ('router', { 'mode': 'interior', 'id': 'router2'}), ('listener', {'port':cls.get_port(), 'role':'normal'}), ('connector', {'port':conf1.sections('listener')[1]['port'], 'role':'inter-router'}) ]) @@ -84,7 +84,7 @@ def setUpClass(cls): # Standalone router for logging tests (avoid interfering with logging for other tests.) conflog=Qdrouterd.Config([ - ('router', { 'mode': 'standalone', 'routerId': 'logrouter'}), + ('router', { 'mode': 'standalone', 'id': 'logrouter'}), ('listener', {'port':cls.get_port(), 'role':'normal'}), ]) cls._logrouter = cls.tester.qdrouterd(config=conflog, wait=False) @@ -124,7 +124,7 @@ def test_bad_query(self): def test_query_type(self): """Query with type only""" response = self.node.query(type=LISTENER) - for attr in ['type', 'name', 'identity', 'addr', 'port']: + for attr in ['type', 'name', 'identity', 'host', 'port']: self.assertTrue(attr in response.attribute_names) for r in response.get_dicts(): self.assertEqual(len(response.attribute_names), len(r)) @@ -172,12 +172,12 @@ def test_create_listener(self): attributes = {'name':'foo', 'port':str(port), 'role':'normal', 'saslMechanisms': 'ANONYMOUS', 'authenticatePeer': False} entity = self.assert_create_ok(LISTENER, 'foo', attributes) self.assertEqual(entity['name'], 'foo') - self.assertEqual(entity['addr'], '127.0.0.1') + self.assertEqual(entity['host'], '127.0.0.1') # Connect via the new listener node3 = self.cleanup(Node.connect(Url(port=port))) router = node3.query(type=ROUTER).get_entities() - self.assertEqual(self.router.name, router[0]['routerId']) + self.assertEqual(self.router.name, router[0]['id']) def test_log(self): """Create, update and query log entities""" @@ -344,7 +344,7 @@ def test_router_node(self): rnode_lists = [n.query(type=NODE).get_dicts() for n in nodes] def check(attrs): - name = attrs['routerId'] + name = attrs['id'] self.assertEqual(attrs['identity'], 'router.node/%s' % name) self.assertEqual(attrs['name'], 'router.node/%s' % name) self.assertEqual(attrs['type'], 'org.apache.qpid.dispatch.router.node') @@ -378,7 +378,7 @@ def test_remote_node(self): # Query router2 indirectly via router1 remote_url = Url(self.routers[0].addresses[0], path=Url(remotes[0]).path) remote = self.cleanup(Node.connect(remote_url)) - self.assertEqual(["router2"], [r.routerId for r in remote.query(type=ROUTER).get_entities()]) + self.assertEqual(["router2"], [r.id for r in remote.query(type=ROUTER).get_entities()]) def test_remote_node(self): """Test that we can access management info of remote nodes using get_mgmt_nodes addresses""" @@ -392,7 +392,7 @@ def test_remote_node(self): remote = self.cleanup(Node.connect(remote_url)) router_id = remotes[0].split("/")[3] assert router_id in ['router0', 'router1', 'router2'] - self.assertEqual([router_id], [r.routerId for r in remote.query(type=ROUTER).get_entities()]) + self.assertEqual([router_id], [r.id for r in remote.query(type=ROUTER).get_entities()]) def test_get_types(self): types = self.node.get_types() @@ -434,7 +434,7 @@ def test_standalone_no_inter_router(self): self.node.create, dict(attrs, type=CONNECTOR, name="bad2", port=str(self.get_port()))) conf = Qdrouterd.Config([ - ('router', { 'mode': 'standalone', 'routerId': 'all_by_myself1'}), + ('router', { 'mode': 'standalone', 'id': 'all_by_myself1'}), ('listener', {'port':self.get_port(), 'role':'inter-router'}) ]) r = self.qdrouterd('routerX', conf, wait=False) @@ -442,7 +442,7 @@ def test_standalone_no_inter_router(self): self.assertTrue(r.wait() != 0) conf = Qdrouterd.Config([ - ('router', { 'mode': 'standalone', 'routerId': 'all_by_myself2'}), + ('router', { 'mode': 'standalone', 'id': 'all_by_myself2'}), ('listener', {'port':self.get_port(), 'role':'normal'}), ('connector', {'port':self.get_port(), 'role':'inter-router'}) ]) diff --git a/tests/system_tests_one_router.py b/tests/system_tests_one_router.py index 49174b4015..eb3b6b1a83 100644 --- a/tests/system_tests_one_router.py +++ b/tests/system_tests_one_router.py @@ -39,7 +39,7 @@ def setUpClass(cls): super(RouterTest, cls).setUpClass() name = "test-router" config = Qdrouterd.Config([ - ('router', {'mode': 'standalone', 'routerId': 'QDR'}), + ('router', {'mode': 'standalone', 'id': 'QDR'}), # Setting the stripAnnotations to 'no' so that the existing tests will work. # Setting stripAnnotations to no will not strip the annotations and any tests that were already in this file diff --git a/tests/system_tests_policy.py b/tests/system_tests_policy.py index 57068ce915..f8fd556a1f 100644 --- a/tests/system_tests_policy.py +++ b/tests/system_tests_policy.py @@ -33,7 +33,7 @@ def setUpClass(cls): """Start the router""" super(AbsoluteConnectionCountLimit, cls).setUpClass() config = Qdrouterd.Config([ - ('router', {'mode': 'standalone', 'routerId': 'QDR.Policy'}), + ('router', {'mode': 'standalone', 'id': 'QDR.Policy'}), ('listener', {'port': cls.tester.get_port()}), ('policy', {'maximumConnections': 2}) ]) @@ -80,7 +80,7 @@ def setUpClass(cls): super(LoadPolicyFromFolder, cls).setUpClass() policy_config_path = os.path.join(DIR, 'policy-1') config = Qdrouterd.Config([ - ('router', {'mode': 'standalone', 'routerId': 'QDR.Policy'}), + ('router', {'mode': 'standalone', 'id': 'QDR.Policy'}), ('listener', {'port': cls.tester.get_port()}), ('policy', {'maximumConnections': 2, 'policyFolder': policy_config_path, 'enableAccessRules': 'true'}) ]) @@ -119,7 +119,7 @@ def setUpClass(cls): super(SenderReceiverLimits, cls).setUpClass() policy_config_path = os.path.join(DIR, 'policy-3') config = Qdrouterd.Config([ - ('router', {'mode': 'standalone', 'routerId': 'QDR.Policy'}), + ('router', {'mode': 'standalone', 'id': 'QDR.Policy'}), ('listener', {'port': cls.tester.get_port()}), ('policy', {'maximumConnections': 2, 'policyFolder': policy_config_path, 'enableAccessRules': 'true'}) ]) diff --git a/tests/system_tests_protocol_family.py b/tests/system_tests_protocol_family.py index 11393c8594..4b46eed804 100644 --- a/tests/system_tests_protocol_family.py +++ b/tests/system_tests_protocol_family.py @@ -41,27 +41,27 @@ def setUpClass(cls): def router(name, connection): config = [ - ('router', {'mode': 'interior', 'routerId': 'QDR.%s'%name}), + ('router', {'mode': 'interior', 'id': 'QDR.%s'%name}), # No protocolFamily is specified for this listener. - # This will test if the router defaults addr to 127.0.0.1 and if the router auto-detects protocol family + # This will test if the router defaults host to 127.0.0.1 and if the router auto-detects protocol family ('listener', {'port': cls.tester.get_port()}), - # Specify addr as 127.0.0.1 and protocol family as IPv4 - ('listener', {'addr': '127.0.0.1', 'protocolFamily': 'IPv4','port': cls.tester.get_port()}), + # Specify host as 127.0.0.1 and protocol family as IPv4 + ('listener', {'host': '127.0.0.1', 'protocolFamily': 'IPv4','port': cls.tester.get_port()}), - # Specify protocol family as IPv4 but don't specify any addr - # This will test if the router defaults the addr field to 127.0.0.1 + # Specify protocol family as IPv4 but don't specify any host + # This will test if the router defaults the host field to 127.0.0.1 ('listener', {'protocolFamily': 'IPv4', 'port': cls.tester.get_port()}), - # Specify the addr as 127.0.0.1 + # Specify the host as 127.0.0.1 # This will test router's auto-detection of protocol family - ('listener', {'addr': '127.0.0.1', 'port': cls.tester.get_port()}), + ('listener', {'host': '127.0.0.1', 'port': cls.tester.get_port()}), - # Specify addr as ::1 and protocol family as IPv6 - ('listener', {'addr': '::1', 'protocolFamily': 'IPv6', 'port': cls.tester.get_port(protocol_family='IPv6')}), + # Specify host as ::1 and protocol family as IPv6 + ('listener', {'host': '::1', 'protocolFamily': 'IPv6', 'port': cls.tester.get_port(protocol_family='IPv6')}), ('fixedAddress', {'prefix': '/closest/', 'fanout': 'single', 'bias': 'closest'}), ('fixedAddress', {'prefix': '/spread/', 'fanout': 'single', 'bias': 'spread'}), @@ -83,15 +83,15 @@ def router(name, connection): router('A', [ - ('listener', {'addr': '::1', 'role': 'inter-router', 'protocolFamily': 'IPv6', 'port': inter_router_port}) + ('listener', {'host': '::1', 'role': 'inter-router', 'protocolFamily': 'IPv6', 'port': inter_router_port}) ] ) router('B', [ # Tests an IPv6 connector - ('connector', {'addr': '::1', 'role': 'inter-router', 'protocolFamily': 'IPv6', 'port': inter_router_port}), - ('listener', {'addr': '127.0.0.1', 'role': 'inter-router', 'port': inter_router_ipv4_port}) + ('connector', {'host': '::1', 'role': 'inter-router', 'protocolFamily': 'IPv6', 'port': inter_router_port}), + ('listener', {'host': '127.0.0.1', 'role': 'inter-router', 'port': inter_router_ipv4_port}) ] ) @@ -99,7 +99,7 @@ def router(name, connection): router('C', [ # Tests an IPv4 connector - ('connector', {'addr': '127.0.0.1', 'role': 'inter-router', 'port': inter_router_ipv4_port}) + ('connector', {'host': '127.0.0.1', 'role': 'inter-router', 'port': inter_router_ipv4_port}) ] ) cls.routers[0].wait_router_connected('QDR.B') diff --git a/tests/system_tests_qdmanage.py b/tests/system_tests_qdmanage.py index da74328754..56216750d0 100644 --- a/tests/system_tests_qdmanage.py +++ b/tests/system_tests_qdmanage.py @@ -38,7 +38,7 @@ def setUpClass(cls): super(QdmanageTest, cls).setUpClass() cls.inter_router_port = cls.tester.get_port() config_1 = Qdrouterd.Config([ - ('router', {'mode': 'interior', 'routerId': 'R1'}), + ('router', {'mode': 'interior', 'id': 'R1'}), ('ssl-profile', {'name': 'server-ssl', 'cert-db': cls.ssl_file('ca-certificate.pem'), 'cert-file': cls.ssl_file('server-certificate.pem'), @@ -50,7 +50,7 @@ def setUpClass(cls): ]) config_2 = Qdrouterd.Config([ - ('router', {'mode': 'interior', 'routerId': 'R2'}), + ('router', {'mode': 'interior', 'id': 'R2'}), ('listener', {'role': 'inter-router', 'port': cls.inter_router_port}), ]) cls.router_2 = cls.tester.qdrouterd('test_router_2', config_2, wait=True) @@ -194,7 +194,7 @@ def test_update(self): self.assertEqual("trace+", output['enable']) def create(self, type, name, port): - create_command = 'CREATE --type=' + type + ' --name=' + name + ' addr=0.0.0.0 port=' + port + create_command = 'CREATE --type=' + type + ' --name=' + name + ' host=0.0.0.0 port=' + port connector = json.loads(self.run_qdmanage(create_command)) return connector @@ -220,7 +220,7 @@ def test_create_delete_connector(self): def test_zzz_add_connector(self): port = self.get_port() # dont provide role and make sure that role is defaulted to 'normal' - command = "CREATE --type=connector --name=eaconn1 port=" + str(port) + " addr=0.0.0.0" + command = "CREATE --type=connector --name=eaconn1 port=" + str(port) + " host=0.0.0.0" output = json.loads(self.run_qdmanage(command)) self.assertEqual("normal", output['role']) @@ -228,7 +228,7 @@ def test_zzz_add_connector(self): try: port = self.get_port() # provide the same connector name (eaconn1) and make sure there is a duplicate value failure - command = "CREATE --type=connector --name=eaconn1 port=" + str(port) + " addr=0.0.0.0" + command = "CREATE --type=connector --name=eaconn1 port=" + str(port) + " host=0.0.0.0" output = json.loads(self.run_qdmanage(command)) except Exception as e: self.assertTrue("Duplicate value 'eaconn1' for unique attribute 'name'" in e.message) @@ -238,7 +238,7 @@ def test_zzz_add_connector(self): port = self.get_port() # provide role as 'normal' and make sure that it is preserved - command = "CREATE --type=connector --name=eaconn2 port=" + str(port) + " addr=0.0.0.0 role=normal" + command = "CREATE --type=connector --name=eaconn2 port=" + str(port) + " host=0.0.0.0 role=normal" output = json.loads(self.run_qdmanage(command)) self.assertEqual("normal", output['role']) diff --git a/tests/system_tests_qdstat.py b/tests/system_tests_qdstat.py index 7befe7b973..057aeb0088 100644 --- a/tests/system_tests_qdstat.py +++ b/tests/system_tests_qdstat.py @@ -30,7 +30,7 @@ class QdstatTest(system_test.TestCase): def setUpClass(cls): super(QdstatTest, cls).setUpClass() config = system_test.Qdrouterd.Config([ - ('router', {'routerId': 'QDR.A', 'workerThreads': 1}), + ('router', {'id': 'QDR.A', 'workerThreads': 1}), ('listener', {'port': cls.tester.get_port()}), ]) cls.router = cls.tester.qdrouterd('test-router', config) @@ -95,7 +95,7 @@ def setUpClass(cls): sasl_conf.write("mech_list: EXTERNAL ANONYMOUS DIGEST-MD5 PLAIN\n") # qdrouterd configuration: config = system_test.Qdrouterd.Config([ - ('router', {'routerId': 'QDR.B', + ('router', {'id': 'QDR.B', 'saslConfigPath': os.getcwd(), 'workerThreads': 1, 'saslConfigName': 'tests-mech-EXTERNAL'}), @@ -242,7 +242,7 @@ def setUpClass(cls): sasl_conf.write("mech_list: ANONYMOUS DIGEST-MD5 PLAIN\n") # qdrouterd configuration: config = system_test.Qdrouterd.Config([ - ('router', {'routerId': 'QDR.C', + ('router', {'id': 'QDR.C', 'saslConfigPath': os.getcwd(), 'workerThreads': 1, 'saslConfigName': 'tests-mech-NOEXTERNAL'}), diff --git a/tests/system_tests_sasl_plain.py b/tests/system_tests_sasl_plain.py index a01ea33dab..40d8cd96f2 100644 --- a/tests/system_tests_sasl_plain.py +++ b/tests/system_tests_sasl_plain.py @@ -81,26 +81,26 @@ def setUpClass(cls): y_listener_port = cls.tester.get_port() super(RouterTestPlainSasl, cls).router('X', [ - ('listener', {'addr': '0.0.0.0', 'role': 'inter-router', 'port': x_listener_port, + ('listener', {'host': '0.0.0.0', 'role': 'inter-router', 'port': x_listener_port, 'saslMechanisms':'PLAIN', 'authenticatePeer': 'yes'}), # This unauthenticated listener is for qdstat to connect to it. - ('listener', {'addr': '0.0.0.0', 'role': 'normal', 'port': cls.tester.get_port(), + ('listener', {'host': '0.0.0.0', 'role': 'normal', 'port': cls.tester.get_port(), 'authenticatePeer': 'no'}), ('router', {'workerThreads': 1, - 'routerId': 'QDR.X', + 'id': 'QDR.X', 'mode': 'interior', 'saslConfigName': 'tests-mech-PLAIN', 'saslConfigPath': os.getcwd()}), ]) super(RouterTestPlainSasl, cls).router('Y', [ - ('connector', {'addr': '0.0.0.0', 'role': 'inter-router', 'port': x_listener_port, + ('connector', {'host': '0.0.0.0', 'role': 'inter-router', 'port': x_listener_port, # Provide a sasl user name and password to connect to QDR.X 'saslMechanisms': 'PLAIN', 'saslUsername': 'test@domain.com', 'saslPassword': 'password'}), ('router', {'workerThreads': 1, 'mode': 'interior', - 'routerId': 'QDR.Y'}), - ('listener', {'addr': '0.0.0.0', 'role': 'normal', 'port': y_listener_port}), + 'id': 'QDR.Y'}), + ('listener', {'host': '0.0.0.0', 'role': 'normal', 'port': y_listener_port}), ]) cls.routers[1].wait_router_connected('QDR.X') @@ -151,11 +151,11 @@ def setUpClass(cls): y_listener_port = cls.tester.get_port() super(RouterTestPlainSaslOverSsl, cls).router('X', [ - ('listener', {'addr': '0.0.0.0', 'role': 'inter-router', 'port': x_listener_port, + ('listener', {'host': '0.0.0.0', 'role': 'inter-router', 'port': x_listener_port, 'sslProfile':'server-ssl-profile', 'saslMechanisms':'PLAIN', 'authenticatePeer': 'yes'}), # This unauthenticated listener is for qdstat to connect to it. - ('listener', {'addr': '0.0.0.0', 'role': 'normal', 'port': cls.tester.get_port(), + ('listener', {'host': '0.0.0.0', 'role': 'normal', 'port': cls.tester.get_port(), 'authenticatePeer': 'no'}), ('sslProfile', {'name': 'server-ssl-profile', 'cert-db': cls.ssl_file('ca-certificate.pem'), @@ -163,7 +163,7 @@ def setUpClass(cls): 'key-file': cls.ssl_file('server-private-key.pem'), 'password': 'server-password'}), ('router', {'workerThreads': 1, - 'routerId': 'QDR.X', + 'id': 'QDR.X', 'mode': 'interior', 'saslConfigName': 'tests-mech-PLAIN', 'saslConfigPath': os.getcwd()}), @@ -172,15 +172,15 @@ def setUpClass(cls): super(RouterTestPlainSaslOverSsl, cls).router('Y', [ # This router will act like a client. First an SSL connection will be established and then # we will have SASL plain authentication over SSL. - ('connector', {'addr': '0.0.0.0', 'role': 'inter-router', 'port': x_listener_port, + ('connector', {'host': '0.0.0.0', 'role': 'inter-router', 'port': x_listener_port, 'ssl-profile': 'client-ssl-profile', # Provide a sasl user name and password to connect to QDR.X 'saslMechanisms': 'PLAIN', 'saslUsername': 'test@domain.com', 'saslPassword': 'password'}), ('router', {'workerThreads': 1, 'mode': 'interior', - 'routerId': 'QDR.Y'}), - ('listener', {'addr': '0.0.0.0', 'role': 'normal', 'port': y_listener_port}), + 'id': 'QDR.Y'}), + ('listener', {'host': '0.0.0.0', 'role': 'normal', 'port': y_listener_port}), ('sslProfile', {'name': 'client-ssl-profile', 'cert-db': cls.ssl_file('ca-certificate.pem'), 'cert-file': cls.ssl_file('client-certificate.pem'), diff --git a/tests/system_tests_two_routers.py b/tests/system_tests_two_routers.py index f8436ed419..99cc3ac522 100644 --- a/tests/system_tests_two_routers.py +++ b/tests/system_tests_two_routers.py @@ -44,7 +44,7 @@ def setUpClass(cls): def router(name, client_server, connection): config = cls.ssl_config(client_server, connection) + [ - ('router', {'mode': 'interior', 'routerId': 'QDR.%s'%name}), + ('router', {'mode': 'interior', 'id': 'QDR.%s'%name}), ('listener', {'port': cls.tester.get_port(), 'stripAnnotations': 'no'}), diff --git a/tests/system_tests_user_id.py b/tests/system_tests_user_id.py index 500a682591..0537543c11 100644 --- a/tests/system_tests_user_id.py +++ b/tests/system_tests_user_id.py @@ -39,7 +39,7 @@ def setUpClass(cls): ssl_profile2_json = os.path.join(DIR, 'displayname_files', 'profile_names2.json') config = Qdrouterd.Config([ - ('router', {'routerId': 'QDR', 'workerThreads': 1}), + ('router', {'id': 'QDR', 'workerThreads': 1}), # sha1 ('sslProfile', {'name': 'server-ssl1', diff --git a/tests/threads4.conf b/tests/threads4.conf index 3173961156..341f98115f 100644 --- a/tests/threads4.conf +++ b/tests/threads4.conf @@ -26,7 +26,7 @@ container { } router { - routerId : QDR + id : QDR } log { diff --git a/tools/qdstat b/tools/qdstat index 2092634a23..a6ac878f35 100755 --- a/tools/qdstat +++ b/tools/qdstat @@ -273,7 +273,7 @@ class BusManager(Node): for node in objects: row = [] - row.append(node.routerId) + row.append(node.id) if node.nextHop != None: row.append(node.nextHop) row.append('-')