Fix duplicated transport when using specific XML with CLI (#5988) (#6009)

* Refs #23610: Test with XML file



* Refs #23610: Fix bug when passing XML



---------


(cherry picked from commit bfa10bc)

Signed-off-by: cferreiragonz <[email protected]>
Co-authored-by: Carlos Ferreira González <[email protected]>

Author: mergify[bot]

test/system/tools/fds/CMakeLists.txt

@@ -37,6 +37,7 @@ if(Python3_Interpreter_FOUND)
         test_fast_discovery_several_server_ids
         test_fast_discovery_invalid_locator
         test_fast_discovery_non_existent_profile
+        test_fast_discovery_tcp_via_XML
     )
 
     if(SECURITY)
@@ -124,6 +125,7 @@ if(Python3_Interpreter_FOUND)
 
     configure_file("test_xml_discovery_server_profile.xml" "test_xml_discovery_server_profile.xml" COPYONLY)
     configure_file("test_wrong_xml_discovery_server_profile.xml" "test_wrong_xml_discovery_server_profile.xml" COPYONLY)
+    configure_file("test_xml_discovery_server_tcp.xml" "test_xml_discovery_server_tcp.xml" COPYONLY)
     unset(TEST_ENVIRONMENT)
 
 endif()

test/system/tools/fds/test_xml_discovery_server_tcp.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<dds>
+    <profiles>
+        <transport_descriptors>
+            <transport_descriptor>
+                <transport_id>tcp_transport</transport_id>
+                <type>TCPv4</type>
+                <listening_ports>
+                    <port>12345</port>
+                </listening_ports>
+            </transport_descriptor>
+        </transport_descriptors>
+        <participant profile_name="tcp_ds" is_default_profile="true">
+            <rtps>
+                <useBuiltinTransports>false</useBuiltinTransports>
+                <userTransports>
+                    <transport_id>tcp_transport</transport_id>
+                </userTransports>
+                <builtin>
+                    <discovery_config>
+                        <discoveryProtocol>SERVER</discoveryProtocol>
+                    </discovery_config>
+                    <metatrafficUnicastLocatorList>
+                        <locator>
+                            <tcpv4>
+                                <address>127.0.0.1</address>
+                                <port>12345</port>
+                                <physical_port>12345</physical_port>
+                            </tcpv4>
+                        </locator>
+                    </metatrafficUnicastLocatorList>
+                </builtin>
+            </rtps>
+        </participant>
+    </profiles>
+</dds>

test/system/tools/fds/tests.py

@@ -41,6 +41,7 @@
         test_fast_discovery_several_server_ids,
         test_fast_discovery_invalid_locator,
         test_fast_discovery_non_existent_profile,
+        test_fast_discovery_tcp_via_XML,
 
 """
 
@@ -639,6 +640,19 @@ def test_fast_discovery_security_enabled_cli_prefix(fast_discovery_tool):
     exit_code = check_output(output, err, EXPECTED_OUTPUT, False, False)
     sys.exit(exit_code)
 
+def test_fast_discovery_tcp_via_XML(fast_discovery_tool):
+    """Test TCP transport loaded via XML configuration"""
+
+    XML_file_path = "test_xml_discovery_server_tcp.xml"
+    command = [fast_discovery_tool, str(command_to_int_test[Command_test.SERVER]), '-x', XML_file_path]
+    output, err, exit_code = send_command(command)
+    if exit_code != 0:
+        print(output)
+        sys.exit(exit_code)
+    EXPECTED_OUTPUT = "TCPv4:[127.0.0.1]:12345-12345"
+    exit_code = check_output(output, err, EXPECTED_OUTPUT, False, False)
+    sys.exit(exit_code)
+
 if __name__ == '__main__':
 
     parser = argparse.ArgumentParser(
@@ -693,7 +707,9 @@ def test_fast_discovery_security_enabled_cli_prefix(fast_discovery_tool):
         'test_fast_discovery_security_enabled_xml_prefix': lambda:
             test_fast_discovery_security_enabled_xml_prefix(args.binary_path),
         'test_fast_discovery_security_enabled_cli_prefix': lambda:
-            test_fast_discovery_security_enabled_cli_prefix(args.binary_path)
+            test_fast_discovery_security_enabled_cli_prefix(args.binary_path),
+        'test_fast_discovery_tcp_via_XML': lambda:
+            test_fast_discovery_tcp_via_XML(args.binary_path)
     }
 
     tests[args.test_name]()

tools/fds/CliDiscoveryManager.cpp

@@ -566,6 +566,11 @@ bool CliDiscoveryManager::add_tcp_servers()
 
 void CliDiscoveryManager::configure_transports()
 {
+    if (serverQos.transport().user_transports.size() > 0)
+    {
+        // User transports already configured in XML file
+        return;
+    }
     if (!serverQos.wire_protocol().builtin.metatrafficUnicastLocatorList.has_kind<LOCATOR_KIND_UDPv4>())
     {
         serverQos.transport().use_builtin_transports = false;