[24066] Refactor Discovery Server to update client behavior

.github/workflows/reusable-sanitizers-ci.yml

@@ -250,108 +250,6 @@ jobs:
             --output-file $GITHUB_STEP_SUMMARY  \
             --sanitizer asan
 
-  asan_discovery_server_test:
-    if: ${{ inputs.run_asan_discovery_server == true }}
-    needs: asan_fastdds_build
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Free disk space
-        uses: eProsima/eProsima-CI/ubuntu/free_disk_space@v0
-
-      - name: Download build artifacts
-        uses: eProsima/eProsima-CI/external/download-artifact@v0
-        with:
-          name: build_artifacts_fastdds_asan_${{ inputs.label }}
-          path: ${{ github.workspace }}
-
-      - name: Install Fix Python version
-        uses: eProsima/eProsima-CI/external/setup-python@v0
-        with:
-          python-version: '3.11'
-
-      - name: Get minimum supported version of CMake
-        uses: eProsima/eProsima-CI/external/get-cmake@v0
-        with:
-          cmakeVersion: '3.22.6'
-
-      - name: Install apt packages
-        uses: eProsima/eProsima-CI/ubuntu/install_apt_packages@v0
-        with:
-          packages: curl grep libasio-dev libtinyxml2-dev python3 python3-pip software-properties-common wget
-
-      - name: Install colcon
-        uses: eProsima/eProsima-CI/ubuntu/install_colcon@v0
-
-      - name: Install Python dependencies
-        uses: eProsima/eProsima-CI/ubuntu/install_python_packages@v0
-        with:
-          packages: vcstool setuptools gcovr tomark xmltodict jsondiff pandas psutil
-
-      - name: Setup CCache
-        uses: eProsima/eProsima-CI/external/setup-ccache-action@v0
-        if: ${{ !always() }}
-        with:
-          api_token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Get Discovery Server branch
-        id: get_discovery_server_branch
-        uses: eProsima/eProsima-CI/ubuntu/get_related_branch_from_repo@v0
-        with:
-          remote_repository: eProsima/Discovery-Server
-          fallback_branch: ${{ inputs.discovery_server_ref }}
-
-      - name: Download Discovery Server repo
-        uses: eProsima/eProsima-CI/external/checkout@v0
-        with:
-          repository: eProsima/Discovery-Server
-          path: src/discovery-server
-          ref: ${{ steps.get_discovery_server_branch.outputs.deduced_branch }}
-
-      - name: Show .meta file
-        id: show_meta
-        run: |
-          cat ${{ github.workspace }}/src/fastdds/.github/workflows/config/asan.meta
-
-      - name: Colcon build
-        continue-on-error: false
-        uses: eProsima/eProsima-CI/ubuntu/colcon_build@v0
-        with:
-          colcon_meta_file: ${{ github.workspace }}/src/fastdds/.github/workflows/config/asan.meta
-          colcon_build_args: ${{ inputs.colcon_build_args }}
-          cmake_args: ${{ inputs.cmake_args }}
-          cmake_args_default: ''
-          cmake_build_type: 'Debug'
-          workspace: ${{ github.workspace }}
-          workspace_dependencies: ''
-
-      - name: Colcon test
-        id: test
-        continue-on-error: true
-        uses: eProsima/eProsima-CI/ubuntu/colcon_test@v0
-        with:
-          colcon_args_default: ''
-          colcon_test_args: ${{ inputs.colcon_test_args }}
-          colcon_test_args_default: '--event-handlers=console_direct+ --return-code-on-test-failure'
-          ctest_args: ${{ inputs.ctest_args }}
-          ctest_args_default: '--timeout 300 --label-exclude "xfail"'
-          packages_names: discovery-server
-          workspace: ${{ github.workspace }}
-          workspace_dependencies: ''
-          test_report_artifact: ${{ format('test_report_{0}_{1}', inputs.label, github.job) }}
-
-      - name: Report sanitizer errors
-        run: |
-          bash src/fastdds/.github/workflows/utils/specific_errors_filter.sh \
-            "==ERROR:" \
-            log/latest_test/discovery-server/stdout_stderr.log \
-            _tmp_specific_error_file.log
-
-          python3 src/fastdds/.github/workflows/utils/log_parser.py \
-            --log-file log/latest_test/discovery-server/stdout_stderr.log \
-            --specific-error-file _tmp_specific_error_file.log \
-            --output-file $GITHUB_STEP_SUMMARY \
-            --sanitizer=asan
-
   tsan_fastdds_test:
     if: ${{ inputs.run_tsan_fastdds == true }}
     runs-on: ubuntu-22.04

.github/workflows/reusable-ubuntu-ci.yml

@@ -639,109 +639,6 @@ jobs:
           cmake_build_type: ${{ matrix.cmake-build-type }}
           workspace: ${{ github.workspace }}
 
-  fastdds_discovery_server_test:
-    needs: fastdds_build
-    runs-on: ${{ inputs.os-image }}
-    strategy:
-      fail-fast: false
-      matrix:
-        cmake-build-type:
-          - 'RelWithDebInfo'
-    steps:
-      - name: Free disk space
-        uses: eProsima/eProsima-CI/ubuntu/free_disk_space@v0
-
-      - name: Download build artifacts
-        uses: eProsima/eProsima-CI/external/download-artifact@v0
-        with:
-          name: fastdds_build_${{ inputs.label }}
-          path: ${{ github.workspace }}
-
-      - name: Install Fix Python version
-        uses: eProsima/eProsima-CI/external/setup-python@v0
-        with:
-          python-version: '3.11'
-
-      - name: Get minimum supported version of CMake
-        uses: eProsima/eProsima-CI/external/get-cmake@v0
-        with:
-          cmakeVersion: '3.22.6'
-
-      - name: Install apt packages
-        uses: eProsima/eProsima-CI/ubuntu/install_apt_packages@v0
-        with:
-          packages: libasio-dev libtinyxml2-dev libssl-dev
-
-      - name: Install colcon
-        uses: eProsima/eProsima-CI/ubuntu/install_colcon@v0
-
-      - name: Install Python dependencies
-        uses: eProsima/eProsima-CI/ubuntu/install_python_packages@v0
-        with:
-          packages: vcstool xmlschema xmltodict==0.13.0 jsondiff==2.0.0 pandas==1.5.2 psutil
-
-      - name: Setup CCache
-        uses: eProsima/eProsima-CI/external/setup-ccache-action@v0
-        if: ${{ inputs.use-ccache == true }}
-        with:
-          api_token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Get Discovery Server branch
-        id: get_discovery_server_branch
-        uses: eProsima/eProsima-CI/ubuntu/get_related_branch_from_repo@v0
-        with:
-          remote_repository: eProsima/Discovery-Server
-          fallback_branch: ${{ env.discovery-server-branch }}
-
-      - name: Download Discovery Server repo
-        uses: eProsima/eProsima-CI/external/checkout@v0
-        with:
-          repository: eProsima/Discovery-Server
-          path: src/discovery_server
-          ref: ${{ steps.get_discovery_server_branch.outputs.deduced_branch }}
-
-      - name: Fetch Fast DDS CI dependencies
-        uses: eProsima/eProsima-CI/ubuntu/vcs_import@v0
-        with:
-          vcs_repos_file: ${{ github.workspace }}/src/fastdds/.github/workflows/config/fastdds_test.repos
-          destination_workspace: src
-          skip_existing: 'true'
-
-      - name: Colcon build
-        continue-on-error: false
-        uses: eProsima/eProsima-CI/ubuntu/colcon_build@v0
-        with:
-          colcon_meta_file: ${{ github.workspace }}/src/fastdds/.github/workflows/config/fastdds_build.meta ${{ github.workspace }}/src/fastdds/.github/workflows/config/discovery_server.meta
-          colcon_build_args: ${{ inputs.colcon-args }}
-          cmake_args: '${{ env.security-cmake-flag }} ${{ inputs.cmake-args }}'
-          cmake_args_default: ${{ env.colcon-build-default-cmake-args }}
-          cmake_build_type: ${{ matrix.cmake-build-type }}
-          workspace: ${{ github.workspace }}
-
-      - name: Colcon test
-        id: discovery_server_test
-        if: ${{ inputs.run-tests == true }}
-        uses: eProsima/eProsima-CI/ubuntu/colcon_test@v0
-        with:
-          colcon_meta_file: ${{ github.workspace }}/src/fastdds/.github/workflows/config/discovery_server.meta
-          colcon_test_args: ${{ inputs.colcon-args }}
-          colcon_test_args_default: --event-handlers=console_direct+
-          ctest_args: ${{ inputs.ctest-args }}
-          packages_names: discovery-server
-          workspace: ${{ github.workspace }}
-          workspace_dependencies: ''
-          test_report_artifact: ${{ format('test_report_{0}_{1}_{2}', inputs.label, github.job, join(matrix.*, '_')) }}
-
-      - name: Discovery server test summary
-        uses: eProsima/eProsima-CI/ubuntu/junit_summary@v0
-        if: ${{ !cancelled() && inputs.run-tests == true }}
-        with:
-          junit_reports_dir: "${{ steps.discovery_server_test.outputs.ctest_results_path }}"
-          print_summary: 'True'
-          show_failed: 'True'
-          show_disabled: 'False'
-          show_skipped: 'False'
-
   fastdds_alternative_builds:
     needs: fastdds_build
     runs-on: ${{ inputs.os-image }}

src/cpp/rtps/builtin/BuiltinProtocols.cpp

@@ -104,6 +104,7 @@ bool BuiltinProtocols::initBuiltinProtocols(
             return false;
 
         case DiscoveryProtocol::CLIENT:
+        case DiscoveryProtocol::SUPER_CLIENT:
             mp_PDP = new fastdds::rtps::PDPClient(this, allocation);
             break;
 
@@ -118,10 +119,6 @@ bool BuiltinProtocols::initBuiltinProtocols(
             break;
 #endif // if HAVE_SQLITE3
 
-        case DiscoveryProtocol::SUPER_CLIENT:
-            mp_PDP = new fastdds::rtps::PDPClient(this, allocation, true);
-            break;
-
         default:
             EPROSIMA_LOG_ERROR(RTPS_PDP, "Unknown DiscoveryProtocol specified.");
             return false;