From c417534a148e7c5d90b21b2b49b10977ff340619 Mon Sep 17 00:00:00 2001 From: Viktor Ashirov Date: Fri, 2 Dec 2016 12:23:10 +0100 Subject: [PATCH] Ticket 49060 - Increase number of masters, hubs and consumers in topology Bug Description: Currently only 10 masters, hubs and consumers can be created for testing using lib389. We should increase that number to at least 60 (number of supported replicas in RHEL7.3). Fix Description: Generate constants for instances on the fly, instead of hardcoding. https://fedorahosted.org/389/ticket/49060 Reviewed by: spichugi (Thanks!) --- lib389/_constants.py | 316 +++++++++------------------------------------------ 1 file changed, 53 insertions(+), 263 deletions(-) diff --git a/lib389/_constants.py b/lib389/_constants.py index 0056a28..e247634 100644 --- a/lib389/_constants.py +++ b/lib389/_constants.py @@ -235,269 +235,59 @@ DISORDERLY_SHUTDOWN = ('Detected Disorderly Shutdown last time Directory ' SUFFIX = 'dc=example,dc=com' PASSWORD = 'password' -# Standalone topology - 10 instances -HOST_STANDALONE = LOCALHOST -PORT_STANDALONE = 38931 -SERVERID_STANDALONE = 'standalone' - -HOST_STANDALONE2 = LOCALHOST -PORT_STANDALONE2 = 38932 -SERVERID_STANDALONE2 = 'standalone_2' - -HOST_STANDALONE3 = LOCALHOST -PORT_STANDALONE3 = 38933 -SERVERID_STANDALONE3 = 'standalone_3' - -HOST_STANDALONE4 = LOCALHOST -PORT_STANDALONE4 = 38934 -SERVERID_STANDALONE4 = 'standalone_4' - -HOST_STANDALONE5 = LOCALHOST -PORT_STANDALONE5 = 38935 -SERVERID_STANDALONE5 = 'standalone_5' - -HOST_STANDALONE6 = LOCALHOST -PORT_STANDALONE6 = 38936 -SERVERID_STANDALONE6 = 'standalone_6' - -HOST_STANDALONE7 = LOCALHOST -PORT_STANDALONE7 = 38937 -SERVERID_STANDALONE7 = 'standalone_7' - -HOST_STANDALONE8 = LOCALHOST -PORT_STANDALONE8 = 38939 -SERVERID_STANDALONE8 = 'standalone_8' - -HOST_STANDALONE9 = LOCALHOST -PORT_STANDALONE9 = 38939 -SERVERID_STANDALONE9 = 'standalone_9' - -HOST_STANDALONE10 = LOCALHOST -PORT_STANDALONE10 = 38930 -SERVERID_STANDALONE10 = 'standalone_10' - -# Replication topology: 10 masters, 10 hubs, 10 consumers -HOST_MASTER_1 = LOCALHOST -PORT_MASTER_1 = 38941 -SERVERID_MASTER_1 = 'master_1' -REPLICAID_MASTER_1 = 1 - -HOST_MASTER_2 = LOCALHOST -PORT_MASTER_2 = 38942 -SERVERID_MASTER_2 = 'master_2' -REPLICAID_MASTER_2 = 2 - -HOST_MASTER_3 = LOCALHOST -PORT_MASTER_3 = 38943 -SERVERID_MASTER_3 = 'master_3' -REPLICAID_MASTER_3 = 3 - -HOST_MASTER_4 = LOCALHOST -PORT_MASTER_4 = 38944 -SERVERID_MASTER_4 = 'master_4' -REPLICAID_MASTER_4 = 4 - -HOST_MASTER_5 = LOCALHOST -PORT_MASTER_5 = 38945 -SERVERID_MASTER_5 = 'master_5' -REPLICAID_MASTER_5 = 5 - -HOST_MASTER_6 = LOCALHOST -PORT_MASTER_6 = 38946 -SERVERID_MASTER_6 = 'master_6' -REPLICAID_MASTER_6 = 6 - -HOST_MASTER_7 = LOCALHOST -PORT_MASTER_7 = 38947 -SERVERID_MASTER_7 = 'master_7' -REPLICAID_MASTER_7 = 7 - -HOST_MASTER_8 = LOCALHOST -PORT_MASTER_8 = 38948 -SERVERID_MASTER_8 = 'master_8' -REPLICAID_MASTER_8 = 8 - -HOST_MASTER_9 = LOCALHOST -PORT_MASTER_9 = 38949 -SERVERID_MASTER_9 = 'master_9' -REPLICAID_MASTER_9 = 9 - -HOST_MASTER_10 = LOCALHOST -PORT_MASTER_10 = 38940 -SERVERID_MASTER_10 = 'master_10' -REPLICAID_MASTER_10 = 10 - -HOST_HUB_1 = LOCALHOST -PORT_HUB_1 = 38951 -SERVERID_HUB_1 = 'hub_1' -REPLICAID_HUB_1 = 65535 - -HOST_HUB_2 = LOCALHOST -PORT_HUB_2 = 38952 -SERVERID_HUB_2 = 'hub_2' -REPLICAID_HUB_2 = 65535 - -HOST_HUB_3 = LOCALHOST -PORT_HUB_3 = 38953 -SERVERID_HUB_3 = 'hub_3' -REPLICAID_HUB_3 = 65535 - -HOST_HUB_4 = LOCALHOST -PORT_HUB_4 = 38954 -SERVERID_HUB_4 = 'hub_4' -REPLICAID_HUB_4 = 65535 - -HOST_HUB_5 = LOCALHOST -PORT_HUB_5 = 38955 -SERVERID_HUB_5 = 'hub_5' -REPLICAID_HUB_5 = 65535 - -HOST_HUB_6 = LOCALHOST -PORT_HUB_6 = 38956 -SERVERID_HUB_6 = 'hub_6' -REPLICAID_HUB_6 = 65535 - -HOST_HUB_7 = LOCALHOST -PORT_HUB_7 = 38957 -SERVERID_HUB_7 = 'hub_7' -REPLICAID_HUB_7 = 65535 - -HOST_HUB_8 = LOCALHOST -PORT_HUB_8 = 38958 -SERVERID_HUB_8 = 'hub_8' -REPLICAID_HUB_8 = 65535 - -HOST_HUB_9 = LOCALHOST -PORT_HUB_9 = 38959 -SERVERID_HUB_9 = 'hub_9' -REPLICAID_HUB_9 = 65535 - -HOST_HUB_10 = LOCALHOST -PORT_HUB_10 = 38950 -SERVERID_HUB_10 = 'hub_10' -REPLICAID_HUB_10 = 65535 - -HOST_CONSUMER_1 = LOCALHOST -PORT_CONSUMER_1 = 38961 -SERVERID_CONSUMER_1 = 'consumer_1' - -HOST_CONSUMER_2 = LOCALHOST -PORT_CONSUMER_2 = 38962 -SERVERID_CONSUMER_2 = 'consumer_2' - -HOST_CONSUMER_3 = LOCALHOST -PORT_CONSUMER_3 = 38963 -SERVERID_CONSUMER_3 = 'consumer_3' - -HOST_CONSUMER_4 = LOCALHOST -PORT_CONSUMER_4 = 38964 -SERVERID_CONSUMER_4 = 'consumer_4' - -HOST_CONSUMER_5 = LOCALHOST -PORT_CONSUMER_5 = 38965 -SERVERID_CONSUMER_5 = 'consumer_5' - -HOST_CONSUMER_6 = LOCALHOST -PORT_CONSUMER_6 = 38966 -SERVERID_CONSUMER_6 = 'consumer_6' - -HOST_CONSUMER_7 = LOCALHOST -PORT_CONSUMER_7 = 38967 -SERVERID_CONSUMER_7 = 'consumer_7' - -HOST_CONSUMER_8 = LOCALHOST -PORT_CONSUMER_8 = 38968 -SERVERID_CONSUMER_8 = 'consumer_8' - -HOST_CONSUMER_9 = LOCALHOST -PORT_CONSUMER_9 = 38969 -SERVERID_CONSUMER_9 = 'consumer_9' - -HOST_CONSUMER_10 = LOCALHOST -PORT_CONSUMER_10 = 38960 -SERVERID_CONSUMER_10 = 'consumer_10' - -# Each defined instance above must be added in that list -ALL_INSTANCES = [{SER_HOST: HOST_STANDALONE, SER_PORT: PORT_STANDALONE, - SER_SERVERID_PROP: SERVERID_STANDALONE}, - {SER_HOST: HOST_STANDALONE2, SER_PORT: PORT_STANDALONE2, - SER_SERVERID_PROP: SERVERID_STANDALONE2}, - {SER_HOST: HOST_STANDALONE3, SER_PORT: PORT_STANDALONE3, - SER_SERVERID_PROP: SERVERID_STANDALONE3}, - {SER_HOST: HOST_STANDALONE4, SER_PORT: PORT_STANDALONE4, - SER_SERVERID_PROP: SERVERID_STANDALONE4}, - {SER_HOST: HOST_STANDALONE5, SER_PORT: PORT_STANDALONE5, - SER_SERVERID_PROP: SERVERID_STANDALONE5}, - {SER_HOST: HOST_STANDALONE6, SER_PORT: PORT_STANDALONE6, - SER_SERVERID_PROP: SERVERID_STANDALONE6}, - {SER_HOST: HOST_STANDALONE7, SER_PORT: PORT_STANDALONE7, - SER_SERVERID_PROP: SERVERID_STANDALONE7}, - {SER_HOST: HOST_STANDALONE8, SER_PORT: PORT_STANDALONE8, - SER_SERVERID_PROP: SERVERID_STANDALONE8}, - {SER_HOST: HOST_STANDALONE9, SER_PORT: PORT_STANDALONE9, - SER_SERVERID_PROP: SERVERID_STANDALONE9}, - {SER_HOST: HOST_STANDALONE10, SER_PORT: PORT_STANDALONE10, - SER_SERVERID_PROP: SERVERID_STANDALONE10}, - {SER_HOST: HOST_MASTER_1, SER_PORT: PORT_MASTER_1, - SER_SERVERID_PROP: SERVERID_MASTER_1}, - {SER_HOST: HOST_MASTER_2, SER_PORT: PORT_MASTER_2, - SER_SERVERID_PROP: SERVERID_MASTER_2}, - {SER_HOST: HOST_MASTER_3, SER_PORT: PORT_MASTER_3, - SER_SERVERID_PROP: SERVERID_MASTER_3}, - {SER_HOST: HOST_MASTER_4, SER_PORT: PORT_MASTER_4, - SER_SERVERID_PROP: SERVERID_MASTER_4}, - {SER_HOST: HOST_MASTER_5, SER_PORT: PORT_MASTER_5, - SER_SERVERID_PROP: SERVERID_MASTER_5}, - {SER_HOST: HOST_MASTER_6, SER_PORT: PORT_MASTER_6, - SER_SERVERID_PROP: SERVERID_MASTER_6}, - {SER_HOST: HOST_MASTER_7, SER_PORT: PORT_MASTER_7, - SER_SERVERID_PROP: SERVERID_MASTER_7}, - {SER_HOST: HOST_MASTER_8, SER_PORT: PORT_MASTER_8, - SER_SERVERID_PROP: SERVERID_MASTER_8}, - {SER_HOST: HOST_MASTER_9, SER_PORT: PORT_MASTER_9, - SER_SERVERID_PROP: SERVERID_MASTER_9}, - {SER_HOST: HOST_MASTER_10, SER_PORT: PORT_MASTER_10, - SER_SERVERID_PROP: SERVERID_MASTER_10}, - {SER_HOST: HOST_HUB_1, SER_PORT: PORT_HUB_1, - SER_SERVERID_PROP: SERVERID_HUB_1}, - {SER_HOST: HOST_HUB_2, SER_PORT: PORT_HUB_2, - SER_SERVERID_PROP: SERVERID_HUB_2}, - {SER_HOST: HOST_HUB_3, SER_PORT: PORT_HUB_3, - SER_SERVERID_PROP: SERVERID_HUB_3}, - {SER_HOST: HOST_HUB_4, SER_PORT: PORT_HUB_4, - SER_SERVERID_PROP: SERVERID_HUB_4}, - {SER_HOST: HOST_HUB_5, SER_PORT: PORT_HUB_5, - SER_SERVERID_PROP: SERVERID_HUB_5}, - {SER_HOST: HOST_HUB_6, SER_PORT: PORT_HUB_6, - SER_SERVERID_PROP: SERVERID_HUB_6}, - {SER_HOST: HOST_HUB_7, SER_PORT: PORT_HUB_7, - SER_SERVERID_PROP: SERVERID_HUB_7}, - {SER_HOST: HOST_HUB_8, SER_PORT: PORT_HUB_8, - SER_SERVERID_PROP: SERVERID_HUB_8}, - {SER_HOST: HOST_HUB_9, SER_PORT: PORT_HUB_9, - SER_SERVERID_PROP: SERVERID_HUB_9}, - {SER_HOST: HOST_HUB_10, SER_PORT: PORT_HUB_10, - SER_SERVERID_PROP: SERVERID_HUB_10}, - {SER_HOST: HOST_CONSUMER_1, SER_PORT: PORT_CONSUMER_1, - SER_SERVERID_PROP: SERVERID_CONSUMER_1}, - {SER_HOST: HOST_CONSUMER_2, SER_PORT: PORT_CONSUMER_2, - SER_SERVERID_PROP: SERVERID_CONSUMER_2}, - {SER_HOST: HOST_CONSUMER_3, SER_PORT: PORT_CONSUMER_3, - SER_SERVERID_PROP: SERVERID_CONSUMER_3}, - {SER_HOST: HOST_CONSUMER_4, SER_PORT: PORT_CONSUMER_4, - SER_SERVERID_PROP: SERVERID_CONSUMER_4}, - {SER_HOST: HOST_CONSUMER_5, SER_PORT: PORT_CONSUMER_5, - SER_SERVERID_PROP: SERVERID_CONSUMER_5}, - {SER_HOST: HOST_CONSUMER_6, SER_PORT: PORT_CONSUMER_6, - SER_SERVERID_PROP: SERVERID_CONSUMER_6}, - {SER_HOST: HOST_CONSUMER_7, SER_PORT: PORT_CONSUMER_7, - SER_SERVERID_PROP: SERVERID_CONSUMER_7}, - {SER_HOST: HOST_CONSUMER_8, SER_PORT: PORT_CONSUMER_8, - SER_SERVERID_PROP: SERVERID_CONSUMER_8}, - {SER_HOST: HOST_CONSUMER_9, SER_PORT: PORT_CONSUMER_9, - SER_SERVERID_PROP: SERVERID_CONSUMER_9}, - {SER_HOST: HOST_CONSUMER_10, SER_PORT: PORT_CONSUMER_10, - SER_SERVERID_PROP: SERVERID_CONSUMER_10}] +# Generate instance parameters on the fly +N=0 +port_start = 38901 +number_of_instances = 99 + +# Standalone topology +for i in range(port_start, port_start + number_of_instances): + N+=1 + exec("HOST_STANDALONE{0} = {1}".format(N, "LOCALHOST")) + exec("PORT_STANDALONE{0} = {1}".format(N, i)) + exec("SECUREPORT_STANDALONE{0} = {1}".format(N, i + 24700)) + exec("SERVERID_STANDALONE{0} = {1}".format(N, "\"standalone_{0}\"".format(N))) + +# For compatibility +HOST_STANDALONE = HOST_STANDALONE1 +PORT_STANDALONE = PORT_STANDALONE1 +SECUREPORT_STANDALONE = SECUREPORT_STANDALONE1 +SERVERID_STANDALONE = SERVERID_STANDALONE1 + +# Replication topology - masters +N=0 +port_start+=100 +for i in range(port_start, port_start + number_of_instances): + N+=1 + exec("HOST_MASTER_{0} = {1}".format(N, "LOCALHOST")) + exec("PORT_MASTER_{0} = {1}".format(N, i)) + exec("SECUREPORT_MASTER_{0} = {1}".format(N, i + 24700)) + exec("SERVERID_MASTER_{0} = {1}".format(N, "\"master_{0}\"".format(N))) + exec("REPLICAID_MASTER_{0} = {1}".format(N, N)) + +# Replication topology - hubs +N=0 +port_start+=100 +for i in range(port_start, port_start + number_of_instances): + N+=1 + exec("HOST_HUB_{0} = {1}".format(N, "LOCALHOST")) + exec("PORT_HUB_{0} = {1}".format(N, i)) + exec("SECUREPORT_HUB_{0} = {1}".format(N, i + 24700)) + exec("SERVERID_HUB_{0} = {1}".format(N, "\"hub_{0}\"".format(N))) + exec("REPLICAID_HUB_{0} = {1}".format(N, 65535)) + +# Replication topology - consumers +N=0 +port_start+=100 +for i in range(port_start, port_start + number_of_instances): + N+=1 + exec("HOST_CONSUMER_{0} = {1}".format(N, "LOCALHOST")) + exec("PORT_CONSUMER_{0} = {1}".format(N, i)) + exec("SECUREPORT_CONSUMER_{0} = {1}".format(N, i + 24700)) + exec("SERVERID_CONSUMER_{0} = {1}".format(N, "\"consumer_{0}\"".format(N))) + +# Cleanup, we don't need to export that +del N, port_start, number_of_instances # This is a template args_instance = {SER_DEPLOYED_DIR: os.environ.get('PREFIX', None), -- 2.9.3