From 786bc71c6ddd9144220a7f4c40d62bf0ef8fe5f5 Mon Sep 17 00:00:00 2001
From: John Estabrook <jestabro@vyos.io>
Date: Thu, 19 Aug 2021 14:56:09 -0500
Subject: T3768: Revert "T1950: Add support for reading component versions from
 JSON file"

This reverts commit 29e438755c8bd2b9598a2016a3c42891f0cbfa1d.
---
 python/vyos/defaults.py       |  2 --
 python/vyos/systemversions.py | 28 ++--------------------------
 2 files changed, 2 insertions(+), 28 deletions(-)

(limited to 'python/vyos')

diff --git a/python/vyos/defaults.py b/python/vyos/defaults.py
index 9921e3b5f..354e4d362 100644
--- a/python/vyos/defaults.py
+++ b/python/vyos/defaults.py
@@ -31,8 +31,6 @@ cfg_vintage = 'vyos'
 
 commit_lock = '/opt/vyatta/config/.lock'
 
-version_file = '/usr/share/vyos/component-versions.json'
-
 https_data = {
     'listen_addresses' : { '*': ['_'] }
 }
diff --git a/python/vyos/systemversions.py b/python/vyos/systemversions.py
index 5c4deca29..9b3f4f413 100644
--- a/python/vyos/systemversions.py
+++ b/python/vyos/systemversions.py
@@ -16,15 +16,12 @@
 import os
 import re
 import sys
-import json
-
 import vyos.defaults
 
 def get_system_versions():
     """
-    Get component versions from running system: read vyatta directory
-    structure for versions, then read vyos JSON file. It is a critical
-    error if either migration directory or JSON file is unreadable.
+    Get component versions from running system; critical failure if
+    unable to read migration directory.
     """
     system_versions = {}
 
@@ -39,25 +36,4 @@ def get_system_versions():
             pair = info.split('@')
             system_versions[pair[0]] = int(pair[1])
 
-    version_dict = {}
-    path = vyos.defaults.version_file
-
-    if os.path.isfile(path):
-        with open(path, 'r') as f:
-            try:
-                version_dict = json.load(f)
-            except ValueError as err:
-                print(f"\nValue error in {path}: {err}")
-                sys.exit(1)
-
-        for k, v in version_dict.items():
-            if not isinstance(v, int):
-                print(f"\nType error in {path}; expecting Dict[str, int]")
-                sys.exit(1)
-            existing = system_versions.get(k)
-            if existing is None:
-                system_versions[k] = v
-            elif v > existing:
-                system_versions[k] = v
-
     return system_versions
-- 
cgit v1.2.3