Skip to content

Commit 14eb345

Browse files
v-lopezaudrow
andauthored
Add rosparam verb load (#590)
* Add rosparam verb load Signed-off-by: Victor Lopez <[email protected]> * Move load_parameter_file implementation to api, add test_verb_load Signed-off-by: Victor Lopez <[email protected]> * Apply fixes for linter Signed-off-by: Victor Lopez <[email protected]> * Remove TODO comment Signed-off-by: Victor Lopez <[email protected]> * Fix linter errors Signed-off-by: Audrow Nash <[email protected]> Co-authored-by: Audrow Nash <[email protected]>
1 parent d864a36 commit 14eb345

File tree

5 files changed

+397
-4
lines changed

5 files changed

+397
-4
lines changed

ros2param/ros2param/api/__init__.py

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,19 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15+
import sys
16+
17+
from rcl_interfaces.msg import Parameter
1518
from rcl_interfaces.msg import ParameterType
1619
from rcl_interfaces.msg import ParameterValue
1720
from rcl_interfaces.srv import DescribeParameters
1821
from rcl_interfaces.srv import GetParameters
1922
from rcl_interfaces.srv import ListParameters
2023
from rcl_interfaces.srv import SetParameters
2124
import rclpy
25+
from rclpy.parameter import PARAMETER_SEPARATOR_STRING
2226
from ros2cli.node.direct import DirectNode
27+
2328
import yaml
2429

2530

@@ -92,6 +97,65 @@ def get_parameter_value(*, string_value):
9297
return value
9398

9499

100+
def parse_parameter_dict(*, namespace, parameter_dict):
101+
parameters = []
102+
for param_name, param_value in parameter_dict.items():
103+
full_param_name = namespace + param_name
104+
# Unroll nested parameters
105+
if type(param_value) == dict:
106+
parameters += parse_parameter_dict(
107+
namespace=full_param_name + PARAMETER_SEPARATOR_STRING,
108+
parameter_dict=param_value)
109+
else:
110+
parameter = Parameter()
111+
parameter.name = full_param_name
112+
parameter.value = get_parameter_value(string_value=str(param_value))
113+
parameters.append(parameter)
114+
return parameters
115+
116+
117+
def load_parameter_dict(*, node, node_name, parameter_dict):
118+
119+
parameters = parse_parameter_dict(namespace='', parameter_dict=parameter_dict)
120+
response = call_set_parameters(
121+
node=node, node_name=node_name, parameters=parameters)
122+
123+
# output response
124+
assert len(response.results) == len(parameters)
125+
for i in range(0, len(response.results)):
126+
result = response.results[i]
127+
param_name = parameters[i].name
128+
if result.successful:
129+
msg = 'Set parameter {} successful'.format(param_name)
130+
if result.reason:
131+
msg += ': ' + result.reason
132+
print(msg)
133+
else:
134+
msg = 'Set parameter {} failed'.format(param_name)
135+
if result.reason:
136+
msg += ': ' + result.reason
137+
print(msg, file=sys.stderr)
138+
139+
140+
def load_parameter_file(*, node, node_name, parameter_file):
141+
# Remove leading slash and namespaces
142+
internal_node_name = node_name.split('/')[-1]
143+
with open(parameter_file, 'r') as f:
144+
param_file = yaml.safe_load(f)
145+
if internal_node_name not in param_file:
146+
raise RuntimeError('Param file does not contain parameters for {}, '
147+
' only for namespaces: {}' .format(internal_node_name,
148+
param_file.keys()))
149+
150+
value = param_file[internal_node_name]
151+
if type(value) != dict or 'ros__parameters' not in value:
152+
raise RuntimeError('Invalid structure of parameter file in namespace {}'
153+
'expected same format as provided by ros2 param dump'
154+
.format(internal_node_name))
155+
load_parameter_dict(node=node, node_name=node_name,
156+
parameter_dict=value['ros__parameters'])
157+
158+
95159
def call_describe_parameters(*, node, node_name, parameter_names=None):
96160
# create client
97161
client = node.create_client(

ros2param/ros2param/verb/load.py

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
# Copyright 2021 Open Source Robotics Foundation, Inc.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
from ros2cli.node.direct import DirectNode
16+
from ros2cli.node.strategy import add_arguments
17+
from ros2cli.node.strategy import NodeStrategy
18+
from ros2node.api import get_absolute_node_name
19+
from ros2node.api import get_node_names
20+
from ros2node.api import NodeNameCompleter
21+
from ros2param.api import load_parameter_file
22+
from ros2param.verb import VerbExtension
23+
24+
25+
class LoadVerb(VerbExtension):
26+
"""Load parameter file for a node."""
27+
28+
def add_arguments(self, parser, cli_name): # noqa: D102
29+
add_arguments(parser)
30+
arg = parser.add_argument(
31+
'node_name', help='Name of the ROS node')
32+
arg.completer = NodeNameCompleter(
33+
include_hidden_nodes_key='include_hidden_nodes')
34+
parser.add_argument(
35+
'--include-hidden-nodes', action='store_true',
36+
help='Consider hidden nodes as well')
37+
arg = parser.add_argument(
38+
'parameter_file', help='Parameter file')
39+
40+
def main(self, *, args): # noqa: D102
41+
with NodeStrategy(args) as node:
42+
node_names = get_node_names(
43+
node=node, include_hidden_nodes=args.include_hidden_nodes)
44+
45+
node_name = get_absolute_node_name(args.node_name)
46+
if node_name not in {n.full_name for n in node_names}:
47+
return 'Node not found'
48+
49+
with DirectNode(args) as node:
50+
load_parameter_file(node=node, node_name=node_name, parameter_file=args.parameter_file)

ros2param/setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
'get = ros2param.verb.get:GetVerb',
4747
'list = ros2param.verb.list:ListVerb',
4848
'set = ros2param.verb.set:SetVerb',
49+
'load = ros2param.verb.load:LoadVerb',
4950
],
5051
}
5152
)

ros2param/test/fixtures/parameter_node.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14-
import sys
1514

1615
import rclpy
1716
from rclpy.parameter import PARAMETER_SEPARATOR_STRING
@@ -38,9 +37,6 @@ def main(args=None):
3837
rclpy.spin(node)
3938
except KeyboardInterrupt:
4039
print('parameter node stopped cleanly')
41-
except BaseException:
42-
print('exception in parameter node:', file=sys.stderr)
43-
raise
4440
finally:
4541
node.destroy_node()
4642
rclpy.shutdown()

0 commit comments

Comments
 (0)