Addresses comments from pull-71

* Adds check to allow "/" or no "/" in permissions file * Renames policy definition file to markdown
ros2 · Jan 9, 2019 · 3c4f981 · 3c4f981
1 parent 597f1bd
commit 3c4f981
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/examples/policy_definition.txt → examples/policy_definition.md b/examples/policy_definition.txt → examples/policy_definition.md
diff --git a/sros2/api/__init__.py b/sros2/api/__init__.py
@@ -389,6 +389,8 @@ def create_permission_file(path, name, domain_id, permissions_dict):
         topic_dict['/clock'] = {'allow': ['subscribe']}
         # we have some policies to add !
         for topic_name, policy in topic_dict.items():
+            # add a "/" if it doesn't exist
+            formatted_topic_name = "/" + (topic_name.lstrip('/'))
             tags = []
             publish = 'publish'
             subscribe = 'subscribe'
@@ -411,9 +413,8 @@ def create_permission_file(path, name, domain_id, permissions_dict):
             <topic>%s</topic>
           </topics>
         </%s>
-""" % (tag, 'rt' + topic_name, tag)
+""" % (tag, 'rt' + formatted_topic_name, tag)
         # TODO(mikaelarguedas) remove this hardcoded handling for default parameter topics
-
         service_dict = permissions_dict['services']
         default_parameter_topics = [
             'describe_parameters',