Repository: qpid-dispatch Updated Branches: refs/heads/master fb439e99e -> 7e5a04330
DISPATCH-300 - (From Ganesh Murthy) Deprecated "container" in the configuration. Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/7e5a0433 Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/7e5a0433 Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/7e5a0433 Branch: refs/heads/master Commit: 7e5a04330f6b44a8e4db3fc4af052b1add2e1e3a Parents: fb439e9 Author: Ted Ross <[email protected]> Authored: Tue May 3 22:21:59 2016 -0400 Committer: Ted Ross <[email protected]> Committed: Tue May 3 22:21:59 2016 -0400 ---------------------------------------------------------------------- etc/qdrouterd.conf | 5 --- python/qpid_dispatch/management/qdrouter.json | 33 ++++++++++++++-- .../qpid_dispatch_internal/management/agent.py | 3 ++ .../qpid_dispatch_internal/management/config.py | 13 ++++++- src/dispatch.c | 40 +++++++++++++------- src/dispatch_private.h | 1 - tests/config-1/A.conf | 24 ------------ tests/config-2-broker/A.conf | 31 ++------------- tests/config-2-broker/B.conf | 30 ++------------- tests/config-2/A-ssl.conf.in | 36 +++--------------- tests/config-2/A.conf | 32 ++-------------- tests/config-2/B-ssl.conf.in | 32 ++-------------- tests/config-2/B.conf | 31 ++------------- tests/config-3-linear/A.conf | 32 ++-------------- tests/config-3-linear/B.conf | 33 ++-------------- tests/config-3-linear/C.conf | 32 ++-------------- tests/config-6/A.conf | 17 ++------- tests/config-6/B.conf | 18 ++------- tests/config-6/C.conf | 18 ++------- tests/config-6/D.conf | 18 ++------- tests/config-6/X.conf | 18 ++------- tests/config-6/Y.conf | 18 ++------- tests/management/qdrouter.py | 6 ++- .../test-policy-conf-includes-folder.conf.in | 24 ------------ tests/policy-2/test-router-with-policy.json.in | 4 +- tests/system_test.py | 6 +-- tests/system_tests_broker.py | 1 - tests/system_tests_link_routes.py | 1 - tests/system_tests_one_router.py | 2 - tests/system_tests_policy.py | 9 ++--- tests/system_tests_protocol_family.py | 1 - tests/system_tests_qdmanage.py | 2 - tests/system_tests_qdstat.py | 15 +++++--- tests/system_tests_sasl_plain.py | 27 ++++++++----- tests/system_tests_two_routers.py | 4 -- tests/system_tests_user_id.py | 3 +- tests/threads4.conf | 5 +++ 37 files changed, 169 insertions(+), 456 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7e5a0433/etc/qdrouterd.conf ---------------------------------------------------------------------- diff --git a/etc/qdrouterd.conf b/etc/qdrouterd.conf index 67abb6a..c3d1dd8 100644 --- a/etc/qdrouterd.conf +++ b/etc/qdrouterd.conf @@ -20,11 +20,6 @@ # See the qdrouterd.conf (5) manual page for information about this # file's format and options. -container { - workerThreads: 4 - containerName: Qpid.Dispatch.Router.A -} - router { mode: standalone routerId: Router.A http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7e5a0433/python/qpid_dispatch/management/qdrouter.json ---------------------------------------------------------------------- diff --git a/python/qpid_dispatch/management/qdrouter.json b/python/qpid_dispatch/management/qdrouter.json index c8614e4..17e3bd3 100644 --- a/python/qpid_dispatch/management/qdrouter.json +++ b/python/qpid_dispatch/management/qdrouter.json @@ -472,11 +472,12 @@ }, "container": { - "description":"Attributes related to the AMQP container.", + "description":"(DEPRECATED)Attributes related to the AMQP container. All container attributes are now available in the router entity. The container entity will be removed in future releases", "extends": "configurationEntity", "singleton": true, "attributes": { + "containerName": { "type": "string", "description": "The name of the AMQP container. If not specified, the container name will be set to a value of the container's choosing. The automatically assigned container name is not guaranteed to be persistent across restarts of the container.", @@ -485,7 +486,7 @@ }, "workerThreads": { "type": "integer", - "default": 1, + "default": 4, "description": "The number of threads that will be created to process message traffic and other application work (timers, non-amqp file descriptors, etc.) .", "create": true @@ -506,7 +507,6 @@ "type": "string", "description": "Name of the SASL configuration. This string + '.conf' is the name of the configuration file.", "required": false, - "default": "qdrouterd", "create": true } } @@ -520,6 +520,7 @@ "routerId": { "description":"Router's unique identity.", "type": "string", + "required": true, "create": true }, "mode": { @@ -587,6 +588,32 @@ "type": "integer", "description":"Number of known peer router nodes.", "graph": true + }, + "workerThreads": { + "type": "integer", + "default": 4, + "description": "The number of threads that will be created to process message traffic and other application work (timers, non-amqp file descriptors, etc.) .", + "create": true + + }, + "debugDump": { + "type": "path", + "description": "A file to dump debugging information that can't be logged normally.", + "create": true + + }, + "saslConfigPath": { + "type": "path", + "description": "Absolute path to the SASL configuration file.", + "required": false, + "create": true + }, + "saslConfigName": { + "type": "string", + "description": "Name of the SASL configuration. This string + '.conf' is the name of the configuration file.", + "default": "qdrouterd", + "required": false, + "create": true } } }, http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7e5a0433/python/qpid_dispatch_internal/management/agent.py ---------------------------------------------------------------------- diff --git a/python/qpid_dispatch_internal/management/agent.py b/python/qpid_dispatch_internal/management/agent.py index 3c1dbc2..f8fed29 100644 --- a/python/qpid_dispatch_internal/management/agent.py +++ b/python/qpid_dispatch_internal/management/agent.py @@ -233,6 +233,9 @@ class EntityAdapter(SchemaEntity): class ContainerEntity(EntityAdapter): + """ + The ContainerEntity has been deprecated. Use the the RouterEntity instead + """ def create(self): self._qd.qd_dispatch_configure_container(self._dispatch, self) http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7e5a0433/python/qpid_dispatch_internal/management/config.py ---------------------------------------------------------------------- diff --git a/python/qpid_dispatch_internal/management/config.py b/python/qpid_dispatch_internal/management/config.py index 3361821..6a5e741 100644 --- a/python/qpid_dispatch_internal/management/config.py +++ b/python/qpid_dispatch_internal/management/config.py @@ -109,6 +109,9 @@ class Config(object): return [_expand_section(s, annotations) for s in content if self.schema.is_configuration(self.schema.entity_type(s[0], False))] + def get_config_types(self): + return self.config_types + def load(self, source, raw_json=False): """ Load a configuration file. @@ -122,7 +125,7 @@ class Config(object): else: sections = self._parserawjson(source) if raw_json else self._parse(source) # Add missing singleton sections - for et in self.config_types: + for et in self.get_config_types(): if et.singleton and not [s for s in sections if s[0] == et.short_name]: sections.append((et.short_name, {})) sections = self._expand(sections) @@ -138,6 +141,12 @@ class Config(object): def remove(self, entity): self.entities.remove(entity) +class PolicyConfig(Config): + def __init__(self, filename=None, schema=QdSchema(), raw_json=False): + super(PolicyConfig, self).__init__(filename, schema, raw_json) + + def get_config_types(self): + return [s for s in self.config_types if 'policy' in s.name] def configure_dispatch(dispatch, lib_handle, filename): """Called by C router code to load configuration file and do configuration""" @@ -195,6 +204,6 @@ def configure_dispatch(dispatch, lib_handle, filename): apath = os.path.abspath(policyFolder) for i in os.listdir(policyFolder): if i.endswith(".json"): - pconfig = Config(os.path.join(apath, i)) + pconfig = PolicyConfig(os.path.join(apath, i)) for a in pconfig.by_type("policyRuleset"): agent.configure(a) http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7e5a0433/src/dispatch.c ---------------------------------------------------------------------- diff --git a/src/dispatch.c b/src/dispatch.c index 73bd0b5..b3dcc0a 100644 --- a/src/dispatch.c +++ b/src/dispatch.c @@ -96,31 +96,44 @@ qd_error_t qd_dispatch_load_config(qd_dispatch_t *qd, const char *config_path) return qd_error_code(); } - +/** + * The Container Entity has been deprecated and will be removed in the future. Use the RouterEntity instead. + */ qd_error_t qd_dispatch_configure_container(qd_dispatch_t *qd, qd_entity_t *entity) { - const char *default_name = "00000000-0000-0000-0000-000000000000"; - qd->thread_count = qd_entity_opt_long(entity, "workerThreads", 1); QD_ERROR_RET(); - qd->container_name = qd_entity_opt_string(entity, "containerName", default_name); QD_ERROR_RET(); + // Add a log warning. Check to see if too early + qd->thread_count = qd_entity_opt_long(entity, "workerThreads", 4); QD_ERROR_RET(); qd->sasl_config_path = qd_entity_opt_string(entity, "saslConfigPath", 0); QD_ERROR_RET(); - qd->sasl_config_name = qd_entity_opt_string(entity, "saslConfigName", "qdrouterd"); QD_ERROR_RET(); - char *dump_file = qd_entity_opt_string(entity, "debugDump", 0); + qd->sasl_config_name = qd_entity_opt_string(entity, "saslConfigName", 0); QD_ERROR_RET(); + char *dump_file = qd_entity_opt_string(entity, "debugDump", 0); QD_ERROR_RET(); if (dump_file) { qd_alloc_debug_dump(dump_file); QD_ERROR_RET(); free(dump_file); } + return QD_ERROR_NONE; } qd_error_t qd_dispatch_configure_router(qd_dispatch_t *qd, qd_entity_t *entity) { - qd_error_clear(); - free(qd->router_id); - qd->router_id = qd_entity_opt_string(entity, "routerId", qd->container_name); - QD_ERROR_RET(); - qd->router_mode = qd_entity_get_long(entity, "mode"); - return qd_error_code(); + qd->router_id = qd_entity_get_string(entity, "routerId"); QD_ERROR_RET(); + 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(); + + if (! qd->sasl_config_path) + qd->sasl_config_path = qd_entity_opt_string(entity, "saslConfigPath", 0); QD_ERROR_RET(); + if (! qd->sasl_config_name) + qd->sasl_config_name = qd_entity_opt_string(entity, "saslConfigName", "qdrouterd"); QD_ERROR_RET(); + + char *dump_file = qd_entity_opt_string(entity, "debugDump", 0); QD_ERROR_RET(); + if (dump_file) { + qd_alloc_debug_dump(dump_file); QD_ERROR_RET(); + free(dump_file); + } + + return QD_ERROR_NONE; + } qd_error_t qd_dispatch_configure_fixed_address(qd_dispatch_t *qd, qd_entity_t *entity) { @@ -193,7 +206,7 @@ void qd_dispatch_policy_c_counts_refresh(long ccounts, qd_entity_t *entity) qd_error_t qd_dispatch_prepare(qd_dispatch_t *qd) { - qd->server = qd_server(qd, qd->thread_count, qd->container_name, qd->sasl_config_path, qd->sasl_config_name); + qd->server = qd_server(qd, qd->thread_count, qd->router_id, qd->sasl_config_path, qd->sasl_config_name); qd->container = qd_container(qd); qd->router = qd_router(qd, qd->router_mode, qd->router_area, qd->router_id); qd->connection_manager = qd_connection_manager(qd); @@ -211,7 +224,6 @@ void qd_dispatch_free(qd_dispatch_t *qd) { if (!qd) return; free(qd->router_id); - free(qd->container_name); free(qd->router_area); qd_connection_manager_free(qd->connection_manager); qd_policy_free(qd->policy); http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7e5a0433/src/dispatch_private.h ---------------------------------------------------------------------- diff --git a/src/dispatch_private.h b/src/dispatch_private.h index d624f5d..d8d8ffd 100644 --- a/src/dispatch_private.h +++ b/src/dispatch_private.h @@ -54,7 +54,6 @@ struct qd_dispatch_t { void *dl_handle; int thread_count; - char *container_name; char *sasl_config_path; char *sasl_config_name; char *router_area; http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7e5a0433/tests/config-1/A.conf ---------------------------------------------------------------------- diff --git a/tests/config-1/A.conf b/tests/config-1/A.conf index e4b976e..f2a6b49 100644 --- a/tests/config-1/A.conf +++ b/tests/config-1/A.conf @@ -18,30 +18,6 @@ ## -## -## Container section - Configures the general operation of the AMQP container. -## -container { - ## - ## workerThreads - The number of threads that will be created to - ## process message traffic and other application work (timers, nonAmqp - ## file descriptors, etc.) - ## - ## The number of threads should be related to the number of available - ## processor cores. To fully utilize a quad-core system, set the - ## number of threads to 4. - ## - workerThreads: 4 - - ## - ## containerName - The name of the AMQP container. If not specified, - ## the container name will be set to a value of the container's - ## choosing. The automatically assigned container name is not - ## guaranteed to be persistent across restarts of the container. - ## - containerName: Qpid.Dispatch.Router.A -} - router { mode: standalone routerId: QDR http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7e5a0433/tests/config-2-broker/A.conf ---------------------------------------------------------------------- diff --git a/tests/config-2-broker/A.conf b/tests/config-2-broker/A.conf index b6a4c8a..f043f60 100644 --- a/tests/config-2-broker/A.conf +++ b/tests/config-2-broker/A.conf @@ -18,31 +18,11 @@ ## -## -## Container section - Configures the general operation of the AMQP container. -## -container { - ## - ## workerThreads - The number of threads that will be created to - ## process message traffic and other application work (timers, non-amqp - ## file descriptors, etc.) - ## - ## The number of threads should be related to the number of available - ## processor cores. To fully utilize a quad-core system, set the - ## number of threads to 4. - ## - workerThreads: 4 - - ## - ## containerName - The name of the AMQP container. If not specified, - ## the container name will be set to a value of the container's - ## choosing. The automatically assigned container name is not - ## guaranteed to be persistent across restarts of the container. - ## - containerName: Qpid.Dispatch.Router.A +router { + mode: interior + routerId: QDR.A } - ## ## Listeners and Connectors ## @@ -59,11 +39,6 @@ listener { saslMechanisms: ANONYMOUS } -router { - mode: interior - routerId: QDR.A -} - connector { name: broker role: on-demand http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7e5a0433/tests/config-2-broker/B.conf ---------------------------------------------------------------------- diff --git a/tests/config-2-broker/B.conf b/tests/config-2-broker/B.conf index a011815..3cca510 100644 --- a/tests/config-2-broker/B.conf +++ b/tests/config-2-broker/B.conf @@ -18,28 +18,9 @@ ## -## -## Container section - Configures the general operation of the AMQP container. -## -container { - ## - ## workerThreads - The number of threads that will be created to - ## process message traffic and other application work (timers, non-amqp - ## file descriptors, etc.) - ## - ## The number of threads should be related to the number of available - ## processor cores. To fully utilize a quad-core system, set the - ## number of threads to 4. - ## - workerThreads: 4 - - ## - ## containerName - The name of the AMQP container. If not specified, - ## the container name will be set to a value of the container's - ## choosing. The automatically assigned container name is not - ## guaranteed to be persistent across restarts of the container. - ## - containerName: Qpid.Dispatch.Router.B +router { + mode: interior + routerId: QDR.B } @@ -59,11 +40,6 @@ connector { saslMechanisms: ANONYMOUS } -router { - mode: interior - routerId: QDR.B -} - linkRoutePattern { prefix: queue. } http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7e5a0433/tests/config-2/A-ssl.conf.in ---------------------------------------------------------------------- diff --git a/tests/config-2/A-ssl.conf.in b/tests/config-2/A-ssl.conf.in index 1033640..6cae30d 100644 --- a/tests/config-2/A-ssl.conf.in +++ b/tests/config-2/A-ssl.conf.in @@ -17,36 +17,17 @@ ## under the License ## - -## -## Container section - Configures the general operation of the AMQP container. -## -container { - ## - ## worker-threads - The number of threads that will be created to - ## process message traffic and other application work (timers, non-amqp - ## file descriptors, etc.) - ## - ## The number of threads should be related to the number of available - ## processor cores. To fully utilize a quad-core system, set the - ## number of threads to 4. - ## - worker-threads: 4 - - ## - ## container-name - The name of the AMQP container. If not specified, - ## the container name will be set to a value of the container's - ## choosing. The automatically assigned container name is not - ## guaranteed to be persistent across restarts of the container. - ## - container-name: Qpid.Dispatch.Router.A -} - ## ## SSL Profile section - Zero or more SSL profiles may be defined here and ## then referenced later in listeners (for incoming connections) or ## connectors (for outgoing connectors). ## + +router { + mode: interior + router-id: QDR.A +} + ssl-profile { name: ssl-profile-name cert-db: ${QPID_DISPATCH_HOME_INSTALLED}/tests/config-2/ca-certificate.pem @@ -73,11 +54,6 @@ listener { requirePeerAuth: yes } -router { - mode: interior - router-id: QDR.A -} - fixed-address { prefix: /closest/ fanout: single http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7e5a0433/tests/config-2/A.conf ---------------------------------------------------------------------- diff --git a/tests/config-2/A.conf b/tests/config-2/A.conf index 5abdebc..6f8fb33 100644 --- a/tests/config-2/A.conf +++ b/tests/config-2/A.conf @@ -17,32 +17,11 @@ ## under the License ## - -## -## Container section - Configures the general operation of the AMQP container. -## -container { - ## - ## workerThreads - The number of threads that will be created to - ## process message traffic and other application work (timers, non-amqp - ## file descriptors, etc.) - ## - ## The number of threads should be related to the number of available - ## processor cores. To fully utilize a quad-core system, set the - ## number of threads to 4. - ## - workerThreads: 4 - - ## - ## containerName - The name of the AMQP container. If not specified, - ## the container name will be set to a value of the container's - ## choosing. The automatically assigned container name is not - ## guaranteed to be persistent across restarts of the container. - ## - containerName: Qpid.Dispatch.Router.A +router { + mode: interior + routerId: QDR.A } - ## ## Listeners and Connectors ## @@ -59,11 +38,6 @@ listener { saslMechanisms: ANONYMOUS } -router { - mode: interior - routerId: QDR.A -} - fixedAddress { prefix: /closest/ fanout: single http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7e5a0433/tests/config-2/B-ssl.conf.in ---------------------------------------------------------------------- diff --git a/tests/config-2/B-ssl.conf.in b/tests/config-2/B-ssl.conf.in index 4fb6fb5..15d3361 100644 --- a/tests/config-2/B-ssl.conf.in +++ b/tests/config-2/B-ssl.conf.in @@ -17,31 +17,12 @@ ## under the License ## - -## -## Container section - Configures the general operation of the AMQP container. -## -container { - ## - ## worker-threads - The number of threads that will be created to - ## process message traffic and other application work (timers, non-amqp - ## file descriptors, etc.) - ## - ## The number of threads should be related to the number of available - ## processor cores. To fully utilize a quad-core system, set the - ## number of threads to 4. - ## - worker-threads: 4 - - ## - ## container-name - The name of the AMQP container. If not specified, - ## the container name will be set to a value of the container's - ## choosing. The automatically assigned container name is not - ## guaranteed to be persistent across restarts of the container. - ## - container-name: Qpid.Dispatch.Router.B +router { + mode: interior + router-id: QDR.B } + ssl-profile { name: ssl-profile-name cert-db: ${QPID_DISPATCH_HOME_INSTALLED}/tests/config-2/ca-certificate.pem @@ -67,11 +48,6 @@ connector { ssl-profile: ssl-profile-name } -router { - mode: interior - router-id: QDR.B -} - fixed-address { prefix: /closest/ fanout: single http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7e5a0433/tests/config-2/B.conf ---------------------------------------------------------------------- diff --git a/tests/config-2/B.conf b/tests/config-2/B.conf index 4d12c62..3dc92cc 100644 --- a/tests/config-2/B.conf +++ b/tests/config-2/B.conf @@ -18,31 +18,11 @@ ## -## -## Container section - Configures the general operation of the AMQP container. -## -container { - ## - ## workerThreads - The number of threads that will be created to - ## process message traffic and other application work (timers, non-amqp - ## file descriptors, etc.) - ## - ## The number of threads should be related to the number of available - ## processor cores. To fully utilize a quad-core system, set the - ## number of threads to 4. - ## - workerThreads: 4 - - ## - ## containerName - The name of the AMQP container. If not specified, - ## the container name will be set to a value of the container's - ## choosing. The automatically assigned container name is not - ## guaranteed to be persistent across restarts of the container. - ## - containerName: Qpid.Dispatch.Router.B +router { + mode: interior + routerId: QDR.B } - ## ## Listeners and Connectors ## @@ -59,11 +39,6 @@ connector { saslMechanisms: ANONYMOUS } -router { - mode: interior - routerId: QDR.B -} - fixedAddress { prefix: /closest/ fanout: single http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7e5a0433/tests/config-3-linear/A.conf ---------------------------------------------------------------------- diff --git a/tests/config-3-linear/A.conf b/tests/config-3-linear/A.conf index c16e8ea..131c216 100644 --- a/tests/config-3-linear/A.conf +++ b/tests/config-3-linear/A.conf @@ -17,32 +17,11 @@ ## under the License ## - -## -## Container section - Configures the general operation of the AMQP container. -## -container { - ## - ## workerThreads - The number of threads that will be created to - ## process message traffic and other application work (timers, non-amqp - ## file descriptors, etc.) - ## - ## The number of threads should be related to the number of available - ## processor cores. To fully utilize a quad-core system, set the - ## number of threads to 4. - ## - workerThreads: 4 - - ## - ## containerName - The name of the AMQP container. If not specified, - ## the container name will be set to a value of the container's - ## choosing. The automatically assigned container name is not - ## guaranteed to be persistent across restarts of the container. - ## - containerName: QDR.A +router { + mode: interior + routerId: QDR.A } - ## ## Listeners and Connectors ## @@ -59,11 +38,6 @@ connector { saslMechanisms: ANONYMOUS } -router { - mode: interior - routerId: QDR.A -} - log { module: ROUTER enable: trace+ http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7e5a0433/tests/config-3-linear/B.conf ---------------------------------------------------------------------- diff --git a/tests/config-3-linear/B.conf b/tests/config-3-linear/B.conf index 3ed1894..dd9f742 100644 --- a/tests/config-3-linear/B.conf +++ b/tests/config-3-linear/B.conf @@ -17,32 +17,11 @@ ## under the License ## - -## -## Container section - Configures the general operation of the AMQP container. -## -container { - ## - ## workerThreads - The number of threads that will be created to - ## process message traffic and other application work (timers, non-amqp - ## file descriptors, etc.) - ## - ## The number of threads should be related to the number of available - ## processor cores. To fully utilize a quad-core system, set the - ## number of threads to 4. - ## - workerThreads: 4 - - ## - ## containerName - The name of the AMQP container. If not specified, - ## the container name will be set to a value of the container's - ## choosing. The automatically assigned container name is not - ## guaranteed to be persistent across restarts of the container. - ## - containerName: QDR.B +router { + mode: interior + routerId: QDR.B } - ## ## Listeners and Connectors ## @@ -60,12 +39,6 @@ connector { saslMechanisms: ANONYMOUS } - -router { - mode: interior - routerId: QDR.B -} - log { module: ROUTER enable: trace+ http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7e5a0433/tests/config-3-linear/C.conf ---------------------------------------------------------------------- diff --git a/tests/config-3-linear/C.conf b/tests/config-3-linear/C.conf index e5a2f37..09facce 100644 --- a/tests/config-3-linear/C.conf +++ b/tests/config-3-linear/C.conf @@ -17,29 +17,9 @@ ## under the License ## - -## -## Container section - Configures the general operation of the AMQP container. -## -container { - ## - ## workerThreads - The number of threads that will be created to - ## process message traffic and other application work (timers, non-amqp - ## file descriptors, etc.) - ## - ## The number of threads should be related to the number of available - ## processor cores. To fully utilize a quad-core system, set the - ## number of threads to 4. - ## - workerThreads: 4 - - ## - ## containerName - The name of the AMQP container. If not specified, - ## the container name will be set to a value of the container's - ## choosing. The automatically assigned container name is not - ## guaranteed to be persistent across restarts of the container. - ## - containerName: QDR.C +router { + mode: interior + routerId: QDR.C } @@ -53,12 +33,6 @@ listener { saslMechanisms: ANONYMOUS } - -router { - mode: interior - routerId: QDR.C -} - log { module: ROUTER enable: trace+ http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7e5a0433/tests/config-6/A.conf ---------------------------------------------------------------------- diff --git a/tests/config-6/A.conf b/tests/config-6/A.conf index 0373ee4..7b53a69 100644 --- a/tests/config-6/A.conf +++ b/tests/config-6/A.conf @@ -18,15 +18,12 @@ ## -## -## Container section - Configures the general operation of the AMQP container. -## -container { - workerThreads: 4 - containerName: QDR.A +router { + mode: interior + area: A + routerId: QDR.A } - ## ## Listeners and Connectors ## @@ -58,12 +55,6 @@ connector { saslMechanisms: ANONYMOUS } -router { - mode: interior - area: A - routerId: QDR.A -} - fixedAddress { prefix: /closest/ fanout: single http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7e5a0433/tests/config-6/B.conf ---------------------------------------------------------------------- diff --git a/tests/config-6/B.conf b/tests/config-6/B.conf index d827b59..94c25b6 100644 --- a/tests/config-6/B.conf +++ b/tests/config-6/B.conf @@ -17,16 +17,12 @@ ## under the License ## - -## -## Container section - Configures the general operation of the AMQP container. -## -container { - workerThreads: 4 - containerName: QDR.B +router { + mode: interior + area: A + routerId: QDR.B } - ## ## Listeners and Connectors ## @@ -51,12 +47,6 @@ connector { saslMechanisms: ANONYMOUS } -router { - mode: interior - area: A - routerId: QDR.B -} - fixedAddress { prefix: /closest/ fanout: single http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7e5a0433/tests/config-6/C.conf ---------------------------------------------------------------------- diff --git a/tests/config-6/C.conf b/tests/config-6/C.conf index f63d082..499c2ec 100644 --- a/tests/config-6/C.conf +++ b/tests/config-6/C.conf @@ -17,16 +17,12 @@ ## under the License ## - -## -## Container section - Configures the general operation of the AMQP container. -## -container { - workerThreads: 4 - containerName: QDR.C +router { + mode: interior + area: A + routerId: QDR.C } - ## ## Listeners and Connectors ## @@ -44,12 +40,6 @@ connector { saslMechanisms: ANONYMOUS } -router { - mode: interior - area: A - routerId: QDR.C -} - fixedAddress { prefix: /closest/ fanout: single http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7e5a0433/tests/config-6/D.conf ---------------------------------------------------------------------- diff --git a/tests/config-6/D.conf b/tests/config-6/D.conf index b46910a..df079b7 100644 --- a/tests/config-6/D.conf +++ b/tests/config-6/D.conf @@ -17,16 +17,12 @@ ## under the License ## - -## -## Container section - Configures the general operation of the AMQP container. -## -container { - workerThreads: 4 - containerName: QDR.D +router { + mode: interior + area: A + routerId: QDR.D } - ## ## Listeners and Connectors ## @@ -37,12 +33,6 @@ listener { saslMechanisms: ANONYMOUS } -router { - mode: interior - area: A - routerId: QDR.D -} - fixedAddress { prefix: /closest/ fanout: single http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7e5a0433/tests/config-6/X.conf ---------------------------------------------------------------------- diff --git a/tests/config-6/X.conf b/tests/config-6/X.conf index da037ad..4e14428 100644 --- a/tests/config-6/X.conf +++ b/tests/config-6/X.conf @@ -17,16 +17,12 @@ ## under the License ## - -## -## Container section - Configures the general operation of the AMQP container. -## -container { - workerThreads: 4 - containerName: QDR.X +router { + mode: interior + area: A + routerId: QDR.X } - ## ## Listeners and Connectors ## @@ -50,12 +46,6 @@ connector { saslMechanisms: ANONYMOUS } -router { - mode: interior - area: A - routerId: QDR.X -} - fixedAddress { prefix: /closest/ fanout: single http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7e5a0433/tests/config-6/Y.conf ---------------------------------------------------------------------- diff --git a/tests/config-6/Y.conf b/tests/config-6/Y.conf index f7f2fc0..ab0cd85 100644 --- a/tests/config-6/Y.conf +++ b/tests/config-6/Y.conf @@ -17,16 +17,12 @@ ## under the License ## - -## -## Container section - Configures the general operation of the AMQP container. -## -container { - workerThreads: 4 - containerName: QDR.Y +router { + mode: interior + area: A + routerId: QDR.Y } - ## ## Listeners and Connectors ## @@ -50,12 +46,6 @@ connector { saslMechanisms: ANONYMOUS } -router { - mode: interior - area: A - routerId: QDR.Y -} - fixedAddress { prefix: /closest/ fanout: single http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7e5a0433/tests/management/qdrouter.py ---------------------------------------------------------------------- diff --git a/tests/management/qdrouter.py b/tests/management/qdrouter.py index 595ea17..d03321f 100644 --- a/tests/management/qdrouter.py +++ b/tests/management/qdrouter.py @@ -26,6 +26,7 @@ from qpid_dispatch_internal.management.config import Config conf_text = """ # Line comment router { + routerId: QDR mode: standalone # End of line comment } ssl-profile { @@ -52,6 +53,7 @@ listener { confText = """ # Line comment router { + routerId: QDR mode: standalone # End of line comment } sslProfile { @@ -82,7 +84,7 @@ class QdrouterTest(unittest.TestCase): content = conf._parse(text.split("\n")) self.maxDiff = None expect = [ - [u'router', {u'mode': u'standalone'}], + [u'router', {u'mode': u'standalone', u'routerId': 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'}], @@ -92,7 +94,7 @@ class QdrouterTest(unittest.TestCase): content = conf._expand(content) expect = [ - [u'router', {u'mode': u'standalone'}], + [u'router', {u'mode': u'standalone', u'routerId': 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'}] http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7e5a0433/tests/policy-1/test-policy-conf-includes-folder.conf.in ---------------------------------------------------------------------- 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 b6f0413..1aaf285 100644 --- a/tests/policy-1/test-policy-conf-includes-folder.conf.in +++ b/tests/policy-1/test-policy-conf-includes-folder.conf.in @@ -18,30 +18,6 @@ ## -## -## Container section - Configures the general operation of the AMQP container. -## -container { - ## - ## workerThreads - The number of threads that will be created to - ## process message traffic and other application work (timers, nonAmqp - ## file descriptors, etc.) - ## - ## The number of threads should be related to the number of available - ## processor cores. To fully utilize a quad-core system, set the - ## number of threads to 4. - ## - workerThreads: 4 - - ## - ## containerName - The name of the AMQP container. If not specified, - ## the container name will be set to a value of the container's - ## choosing. The automatically assigned container name is not - ## guaranteed to be persistent across restarts of the container. - ## - containerName: Qpid.Dispatch.Router.A -} - router { mode: standalone routerId: QDR http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7e5a0433/tests/policy-2/test-router-with-policy.json.in ---------------------------------------------------------------------- diff --git a/tests/policy-2/test-router-with-policy.json.in b/tests/policy-2/test-router-with-policy.json.in index ad07a8d..6b2fb85 100644 --- a/tests/policy-2/test-router-with-policy.json.in +++ b/tests/policy-2/test-router-with-policy.json.in @@ -1,6 +1,6 @@ [ - ["container", { - "containerName": "dispatch", + ["router", { + "routerId": "dispatch", "saslConfigName": "policy-photoserver-sasl", "saslConfigPath": "${CMAKE_CURRENT_BINARY_DIR}/policy-2", "debugDump": "qddebug.txt" http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7e5a0433/tests/system_test.py ---------------------------------------------------------------------- diff --git a/tests/system_test.py b/tests/system_test.py index be9b262..dc21c18 100755 --- a/tests/system_test.py +++ b/tests/system_test.py @@ -317,9 +317,9 @@ class Qdrouterd(Process): """ 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'}, - 'container':{'debugDump':"qddebug.txt"} + '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} } def sections(self, name): http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7e5a0433/tests/system_tests_broker.py ---------------------------------------------------------------------- diff --git a/tests/system_tests_broker.py b/tests/system_tests_broker.py index e1be921..ca42085 100644 --- a/tests/system_tests_broker.py +++ b/tests/system_tests_broker.py @@ -52,7 +52,6 @@ class DistributedQueueTest(system_test.TestCase): # pylint: disable=too-many-pub def common_router_conf(self, name, mode='standalone'): """Common router configuration for the tests""" return Qdrouterd.Config([ - ('container', {'containerName':name}), ('router', {'mode': mode, 'routerId': name}) ]) http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7e5a0433/tests/system_tests_link_routes.py ---------------------------------------------------------------------- diff --git a/tests/system_tests_link_routes.py b/tests/system_tests_link_routes.py index 5292fb2..ce44bc2 100644 --- a/tests/system_tests_link_routes.py +++ b/tests/system_tests_link_routes.py @@ -60,7 +60,6 @@ class LinkRoutePatternTest(TestCase): def router(name, connection): config = [ - ('container', {'workerThreads': 4, 'containerName': 'Qpid.Dispatch.Router.%s'%name}), ('router', {'mode': 'interior', 'routerId': 'QDR.%s'%name}), ('fixedAddress', {'prefix': '/closest/', 'fanout': 'single', 'bias': 'closest'}), ('fixedAddress', {'prefix': '/spread/', 'fanout': 'single', 'bias': 'spread'}), http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7e5a0433/tests/system_tests_one_router.py ---------------------------------------------------------------------- diff --git a/tests/system_tests_one_router.py b/tests/system_tests_one_router.py index 7b4590d..49174b4 100644 --- a/tests/system_tests_one_router.py +++ b/tests/system_tests_one_router.py @@ -39,8 +39,6 @@ class RouterTest(TestCase): super(RouterTest, cls).setUpClass() name = "test-router" config = Qdrouterd.Config([ - ('container', {'workerThreads': 4, 'containerName': 'Qpid.Dispatch.Router.A'}), - ('router', {'mode': 'standalone', 'routerId': 'QDR'}), # Setting the stripAnnotations to 'no' so that the existing tests will work. http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7e5a0433/tests/system_tests_policy.py ---------------------------------------------------------------------- diff --git a/tests/system_tests_policy.py b/tests/system_tests_policy.py index 3a3e123..57068ce 100644 --- a/tests/system_tests_policy.py +++ b/tests/system_tests_policy.py @@ -19,7 +19,7 @@ import unittest, json import os -from system_test import TestCase, Qdrouterd, main_module, Process, TIMEOUT +from system_test import TestCase, Qdrouterd, main_module, Process, TIMEOUT, DIR from subprocess import PIPE, STDOUT from proton import ConnectionException from proton.utils import BlockingConnection, LinkDetached @@ -33,7 +33,6 @@ class AbsoluteConnectionCountLimit(TestCase): """Start the router""" super(AbsoluteConnectionCountLimit, cls).setUpClass() config = Qdrouterd.Config([ - ('container', {'workerThreads': 4, 'containerName': 'Qpid.Dispatch.Router.Policy'}), ('router', {'mode': 'standalone', 'routerId': 'QDR.Policy'}), ('listener', {'port': cls.tester.get_port()}), ('policy', {'maximumConnections': 2}) @@ -79,9 +78,8 @@ class LoadPolicyFromFolder(TestCase): def setUpClass(cls): """Start the router""" super(LoadPolicyFromFolder, cls).setUpClass() - policy_config_path = os.path.join(cls.top_dir, 'policy-1') + policy_config_path = os.path.join(DIR, 'policy-1') config = Qdrouterd.Config([ - ('container', {'workerThreads': 4, 'containerName': 'Qpid.Dispatch.Router.Policy2'}), ('router', {'mode': 'standalone', 'routerId': 'QDR.Policy'}), ('listener', {'port': cls.tester.get_port()}), ('policy', {'maximumConnections': 2, 'policyFolder': policy_config_path, 'enableAccessRules': 'true'}) @@ -119,9 +117,8 @@ class SenderReceiverLimits(TestCase): def setUpClass(cls): """Start the router""" super(SenderReceiverLimits, cls).setUpClass() - policy_config_path = os.path.join(cls.top_dir, 'policy-3') + policy_config_path = os.path.join(DIR, 'policy-3') config = Qdrouterd.Config([ - ('container', {'workerThreads': 4, 'containerName': 'Qpid.Dispatch.Router.Policy3'}), ('router', {'mode': 'standalone', 'routerId': 'QDR.Policy'}), ('listener', {'port': cls.tester.get_port()}), ('policy', {'maximumConnections': 2, 'policyFolder': policy_config_path, 'enableAccessRules': 'true'}) http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7e5a0433/tests/system_tests_protocol_family.py ---------------------------------------------------------------------- diff --git a/tests/system_tests_protocol_family.py b/tests/system_tests_protocol_family.py index 6a4cb89..11393c8 100644 --- a/tests/system_tests_protocol_family.py +++ b/tests/system_tests_protocol_family.py @@ -41,7 +41,6 @@ class ProtocolFamilyTest(TestCase): def router(name, connection): config = [ - ('container', {'workerThreads': 4, 'containerName': 'Qpid.Dispatch.Router.%s'%name}), ('router', {'mode': 'interior', 'routerId': 'QDR.%s'%name}), # No protocolFamily is specified for this listener. http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7e5a0433/tests/system_tests_qdmanage.py ---------------------------------------------------------------------- diff --git a/tests/system_tests_qdmanage.py b/tests/system_tests_qdmanage.py index c677ab3..da74328 100644 --- a/tests/system_tests_qdmanage.py +++ b/tests/system_tests_qdmanage.py @@ -38,7 +38,6 @@ class QdmanageTest(TestCase): super(QdmanageTest, cls).setUpClass() cls.inter_router_port = cls.tester.get_port() config_1 = Qdrouterd.Config([ - ('container', {'workerThreads': 4, 'containerName': 'Qpid.Dispatch.Router.1'}), ('router', {'mode': 'interior', 'routerId': 'R1'}), ('ssl-profile', {'name': 'server-ssl', 'cert-db': cls.ssl_file('ca-certificate.pem'), @@ -51,7 +50,6 @@ class QdmanageTest(TestCase): ]) config_2 = Qdrouterd.Config([ - ('container', {'workerThreads': 4, 'containerName': 'Qpid.Dispatch.Router.2'}), ('router', {'mode': 'interior', 'routerId': 'R2'}), ('listener', {'role': 'inter-router', 'port': cls.inter_router_port}), ]) http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7e5a0433/tests/system_tests_qdstat.py ---------------------------------------------------------------------- diff --git a/tests/system_tests_qdstat.py b/tests/system_tests_qdstat.py index 8a88000..7befe7b 100644 --- a/tests/system_tests_qdstat.py +++ b/tests/system_tests_qdstat.py @@ -30,6 +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}), ('listener', {'port': cls.tester.get_port()}), ]) cls.router = cls.tester.qdrouterd('test-router', config) @@ -94,9 +95,10 @@ try: sasl_conf.write("mech_list: EXTERNAL ANONYMOUS DIGEST-MD5 PLAIN\n") # qdrouterd configuration: config = system_test.Qdrouterd.Config([ - ('container', {'containerName': 'QdstatSslTest', - 'saslConfigPath': os.getcwd(), - 'saslConfigName': 'tests-mech-EXTERNAL'}), + ('router', {'routerId': 'QDR.B', + 'saslConfigPath': os.getcwd(), + 'workerThreads': 1, + 'saslConfigName': 'tests-mech-EXTERNAL'}), ('ssl-profile', {'name': 'server-ssl', 'cert-db': cls.ssl_file('ca-certificate.pem'), 'cert-file': cls.ssl_file('server-certificate.pem'), @@ -240,9 +242,10 @@ try: sasl_conf.write("mech_list: ANONYMOUS DIGEST-MD5 PLAIN\n") # qdrouterd configuration: config = system_test.Qdrouterd.Config([ - ('container', {'containerName': 'QdstatSslTest', - 'saslConfigPath': os.getcwd(), - 'saslConfigName': 'tests-mech-NOEXTERNAL'}), + ('router', {'routerId': 'QDR.C', + 'saslConfigPath': os.getcwd(), + 'workerThreads': 1, + 'saslConfigName': 'tests-mech-NOEXTERNAL'}), ('ssl-profile', {'name': 'server-ssl', 'cert-db': cls.ssl_file('ca-certificate.pem'), 'cert-file': cls.ssl_file('server-certificate.pem'), http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7e5a0433/tests/system_tests_sasl_plain.py ---------------------------------------------------------------------- diff --git a/tests/system_tests_sasl_plain.py b/tests/system_tests_sasl_plain.py index 1854279..a01ea33 100644 --- a/tests/system_tests_sasl_plain.py +++ b/tests/system_tests_sasl_plain.py @@ -29,7 +29,6 @@ class RouterTestPlainSaslCommon(TestCase): def router(cls, name, connection): config = [ - ('router', {'mode': 'interior', 'routerId': 'QDR.%s'%name}), ('fixedAddress', {'prefix': '/closest/', 'fanout': 'single', 'bias': 'closest'}), ('fixedAddress', {'prefix': '/spread/', 'fanout': 'single', 'bias': 'spread'}), ('fixedAddress', {'prefix': '/multicast/', 'fanout': 'multiple'}), @@ -38,6 +37,7 @@ class RouterTestPlainSaslCommon(TestCase): ] + connection config = Qdrouterd.Config(config) + cls.routers.append(cls.tester.qdrouterd(name, config, wait=False)) @classmethod @@ -86,16 +86,20 @@ class RouterTestPlainSasl(RouterTestPlainSaslCommon): # This unauthenticated listener is for qdstat to connect to it. ('listener', {'addr': '0.0.0.0', 'role': 'normal', 'port': cls.tester.get_port(), 'authenticatePeer': 'no'}), - ('container', {'workerThreads': 4, 'containerName': 'Qpid.Dispatch.Router.X', - 'saslConfigName': 'tests-mech-PLAIN', - 'saslConfigPath': os.getcwd()}), + ('router', {'workerThreads': 1, + 'routerId': '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, # Provide a sasl user name and password to connect to QDR.X 'saslMechanisms': 'PLAIN', 'saslUsername': '[email protected]', 'saslPassword': 'password'}), - ('container', {'workerThreads': 4, 'containerName': 'Qpid.Dispatch.Router.Y'}), + ('router', {'workerThreads': 1, + 'mode': 'interior', + 'routerId': 'QDR.Y'}), ('listener', {'addr': '0.0.0.0', 'role': 'normal', 'port': y_listener_port}), ]) @@ -158,9 +162,11 @@ class RouterTestPlainSaslOverSsl(RouterTestPlainSaslCommon): 'cert-file': cls.ssl_file('server-certificate.pem'), 'key-file': cls.ssl_file('server-private-key.pem'), 'password': 'server-password'}), - ('container', {'workerThreads': 4, 'containerName': 'Qpid.Dispatch.Router.X', - 'saslConfigName': 'tests-mech-PLAIN', - 'saslConfigPath': os.getcwd()}), + ('router', {'workerThreads': 1, + 'routerId': 'QDR.X', + 'mode': 'interior', + 'saslConfigName': 'tests-mech-PLAIN', + 'saslConfigPath': os.getcwd()}), ]) super(RouterTestPlainSaslOverSsl, cls).router('Y', [ @@ -171,7 +177,9 @@ class RouterTestPlainSaslOverSsl(RouterTestPlainSaslCommon): # Provide a sasl user name and password to connect to QDR.X 'saslMechanisms': 'PLAIN', 'saslUsername': '[email protected]', 'saslPassword': 'password'}), - ('container', {'workerThreads': 4, 'containerName': 'Qpid.Dispatch.Router.Y'}), + ('router', {'workerThreads': 1, + 'mode': 'interior', + 'routerId': 'QDR.Y'}), ('listener', {'addr': '0.0.0.0', 'role': 'normal', 'port': y_listener_port}), ('sslProfile', {'name': 'client-ssl-profile', 'cert-db': cls.ssl_file('ca-certificate.pem'), @@ -207,7 +215,6 @@ class RouterTestPlainSaslOverSsl(RouterTestPlainSaslCommon): # user must be [email protected] self.assertEqual(u'[email protected]', local_node.query(type='org.apache.qpid.dispatch.connection').results[0][16]) - if __name__ == '__main__': unittest.main(main_module()) http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7e5a0433/tests/system_tests_two_routers.py ---------------------------------------------------------------------- diff --git a/tests/system_tests_two_routers.py b/tests/system_tests_two_routers.py index 2425b7f..f8436ed 100644 --- a/tests/system_tests_two_routers.py +++ b/tests/system_tests_two_routers.py @@ -44,12 +44,8 @@ class RouterTest(TestCase): def router(name, client_server, connection): config = cls.ssl_config(client_server, connection) + [ - ('container', {'workerThreads': 4, 'containerName': 'Qpid.Dispatch.Router.%s'%name}), ('router', {'mode': 'interior', 'routerId': 'QDR.%s'%name}), - # 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 - # that were expecting the annotations to not be stripped will continue working. ('listener', {'port': cls.tester.get_port(), 'stripAnnotations': 'no'}), # The following listeners were exclusively added to test the stripAnnotations attribute in qdrouterd.conf file http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7e5a0433/tests/system_tests_user_id.py ---------------------------------------------------------------------- diff --git a/tests/system_tests_user_id.py b/tests/system_tests_user_id.py index c7464a1..500a682 100644 --- a/tests/system_tests_user_id.py +++ b/tests/system_tests_user_id.py @@ -38,9 +38,8 @@ class QdSSLUseridTest(TestCase): ssl_profile1_json = os.path.join(DIR, 'displayname_files', 'profile_names1.json') ssl_profile2_json = os.path.join(DIR, 'displayname_files', 'profile_names2.json') - port = cls.tester.get_port() - config = Qdrouterd.Config([ + ('router', {'routerId': 'QDR', 'workerThreads': 1}), # sha1 ('sslProfile', {'name': 'server-ssl1', http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7e5a0433/tests/threads4.conf ---------------------------------------------------------------------- diff --git a/tests/threads4.conf b/tests/threads4.conf index 89dbe7f..3173961 100644 --- a/tests/threads4.conf +++ b/tests/threads4.conf @@ -24,6 +24,11 @@ container { workerThreads: 4 } + +router { + routerId : QDR +} + log { module: DEFAULT enable: debug+ --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
