Merge branch 'fix/config-private' into 'develop'

Add `set_config_mode` in sros.py

See merge request !183

geant/gap_ansible/plugins/netconf/sros.py

@@ -102,3 +102,8 @@ class Netconf(NetconfBase):
         """
         resp = self.m.commit(confirmed=confirmed, timeout=timeout, persist=persist, comment=comment)
         return resp.data_xml if hasattr(resp, "data_xml") else resp.xml
+
+    def set_config_mode(self, config_mode):
+        """Set the config_mode passed from the module."""
+        if config_mode:
+            self._config_mode = config_mode

geant/gap_ansible/roles/base_config/tasks/deploy_base_config.yaml

@@ -36,6 +36,7 @@
     content: "{{ lookup('ansible.builtin.template', 'routers/{{ wfo_router.router.vendor }}/base_config.j2') }}"
     commit: true
     validate: true
+    config_mode: private
   diff: true
   register: output
   check_mode: true
@@ -75,6 +76,7 @@
     content: "{{ lookup('ansible.builtin.template', 'routers/{{ wfo_router.router.vendor }}/base_config.j2') }}"
     commit: true
     commit_comment: "{{ commit_comment }}"
+    config_mode: private
   diff: true
   check_mode: false
   when: >

geant/gap_ansible/roles/ibgp_update/tasks/deploy.yaml

@@ -29,6 +29,7 @@
     content: "{{ lookup('ansible.builtin.template', '{{ vendor }}/{{ verb }}.j2') }}"
     commit: true
     validate: true
+    config_mode: private
   diff: true
   register: output
   check_mode: true
@@ -53,6 +54,7 @@
     content: "{{ lookup('ansible.builtin.template', '{{ vendor }}/{{ verb }}.j2') }}"
     commit: true
     commit_comment: "{{ commit_comment }}"
+    config_mode: private
   diff: true
   check_mode: false
   when: >

geant/gap_ansible/roles/iptrunk/tasks/deploy_object.yaml

@@ -41,6 +41,7 @@
     default_operation: merge
     content: "{{ lookup('ansible.builtin.template', '{{ local_side.iptrunk_side_node.vendor }}/{{ config_object }}.j2') }}"
     commit: true
+    config_mode: private
   diff: true
   register: output
   check_mode: true
@@ -67,6 +68,7 @@
     content: "{{ lookup('ansible.builtin.template', '{{ local_side.iptrunk_side_node.vendor }}/{{ config_object }}.j2') }}"
     commit: true
     commit_comment: "{{ commit_comment }}"
+    config_mode: private
   diff: true
   check_mode: false
   when: >

geant/gap_ansible/roles/iptrunk/tasks/remove_trunk.yaml

@@ -24,11 +24,13 @@
     local_side.iptrunk_side_node.vendor == "juniper"
 
 - name: Remove "{{ config_object }}" on "{{ inventory_hostname }}" [CHECK ONLY][NOKIA]
-  ansible.netcommon.netconf_config:
+  # ansible.netcommon.netconf_config:
+  geant.gap_ansible.nokia_netconf_config:
     format: xml
     default_operation: merge
     content: "{{ lookup('ansible.builtin.template', '{{ local_side.iptrunk_side_node.vendor }}/{{ config_object }}.j2') }}"
     commit: true
+    config_mode: private
   diff: true
   check_mode: true
   when: >
@@ -37,11 +39,14 @@
     local_side.iptrunk_side_node.vendor == "nokia"
 
 - name: Remove base_config on "{{ inventory_hostname }}" [AND COMMIT][NOKIA]
-  ansible.netcommon.netconf_config:
+  # ansible.netcommon.netconf_config:
+  geant.gap_ansible.nokia_netconf_config:
     format: xml
     default_operation: merge
     content: "{{ lookup('ansible.builtin.template', '{{ local_side.iptrunk_side_node.vendor }}/{{ config_object }}.j2') }}"
     commit: true
+    commit_comment: "{{ commit_comment }}"
+    config_mode: private
   diff: true
   check_mode: false
   when: >

geant/gap_ansible/roles/iptrunk_migration/tasks/deactivate_trunk_side.yaml

@@ -39,6 +39,7 @@
     default_operation: merge
     content: "{{ lookup('ansible.builtin.template', '{{ local_side.iptrunk_side_node.vendor }}/{{ config_object }}.j2') }}"
     commit: true
+    config_mode: private
   diff: true
   check_mode: true
 
@@ -55,5 +56,6 @@
     content: "{{ lookup('ansible.builtin.template', '{{ local_side.iptrunk_side_node.vendor }}/{{ config_object }}.j2') }}"
     commit: true
     commit_comment: "{{ commit_comment }}"
+    config_mode: private
   diff: true
   check_mode: false

geant/gap_ansible/roles/iptrunk_migration/tasks/deploy_object.yaml

@@ -29,6 +29,7 @@
     default_operation: merge
     content: "{{ lookup('ansible.builtin.template', '{{ new_node.router.vendor }}/{{ config_object }}.j2') }}"
     commit: true
+    config_mode: private
   diff: true
   check_mode: true
   when: >
@@ -43,6 +44,7 @@
     content: "{{ lookup('ansible.builtin.template', '{{ new_node.router.vendor }}/{{ config_object }}.j2') }}"
     commit: true
     commit_comment: "{{ commit_comment }}"
+    config_mode: private
   diff: true
   check_mode: false
   when: >

geant/gap_ansible/roles/iptrunk_twamp/tasks/deploy_object.yaml

@@ -41,6 +41,7 @@
     default_operation: merge
     content: "{{ lookup('ansible.builtin.template', '{{ local_side.iptrunk_side_node.vendor }}/{{ config_object }}.j2') }}"
     commit: true
+    config_mode: private
   diff: true
   register: output
   check_mode: true
@@ -67,6 +68,7 @@
     content: "{{ lookup('ansible.builtin.template', '{{ local_side.iptrunk_side_node.vendor }}/{{ config_object }}.j2') }}"
     commit: true
     commit_comment: "{{ commit_comment }}"
+    config_mode: private
   diff: true
   check_mode: false
   when: >

geant/gap_ansible/roles/promote_p_to_pe/tasks/deploy.yaml

@@ -8,6 +8,7 @@
     content: "{{ lookup('ansible.builtin.template', 'routers/{{ subscription.router.vendor }}/pe_promotion_base_config.j2') }}"
     commit: true
     validate: true
+    config_mode: private
   diff: true
   register: output
   check_mode: true
@@ -22,6 +23,7 @@
     content: "{{ lookup('ansible.builtin.template', 'routers/{{ subscription.router.vendor }}/pe_promotion_base_vprn.j2') }}"
     commit: true
     validate: true
+    config_mode: private
   diff: true
   register: output
   check_mode: true
@@ -36,6 +38,7 @@
     content: "{{ lookup('ansible.builtin.template', 'routers/{{ subscription.router.vendor }}/pe_update_sdp.j2') }}"
     commit: true
     validate: true
+    config_mode: private
   diff: true
   register: output
   check_mode: true
@@ -50,6 +53,7 @@
     content: "{{ lookup('ansible.builtin.template', 'routers/{{ subscription.router.vendor }}/router/delete_default_static_routes.j2') }}"
     commit: true
     validate: true
+    config_mode: private
   diff: true
   register: output
   check_mode: true
@@ -72,6 +76,7 @@
     content: "{{ lookup('ansible.builtin.template', 'routers/{{ subscription.router.vendor }}/pe_promotion_base_config.j2') }}"
     commit: true
     commit_comment: "{{ commit_comment }}"
+    config_mode: private
   diff: true
   check_mode: false
 
@@ -85,6 +90,7 @@
     content: "{{ lookup('ansible.builtin.template', 'routers/{{ subscription.router.vendor }}/pe_promotion_base_vprn.j2') }}"
     commit: true
     commit_comment: "{{ commit_comment }}"
+    config_mode: private
   diff: true
   check_mode: false
 
@@ -98,6 +104,7 @@
     content: "{{ lookup('ansible.builtin.template', 'routers/{{ subscription.router.vendor }}/pe_update_sdp.j2') }}"
     commit: true
     commit_comment: "{{ commit_comment }}"
+    config_mode: private
   diff: true
   check_mode: false
 
@@ -111,5 +118,6 @@
     content: "{{ lookup('ansible.builtin.template', 'routers/{{ subscription.router.vendor }}/router/delete_default_static_routes.j2') }}"
     commit: true
     commit_comment: "{{ commit_comment }}"
+    config_mode: private
   diff: true
   check_mode: false