diff options
| author | John Estabrook <jestabro@vyos.io> | 2022-02-16 11:31:23 -0600 |
|---|---|---|
| committer | John Estabrook <jestabro@vyos.io> | 2022-02-16 16:26:25 -0600 |
| commit | 3795fdba8edf8e81298370d6cd8d81a779ae2997 (patch) | |
| tree | df234f88b0734d33eb82a863a75c1364fc9377af /python/vyos | |
| parent | f076f9f4cf6e6b7d89eada9f5d59bacea0f3af72 (diff) | |
| download | vyos-1x-3795fdba8edf8e81298370d6cd8d81a779ae2997.tar.gz vyos-1x-3795fdba8edf8e81298370d6cd8d81a779ae2997.zip | |
xml: T3474: add component version include files
Add the include files containing the syntaxVersion element defining the
version of the respective component; these files are included by the top
level file 'xml-component-versions.xml.in'. Processing of these elements
was previously added to the python xml lib in commit 40f5359d. This will
replace the use of 'curver_DATA' in vyatta-cfg-system and other legacy
packages.
Diffstat (limited to 'python/vyos')
| -rw-r--r-- | python/vyos/xml/__init__.py | 4 | ||||
| -rw-r--r-- | python/vyos/xml/definition.py | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/python/vyos/xml/__init__.py b/python/vyos/xml/__init__.py index e0eacb2d1..6db446a40 100644 --- a/python/vyos/xml/__init__.py +++ b/python/vyos/xml/__init__.py @@ -46,8 +46,8 @@ def is_tag(lpath): def is_leaf(lpath, flat=True): return load_configuration().is_leaf(lpath, flat) -def component_versions(): - return load_configuration().component_versions() +def component_version(): + return load_configuration().component_version() def defaults(lpath, flat=False): return load_configuration().defaults(lpath, flat) diff --git a/python/vyos/xml/definition.py b/python/vyos/xml/definition.py index 5e0d5282c..bc3892b42 100644 --- a/python/vyos/xml/definition.py +++ b/python/vyos/xml/definition.py @@ -249,10 +249,11 @@ class XML(dict): # @lru_cache(maxsize=100) # XXX: need to use cachetool instead - for later - def component_versions(self) -> dict: - sort_component = sorted(self[kw.component_version].items(), - key = lambda kv: kv[0]) - return dict(sort_component) + def component_version(self) -> dict: + d = {} + for k in sorted(self[kw.component_version]): + d[k] = int(self[kw.component_version][k]) + return d def defaults(self, lpath, flat): d = self[kw.default] |