diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/vyos/configsession.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/python/vyos/configsession.py b/python/vyos/configsession.py index 175b40260..569a82f3c 100644 --- a/python/vyos/configsession.py +++ b/python/vyos/configsession.py @@ -364,8 +364,13 @@ class ConfigSession(object): return out def merge_config(self, file_path, destructive=False): - destr = ['--destructive'] if destructive else [] - out = self.__run_command(MERGE_CONFIG + [file_path] + destr) + if self._vyconf_session is None: + destr = ['--destructive'] if destructive else [] + out = self.__run_command(MERGE_CONFIG + [file_path] + destr) + else: + out, _ = self._vyconf_session.merge_config( + file=file_path, destructive=destructive + ) return out |