Skip to content

[20629] GUIDLess Discovery Server - Make ServerAttributes private #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MiguelCompany merged 1 commit into from
Jul 3, 2024
Merged

[20629] GUIDLess Discovery Server - Make ServerAttributes private #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion fastdds_python/src/swig/fastdds.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
27 changes: 0 additions & 27 deletions fastdds_python/src/swig/fastdds/rtps/attributes/ServerAttributes.i
View file
Open in desktop

This file was deleted.

34 changes: 7 additions & 27 deletions fastdds_python/test/api/test_qos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down