diff options
| author | Viacheslav Hletenko <v.gletenko@vyos.io> | 2023-06-02 16:06:52 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-02 16:06:52 +0300 |
| commit | b8a3dc506b7bd83a0a0fcb7981571eeeb8eedf64 (patch) | |
| tree | 57149092bdf8f04939ee50f7d094ed57eada0f8e /python | |
| parent | 6dd683f3e7a966bf0124444b746ab4a223bbe104 (diff) | |
| parent | 362ece3add2771bf412131a306fd0c0cfa04c16c (diff) | |
| download | vyos-1x-b8a3dc506b7bd83a0a0fcb7981571eeeb8eedf64.tar.gz vyos-1x-b8a3dc506b7bd83a0a0fcb7981571eeeb8eedf64.zip | |
Merge pull request #2023 from jestabro/error-passing
configtree: T5251: catch/raise errors in functions delete and delete_value
Diffstat (limited to 'python')
| -rw-r--r-- | python/vyos/configtree.py | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/python/vyos/configtree.py b/python/vyos/configtree.py index 19b9838d4..d0cd87464 100644 --- a/python/vyos/configtree.py +++ b/python/vyos/configtree.py @@ -201,7 +201,9 @@ class ConfigTree(object): check_path(path) path_str = " ".join(map(str, path)).encode() - self.__delete(self.__config, path_str) + res = self.__delete(self.__config, path_str) + if (res != 0): + raise ConfigTreeError(f"Path doesn't exist: {path}") if self.__migration: print(f"- op: delete path: {path}") @@ -210,7 +212,14 @@ class ConfigTree(object): check_path(path) path_str = " ".join(map(str, path)).encode() - self.__delete_value(self.__config, path_str, value.encode()) + res = self.__delete_value(self.__config, path_str, value.encode()) + if (res != 0): + if res == 1: + raise ConfigTreeError(f"Path doesn't exist: {path}") + elif res == 2: + raise ConfigTreeError(f"Value doesn't exist: '{value}'") + else: + raise ConfigTreeError() if self.__migration: print(f"- op: delete_value path: {path} value: {value}") |