Skip to content

In templates, remove "lstrip('/')" from full node name #65

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

Open
Rezenders wants to merge 1 commit into
base: main
Choose a base branch
from
Open

In templates, remove "lstrip('/')" from full node name #65

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
2 changes: 1 addition & 1 deletion templates/component.ros2.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{% for artifact in model.artifact %}
{{ artifact.name }}:
{% for node in artifact.node %}
node: {{ node.name.full_name.lstrip('/') }}
node: {{ node.name.full_name }}
{% if node.publisher | length >0 %}
publishers:
{% for interface in node.publisher %}
Expand Down
2 changes: 1 addition & 1 deletion templates/rossystem.rossystem.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{% for node in model.nodes %}
{% set pkg_attr = node|attr('package') %}
{% set pkg = pkg_attr if pkg_attr is not undefined and pkg_attr else 'TODO' %}
{% set node_identifier = node.name.full_name.lstrip('/') %}
{% set node_identifier = node.name.full_name %}
{% set exec_attr = node|attr('executable') %}
{% set exec_name = exec_attr if exec_attr is not undefined and exec_attr else (node_identifier.lstrip('/') if node_identifier else '') %}
{% if exec_name == '' %}
Expand Down
2 changes: 1 addition & 1 deletion test/outputs/test_model.ros2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
test_model:
artifacts:
map_server:
node: map_server
node: /map_server
publishers:
'map_metadata':
type: 'nav_msgs/msg/MapMetaData'
Expand Down
8 changes: 4 additions & 4 deletions test/outputs/test_system.rossystem
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
test_system:
nodes:
"map_server":
from: "TODO.map_server"
"/map_server":
from: "TODO./map_server"
interfaces:
- "map_metadata": pub-> "map_server::map_metadata"
- "map": pub-> "map_server::map"
Expand All @@ -13,5 +13,5 @@ test_system:
- "shadows/min_angle": "map_server::shadows/min_angle"
value: -1.52
connections:
- ["map_server.static_map", "map_server.static_map"]
- ["map_server.static_map", "map_server.static_map"]
- ["/map_server.static_map", "/map_server.static_map"]
- ["/map_server.static_map", "/map_server.static_map"]
2 changes: 1 addition & 1 deletion test/unittest/test_generate_component.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
test_model:
artifacts:
map_server:
node: map_server
node: /map_server
publishers:
'map_metadata':
type: 'nav_msgs/msg/MapMetaData'
Expand Down
8 changes: 4 additions & 4 deletions test/unittest/test_generate_system.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
expect_result = """
test_system:
nodes:
"map_server":
from: "TODO.map_server"
"/map_server":
from: "TODO./map_server"
interfaces:
- "map_metadata": pub-> "map_server::map_metadata"
- "map": pub-> "map_server::map"
Expand All @@ -55,8 +55,8 @@
- "shadows/min_angle": "map_server::shadows/min_angle"
value: -1.52
connections:
- ["map_server.static_map", "map_server.static_map"]
- ["map_server.static_map", "map_server.static_map"]
- ["/map_server.static_map", "/map_server.static_map"]
- ["/map_server.static_map", "/map_server.static_map"]

"""

Expand Down