diff --git a/fastdds_python/src/swig/fastdds.i b/fastdds_python/src/swig/fastdds.i index ed97af05..62bcb5e8 100644 --- a/fastdds_python/src/swig/fastdds.i +++ b/fastdds_python/src/swig/fastdds.i @@ -160,7 +160,6 @@ namespace xtypes { %include "fastdds/rtps/flowcontrol/FlowControllerDescriptor.i" %include "fastdds/rtps/attributes/PropertyPolicy.i" %include "fastdds/rtps/attributes/RTPSParticipantAttributes.i" -%include "fastdds/rtps/attributes/ServerAttributes.i" %include "fastdds/rtps/attributes/ReaderAttributes.i" %include "fastdds/rtps/attributes/WriterAttributes.i" %include "fastdds/rtps/common/SequenceNumber.i" diff --git a/fastdds_python/src/swig/fastdds/rtps/attributes/ServerAttributes.i b/fastdds_python/src/swig/fastdds/rtps/attributes/ServerAttributes.i deleted file mode 100644 index 43774533..00000000 --- a/fastdds_python/src/swig/fastdds/rtps/attributes/ServerAttributes.i +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright 2022 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -%{ -#include "fastdds/rtps/attributes/ServerAttributes.hpp" -%} - -// Ignore deprecated methods -%ignore eprosima::fastdds::rtps::RemoteServerAttributes::GetEDPSubscriptionsWriter; -%ignore eprosima::fastdds::rtps::RemoteServerAttributes::GetEDPSubscriptionsReader; -%ignore eprosima::fastdds::rtps::RemoteServerAttributes::GetEDPPublicationsWriter; -%ignore eprosima::fastdds::rtps::RemoteServerAttributes::GetEDPPublicationsReader; - -%template(RemoteServerAttributesList) std::list; - -%include "fastdds/rtps/attributes/ServerAttributes.hpp" diff --git a/fastdds_python/test/api/test_qos.py b/fastdds_python/test/api/test_qos.py index 9cfde479..37f72496 100644 --- a/fastdds_python/test/api/test_qos.py +++ b/fastdds_python/test/api/test_qos.py @@ -1436,16 +1436,12 @@ def test_domain_participant_qos(): discoveryServer_client_syncperiod.nanosec = 10 participant_qos.wire_protocol().builtin.discovery_config. \ discoveryServer_client_syncperiod.nanosec = 10 - server_info = fastdds.RemoteServerAttributes() - server_info.guidPrefix.value = (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12) locator = fastdds.Locator_t() locator.address = (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 192, 168, 1, 1) locator.port = 7400 locator.kind = fastdds.LOCATOR_KIND_UDPv4 - server_info.metatrafficMulticastLocatorList.push_back(locator) - server_info.metatrafficUnicastLocatorList.push_back(locator) participant_qos.wire_protocol().builtin.discovery_config. \ - m_DiscoveryServers.push_back(server_info) + m_DiscoveryServers.push_back(locator) participant_qos.wire_protocol().builtin.discovery_config. \ ignoreParticipantFlags = fastdds.FILTER_DIFFERENT_HOST assert(not participant_qos.wire_protocol().builtin.discovery_config. @@ -1485,18 +1481,10 @@ def test_domain_participant_qos(): discoveryServer_client_syncperiod.nanosec) server_info = participant_qos.wire_protocol().builtin.discovery_config. \ m_DiscoveryServers[0] - assert((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12) == - server_info.guidPrefix.value) - locator = server_info.metatrafficMulticastLocatorList[0] - assert((0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 192, 168, 1, 1) == - locator.address) - assert(7400 == locator.port) - assert(fastdds.LOCATOR_KIND_UDPv4 == locator.kind) - locator = server_info.metatrafficUnicastLocatorList[0] assert((0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 192, 168, 1, 1) == - locator.address) - assert(7400 == locator.port) - assert(fastdds.LOCATOR_KIND_UDPv4 == locator.kind) + server_info.address) + assert(7400 == server_info.port) + assert(fastdds.LOCATOR_KIND_UDPv4 == server_info.kind) assert(fastdds.FILTER_DIFFERENT_HOST == participant_qos. wire_protocol().builtin.discovery_config.ignoreParticipantFlags) # ## .metatrafficUnicastLocatorList; @@ -1734,18 +1722,10 @@ def test_domain_participant_qos(): discovery_config.discoveryServer_client_syncperiod.nanosec) server_info = default_participant_qos.wire_protocol().builtin. \ discovery_config.m_DiscoveryServers[0] - assert((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12) == - server_info.guidPrefix.value) - locator = server_info.metatrafficMulticastLocatorList[0] - assert((0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 192, 168, 1, 1) == - locator.address) - assert(7400 == locator.port) - assert(fastdds.LOCATOR_KIND_UDPv4 == locator.kind) - locator = server_info.metatrafficUnicastLocatorList[0] assert((0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 192, 168, 1, 1) == - locator.address) - assert(7400 == locator.port) - assert(fastdds.LOCATOR_KIND_UDPv4 == locator.kind) + server_info.address) + assert(7400 == server_info.port) + assert(fastdds.LOCATOR_KIND_UDPv4 == server_info.kind) assert(fastdds.FILTER_DIFFERENT_HOST == default_participant_qos. wire_protocol().builtin.discovery_config.ignoreParticipantFlags) # ## .metatrafficUnicastLocatorList;