diff --git a/galaxy.yml b/galaxy.yml index ec51b14..fd54b7a 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -2,8 +2,8 @@ authors: - Rohit Thakur (rohitthakur2590) dependencies: - "ansible.netcommon": ">=5.1.1" - "ansible.utils": ">=2.7.0" + ansible.netcommon: ">=5.1.1" + ansible.utils: ">=2.7.0" license_file: LICENSE name: bgp description: Ansible Network BGP enables user to manage the BGP resources independent of platforms and perform BGP health checks. diff --git a/roles/run/tasks/includes/configure.yaml b/roles/run/tasks/includes/configure.yaml index 5ed5f8d..a3464f9 100644 --- a/roles/run/tasks/includes/configure.yaml +++ b/roles/run/tasks/includes/configure.yaml @@ -3,4 +3,4 @@ ansible.builtin.include_role: name: network.base.resource_manager vars: - operation: 'configure' + operation: configure diff --git a/roles/run/tasks/includes/deploy.yaml b/roles/run/tasks/includes/deploy.yaml index 19beb88..4b5f82b 100644 --- a/roles/run/tasks/includes/deploy.yaml +++ b/roles/run/tasks/includes/deploy.yaml @@ -6,5 +6,5 @@ ansible.builtin.include_role: name: network.base.resource_manager vars: - operation: 'deploy' + operation: deploy resources: "{{ bgp_resources }}" diff --git a/roles/run/tasks/includes/detect.yaml b/roles/run/tasks/includes/detect.yaml index f87154a..4259211 100644 --- a/roles/run/tasks/includes/detect.yaml +++ b/roles/run/tasks/includes/detect.yaml @@ -6,6 +6,6 @@ ansible.builtin.include_role: name: network.base.resource_manager vars: - operation: 'detect' - state: 'replaced' + operation: detect + state: replaced resources: "{{ bgp_resources }}" diff --git a/roles/run/tasks/includes/gather.yaml b/roles/run/tasks/includes/gather.yaml index c441774..2549529 100644 --- a/roles/run/tasks/includes/gather.yaml +++ b/roles/run/tasks/includes/gather.yaml @@ -6,5 +6,5 @@ ansible.builtin.include_role: name: network.base.resource_manager vars: - operation: 'gather' + operation: gather resources: "{{ bgp_resources }}" diff --git a/roles/run/tasks/includes/health_check.yaml b/roles/run/tasks/includes/health_check.yaml index 77f1ce8..04cc16f 100644 --- a/roles/run/tasks/includes/health_check.yaml +++ b/roles/run/tasks/includes/health_check.yaml @@ -4,9 +4,9 @@ - name: Set health checks fact ansible.builtin.set_fact: - health_checks: "{{ bgp_health | network.bgp.health_check_view(operation) }}" + health_checks: "{{ bgp_health | network.bgp.health_check_view(operation) }}" - name: BGP health checks ansible.builtin.debug: - var: health_checks + var: health_checks failed_when: "'unsuccessful' == health_checks.status" diff --git a/roles/run/tasks/includes/health_checks/eos.yaml b/roles/run/tasks/includes/health_checks/eos.yaml index b71a087..0336c8d 100644 --- a/roles/run/tasks/includes/health_checks/eos.yaml +++ b/roles/run/tasks/includes/health_checks/eos.yaml @@ -1,7 +1,7 @@ --- - name: Parse bgp summary ansible.utils.cli_parse: - command: "show ip bgp summary" + command: show ip bgp summary parser: name: ansible.netcommon.content_templates set_fact: bgp_health diff --git a/roles/run/tasks/includes/health_checks/ios.yaml b/roles/run/tasks/includes/health_checks/ios.yaml index d2e66f2..3b3b27e 100644 --- a/roles/run/tasks/includes/health_checks/ios.yaml +++ b/roles/run/tasks/includes/health_checks/ios.yaml @@ -1,7 +1,7 @@ --- - name: Parse bgp summary ansible.utils.cli_parse: - command: "show bgp summary" + command: show bgp summary parser: name: ansible.netcommon.content_templates set_fact: bgp_health diff --git a/roles/run/tasks/includes/health_checks/iosxr.yaml b/roles/run/tasks/includes/health_checks/iosxr.yaml index d2e66f2..3b3b27e 100644 --- a/roles/run/tasks/includes/health_checks/iosxr.yaml +++ b/roles/run/tasks/includes/health_checks/iosxr.yaml @@ -1,7 +1,7 @@ --- - name: Parse bgp summary ansible.utils.cli_parse: - command: "show bgp summary" + command: show bgp summary parser: name: ansible.netcommon.content_templates set_fact: bgp_health diff --git a/roles/run/tasks/includes/health_checks/junos.yaml b/roles/run/tasks/includes/health_checks/junos.yaml index bf80e6c..42251a2 100644 --- a/roles/run/tasks/includes/health_checks/junos.yaml +++ b/roles/run/tasks/includes/health_checks/junos.yaml @@ -1,12 +1,11 @@ --- - name: Parse bgp summary ansible.utils.cli_parse: - command: "show bgp summary" + command: show bgp summary parser: name: ansible.netcommon.content_templates set_fact: bgp_health - - name: Show Summary facts ansible.builtin.debug: msg: "{{ bgp_health }}" diff --git a/roles/run/tasks/includes/health_checks/nxos.yaml b/roles/run/tasks/includes/health_checks/nxos.yaml index b71a087..0336c8d 100644 --- a/roles/run/tasks/includes/health_checks/nxos.yaml +++ b/roles/run/tasks/includes/health_checks/nxos.yaml @@ -1,7 +1,7 @@ --- - name: Parse bgp summary ansible.utils.cli_parse: - command: "show ip bgp summary" + command: show ip bgp summary parser: name: ansible.netcommon.content_templates set_fact: bgp_health diff --git a/roles/run/tasks/includes/health_checks/vyos.yaml b/roles/run/tasks/includes/health_checks/vyos.yaml index b71a087..0336c8d 100644 --- a/roles/run/tasks/includes/health_checks/vyos.yaml +++ b/roles/run/tasks/includes/health_checks/vyos.yaml @@ -1,7 +1,7 @@ --- - name: Parse bgp summary ansible.utils.cli_parse: - command: "show ip bgp summary" + command: show ip bgp summary parser: name: ansible.netcommon.content_templates set_fact: bgp_health diff --git a/roles/run/tasks/includes/list.yaml b/roles/run/tasks/includes/list.yaml index 03d5bd3..c794b39 100644 --- a/roles/run/tasks/includes/list.yaml +++ b/roles/run/tasks/includes/list.yaml @@ -3,4 +3,4 @@ ansible.builtin.include_role: name: network.base.resource_manager vars: - operation: 'list' + operation: list diff --git a/roles/run/tasks/includes/persist.yaml b/roles/run/tasks/includes/persist.yaml index c27e14f..a44eb28 100644 --- a/roles/run/tasks/includes/persist.yaml +++ b/roles/run/tasks/includes/persist.yaml @@ -6,6 +6,6 @@ ansible.builtin.include_role: name: network.base.resource_manager vars: - operation: 'persist' + operation: persist resources: "{{ bgp_resources }}" ignore_empty: "{{ persist_empty | default(true) }}" diff --git a/roles/run/tasks/includes/remediate.yaml b/roles/run/tasks/includes/remediate.yaml index 63a7aa2..406b0cc 100644 --- a/roles/run/tasks/includes/remediate.yaml +++ b/roles/run/tasks/includes/remediate.yaml @@ -6,6 +6,6 @@ ansible.builtin.include_role: name: network.base.resource_manager vars: - operation: 'remediate' - state: 'replaced' + operation: remediate + state: replaced resources: "{{ bgp_resources }}" diff --git a/roles/run/tasks/includes/resources.yaml b/roles/run/tasks/includes/resources.yaml index b0332cf..0dfda14 100644 --- a/roles/run/tasks/includes/resources.yaml +++ b/roles/run/tasks/includes/resources.yaml @@ -2,14 +2,14 @@ - name: Set resources ansible.builtin.set_fact: bgp_resources: - - 'bgp_global' - - 'bgp_address_family' - - 'bgp_neighbor_address_family' + - bgp_global + - bgp_address_family + - bgp_neighbor_address_family when: ansible_network_os == 'cisco.nxos.nxos' - name: Set resources ansible.builtin.set_fact: bgp_resources: - - 'bgp_global' - - 'bgp_address_family' + - bgp_global + - bgp_address_family when: ansible_network_os != 'cisco.nxos.nxos' diff --git a/tests/bgp/roles/tests/tasks/health_check.yml b/tests/bgp/roles/tests/tasks/health_check.yml index bd82c3c..67095fd 100644 --- a/tests/bgp/roles/tests/tasks/health_check.yml +++ b/tests/bgp/roles/tests/tasks/health_check.yml @@ -10,10 +10,10 @@ msg_rcvd: 73271 msg_sent: 73233 output_queue: 0 - peer: "12.0.0.1" + peer: 12.0.0.1 peer_as: 500 peer_state: 1 - uptime: "6w4d" + uptime: 6w4d version: 4 - bgp_table_version: 1 @@ -21,34 +21,33 @@ msg_rcvd: 0 msg_sent: 0 output_queue: 0 - peer: "23.0.0.1" + peer: 23.0.0.1 peer_as: 500 - peer_state: "Idle" - uptime: "never" + peer_state: Idle + uptime: never version: 4 path: memory_usage: 288 total_entries: 2 route_table_version: 3 - router_id: "22.0.0.1" + router_id: 22.0.0.1 - name: Vars ansible.builtin.set_fact: tests_item: - name: "health_check" + name: health_check vars: checks: - - name: "all_neighbors_up" - - name: "all_neighbors_down" - - name: "min_neighbors_up" + - name: all_neighbors_up + - name: all_neighbors_down + - name: min_neighbors_up min_count: 1 - name: Set BGP health facts ansible.builtin.set_fact: tests_health_checks: "{{ bgp_health | ansible.utils.health_check_view(tests_item) }}" - - name: Check for accurate facts ansible.builtin.assert: that: "{{ tests_health_checks == tests_expected_health_checks }}"