caddy-frontend/test: Drop needless -CADDY suffix from test data files

software/caddy-frontend/test/test.py

@@ -300,7 +300,7 @@ class TestDataMixin(object):
   def assertTestData(self, runtime_data, data_replacement_dict=None, msg=None):
     if data_replacement_dict is None:
       data_replacement_dict = {}
-    filename = '%s-%s.txt' % (self.id().replace('zz_', ''), 'CADDY')
+    filename = '%s.txt' % (self.id().replace('zz_', ''))
     test_data_file = os.path.join(
       os.path.dirname(os.path.realpath(__file__)), 'test_data', filename)
 

software/caddy-frontend/test/test_data/test.TestReplicateSlave.test00cluster_request_instance_parameter_dict-CADDY.txt → software/caddy-frontend/test/test_data/test.TestReplicateSlave.test00cluster_request_instance_parameter_dict.txt

 [
   {
+    "-frontend-1-state": "started",
+    "-frontend-2-state": "stopped",
+    "-frontend-quantity": "2",
+    "-sla-2-computer_guid": "local",
     "caucase_port": "15090",
     "domain": "example.com",
     "full_address_list": [],
@@ -106,5 +110,42 @@
     "slap_software_type": "single-custom-personal",
     "slave_instance_list": [],
     "timestamp": "@@TIMESTAMP@@"
+  },
+  {
+    "_": {
+      "backend-client-caucase-url": "http://[@@_ipv6_address@@]:8990",
+      "cluster-identification": "testing partition 0",
+      "domain": "example.com",
+      "extra_slave_instance_list": "[{\"enable_cache\": true, \"slave_reference\": \"_replicate\", \"url\": \"http://@@_ipv4_address@@:@@_server_http_port@@/\"}]",
+      "frontend-name": "caddy-frontend-2",
+      "kedifa-caucase-url": "http://[@@_ipv6_address@@]:15090",
+      "master-key-download-url": "https://[@@_ipv6_address@@]:15080/@@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=\"}}"
+    },
+    "full_address_list": [],
+    "instance_title": "caddy-frontend-2",
+    "ip_list": [
+      [
+        "T-3",
+        "@@_ipv4_address@@"
+      ],
+      [
+        "T-3",
+        "@@_ipv6_address@@"
+      ]
+    ],
+    "root_instance_title": "testing partition 0",
+    "slap_computer_id": "local",
+    "slap_computer_partition_id": "T-3",
+    "slap_software_release_url": "@@getSoftwareURL@@",
+    "slap_software_type": "single-custom-personal",
+    "slave_instance_list": [],
+    "timestamp": "@@TIMESTAMP@@"
   }
 ]