Use merge operation for load configuration in junos modules (#28369)

*  Change load configuration operation from replace to merge
pull/24929/merge
Ganesh Nalawade 7 years ago committed by GitHub
parent bc66faa328
commit ceef4f97ed

@ -161,7 +161,7 @@ def main():
ele = map_obj_to_ele(module, want, top)
with locked_config(module):
diff = load_config(module, tostring(ele), warnings, action='replace')
diff = load_config(module, tostring(ele), warnings, action='merge')
commit = not module.check_mode
if diff:

@ -184,7 +184,7 @@ def main():
diff = None
with locked_config(module):
for req in requests:
diff = load_config(module, tostring(req), warnings, action='replace')
diff = load_config(module, tostring(req), warnings, action='merge')
commit = not module.check_mode
if diff:

@ -327,7 +327,7 @@ def main():
diff = None
with locked_config(module):
for req in requests:
diff = load_config(module, tostring(req), warnings, action='replace')
diff = load_config(module, tostring(req), warnings, action='merge')
commit = not module.check_mode
if diff:

@ -184,7 +184,7 @@ def main():
ele = map_obj_to_ele(module, want, top, param=item)
with locked_config(module):
diff = load_config(module, tostring(ele), warnings, action='replace')
diff = load_config(module, tostring(ele), warnings, action='merge')
commit = not module.check_mode
if diff:

@ -145,7 +145,7 @@ def main():
ele = map_obj_to_ele(module, want, top, param=item)
with locked_config(module):
diff = load_config(module, tostring(ele), warnings, action='replace')
diff = load_config(module, tostring(ele), warnings, action='merge')
commit = not module.check_mode
if diff:

@ -267,7 +267,7 @@ def main():
diff = None
with locked_config(module):
for req in requests:
diff = load_config(module, tostring(req), warnings, action='replace')
diff = load_config(module, tostring(req), warnings, action='merge')
commit = not module.check_mode
if diff:

@ -219,7 +219,7 @@ def main():
with locked_config(module):
for req in requests:
diff = load_config(module, tostring(req), warnings, action='replace')
diff = load_config(module, tostring(req), warnings, action='merge')
commit = not module.check_mode
if diff:

@ -173,7 +173,7 @@ def main():
ele = map_obj_to_ele(module, want, top)
with locked_config(module):
diff = load_config(module, tostring(ele), warnings, action='replace')
diff = load_config(module, tostring(ele), warnings, action='merge')
commit = not module.check_mode
if diff:

@ -298,6 +298,8 @@ def main():
kwargs = {}
if module.params['purge']:
kwargs['action'] = 'replace'
else:
kwargs['action'] = 'merge'
with locked_config(module):
diff = load_config(module, tostring(ele), warnings, **kwargs)

@ -207,7 +207,7 @@ def main():
with locked_config(module):
for req in requests:
diff = load_config(module, tostring(req), warnings, action='replace')
diff = load_config(module, tostring(req), warnings, action='merge')
commit = not module.check_mode
if diff:

@ -245,7 +245,7 @@ def main():
with locked_config(module):
for req in requests:
diff = load_config(module, tostring(req), warnings, action='replace')
diff = load_config(module, tostring(req), warnings, action='merge')
commit = not module.check_mode
if diff:

Loading…
Cancel
Save