From 59243a9afc4e661512164899305a8cc4350a555a Mon Sep 17 00:00:00 2001
From: Simone Spinelli <simone.spinelli@geant.org>
Date: Mon, 8 Jan 2024 13:42:20 +0100
Subject: [PATCH] rename attribute router_vendor in vendor
---
.../roles/iptrunk/tasks/compile_object.yaml | 2 +-
.../roles/iptrunk/tasks/deploy_object.yaml | 16 ++++++++--------
geant/gap_ansible/roles/iptrunk/tasks/main.yml | 4 ++--
.../roles/iptrunk/tasks/remove_trunk.yaml | 16 ++++++++--------
4 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/geant/gap_ansible/roles/iptrunk/tasks/compile_object.yaml b/geant/gap_ansible/roles/iptrunk/tasks/compile_object.yaml
index a929902c..f248c392 100644
--- a/geant/gap_ansible/roles/iptrunk/tasks/compile_object.yaml
+++ b/geant/gap_ansible/roles/iptrunk/tasks/compile_object.yaml
@@ -14,7 +14,7 @@
- name: Print the template in "/var/tmp/ansible_run_{{ opid }}/{{ config_object }}.conf"
ansible.builtin.template:
- src: "{{ local_side.iptrunk_side_node.router_vendor }}/{{ config_object }}.j2"
+ src: "{{ local_side.iptrunk_side_node.vendor }}/{{ config_object }}.j2"
dest: "/var/tmp/ansible_run_{{ opid }}/{{ config_object }}.conf"
lstrip_blocks: true
trim_blocks: true
diff --git a/geant/gap_ansible/roles/iptrunk/tasks/deploy_object.yaml b/geant/gap_ansible/roles/iptrunk/tasks/deploy_object.yaml
index c07fb35f..53a0b11b 100644
--- a/geant/gap_ansible/roles/iptrunk/tasks/deploy_object.yaml
+++ b/geant/gap_ansible/roles/iptrunk/tasks/deploy_object.yaml
@@ -10,7 +10,7 @@
register: response
when: >
verb == "deploy" and
- local_side.iptrunk_side_node.router_vendor == "juniper" and
+ local_side.iptrunk_side_node.vendor == "juniper" and
dry_run | ansible.builtin.bool
- name: Show DRY diff of "{{ config_object }}"
@@ -19,7 +19,7 @@
when: >
verb == "deploy"
and dry_run | ansible.builtin.bool and
- local_side.iptrunk_side_node.router_vendor == "juniper"
+ local_side.iptrunk_side_node.vendor == "juniper"
- name: Deploy "{{ config_object }}" on "{{ inventory_hostname }}" [AND COMMIT][JUNIPER]
juniper_junos_config:
@@ -32,7 +32,7 @@
register: response
when: >
verb == "deploy" and
- local_side.iptrunk_side_node.router_vendor == "juniper" and
+ local_side.iptrunk_side_node.vendor == "juniper" and
not (dry_run | ansible.builtin.bool)
- name: Show real diff of "{{ config_object }}"
@@ -40,31 +40,31 @@
msg: "{{ response }}"
when: >
verb == "deploy" and
- local_side.iptrunk_side_node.router_vendor == "juniper" and
+ local_side.iptrunk_side_node.vendor == "juniper" and
not (dry_run | ansible.builtin.bool)
- name: Deploy "{{ config_object }}" on "{{ inventory_hostname }}" [CHECK ONLY][NOKIA]
ansible.netcommon.netconf_config:
format: xml
default_operation: merge
- content: "{{ lookup('ansible.builtin.template', '{{ local_side.iptrunk_side_node.router_vendor }}/{{ config_object }}.j2') }}"
+ content: "{{ lookup('ansible.builtin.template', '{{ local_side.iptrunk_side_node.vendor }}/{{ config_object }}.j2') }}"
commit: true
diff: true
check_mode: true
when: >
verb == "deploy" and
( dry_run | ansible.builtin.bool ) is true and
- local_side.iptrunk_side_node.router_vendor == "nokia"
+ local_side.iptrunk_side_node.vendor == "nokia"
- name: Deploy base_config on "{{ inventory_hostname }}" [AND COMMIT][NOKIA]
ansible.netcommon.netconf_config:
format: xml
default_operation: merge
- content: "{{ lookup('ansible.builtin.template', '{{ local_side.iptrunk_side_node.router_vendor }}/{{ config_object }}.j2') }}"
+ content: "{{ lookup('ansible.builtin.template', '{{ local_side.iptrunk_side_node.vendor }}/{{ config_object }}.j2') }}"
commit: true
diff: true
check_mode: false
when: >
verb == "deploy" and
( dry_run | ansible.builtin.bool ) is false and
- local_side.iptrunk_side_node.router_vendor == "nokia"
+ local_side.iptrunk_side_node.vendor == "nokia"
diff --git a/geant/gap_ansible/roles/iptrunk/tasks/main.yml b/geant/gap_ansible/roles/iptrunk/tasks/main.yml
index abe1ecce..788199e9 100644
--- a/geant/gap_ansible/roles/iptrunk/tasks/main.yml
+++ b/geant/gap_ansible/roles/iptrunk/tasks/main.yml
@@ -36,8 +36,8 @@
- name: Load netconf connection config
ansible.builtin.set_fact:
- ansible_connection: "{{ netconf_access[local_side.iptrunk_side_node.router_vendor].ansible_connection }}"
- ansible_network_os: "{{ netconf_access[local_side.iptrunk_side_node.router_vendor].ansible_network_os }}"
+ ansible_connection: "{{ netconf_access[local_side.iptrunk_side_node.vendor].ansible_connection }}"
+ ansible_network_os: "{{ netconf_access[local_side.iptrunk_side_node.vendor].ansible_network_os }}"
- name: Load remote info
ansible.builtin.set_fact:
diff --git a/geant/gap_ansible/roles/iptrunk/tasks/remove_trunk.yaml b/geant/gap_ansible/roles/iptrunk/tasks/remove_trunk.yaml
index 820796b3..e6c05980 100644
--- a/geant/gap_ansible/roles/iptrunk/tasks/remove_trunk.yaml
+++ b/geant/gap_ansible/roles/iptrunk/tasks/remove_trunk.yaml
@@ -11,7 +11,7 @@
when:
verb == "terminate" and
dry_run | ansible.builtin.bool and
- local_side.iptrunk_side_node.router_vendor == "juniper"
+ local_side.iptrunk_side_node.vendor == "juniper"
- name: Show DRY diff of "{{ config_object }}"
ansible.builtin.debug:
@@ -19,7 +19,7 @@
when:
verb == "terminate" and
dry_run | ansible.builtin.bool and
- local_side.iptrunk_side_node.router_vendor == "juniper"
+ local_side.iptrunk_side_node.vendor == "juniper"
- name: Remove "{{ config_object }}" [FOR REAL]
juniper_junos_config:
@@ -33,7 +33,7 @@
when:
verb == "terminate" and
not (dry_run | ansible.builtin.bool) and
- local_side.iptrunk_side_node.router_vendor == "juniper"
+ local_side.iptrunk_side_node.vendor == "juniper"
- name: Show real diff of "{{ config_object }}"
ansible.builtin.debug:
@@ -41,30 +41,30 @@
when:
verb == "terminate" and
dry_run | ansible.builtin.bool and
- local_side.iptrunk_side_node.router_vendor == "juniper"
+ local_side.iptrunk_side_node.vendor == "juniper"
- name: Remove "{{ config_object }}" on "{{ inventory_hostname }}" [CHECK ONLY][NOKIA]
ansible.netcommon.netconf_config:
format: xml
default_operation: merge
- content: "{{ lookup('ansible.builtin.template', '{{ local_side.iptrunk_side_node.router_vendor }}/{{ config_object }}.j2') }}"
+ content: "{{ lookup('ansible.builtin.template', '{{ local_side.iptrunk_side_node.vendor }}/{{ config_object }}.j2') }}"
commit: true
diff: true
check_mode: true
when: >
verb == "terminate" and
( dry_run | ansible.builtin.bool ) and
- local_side.iptrunk_side_node.router_vendor == "nokia"
+ local_side.iptrunk_side_node.vendor == "nokia"
- name: Remove base_config on "{{ inventory_hostname }}" [AND COMMIT][NOKIA]
ansible.netcommon.netconf_config:
format: xml
default_operation: merge
- content: "{{ lookup('ansible.builtin.template', '{{ local_side.iptrunk_side_node.router_vendor }}/{{ config_object }}.j2') }}"
+ content: "{{ lookup('ansible.builtin.template', '{{ local_side.iptrunk_side_node.vendor }}/{{ config_object }}.j2') }}"
commit: true
diff: true
check_mode: false
when: >
verb == "terminate" and
not ( dry_run | ansible.builtin.bool ) and
- local_side.iptrunk_side_node.router_vendor == "nokia"
+ local_side.iptrunk_side_node.vendor == "nokia"
--
GitLab