Skip to content

Commit 0af768d

Browse files
Add namespace to services names (#992)
1 parent a000226 commit 0af768d

File tree

1 file changed

+30
-25
lines changed

1 file changed

+30
-25
lines changed

rosapi/scripts/rosapi_node

Lines changed: 30 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -89,47 +89,52 @@ class Rosapi(Node):
8989
else:
9090
full_name = self.get_namespace() + "/" + self.get_name()
9191
params.init(full_name)
92-
self.create_service(Topics, "/rosapi/topics", self.get_topics)
93-
self.create_service(Interfaces, "/rosapi/interfaces", self.get_interfaces)
94-
self.create_service(TopicsForType, "/rosapi/topics_for_type", self.get_topics_for_type)
92+
93+
self.create_service(Topics, "~/topics", self.get_topics)
94+
self.create_service(Interfaces, "~/interfaces", self.get_interfaces)
95+
self.create_service(TopicsForType, "~/topics_for_type", self.get_topics_for_type)
9596
self.create_service(
9697
TopicsAndRawTypes,
97-
"/rosapi/topics_and_raw_types",
98+
"~/topics_and_raw_types",
9899
self.get_topics_and_raw_types,
99100
)
100-
self.create_service(Services, "/rosapi/services", self.get_services)
101+
self.create_service(Services, "~/services", self.get_services)
101102
self.create_service(
102-
ServicesForType, "/rosapi/services_for_type", self.get_services_for_type
103+
ServicesForType,
104+
"~/services_for_type",
105+
self.get_services_for_type,
103106
)
104-
self.create_service(Nodes, "/rosapi/nodes", self.get_nodes)
105-
self.create_service(NodeDetails, "/rosapi/node_details", self.get_node_details)
106-
self.create_service(GetActionServers, "/rosapi/action_servers", self.get_action_servers)
107-
self.create_service(TopicType, "/rosapi/topic_type", self.get_topic_type)
108-
self.create_service(ServiceType, "/rosapi/service_type", self.get_service_type)
109-
self.create_service(Publishers, "/rosapi/publishers", self.get_publishers)
110-
self.create_service(Subscribers, "/rosapi/subscribers", self.get_subscribers)
107+
self.create_service(Nodes, "~/nodes", self.get_nodes)
108+
self.create_service(NodeDetails, "~/node_details", self.get_node_details)
109+
self.create_service(GetActionServers, "~/action_servers", self.get_action_servers)
110+
self.create_service(TopicType, "~/topic_type", self.get_topic_type)
111+
self.create_service(ServiceType, "~/service_type", self.get_service_type)
112+
self.create_service(Publishers, "~/publishers", self.get_publishers)
113+
self.create_service(Subscribers, "~/subscribers", self.get_subscribers)
111114
self.create_service(
112-
ServiceProviders, "/rosapi/service_providers", self.get_service_providers
115+
ServiceProviders,
116+
"~/service_providers",
117+
self.get_service_providers,
113118
)
114-
self.create_service(ServiceNode, "/rosapi/service_node", self.get_service_node)
115-
self.create_service(MessageDetails, "/rosapi/message_details", self.get_message_details)
119+
self.create_service(ServiceNode, "~/service_node", self.get_service_node)
120+
self.create_service(MessageDetails, "~/message_details", self.get_message_details)
116121
self.create_service(
117122
ServiceRequestDetails,
118-
"/rosapi/service_request_details",
123+
"~/service_request_details",
119124
self.get_service_request_details,
120125
)
121126
self.create_service(
122127
ServiceResponseDetails,
123-
"/rosapi/service_response_details",
128+
"~/service_response_details",
124129
self.get_service_response_details,
125130
)
126-
self.create_service(SetParam, "/rosapi/set_param", self.set_param)
127-
self.create_service(GetParam, "/rosapi/get_param", self.get_param)
128-
self.create_service(HasParam, "/rosapi/has_param", self.has_param)
129-
self.create_service(DeleteParam, "/rosapi/delete_param", self.delete_param)
130-
self.create_service(GetParamNames, "/rosapi/get_param_names", self.get_param_names)
131-
self.create_service(GetTime, "/rosapi/get_time", self.get_time)
132-
self.create_service(GetROSVersion, "/rosapi/get_ros_version", self.get_ros_version)
131+
self.create_service(SetParam, "~/set_param", self.set_param)
132+
self.create_service(GetParam, "~/get_param", self.get_param)
133+
self.create_service(HasParam, "~/has_param", self.has_param)
134+
self.create_service(DeleteParam, "~/delete_param", self.delete_param)
135+
self.create_service(GetParamNames, "~/get_param_names", self.get_param_names)
136+
self.create_service(GetTime, "~/get_time", self.get_time)
137+
self.create_service(GetROSVersion, "~/get_ros_version", self.get_ros_version)
133138

134139
def get_globs(self):
135140
return glob_helper.get_globs(self)

0 commit comments

Comments
 (0)