caddy-frontend: Drop additional keys for destroyed nodes

Destroyed nodes shall be just destroyed, and there is no need to send whole
configuration to them.

software/caddy-frontend/buildout.hash.cfg

@@ -26,7 +26,7 @@ md5sum = 2903758a104186b7dae9573c3470be78
 
 [template-caddy-replicate]
 filename = instance-apache-replicate.cfg.in
-md5sum = fbd7b74de5bc445157c6c3533fc5b073
+md5sum = 89a7488419875c117b8eddd185a2d50b
 
 [template-slave-list]
 filename = templates/apache-custom-slave-list.cfg.in

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

@@ -221,23 +221,27 @@ software-type = {{frontend_type}}
 return = private-ipv4 public-ipv4 slave-instance-information-list monitor-base-url csr_id-url csr_id-certificate
 
 {% for section, frontend_request in request_dict.iteritems() %}
+{%   set state = frontend_request.get('state', '') %}
 [{{section}}]
 <= replicate
 name = {{ frontend_request.get('name') }}
-{%   if frontend_request.get('state') %}
-state = {{ frontend_request.get('state') }}
-{%   endif%}
+{%   if state %}
+state = {{ state }}
+{%   endif %}
 config-slave-kedifa-information = ${request-kedifa:connection-slave-kedifa-information}
 config-kedifa-caucase-url = ${request-kedifa:connection-caucase-url}
 config-master-key-download-url = ${request-kedifa:connection-master-key-download-url}
 config-cluster-identification = {{ cluster_identification }}
-{%   set slave_configuration_dict = slapparameter_dict %}
-{%   do slave_configuration_dict.update(frontend_request.get('config')) %}
-{%   do slave_configuration_dict.__setitem__(slave_list_name, json_module.dumps(authorized_slave_list)) %}
-{%   do slave_configuration_dict.__setitem__("frontend-name", frontend_request.get('name')) %}
-{%-   for config_key, config_value in slave_configuration_dict.iteritems() %}
+{#   Do not send additional parameters for destroyed nodes #}
+{%   if state != 'destroyed' %}
+{%     set slave_configuration_dict = slapparameter_dict %}
+{%     do slave_configuration_dict.update(frontend_request.get('config')) %}
+{%     do slave_configuration_dict.__setitem__(slave_list_name, json_module.dumps(authorized_slave_list)) %}
+{%     do slave_configuration_dict.__setitem__("frontend-name", frontend_request.get('name')) %}
+{%-     for config_key, config_value in slave_configuration_dict.iteritems() %}
 config-{{ config_key }} = {{ dumps(config_value) }}
-{%   endfor -%}
+{%     endfor -%}
+{%   endif %}
 {%   if frontend_request.get('sla') %}
 {%     for parameter, value in frontend_request.get('sla').iteritems() %}
 sla-{{ parameter }} = {{ value }}

software/caddy-frontend/test/test.py

@@ -3927,6 +3927,43 @@ class TestReplicateSlave(SlaveHttpFrontendTestCase, TestDataMixin):
       2, len(slave_configuration_file_list), slave_configuration_file_list)
 
 
+class TestReplicateSlaveOtherDestroyed(SlaveHttpFrontendTestCase):
+  @classmethod
+  def getInstanceParameterDict(cls):
+    return {
+      'domain': 'example.com',
+      'public-ipv4': SLAPOS_TEST_IPV4,
+      '-frontend-quantity': 2,
+      '-sla-2-computer_guid': 'slapos.test',
+      '-frontend-2-state': 'destroyed',
+      'port': HTTPS_PORT,
+      'plain_http_port': HTTP_PORT,
+      'monitor-httpd-port': MONITOR_HTTPD_PORT,
+      '-frontend-config-1-monitor-httpd-port': MONITOR_F1_HTTPD_PORT,
+      '-frontend-config-2-monitor-httpd-port': MONITOR_F2_HTTPD_PORT,
+      'kedifa_port': KEDIFA_PORT,
+      'caucase_port': CAUCASE_PORT,
+    }
+
+  @classmethod
+  def getSlaveParameterDictDict(cls):
+    return {'empty': {}}
+
+  def test_extra_slave_instance_list_not_present_destroyed_request(self):
+    buildout_file = os.path.join(
+      self.getMasterPartitionPath(), 'buildout-switch-softwaretype.cfg')
+    with open(buildout_file) as fh:
+      buildout_file_content = fh.read()
+      node_1_present = re.search(
+        "^config-frontend-name = !py!'caddy-frontend-1'$",
+        buildout_file_content, flags=re.M) is not None
+      node_2_present = re.search(
+        "^config-frontend-name = !py!'caddy-frontend-2'$",
+        buildout_file_content, flags=re.M) is not None
+    self.assertTrue(node_1_present)
+    self.assertFalse(node_2_present)
+
+
 class TestEnableHttp2ByDefaultFalseSlave(SlaveHttpFrontendTestCase,
                                          TestDataMixin):
   @classmethod