dscp: Remove conditions for reply marks that weren't observed (Fixes: #…

…214)
mami-project · Jan 19, 2018 · db40168 · db40168
1 parent e6847c3
commit db40168
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/pathspider/plugins/dscp.py b/pathspider/plugins/dscp.py
@@ -43,13 +43,13 @@ def config_dscp(self):
     configurations = [config_no_dscp, config_dscp]
 
     def combine_flows(self, flows):
-        conditions = []
-
         # discard non-observed flows
         for f in flows:
             if not f['observed']:
                 return ['pathspider.not_observed']
 
+        conditions = []
+
         baseline = 'dscp.' + str(flows[0]['dscp_mark_syn_fwd'] or
                                  flows[0]['dscp_mark_data_fwd']) + '.'
         test = 'dscp.' + str(flows[1]['dscp_mark_syn_fwd'] or
@@ -68,10 +68,13 @@ def combine_flows(self, flows):
             cond_conn = test + 'connectivity.offline'
         conditions.append(cond_conn)
 
-        conditions.append(baseline + 'replymark:' + str(
-            flows[0]['dscp_mark_syn_rev'] or flows[0]['dscp_mark_data_rev']))
-        conditions.append(test + 'replymark:' + str(
-            flows[1]['dscp_mark_syn_rev'] or flows[1]['dscp_mark_data_rev']))
+        baseline_replymark = flows[0]['dscp_mark_syn_rev'] or flows[0]['dscp_mark_data_rev']
+        test_replymark = flows[1]['dscp_mark_syn_rev'] or flows[1]['dscp_mark_data_rev']
+
+        if baseline_replymark is not None:
+            conditions.append(baseline + 'replymark:' + str(baseline_replymark))
+        if test_replymark is not None:
+            conditions.append(test + 'replymark:' + str(test_replymark))
 
         return conditions