diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index d4c95261..305aa7a9 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -96,6 +96,15 @@ list(APPEND TEST_LIST
test_60_disconnection
test_61_superclient_environment_variable
+<<<<<<< HEAD
+=======
+
+ test_94_tcpv4_custom_guid_transform_locators
+ test_95_tcpv4_cli
+ test_96_tcpv6_cli
+ test_97_tcpv4_env_var
+ test_98_tcpv6_env_var
+>>>>>>> 5777caa (Transform locators using new host_id PID (#107))
test_99_tcp
)
diff --git a/test/configuration/test_cases/test_94_tcpv4_custom_guid_transform_locators.xml b/test/configuration/test_cases/test_94_tcpv4_custom_guid_transform_locators.xml
new file mode 100644
index 00000000..d039d41c
--- /dev/null
+++ b/test/configuration/test_cases/test_94_tcpv4_custom_guid_transform_locators.xml
@@ -0,0 +1,97 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Knows all
+
+
+
+
+
+
+ transport_client_1
+ TCPv4
+
+ 0
+
+
+
+ transport_client_2
+ TCPv4
+
+ 0
+
+
+
+
+
+
+ 63.6c.69.65.6e.74.31.5f.73.31.5f.5f
+ false
+
+ transport_client_1
+
+
+
+ CLIENT
+
+
+
+ 127.0.0.1
+ 42200
+ 42200
+
+
+
+
+
+
+
+
+
+
+ 63.6c.69.65.6e.74.32.5f.73.31.5f.5f
+ false
+
+ transport_client_2
+
+
+
+ CLIENT
+
+
+
+ 127.0.0.1
+ 42200
+ 42200
+
+
+
+
+
+
+
+
+
+ topic_1
+ HelloWorld
+
+
+
+
+
diff --git a/test/configuration/test_cases/test_95_tcpv4_cli.xml b/test/configuration/test_cases/test_95_tcpv4_cli.xml
index 030df68e..ac4fd3ab 100644
--- a/test/configuration/test_cases/test_95_tcpv4_cli.xml
+++ b/test/configuration/test_cases/test_95_tcpv4_cli.xml
@@ -1,6 +1,16 @@
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> 5777caa (Transform locators using new host_id PID (#107))
diff --git a/test/configuration/test_cases/test_96_tcpv6_cli.xml b/test/configuration/test_cases/test_96_tcpv6_cli.xml
index 01c1850f..0e257c4b 100644
--- a/test/configuration/test_cases/test_96_tcpv6_cli.xml
+++ b/test/configuration/test_cases/test_96_tcpv6_cli.xml
@@ -1,6 +1,16 @@
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> 5777caa (Transform locators using new host_id PID (#107))
diff --git a/test/configuration/test_cases/test_97_tcpv4_env_var.xml b/test/configuration/test_cases/test_97_tcpv4_env_var.xml
index 705d2834..6fcbab4c 100644
--- a/test/configuration/test_cases/test_97_tcpv4_env_var.xml
+++ b/test/configuration/test_cases/test_97_tcpv4_env_var.xml
@@ -1,6 +1,16 @@
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> 5777caa (Transform locators using new host_id PID (#107))
diff --git a/test/configuration/test_cases/test_98_tcpv6_env_var.xml b/test/configuration/test_cases/test_98_tcpv6_env_var.xml
index 0eedf110..10a30c6d 100644
--- a/test/configuration/test_cases/test_98_tcpv6_env_var.xml
+++ b/test/configuration/test_cases/test_98_tcpv6_env_var.xml
@@ -1,6 +1,16 @@
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> 5777caa (Transform locators using new host_id PID (#107))
diff --git a/test/configuration/test_solutions/test_94_tcpv4_custom_guid_transform_locators.snapshot b/test/configuration/test_solutions/test_94_tcpv4_custom_guid_transform_locators.snapshot
new file mode 100644
index 00000000..30662b2c
--- /dev/null
+++ b/test/configuration/test_solutions/test_94_tcpv4_custom_guid_transform_locators.snapshot
@@ -0,0 +1,24 @@
+
+
+
+ Knows all
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/test/configuration/tests_params.json b/test/configuration/tests_params.json
index dfc9184f..69f2a796 100644
--- a/test/configuration/tests_params.json
+++ b/test/configuration/tests_params.json
@@ -2271,6 +2271,64 @@
}
},
+ "test_94_tcpv4_custom_guid_transform_locators":
+ {
+ "description": [
+ "Test that a TCP discovery server with a custom GUID (-i CLI param) and listening on any (0.0.0.0)\n",
+ "is able to communicate with a client that connects to localhost (127.0.0.1).\n",
+ "This test is a regression from #22006"
+ ],
+
+ "processes":
+ {
+ "main":
+ {
+ "xml_config_file": "/test_cases/test_94_tcpv4_custom_guid_transform_locators.xml",
+ "validation":
+ {
+ "exit_code_validation":
+ {
+ "expected_exit_code": 0
+ },
+ "stderr_validation":
+ {
+ "err_expected_lines": 0
+ },
+ "count_lines_validation":
+ {
+ "file_path": "/test_solutions/test_94_tcpv4_custom_guid_transform_locators.snapshot"
+ },
+ "ground_truth_validation":
+ {
+ "guidless": false,
+ "file_path": "/test_solutions/test_94_tcpv4_custom_guid_transform_locators.snapshot"
+ }
+ }
+ },
+ "fastddstool":
+ {
+ "kill_time": 6,
+ "tool_config":
+ {
+ "id" : 0,
+ "tcp_address": "0.0.0.0",
+ "tcp_port": 42200
+ },
+ "validation":
+ {
+ "exit_code_validation":
+ {
+ "expected_exit_code": 0
+ },
+ "stderr_validation":
+ {
+ "err_expected_lines": 0
+ }
+ }
+ }
+ }
+ },
+
"test_95_tcpv4_cli":
{
"description": [