summaryrefslogtreecommitdiff
path: root/python/vyos/configsession.py
diff options
context:
space:
mode:
Diffstat (limited to 'python/vyos/configsession.py')
-rw-r--r--python/vyos/configsession.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/python/vyos/configsession.py b/python/vyos/configsession.py
index 216069992..175b40260 100644
--- a/python/vyos/configsession.py
+++ b/python/vyos/configsession.py
@@ -363,11 +363,9 @@ class ConfigSession(object):
return out
- def merge_config(self, file_path):
- if self._vyconf_session is None:
- out = self.__run_command(MERGE_CONFIG + [file_path])
- else:
- out = 'unimplemented'
+ def merge_config(self, file_path, destructive=False):
+ destr = ['--destructive'] if destructive else []
+ out = self.__run_command(MERGE_CONFIG + [file_path] + destr)
return out