Use merge operation for load configuration in junos modules (ansible#…

…28369)

*  Change load configuration operation from replace to merge

lib/ansible/modules/network/junos/junos_banner.py

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

lib/ansible/modules/network/junos/junos_l3_interface.py

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

lib/ansible/modules/network/junos/junos_linkagg.py

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

lib/ansible/modules/network/junos/junos_lldp.py

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

lib/ansible/modules/network/junos/junos_lldp_interface.py

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

lib/ansible/modules/network/junos/junos_logging.py

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

lib/ansible/modules/network/junos/junos_static_route.py

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

lib/ansible/modules/network/junos/junos_system.py

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

lib/ansible/modules/network/junos/junos_user.py

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

lib/ansible/modules/network/junos/junos_vlan.py

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

lib/ansible/modules/network/junos/junos_vrf.py

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