cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source 
*  Change load configuration operation from replace to merge
This commit is contained in:
Ganesh Nalawade 2017-08-18 09:50:02 +05:30 committed by GitHub
parent bc66faa328
commit ceef4f97ed
11 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/modules/network/junos/junos_banner.py
View file

@ -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:

2
lib/ansible/modules/network/junos/junos_l3_interface.py
View file

@ -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:

2
lib/ansible/modules/network/junos/junos_linkagg.py
View file

@ -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:

2
lib/ansible/modules/network/junos/junos_lldp.py
View file

@ -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:

2
lib/ansible/modules/network/junos/junos_lldp_interface.py
View file

@ -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:

2
lib/ansible/modules/network/junos/junos_logging.py
View file

@ -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:

2
lib/ansible/modules/network/junos/junos_static_route.py
View file

@ -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:

2
lib/ansible/modules/network/junos/junos_system.py
View file

@ -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:

2
lib/ansible/modules/network/junos/junos_user.py
View file

@ -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)

2
lib/ansible/modules/network/junos/junos_vlan.py
View file

@ -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:

2
lib/ansible/modules/network/junos/junos_vrf.py
View file

@ -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: