Merge pull request #229 from CESNET/blacklist-field-name

blacklist - rename Idea fields

report2idea/blacklist/blacklist2idea.py

@@ -90,11 +90,11 @@ def set_common_ip_fields(self):
         if self.rec["src_sent_flows"]:
             self.src_addr["OutFlowCount"] = self.rec["src_sent_flows"]
             self.src_addr["OutByteCount"] = self.rec["src_sent_bytes"]
-            self.src_addr["OutPacketsCount"] = self.rec["src_sent_packets"]
+            self.src_addr["OutPacketCount"] = self.rec["src_sent_packets"]
         if self.rec["tgt_sent_flows"]:
             self.src_addr["InFlowCount"] = self.rec["tgt_sent_flows"]
             self.src_addr["InByteCount"] = self.rec["tgt_sent_bytes"]
-            self.src_addr["InPacketsCount"] = self.rec["tgt_sent_packets"]
+            self.src_addr["InPacketCount"] = self.rec["tgt_sent_packets"]
             self.idea["Source"].append(self.tgt_addr)
         else:
             self.idea["Description"] = "Blacklisted IP tried to communicate with host (with no response)"
@@ -126,7 +126,7 @@ def set_common_url_fields(self):
         if self.rec["tgt_sent_flows"]:
             self.src_addr["InFlowCount"] = self.rec["tgt_sent_flows"]
             self.src_addr["InByteCount"] = self.rec["tgt_sent_bytes"]
-            self.src_addr["InPacketsCount"] = self.rec["tgt_sent_packets"]
+            self.src_addr["InPacketCount"] = self.rec["tgt_sent_packets"]
             self.idea["Source"].append(self.tgt_addr)
         else:
             self.idea["Description"] = "Blacklisted IP tried to communicate with host (with no response)"

report2idea/blacklist/test.sh

@@ -27,49 +27,49 @@ mtVz0ZbvpJt2mfSHaclxZ3FHqMkULTVGeH565LorpMoTEIShvnV7M5P/A8hpBXJAFwAA
 
 # output data:
 out='
-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
-NAAA
+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
+D30IdopNMOSkCXT+BBMydERZNAAA
 '
 
 blconfig="