Skip to content

Commit 94d9e52

Browse files
committed
Refs #20629: Make ServerAttributes private
Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
1 parent ad827a8 commit 94d9e52

3 files changed

Lines changed: 7 additions & 55 deletions

File tree

fastdds_python/src/swig/fastdds.i

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@ namespace xtypes {
160160
%include "fastdds/rtps/flowcontrol/FlowControllerDescriptor.i"
161161
%include "fastdds/rtps/attributes/PropertyPolicy.i"
162162
%include "fastdds/rtps/attributes/RTPSParticipantAttributes.i"
163-
%include "fastdds/rtps/attributes/ServerAttributes.i"
164163
%include "fastdds/rtps/attributes/ReaderAttributes.i"
165164
%include "fastdds/rtps/attributes/WriterAttributes.i"
166165
%include "fastdds/rtps/common/SequenceNumber.i"

fastdds_python/src/swig/fastdds/rtps/attributes/ServerAttributes.i

Lines changed: 0 additions & 27 deletions
This file was deleted.

fastdds_python/test/api/test_qos.py

Lines changed: 7 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1436,16 +1436,12 @@ def test_domain_participant_qos():
14361436
discoveryServer_client_syncperiod.nanosec = 10
14371437
participant_qos.wire_protocol().builtin.discovery_config. \
14381438
discoveryServer_client_syncperiod.nanosec = 10
1439-
server_info = fastdds.RemoteServerAttributes()
1440-
server_info.guidPrefix.value = (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12)
14411439
locator = fastdds.Locator_t()
14421440
locator.address = (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 192, 168, 1, 1)
14431441
locator.port = 7400
14441442
locator.kind = fastdds.LOCATOR_KIND_UDPv4
1445-
server_info.metatrafficMulticastLocatorList.push_back(locator)
1446-
server_info.metatrafficUnicastLocatorList.push_back(locator)
14471443
participant_qos.wire_protocol().builtin.discovery_config. \
1448-
m_DiscoveryServers.push_back(server_info)
1444+
m_DiscoveryServers.push_back(locator)
14491445
participant_qos.wire_protocol().builtin.discovery_config. \
14501446
ignoreParticipantFlags = fastdds.FILTER_DIFFERENT_HOST
14511447
assert(not participant_qos.wire_protocol().builtin.discovery_config.
@@ -1485,18 +1481,10 @@ def test_domain_participant_qos():
14851481
discoveryServer_client_syncperiod.nanosec)
14861482
server_info = participant_qos.wire_protocol().builtin.discovery_config. \
14871483
m_DiscoveryServers[0]
1488-
assert((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12) ==
1489-
server_info.guidPrefix.value)
1490-
locator = server_info.metatrafficMulticastLocatorList[0]
1491-
assert((0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 192, 168, 1, 1) ==
1492-
locator.address)
1493-
assert(7400 == locator.port)
1494-
assert(fastdds.LOCATOR_KIND_UDPv4 == locator.kind)
1495-
locator = server_info.metatrafficUnicastLocatorList[0]
14961484
assert((0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 192, 168, 1, 1) ==
1497-
locator.address)
1498-
assert(7400 == locator.port)
1499-
assert(fastdds.LOCATOR_KIND_UDPv4 == locator.kind)
1485+
server_info.address)
1486+
assert(7400 == server_info.port)
1487+
assert(fastdds.LOCATOR_KIND_UDPv4 == server_info.kind)
15001488
assert(fastdds.FILTER_DIFFERENT_HOST == participant_qos.
15011489
wire_protocol().builtin.discovery_config.ignoreParticipantFlags)
15021490
# ## .metatrafficUnicastLocatorList;
@@ -1734,18 +1722,10 @@ def test_domain_participant_qos():
17341722
discovery_config.discoveryServer_client_syncperiod.nanosec)
17351723
server_info = default_participant_qos.wire_protocol().builtin. \
17361724
discovery_config.m_DiscoveryServers[0]
1737-
assert((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12) ==
1738-
server_info.guidPrefix.value)
1739-
locator = server_info.metatrafficMulticastLocatorList[0]
1740-
assert((0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 192, 168, 1, 1) ==
1741-
locator.address)
1742-
assert(7400 == locator.port)
1743-
assert(fastdds.LOCATOR_KIND_UDPv4 == locator.kind)
1744-
locator = server_info.metatrafficUnicastLocatorList[0]
17451725
assert((0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 192, 168, 1, 1) ==
1746-
locator.address)
1747-
assert(7400 == locator.port)
1748-
assert(fastdds.LOCATOR_KIND_UDPv4 == locator.kind)
1726+
server_info.address)
1727+
assert(7400 == server_info.port)
1728+
assert(fastdds.LOCATOR_KIND_UDPv4 == server_info.kind)
17491729
assert(fastdds.FILTER_DIFFERENT_HOST == default_participant_qos.
17501730
wire_protocol().builtin.discovery_config.ignoreParticipantFlags)
17511731
# ## .metatrafficUnicastLocatorList;

0 commit comments

Comments
 (0)