adding icdiff for diff feature

Author: vnitinv

lib/jnpr/jsnapy/check.py

@@ -11,6 +11,7 @@
 import os
 from jnpr.jsnapy.sqlite_get import SqliteExtractXml
 import jnpr.jsnapy.snap_diff
+from icdiff import diff
 from jnpr.jsnapy.xml_comparator import XmlComparator
 import colorama
 import logging
@@ -229,7 +230,7 @@ def compare_diff(self, pre_snap_file, post_snap_file, check_from_sqlite):
         """
         This function is called when --diff is used
         """
-        diff_obj = jnpr.jsnapy.snap_diff.Diff(self.log_detail)
+        #diff_obj = jnpr.jsnapy.snap_diff.Diff(self.log_detail)
         if check_from_sqlite:
             diff_obj.diff_strings(
                 pre_snap_file,
@@ -239,7 +240,7 @@ def compare_diff(self, pre_snap_file, post_snap_file, check_from_sqlite):
         else:
             if os.path.isfile(pre_snap_file) and os.path.isfile(
                     post_snap_file):
-                diff_obj.diff_files(pre_snap_file, post_snap_file)
+                diff(pre_snap_file, post_snap_file)
             else:
                 self.logger_check.info(
                     colorama.Fore.RED +

requirements.txt

@@ -2,3 +2,4 @@ junos-eznc
 colorama
 ConfigParser
 pyparsing
+icdiff