Skip to content

Commit a1d41b4

Browse files
committed
add wait_for_service
Signed-off-by: Brian Chen <[email protected]>
1 parent 8638a04 commit a1d41b4

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

ros2param/ros2param/api/__init__.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def get_value(*, parameter_value):
4343
def load_parameter_file(*, node, node_name, parameter_file, use_wildcard):
4444
# Remove leading slash and namespaces
4545
client = AsyncParameterClient(node, node_name)
46-
client.wait_for_services(30)
46+
client.wait_for_services(timeout_sec=5.0)
4747
if not client.services_are_ready():
4848
raise RuntimeError('Could not reach parameter services')
4949

@@ -69,7 +69,7 @@ def load_parameter_file(*, node, node_name, parameter_file, use_wildcard):
6969

7070
def call_describe_parameters(*, node, node_name, parameter_names=None):
7171
client = AsyncParameterClient(node, node_name)
72-
client.wait_for_services(30)
72+
client.wait_for_services(5.0)
7373
if not client.services_are_ready():
7474
raise RuntimeError('Could not reach parameter services')
7575
future = client.describe_parameters(parameter_names)
@@ -80,7 +80,7 @@ def call_describe_parameters(*, node, node_name, parameter_names=None):
8080

8181
def call_get_parameters(*, node, node_name, parameter_names):
8282
client = AsyncParameterClient(node, node_name)
83-
client.wait_for_services(30)
83+
client.wait_for_services(timeout_sec=5.0)
8484
if not client.services_are_ready():
8585
raise RuntimeError('Could not reach parameter services')
8686
future = client.get_parameters(parameter_names)
@@ -91,7 +91,7 @@ def call_get_parameters(*, node, node_name, parameter_names):
9191

9292
def call_set_parameters(*, node, node_name, parameters):
9393
client = AsyncParameterClient(node, node_name)
94-
client.wait_for_services(30)
94+
client.wait_for_services(timeout_sec=5.0)
9595
if not client.services_are_ready():
9696
raise RuntimeError('Could not reach parameter services')
9797
future = client.set_parameters(parameters)
@@ -102,7 +102,7 @@ def call_set_parameters(*, node, node_name, parameters):
102102

103103
def call_list_parameters(*, node, node_name):
104104
client = AsyncParameterClient(node, node_name)
105-
client.wait_for_services(30)
105+
client.wait_for_services(timeout_sec=5.0)
106106
if not client.services_are_ready():
107107
raise RuntimeError('Could not reach parameter services')
108108
future = client.list_parameters()

ros2param/ros2param/verb/list.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,22 @@
1515
import re
1616
import sys
1717

18+
import rclpy
1819
from ros2cli.node.direct import DirectNode
1920
from ros2cli.node.strategy import add_arguments
2021
from ros2cli.node.strategy import NodeStrategy
2122
from ros2node.api import get_absolute_node_name
2223
from ros2node.api import get_node_names
2324
from ros2node.api import NodeNameCompleter
2425

26+
from rcl_interfaces.srv import ListParameters
27+
2528
from ros2param.api import call_describe_parameters
2629
from ros2param.api import call_list_parameters
2730
from ros2param.api import get_parameter_type_string
2831
from ros2param.verb import VerbExtension
2932

33+
from ros2service.api import get_service_names
3034

3135
class ListVerb(VerbExtension):
3236
"""Output a list of available parameters."""

0 commit comments

Comments
 (0)