From 6a88f32eea3850d58411b854ba102a2baa978158 Mon Sep 17 00:00:00 2001 From: Daniil Baturin Date: Mon, 14 May 2018 04:47:12 +0200 Subject: T633: build integration and minor fixes in the op mode command generator. --- python/vyos/util.py | 37 ------------------------------------- python/vyos/version.py | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 37 deletions(-) delete mode 100644 python/vyos/util.py create mode 100644 python/vyos/version.py (limited to 'python') diff --git a/python/vyos/util.py b/python/vyos/util.py deleted file mode 100644 index b3eff3965..000000000 --- a/python/vyos/util.py +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright (c) 2017 VyOS maintainers and contributors -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the Software -# is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, -# INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS -# OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR -# IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -import json - -class ConfigError(Exception): - pass - - -def get_version_data(file='/opt/vyatta/etc/version.json'): - with open(file, 'r') as f: - version_data = json.load(f) - return version_data - -def get_version(file=None): - version_data = None - if file: - version_data = get_version_data(file=file) - else: - version_data = get_version_data() - return version_data["version"] diff --git a/python/vyos/version.py b/python/vyos/version.py new file mode 100644 index 000000000..b3eff3965 --- /dev/null +++ b/python/vyos/version.py @@ -0,0 +1,37 @@ +# Copyright (c) 2017 VyOS maintainers and contributors +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the Software +# is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +# INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS +# OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR +# IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +import json + +class ConfigError(Exception): + pass + + +def get_version_data(file='/opt/vyatta/etc/version.json'): + with open(file, 'r') as f: + version_data = json.load(f) + return version_data + +def get_version(file=None): + version_data = None + if file: + version_data = get_version_data(file=file) + else: + version_data = get_version_data() + return version_data["version"] -- cgit v1.2.3