Fix python 3 incompatibility for McAfee MAR

Packs/McAfee-MAR/Integrations/McAfee-MAR/McAfee-MAR.py

@@ -88,7 +88,7 @@ def create_entry(header, contents, table, context={}, headers=None):
 
 def translate_dict(d, translator):
     res = {}
-    for key, value in d.iteritems():
+    for key, value in d.items():
         new_key = translator.get(key, key)
         res[new_key] = value
     return res
@@ -134,7 +134,7 @@ def extract_item_output(item, capitalize):
     }
 
     # map <CollectorName>|<OutputName> to <OutputName>
-    for key, value in output.iteritems():
+    for key, value in output.items():
         splited_key = key.split('|')
         if(len(splited_key) > 1):
             new_key = splited_key[1]

Packs/McAfee-MAR/Integrations/McAfee-MAR/McAfee-MAR.yml

@@ -496,6 +496,8 @@ script:
     - contextPath: MAR.HostInfo.Os
       description: Host operation system
     description: Gets host information from McAfee Active Response
-  dockerimage: demisto/dxl:1.0.0.35274
+  dockerimage: demisto/dxl:1.0.0.63890
   runonce: false
 fromversion: 5.0.0
+tests:
+- No tests (auto formatted)

Packs/McAfee-MAR/Integrations/McAfee-MAR/McAfee-MAR_test.py

@@ -1,3 +1,5 @@
+import unittest
+
 import demistomock as demisto
 import importlib
 import pytest
@@ -62,3 +64,95 @@ def test_get_client_config(mocker):
                     'broker_ca_bundle': spaces_in_certificate}
     mocker.patch.object(demisto, "params", return_value=valid_params)
     mcafee_mar.validate_certificates_format()
+
+
+class TestTranslateDict(unittest.TestCase):
+    """
+    Test cases for the translate_dict function.
+    """
+
+    def test_translate_dict_no_translation_needed(self):
+        """
+        Test the scenario where no translation is needed.
+        """
+        mcafee_mar = importlib.import_module("McAfee-MAR")
+        d = {'key1': 'value1', 'key2': 'value2'}
+        translator = {'key1': 'key1', 'key2': 'key2'}
+        expected = {'key1': 'value1', 'key2': 'value2'}
+        self.assertEqual(mcafee_mar.translate_dict(d, translator), expected)
+
+    def test_translate_dict_translation_needed(self):
+        """
+        Test the scenario where every key in the dictionary needs to be translated.
+        """
+        mcafee_mar = importlib.import_module("McAfee-MAR")
+        d = {'key1': 'value1', 'key2': 'value2'}
+        translator = {'key1': 'new_key1', 'key2': 'new_key2'}
+        expected = {'new_key1': 'value1', 'new_key2': 'value2'}
+        self.assertEqual(mcafee_mar.translate_dict(d, translator), expected)
+
+    def test_translate_dict_partial_translation(self):
+        """
+        Test the scenario where only some keys in the dictionary need to be translated.
+        """
+        mcafee_mar = importlib.import_module("McAfee-MAR")
+        d = {'key1': 'value1', 'key2': 'value2', 'key3': 'value3'}
+        translator = {'key1': 'new_key1'}
+        expected = {'new_key1': 'value1', 'key2': 'value2', 'key3': 'value3'}
+        self.assertEqual(mcafee_mar.translate_dict(d, translator), expected)
+
+    def test_translate_dict_empty_dict(self):
+        """
+        Test the scenario where the input dictionary is empty.
+        """
+        mcafee_mar = importlib.import_module("McAfee-MAR")
+        d = {}
+        translator = {'key1': 'new_key1', 'key2': 'new_key2'}
+        expected = {}
+        self.assertEqual(mcafee_mar.translate_dict(d, translator), expected)
+
+
+class TestExtractItemOutput(unittest.TestCase):
+    """
+    Test cases for the extract_item_output function.
+    """
+
+    def test_extract_item_output_no_capitalize(self):
+        """
+        Test the scenario where 'capitalize' is False.
+        """
+        mcafee_mar = importlib.import_module("McAfee-MAR")
+        item = {'output': {'Collector1|Key1': 'value1', 'Collector2|Key2': 'value2'}, 'created_at': '2023-06-20'}
+        capitalize = False
+        expected = {'created_at': '2023-06-20', 'Key1': 'value1', 'Key2': 'value2'}
+        self.assertEqual(mcafee_mar.extract_item_output(item, capitalize), expected)
+
+    def test_extract_item_output_with_capitalize(self):
+        """
+        Test the scenario where 'capitalize' is True.
+        """
+        mcafee_mar = importlib.import_module("McAfee-MAR")
+        item = {'output': {'Collector1|Key1': 'value1', 'Collector2|Key2': 'value2'}, 'created_at': '2023-06-20'}
+        capitalize = True
+        expected = {'created_at': '2023-06-20', 'Key1': 'value1', 'Key2': 'value2'}
+        self.assertEqual(mcafee_mar.extract_item_output(item, capitalize), expected)
+
+    def test_extract_item_output_no_pipe_in_key(self):
+        """
+        Test the scenario where there is no pipe ('|') in the output keys.
+        """
+        mcafee_mar = importlib.import_module("McAfee-MAR")
+        item = {'output': {'Key1': 'value1', 'Key2': 'value2'}, 'created_at': '2023-06-20'}
+        capitalize = False
+        expected = {'created_at': '2023-06-20', 'Key1': 'value1', 'Key2': 'value2'}
+        self.assertEqual(mcafee_mar.extract_item_output(item, capitalize), expected)
+
+    def test_extract_item_output_empty_output(self):
+        """
+        Test the scenario where the output in the item is empty.
+        """
+        mcafee_mar = importlib.import_module("McAfee-MAR")
+        item = {'output': {}, 'created_at': '2023-06-20'}
+        capitalize = False
+        expected = {'created_at': '2023-06-20'}
+        self.assertEqual(mcafee_mar.extract_item_output(item, capitalize), expected)

Packs/McAfee-MAR/ReleaseNotes/1_0_7.md

@@ -0,0 +1,6 @@
+
+#### Integrations
+
+##### McAfee Active Response
+- Updated the Docker image to: *demisto/dxl:1.0.0.63890*.
+- Fixed an issue where certain parts of the integration were incompatible with Python 3.

Packs/McAfee-MAR/pack_metadata.json

@@ -2,7 +2,7 @@
     "name": "McAfee Active Response",
     "description": "Connect to MAR using its DXL client",
     "support": "xsoar",
-    "currentVersion": "1.0.6",
+    "currentVersion": "1.0.7",
     "author": "Cortex XSOAR",
     "url": "https://www.paloaltonetworks.com/cortex",
     "email": "",