XXX software/rapid-cdn: Switch to slapos.cookbook:free_port

XXX:
 * adapt tests
 * decide what to do with configuration.port and configuration.plain_http_port

software/rapid-cdn/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [template]
 filename = instance.cfg.in
-md5sum = c478478882232200fbe4bf3e7d2a4ff0
+md5sum = 5f8a32ab66e25999bf8bdd3ec9e82a34
 
 [profile-common]
 filename = instance-common.cfg.in
@@ -22,11 +22,11 @@ md5sum = 5784bea3bd608913769ff9a8afcccb68
 
 [profile-frontend]
 filename = instance-frontend.cfg.in
-md5sum = 5c2f79d0773bd8594ccf1c34a7d27d53
+md5sum = d3cc9487241d33385ecb5a759d06a590
 
 [profile-master]
 filename = instance-master.cfg.in
-md5sum = 3006197ddce87bd92866b76b5ce8ce08
+md5sum = a73f253674e718338f406dce12c5a4a0
 
 [profile-slave-list]
 filename = instance-slave-list.cfg.in
@@ -102,7 +102,7 @@ md5sum = e82ccdb0b26552a1c88ff523d8fae24a
 
 [profile-kedifa]
 filename = instance-kedifa.cfg.in
-md5sum = a9854d48e750b3599043715c95138d5d
+md5sum = 40141120fec6c5f86f565a7a429ce227
 
 [template-frontend-haproxy-rsyslogd-conf]
 _update_hash_filename_ = templates/frontend-haproxy-rsyslogd.conf.in

software/rapid-cdn/instance-frontend.cfg.in

@@ -187,10 +187,16 @@ RootSoftwareInstance = ${:default}
 single-default = dynamic-custom-personal-profile-slave-list:output
 single-custom-personal = dynamic-custom-personal-profile-slave-list:output
 
+[slave-introspection-port]
+recipe = slapos.cookbook:free_port
+ip = ${slap-configuration:ipv6-random}
+minimum = 22400
+maximum = 22450
+
 [frontend-configuration]
 ip-access-certificate = ${self-signed-ip-access:certificate}
 slave-introspection-configuration = ${directory:etc}/slave-introspection-httpd-nginx.conf
-slave-introspection-https-port = ${configuration:slave-introspection-https-port}
+slave-introspection-https-port = ${slave-introspection-port:port}
 slave-introspection-secure_access = ${slave-introspection-frontend:connection-secure_access}
 
 [self-signed-ip-access]
@@ -798,13 +804,31 @@ name = backend_haproxy_https.py
 config-host = {{ instance_parameter_dict['ipv4-random'] }}
 config-port = ${backend-haproxy-configuration:https-port}
 
+[statistic-port]
+recipe = slapos.cookbook:free_port
+ip = ${slap-configuration:ipv6-random}
+minimum = 21400
+maximum = 21450
+
+[backend-haproxy-http-port]
+recipe = slapos.cookbook:free_port
+ip = ${slap-configuration:ipv6-random}
+minimum = 21050
+maximum = 21100
+
+[backend-haproxy-https-port]
+recipe = slapos.cookbook:free_port
+ip = ${slap-configuration:ipv6-random}
+minimum = 21400
+maximum = 21450
+
 [backend-haproxy-configuration]
 file = ${directory:etc}/backend-haproxy.cfg
 pid-file = ${directory:run}/backend-haproxy.pid
 log-socket = ${backend-haproxy-rsyslogd-config:log-socket}
 graceful-command = ${backend-haproxy-validate:output} && kill -USR2 $(cat ${:pid-file})
-http-port = ${configuration:backend-haproxy-http-port}
-https-port = ${configuration:backend-haproxy-https-port}
+http-port = ${backend-haproxy-http-port:port}
+https-port = ${backend-haproxy-https-port:port}
 # Caucase related configuration
 caucase-url = {{ slapparameter_dict['backend-client-caucase-url'] }}
 ca-certificate = ${backend-client-login-config:ca-certificate}
@@ -814,7 +838,7 @@ csr = ${backend-client-caucase-updater-csr:csr}
 crl = ${backend-client-login-config:crl}
 # the statistic page
 statistic-certificate = ${self-signed-ip-access:certificate}
-statistic-port = ${configuration:backend-haproxy-statistic-port}
+statistic-port = ${statistic-port:port}
 statistic-username = ${monitor-instance-parameter:username}
 statistic-password = ${monitor-htpasswd:passwd}
 statistic-identification = {{ instance_parameter_dict['configuration.frontend-name'] + ' @ ' + slapparameter_dict['cluster-identification'] }}
@@ -956,10 +980,6 @@ hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
 #
 
 [monitor-instance-parameter]
-# Note: Workaround for monitor stack, which uses monitor-httpd-port parameter
-#       directly, and in our case it can come from the network, thus resulting
-#       with need to strip !py!'u'
-monitor-httpd-port = {{ instance_parameter_dict['configuration.monitor-httpd-port'] | int }}
 password = {{ instance_parameter_dict['configuration.monitor-password'] | string }}
 
 [monitor-conf-parameters]
@@ -1003,7 +1023,7 @@ recipe = slapos.cookbook:requestoptional
 name = Slave Introspection Frontend {{ instance_parameter_dict['configuration.frontend-name'] }}
 software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
 shared = true
-config-url = https://[${slap-configuration:ipv6-random}]:{{ instance_parameter_dict['configuration.slave-introspection-https-port'] }}/
+config-url = https://[${slap-configuration:ipv6-random}]:${frontend-configuration:slave-introspection-https-port}/
 config-https-only = true
 return = secure_access
 
@@ -1013,7 +1033,7 @@ recipe = slapos.cookbook:requestoptional
 name = Backend Haproxy Statistic Frontend {{ instance_parameter_dict['configuration.frontend-name'] }}
 software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
 shared = true
-config-url = https://[${slap-configuration:ipv6-random}]:{{ instance_parameter_dict['configuration.backend-haproxy-statistic-port'] }}/
+config-url = https://[${slap-configuration:ipv6-random}]:${backend-haproxy-configuration:statistic-port}/
 config-https-only = true
 return = domain secure_access
 

software/rapid-cdn/instance-kedifa.cfg.in

@@ -22,25 +22,28 @@ parts =
   promise-kedifa-auth-ready
 
 [monitor-instance-parameter]
-# Note: Workaround for monitor stack, which uses monitor-httpd-port parameter
-#       directly, and in our case it can come from the network, thus resulting
-#       with need to strip !py!'u'
-monitor-httpd-port = {{ instance_parameter_dict['configuration.monitor-httpd-port'] | int }}
 password = {{ instance_parameter_dict['configuration.monitor-password'] | string }}
 
+[caucased-port]
+recipe = slapos.cookbook:free_port
+ip = {{ instance_parameter_dict['ipv6-random'] }}
+minimum = 8800
+maximum = 8850
+
+[caucased-netloc]
+caucase_netloc = [${caucased-port:ip}]:${caucased-port:port}
+
 [caucased]
 hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
+caucase_url = http://${caucased-netloc:caucase_netloc}
 
-{%  set caucase_host = '[' ~ instance_parameter_dict['ipv6-random'] ~ ']' %}
-{%  set caucase_netloc = caucase_host ~ ':' ~ instance_parameter_dict['configuration.caucase_port'] -%}
-{%  set caucase_url = 'http://' ~ caucase_netloc -%}
 {{  caucase.caucased(
       prefix='caucased',
       buildout_bin_directory=software_parameter_dict['bin_directory'],
       caucased_path='${directory:service}/caucased',
       backup_dir='${directory:backup-caucased}',
       data_dir='${directory:caucased}',
-      netloc=caucase_netloc,
+      netloc='${caucased-netloc:caucase_netloc}',
       tmp='${directory:tmp}',
       service_auto_approve_count=0,
       user_auto_approve_count=1,
@@ -106,7 +109,7 @@ stop-on-error = True
      prefix='caucase-updater',
      buildout_bin_directory=software_parameter_dict['bin_directory'],
      updater_path='${directory:service}/caucase-updater',
-     url=caucase_url,
+     url='${caucased:caucase_url}',
      data_dir='${directory:srv}/caucase-updater',
      crt_path='${kedifa-config:certificate}',
      ca_path='${kedifa-config:ca-certificate}',
@@ -198,9 +201,15 @@ context =
     section directory directory
     ${:extra-context}
 
-[kedifa-config]
+[kedifa-port]
+recipe = slapos.cookbook:free_port
 ip = {{ instance_parameter_dict['ipv6-random'] }}
-port = {{ instance_parameter_dict['configuration.kedifa_port'] }}
+minimum = 7850
+maximum = 7900
+
+[kedifa-config]
+ip = ${kedifa-port:ip}
+port = ${kedifa-port:port}
 db = ${directory:kedifa}/kedifa.sqlite
 certificate = ${directory:etc-kedifa}/certificate.pem
 key = ${:certificate}
@@ -258,7 +267,7 @@ hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
 {%-   do slave_dict.__setitem__('key-generate-auth-url', 'https://[${kedifa-config:ip}]:${kedifa-config:port}/${%s-auth-random:passwd}/generateauth' % (slave_reference,)) -%}
 {%-   do slave_dict.__setitem__('key-upload-url', 'https://[${kedifa-config:ip}]:${kedifa-config:port}/${%s-auth-random:passwd}?auth=' % (slave_reference,)) -%}
 {%-   do slave_dict.__setitem__('key-download-url', 'https://[${kedifa-config:ip}]:${kedifa-config:port}/${%s-auth-random:passwd}' % (slave_reference,)) -%}
-{%-   do slave_dict.__setitem__('kedifa-caucase-url', caucase_url ) -%}
+{%-   do slave_dict.__setitem__('kedifa-caucase-url', '${caucased:caucase_url}' ) -%}
 {%-   do slave_kedifa_information.__setitem__(slave_reference, slave_dict) %}
 [{{ slave_reference }}-auth-random-generate]
 recipe = plone.recipe.command
@@ -316,7 +325,7 @@ file = ${master-auth-random-generate:file}
 recipe = slapos.cookbook:publish.serialised
 {# sort_keys are important in order to avoid shuffling parameters on each run #}
 slave-kedifa-information = {{ json_module.dumps(slave_kedifa_information, sort_keys=True) }}
-caucase-url = {{ caucase_url }}
+caucase-url = ${caucased:caucase_url}
 master-key-generate-auth-url = https://[${kedifa-config:ip}]:${kedifa-config:port}/${master-auth-random:passwd}/generateauth
 master-key-upload-url = https://[${kedifa-config:ip}]:${kedifa-config:port}/${master-auth-random:passwd}?auth=
 master-key-download-url = https://[${kedifa-config:ip}]:${kedifa-config:port}/${master-auth-random:passwd}

software/rapid-cdn/instance-master.cfg.in

@@ -103,13 +103,6 @@
 {%- set FRONTEND_NODE_SLAVE_PASSED_KEY_LIST = FRONTEND_NODE_SLAVE_PASSED_KEY_LIST_SCHEMA + FRONTEND_NODE_SLAVE_PASSED_KEY_LIST_INTERNAL %}
 {% set aikc_enabled = slapparameter_dict.get('automatic-internal-kedifa-caucase-csr', 'true').lower() in TRUE_VALUES %}
 {% set aibcc_enabled = slapparameter_dict.get('automatic-internal-backend-client-caucase-csr', 'true').lower() in TRUE_VALUES %}
-{# Ports 8401, 8402 and 8410+1..N are reserved for monitor ports on various partitions #}
-{% set master_partition_monitor_monitor_httpd_port = 8401 %}
-{% set kedifa_partition_monitor_httpd_port = 8402 %}
-{% set frontend_monitor_httpd_base_port = 8410 %}
-{% set caucase_host = '[' ~ instance_parameter_dict['ipv6-random'] ~ ']' %}
-{% set caucase_netloc = caucase_host ~ ':' ~ instance_parameter_dict['configuration.caucase_backend_client_port'] %}
-{% set caucase_url = 'http://' ~ caucase_netloc %}
 [jinja2-template-base]
 recipe = slapos.recipe.template:jinja2
 output = ${buildout:directory}/${:filename}
@@ -172,8 +165,6 @@ context =
 {%   if 'enable-http3' not in config_dict %}
 {%     do config_dict.__setitem__('enable-http3', slapparameter_dict.get('enable-http3') or NODE_DEFAULT_KEY_VALUE['enable-http3']) %}
 {%   endif %}
-{%   do config_dict.__setitem__('monitor-httpd-port', frontend_monitor_httpd_base_port + i) %}
-{%   do config_dict.__setitem__('backend-client-caucase-url', caucase_url) %}
 {%   set state_key = "-frontend-%s-state" % i %}
 {%   set frontend_state = slapparameter_dict.pop(state_key, None) %}
 {%   if frontend_state != 'destroyed' %}
@@ -376,9 +367,6 @@ context =
 {% endfor %}
 {% do authorized_slave_list.sort(key=operator_module.itemgetter('slave_reference')) %}
 
-[monitor-instance-parameter]
-monitor-httpd-port = {{ master_partition_monitor_monitor_httpd_port }}
-
 [replicate]
 <= slap-connection
 recipe = slapos.cookbook:requestoptional.serialised
@@ -409,7 +397,7 @@ state = {{ state }}
 {%   if state != 'destroyed' %}
 config-slave-kedifa-information = ${request-kedifa:connection-slave-kedifa-information}
 config-kedifa-caucase-url = ${request-kedifa:connection-caucase-url}
-config-backend-client-caucase-url = {{ caucase_url }}
+config-backend-client-caucase-url = ${caucased-backend-client-netloc:caucase_url}
 config-master-key-download-url = ${request-kedifa:connection-master-key-download-url}
 config-cluster-identification = {{ instance_parameter_dict['root-instance-title'] }}
 {%     set node_configuration_dict = {} %}
@@ -448,7 +436,7 @@ domain = {{ slapparameter_dict.get('domain') }}
 slave-amount = {{ instance_parameter_dict['slave-instance-list'] | length }}
 accepted-slave-amount = {{ authorized_slave_list | length }}
 rejected-slave-amount = {{ rejected_slave_dict | length }}
-backend-client-caucase-url = {{ caucase_url }}
+backend-client-caucase-url = ${caucased-backend-client-netloc:caucase_url}
 {# sort_keys are important in order to avoid shuffling parameters on each run #}
 rejected-slave-dict = {{ dumps(json_module.dumps(rejected_slave_dict, sort_keys=True)) }}
 rejected-slave-promise-url = ${rejected-slave-promise:config-url}
@@ -520,12 +508,6 @@ recipe = slapos.cookbook:requestoptional.serialised
 config-monitor-cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.app.officejs.com') }}
 config-monitor-username = ${monitor-instance-parameter:username}
 config-monitor-password = ${monitor-htpasswd:passwd}
-config-monitor-httpd-port = {{ kedifa_partition_monitor_httpd_port }}
-{% for key in ['kedifa_port', 'caucase_port'] -%}
-{%-   if key in slapparameter_dict %}
-config-{{ key }} = {{ dumps(slapparameter_dict[key]) }}
-{%-   endif %}
-{%- endfor %}
 config-slave-list = {{ dumps(authorized_slave_list) }}
 config-cluster-identification = {{ instance_parameter_dict['root-instance-title'] }}
 
@@ -734,7 +716,7 @@ update-command = ${:command}
 aibcc = ${:srv}/aibcc
 
 [aibcc-config]
-caucase-url = {{ caucase_url }}
+caucase-url = ${caucased-backend-client-netloc:caucase_url}
 
 csr = ${directory:aibcc}/csr.pem
 key = ${directory:aibcc}/key.pem
@@ -1047,6 +1029,16 @@ key = ${request-kedifa:connection-master-key-download-url}
 <= master-key-upload-url-ready-promise
 config-filename = ${master-key-download-url-ready:output}
 
+[caucased-backend-client-port]
+recipe = slapos.cookbook:free_port
+ip = {{ instance_parameter_dict['ipv6-random'] }}
+minimum = 8900
+maximum = 8950
+
+[caucased-backend-client-netloc]
+netloc = [${caucased-backend-client-port:ip}]:${caucased-backend-client-port:port}
+caucase_url = http://${:netloc}
+
 [caucased-backend-client]
 hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
 {{  caucase.caucased(
@@ -1055,7 +1047,7 @@ hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
       caucased_path='${directory:service}/caucased-backend-client',
       backup_dir='${directory:backup-caucased}',
       data_dir='${directory:caucased}',
-      netloc=caucase_netloc,
+      netloc='${caucased-backend-client-netloc:netloc}',
       tmp='${directory:tmp}',
       service_auto_approve_count=0,
       user_auto_approve_count=1,

software/rapid-cdn/instance.cfg.in

@@ -83,12 +83,6 @@ cert = ${slap-connection:cert-file}
 configuration.domain = example.org
 configuration.port = 4443
 configuration.plain_http_port = 8080
-configuration.plain_nginx_port = 8081
-configuration.nginx_port = 9443
-configuration.kedifa_port = 7879
-# Warning: Caucase takes also cacuase_port+1
-configuration.caucase_port = 8890
-configuration.caucase_backend_client_port = 8990
 configuration.apache-key =
 configuration.apache-certificate =
 configuration.disk-cache-size = 8G
@@ -102,9 +96,5 @@ configuration.request-timeout = 600
 configuration.frontend-name =
 configuration.backend-connect-timeout = 5
 configuration.backend-connect-retries = 3
-configuration.backend-haproxy-http-port = 21080
-configuration.backend-haproxy-https-port = 21443
-configuration.backend-haproxy-statistic-port = 21444
 configuration.authenticate-to-backend = False
 configuration.rotate-num = 4000
-configuration.slave-introspection-https-port = 22443

software/rapid-cdn/test/test.py

@@ -79,8 +79,6 @@ else:
 # ports chosen to not collide with test systems
 HTTP_PORT = '11080'
 HTTPS_PORT = '11443'
-CAUCASE_PORT = '15090'
-KEDIFA_PORT = '15080'
 
 # IP to originate requests from
 # has to be not partition one
@@ -1063,9 +1061,7 @@ class HttpFrontendTestCase(SlapOSInstanceTestCase):
     generate_auth_url = parameter_dict.pop('%skey-generate-auth-url' % (
       prefix,))
     upload_url = parameter_dict.pop('%skey-upload-url' % (prefix,))
-    kedifa_ipv6_base = 'https://[%s]:%s' % (self._ipv6_address, KEDIFA_PORT)
-    base = '^' + kedifa_ipv6_base.replace(
-      '[', r'\[').replace(']', r'\]') + '/.{32}'
+    base = r'https://\[%s\]:\d+/.{32}' % (self._ipv6_address,)
     self.assertRegex(
       generate_auth_url,
       base + r'\/generateauth$'
@@ -1075,11 +1071,7 @@ class HttpFrontendTestCase(SlapOSInstanceTestCase):
       base + r'\?auth=$'
     )
 
-    kedifa_caucase_url = parameter_dict.pop('kedifa-caucase-url')
-    self.assertEqual(
-      kedifa_caucase_url,
-      'http://[%s]:%s' % (self._ipv6_address, CAUCASE_PORT),
-    )
+    self.assertNotEqual(None, parameter_dict.pop('kedifa-caucase-url'))
 
     return generate_auth_url, upload_url
 
@@ -1372,6 +1364,10 @@ class SlaveHttpFrontendTestCase(HttpFrontendTestCase):
     self.current_generate_auth, self.current_upload_url = \
         self.assertKedifaKeysWithPop(parameter_dict, '')
     self.assertNodeInformationWithPop(parameter_dict)
+    self.assertRegex(
+      parameter_dict.pop('backend-client-caucase-url'),
+      r'http://\[%s\]:\d+' % (self._ipv6_address,)
+    )
     if hostname is None:
       hostname = reference.replace('_', '').replace('-', '').lower()
     expected_parameter_dict.update(**{
@@ -1380,7 +1376,6 @@ class SlaveHttpFrontendTestCase(HttpFrontendTestCase):
       'url': 'http://%s.example.com' % (hostname, ),
       'site_url': 'http://%s.example.com' % (hostname, ),
       'secure_access': 'https://%s.example.com' % (hostname, ),
-      'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
     })
     self.assertEqual(
       expected_parameter_dict,
@@ -1414,8 +1409,6 @@ class TestMasterRequestDomain(HttpFrontendTestCase, TestDataMixin):
       'domain': 'example.com',
       'port': HTTPS_PORT,
       'plain_http_port': HTTP_PORT,
-      'kedifa_port': KEDIFA_PORT,
-      'caucase_port': CAUCASE_PORT,
     }
 
   def test(self):
@@ -1447,8 +1440,6 @@ class TestMasterRequest(HttpFrontendTestCase, TestDataMixin):
     return {
       'port': HTTPS_PORT,
       'plain_http_port': HTTP_PORT,
-      'kedifa_port': KEDIFA_PORT,
-      'caucase_port': CAUCASE_PORT,
     }
 
   def test(self):
@@ -1479,8 +1470,6 @@ class TestMasterAIKCDisabledAIBCCDisabledRequest(
     return {
       'port': HTTPS_PORT,
       'plain_http_port': HTTP_PORT,
-      'kedifa_port': KEDIFA_PORT,
-      'caucase_port': CAUCASE_PORT,
       'automatic-internal-kedifa-caucase-csr': 'false',
       'automatic-internal-backend-client-caucase-csr': 'false',
     }
@@ -1593,8 +1582,6 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin):
     'domain': 'example.com',
     'port': HTTPS_PORT,
     'plain_http_port': HTTP_PORT,
-    'kedifa_port': KEDIFA_PORT,
-    'caucase_port': CAUCASE_PORT,
     'request-timeout': '12',
   }
   max_client_version = '2.0'
@@ -4728,8 +4715,6 @@ class TestSlaveHttp3(TestSlave):
     'domain': 'example.com',
     'port': HTTPS_PORT,
     'plain_http_port': HTTP_PORT,
-    'kedifa_port': KEDIFA_PORT,
-    'caucase_port': CAUCASE_PORT,
     'request-timeout': '12',
     'enable-http3': 'True',
     'http3-port': HTTPS_PORT,
@@ -4748,8 +4733,6 @@ class TestEnableHttp2ByDefaultFalseSlave(TestSlave):
     'domain': 'example.com',
     'port': HTTPS_PORT,
     'plain_http_port': HTTP_PORT,
-    'kedifa_port': KEDIFA_PORT,
-    'caucase_port': CAUCASE_PORT,
     'request-timeout': '12',
     'enable-http2-by-default': 'false',
   }
@@ -4767,8 +4750,6 @@ class TestReplicateSlave(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin):
       'domain': 'example.com',
       'port': HTTPS_PORT,
       'plain_http_port': HTTP_PORT,
-      'kedifa_port': KEDIFA_PORT,
-      'caucase_port': CAUCASE_PORT,
     }
 
   @classmethod
@@ -4876,8 +4857,6 @@ class TestReplicateSlaveOtherDestroyed(SlaveHttpFrontendTestCase):
       'domain': 'example.com',
       'port': HTTPS_PORT,
       'plain_http_port': HTTP_PORT,
-      'kedifa_port': KEDIFA_PORT,
-      'caucase_port': CAUCASE_PORT,
     }
 
   @classmethod
@@ -4938,8 +4917,6 @@ class TestRe6stVerificationUrlDefaultSlave(SlaveHttpFrontendTestCase,
       'domain': 'example.com',
       'port': HTTPS_PORT,
       'plain_http_port': HTTP_PORT,
-      'kedifa_port': KEDIFA_PORT,
-      'caucase_port': CAUCASE_PORT,
     }
 
   @classmethod
@@ -4981,8 +4958,6 @@ class TestRe6stVerificationUrlSlave(SlaveHttpFrontendTestCase,
       'port': HTTPS_PORT,
       'domain': 'example.com',
       'plain_http_port': HTTP_PORT,
-      'kedifa_port': KEDIFA_PORT,
-      'caucase_port': CAUCASE_PORT,
     }
 
   @classmethod
@@ -5055,8 +5030,6 @@ class TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster(
       'apache-key': cls.key_pem,
       'port': HTTPS_PORT,
       'plain_http_port': HTTP_PORT,
-      'kedifa_port': KEDIFA_PORT,
-      'caucase_port': CAUCASE_PORT,
     }
 
   @classmethod
@@ -5213,8 +5186,6 @@ class TestSlaveSlapOSMasterCertificateCompatibility(
       'apache-key': cls.key_pem,
       'port': HTTPS_PORT,
       'plain_http_port': HTTP_PORT,
-      'kedifa_port': KEDIFA_PORT,
-      'caucase_port': CAUCASE_PORT,
     }
 
   @classmethod
@@ -5771,8 +5742,6 @@ class TestSlaveSlapOSMasterCertificateCompatibilityUpdate(
     'domain': 'example.com',
     'port': HTTPS_PORT,
     'plain_http_port': HTTP_PORT,
-    'kedifa_port': KEDIFA_PORT,
-    'caucase_port': CAUCASE_PORT,
   }
 
   @classmethod
@@ -5866,8 +5835,6 @@ class TestSlaveCiphers(SlaveHttpFrontendTestCase, TestDataMixin):
       'domain': 'example.com',
       'port': HTTPS_PORT,
       'plain_http_port': HTTP_PORT,
-      'kedifa_port': KEDIFA_PORT,
-      'caucase_port': CAUCASE_PORT,
       'ciphers': 'ECDHE-ECDSA-AES256-GCM-SHA384 ECDHE-RSA-AES256-GCM-SHA384'
     }
 
@@ -5974,8 +5941,6 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase):
       'domain': 'example.com',
       'port': HTTPS_PORT,
       'plain_http_port': HTTP_PORT,
-      'kedifa_port': KEDIFA_PORT,
-      'caucase_port': CAUCASE_PORT,
     }
 
   @classmethod
@@ -6508,8 +6473,6 @@ class TestSlaveHostHaproxyClash(SlaveHttpFrontendTestCase, TestDataMixin):
       'domain': 'example.com',
       'port': HTTPS_PORT,
       'plain_http_port': HTTP_PORT,
-      'kedifa_port': KEDIFA_PORT,
-      'caucase_port': CAUCASE_PORT,
       'request-timeout': '12',
     }
 
@@ -6586,8 +6549,6 @@ class TestPassedRequestParameter(HttpFrontendTestCase):
   instance_parameter_dict = {
       'port': HTTPS_PORT,
       'plain_http_port': HTTP_PORT,
-      'kedifa_port': KEDIFA_PORT,
-      'caucase_port': CAUCASE_PORT,
   }
 
   @classmethod
@@ -6831,8 +6792,6 @@ class TestSlaveHealthCheck(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin):
       'domain': 'example.com',
       'port': HTTPS_PORT,
       'plain_http_port': HTTP_PORT,
-      'kedifa_port': KEDIFA_PORT,
-      'caucase_port': CAUCASE_PORT,
       'request-timeout': '12',
     }
 

software/rapid-cdn/test/test_data/test.TestMasterAIKCDisabledAIBCCDisabledRequest.test00cluster_request_instance_parameter_dict.txt

@@ -2,7 +2,6 @@
   {
     "automatic-internal-backend-client-caucase-csr": "false",
     "automatic-internal-kedifa-caucase-csr": "false",
-    "caucase_port": "15090",
     "full_address_list": [],
     "instance_title": "testing partition 0",
     "ip_list": [
@@ -15,7 +14,6 @@
         "@@_ipv6_address@@"
       ]
     ],
-    "kedifa_port": "15080",
     "plain_http_port": "11080",
     "port": "11443",
     "root_instance_title": "testing partition 0",
@@ -28,11 +26,8 @@
   },
   {
     "_": {
-      "caucase_port": "15090",
       "cluster-identification": "testing partition 0",
-      "kedifa_port": "15080",
       "monitor-cors-domains": "monitor.app.officejs.com",
-      "monitor-httpd-port": "8402",
       "monitor-password": "@@monitor-password@@",
       "monitor-username": "admin",
       "slave-list": []
@@ -59,16 +54,15 @@
   },
   {
     "_": {
-      "backend-client-caucase-url": "http://[@@_ipv6_address@@]:8990",
+      "backend-client-caucase-url": "http://[@@_ipv6_address@@]:8900",
       "cluster-identification": "testing partition 0",
       "enable-http3": "false",
       "extra_slave_instance_list": "[]",
       "frontend-name": "caddy-frontend-1",
       "http3-port": "443",
-      "kedifa-caucase-url": "http://[@@_ipv6_address@@]:15090",
-      "master-key-download-url": "https://[@@_ipv6_address@@]:15080/@@master-key-download-url_endpoint@@",
+      "kedifa-caucase-url": "http://[@@_ipv6_address@@]:8800",
+      "master-key-download-url": "https://[@@_ipv6_address@@]:7850/@@master-key-download-url_endpoint@@",
       "monitor-cors-domains": "monitor.app.officejs.com",
-      "monitor-httpd-port": 8411,
       "monitor-password": "@@monitor-password@@",
       "monitor-username": "admin",
       "plain_http_port": "11080",

software/rapid-cdn/test/test_data/test.TestMasterRequest.test00cluster_request_instance_parameter_dict.txt

 [
   {
-    "caucase_port": "15090",
     "full_address_list": [],
     "instance_title": "testing partition 0",
     "ip_list": [
@@ -13,7 +12,6 @@
         "@@_ipv6_address@@"
       ]
     ],
-    "kedifa_port": "15080",
     "plain_http_port": "11080",
     "port": "11443",
     "root_instance_title": "testing partition 0",
@@ -26,11 +24,8 @@
   },
   {
     "_": {
-      "caucase_port": "15090",
       "cluster-identification": "testing partition 0",
-      "kedifa_port": "15080",
       "monitor-cors-domains": "monitor.app.officejs.com",
-      "monitor-httpd-port": "8402",
       "monitor-password": "@@monitor-password@@",
       "monitor-username": "admin",
       "slave-list": []
@@ -57,16 +52,15 @@
   },
   {
     "_": {
-      "backend-client-caucase-url": "http://[@@_ipv6_address@@]:8990",
+      "backend-client-caucase-url": "http://[@@_ipv6_address@@]:8900",
       "cluster-identification": "testing partition 0",
       "enable-http3": "false",
       "extra_slave_instance_list": "[]",
       "frontend-name": "caddy-frontend-1",
       "http3-port": "443",
-      "kedifa-caucase-url": "http://[@@_ipv6_address@@]:15090",
-      "master-key-download-url": "https://[@@_ipv6_address@@]:15080/@@master-key-download-url_endpoint@@",
+      "kedifa-caucase-url": "http://[@@_ipv6_address@@]:8800",
+      "master-key-download-url": "https://[@@_ipv6_address@@]:7850/@@master-key-download-url_endpoint@@",
       "monitor-cors-domains": "monitor.app.officejs.com",
-      "monitor-httpd-port": 8411,
       "monitor-password": "@@monitor-password@@",
       "monitor-username": "admin",
       "plain_http_port": "11080",

software/rapid-cdn/test/test_data/test.TestMasterRequestDomain.test00cluster_request_instance_parameter_dict.txt

 [
   {
-    "caucase_port": "15090",
     "domain": "example.com",
     "full_address_list": [],
     "instance_title": "testing partition 0",
@@ -14,7 +13,6 @@
         "@@_ipv6_address@@"
       ]
     ],
-    "kedifa_port": "15080",
     "plain_http_port": "11080",
     "port": "11443",
     "root_instance_title": "testing partition 0",
@@ -27,11 +25,8 @@
   },
   {
     "_": {
-      "caucase_port": "15090",
       "cluster-identification": "testing partition 0",
-      "kedifa_port": "15080",
       "monitor-cors-domains": "monitor.app.officejs.com",
-      "monitor-httpd-port": "8402",
       "monitor-password": "@@monitor-password@@",
       "monitor-username": "admin",
       "slave-list": []
@@ -58,17 +53,16 @@
   },
   {
     "_": {
-      "backend-client-caucase-url": "http://[@@_ipv6_address@@]:8990",
+      "backend-client-caucase-url": "http://[@@_ipv6_address@@]:8900",
       "cluster-identification": "testing partition 0",
       "domain": "example.com",
       "enable-http3": "false",
       "extra_slave_instance_list": "[]",
       "frontend-name": "caddy-frontend-1",
       "http3-port": "443",
-      "kedifa-caucase-url": "http://[@@_ipv6_address@@]:15090",
-      "master-key-download-url": "https://[@@_ipv6_address@@]:15080/@@master-key-download-url_endpoint@@",
+      "kedifa-caucase-url": "http://[@@_ipv6_address@@]:8800",
+      "master-key-download-url": "https://[@@_ipv6_address@@]:7850/@@master-key-download-url_endpoint@@",
       "monitor-cors-domains": "monitor.app.officejs.com",
-      "monitor-httpd-port": 8411,
       "monitor-password": "@@monitor-password@@",
       "monitor-username": "admin",
       "plain_http_port": "11080",

software/rapid-cdn/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test00cluster_request_instance_parameter_dict.txt

 [
   {
-    "caucase_port": "15090",
     "domain": "example.com",
     "full_address_list": [],
     "instance_title": "testing partition 0",
@@ -14,7 +13,6 @@
         "@@_ipv6_address@@"
       ]
     ],
-    "kedifa_port": "15080",
     "plain_http_port": "11080",
     "port": "11443",
     "root_instance_title": "testing partition 0",
@@ -35,11 +33,8 @@
   },
   {
     "_": {
-      "caucase_port": "15090",
       "cluster-identification": "testing partition 0",
-      "kedifa_port": "15080",
       "monitor-cors-domains": "monitor.app.officejs.com",
-      "monitor-httpd-port": "8402",
       "monitor-password": "@@monitor-password@@",
       "monitor-username": "admin",
       "slave-list": [
@@ -72,22 +67,21 @@
   },
   {
     "_": {
-      "backend-client-caucase-url": "http://[@@_ipv6_address@@]:8990",
+      "backend-client-caucase-url": "http://[@@_ipv6_address@@]:8900",
       "cluster-identification": "testing partition 0",
       "domain": "example.com",
       "enable-http3": "false",
       "extra_slave_instance_list": "[{\"enable_cache\": true, \"slave_reference\": \"_default\", \"url\": \"http://@@_ipv4_address@@:@@_server_http_port@@/\"}]",
       "frontend-name": "caddy-frontend-1",
       "http3-port": "443",
-      "kedifa-caucase-url": "http://[@@_ipv6_address@@]:15090",
-      "master-key-download-url": "https://[@@_ipv6_address@@]:15080/@@master-key-download-url_endpoint@@",
+      "kedifa-caucase-url": "http://[@@_ipv6_address@@]:8800",
+      "master-key-download-url": "https://[@@_ipv6_address@@]:7851/@@master-key-download-url_endpoint@@",
       "monitor-cors-domains": "monitor.app.officejs.com",
-      "monitor-httpd-port": 8411,
       "monitor-password": "@@monitor-password@@",
       "monitor-username": "admin",
       "plain_http_port": "11080",
       "port": "11443",
-      "slave-kedifa-information": "{\"_default\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:15090\", \"key-download-url\": \"https://[@@_ipv6_address@@]:15080/@@default_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:15080/@@default_key-generate-auth-url@@/@@default_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:15080/@@default_key-generate-auth-url@@?auth=\"}}"
+      "slave-kedifa-information": "{\"_default\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:8800\", \"key-download-url\": \"https://[@@_ipv6_address@@]:7851/@@default_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:7851/@@default_key-generate-auth-url@@/@@default_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:7851/@@default_key-generate-auth-url@@?auth=\"}}"
     },
     "full_address_list": [],
     "instance_title": "caddy-frontend-1",

software/rapid-cdn/test/test_data/test.TestRe6stVerificationUrlSlave.test00cluster_request_instance_parameter_dict.txt

 [
   {
-    "caucase_port": "15090",
     "domain": "example.com",
     "full_address_list": [],
     "instance_title": "testing partition 0",
@@ -14,7 +13,6 @@
         "@@_ipv6_address@@"
       ]
     ],
-    "kedifa_port": "15080",
     "plain_http_port": "11080",
     "port": "11443",
     "root_instance_title": "testing partition 0",
@@ -35,11 +33,8 @@
   },
   {
     "_": {
-      "caucase_port": "15090",
       "cluster-identification": "testing partition 0",
-      "kedifa_port": "15080",
       "monitor-cors-domains": "monitor.app.officejs.com",
-      "monitor-httpd-port": "8402",
       "monitor-password": "@@monitor-password@@",
       "monitor-username": "admin",
       "slave-list": [
@@ -72,22 +67,21 @@
   },
   {
     "_": {
-      "backend-client-caucase-url": "http://[@@_ipv6_address@@]:8990",
+      "backend-client-caucase-url": "http://[@@_ipv6_address@@]:8900",
       "cluster-identification": "testing partition 0",
       "domain": "example.com",
       "enable-http3": "false",
       "extra_slave_instance_list": "[{\"enable_cache\": true, \"slave_reference\": \"_default\", \"url\": \"http://@@_ipv4_address@@:@@_server_http_port@@/\"}]",
       "frontend-name": "caddy-frontend-1",
       "http3-port": "443",
-      "kedifa-caucase-url": "http://[@@_ipv6_address@@]:15090",
-      "master-key-download-url": "https://[@@_ipv6_address@@]:15080/@@master-key-download-url_endpoint@@",
+      "kedifa-caucase-url": "http://[@@_ipv6_address@@]:8800",
+      "master-key-download-url": "https://[@@_ipv6_address@@]:7850/@@master-key-download-url_endpoint@@",
       "monitor-cors-domains": "monitor.app.officejs.com",
-      "monitor-httpd-port": 8411,
       "monitor-password": "@@monitor-password@@",
       "monitor-username": "admin",
       "plain_http_port": "11080",
       "port": "11443",
-      "slave-kedifa-information": "{\"_default\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:15090\", \"key-download-url\": \"https://[@@_ipv6_address@@]:15080/@@default_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:15080/@@default_key-generate-auth-url@@/@@default_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:15080/@@default_key-generate-auth-url@@?auth=\"}}"
+      "slave-kedifa-information": "{\"_default\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:8800\", \"key-download-url\": \"https://[@@_ipv6_address@@]:7850/@@default_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:7850/@@default_key-generate-auth-url@@/@@default_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:7850/@@default_key-generate-auth-url@@?auth=\"}}"
     },
     "full_address_list": [],
     "instance_title": "caddy-frontend-1",

software/rapid-cdn/test/test_data/test.TestReplicateSlave.test00cluster_request_instance_parameter_dict.txt

@@ -4,7 +4,6 @@
     "-frontend-2-state": "stopped",
     "-frontend-quantity": "2",
     "-sla-2-computer_guid": "local",
-    "caucase_port": "15090",
     "domain": "example.com",
     "full_address_list": [],
     "instance_title": "testing partition 0",
@@ -18,7 +17,6 @@
         "@@_ipv6_address@@"
       ]
     ],
-    "kedifa_port": "15080",
     "plain_http_port": "11080",
     "port": "11443",
     "root_instance_title": "testing partition 0",
@@ -39,11 +37,8 @@
   },
   {
     "_": {
-      "caucase_port": "15090",
       "cluster-identification": "testing partition 0",
-      "kedifa_port": "15080",
       "monitor-cors-domains": "monitor.app.officejs.com",
-      "monitor-httpd-port": "8402",
       "monitor-password": "@@monitor-password@@",
       "monitor-username": "admin",
       "slave-list": [
@@ -76,22 +71,21 @@
   },
   {
     "_": {
-      "backend-client-caucase-url": "http://[@@_ipv6_address@@]:8990",
+      "backend-client-caucase-url": "http://[@@_ipv6_address@@]:8900",
       "cluster-identification": "testing partition 0",
       "domain": "example.com",
       "enable-http3": "false",
       "extra_slave_instance_list": "[{\"enable_cache\": true, \"slave_reference\": \"_replicate\", \"url\": \"http://@@_ipv4_address@@:@@_server_http_port@@/\"}]",
       "frontend-name": "caddy-frontend-1",
       "http3-port": "443",
-      "kedifa-caucase-url": "http://[@@_ipv6_address@@]:15090",
-      "master-key-download-url": "https://[@@_ipv6_address@@]:15080/@@master-key-download-url_endpoint@@",
+      "kedifa-caucase-url": "http://[@@_ipv6_address@@]:8800",
+      "master-key-download-url": "https://[@@_ipv6_address@@]:7851/@@master-key-download-url_endpoint@@",
       "monitor-cors-domains": "monitor.app.officejs.com",
-      "monitor-httpd-port": 8411,
       "monitor-password": "@@monitor-password@@",
       "monitor-username": "admin",
       "plain_http_port": "11080",
       "port": "11443",
-      "slave-kedifa-information": "{\"_replicate\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:15090\", \"key-download-url\": \"https://[@@_ipv6_address@@]:15080/@@replicate_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:15080/@@replicate_key-generate-auth-url@@/@@replicate_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:15080/@@replicate_key-generate-auth-url@@?auth=\"}}"
+      "slave-kedifa-information": "{\"_replicate\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:8800\", \"key-download-url\": \"https://[@@_ipv6_address@@]:7851/@@replicate_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:7851/@@replicate_key-generate-auth-url@@/@@replicate_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:7851/@@replicate_key-generate-auth-url@@?auth=\"}}"
     },
     "full_address_list": [],
     "instance_title": "caddy-frontend-1",
@@ -115,22 +109,21 @@
   },
   {
     "_": {
-      "backend-client-caucase-url": "http://[@@_ipv6_address@@]:8990",
+      "backend-client-caucase-url": "http://[@@_ipv6_address@@]:8900",
       "cluster-identification": "testing partition 0",
       "domain": "example.com",
       "enable-http3": "false",
       "extra_slave_instance_list": "[{\"enable_cache\": true, \"slave_reference\": \"_replicate\", \"url\": \"http://@@_ipv4_address@@:@@_server_http_port@@/\"}]",
       "frontend-name": "caddy-frontend-2",
       "http3-port": "443",
-      "kedifa-caucase-url": "http://[@@_ipv6_address@@]:15090",
-      "master-key-download-url": "https://[@@_ipv6_address@@]:15080/@@master-key-download-url_endpoint@@",
+      "kedifa-caucase-url": "http://[@@_ipv6_address@@]:8800",
+      "master-key-download-url": "https://[@@_ipv6_address@@]:7851/@@master-key-download-url_endpoint@@",
       "monitor-cors-domains": "monitor.app.officejs.com",
-      "monitor-httpd-port": 8412,
       "monitor-password": "@@monitor-password@@",
       "monitor-username": "admin",
       "plain_http_port": "11080",
       "port": "11443",
-      "slave-kedifa-information": "{\"_replicate\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:15090\", \"key-download-url\": \"https://[@@_ipv6_address@@]:15080/@@replicate_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:15080/@@replicate_key-generate-auth-url@@/@@replicate_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:15080/@@replicate_key-generate-auth-url@@?auth=\"}}"
+      "slave-kedifa-information": "{\"_replicate\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:8800\", \"key-download-url\": \"https://[@@_ipv6_address@@]:7851/@@replicate_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:7851/@@replicate_key-generate-auth-url@@/@@replicate_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:7851/@@replicate_key-generate-auth-url@@?auth=\"}}"
     },
     "full_address_list": [],
     "instance_title": "caddy-frontend-2",

software/rapid-cdn/test/test_data/test.TestSlaveCiphers.test00cluster_request_instance_parameter_dict.txt

 [
   {
-    "caucase_port": "15090",
     "ciphers": "ECDHE-ECDSA-AES256-GCM-SHA384 ECDHE-RSA-AES256-GCM-SHA384",
     "domain": "example.com",
     "full_address_list": [],
@@ -15,7 +14,6 @@
         "@@_ipv6_address@@"
       ]
     ],
-    "kedifa_port": "15080",
     "plain_http_port": "11080",
     "port": "11443",
     "root_instance_title": "testing partition 0",
@@ -44,11 +42,8 @@
   },
   {
     "_": {
-      "caucase_port": "15090",
       "cluster-identification": "testing partition 0",
-      "kedifa_port": "15080",
       "monitor-cors-domains": "monitor.app.officejs.com",
-      "monitor-httpd-port": "8402",
       "monitor-password": "@@monitor-password@@",
       "monitor-username": "admin",
       "slave-list": [
@@ -87,7 +82,7 @@
   },
   {
     "_": {
-      "backend-client-caucase-url": "http://[@@_ipv6_address@@]:8990",
+      "backend-client-caucase-url": "http://[@@_ipv6_address@@]:8900",
       "ciphers": "ECDHE-ECDSA-AES256-GCM-SHA384 ECDHE-RSA-AES256-GCM-SHA384",
       "cluster-identification": "testing partition 0",
       "domain": "example.com",
@@ -95,15 +90,14 @@
       "extra_slave_instance_list": "[{\"enable_cache\": true, \"slave_reference\": \"_default_ciphers\", \"url\": \"http://@@_ipv4_address@@:@@_server_http_port@@/\"}, {\"ciphers\": \"ECDHE-ECDSA-AES128-GCM-SHA256 ECDHE-RSA-AES128-GCM-SHA256\", \"enable_cache\": true, \"slave_reference\": \"_own_ciphers\", \"url\": \"http://@@_ipv4_address@@:@@_server_http_port@@/\"}]",
       "frontend-name": "caddy-frontend-1",
       "http3-port": "443",
-      "kedifa-caucase-url": "http://[@@_ipv6_address@@]:15090",
-      "master-key-download-url": "https://[@@_ipv6_address@@]:15080/@@master-key-download-url_endpoint@@",
+      "kedifa-caucase-url": "http://[@@_ipv6_address@@]:8800",
+      "master-key-download-url": "https://[@@_ipv6_address@@]:7850/@@master-key-download-url_endpoint@@",
       "monitor-cors-domains": "monitor.app.officejs.com",
-      "monitor-httpd-port": 8411,
       "monitor-password": "@@monitor-password@@",
       "monitor-username": "admin",
       "plain_http_port": "11080",
       "port": "11443",
-      "slave-kedifa-information": "{\"_default_ciphers\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:15090\", \"key-download-url\": \"https://[@@_ipv6_address@@]:15080/@@default_ciphers_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:15080/@@default_ciphers_key-generate-auth-url@@/@@default_ciphers_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:15080/@@default_ciphers_key-generate-auth-url@@?auth=\"}, \"_own_ciphers\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:15090\", \"key-download-url\": \"https://[@@_ipv6_address@@]:15080/@@own_ciphers_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:15080/@@own_ciphers_key-generate-auth-url@@/@@default_ciphers_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:15080/@@own_ciphers_key-generate-auth-url@@?auth=\"}}"
+      "slave-kedifa-information": "{\"_default_ciphers\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:8800\", \"key-download-url\": \"https://[@@_ipv6_address@@]:7850/@@default_ciphers_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:7850/@@default_ciphers_key-generate-auth-url@@/@@default_ciphers_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:7850/@@default_ciphers_key-generate-auth-url@@?auth=\"}, \"_own_ciphers\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:8800\", \"key-download-url\": \"https://[@@_ipv6_address@@]:7850/@@own_ciphers_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:7850/@@own_ciphers_key-generate-auth-url@@/@@default_ciphers_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:7850/@@own_ciphers_key-generate-auth-url@@?auth=\"}}"
     },
     "full_address_list": [],
     "instance_title": "caddy-frontend-1",

software/rapid-cdn/test/test_data/test.TestSlaveHostHaproxyClash.test00cluster_request_instance_parameter_dict.txt

 [
   {
-    "caucase_port": "15090",
     "domain": "example.com",
     "full_address_list": [],
     "instance_title": "testing partition 0",
@@ -14,7 +13,6 @@
         "@@_ipv6_address@@"
       ]
     ],
-    "kedifa_port": "15080",
     "plain_http_port": "11080",
     "port": "11443",
     "request-timeout": "12",
@@ -43,11 +41,8 @@
   },
   {
     "_": {
-      "caucase_port": "15090",
       "cluster-identification": "testing partition 0",
-      "kedifa_port": "15080",
       "monitor-cors-domains": "monitor.app.officejs.com",
-      "monitor-httpd-port": "8402",
       "monitor-password": "@@monitor-password@@",
       "monitor-username": "admin",
       "slave-list": [
@@ -85,23 +80,22 @@
   },
   {
     "_": {
-      "backend-client-caucase-url": "http://[@@_ipv6_address@@]:8990",
+      "backend-client-caucase-url": "http://[@@_ipv6_address@@]:8900",
       "cluster-identification": "testing partition 0",
       "domain": "example.com",
       "enable-http3": "false",
       "extra_slave_instance_list": "[{\"custom_domain\": \"*.alias1.example.com\", \"slave_reference\": \"_wildcard\", \"url\": \"http://@@_ipv4_address@@:@@_server_http_port@@/wildcard\"}, {\"custom_domain\": \"zspecific.alias1.example.com\", \"slave_reference\": \"_zspecific\", \"url\": \"http://@@_ipv4_address@@:@@_server_http_port@@/zspecific\"}]",
       "frontend-name": "caddy-frontend-1",
       "http3-port": "443",
-      "kedifa-caucase-url": "http://[@@_ipv6_address@@]:15090",
-      "master-key-download-url": "https://[@@_ipv6_address@@]:15080/@@master-key-download-url_endpoint@@",
+      "kedifa-caucase-url": "http://[@@_ipv6_address@@]:8800",
+      "master-key-download-url": "https://[@@_ipv6_address@@]:7850/@@master-key-download-url_endpoint@@",
       "monitor-cors-domains": "monitor.app.officejs.com",
-      "monitor-httpd-port": 8411,
       "monitor-password": "@@monitor-password@@",
       "monitor-username": "admin",
       "plain_http_port": "11080",
       "port": "11443",
       "request-timeout": "12",
-      "slave-kedifa-information": "{\"_wildcard\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:15090\", \"key-download-url\": \"https://[@@_ipv6_address@@]:15080/@@wildcard_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:15080/@@wildcard_key-generate-auth-url@@/@@wildcard_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:15080/@@wildcard_key-generate-auth-url@@?auth=\"}, \"_zspecific\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:15090\", \"key-download-url\": \"https://[@@_ipv6_address@@]:15080/@@zspecific_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:15080/@@zspecific_key-generate-auth-url@@/@@wildcard_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:15080/@@zspecific_key-generate-auth-url@@?auth=\"}}"
+      "slave-kedifa-information": "{\"_wildcard\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:8800\", \"key-download-url\": \"https://[@@_ipv6_address@@]:7850/@@wildcard_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:7850/@@wildcard_key-generate-auth-url@@/@@wildcard_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:7850/@@wildcard_key-generate-auth-url@@?auth=\"}, \"_zspecific\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:8800\", \"key-download-url\": \"https://[@@_ipv6_address@@]:7850/@@zspecific_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:7850/@@zspecific_key-generate-auth-url@@/@@wildcard_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:7850/@@zspecific_key-generate-auth-url@@?auth=\"}}"
     },
     "full_address_list": [],
     "instance_title": "caddy-frontend-1",

software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test00cluster_request_instance_parameter_dict.txt

@@ -2,7 +2,6 @@
   {
     "apache-certificate": "@@certificate_pem@@",
     "apache-key": "@@key_pem@@",
-    "caucase_port": "15090",
     "domain": "example.com",
     "full_address_list": [],
     "instance_title": "testing partition 0",
@@ -16,7 +15,6 @@
         "@@_ipv6_address@@"
       ]
     ],
-    "kedifa_port": "15080",
     "plain_http_port": "11080",
     "port": "11443",
     "root_instance_title": "testing partition 0",
@@ -37,11 +35,8 @@
   },
   {
     "_": {
-      "caucase_port": "15090",
       "cluster-identification": "testing partition 0",
-      "kedifa_port": "15080",
       "monitor-cors-domains": "monitor.app.officejs.com",
-      "monitor-httpd-port": "8402",
       "monitor-password": "@@monitor-password@@",
       "monitor-username": "admin",
       "slave-list": [
@@ -76,22 +71,21 @@
     "_": {
       "apache-certificate": "@@certificate_pem@@",
       "apache-key": "@@key_pem@@",
-      "backend-client-caucase-url": "http://[@@_ipv6_address@@]:8990",
+      "backend-client-caucase-url": "http://[@@_ipv6_address@@]:8900",
       "cluster-identification": "testing partition 0",
       "domain": "example.com",
       "enable-http3": "false",
       "extra_slave_instance_list": "[{\"enable_cache\": true, \"slave_reference\": \"_ssl_from_master_kedifa_overrides_master_certificate\", \"url\": \"http://@@_ipv4_address@@:@@_server_http_port@@/\"}]",
       "frontend-name": "caddy-frontend-1",
       "http3-port": "443",
-      "kedifa-caucase-url": "http://[@@_ipv6_address@@]:15090",
-      "master-key-download-url": "https://[@@_ipv6_address@@]:15080/@@master-key-download-url_endpoint@@",
+      "kedifa-caucase-url": "http://[@@_ipv6_address@@]:8800",
+      "master-key-download-url": "https://[@@_ipv6_address@@]:7851/@@master-key-download-url_endpoint@@",
       "monitor-cors-domains": "monitor.app.officejs.com",
-      "monitor-httpd-port": 8411,
       "monitor-password": "@@monitor-password@@",
       "monitor-username": "admin",
       "plain_http_port": "11080",
       "port": "11443",
-      "slave-kedifa-information": "{\"_ssl_from_master_kedifa_overrides_master_certificate\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:15090\", \"key-download-url\": \"https://[@@_ipv6_address@@]:15080/@@ssl_from_master_kedifa_overrides_master_certificate_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:15080/@@ssl_from_master_kedifa_overrides_master_certificate_key-generate-auth-url@@/@@ssl_from_master_kedifa_overrides_master_certificate_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:15080/@@ssl_from_master_kedifa_overrides_master_certificate_key-generate-auth-url@@?auth=\"}}"
+      "slave-kedifa-information": "{\"_ssl_from_master_kedifa_overrides_master_certificate\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:8800\", \"key-download-url\": \"https://[@@_ipv6_address@@]:7851/@@ssl_from_master_kedifa_overrides_master_certificate_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:7851/@@ssl_from_master_kedifa_overrides_master_certificate_key-generate-auth-url@@/@@ssl_from_master_kedifa_overrides_master_certificate_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:7851/@@ssl_from_master_kedifa_overrides_master_certificate_key-generate-auth-url@@?auth=\"}}"
     },
     "full_address_list": [],
     "instance_title": "caddy-frontend-1",

software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test00cluster_request_instance_parameter_dict.txt

@@ -2,7 +2,6 @@
   {
     "apache-certificate": "@@certificate_pem@@",
     "apache-key": "@@key_pem@@",
-    "caucase_port": "15090",
     "domain": "example.com",
     "full_address_list": [],
     "instance_title": "testing partition 0",
@@ -16,7 +15,6 @@
         "@@_ipv6_address@@"
       ]
     ],
-    "kedifa_port": "15080",
     "plain_http_port": "11080",
     "port": "11443",
     "root_instance_title": "testing partition 0",
@@ -37,11 +35,8 @@
   },
   {
     "_": {
-      "caucase_port": "15090",
       "cluster-identification": "testing partition 0",
-      "kedifa_port": "15080",
       "monitor-cors-domains": "monitor.app.officejs.com",
-      "monitor-httpd-port": "8402",
       "monitor-password": "@@monitor-password@@",
       "monitor-username": "admin",
       "slave-list": [
@@ -76,22 +71,21 @@
     "_": {
       "apache-certificate": "@@certificate_pem@@",
       "apache-key": "@@key_pem@@",
-      "backend-client-caucase-url": "http://[@@_ipv6_address@@]:8990",
+      "backend-client-caucase-url": "http://[@@_ipv6_address@@]:8900",
       "cluster-identification": "testing partition 0",
       "domain": "example.com",
       "enable-http3": "false",
       "extra_slave_instance_list": "[{\"enable_cache\": true, \"slave_reference\": \"_ssl_from_master\", \"url\": \"http://@@_ipv4_address@@:@@_server_http_port@@/\"}]",
       "frontend-name": "caddy-frontend-1",
       "http3-port": "443",
-      "kedifa-caucase-url": "http://[@@_ipv6_address@@]:15090",
-      "master-key-download-url": "https://[@@_ipv6_address@@]:15080/@@master-key-download-url_endpoint@@",
+      "kedifa-caucase-url": "http://[@@_ipv6_address@@]:8800",
+      "master-key-download-url": "https://[@@_ipv6_address@@]:7850/@@master-key-download-url_endpoint@@",
       "monitor-cors-domains": "monitor.app.officejs.com",
-      "monitor-httpd-port": 8411,
       "monitor-password": "@@monitor-password@@",
       "monitor-username": "admin",
       "plain_http_port": "11080",
       "port": "11443",
-      "slave-kedifa-information": "{\"_ssl_from_master\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:15090\", \"key-download-url\": \"https://[@@_ipv6_address@@]:15080/@@ssl_from_master_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:15080/@@ssl_from_master_key-generate-auth-url@@/@@ssl_from_master_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:15080/@@ssl_from_master_key-generate-auth-url@@?auth=\"}}"
+      "slave-kedifa-information": "{\"_ssl_from_master\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:8800\", \"key-download-url\": \"https://[@@_ipv6_address@@]:7850/@@ssl_from_master_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:7850/@@ssl_from_master_key-generate-auth-url@@/@@ssl_from_master_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:7850/@@ssl_from_master_key-generate-auth-url@@?auth=\"}}"
     },
     "full_address_list": [],
     "instance_title": "caddy-frontend-1",