Update Release Candidate

software/caddy-frontend/buildout.hash.cfg

@@ -22,15 +22,15 @@ md5sum = 5784bea3bd608913769ff9a8afcccb68
 
 [profile-caddy-frontend]
 filename = instance-apache-frontend.cfg.in
-md5sum = 874133120f3a4eda1d0505b8608b280f
+md5sum = 75db32dd9b17c923b16420784dfba581
 
 [profile-caddy-replicate]
 filename = instance-apache-replicate.cfg.in
-md5sum = 5ae9b9c95042af3f65f1b1ff263eb3f9
+md5sum = e7209d9c66fd30e1fa950d2d07957b95
 
 [profile-slave-list]
 _update_hash_filename_ = templates/apache-custom-slave-list.cfg.in
-md5sum = 268a945e5c7a52c8766b54a817215c4c
+md5sum = 8028eff10acbc6e3415a50ffe534d424
 
 [profile-replicate-publish-slave-information]
 _update_hash_filename_ = templates/replicate-publish-slave-information.cfg.in
@@ -102,7 +102,7 @@ md5sum = 1c866272ec0ea0c161f0c0d80cb6e584
 
 [profile-kedifa]
 filename = instance-kedifa.cfg.in
-md5sum = 2f1c9cc9a3d2f4c6ac59eba5a99d4983
+md5sum = b757e0409ec3e70679a8fc4aab4a065f
 
 [template-backend-haproxy-rsyslogd-conf]
 _update_hash_filename_ = templates/backend-haproxy-rsyslogd.conf.in

software/caddy-frontend/instance-apache-frontend.cfg.in

@@ -356,6 +356,7 @@ organization = {{ slapparameter_dict['cluster-identification'] }}
 organizational-unit = {{ instance_parameter_dict['configuration.frontend-name'] }}
 backend-client-caucase-url = {{ slapparameter_dict['backend-client-caucase-url'] }}
 partition_ipv6 =  ${slap-configuration:ipv6-random}
+url-ready-file = ${directory:var}/url-ready.txt
 extra-context =
     key caddy_configuration_directory caddy-directory:slave-configuration
     key backend_client_caucase_url :backend-client-caucase-url
@@ -365,6 +366,7 @@ extra-context =
     key master_key_download_url :master_key_download_url
     key autocert caddy-directory:autocert
     key caddy_log_directory caddy-directory:slave-log
+    key url_ready_file :url-ready-file
     key expose_csr_organization :organization
     key expose_csr_organizational_unit :organizational-unit
     key global_ipv6 slap-configuration:ipv6-random

software/caddy-frontend/instance-apache-replicate.cfg.in

@@ -931,6 +931,44 @@ config-filename = ${rejected-slave-json:output}
 config-state = empty
 config-url = ${rejected-slave-publish:url}
 
+[master-key-upload-url-ready]
+recipe = slapos.recipe.build
+directory = ${directory:var}
+output = ${directory:var}/${:_buildout_section_name_}.txt
+key = ${request-kedifa:connection-master-key-upload-url}
+init =
+  import os
+  # protect against early init
+  if os.path.isdir(options['directory']):
+    with open(options['output'], 'w') as fh:
+      if 'NotReadyYet' in options['key']:
+        fh.write('NotReadyYet')
+      else:
+        fh.write('')
+
+[master-key-upload-url-ready-promise]
+<= monitor-promise-base
+promise = check_file_state
+name = ${:_buildout_section_name_}.py
+config-filename = ${master-key-upload-url-ready:output}
+config-state = empty
+
+[master-key-generate-auth-url-ready]
+<= master-key-upload-url-ready
+key = ${request-kedifa:connection-master-key-generate-auth-url}
+
+[master-key-generate-auth-url-ready-promise]
+<= master-key-upload-url-ready-promise
+config-filename = ${master-key-generate-auth-url-ready:output}
+
+[master-key-download-url-ready]
+<= master-key-upload-url-ready
+key = ${request-kedifa:connection-master-key-download-url}
+
+[master-key-download-url-ready-promise]
+<= master-key-upload-url-ready-promise
+config-filename = ${master-key-download-url-ready:output}
+
 [caucased-backend-client]
 hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
 {{  caucase.caucased(
@@ -959,6 +997,9 @@ parts =
   promise-rejected-slave-publish-ip-port
   caucased-backend-client
   caucased-backend-client-promise
+  master-key-upload-url-ready-promise
+  master-key-generate-auth-url-ready-promise
+  master-key-download-url-ready-promise
 {% for part in part_list %}
 {{ '  %s' % part }}
 {% endfor %}

software/caddy-frontend/instance-kedifa.cfg.in

@@ -19,6 +19,7 @@ parts =
   caucase-updater
   promise-expose-csr-ip-port
   promise-logrotate-setup
+  promise-kedifa-auth-ready
 
 [monitor-instance-parameter]
 # Note: Workaround for monitor stack, which uses monitor-httpd-port parameter
@@ -73,6 +74,9 @@ backup-caucased = ${:backup}/caucased
 # reservation
 reservation = ${:srv}/reservation
 
+# auth ready
+auth-ready = ${:var}/auth-ready
+
 # CSR publication
 expose-csr = ${:srv}/expose-csr
 expose-csr-etc = ${:etc}/expose-csr
@@ -278,12 +282,21 @@ update-command = ${:command}
 
 [auth-random]
 recipe = slapos.recipe.build
+directory = ${directory:auth-ready}
+auth-ready = ${directory:auth-ready}/${:_buildout_section_name_}
 init =
   import os
   options['passwd'] = 'NotReadyYet'
   if os.path.exists(options['file']):
     with open(options['file'], 'r') as fh:
       options['passwd'] = fh.read()
+    if os.path.exists(options['auth-ready']):
+      os.unlink(options['auth-ready'])
+  else:
+    # protect against too early init run - wait for directory to be created
+    if os.path.isdir(options['directory']):
+      with open(options['auth-ready'], 'w') as fh:
+        fh.write('')
 
 [master-auth-random]
 <= auth-random
@@ -308,4 +321,17 @@ name = ${:_buildout_section_name_}.py
 config-command =
   ${logrotate:wrapper-path} -d
 
+[kedifa-auth-ready]
+recipe = plone.recipe.command
+output = ${directory:var}/${:_buildout_section_name_}.txt
+update-command = ${:command}
+command = find ${directory:auth-ready} -type f > ${:output}
+
+[promise-kedifa-auth-ready]
+<= monitor-promise-base
+promise = check_file_state
+name = ${:_buildout_section_name_}.py
+config-filename = ${kedifa-auth-ready:output}
+config-state = empty
+
 {%- endif -%} {# if instance_parameter_dict['slap-software-type'] == software_type #}

software/caddy-frontend/templates/apache-custom-slave-list.cfg.in

@@ -551,6 +551,7 @@ parts +=
     kedifa-updater-run
     backend-haproxy-configuration
     promise-logrotate-setup
+    promise-key-download-url-ready
 {%- for part in part_list %}
 {{ '    %s' % part }}
 {%- endfor %}
@@ -626,3 +627,29 @@ promise = check_command_execute
 name = ${:_buildout_section_name_}.py
 config-command =
   ${logrotate:wrapper-path} -d
+
+[key-download-url-ready]
+recipe = slapos.recipe.build
+output = {{ url_ready_file }}
+master-key-download-url = {{ master_key_download_url }}
+slave-kedifa-information = {{ dumps(slave_kedifa_information) }}
+init =
+  not_ready_count = 0
+  if not options['master-key-download-url'] or 'NotReadyYet' in options['master-key-download-url']:
+    not_ready_count += 1
+  for slave_kedifa_reference, slave_kedifa_information in options['slave-kedifa-information'].items():
+    key_download_url = slave_kedifa_information.get('key-download-url')
+    if not key_download_url or 'NotReadyYet' in key_download_url:
+      not_ready_count += 1
+  with open(options['output'], 'w') as fh:
+    if not_ready_count > 0:
+      fh.write('%s' % (not_ready_count,))
+    else:
+      fh.write('')
+
+[promise-key-download-url-ready]
+<= monitor-promise-base
+promise = check_file_state
+name = ${:_buildout_section_name_}.py
+config-filename = ${key-download-url-ready:output}
+config-state = empty

software/caddy-frontend/test/test.py

@@ -82,9 +82,6 @@ else:
     os.path.abspath(
         os.path.join(os.path.dirname(__file__), '..', 'software.cfg')))
 
-  # XXX Keep using slapos node instance --all, because of missing promises
-  SlapOSInstanceTestCase.slap._force_slapos_node_instance_all = True
-
 # ports chosen to not collide with test systems
 HTTP_PORT = '11080'
 HTTPS_PORT = '11443'
@@ -858,9 +855,6 @@ class HttpFrontendTestCase(SlapOSInstanceTestCase):
 
   @classmethod
   def setUpMaster(cls):
-    # run partition until AIKC finishes
-    cls.runComputerPartitionUntil(
-      cls.untilNotReadyYetNotInMasterKeyGenerateAuthUrl)
     parameter_dict = cls.requestDefaultInstance().getConnectionParameterDict()
     cls._fetchKedifaCaucaseCaCertificateFile(parameter_dict)
     auth = requests.get(
@@ -908,31 +902,6 @@ class HttpFrontendTestCase(SlapOSInstanceTestCase):
         '*.alias1.example.com',
       ])
 
-  @classmethod
-  def runComputerPartitionUntil(cls, until):
-    max_try = 10
-    try_num = 1
-    while True:
-      if until():
-        break
-      if try_num > max_try:
-        raise ValueError('Failed to run computer partition with %r' % (until,))
-      try:
-        cls.slap.waitForInstance()
-      except Exception:
-        cls.logger.exception("Error during until run")
-      try_num += 1
-
-  @classmethod
-  def untilNotReadyYetNotInMasterKeyGenerateAuthUrl(cls):
-    parameter_dict = cls.requestDefaultInstance().getConnectionParameterDict()
-    key = 'master-key-generate-auth-url'
-    if key not in parameter_dict:
-      return False
-    if 'NotReadyYet' in parameter_dict[key]:
-      return False
-    return True
-
   @classmethod
   def callSupervisorMethod(cls, method, *args, **kwargs):
     with cls.slap.instance_supervisor_rpc as instance_supervisor:
@@ -1366,30 +1335,8 @@ class SlaveHttpFrontendTestCase(HttpFrontendTestCase):
       ).getConnectionParameterDict()
     return parameter_dict_dict
 
-  @classmethod
-  def untilSlavePartitionReady(cls):
-    # all on-watch services shall not be exited
-    for process in cls.callSupervisorMethod('getAllProcessInfo'):
-      if process['name'].endswith('-on-watch') and \
-        process['statename'] == 'EXITED':
-        if process['name'].startswith('monitor-http'):
-          continue
-        return False
-
-    for parameter_dict in cls.getSlaveConnectionParameterDictList():
-      log_access_ready = 'log-access-url' in parameter_dict
-      key = 'key-generate-auth-url'
-      key_generate_auth_ready = key in parameter_dict \
-          and 'NotReadyYet' not in parameter_dict[key]
-      if not(log_access_ready and key_generate_auth_ready):
-        return False
-
-    return True
-
   @classmethod
   def setUpSlaves(cls):
-    cls.runComputerPartitionUntil(
-      cls.untilSlavePartitionReady)
     cls.updateSlaveConnectionParameterDictDict()
 
   @classmethod
@@ -2119,9 +2066,18 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
     def writeNodeInformation(node_information, path):
       with open(path, 'w') as fh:
         json.dump(node_information, fh, sort_keys=True)
+      # full processing is needed as this is just simulation which does
+      # not bang the instance tree
+      slap_force_slapos_node_instance_all = \
+          self.slap._force_slapos_node_instance_all
+      self.slap._force_slapos_node_instance_all = True
+      try:
         self.waitForInstance()
         self.waitForInstance()
         self.waitForInstance()
+      finally:
+        self.slap._force_slapos_node_instance_all = \
+          slap_force_slapos_node_instance_all
 
     self.addCleanup(
       writeNodeInformation, current_node_information,
@@ -5012,10 +4968,6 @@ class TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster(
   SlaveHttpFrontendTestCase, TestDataMixin):
   @classmethod
   def setUpMaster(cls):
-    # run partition until AIKC finishes
-    cls.runComputerPartitionUntil(
-      cls.untilNotReadyYetNotInMasterKeyGenerateAuthUrl)
-
     parameter_dict = cls.requestDefaultInstance().getConnectionParameterDict()
     cls._fetchKedifaCaucaseCaCertificateFile(parameter_dict)
     # Do not upload certificates for the master partition
@@ -5139,10 +5091,6 @@ class TestSlaveSlapOSMasterCertificateCompatibility(
 
   @classmethod
   def setUpMaster(cls):
-    # run partition until AIKC finishes
-    cls.runComputerPartitionUntil(
-      cls.untilNotReadyYetNotInMasterKeyGenerateAuthUrl)
-
     parameter_dict = cls.requestDefaultInstance().getConnectionParameterDict()
     cls._fetchKedifaCaucaseCaCertificateFile(parameter_dict)
     # Do not upload certificates for the master partition
@@ -5741,10 +5689,6 @@ class TestSlaveSlapOSMasterCertificateCompatibilityUpdate(
   SlaveHttpFrontendTestCase, TestDataMixin):
   @classmethod
   def setUpMaster(cls):
-    # run partition until AIKC finishes
-    cls.runComputerPartitionUntil(
-      cls.untilNotReadyYetNotInMasterKeyGenerateAuthUrl)
-
     parameter_dict = cls.requestDefaultInstance().getConnectionParameterDict()
     cls._fetchKedifaCaucaseCaCertificateFile(parameter_dict)
     # Do not upload certificates for the master partition
@@ -5977,9 +5921,7 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase):
     cls.fillSlaveParameterDictDict()
     cls.requestSlaves()
     try:
-      cls.slap.waitForInstance(
-        max_retry=2  # two runs shall be enough
-      )
+      cls.slap.waitForInstance(max_retry=10)
     except Exception:
       # ignores exceptions, as problems are tested
       pass

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_plugin.txt

@@ -7,6 +7,9 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-caddy-frontend-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/master-key-download-url-ready-promise.py
+T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
+T-0/etc/plugin/master-key-upload-url-ready-promise.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
@@ -21,6 +24,7 @@ T-1/etc/plugin/kedifa-http-reply.py
 T-1/etc/plugin/monitor-bootstrap-status.py
 T-1/etc/plugin/monitor-http-frontend.py
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
+T-1/etc/plugin/promise-kedifa-auth-ready.py
 T-1/etc/plugin/promise-logrotate-setup.py
 T-2/etc/plugin/__init__.py
 T-2/etc/plugin/backend-client-caucase-updater.py
@@ -40,6 +44,7 @@ T-2/etc/plugin/frontend-caddy-configuration-promise.py
 T-2/etc/plugin/monitor-bootstrap-status.py
 T-2/etc/plugin/monitor-http-frontend.py
 T-2/etc/plugin/monitor-httpd-listening-on-tcp.py
+T-2/etc/plugin/promise-key-download-url-ready.py
 T-2/etc/plugin/promise-logrotate-setup.py
 T-2/etc/plugin/re6st-connectivity.py
 T-2/etc/plugin/slave-introspection-configuration.py

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_plugin.txt

@@ -7,6 +7,9 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-caddy-frontend-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/master-key-download-url-ready-promise.py
+T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
+T-0/etc/plugin/master-key-upload-url-ready-promise.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
@@ -21,6 +24,7 @@ T-1/etc/plugin/kedifa-http-reply.py
 T-1/etc/plugin/monitor-bootstrap-status.py
 T-1/etc/plugin/monitor-http-frontend.py
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
+T-1/etc/plugin/promise-kedifa-auth-ready.py
 T-1/etc/plugin/promise-logrotate-setup.py
 T-2/etc/plugin/__init__.py
 T-2/etc/plugin/backend-client-caucase-updater.py
@@ -40,6 +44,7 @@ T-2/etc/plugin/frontend-caddy-configuration-promise.py
 T-2/etc/plugin/monitor-bootstrap-status.py
 T-2/etc/plugin/monitor-http-frontend.py
 T-2/etc/plugin/monitor-httpd-listening-on-tcp.py
+T-2/etc/plugin/promise-key-download-url-ready.py
 T-2/etc/plugin/promise-logrotate-setup.py
 T-2/etc/plugin/re6st-connectivity.py
 T-2/etc/plugin/slave-introspection-configuration.py

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_plugin.txt

@@ -7,6 +7,9 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-caddy-frontend-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/master-key-download-url-ready-promise.py
+T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
+T-0/etc/plugin/master-key-upload-url-ready-promise.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
@@ -21,6 +24,7 @@ T-1/etc/plugin/kedifa-http-reply.py
 T-1/etc/plugin/monitor-bootstrap-status.py
 T-1/etc/plugin/monitor-http-frontend.py
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
+T-1/etc/plugin/promise-kedifa-auth-ready.py
 T-1/etc/plugin/promise-logrotate-setup.py
 T-2/etc/plugin/__init__.py
 T-2/etc/plugin/backend-client-caucase-updater.py
@@ -40,6 +44,7 @@ T-2/etc/plugin/frontend-caddy-configuration-promise.py
 T-2/etc/plugin/monitor-bootstrap-status.py
 T-2/etc/plugin/monitor-http-frontend.py
 T-2/etc/plugin/monitor-httpd-listening-on-tcp.py
+T-2/etc/plugin/promise-key-download-url-ready.py
 T-2/etc/plugin/promise-logrotate-setup.py
 T-2/etc/plugin/re6st-connectivity.py
 T-2/etc/plugin/slave-introspection-configuration.py

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_plugin.txt

@@ -7,6 +7,9 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-caddy-frontend-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/master-key-download-url-ready-promise.py
+T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
+T-0/etc/plugin/master-key-upload-url-ready-promise.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
@@ -21,6 +24,7 @@ T-1/etc/plugin/kedifa-http-reply.py
 T-1/etc/plugin/monitor-bootstrap-status.py
 T-1/etc/plugin/monitor-http-frontend.py
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
+T-1/etc/plugin/promise-kedifa-auth-ready.py
 T-1/etc/plugin/promise-logrotate-setup.py
 T-2/etc/plugin/__init__.py
 T-2/etc/plugin/backend-client-caucase-updater.py
@@ -40,6 +44,7 @@ T-2/etc/plugin/frontend-caddy-configuration-promise.py
 T-2/etc/plugin/monitor-bootstrap-status.py
 T-2/etc/plugin/monitor-http-frontend.py
 T-2/etc/plugin/monitor-httpd-listening-on-tcp.py
+T-2/etc/plugin/promise-key-download-url-ready.py
 T-2/etc/plugin/promise-logrotate-setup.py
 T-2/etc/plugin/re6st-connectivity.py
 T-2/etc/plugin/slave-introspection-configuration.py

software/caddy-frontend/test/test_data/test.TestMasterAIKCDisabledAIBCCDisabledRequest.test_file_list_plugin.txt

@@ -3,6 +3,9 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-caddy-frontend-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/master-key-download-url-ready-promise.py
+T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
+T-0/etc/plugin/master-key-upload-url-ready-promise.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
@@ -17,6 +20,7 @@ T-1/etc/plugin/kedifa-http-reply.py
 T-1/etc/plugin/monitor-bootstrap-status.py
 T-1/etc/plugin/monitor-http-frontend.py
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
+T-1/etc/plugin/promise-kedifa-auth-ready.py
 T-1/etc/plugin/promise-logrotate-setup.py
 T-2/etc/plugin/__init__.py
 T-2/etc/plugin/backend-client-caucase-updater.py
@@ -36,6 +40,7 @@ T-2/etc/plugin/frontend-caddy-configuration-promise.py
 T-2/etc/plugin/monitor-bootstrap-status.py
 T-2/etc/plugin/monitor-http-frontend.py
 T-2/etc/plugin/monitor-httpd-listening-on-tcp.py
+T-2/etc/plugin/promise-key-download-url-ready.py
 T-2/etc/plugin/promise-logrotate-setup.py
 T-2/etc/plugin/re6st-connectivity.py
 T-2/etc/plugin/slave-introspection-configuration.py

software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_plugin.txt

@@ -7,6 +7,9 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-caddy-frontend-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/master-key-download-url-ready-promise.py
+T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
+T-0/etc/plugin/master-key-upload-url-ready-promise.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
@@ -21,6 +24,7 @@ T-1/etc/plugin/kedifa-http-reply.py
 T-1/etc/plugin/monitor-bootstrap-status.py
 T-1/etc/plugin/monitor-http-frontend.py
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
+T-1/etc/plugin/promise-kedifa-auth-ready.py
 T-1/etc/plugin/promise-logrotate-setup.py
 T-2/etc/plugin/__init__.py
 T-2/etc/plugin/backend-client-caucase-updater.py
@@ -40,6 +44,7 @@ T-2/etc/plugin/frontend-caddy-configuration-promise.py
 T-2/etc/plugin/monitor-bootstrap-status.py
 T-2/etc/plugin/monitor-http-frontend.py
 T-2/etc/plugin/monitor-httpd-listening-on-tcp.py
+T-2/etc/plugin/promise-key-download-url-ready.py
 T-2/etc/plugin/promise-logrotate-setup.py
 T-2/etc/plugin/re6st-connectivity.py
 T-2/etc/plugin/slave-introspection-configuration.py

software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_plugin.txt

@@ -7,6 +7,9 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-caddy-frontend-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/master-key-download-url-ready-promise.py
+T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
+T-0/etc/plugin/master-key-upload-url-ready-promise.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
@@ -21,6 +24,7 @@ T-1/etc/plugin/kedifa-http-reply.py
 T-1/etc/plugin/monitor-bootstrap-status.py
 T-1/etc/plugin/monitor-http-frontend.py
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
+T-1/etc/plugin/promise-kedifa-auth-ready.py
 T-1/etc/plugin/promise-logrotate-setup.py
 T-2/etc/plugin/__init__.py
 T-2/etc/plugin/backend-client-caucase-updater.py
@@ -40,6 +44,7 @@ T-2/etc/plugin/frontend-caddy-configuration-promise.py
 T-2/etc/plugin/monitor-bootstrap-status.py
 T-2/etc/plugin/monitor-http-frontend.py
 T-2/etc/plugin/monitor-httpd-listening-on-tcp.py
+T-2/etc/plugin/promise-key-download-url-ready.py
 T-2/etc/plugin/promise-logrotate-setup.py
 T-2/etc/plugin/re6st-connectivity.py
 T-2/etc/plugin/slave-introspection-configuration.py

software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_plugin.txt

@@ -7,6 +7,9 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-caddy-frontend-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/master-key-download-url-ready-promise.py
+T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
+T-0/etc/plugin/master-key-upload-url-ready-promise.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
@@ -21,6 +24,7 @@ T-1/etc/plugin/kedifa-http-reply.py
 T-1/etc/plugin/monitor-bootstrap-status.py
 T-1/etc/plugin/monitor-http-frontend.py
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
+T-1/etc/plugin/promise-kedifa-auth-ready.py
 T-1/etc/plugin/promise-logrotate-setup.py
 T-2/etc/plugin/__init__.py
 T-2/etc/plugin/backend-client-caucase-updater.py
@@ -40,6 +44,7 @@ T-2/etc/plugin/frontend-caddy-configuration-promise.py
 T-2/etc/plugin/monitor-bootstrap-status.py
 T-2/etc/plugin/monitor-http-frontend.py
 T-2/etc/plugin/monitor-httpd-listening-on-tcp.py
+T-2/etc/plugin/promise-key-download-url-ready.py
 T-2/etc/plugin/promise-logrotate-setup.py
 T-2/etc/plugin/re6st-connectivity.py
 T-2/etc/plugin/slave-introspection-configuration.py

software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_file_list_plugin.txt

@@ -7,6 +7,9 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-caddy-frontend-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/master-key-download-url-ready-promise.py
+T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
+T-0/etc/plugin/master-key-upload-url-ready-promise.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
@@ -21,6 +24,7 @@ T-1/etc/plugin/kedifa-http-reply.py
 T-1/etc/plugin/monitor-bootstrap-status.py
 T-1/etc/plugin/monitor-http-frontend.py
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
+T-1/etc/plugin/promise-kedifa-auth-ready.py
 T-1/etc/plugin/promise-logrotate-setup.py
 T-2/etc/plugin/__init__.py
 T-2/etc/plugin/backend-client-caucase-updater.py
@@ -40,6 +44,7 @@ T-2/etc/plugin/frontend-caddy-configuration-promise.py
 T-2/etc/plugin/monitor-bootstrap-status.py
 T-2/etc/plugin/monitor-http-frontend.py
 T-2/etc/plugin/monitor-httpd-listening-on-tcp.py
+T-2/etc/plugin/promise-key-download-url-ready.py
 T-2/etc/plugin/promise-logrotate-setup.py
 T-2/etc/plugin/re6st-connectivity.py
 T-2/etc/plugin/slave-introspection-configuration.py

software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_file_list_plugin.txt

@@ -8,6 +8,9 @@ T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-caddy-frontend-1.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-caddy-frontend-2.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/master-key-download-url-ready-promise.py
+T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
+T-0/etc/plugin/master-key-upload-url-ready-promise.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
@@ -22,6 +25,7 @@ T-1/etc/plugin/kedifa-http-reply.py
 T-1/etc/plugin/monitor-bootstrap-status.py
 T-1/etc/plugin/monitor-http-frontend.py
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
+T-1/etc/plugin/promise-kedifa-auth-ready.py
 T-1/etc/plugin/promise-logrotate-setup.py
 T-2/etc/plugin/__init__.py
 T-2/etc/plugin/backend-client-caucase-updater.py
@@ -41,6 +45,7 @@ T-2/etc/plugin/frontend-caddy-configuration-promise.py
 T-2/etc/plugin/monitor-bootstrap-status.py
 T-2/etc/plugin/monitor-http-frontend.py
 T-2/etc/plugin/monitor-httpd-listening-on-tcp.py
+T-2/etc/plugin/promise-key-download-url-ready.py
 T-2/etc/plugin/promise-logrotate-setup.py
 T-2/etc/plugin/re6st-connectivity.py
 T-2/etc/plugin/slave-introspection-configuration.py
@@ -65,6 +70,7 @@ T-3/etc/plugin/frontend-caddy-configuration-promise.py
 T-3/etc/plugin/monitor-bootstrap-status.py
 T-3/etc/plugin/monitor-http-frontend.py
 T-3/etc/plugin/monitor-httpd-listening-on-tcp.py
+T-3/etc/plugin/promise-key-download-url-ready.py
 T-3/etc/plugin/promise-logrotate-setup.py
 T-3/etc/plugin/re6st-connectivity.py
 T-3/etc/plugin/slave-introspection-configuration.py

software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_plugin.txt

@@ -7,6 +7,9 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-caddy-frontend-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/master-key-download-url-ready-promise.py
+T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
+T-0/etc/plugin/master-key-upload-url-ready-promise.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
@@ -21,6 +24,7 @@ T-1/etc/plugin/kedifa-http-reply.py
 T-1/etc/plugin/monitor-bootstrap-status.py
 T-1/etc/plugin/monitor-http-frontend.py
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
+T-1/etc/plugin/promise-kedifa-auth-ready.py
 T-1/etc/plugin/promise-logrotate-setup.py
 T-2/etc/plugin/__init__.py
 T-2/etc/plugin/backend-client-caucase-updater.py
@@ -42,6 +46,7 @@ T-2/etc/plugin/frontend-caddy-configuration-promise.py
 T-2/etc/plugin/monitor-bootstrap-status.py
 T-2/etc/plugin/monitor-http-frontend.py
 T-2/etc/plugin/monitor-httpd-listening-on-tcp.py
+T-2/etc/plugin/promise-key-download-url-ready.py
 T-2/etc/plugin/promise-logrotate-setup.py
 T-2/etc/plugin/re6st-connectivity.py
 T-2/etc/plugin/slave-introspection-configuration.py

software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test_file_list_plugin.txt

@@ -7,6 +7,9 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-caddy-frontend-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/master-key-download-url-ready-promise.py
+T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
+T-0/etc/plugin/master-key-upload-url-ready-promise.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
@@ -21,6 +24,7 @@ T-1/etc/plugin/kedifa-http-reply.py
 T-1/etc/plugin/monitor-bootstrap-status.py
 T-1/etc/plugin/monitor-http-frontend.py
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
+T-1/etc/plugin/promise-kedifa-auth-ready.py
 T-1/etc/plugin/promise-logrotate-setup.py
 T-2/etc/plugin/__init__.py
 T-2/etc/plugin/backend-client-caucase-updater.py
@@ -40,6 +44,7 @@ T-2/etc/plugin/frontend-caddy-configuration-promise.py
 T-2/etc/plugin/monitor-bootstrap-status.py
 T-2/etc/plugin/monitor-http-frontend.py
 T-2/etc/plugin/monitor-httpd-listening-on-tcp.py
+T-2/etc/plugin/promise-key-download-url-ready.py
 T-2/etc/plugin/promise-logrotate-setup.py
 T-2/etc/plugin/re6st-connectivity.py
 T-2/etc/plugin/slave-introspection-configuration.py

software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_plugin.txt

@@ -7,6 +7,9 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-caddy-frontend-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/master-key-download-url-ready-promise.py
+T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
+T-0/etc/plugin/master-key-upload-url-ready-promise.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
@@ -21,6 +24,7 @@ T-1/etc/plugin/kedifa-http-reply.py
 T-1/etc/plugin/monitor-bootstrap-status.py
 T-1/etc/plugin/monitor-http-frontend.py
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
+T-1/etc/plugin/promise-kedifa-auth-ready.py
 T-1/etc/plugin/promise-logrotate-setup.py
 T-2/etc/plugin/__init__.py
 T-2/etc/plugin/backend-client-caucase-updater.py
@@ -42,6 +46,7 @@ T-2/etc/plugin/frontend-caddy-configuration-promise.py
 T-2/etc/plugin/monitor-bootstrap-status.py
 T-2/etc/plugin/monitor-http-frontend.py
 T-2/etc/plugin/monitor-httpd-listening-on-tcp.py
+T-2/etc/plugin/promise-key-download-url-ready.py
 T-2/etc/plugin/promise-logrotate-setup.py
 T-2/etc/plugin/re6st-connectivity.py
 T-2/etc/plugin/slave-introspection-configuration.py

software/caddy-frontend/test/test_data/test.TestSlaveHealthCheck.test_file_list_plugin.txt

@@ -7,6 +7,9 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-caddy-frontend-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/master-key-download-url-ready-promise.py
+T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
+T-0/etc/plugin/master-key-upload-url-ready-promise.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
@@ -21,6 +24,7 @@ T-1/etc/plugin/kedifa-http-reply.py
 T-1/etc/plugin/monitor-bootstrap-status.py
 T-1/etc/plugin/monitor-http-frontend.py
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
+T-1/etc/plugin/promise-kedifa-auth-ready.py
 T-1/etc/plugin/promise-logrotate-setup.py
 T-2/etc/plugin/__init__.py
 T-2/etc/plugin/backend-client-caucase-updater.py
@@ -40,6 +44,7 @@ T-2/etc/plugin/frontend-caddy-configuration-promise.py
 T-2/etc/plugin/monitor-bootstrap-status.py
 T-2/etc/plugin/monitor-http-frontend.py
 T-2/etc/plugin/monitor-httpd-listening-on-tcp.py
+T-2/etc/plugin/promise-key-download-url-ready.py
 T-2/etc/plugin/promise-logrotate-setup.py
 T-2/etc/plugin/re6st-connectivity.py
 T-2/etc/plugin/slave-introspection-configuration.py

software/caddy-frontend/test/test_data/test.TestSlaveHostHaproxyClash.test_file_list_plugin.txt

@@ -7,6 +7,9 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-caddy-frontend-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/master-key-download-url-ready-promise.py
+T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
+T-0/etc/plugin/master-key-upload-url-ready-promise.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
@@ -21,6 +24,7 @@ T-1/etc/plugin/kedifa-http-reply.py
 T-1/etc/plugin/monitor-bootstrap-status.py
 T-1/etc/plugin/monitor-http-frontend.py
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
+T-1/etc/plugin/promise-kedifa-auth-ready.py
 T-1/etc/plugin/promise-logrotate-setup.py
 T-2/etc/plugin/__init__.py
 T-2/etc/plugin/backend-client-caucase-updater.py
@@ -40,6 +44,7 @@ T-2/etc/plugin/frontend-caddy-configuration-promise.py
 T-2/etc/plugin/monitor-bootstrap-status.py
 T-2/etc/plugin/monitor-http-frontend.py
 T-2/etc/plugin/monitor-httpd-listening-on-tcp.py
+T-2/etc/plugin/promise-key-download-url-ready.py
 T-2/etc/plugin/promise-logrotate-setup.py
 T-2/etc/plugin/re6st-connectivity.py
 T-2/etc/plugin/slave-introspection-configuration.py

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_file_list_plugin.txt

@@ -7,6 +7,9 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-caddy-frontend-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/master-key-download-url-ready-promise.py
+T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
+T-0/etc/plugin/master-key-upload-url-ready-promise.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
@@ -21,6 +24,7 @@ T-1/etc/plugin/kedifa-http-reply.py
 T-1/etc/plugin/monitor-bootstrap-status.py
 T-1/etc/plugin/monitor-http-frontend.py
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
+T-1/etc/plugin/promise-kedifa-auth-ready.py
 T-1/etc/plugin/promise-logrotate-setup.py
 T-2/etc/plugin/__init__.py
 T-2/etc/plugin/backend-client-caucase-updater.py
@@ -40,6 +44,7 @@ T-2/etc/plugin/frontend-caddy-configuration-promise.py
 T-2/etc/plugin/monitor-bootstrap-status.py
 T-2/etc/plugin/monitor-http-frontend.py
 T-2/etc/plugin/monitor-httpd-listening-on-tcp.py
+T-2/etc/plugin/promise-key-download-url-ready.py
 T-2/etc/plugin/promise-logrotate-setup.py
 T-2/etc/plugin/re6st-connectivity.py
 T-2/etc/plugin/slave-introspection-configuration.py

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_file_list_plugin.txt

@@ -7,6 +7,9 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-caddy-frontend-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/master-key-download-url-ready-promise.py
+T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
+T-0/etc/plugin/master-key-upload-url-ready-promise.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
@@ -21,6 +24,7 @@ T-1/etc/plugin/kedifa-http-reply.py
 T-1/etc/plugin/monitor-bootstrap-status.py
 T-1/etc/plugin/monitor-http-frontend.py
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
+T-1/etc/plugin/promise-kedifa-auth-ready.py
 T-1/etc/plugin/promise-logrotate-setup.py
 T-2/etc/plugin/__init__.py
 T-2/etc/plugin/backend-client-caucase-updater.py
@@ -40,6 +44,7 @@ T-2/etc/plugin/frontend-caddy-configuration-promise.py
 T-2/etc/plugin/monitor-bootstrap-status.py
 T-2/etc/plugin/monitor-http-frontend.py
 T-2/etc/plugin/monitor-httpd-listening-on-tcp.py
+T-2/etc/plugin/promise-key-download-url-ready.py
 T-2/etc/plugin/promise-logrotate-setup.py
 T-2/etc/plugin/re6st-connectivity.py
 T-2/etc/plugin/slave-introspection-configuration.py

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_file_list_plugin.txt

@@ -7,6 +7,9 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-caddy-frontend-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/master-key-download-url-ready-promise.py
+T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
+T-0/etc/plugin/master-key-upload-url-ready-promise.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
@@ -21,6 +24,7 @@ T-1/etc/plugin/kedifa-http-reply.py
 T-1/etc/plugin/monitor-bootstrap-status.py
 T-1/etc/plugin/monitor-http-frontend.py
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
+T-1/etc/plugin/promise-kedifa-auth-ready.py
 T-1/etc/plugin/promise-logrotate-setup.py
 T-2/etc/plugin/__init__.py
 T-2/etc/plugin/backend-client-caucase-updater.py
@@ -40,6 +44,7 @@ T-2/etc/plugin/frontend-caddy-configuration-promise.py
 T-2/etc/plugin/monitor-bootstrap-status.py
 T-2/etc/plugin/monitor-http-frontend.py
 T-2/etc/plugin/monitor-httpd-listening-on-tcp.py
+T-2/etc/plugin/promise-key-download-url-ready.py
 T-2/etc/plugin/promise-logrotate-setup.py
 T-2/etc/plugin/re6st-connectivity.py
 T-2/etc/plugin/slave-introspection-configuration.py

software/ors-amarisoft/buildout.hash.cfg

@@ -48,7 +48,7 @@ md5sum = dcaac06553a3222b14c0013a13f4a149
 
 [enb.jinja2.cfg]
 filename = config/enb.jinja2.cfg
-md5sum = f5848c48f573c79615f595b07c358ce8
+md5sum = 4b66551e04edff724b08d6bb90f7342c
 
 [sib23.asn]
 filename = config/sib23.asn
@@ -56,7 +56,7 @@ md5sum = b377dac7f1fcf94fb9ce9ebed617f36a
 
 [gnb.jinja2.cfg]
 filename = config/gnb.jinja2.cfg
-md5sum = b3fb1b32aa1b151892eeb87a03e1d152
+md5sum = a9df6d3d66bf5a48ed2bc1dc7084291a
 
 [ltelogs.jinja2.sh]
 filename = ltelogs.jinja2.sh

software/ors-amarisoft/config/enb.jinja2.cfg

@@ -68,7 +68,7 @@
 
     dl_earfcn: {{ slapparameter_dict.get('dl_earfcn', slap_configuration['configuration.default_dl_earfcn']) }},
 
-    n_id_cell: 1,
+    n_id_cell: {{ slapparameter_dict.get('pci', 1) }},
     cell_id: 0x01,
     tac: 0x0001,
     root_sequence_index: 204,

software/ors-amarisoft/config/gnb.jinja2.cfg

@@ -138,7 +138,7 @@
 #endif
     },
     ssb_period: 20, 
-    n_id_cell: 500,
+    n_id_cell: {{ slapparameter_dict.get('pci', 500) }},
 
   plmn_list: [
 {%- if slapparameter_dict.get('plmn_list', '') %}

software/ors-amarisoft/instance-enb-input-schema.jinja2.json

@@ -65,6 +65,12 @@
       "type": "string",
       "default": "0x1A2D0"
     },
+    "pci": {
+      "title": "Physical Cell ID",
+      "description": "Physical Cell ID",
+      "type": "number",
+      "default": 1
+    },
     "plmn_list": {
       "title": "PLMN list",
       "description": "List of PLMNs broadcasted by the eNodeB, at most 6 (default: 00101)",

software/ors-amarisoft/instance-gnb-input-schema.jinja2.json

@@ -71,6 +71,12 @@
       "type": "string",
       "default": "0x12345"
     },
+    "pci": {
+      "title": "Physical Cell ID",
+      "description": "Physical Cell ID",
+      "type": "number",
+      "default": 1
+    },
     "ssb_pos_bitmap": {
       "title": "SSB Position Bitmap",
       "description": "SSB position bitmap in bits (4, 8 or 64 bits depending on the DL frequency).",

software/ors-amarisoft/instance-tdd1900-enb-epc-input-schema.json

@@ -63,6 +63,12 @@
       "type": "string",
       "default": "0x1A2D0"
     },
+    "pci": {
+      "title": "Physical Cell ID",
+      "description": "Physical Cell ID",
+      "type": "number",
+      "default": 1
+    },
     "plmn_list": {
       "title": "PLMN list",
       "description": "List of PLMNs broadcasted by the eNodeB, at most 6 (default: 00101)",

software/ors-amarisoft/instance-tdd1900-enb-input-schema.json

@@ -51,6 +51,12 @@
       "type": "string",
       "default": "0x1A2D0"
     },
+    "pci": {
+      "title": "Physical Cell ID",
+      "description": "Physical Cell ID",
+      "type": "number",
+      "default": 1
+    },
     "plmn_list": {
       "title": "PLMN list",
       "description": "List of PLMNs broadcasted by the eNodeB, at most 6 (default: 00101)",

software/ors-amarisoft/instance-tdd1900-gnb-epc-input-schema.json

@@ -69,6 +69,12 @@
       "type": "string",
       "default": "0x12345"
     },
+    "pci": {
+      "title": "Physical Cell ID",
+      "description": "Physical Cell ID",
+      "type": "number",
+      "default": 1
+    },
     "ssb_pos_bitmap": {
       "title": "SSB Position Bitmap",
       "description": "SSB position bitmap in bits (4, 8 or 64 bits depending on the DL frequency).",

software/ors-amarisoft/instance-tdd1900-gnb-input-schema.json

@@ -57,6 +57,12 @@
       "type": "string",
       "default": "0x12345"
     },
+    "pci": {
+      "title": "Physical Cell ID",
+      "description": "Physical Cell ID",
+      "type": "number",
+      "default": 1
+    },
     "ssb_pos_bitmap": {
       "title": "SSB Position Bitmap",
       "description": "SSB position bitmap in bits (4, 8 or 64 bits depending on the DL frequency).",

software/ors-amarisoft/instance-tdd2600-enb-epc-input-schema.json

@@ -63,6 +63,12 @@
       "type": "string",
       "default": "0x1A2D0"
     },
+    "pci": {
+      "title": "Physical Cell ID",
+      "description": "Physical Cell ID",
+      "type": "number",
+      "default": 1
+    },
     "plmn_list": {
       "title": "PLMN list",
       "description": "List of PLMNs broadcasted by the eNodeB, at most 6 (default: 00101)",

software/ors-amarisoft/instance-tdd2600-enb-input-schema.json

@@ -51,6 +51,12 @@
       "type": "string",
       "default": "0x1A2D0"
     },
+    "pci": {
+      "title": "Physical Cell ID",
+      "description": "Physical Cell ID",
+      "type": "number",
+      "default": 1
+    },
     "plmn_list": {
       "title": "PLMN list",
       "description": "List of PLMNs broadcasted by the eNodeB, at most 6 (default: 00101)",

software/ors-amarisoft/instance-tdd2600-gnb-epc-input-schema.json

@@ -69,6 +69,12 @@
       "type": "string",
       "default": "0x12345"
     },
+    "pci": {
+      "title": "Physical Cell ID",
+      "description": "Physical Cell ID",
+      "type": "number",
+      "default": 1
+    },
     "ssb_pos_bitmap": {
       "title": "SSB Position Bitmap",
       "description": "SSB position bitmap in bits (4, 8 or 64 bits depending on the DL frequency).",

software/ors-amarisoft/instance-tdd2600-gnb-input-schema.json

@@ -57,6 +57,12 @@
       "type": "string",
       "default": "0x12345"
     },
+    "pci": {
+      "title": "Physical Cell ID",
+      "description": "Physical Cell ID",
+      "type": "number",
+      "default": 1
+    },
     "ssb_pos_bitmap": {
       "title": "SSB Position Bitmap",
       "description": "SSB position bitmap in bits (4, 8 or 64 bits depending on the DL frequency).",

software/ors-amarisoft/instance-tdd3500-enb-epc-input-schema.json

@@ -63,6 +63,12 @@
       "type": "string",
       "default": "0x1A2D0"
     },
+    "pci": {
+      "title": "Physical Cell ID",
+      "description": "Physical Cell ID",
+      "type": "number",
+      "default": 1
+    },
     "plmn_list": {
       "title": "PLMN list",
       "description": "List of PLMNs broadcasted by the eNodeB, at most 6 (default: 00101)",

software/ors-amarisoft/instance-tdd3500-enb-input-schema.json

@@ -51,6 +51,12 @@
       "type": "string",
       "default": "0x1A2D0"
     },
+    "pci": {
+      "title": "Physical Cell ID",
+      "description": "Physical Cell ID",
+      "type": "number",
+      "default": 1
+    },
     "plmn_list": {
       "title": "PLMN list",
       "description": "List of PLMNs broadcasted by the eNodeB, at most 6 (default: 00101)",

software/ors-amarisoft/instance-tdd3500-gnb-epc-input-schema.json

@@ -69,6 +69,12 @@
       "type": "string",
       "default": "0x12345"
     },
+    "pci": {
+      "title": "Physical Cell ID",
+      "description": "Physical Cell ID",
+      "type": "number",
+      "default": 1
+    },
     "ssb_pos_bitmap": {
       "title": "SSB Position Bitmap",
       "description": "SSB position bitmap in bits (4, 8 or 64 bits depending on the DL frequency).",

software/ors-amarisoft/instance-tdd3500-gnb-input-schema.json

@@ -57,6 +57,12 @@
       "type": "string",
       "default": "0x12345"
     },
+    "pci": {
+      "title": "Physical Cell ID",
+      "description": "Physical Cell ID",
+      "type": "number",
+      "default": 1
+    },
     "ssb_pos_bitmap": {
       "title": "SSB Position Bitmap",
       "description": "SSB position bitmap in bits (4, 8 or 64 bits depending on the DL frequency).",

software/ors-amarisoft/instance-tdd3700-enb-epc-input-schema.json

@@ -63,6 +63,12 @@
       "type": "string",
       "default": "0x1A2D0"
     },
+    "pci": {
+      "title": "Physical Cell ID",
+      "description": "Physical Cell ID",
+      "type": "number",
+      "default": 1
+    },
     "plmn_list": {
       "title": "PLMN list",
       "description": "List of PLMNs broadcasted by the eNodeB, at most 6 (default: 00101)",

software/ors-amarisoft/instance-tdd3700-enb-input-schema.json

@@ -51,6 +51,12 @@
       "type": "string",
       "default": "0x1A2D0"
     },
+    "pci": {
+      "title": "Physical Cell ID",
+      "description": "Physical Cell ID",
+      "type": "number",
+      "default": 1
+    },
     "plmn_list": {
       "title": "PLMN list",
       "description": "List of PLMNs broadcasted by the eNodeB, at most 6 (default: 00101)",

software/ors-amarisoft/instance-tdd3700-gnb-epc-input-schema.json

@@ -69,6 +69,12 @@
       "type": "string",
       "default": "0x12345"
     },
+    "pci": {
+      "title": "Physical Cell ID",
+      "description": "Physical Cell ID",
+      "type": "number",
+      "default": 1
+    },
     "ssb_pos_bitmap": {
       "title": "SSB Position Bitmap",
       "description": "SSB position bitmap in bits (4, 8 or 64 bits depending on the DL frequency).",

software/ors-amarisoft/instance-tdd3700-gnb-input-schema.json

@@ -57,6 +57,12 @@
       "type": "string",
       "default": "0x12345"
     },
+    "pci": {
+      "title": "Physical Cell ID",
+      "description": "Physical Cell ID",
+      "type": "number",
+      "default": 1
+    },
     "ssb_pos_bitmap": {
       "title": "SSB Position Bitmap",
       "description": "SSB position bitmap in bits (4, 8 or 64 bits depending on the DL frequency).",