From ec7e8d8598d9957e5b87e37bee4ca59a28ccc088 Mon Sep 17 00:00:00 2001 From: Andrew Yourtchenko Date: Fri, 11 Sep 2020 17:40:52 +0000 Subject: [PATCH] vppapigen: crcchecker: report deprecated messages Report if the messages were marked as deprecated, but not yet deleted. Useful for building the release notes and comparing between the releases. Also, put the dict_compare() call into the report(), since latter always consumes the output of the former. Change-Id: Iceab3e94ff66da931a4669b612026bd162dd5d1a Type: improvement Signed-off-by: Andrew Yourtchenko (cherry picked from commit 62bd50de97cd90cc09559a09fe46f98211279a1e) --- extras/scripts/crcchecker.py | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/extras/scripts/crcchecker.py b/extras/scripts/crcchecker.py index 7f83d2e6d85..c25510d08e4 100755 --- a/extras/scripts/crcchecker.py +++ b/extras/scripts/crcchecker.py @@ -107,7 +107,8 @@ def is_in_progress(d, k): except: return False -def report(old, new, added, removed, modified, same): +def report(new, old): + added, removed, modified, same = dict_compare(new, old) backwards_incompatible = 0 for k in added: print(f'added: {k}') @@ -126,6 +127,17 @@ def report(old, new, added, removed, modified, same): print(f'modified: ** {k}') else: print(f'modified: {k}') + + # check which messages are still there but were marked for deprecation + for k in new.keys(): + newversion = int(new[k]['version']) + if newversion > 0 and is_deprecated(new, k): + if k in old: + if not is_deprecated(old, k): + print(f'deprecated: {k}') + else: + print(f'added+deprecated: {k}') + return backwards_incompatible @@ -150,8 +162,7 @@ def main(): if args.diff: oldcrcs = crc_from_apigen(None, args.diff[0]) newcrcs = crc_from_apigen(None, args.diff[1]) - added, removed, modified, same = dict_compare(newcrcs, oldcrcs) - backwards_incompatible = report(oldcrcs, newcrcs, added, removed, modified, same) + backwards_incompatible = report(newcrcs, oldcrcs) sys.exit(0) # Dump CRC for messages in given files / revision @@ -186,8 +197,7 @@ def main(): newcrcs.update(crc_from_apigen(None, f)) oldcrcs.update(crc_from_apigen(revision, f)) - added, removed, modified, same = dict_compare(newcrcs, oldcrcs) - backwards_incompatible = report(oldcrcs, newcrcs, added, removed, modified, same) + backwards_incompatible = report(newcrcs, oldcrcs) if args.check_patchset: if backwards_incompatible: -- 2.16.6