diff --git a/software/ors-amarisoft/buildout.hash.cfg b/software/ors-amarisoft/buildout.hash.cfg index 5f45ce15622b1776288a7238cd48fae7afe70cac..2fd45867712bbf6085ac7e07898965c72ea20410 100644 --- a/software/ors-amarisoft/buildout.hash.cfg +++ b/software/ors-amarisoft/buildout.hash.cfg @@ -72,7 +72,7 @@ md5sum = b377dac7f1fcf94fb9ce9ebed617f36a [gnb.jinja2.cfg] filename = config/gnb.jinja2.cfg -md5sum = a49375a59ddda6b8e6eab30e7af30dc6 +md5sum = 2618a2af4eb5b21856e023dcd10c5c24 [ltelogs.jinja2.sh] filename = ltelogs.jinja2.sh diff --git a/software/ors-amarisoft/changelog.rst b/software/ors-amarisoft/changelog.rst index de5d483ebd5b43bcdfb065c8e9d6b82625f914eb..c604c32b08a5c54b583d366a54001ff5aaff3b28 100644 --- a/software/ors-amarisoft/changelog.rst +++ b/software/ors-amarisoft/changelog.rst @@ -20,7 +20,7 @@ Version 1.0.316 (2023-04-14) - gnb - core-network (replaces epc software type) -Version 1.0.317 (2023-04-18) +Version 1.0.318 (2023-04-20) ------------- -* Add support for inter gNB NR handover +* Add support for inter gNB XnAP and NGAP NR handover diff --git a/software/ors-amarisoft/config/gnb.jinja2.cfg b/software/ors-amarisoft/config/gnb.jinja2.cfg index 6e1618b6079aeb8b001dd2951fdcf29089b24730..3a4198ba179ffb982e960ceb4aa35ee86ddba949 100644 --- a/software/ors-amarisoft/config/gnb.jinja2.cfg +++ b/software/ors-amarisoft/config/gnb.jinja2.cfg @@ -1,7 +1,3 @@ -{% set dl_nr_arfcn = slapparameter_dict.get('dl_nr_arfcn', slap_configuration['configuration.default_dl_nr_arfcn']) %} -{% set band = slapparameter_dict.get('nr_band', slap_configuration['configuration.default_nr_band']) %} -{% set gnb_id_bits = slapparameter_dict.get('gnb_id_bits', 28) %} - #define FR2 0 // Values: 0 (FR1), 1 (FR2) #define NR_TDD_CONFIG 2 // Values: FR1: 1, 2, 3, 4 (compatible with LTE TDD config 2) FR2: 10 #define N_ANTENNA_DL {{ slapparameter_dict.get('n_antenna_dl', slap_configuration['configuration.default_n_antenna_dl']) }} // Values: 1 (SISO), 2 (MIMO 2x2), 4 (MIMO 4x4) @@ -62,6 +58,14 @@ {% endif %} ], +{% if slapparameter_dict.get('xn_peers', '') %} + xn_peers: [ +{%- for k in slapparameter_dict['xn_peers'] -%} + "{{ slapparameter_dict['xn_peers'][k]['xn_addr'] }}", +{%- endfor -%} + ], +{% endif %} + {% if slapparameter_dict.get('amf_list', '') %} {% if slapparameter_dict.get('use_ipv4', False) %} gtp_addr: "{{ gtp_addr_v4 }}", @@ -72,7 +76,7 @@ gtp_addr: "127.0.1.1", {% endif %} - gnb_id_bits: {{ gnb_id_bits }}, + gnb_id_bits: {{ slapparameter_dict.get('gnb_id_bits', 28) }}, gnb_id: {{ slapparameter_dict.get('gnb_id', '0x12345') }}, nr_support: true, @@ -97,8 +101,8 @@ { rf_port: 0, cell_id: {{ slapparameter_dict.get('cell_id', '0x01') }}, - band: {{ band }}, - dl_nr_arfcn: {{ dl_nr_arfcn }}, + band: {{ slapparameter_dict.get('nr_band', slap_configuration['configuration.default_nr_band']) }}, + dl_nr_arfcn: {{ slapparameter_dict.get('dl_nr_arfcn', slap_configuration['configuration.default_dl_nr_arfcn']) }}, subcarrier_spacing: 30, ssb_pos_bitmap: "{{ slapparameter_dict.get('ssb_pos_bitmap', slap_configuration['configuration.default_nr_ssb_pos_bitmap']) }}", @@ -111,14 +115,14 @@ , { {%- endif %} rat: "nr", - ssb_nr_arfcn: {{ dl_nr_arfcn }}, - dl_nr_arfcn: {{ dl_nr_arfcn }}, - ul_nr_arfcn: {{ dl_nr_arfcn }}, - n_id_cell: 500, - gnb_id_bits: {{ gnb_id_bits }}, + dl_nr_arfcn: {{ slapparameter_dict['ncell_list'][k].get('dl_nr_arfcn', '') }}, + ssb_nr_arfcn: {{ slapparameter_dict['ncell_list'][k].get('ssb_nr_arfcn', '') }}, + ul_nr_arfcn: {{ slapparameter_dict['ncell_list'][k].get('dl_nr_arfcn', '') }}, + n_id_cell: {{ slapparameter_dict['ncell_list'][k].get('n_id_cell', '') }}, + gnb_id_bits: {{ slapparameter_dict['ncell_list'][k].get('gnb_id_bits', '') }}, nr_cell_id: {{ slapparameter_dict['ncell_list'][k].get('nr_cell_id', '') }}, tac: {{ slapparameter_dict['ncell_list'][k].get('tac', 1) }}, - band: {{ band }}, + band: {{ slapparameter_dict['ncell_list'][k].get('nr_band', '') }}, ssb_subcarrier_spacing: 30, ssb_period: 20, ssb_offset: 0, diff --git a/software/ors-amarisoft/instance-gnb-input-schema.json.jinja2 b/software/ors-amarisoft/instance-gnb-input-schema.json.jinja2 index 210147dad182ab415865641546bcaae684c73159..3f150a824ae3fe90f0942cb2dd639ea2706b9329 100644 --- a/software/ors-amarisoft/instance-gnb-input-schema.json.jinja2 +++ b/software/ors-amarisoft/instance-gnb-input-schema.json.jinja2 @@ -85,12 +85,42 @@ "patternProperties": { ".*": { "properties": { + "dl_nr_arfcn": { + "title": "DL NR ARFCN", + "description": "Downlink NR Absolute Radio Frequency Channel Number of the neighbour cell", + "type": "number", + "default": {{ default_dl_nr_arfcn }} + }, + "ssb_nr_arfcn": { + "title": "SSB NR ARFCN", + "description": "SSB NR Absolute Radio Frequency Channel Number of the neighbour cell", + "type": "number", + "default": "" + }, + "pci": { + "title": "Physical Cell ID", + "description": "Physical Cell ID of the neighbour cell", + "type": "number", + "default": 500 + }, "nr_cell_id": { "title": "NR Cell ID", "description": "Concatenation of gnb_id and cell_id of the neighbour cell", "type": "string", "default": "0x1234501" }, + "gnb_id_bits": { + "title": "gNB ID bits", + "description": "Number of bits for the gNodeB global identifier. (range 22 to 32)", + "type": "number", + "default": 28 + }, + "nr_band": { + "title": "NR band", + "description": "NR band number", + "type": "number", + "default": {{ default_nr_band }} + }, "tac": { "default": 100, "title": "Tracking Area Code", @@ -104,6 +134,24 @@ "type": "object", "default": {} }, + "xn_peers": { + "title": "XN Peers", + "description": "XN Peers", + "patternProperties": { + ".*": { + "properties": { + "xn_addr": { + "title": "XN Address", + "description": "XN Address of the neighbour cell (gNB Address)", + "type": "string" + } + }, + "type": "object" + } + }, + "type": "object", + "default": {} + }, "gnb_id": { "title": "gNB ID", "description": "gNB ID", @@ -126,7 +174,7 @@ "title": "Physical Cell ID", "description": "Physical Cell ID", "type": "number", - "default": 1 + "default": 500 }, "ssb_pos_bitmap": { "title": "SSB Position Bitmap", diff --git a/software/ors-amarisoft/instance-tdd1900-gnb-input-schema.json b/software/ors-amarisoft/instance-tdd1900-gnb-input-schema.json index aa1520cdf76c5aab467424755edbca474ace3a1d..f319a20a5be98fe50c6ace4d6cf5a928686d9175 100644 --- a/software/ors-amarisoft/instance-tdd1900-gnb-input-schema.json +++ b/software/ors-amarisoft/instance-tdd1900-gnb-input-schema.json @@ -85,12 +85,42 @@ "patternProperties": { ".*": { "properties": { + "dl_nr_arfcn": { + "title": "DL NR ARFCN", + "description": "Downlink NR Absolute Radio Frequency Channel Number of the neighbour cell", + "type": "number", + "default": 378000 + }, + "ssb_nr_arfcn": { + "title": "SSB NR ARFCN", + "description": "SSB NR Absolute Radio Frequency Channel Number of the neighbour cell", + "type": "number", + "default": "" + }, + "pci": { + "title": "Physical Cell ID", + "description": "Physical Cell ID of the neighbour cell", + "type": "number", + "default": 500 + }, "nr_cell_id": { "title": "NR Cell ID", "description": "Concatenation of gnb_id and cell_id of the neighbour cell", "type": "string", "default": "0x1234501" }, + "gnb_id_bits": { + "title": "gNB ID bits", + "description": "Number of bits for the gNodeB global identifier. (range 22 to 32)", + "type": "number", + "default": 28 + }, + "nr_band": { + "title": "NR band", + "description": "NR band number", + "type": "number", + "default": 39 + }, "tac": { "default": 100, "title": "Tracking Area Code", @@ -104,6 +134,24 @@ "type": "object", "default": {} }, + "xn_peers": { + "title": "XN Peers", + "description": "XN Peers", + "patternProperties": { + ".*": { + "properties": { + "xn_addr": { + "title": "XN Address", + "description": "XN Address of the neighbour cell (gNB Address)", + "type": "string" + } + }, + "type": "object" + } + }, + "type": "object", + "default": {} + }, "gnb_id": { "title": "gNB ID", "description": "gNB ID", @@ -126,7 +174,7 @@ "title": "Physical Cell ID", "description": "Physical Cell ID", "type": "number", - "default": 1 + "default": 500 }, "ssb_pos_bitmap": { "title": "SSB Position Bitmap", diff --git a/software/ors-amarisoft/instance-tdd2600-gnb-input-schema.json b/software/ors-amarisoft/instance-tdd2600-gnb-input-schema.json index 18aaa72d32584a5eba46d2a393308efcf1069372..085470bbf39f5cca03d29ecad6539a03e1c309d3 100644 --- a/software/ors-amarisoft/instance-tdd2600-gnb-input-schema.json +++ b/software/ors-amarisoft/instance-tdd2600-gnb-input-schema.json @@ -85,12 +85,42 @@ "patternProperties": { ".*": { "properties": { + "dl_nr_arfcn": { + "title": "DL NR ARFCN", + "description": "Downlink NR Absolute Radio Frequency Channel Number of the neighbour cell", + "type": "number", + "default": 520000 + }, + "ssb_nr_arfcn": { + "title": "SSB NR ARFCN", + "description": "SSB NR Absolute Radio Frequency Channel Number of the neighbour cell", + "type": "number", + "default": "" + }, + "pci": { + "title": "Physical Cell ID", + "description": "Physical Cell ID of the neighbour cell", + "type": "number", + "default": 500 + }, "nr_cell_id": { "title": "NR Cell ID", "description": "Concatenation of gnb_id and cell_id of the neighbour cell", "type": "string", "default": "0x1234501" }, + "gnb_id_bits": { + "title": "gNB ID bits", + "description": "Number of bits for the gNodeB global identifier. (range 22 to 32)", + "type": "number", + "default": 28 + }, + "nr_band": { + "title": "NR band", + "description": "NR band number", + "type": "number", + "default": 38 + }, "tac": { "default": 100, "title": "Tracking Area Code", @@ -104,6 +134,24 @@ "type": "object", "default": {} }, + "xn_peers": { + "title": "XN Peers", + "description": "XN Peers", + "patternProperties": { + ".*": { + "properties": { + "xn_addr": { + "title": "XN Address", + "description": "XN Address of the neighbour cell (gNB Address)", + "type": "string" + } + }, + "type": "object" + } + }, + "type": "object", + "default": {} + }, "gnb_id": { "title": "gNB ID", "description": "gNB ID", @@ -126,7 +174,7 @@ "title": "Physical Cell ID", "description": "Physical Cell ID", "type": "number", - "default": 1 + "default": 500 }, "ssb_pos_bitmap": { "title": "SSB Position Bitmap", diff --git a/software/ors-amarisoft/instance-tdd3500-gnb-input-schema.json b/software/ors-amarisoft/instance-tdd3500-gnb-input-schema.json index 03c9b3ec140b6917316a163c7ec7fab64b8de62c..647d36d44628e20f6dd700d7b528b282378559b9 100644 --- a/software/ors-amarisoft/instance-tdd3500-gnb-input-schema.json +++ b/software/ors-amarisoft/instance-tdd3500-gnb-input-schema.json @@ -85,12 +85,42 @@ "patternProperties": { ".*": { "properties": { + "dl_nr_arfcn": { + "title": "DL NR ARFCN", + "description": "Downlink NR Absolute Radio Frequency Channel Number of the neighbour cell", + "type": "number", + "default": 632628 + }, + "ssb_nr_arfcn": { + "title": "SSB NR ARFCN", + "description": "SSB NR Absolute Radio Frequency Channel Number of the neighbour cell", + "type": "number", + "default": "" + }, + "pci": { + "title": "Physical Cell ID", + "description": "Physical Cell ID of the neighbour cell", + "type": "number", + "default": 500 + }, "nr_cell_id": { "title": "NR Cell ID", "description": "Concatenation of gnb_id and cell_id of the neighbour cell", "type": "string", "default": "0x1234501" }, + "gnb_id_bits": { + "title": "gNB ID bits", + "description": "Number of bits for the gNodeB global identifier. (range 22 to 32)", + "type": "number", + "default": 28 + }, + "nr_band": { + "title": "NR band", + "description": "NR band number", + "type": "number", + "default": 78 + }, "tac": { "default": 100, "title": "Tracking Area Code", @@ -104,6 +134,24 @@ "type": "object", "default": {} }, + "xn_peers": { + "title": "XN Peers", + "description": "XN Peers", + "patternProperties": { + ".*": { + "properties": { + "xn_addr": { + "title": "XN Address", + "description": "XN Address of the neighbour cell (gNB Address)", + "type": "string" + } + }, + "type": "object" + } + }, + "type": "object", + "default": {} + }, "gnb_id": { "title": "gNB ID", "description": "gNB ID", @@ -126,7 +174,7 @@ "title": "Physical Cell ID", "description": "Physical Cell ID", "type": "number", - "default": 1 + "default": 500 }, "ssb_pos_bitmap": { "title": "SSB Position Bitmap", diff --git a/software/ors-amarisoft/instance-tdd3700-gnb-input-schema.json b/software/ors-amarisoft/instance-tdd3700-gnb-input-schema.json index c8da2e71cb254cb1a40be3a3f41b7f67f2343094..c151e73c43c2ac16c3a545d3395ea0a4e0631a33 100644 --- a/software/ors-amarisoft/instance-tdd3700-gnb-input-schema.json +++ b/software/ors-amarisoft/instance-tdd3700-gnb-input-schema.json @@ -85,12 +85,42 @@ "patternProperties": { ".*": { "properties": { + "dl_nr_arfcn": { + "title": "DL NR ARFCN", + "description": "Downlink NR Absolute Radio Frequency Channel Number of the neighbour cell", + "type": "number", + "default": 646666 + }, + "ssb_nr_arfcn": { + "title": "SSB NR ARFCN", + "description": "SSB NR Absolute Radio Frequency Channel Number of the neighbour cell", + "type": "number", + "default": "" + }, + "pci": { + "title": "Physical Cell ID", + "description": "Physical Cell ID of the neighbour cell", + "type": "number", + "default": 500 + }, "nr_cell_id": { "title": "NR Cell ID", "description": "Concatenation of gnb_id and cell_id of the neighbour cell", "type": "string", "default": "0x1234501" }, + "gnb_id_bits": { + "title": "gNB ID bits", + "description": "Number of bits for the gNodeB global identifier. (range 22 to 32)", + "type": "number", + "default": 28 + }, + "nr_band": { + "title": "NR band", + "description": "NR band number", + "type": "number", + "default": 78 + }, "tac": { "default": 100, "title": "Tracking Area Code", @@ -104,6 +134,24 @@ "type": "object", "default": {} }, + "xn_peers": { + "title": "XN Peers", + "description": "XN Peers", + "patternProperties": { + ".*": { + "properties": { + "xn_addr": { + "title": "XN Address", + "description": "XN Address of the neighbour cell (gNB Address)", + "type": "string" + } + }, + "type": "object" + } + }, + "type": "object", + "default": {} + }, "gnb_id": { "title": "gNB ID", "description": "gNB ID", @@ -126,7 +174,7 @@ "title": "Physical Cell ID", "description": "Physical Cell ID", "type": "number", - "default": 1 + "default": 500 }, "ssb_pos_bitmap": { "title": "SSB Position Bitmap", diff --git a/software/rapid-cdn/buildout.hash.cfg b/software/rapid-cdn/buildout.hash.cfg index 47e4c6a0f80e310a316dfd8cdabcb8cd38efed54..2cce18022bd2357bb9eb820585aa0a8031b78e29 100644 --- a/software/rapid-cdn/buildout.hash.cfg +++ b/software/rapid-cdn/buildout.hash.cfg @@ -30,7 +30,7 @@ md5sum = 3006197ddce87bd92866b76b5ce8ce08 [profile-slave-list] filename = instance-slave-list.cfg.in -md5sum = 5d0b7461ecde54f68fda7f4e5fc2c82f +md5sum = f6b3d4c6502cc0fa3a5021e436b4771b [profile-master-publish-slave-information] filename = instance-master-publish-slave-information.cfg.in @@ -38,7 +38,7 @@ md5sum = cba4d995962f7fbeae3f61c9372c4181 [template-frontend-haproxy-configuration] _update_hash_filename_ = templates/frontend-haproxy.cfg.in -md5sum = ceb36ef6bdf5f508b5303a1680057bc8 +md5sum = eef9712c6fe4d62b570b9059157c67ea [template-frontend-haproxy-crt-list] _update_hash_filename_ = templates/frontend-haproxy-crt-list.in @@ -106,7 +106,7 @@ md5sum = a9854d48e750b3599043715c95138d5d [template-frontend-haproxy-rsyslogd-conf] _update_hash_filename_ = templates/frontend-haproxy-rsyslogd.conf.in -md5sum = 5b5907dfcac25f62da182024751cac30 +md5sum = afbf1a74322f927a10306657b9a590ad [template-backend-haproxy-rsyslogd-conf] _update_hash_filename_ = templates/backend-haproxy-rsyslogd.conf.in diff --git a/software/rapid-cdn/instance-slave-list.cfg.in b/software/rapid-cdn/instance-slave-list.cfg.in index 5354475c96e58799c9bbe7a73884a908a1d49ea4..7654029f6bdfaf401dd19010d806e7a38a61c956 100644 --- a/software/rapid-cdn/instance-slave-list.cfg.in +++ b/software/rapid-cdn/instance-slave-list.cfg.in @@ -203,8 +203,10 @@ context = {%- endif %} {# if slave_instance['health-check'] #} {#- Set Up log files #} {%- do slave_parameter_dict.__setitem__('access_log', '/'.join([frontend_directory['slave-log'], '%s_access_log' % slave_reference])) %} +{%- do slave_parameter_dict.__setitem__('frontend_log', '/'.join([frontend_directory['slave-log'], '%s_frontend_log' % slave_reference])) %} {%- do slave_parameter_dict.__setitem__('backend_log', '/'.join([frontend_directory['slave-log'], '%s_backend_log' % slave_reference])) %} {%- do slave_instance.__setitem__('access_log', slave_parameter_dict.get('access_log')) %} +{%- do slave_instance.__setitem__('frontend_log', slave_parameter_dict.get('frontend_log')) %} {%- do slave_instance.__setitem__('backend_log', slave_parameter_dict.get('backend_log')) %} {#- Add slave log directory to the slave log access dict #} {%- do slave_log_dict.__setitem__(slave_reference, slave_log_folder) %} @@ -282,7 +284,7 @@ log-directory = {{ '${slave-log-directory-dict:' + slave_reference + '}' }} [{{slave_logrotate_section}}] <= logrotate-entry-base name = ${:_buildout_section_name_} -log = {{slave_parameter_dict.get('access_log')}} {{slave_parameter_dict.get('backend_log')}} +log = {{slave_parameter_dict.get('access_log')}} {{slave_parameter_dict.get('frontend_log')}} {{slave_parameter_dict.get('backend_log')}} backup = {{ '${' + slave_log_directory_section + ':log-directory}' }} rotate-num = {{ dumps('' ~ configuration['rotate-num']) }} # disable delayed compression, as log filenames shall be stable @@ -296,6 +298,7 @@ stop-on-error = false log-directory = {{ '${' + slave_logrotate_section + ':backup}' }} command = ln -sf {{slave_parameter_dict.get('access_log')}} ${:log-directory}/access.log + ln -sf {{slave_parameter_dict.get('frontend_log')}} ${:log-directory}/frontend.log ln -sf {{slave_parameter_dict.get('backend_log')}} ${:log-directory}/backend.log {#- Set password for slave #} diff --git a/software/rapid-cdn/templates/frontend-haproxy-rsyslogd.conf.in b/software/rapid-cdn/templates/frontend-haproxy-rsyslogd.conf.in index 2113114da3c6eb19aa7e54d343cdd7a079ee49bd..3a2a23f8a9d47a7854b241329bb64b0f47d37a6c 100644 --- a/software/rapid-cdn/templates/frontend-haproxy-rsyslogd.conf.in +++ b/software/rapid-cdn/templates/frontend-haproxy-rsyslogd.conf.in @@ -16,16 +16,20 @@ $Umask 0022 $WorkDirectory {{ configuration['spool-directory'] }} # Setup logging per slave, by extracting the slave name from the log stream -{%- set regex = "^\\\\s*\\\\{(\\\\S.*)-https{0,1}\\\\} (.*)" %} +{%- set regex = "^\\\\s*\\\\{(\\\\S.*)-https{0,1}\\\\} (.*)!!!(.*)" %} # Extract file name part from 1st match template(name="extract_slave_name" type="string" string="%msg:R,ERE,1,FIELD:{{ regex }}--end%") set $!slave_name = exec_template("extract_slave_name"); -template(name="slave_output" type="string" string="{{ configuration['slave-log-directory'] }}/%$!slave_name%_access_log") -# Output only 2nd match, add the newline in the ned -template(name="haproxy_slave_line" type="string" string="%msg:R,ERE,2,FIELD:{{ regex }}--end%\n") +# Frontend output - the HAProxy's like httplog +template(name="frontend_output" type="string" string="{{ configuration['slave-log-directory'] }}/%$!slave_name%_frontend_log") +template(name="haproxy_frontend_line" type="string" string="%msg:R,ERE,2,FIELD:{{ regex }}--end%\n") +# Access output - the Apache's CLF +template(name="access_output" type="string" string="{{ configuration['slave-log-directory'] }}/%$!slave_name%_access_log") +template(name="haproxy_access_line" type="string" string="%msg:R,ERE,3,FIELD:{{ regex }}--end%\n") # React on match if (re_match($msg, '{{ regex }}')) then { - action(type="omfile" dynaFile="slave_output" template="haproxy_slave_line") + action(type="omfile" dynaFile="frontend_output" template="haproxy_frontend_line") + action(type="omfile" dynaFile="access_output" template="haproxy_access_line") stop } diff --git a/software/rapid-cdn/templates/frontend-haproxy.cfg.in b/software/rapid-cdn/templates/frontend-haproxy.cfg.in index e8a873eba3e1a9d408287025bd7524088a93cc89..e6b1c79c6a1a89c69bd2b1460fb68693a5a98731 100644 --- a/software/rapid-cdn/templates/frontend-haproxy.cfg.in +++ b/software/rapid-cdn/templates/frontend-haproxy.cfg.in @@ -58,7 +58,7 @@ defaults capture request header REMOTE_USER len 255 capture request header Referer len 255 capture request header User-Agent len 255 - log-format "%{+E}o {{ '{' }}%b{{ '}' }} %ci - %[capture.req.hdr(0)] [%trl] \"%HM %[capture.req.uri] %HV\" %ST %B \"%[capture.req.hdr(1)]\" \"%[capture.req.hdr(2)]\" %Ta" + log-format "%{+E}o {{ '{' }}%b{{ '}' }} %ci:%cp [%tr] %ft %b/%s %TR/%Tw/%Tc/%Tr/%Ta %ST %B %CC %CS %tsc %ac/%fc/%bc/%sc/%rc %sq/%bq!!!%ci - %[capture.req.hdr(0)] [%trl] \"%HM %[capture.req.uri] %HV\" %ST %B \"%[capture.req.hdr(1)]\" \"%[capture.req.hdr(2)]\" %Ta" # setup Via http-request add-header Via "%HV rapid-cdn-frontend-{{ configuration['node-id'] }}-{{ configuration['version-hash'] }}" # setup X-Forwarded-For diff --git a/software/rapid-cdn/test/test.py b/software/rapid-cdn/test/test.py index b31da64254c09b3b35abb2aa970af7efb441a2be..6efb873ebc785a8aa7de1b11e0b258f48784a60c 100644 --- a/software/rapid-cdn/test/test.py +++ b/software/rapid-cdn/test/test.py @@ -1044,7 +1044,7 @@ class HttpFrontendTestCase(SlapOSInstanceTestCase): ) self.assertEqual( sorted([q['name'] for q in result.json()]), - ['access.log', 'backend.log']) + ['access.log', 'backend.log', 'frontend.log']) # assert only for few tests, as logs are available for sure only # for few of them for test_name in [ @@ -2354,6 +2354,16 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin): http_version=self.max_client_version) ) + self.assertLastLogLineRegexp( + '_Url_frontend_log', + r'^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}:\d+ ' + r'\[\d{2}\/.{3}\/\d{4}\:\d{2}\:\d{2}\:\d{2}.\d{3}\] ' + r'https-frontend~ _Url-https\/_Url-backend-https ' + r'\d+/\d+\/\d+\/\d+\/\d+ ' + r'200 \d+ - - ---- ' + r'\d+\/\d+\/\d+\/\d+\/\d+ \d+\/\d+' + ) + self.assertLastLogLineRegexp( '_Url_backend_log', r'^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}:\d+ ' diff --git a/software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test00file_list_log.txt b/software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test00file_list_log.txt index 48669e88540fec370489299c1e1fb54bc49762c3..d282367752ce8b4a602f9d2852f53a7b1b07b479 100644 --- a/software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test00file_list_log.txt +++ b/software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test00file_list_log.txt @@ -10,9 +10,13 @@ T-2/var/log/expose-csr.log T-2/var/log/frontend-haproxy.log T-2/var/log/httpd/_dummy-cached_access_log T-2/var/log/httpd/_dummy-cached_backend_log +T-2/var/log/httpd/_dummy-cached_frontend_log T-2/var/log/httpd/_enable-http2-default_access_log +T-2/var/log/httpd/_enable-http2-default_frontend_log T-2/var/log/httpd/_enable-http2-false_access_log +T-2/var/log/httpd/_enable-http2-false_frontend_log T-2/var/log/httpd/_enable-http2-true_access_log +T-2/var/log/httpd/_enable-http2-true_frontend_log T-2/var/log/monitor-httpd-access.log T-2/var/log/monitor-httpd-error.log T-2/var/log/slave-introspection-access.log diff --git a/software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test00file_list_log.txt b/software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test00file_list_log.txt index a1a0972e52525986d662b0ebf81791f146420858..dfe623d37e6cd297cc16b55b965ca12e58833859 100644 --- a/software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test00file_list_log.txt +++ b/software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test00file_list_log.txt @@ -10,116 +10,175 @@ T-2/var/log/expose-csr.log T-2/var/log/frontend-haproxy.log T-2/var/log/httpd/_Url_access_log T-2/var/log/httpd/_Url_backend_log +T-2/var/log/httpd/_Url_frontend_log T-2/var/log/httpd/_auth-to-backend-backend-ignore_access_log T-2/var/log/httpd/_auth-to-backend-backend-ignore_backend_log +T-2/var/log/httpd/_auth-to-backend-backend-ignore_frontend_log T-2/var/log/httpd/_auth-to-backend-not-configured_access_log T-2/var/log/httpd/_auth-to-backend-not-configured_backend_log +T-2/var/log/httpd/_auth-to-backend-not-configured_frontend_log T-2/var/log/httpd/_auth-to-backend_access_log T-2/var/log/httpd/_auth-to-backend_backend_log +T-2/var/log/httpd/_auth-to-backend_frontend_log T-2/var/log/httpd/_bad-backend_access_log T-2/var/log/httpd/_bad-backend_backend_log +T-2/var/log/httpd/_bad-backend_frontend_log T-2/var/log/httpd/_ciphers-translation-all_access_log +T-2/var/log/httpd/_ciphers-translation-all_frontend_log T-2/var/log/httpd/_ciphers_access_log +T-2/var/log/httpd/_ciphers_frontend_log T-2/var/log/httpd/_custom_domain_access_log T-2/var/log/httpd/_custom_domain_backend_log +T-2/var/log/httpd/_custom_domain_frontend_log T-2/var/log/httpd/_custom_domain_server_alias_access_log T-2/var/log/httpd/_custom_domain_server_alias_backend_log +T-2/var/log/httpd/_custom_domain_server_alias_frontend_log T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_access_log T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_backend_log +T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_frontend_log T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_ssl_ca_crt_access_log T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_ssl_ca_crt_backend_log +T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_ssl_ca_crt_frontend_log T-2/var/log/httpd/_disabled-cookie-list-simple_access_log T-2/var/log/httpd/_disabled-cookie-list-simple_backend_log +T-2/var/log/httpd/_disabled-cookie-list-simple_frontend_log T-2/var/log/httpd/_disabled-cookie-list_access_log T-2/var/log/httpd/_disabled-cookie-list_backend_log +T-2/var/log/httpd/_disabled-cookie-list_frontend_log T-2/var/log/httpd/_empty_access_log +T-2/var/log/httpd/_empty_frontend_log T-2/var/log/httpd/_enable-http2-default_access_log T-2/var/log/httpd/_enable-http2-default_backend_log +T-2/var/log/httpd/_enable-http2-default_frontend_log T-2/var/log/httpd/_enable-http2-false_access_log T-2/var/log/httpd/_enable-http2-false_backend_log +T-2/var/log/httpd/_enable-http2-false_frontend_log T-2/var/log/httpd/_enable-http2-true_access_log T-2/var/log/httpd/_enable-http2-true_backend_log +T-2/var/log/httpd/_enable-http2-true_frontend_log T-2/var/log/httpd/_enable-http3-default-enable-http2-false_access_log T-2/var/log/httpd/_enable-http3-default-enable-http2-false_backend_log +T-2/var/log/httpd/_enable-http3-default-enable-http2-false_frontend_log T-2/var/log/httpd/_enable-http3-default_access_log T-2/var/log/httpd/_enable-http3-default_backend_log +T-2/var/log/httpd/_enable-http3-default_frontend_log T-2/var/log/httpd/_enable-http3-false_access_log T-2/var/log/httpd/_enable-http3-false_backend_log +T-2/var/log/httpd/_enable-http3-false_frontend_log T-2/var/log/httpd/_enable-http3-true-enable-http2-false_access_log T-2/var/log/httpd/_enable-http3-true-enable-http2-false_backend_log +T-2/var/log/httpd/_enable-http3-true-enable-http2-false_frontend_log T-2/var/log/httpd/_enable-http3-true_access_log T-2/var/log/httpd/_enable-http3-true_backend_log +T-2/var/log/httpd/_enable-http3-true_frontend_log T-2/var/log/httpd/_enable_cache-disable-no-cache-request_access_log T-2/var/log/httpd/_enable_cache-disable-no-cache-request_backend_log +T-2/var/log/httpd/_enable_cache-disable-no-cache-request_frontend_log T-2/var/log/httpd/_enable_cache-disable-via-header_access_log T-2/var/log/httpd/_enable_cache-disable-via-header_backend_log +T-2/var/log/httpd/_enable_cache-disable-via-header_frontend_log T-2/var/log/httpd/_enable_cache-https-only-false_access_log T-2/var/log/httpd/_enable_cache-https-only-false_backend_log +T-2/var/log/httpd/_enable_cache-https-only-false_frontend_log T-2/var/log/httpd/_enable_cache_access_log T-2/var/log/httpd/_enable_cache_backend_log T-2/var/log/httpd/_enable_cache_custom_domain_access_log T-2/var/log/httpd/_enable_cache_custom_domain_backend_log +T-2/var/log/httpd/_enable_cache_custom_domain_frontend_log +T-2/var/log/httpd/_enable_cache_frontend_log T-2/var/log/httpd/_enable_cache_server_alias_access_log T-2/var/log/httpd/_enable_cache_server_alias_backend_log +T-2/var/log/httpd/_enable_cache_server_alias_frontend_log T-2/var/log/httpd/_https-only_access_log T-2/var/log/httpd/_https-only_backend_log +T-2/var/log/httpd/_https-only_frontend_log T-2/var/log/httpd/_https-url-netloc-list_access_log T-2/var/log/httpd/_https-url-netloc-list_backend_log +T-2/var/log/httpd/_https-url-netloc-list_frontend_log T-2/var/log/httpd/_prefer-gzip-encoding-to-backend-https-only_access_log T-2/var/log/httpd/_prefer-gzip-encoding-to-backend-https-only_backend_log +T-2/var/log/httpd/_prefer-gzip-encoding-to-backend-https-only_frontend_log T-2/var/log/httpd/_prefer-gzip-encoding-to-backend_access_log T-2/var/log/httpd/_prefer-gzip-encoding-to-backend_backend_log +T-2/var/log/httpd/_prefer-gzip-encoding-to-backend_frontend_log T-2/var/log/httpd/_server-alias-duplicated_access_log T-2/var/log/httpd/_server-alias-duplicated_backend_log +T-2/var/log/httpd/_server-alias-duplicated_frontend_log T-2/var/log/httpd/_server-alias-empty_access_log T-2/var/log/httpd/_server-alias-empty_backend_log +T-2/var/log/httpd/_server-alias-empty_frontend_log T-2/var/log/httpd/_server-alias-wildcard_access_log T-2/var/log/httpd/_server-alias-wildcard_backend_log +T-2/var/log/httpd/_server-alias-wildcard_frontend_log T-2/var/log/httpd/_server-alias_access_log T-2/var/log/httpd/_server-alias_backend_log T-2/var/log/httpd/_server-alias_custom_domain-duplicated_access_log T-2/var/log/httpd/_server-alias_custom_domain-duplicated_backend_log +T-2/var/log/httpd/_server-alias_custom_domain-duplicated_frontend_log +T-2/var/log/httpd/_server-alias_frontend_log T-2/var/log/httpd/_ssl-proxy-verify-unverified_access_log T-2/var/log/httpd/_ssl-proxy-verify-unverified_backend_log +T-2/var/log/httpd/_ssl-proxy-verify-unverified_frontend_log T-2/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt-unverified_access_log T-2/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt-unverified_backend_log +T-2/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt-unverified_frontend_log T-2/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt_access_log T-2/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt_backend_log +T-2/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt_frontend_log T-2/var/log/httpd/_ssl_ca_crt_does_not_match_access_log T-2/var/log/httpd/_ssl_ca_crt_does_not_match_backend_log +T-2/var/log/httpd/_ssl_ca_crt_does_not_match_frontend_log T-2/var/log/httpd/_ssl_ca_crt_garbage_access_log T-2/var/log/httpd/_ssl_ca_crt_garbage_backend_log +T-2/var/log/httpd/_ssl_ca_crt_garbage_frontend_log T-2/var/log/httpd/_ssl_ca_crt_only_access_log T-2/var/log/httpd/_ssl_ca_crt_only_backend_log +T-2/var/log/httpd/_ssl_ca_crt_only_frontend_log T-2/var/log/httpd/_type-notebook_access_log T-2/var/log/httpd/_type-notebook_backend_log +T-2/var/log/httpd/_type-notebook_frontend_log T-2/var/log/httpd/_type-redirect-custom_domain_access_log +T-2/var/log/httpd/_type-redirect-custom_domain_frontend_log T-2/var/log/httpd/_type-redirect_access_log +T-2/var/log/httpd/_type-redirect_frontend_log T-2/var/log/httpd/_type-websocket-websocket-path-list-websocket-transparent-false_access_log T-2/var/log/httpd/_type-websocket-websocket-path-list-websocket-transparent-false_backend_log +T-2/var/log/httpd/_type-websocket-websocket-path-list-websocket-transparent-false_frontend_log T-2/var/log/httpd/_type-websocket-websocket-path-list_access_log T-2/var/log/httpd/_type-websocket-websocket-path-list_backend_log +T-2/var/log/httpd/_type-websocket-websocket-path-list_frontend_log T-2/var/log/httpd/_type-websocket-websocket-transparent-false_access_log T-2/var/log/httpd/_type-websocket-websocket-transparent-false_backend_log +T-2/var/log/httpd/_type-websocket-websocket-transparent-false_frontend_log T-2/var/log/httpd/_type-websocket_access_log T-2/var/log/httpd/_type-websocket_backend_log +T-2/var/log/httpd/_type-websocket_frontend_log T-2/var/log/httpd/_type-zope-default-path_access_log +T-2/var/log/httpd/_type-zope-default-path_frontend_log T-2/var/log/httpd/_type-zope-path_access_log T-2/var/log/httpd/_type-zope-path_backend_log +T-2/var/log/httpd/_type-zope-path_frontend_log T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend-https-only_access_log T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend-https-only_backend_log +T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend-https-only_frontend_log T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend_access_log T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend_backend_log +T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend_frontend_log T-2/var/log/httpd/_type-zope-virtualhostroot-http-port_access_log T-2/var/log/httpd/_type-zope-virtualhostroot-http-port_backend_log +T-2/var/log/httpd/_type-zope-virtualhostroot-http-port_frontend_log T-2/var/log/httpd/_type-zope-virtualhostroot-https-port_access_log T-2/var/log/httpd/_type-zope-virtualhostroot-https-port_backend_log +T-2/var/log/httpd/_type-zope-virtualhostroot-https-port_frontend_log T-2/var/log/httpd/_type-zope_access_log T-2/var/log/httpd/_type-zope_backend_log +T-2/var/log/httpd/_type-zope_frontend_log T-2/var/log/httpd/_url-netloc-list_access_log T-2/var/log/httpd/_url-netloc-list_backend_log +T-2/var/log/httpd/_url-netloc-list_frontend_log T-2/var/log/httpd/_url_https-url_access_log T-2/var/log/httpd/_url_https-url_backend_log +T-2/var/log/httpd/_url_https-url_frontend_log T-2/var/log/monitor-httpd-access.log T-2/var/log/monitor-httpd-error.log T-2/var/log/slave-introspection-access.log diff --git a/software/rapid-cdn/test/test_data/test.TestRe6stVerificationUrlSlave.test00file_list_log.txt b/software/rapid-cdn/test/test_data/test.TestRe6stVerificationUrlSlave.test00file_list_log.txt index c805c2e2591905555fc30b8e632e77bac8564aab..244bd6959be50bd0173cc570c70c5562e85478eb 100644 --- a/software/rapid-cdn/test/test_data/test.TestRe6stVerificationUrlSlave.test00file_list_log.txt +++ b/software/rapid-cdn/test/test_data/test.TestRe6stVerificationUrlSlave.test00file_list_log.txt @@ -10,6 +10,7 @@ T-2/var/log/expose-csr.log T-2/var/log/frontend-haproxy.log T-2/var/log/httpd/_default_access_log T-2/var/log/httpd/_default_backend_log +T-2/var/log/httpd/_default_frontend_log T-2/var/log/monitor-httpd-access.log T-2/var/log/monitor-httpd-error.log T-2/var/log/slave-introspection-access.log diff --git a/software/rapid-cdn/test/test_data/test.TestReplicateSlave.test00file_list_log.txt b/software/rapid-cdn/test/test_data/test.TestReplicateSlave.test00file_list_log.txt index 63fe555e15082ab94dbd1b3963625cff57be8881..6fac103b68d3da4443b41ceb3319cf2287146c88 100644 --- a/software/rapid-cdn/test/test_data/test.TestReplicateSlave.test00file_list_log.txt +++ b/software/rapid-cdn/test/test_data/test.TestReplicateSlave.test00file_list_log.txt @@ -10,6 +10,7 @@ T-2/var/log/expose-csr.log T-2/var/log/frontend-haproxy.log T-2/var/log/httpd/_replicate_access_log T-2/var/log/httpd/_replicate_backend_log +T-2/var/log/httpd/_replicate_frontend_log T-2/var/log/monitor-httpd-access.log T-2/var/log/monitor-httpd-error.log T-2/var/log/slave-introspection-access.log diff --git a/software/rapid-cdn/test/test_data/test.TestSlave.test00file_list_log.txt b/software/rapid-cdn/test/test_data/test.TestSlave.test00file_list_log.txt index a1a0972e52525986d662b0ebf81791f146420858..dfe623d37e6cd297cc16b55b965ca12e58833859 100644 --- a/software/rapid-cdn/test/test_data/test.TestSlave.test00file_list_log.txt +++ b/software/rapid-cdn/test/test_data/test.TestSlave.test00file_list_log.txt @@ -10,116 +10,175 @@ T-2/var/log/expose-csr.log T-2/var/log/frontend-haproxy.log T-2/var/log/httpd/_Url_access_log T-2/var/log/httpd/_Url_backend_log +T-2/var/log/httpd/_Url_frontend_log T-2/var/log/httpd/_auth-to-backend-backend-ignore_access_log T-2/var/log/httpd/_auth-to-backend-backend-ignore_backend_log +T-2/var/log/httpd/_auth-to-backend-backend-ignore_frontend_log T-2/var/log/httpd/_auth-to-backend-not-configured_access_log T-2/var/log/httpd/_auth-to-backend-not-configured_backend_log +T-2/var/log/httpd/_auth-to-backend-not-configured_frontend_log T-2/var/log/httpd/_auth-to-backend_access_log T-2/var/log/httpd/_auth-to-backend_backend_log +T-2/var/log/httpd/_auth-to-backend_frontend_log T-2/var/log/httpd/_bad-backend_access_log T-2/var/log/httpd/_bad-backend_backend_log +T-2/var/log/httpd/_bad-backend_frontend_log T-2/var/log/httpd/_ciphers-translation-all_access_log +T-2/var/log/httpd/_ciphers-translation-all_frontend_log T-2/var/log/httpd/_ciphers_access_log +T-2/var/log/httpd/_ciphers_frontend_log T-2/var/log/httpd/_custom_domain_access_log T-2/var/log/httpd/_custom_domain_backend_log +T-2/var/log/httpd/_custom_domain_frontend_log T-2/var/log/httpd/_custom_domain_server_alias_access_log T-2/var/log/httpd/_custom_domain_server_alias_backend_log +T-2/var/log/httpd/_custom_domain_server_alias_frontend_log T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_access_log T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_backend_log +T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_frontend_log T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_ssl_ca_crt_access_log T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_ssl_ca_crt_backend_log +T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_ssl_ca_crt_frontend_log T-2/var/log/httpd/_disabled-cookie-list-simple_access_log T-2/var/log/httpd/_disabled-cookie-list-simple_backend_log +T-2/var/log/httpd/_disabled-cookie-list-simple_frontend_log T-2/var/log/httpd/_disabled-cookie-list_access_log T-2/var/log/httpd/_disabled-cookie-list_backend_log +T-2/var/log/httpd/_disabled-cookie-list_frontend_log T-2/var/log/httpd/_empty_access_log +T-2/var/log/httpd/_empty_frontend_log T-2/var/log/httpd/_enable-http2-default_access_log T-2/var/log/httpd/_enable-http2-default_backend_log +T-2/var/log/httpd/_enable-http2-default_frontend_log T-2/var/log/httpd/_enable-http2-false_access_log T-2/var/log/httpd/_enable-http2-false_backend_log +T-2/var/log/httpd/_enable-http2-false_frontend_log T-2/var/log/httpd/_enable-http2-true_access_log T-2/var/log/httpd/_enable-http2-true_backend_log +T-2/var/log/httpd/_enable-http2-true_frontend_log T-2/var/log/httpd/_enable-http3-default-enable-http2-false_access_log T-2/var/log/httpd/_enable-http3-default-enable-http2-false_backend_log +T-2/var/log/httpd/_enable-http3-default-enable-http2-false_frontend_log T-2/var/log/httpd/_enable-http3-default_access_log T-2/var/log/httpd/_enable-http3-default_backend_log +T-2/var/log/httpd/_enable-http3-default_frontend_log T-2/var/log/httpd/_enable-http3-false_access_log T-2/var/log/httpd/_enable-http3-false_backend_log +T-2/var/log/httpd/_enable-http3-false_frontend_log T-2/var/log/httpd/_enable-http3-true-enable-http2-false_access_log T-2/var/log/httpd/_enable-http3-true-enable-http2-false_backend_log +T-2/var/log/httpd/_enable-http3-true-enable-http2-false_frontend_log T-2/var/log/httpd/_enable-http3-true_access_log T-2/var/log/httpd/_enable-http3-true_backend_log +T-2/var/log/httpd/_enable-http3-true_frontend_log T-2/var/log/httpd/_enable_cache-disable-no-cache-request_access_log T-2/var/log/httpd/_enable_cache-disable-no-cache-request_backend_log +T-2/var/log/httpd/_enable_cache-disable-no-cache-request_frontend_log T-2/var/log/httpd/_enable_cache-disable-via-header_access_log T-2/var/log/httpd/_enable_cache-disable-via-header_backend_log +T-2/var/log/httpd/_enable_cache-disable-via-header_frontend_log T-2/var/log/httpd/_enable_cache-https-only-false_access_log T-2/var/log/httpd/_enable_cache-https-only-false_backend_log +T-2/var/log/httpd/_enable_cache-https-only-false_frontend_log T-2/var/log/httpd/_enable_cache_access_log T-2/var/log/httpd/_enable_cache_backend_log T-2/var/log/httpd/_enable_cache_custom_domain_access_log T-2/var/log/httpd/_enable_cache_custom_domain_backend_log +T-2/var/log/httpd/_enable_cache_custom_domain_frontend_log +T-2/var/log/httpd/_enable_cache_frontend_log T-2/var/log/httpd/_enable_cache_server_alias_access_log T-2/var/log/httpd/_enable_cache_server_alias_backend_log +T-2/var/log/httpd/_enable_cache_server_alias_frontend_log T-2/var/log/httpd/_https-only_access_log T-2/var/log/httpd/_https-only_backend_log +T-2/var/log/httpd/_https-only_frontend_log T-2/var/log/httpd/_https-url-netloc-list_access_log T-2/var/log/httpd/_https-url-netloc-list_backend_log +T-2/var/log/httpd/_https-url-netloc-list_frontend_log T-2/var/log/httpd/_prefer-gzip-encoding-to-backend-https-only_access_log T-2/var/log/httpd/_prefer-gzip-encoding-to-backend-https-only_backend_log +T-2/var/log/httpd/_prefer-gzip-encoding-to-backend-https-only_frontend_log T-2/var/log/httpd/_prefer-gzip-encoding-to-backend_access_log T-2/var/log/httpd/_prefer-gzip-encoding-to-backend_backend_log +T-2/var/log/httpd/_prefer-gzip-encoding-to-backend_frontend_log T-2/var/log/httpd/_server-alias-duplicated_access_log T-2/var/log/httpd/_server-alias-duplicated_backend_log +T-2/var/log/httpd/_server-alias-duplicated_frontend_log T-2/var/log/httpd/_server-alias-empty_access_log T-2/var/log/httpd/_server-alias-empty_backend_log +T-2/var/log/httpd/_server-alias-empty_frontend_log T-2/var/log/httpd/_server-alias-wildcard_access_log T-2/var/log/httpd/_server-alias-wildcard_backend_log +T-2/var/log/httpd/_server-alias-wildcard_frontend_log T-2/var/log/httpd/_server-alias_access_log T-2/var/log/httpd/_server-alias_backend_log T-2/var/log/httpd/_server-alias_custom_domain-duplicated_access_log T-2/var/log/httpd/_server-alias_custom_domain-duplicated_backend_log +T-2/var/log/httpd/_server-alias_custom_domain-duplicated_frontend_log +T-2/var/log/httpd/_server-alias_frontend_log T-2/var/log/httpd/_ssl-proxy-verify-unverified_access_log T-2/var/log/httpd/_ssl-proxy-verify-unverified_backend_log +T-2/var/log/httpd/_ssl-proxy-verify-unverified_frontend_log T-2/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt-unverified_access_log T-2/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt-unverified_backend_log +T-2/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt-unverified_frontend_log T-2/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt_access_log T-2/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt_backend_log +T-2/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt_frontend_log T-2/var/log/httpd/_ssl_ca_crt_does_not_match_access_log T-2/var/log/httpd/_ssl_ca_crt_does_not_match_backend_log +T-2/var/log/httpd/_ssl_ca_crt_does_not_match_frontend_log T-2/var/log/httpd/_ssl_ca_crt_garbage_access_log T-2/var/log/httpd/_ssl_ca_crt_garbage_backend_log +T-2/var/log/httpd/_ssl_ca_crt_garbage_frontend_log T-2/var/log/httpd/_ssl_ca_crt_only_access_log T-2/var/log/httpd/_ssl_ca_crt_only_backend_log +T-2/var/log/httpd/_ssl_ca_crt_only_frontend_log T-2/var/log/httpd/_type-notebook_access_log T-2/var/log/httpd/_type-notebook_backend_log +T-2/var/log/httpd/_type-notebook_frontend_log T-2/var/log/httpd/_type-redirect-custom_domain_access_log +T-2/var/log/httpd/_type-redirect-custom_domain_frontend_log T-2/var/log/httpd/_type-redirect_access_log +T-2/var/log/httpd/_type-redirect_frontend_log T-2/var/log/httpd/_type-websocket-websocket-path-list-websocket-transparent-false_access_log T-2/var/log/httpd/_type-websocket-websocket-path-list-websocket-transparent-false_backend_log +T-2/var/log/httpd/_type-websocket-websocket-path-list-websocket-transparent-false_frontend_log T-2/var/log/httpd/_type-websocket-websocket-path-list_access_log T-2/var/log/httpd/_type-websocket-websocket-path-list_backend_log +T-2/var/log/httpd/_type-websocket-websocket-path-list_frontend_log T-2/var/log/httpd/_type-websocket-websocket-transparent-false_access_log T-2/var/log/httpd/_type-websocket-websocket-transparent-false_backend_log +T-2/var/log/httpd/_type-websocket-websocket-transparent-false_frontend_log T-2/var/log/httpd/_type-websocket_access_log T-2/var/log/httpd/_type-websocket_backend_log +T-2/var/log/httpd/_type-websocket_frontend_log T-2/var/log/httpd/_type-zope-default-path_access_log +T-2/var/log/httpd/_type-zope-default-path_frontend_log T-2/var/log/httpd/_type-zope-path_access_log T-2/var/log/httpd/_type-zope-path_backend_log +T-2/var/log/httpd/_type-zope-path_frontend_log T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend-https-only_access_log T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend-https-only_backend_log +T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend-https-only_frontend_log T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend_access_log T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend_backend_log +T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend_frontend_log T-2/var/log/httpd/_type-zope-virtualhostroot-http-port_access_log T-2/var/log/httpd/_type-zope-virtualhostroot-http-port_backend_log +T-2/var/log/httpd/_type-zope-virtualhostroot-http-port_frontend_log T-2/var/log/httpd/_type-zope-virtualhostroot-https-port_access_log T-2/var/log/httpd/_type-zope-virtualhostroot-https-port_backend_log +T-2/var/log/httpd/_type-zope-virtualhostroot-https-port_frontend_log T-2/var/log/httpd/_type-zope_access_log T-2/var/log/httpd/_type-zope_backend_log +T-2/var/log/httpd/_type-zope_frontend_log T-2/var/log/httpd/_url-netloc-list_access_log T-2/var/log/httpd/_url-netloc-list_backend_log +T-2/var/log/httpd/_url-netloc-list_frontend_log T-2/var/log/httpd/_url_https-url_access_log T-2/var/log/httpd/_url_https-url_backend_log +T-2/var/log/httpd/_url_https-url_frontend_log T-2/var/log/monitor-httpd-access.log T-2/var/log/monitor-httpd-error.log T-2/var/log/slave-introspection-access.log diff --git a/software/rapid-cdn/test/test_data/test.TestSlaveCiphers.test00file_list_log.txt b/software/rapid-cdn/test/test_data/test.TestSlaveCiphers.test00file_list_log.txt index b258ada1194ecfbc82723af62b80ec8ad37e5abd..24404d713d45c642219dd0fcaadc7920e059802a 100644 --- a/software/rapid-cdn/test/test_data/test.TestSlaveCiphers.test00file_list_log.txt +++ b/software/rapid-cdn/test/test_data/test.TestSlaveCiphers.test00file_list_log.txt @@ -10,8 +10,10 @@ T-2/var/log/expose-csr.log T-2/var/log/frontend-haproxy.log T-2/var/log/httpd/_default_ciphers_access_log T-2/var/log/httpd/_default_ciphers_backend_log +T-2/var/log/httpd/_default_ciphers_frontend_log T-2/var/log/httpd/_own_ciphers_access_log T-2/var/log/httpd/_own_ciphers_backend_log +T-2/var/log/httpd/_own_ciphers_frontend_log T-2/var/log/monitor-httpd-access.log T-2/var/log/monitor-httpd-error.log T-2/var/log/slave-introspection-access.log diff --git a/software/rapid-cdn/test/test_data/test.TestSlaveHealthCheck.test00file_list_log.txt b/software/rapid-cdn/test/test_data/test.TestSlaveHealthCheck.test00file_list_log.txt index d17bd66882924ee7498a35873c270e9f2ab655e6..576dbc7bf283e2750afa1ded574eed89fe68c144 100644 --- a/software/rapid-cdn/test/test_data/test.TestSlaveHealthCheck.test00file_list_log.txt +++ b/software/rapid-cdn/test/test_data/test.TestSlaveHealthCheck.test00file_list_log.txt @@ -10,24 +10,34 @@ T-2/var/log/expose-csr.log T-2/var/log/frontend-haproxy.log T-2/var/log/httpd/_health-check-connect_access_log T-2/var/log/httpd/_health-check-connect_backend_log +T-2/var/log/httpd/_health-check-connect_frontend_log T-2/var/log/httpd/_health-check-custom_access_log T-2/var/log/httpd/_health-check-custom_backend_log +T-2/var/log/httpd/_health-check-custom_frontend_log T-2/var/log/httpd/_health-check-default_access_log T-2/var/log/httpd/_health-check-default_backend_log +T-2/var/log/httpd/_health-check-default_frontend_log T-2/var/log/httpd/_health-check-disabled_access_log T-2/var/log/httpd/_health-check-disabled_backend_log +T-2/var/log/httpd/_health-check-disabled_frontend_log T-2/var/log/httpd/_health-check-failover-url-auth-to-backend_access_log T-2/var/log/httpd/_health-check-failover-url-auth-to-backend_backend_log +T-2/var/log/httpd/_health-check-failover-url-auth-to-backend_frontend_log T-2/var/log/httpd/_health-check-failover-url-netloc-list_access_log T-2/var/log/httpd/_health-check-failover-url-netloc-list_backend_log +T-2/var/log/httpd/_health-check-failover-url-netloc-list_frontend_log T-2/var/log/httpd/_health-check-failover-url-ssl-proxy-verified_access_log T-2/var/log/httpd/_health-check-failover-url-ssl-proxy-verified_backend_log +T-2/var/log/httpd/_health-check-failover-url-ssl-proxy-verified_frontend_log T-2/var/log/httpd/_health-check-failover-url-ssl-proxy-verify-missing_access_log T-2/var/log/httpd/_health-check-failover-url-ssl-proxy-verify-missing_backend_log +T-2/var/log/httpd/_health-check-failover-url-ssl-proxy-verify-missing_frontend_log T-2/var/log/httpd/_health-check-failover-url-ssl-proxy-verify-unverified_access_log T-2/var/log/httpd/_health-check-failover-url-ssl-proxy-verify-unverified_backend_log +T-2/var/log/httpd/_health-check-failover-url-ssl-proxy-verify-unverified_frontend_log T-2/var/log/httpd/_health-check-failover-url_access_log T-2/var/log/httpd/_health-check-failover-url_backend_log +T-2/var/log/httpd/_health-check-failover-url_frontend_log T-2/var/log/monitor-httpd-access.log T-2/var/log/monitor-httpd-error.log T-2/var/log/slave-introspection-access.log diff --git a/software/rapid-cdn/test/test_data/test.TestSlaveHostHaproxyClash.test00file_list_log.txt b/software/rapid-cdn/test/test_data/test.TestSlaveHostHaproxyClash.test00file_list_log.txt index ff718f8148daa47c359d7a7743c9fe2924a7a928..78ce58bcda4c846f6decb109496b92dd585769c1 100644 --- a/software/rapid-cdn/test/test_data/test.TestSlaveHostHaproxyClash.test00file_list_log.txt +++ b/software/rapid-cdn/test/test_data/test.TestSlaveHostHaproxyClash.test00file_list_log.txt @@ -10,8 +10,10 @@ T-2/var/log/expose-csr.log T-2/var/log/frontend-haproxy.log T-2/var/log/httpd/_wildcard_access_log T-2/var/log/httpd/_wildcard_backend_log +T-2/var/log/httpd/_wildcard_frontend_log T-2/var/log/httpd/_zspecific_access_log T-2/var/log/httpd/_zspecific_backend_log +T-2/var/log/httpd/_zspecific_frontend_log T-2/var/log/monitor-httpd-access.log T-2/var/log/monitor-httpd-error.log T-2/var/log/slave-introspection-access.log diff --git a/software/rapid-cdn/test/test_data/test.TestSlaveHttp3.test00file_list_log.txt b/software/rapid-cdn/test/test_data/test.TestSlaveHttp3.test00file_list_log.txt index a1a0972e52525986d662b0ebf81791f146420858..dfe623d37e6cd297cc16b55b965ca12e58833859 100644 --- a/software/rapid-cdn/test/test_data/test.TestSlaveHttp3.test00file_list_log.txt +++ b/software/rapid-cdn/test/test_data/test.TestSlaveHttp3.test00file_list_log.txt @@ -10,116 +10,175 @@ T-2/var/log/expose-csr.log T-2/var/log/frontend-haproxy.log T-2/var/log/httpd/_Url_access_log T-2/var/log/httpd/_Url_backend_log +T-2/var/log/httpd/_Url_frontend_log T-2/var/log/httpd/_auth-to-backend-backend-ignore_access_log T-2/var/log/httpd/_auth-to-backend-backend-ignore_backend_log +T-2/var/log/httpd/_auth-to-backend-backend-ignore_frontend_log T-2/var/log/httpd/_auth-to-backend-not-configured_access_log T-2/var/log/httpd/_auth-to-backend-not-configured_backend_log +T-2/var/log/httpd/_auth-to-backend-not-configured_frontend_log T-2/var/log/httpd/_auth-to-backend_access_log T-2/var/log/httpd/_auth-to-backend_backend_log +T-2/var/log/httpd/_auth-to-backend_frontend_log T-2/var/log/httpd/_bad-backend_access_log T-2/var/log/httpd/_bad-backend_backend_log +T-2/var/log/httpd/_bad-backend_frontend_log T-2/var/log/httpd/_ciphers-translation-all_access_log +T-2/var/log/httpd/_ciphers-translation-all_frontend_log T-2/var/log/httpd/_ciphers_access_log +T-2/var/log/httpd/_ciphers_frontend_log T-2/var/log/httpd/_custom_domain_access_log T-2/var/log/httpd/_custom_domain_backend_log +T-2/var/log/httpd/_custom_domain_frontend_log T-2/var/log/httpd/_custom_domain_server_alias_access_log T-2/var/log/httpd/_custom_domain_server_alias_backend_log +T-2/var/log/httpd/_custom_domain_server_alias_frontend_log T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_access_log T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_backend_log +T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_frontend_log T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_ssl_ca_crt_access_log T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_ssl_ca_crt_backend_log +T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_ssl_ca_crt_frontend_log T-2/var/log/httpd/_disabled-cookie-list-simple_access_log T-2/var/log/httpd/_disabled-cookie-list-simple_backend_log +T-2/var/log/httpd/_disabled-cookie-list-simple_frontend_log T-2/var/log/httpd/_disabled-cookie-list_access_log T-2/var/log/httpd/_disabled-cookie-list_backend_log +T-2/var/log/httpd/_disabled-cookie-list_frontend_log T-2/var/log/httpd/_empty_access_log +T-2/var/log/httpd/_empty_frontend_log T-2/var/log/httpd/_enable-http2-default_access_log T-2/var/log/httpd/_enable-http2-default_backend_log +T-2/var/log/httpd/_enable-http2-default_frontend_log T-2/var/log/httpd/_enable-http2-false_access_log T-2/var/log/httpd/_enable-http2-false_backend_log +T-2/var/log/httpd/_enable-http2-false_frontend_log T-2/var/log/httpd/_enable-http2-true_access_log T-2/var/log/httpd/_enable-http2-true_backend_log +T-2/var/log/httpd/_enable-http2-true_frontend_log T-2/var/log/httpd/_enable-http3-default-enable-http2-false_access_log T-2/var/log/httpd/_enable-http3-default-enable-http2-false_backend_log +T-2/var/log/httpd/_enable-http3-default-enable-http2-false_frontend_log T-2/var/log/httpd/_enable-http3-default_access_log T-2/var/log/httpd/_enable-http3-default_backend_log +T-2/var/log/httpd/_enable-http3-default_frontend_log T-2/var/log/httpd/_enable-http3-false_access_log T-2/var/log/httpd/_enable-http3-false_backend_log +T-2/var/log/httpd/_enable-http3-false_frontend_log T-2/var/log/httpd/_enable-http3-true-enable-http2-false_access_log T-2/var/log/httpd/_enable-http3-true-enable-http2-false_backend_log +T-2/var/log/httpd/_enable-http3-true-enable-http2-false_frontend_log T-2/var/log/httpd/_enable-http3-true_access_log T-2/var/log/httpd/_enable-http3-true_backend_log +T-2/var/log/httpd/_enable-http3-true_frontend_log T-2/var/log/httpd/_enable_cache-disable-no-cache-request_access_log T-2/var/log/httpd/_enable_cache-disable-no-cache-request_backend_log +T-2/var/log/httpd/_enable_cache-disable-no-cache-request_frontend_log T-2/var/log/httpd/_enable_cache-disable-via-header_access_log T-2/var/log/httpd/_enable_cache-disable-via-header_backend_log +T-2/var/log/httpd/_enable_cache-disable-via-header_frontend_log T-2/var/log/httpd/_enable_cache-https-only-false_access_log T-2/var/log/httpd/_enable_cache-https-only-false_backend_log +T-2/var/log/httpd/_enable_cache-https-only-false_frontend_log T-2/var/log/httpd/_enable_cache_access_log T-2/var/log/httpd/_enable_cache_backend_log T-2/var/log/httpd/_enable_cache_custom_domain_access_log T-2/var/log/httpd/_enable_cache_custom_domain_backend_log +T-2/var/log/httpd/_enable_cache_custom_domain_frontend_log +T-2/var/log/httpd/_enable_cache_frontend_log T-2/var/log/httpd/_enable_cache_server_alias_access_log T-2/var/log/httpd/_enable_cache_server_alias_backend_log +T-2/var/log/httpd/_enable_cache_server_alias_frontend_log T-2/var/log/httpd/_https-only_access_log T-2/var/log/httpd/_https-only_backend_log +T-2/var/log/httpd/_https-only_frontend_log T-2/var/log/httpd/_https-url-netloc-list_access_log T-2/var/log/httpd/_https-url-netloc-list_backend_log +T-2/var/log/httpd/_https-url-netloc-list_frontend_log T-2/var/log/httpd/_prefer-gzip-encoding-to-backend-https-only_access_log T-2/var/log/httpd/_prefer-gzip-encoding-to-backend-https-only_backend_log +T-2/var/log/httpd/_prefer-gzip-encoding-to-backend-https-only_frontend_log T-2/var/log/httpd/_prefer-gzip-encoding-to-backend_access_log T-2/var/log/httpd/_prefer-gzip-encoding-to-backend_backend_log +T-2/var/log/httpd/_prefer-gzip-encoding-to-backend_frontend_log T-2/var/log/httpd/_server-alias-duplicated_access_log T-2/var/log/httpd/_server-alias-duplicated_backend_log +T-2/var/log/httpd/_server-alias-duplicated_frontend_log T-2/var/log/httpd/_server-alias-empty_access_log T-2/var/log/httpd/_server-alias-empty_backend_log +T-2/var/log/httpd/_server-alias-empty_frontend_log T-2/var/log/httpd/_server-alias-wildcard_access_log T-2/var/log/httpd/_server-alias-wildcard_backend_log +T-2/var/log/httpd/_server-alias-wildcard_frontend_log T-2/var/log/httpd/_server-alias_access_log T-2/var/log/httpd/_server-alias_backend_log T-2/var/log/httpd/_server-alias_custom_domain-duplicated_access_log T-2/var/log/httpd/_server-alias_custom_domain-duplicated_backend_log +T-2/var/log/httpd/_server-alias_custom_domain-duplicated_frontend_log +T-2/var/log/httpd/_server-alias_frontend_log T-2/var/log/httpd/_ssl-proxy-verify-unverified_access_log T-2/var/log/httpd/_ssl-proxy-verify-unverified_backend_log +T-2/var/log/httpd/_ssl-proxy-verify-unverified_frontend_log T-2/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt-unverified_access_log T-2/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt-unverified_backend_log +T-2/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt-unverified_frontend_log T-2/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt_access_log T-2/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt_backend_log +T-2/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt_frontend_log T-2/var/log/httpd/_ssl_ca_crt_does_not_match_access_log T-2/var/log/httpd/_ssl_ca_crt_does_not_match_backend_log +T-2/var/log/httpd/_ssl_ca_crt_does_not_match_frontend_log T-2/var/log/httpd/_ssl_ca_crt_garbage_access_log T-2/var/log/httpd/_ssl_ca_crt_garbage_backend_log +T-2/var/log/httpd/_ssl_ca_crt_garbage_frontend_log T-2/var/log/httpd/_ssl_ca_crt_only_access_log T-2/var/log/httpd/_ssl_ca_crt_only_backend_log +T-2/var/log/httpd/_ssl_ca_crt_only_frontend_log T-2/var/log/httpd/_type-notebook_access_log T-2/var/log/httpd/_type-notebook_backend_log +T-2/var/log/httpd/_type-notebook_frontend_log T-2/var/log/httpd/_type-redirect-custom_domain_access_log +T-2/var/log/httpd/_type-redirect-custom_domain_frontend_log T-2/var/log/httpd/_type-redirect_access_log +T-2/var/log/httpd/_type-redirect_frontend_log T-2/var/log/httpd/_type-websocket-websocket-path-list-websocket-transparent-false_access_log T-2/var/log/httpd/_type-websocket-websocket-path-list-websocket-transparent-false_backend_log +T-2/var/log/httpd/_type-websocket-websocket-path-list-websocket-transparent-false_frontend_log T-2/var/log/httpd/_type-websocket-websocket-path-list_access_log T-2/var/log/httpd/_type-websocket-websocket-path-list_backend_log +T-2/var/log/httpd/_type-websocket-websocket-path-list_frontend_log T-2/var/log/httpd/_type-websocket-websocket-transparent-false_access_log T-2/var/log/httpd/_type-websocket-websocket-transparent-false_backend_log +T-2/var/log/httpd/_type-websocket-websocket-transparent-false_frontend_log T-2/var/log/httpd/_type-websocket_access_log T-2/var/log/httpd/_type-websocket_backend_log +T-2/var/log/httpd/_type-websocket_frontend_log T-2/var/log/httpd/_type-zope-default-path_access_log +T-2/var/log/httpd/_type-zope-default-path_frontend_log T-2/var/log/httpd/_type-zope-path_access_log T-2/var/log/httpd/_type-zope-path_backend_log +T-2/var/log/httpd/_type-zope-path_frontend_log T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend-https-only_access_log T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend-https-only_backend_log +T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend-https-only_frontend_log T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend_access_log T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend_backend_log +T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend_frontend_log T-2/var/log/httpd/_type-zope-virtualhostroot-http-port_access_log T-2/var/log/httpd/_type-zope-virtualhostroot-http-port_backend_log +T-2/var/log/httpd/_type-zope-virtualhostroot-http-port_frontend_log T-2/var/log/httpd/_type-zope-virtualhostroot-https-port_access_log T-2/var/log/httpd/_type-zope-virtualhostroot-https-port_backend_log +T-2/var/log/httpd/_type-zope-virtualhostroot-https-port_frontend_log T-2/var/log/httpd/_type-zope_access_log T-2/var/log/httpd/_type-zope_backend_log +T-2/var/log/httpd/_type-zope_frontend_log T-2/var/log/httpd/_url-netloc-list_access_log T-2/var/log/httpd/_url-netloc-list_backend_log +T-2/var/log/httpd/_url-netloc-list_frontend_log T-2/var/log/httpd/_url_https-url_access_log T-2/var/log/httpd/_url_https-url_backend_log +T-2/var/log/httpd/_url_https-url_frontend_log T-2/var/log/monitor-httpd-access.log T-2/var/log/monitor-httpd-error.log T-2/var/log/slave-introspection-access.log diff --git a/software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test00file_list_log.txt b/software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test00file_list_log.txt index e0ad3250d3dfad3e7cb7d8317ddcb173f4aaf4a3..867b091c0c4914f127a602e561498da01307c829 100644 --- a/software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test00file_list_log.txt +++ b/software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test00file_list_log.txt @@ -10,28 +10,40 @@ T-2/var/log/expose-csr.log T-2/var/log/frontend-haproxy.log T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_access_log T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_backend_log +T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_frontend_log T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_ssl_ca_crt_access_log T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_ssl_ca_crt_backend_log +T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_ssl_ca_crt_frontend_log T-2/var/log/httpd/_ssl_ca_crt_does_not_match_access_log T-2/var/log/httpd/_ssl_ca_crt_does_not_match_backend_log +T-2/var/log/httpd/_ssl_ca_crt_does_not_match_frontend_log T-2/var/log/httpd/_ssl_ca_crt_garbage_access_log T-2/var/log/httpd/_ssl_ca_crt_garbage_backend_log +T-2/var/log/httpd/_ssl_ca_crt_garbage_frontend_log T-2/var/log/httpd/_ssl_from_master_access_log T-2/var/log/httpd/_ssl_from_master_backend_log +T-2/var/log/httpd/_ssl_from_master_frontend_log T-2/var/log/httpd/_ssl_from_master_kedifa_overrides_access_log T-2/var/log/httpd/_ssl_from_master_kedifa_overrides_backend_log +T-2/var/log/httpd/_ssl_from_master_kedifa_overrides_frontend_log T-2/var/log/httpd/_ssl_from_slave_access_log T-2/var/log/httpd/_ssl_from_slave_backend_log +T-2/var/log/httpd/_ssl_from_slave_frontend_log T-2/var/log/httpd/_ssl_from_slave_kedifa_overrides_access_log T-2/var/log/httpd/_ssl_from_slave_kedifa_overrides_backend_log +T-2/var/log/httpd/_ssl_from_slave_kedifa_overrides_frontend_log T-2/var/log/httpd/_type-notebook-ssl_from_master_access_log T-2/var/log/httpd/_type-notebook-ssl_from_master_backend_log +T-2/var/log/httpd/_type-notebook-ssl_from_master_frontend_log T-2/var/log/httpd/_type-notebook-ssl_from_master_kedifa_overrides_access_log T-2/var/log/httpd/_type-notebook-ssl_from_master_kedifa_overrides_backend_log +T-2/var/log/httpd/_type-notebook-ssl_from_master_kedifa_overrides_frontend_log T-2/var/log/httpd/_type-notebook-ssl_from_slave_access_log T-2/var/log/httpd/_type-notebook-ssl_from_slave_backend_log +T-2/var/log/httpd/_type-notebook-ssl_from_slave_frontend_log T-2/var/log/httpd/_type-notebook-ssl_from_slave_kedifa_overrides_access_log T-2/var/log/httpd/_type-notebook-ssl_from_slave_kedifa_overrides_backend_log +T-2/var/log/httpd/_type-notebook-ssl_from_slave_kedifa_overrides_frontend_log T-2/var/log/monitor-httpd-access.log T-2/var/log/monitor-httpd-error.log T-2/var/log/slave-introspection-access.log diff --git a/software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test00file_list_log.txt b/software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test00file_list_log.txt index 42cc01fbee19f8ee3656eef887e6bc584d024307..2406e9244c987a1891feae7b8ed361210968f956 100644 --- a/software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test00file_list_log.txt +++ b/software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test00file_list_log.txt @@ -10,6 +10,7 @@ T-2/var/log/expose-csr.log T-2/var/log/frontend-haproxy.log T-2/var/log/httpd/_ssl_from_master_kedifa_overrides_master_certificate_access_log T-2/var/log/httpd/_ssl_from_master_kedifa_overrides_master_certificate_backend_log +T-2/var/log/httpd/_ssl_from_master_kedifa_overrides_master_certificate_frontend_log T-2/var/log/monitor-httpd-access.log T-2/var/log/monitor-httpd-error.log T-2/var/log/slave-introspection-access.log diff --git a/software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test00file_list_log.txt b/software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test00file_list_log.txt index cbac728f41de191a78142ae3a28e7b6e6add91cf..59c9dc754d8bc23f19c1e9a271901c8048b71be0 100644 --- a/software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test00file_list_log.txt +++ b/software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test00file_list_log.txt @@ -10,6 +10,7 @@ T-2/var/log/expose-csr.log T-2/var/log/frontend-haproxy.log T-2/var/log/httpd/_ssl_from_master_access_log T-2/var/log/httpd/_ssl_from_master_backend_log +T-2/var/log/httpd/_ssl_from_master_frontend_log T-2/var/log/monitor-httpd-access.log T-2/var/log/monitor-httpd-error.log T-2/var/log/slave-introspection-access.log