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.

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

Jump to bottom

add slash for node name #179

Merged
merged 3 commits into from
Dec 13, 2018
Merged

add slash for node name #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a7716ce
add slash for node name
Karsten1987 Dec 13, 2018
be9e65a
check for forward slash in ros2param
Karsten1987 Dec 13, 2018
c3f057d
use get_absolute_node_name function
Karsten1987 Dec 13, 2018
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
8 changes: 3 additions & 5 deletions ros2lifecycle/ros2lifecycle/verb/get.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
from ros2lifecycle.api import call_get_states
from ros2lifecycle.api import get_node_names
from ros2lifecycle.verb import VerbExtension
from ros2node.api import get_absolute_node_name
from ros2node.api import NodeNameCompleter


Expand All @@ -42,13 +43,10 @@ def main(self, *, args): # noqa: D102
node=node, include_hidden_nodes=args.include_hidden_nodes)
node_names = [n.full_name for n in node_names]

if args.node_name:
node_name = args.node_name
if node_name[0] != '/':
node_name = '/' + node_name
node_name = get_absolute_node_name(args.node_name)
if node_name:
if node_name not in node_names:
return 'Node not found'
node_names = [node_name]

with DirectNode(args) as node:
states = call_get_states(node=node, node_names=node_names)
Expand Down
4 changes: 3 additions & 1 deletion ros2lifecycle/ros2lifecycle/verb/set.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
from ros2lifecycle.api import call_get_available_transitions
from ros2lifecycle.verb import VerbExtension

from ros2node.api import get_absolute_node_name
from ros2node.api import get_node_names
from ros2node.api import NodeNameCompleter

Expand All @@ -46,7 +47,8 @@ def main(self, *, args): # noqa: D102
node_names = get_node_names(
node=node, include_hidden_nodes=args.include_hidden_nodes)

if args.node_name not in {n.full_name for n in node_names}:
node_name = get_absolute_node_name(args.node_name)
if node_name not in {n.full_name for n in node_names}:
return 'Node not found'

with DirectNode(args) as node:
Expand Down
8 changes: 8 additions & 0 deletions ros2node/ros2node/api/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,14 @@
TopicInfo = namedtuple('Topic', ('name', 'types'))


def get_absolute_node_name(node_name):
if not node_name:
return None
if node_name[0] != '/':
node_name = '/' + node_name
return node_name


def parse_node_name(full_node_name):
tokens = full_node_name.split('/')
if 1 > len(tokens):
Expand Down
4 changes: 3 additions & 1 deletion ros2param/ros2param/verb/delete.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
from ros2cli.node.direct import DirectNode
from ros2cli.node.strategy import add_arguments
from ros2cli.node.strategy import NodeStrategy
from ros2node.api import get_absolute_node_name
from ros2node.api import get_node_names
from ros2node.api import NodeNameCompleter
from ros2param.api import call_set_parameters
Expand All @@ -46,7 +47,8 @@ def main(self, *, args): # noqa: D102
node_names = get_node_names(
node=node, include_hidden_nodes=args.include_hidden_nodes)

if args.node_name not in [n.full_name for n in node_names]:
node_name = get_absolute_node_name(args.node_name)
if node_name not in [n.full_name for n in node_names]:
return 'Node not found'

with DirectNode(args) as node:
Expand Down
4 changes: 3 additions & 1 deletion ros2param/ros2param/verb/get.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
from ros2cli.node.direct import DirectNode
from ros2cli.node.strategy import add_arguments
from ros2cli.node.strategy import NodeStrategy
from ros2node.api import get_absolute_node_name
from ros2node.api import get_node_names
from ros2node.api import NodeNameCompleter
from ros2param.api import call_get_parameters
Expand Down Expand Up @@ -45,7 +46,8 @@ def main(self, *, args): # noqa: D102
node_names = get_node_names(
node=node, include_hidden_nodes=args.include_hidden_nodes)

if args.node_name not in [n.full_name for n in node_names]:
node_name = get_absolute_node_name(args.node_name)
if node_name not in {n.full_name for n in node_names}:
return 'Node not found'

with DirectNode(args) as node:
Expand Down
8 changes: 5 additions & 3 deletions ros2param/ros2param/verb/list.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
from ros2cli.node.direct import DirectNode
from ros2cli.node.strategy import add_arguments
from ros2cli.node.strategy import NodeStrategy
from ros2node.api import get_absolute_node_name
from ros2node.api import get_node_names
from ros2node.api import NodeNameCompleter
from ros2param.verb import VerbExtension
Expand All @@ -45,11 +46,12 @@ def main(self, *, args): # noqa: D102
node_names = get_node_names(
node=node, include_hidden_nodes=args.include_hidden_nodes)

if args.node_name:
if args.node_name not in [n.full_name for n in node_names]:
node_name = get_absolute_node_name(args.node_name)
if node_name:
if node_name not in [n.full_name for n in node_names]:
return 'Node not found'
node_names = [
n for n in node_names if args.node_name == n.full_name]
n for n in node_names if node_name == n.full_name]

with DirectNode(args) as node:
clients = {}
Expand Down
4 changes: 3 additions & 1 deletion ros2param/ros2param/verb/set.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
from ros2cli.node.direct import DirectNode
from ros2cli.node.strategy import add_arguments
from ros2cli.node.strategy import NodeStrategy
from ros2node.api import get_absolute_node_name
from ros2node.api import get_node_names
from ros2node.api import NodeNameCompleter
from ros2param.api import call_set_parameters
Expand Down Expand Up @@ -47,7 +48,8 @@ def main(self, *, args): # noqa: D102
node_names = get_node_names(
node=node, include_hidden_nodes=args.include_hidden_nodes)

if args.node_name not in [n.full_name for n in node_names]:
node_name = get_absolute_node_name(args.node_name)
if node_name not in {n.full_name for n in node_names}:
return 'Node not found'

with DirectNode(args) as node:
Expand Down