Merge branch 'release/2.28.1'

Author: vmalloc

backslash/__version__.py

@@ -1 +1 @@
-__version__ = '2.28.0'
+__version__ = '2.28.1'

backslash/client.py

@@ -36,6 +36,7 @@ def delete_comment(self, comment_id):
         self.api.call_function('delete_comment', {'comment_id': comment_id})
 
     def report_session_start(self, logical_id=NOTHING,
+                             parent_logical_id=NOTHING,
                              hostname=NOTHING,
                              total_num_tests=NOTHING,
                              user_email=NOTHING,
@@ -48,7 +49,7 @@ def report_session_start(self, logical_id=NOTHING,
 
         :rtype: A session object representing the reported session
         """
-        returned = self.api.call_function('report_session_start', {
+        params = {
             'hostname': hostname,
             'logical_id': logical_id,
             'total_num_tests': total_num_tests,
@@ -57,7 +58,14 @@ def report_session_start(self, logical_id=NOTHING,
             'keepalive_interval': keepalive_interval,
             'subjects': subjects,
             'infrastructure': infrastructure,
-        })
+        }
+        if parent_logical_id is not None:
+            supports_parent_logical_id = (self.api.info().endpoints.report_session_start.version >= 2)
+
+            if supports_parent_logical_id:
+                params['parent_logical_id'] = parent_logical_id
+
+        returned = self.api.call_function('report_session_start', params)
         return returned
 
     def query_sessions(self):

backslash/contrib/slash_plugin.py

@@ -99,9 +99,11 @@ def deactivate(self):
     @handle_exceptions
     def session_start(self):
         metadata = self._get_initial_session_metadata()
+        parent_logical_id = getattr(slash.context.session, 'parent_session_id', None)
         try:
             self.session = self.client.report_session_start(
                 logical_id=slash.context.session.id,
+                parent_logical_id=parent_logical_id,
                 total_num_tests=slash.context.session.get_total_num_tests(),
                 hostname=socket.getfqdn(),
                 keepalive_interval=self._keepalive_interval,