Skip to content
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.

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

Make DiscoveryServer servers' guid prefix optional #467

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,6 @@ discovery_server_participant_configuration(

conf.id = core::types::ParticipantId("WanDsParticipant_" + std::to_string((this_server_id_is_1 ? 1 : 0)));

conf.discovery_server_guid_prefix = core::types::GuidPrefix((this_server_id_is_1 ? 1u : 0u));

if (tls)
{
conf.tls_configuration = tls_configuration(wan_kind);
Expand Down
2 changes: 1 addition & 1 deletion ddsrouter_test/compose/test_cases/dds/ddsrouter.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

xml:
raw: |
Expand Down
2 changes: 1 addition & 1 deletion ddsrouter_test/compose/test_cases/dds_rtps/ddsrouter.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

xml:
raw: |
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
version: v4.0
version: v5.0

participants:

- name: Cloud_Discovery_Server_Participant
kind: wan-ds
discovery-server-guid:
id: 0
listening-addresses:
- domain: ddsrouter_cloud
port: 11666
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

participants:

Expand All @@ -8,12 +8,8 @@ participants:

- name: Edge_1_DS_Participant
kind: wan-ds
discovery-server-guid:
id: 1
connection-addresses:
- discovery-server-guid:
id: 0
addresses:
- addresses:
- domain: ddsrouter_cloud
port: 11666
transport: udp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

participants:

Expand All @@ -8,12 +8,8 @@ participants:

- name: Edge_2_DS_Participant
kind: wan-ds
discovery-server-guid:
id: 2
connection-addresses:
- discovery-server-guid:
id: 0
addresses:
- addresses:
- domain: ddsrouter_cloud
port: 21666
transport: udp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

participants:
- name: Local_80
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

participants:
- name: Local_80
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

participants:
- name: Local_80
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

participants:
- name: Local_80
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0


participants:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0


participants:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

participants:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

participants:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

participants:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0


participants:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0


participants:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0


participants:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0


participants:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0


participants:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0


participants:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0


participants:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

topics:
- name: topic_0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

topics:
- name: topic_0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

topics:
- name: topic_0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

participants:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

participants:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

participants:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

participants:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

participants:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

participants:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

participants:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

participants:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

participants:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

participants:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

participants:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

participants:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

participants:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

participants:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

participants:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

participants:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

participants:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

participants:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

allowlist:
- name: "*addition_service*"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

allowlist:
- name: "*addition_service*"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

participants:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

participants:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

participants:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

participants:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

participants:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

participants:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

participants:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

participants:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

participants:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

participants:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

participants:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

participants:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

participants:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

xml:
files:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v4.0
version: v5.0

xml:
files:
Expand Down
Loading
Loading