From d943440080858ea4951dc62c931faeb55f72f601 Mon Sep 17 00:00:00 2001 From: Daniil Baturin Date: Tue, 5 Jul 2022 10:08:29 -0400 Subject: T2719: update op mode CLI definition for 'show version' --- op-mode-definitions/show-version.xml.in | 4 +- src/op_mode/show_version.py | 86 --------------------------------- src/op_mode/version.py | 86 +++++++++++++++++++++++++++++++++ 3 files changed, 88 insertions(+), 88 deletions(-) delete mode 100755 src/op_mode/show_version.py create mode 100755 src/op_mode/version.py diff --git a/op-mode-definitions/show-version.xml.in b/op-mode-definitions/show-version.xml.in index 8b7cc7e58..d9c4738af 100644 --- a/op-mode-definitions/show-version.xml.in +++ b/op-mode-definitions/show-version.xml.in @@ -6,13 +6,13 @@ Show system version information - sudo ${vyos_op_scripts_dir}/show_version.py + sudo ${vyos_op_scripts_dir}/version.py show Show system version and some fun stuff - sudo ${vyos_op_scripts_dir}/show_version.py --funny + sudo ${vyos_op_scripts_dir}/version.py show --funny diff --git a/src/op_mode/show_version.py b/src/op_mode/show_version.py deleted file mode 100755 index 90645dfbc..000000000 --- a/src/op_mode/show_version.py +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/bin/env python3 -# -# Copyright (C) 2016-2022 VyOS maintainers and contributors -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 or later as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -# Purpose: -# Displays image version and system information. -# Used by the "run show version" command. - -import argparse -import sys -import typing - -import vyos.opmode -import vyos.version -import vyos.limericks - -from jinja2 import Template -from vyos.util import call - -version_output_tmpl = """ -Version: VyOS {{version}} -Release train: {{release_train}} - -Built by: {{built_by}} -Built on: {{built_on}} -Build UUID: {{build_uuid}} -Build commit ID: {{build_git}} - -Architecture: {{system_arch}} -Boot via: {{boot_via}} -System type: {{system_type}} - -Hardware vendor: {{hardware_vendor}} -Hardware model: {{hardware_model}} -Hardware S/N: {{hardware_serial}} -Hardware UUID: {{hardware_uuid}} - -Copyright: VyOS maintainers and contributors -{%- if limerick %} -{{limerick}} -{% endif -%} -""" - -def _get_raw_data(funny=False): - version_data = vyos.version.get_full_version_data() - - if funny: - version_data["limerick"] = vyos.limericks.get_random() - - return version_data - -def _get_formatted_output(version_data): - tmpl = Template(version_output_tmpl) - return tmpl.render(version_data).strip() - -def show(raw: bool, funny: bool): - """ Display neighbor table contents """ - version_data = _get_raw_data(funny=funny) - - if raw: - return version_data - else: - return _get_formatted_output(version_data) - - -if __name__ == '__main__': - try: - res = vyos.opmode.run(sys.modules[__name__]) - if res: - print(res) - except ValueError as e: - print(e) - sys.exit(1) - diff --git a/src/op_mode/version.py b/src/op_mode/version.py new file mode 100755 index 000000000..90645dfbc --- /dev/null +++ b/src/op_mode/version.py @@ -0,0 +1,86 @@ +#!/usr/bin/env python3 +# +# Copyright (C) 2016-2022 VyOS maintainers and contributors +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 or later as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +# Purpose: +# Displays image version and system information. +# Used by the "run show version" command. + +import argparse +import sys +import typing + +import vyos.opmode +import vyos.version +import vyos.limericks + +from jinja2 import Template +from vyos.util import call + +version_output_tmpl = """ +Version: VyOS {{version}} +Release train: {{release_train}} + +Built by: {{built_by}} +Built on: {{built_on}} +Build UUID: {{build_uuid}} +Build commit ID: {{build_git}} + +Architecture: {{system_arch}} +Boot via: {{boot_via}} +System type: {{system_type}} + +Hardware vendor: {{hardware_vendor}} +Hardware model: {{hardware_model}} +Hardware S/N: {{hardware_serial}} +Hardware UUID: {{hardware_uuid}} + +Copyright: VyOS maintainers and contributors +{%- if limerick %} +{{limerick}} +{% endif -%} +""" + +def _get_raw_data(funny=False): + version_data = vyos.version.get_full_version_data() + + if funny: + version_data["limerick"] = vyos.limericks.get_random() + + return version_data + +def _get_formatted_output(version_data): + tmpl = Template(version_output_tmpl) + return tmpl.render(version_data).strip() + +def show(raw: bool, funny: bool): + """ Display neighbor table contents """ + version_data = _get_raw_data(funny=funny) + + if raw: + return version_data + else: + return _get_formatted_output(version_data) + + +if __name__ == '__main__': + try: + res = vyos.opmode.run(sys.modules[__name__]) + if res: + print(res) + except ValueError as e: + print(e) + sys.exit(1) + -- cgit v1.2.3