From 81214409cfcb1f256aef910e6196ff5dca7ff1aa Mon Sep 17 00:00:00 2001 From: Deepak Agrawal Date: Wed, 12 Sep 2018 07:50:24 +0530 Subject: [PATCH] asa_config/ios_config: diff strict does not work with multiple parents (#45150) * multiple parents issues in diff * Integration tests for missing functionality * add testcase for other platforms. vnxos does not support qos so need to find a command chain on v-nxos for multiple parets. junos uses on-device diff so should not need this. * Fix for issue when any candidate parent did not meet the exact line in running-config * DCI runs eos_config without become flag --- .../module_utils/network/common/config.py | 8 +++ .../cli/sublevel_strict_mul_parents.yaml | 66 +++++++++++++++++ .../cli/sublevel_strict_mul_parents.yaml | 71 +++++++++++++++++++ .../cli/sublevel_strict_mul_parents.yaml | 66 +++++++++++++++++ .../cli/sublevel_strict_mul_parents.yaml | 67 +++++++++++++++++ 5 files changed, 278 insertions(+) create mode 100644 test/integration/targets/asa_config/tests/cli/sublevel_strict_mul_parents.yaml create mode 100644 test/integration/targets/eos_config/tests/cli/sublevel_strict_mul_parents.yaml create mode 100644 test/integration/targets/ios_config/tests/cli/sublevel_strict_mul_parents.yaml create mode 100644 test/integration/targets/iosxr_config/tests/cli/sublevel_strict_mul_parents.yaml diff --git a/lib/ansible/module_utils/network/common/config.py b/lib/ansible/module_utils/network/common/config.py index 40d2272e02c..fe9b8894a55 100644 --- a/lib/ansible/module_utils/network/common/config.py +++ b/lib/ansible/module_utils/network/common/config.py @@ -296,6 +296,14 @@ class NetworkConfig(object): def _diff_strict(self, other): updates = list() + # block extracted from other does not have all parents + # but the last one. In case of multiple parents we need + # to add additional parents. + if other and isinstance(other, list) and len(other) > 0: + start_other = other[0] + if start_other.parents: + for parent in start_other.parents: + other.insert(0, ConfigLine(parent)) for index, line in enumerate(self.items): try: if str(line).strip() != str(other[index]).strip(): diff --git a/test/integration/targets/asa_config/tests/cli/sublevel_strict_mul_parents.yaml b/test/integration/targets/asa_config/tests/cli/sublevel_strict_mul_parents.yaml new file mode 100644 index 00000000000..7ded0132194 --- /dev/null +++ b/test/integration/targets/asa_config/tests/cli/sublevel_strict_mul_parents.yaml @@ -0,0 +1,66 @@ +--- +- debug: msg="START cli/sublevel_strict_mul_parents.yaml on connection={{ ansible_connection }}" + +- name: setup + asa_config: + lines: + - class-map c1 + - match default-inspection-traffic + - policy-map p1 + - class c1 + before: ['no policy-map p1', 'no class-map c1'] + match: none + +- name: configure sub level command using strict match + asa_config: + lines: + - inspect ftp + - inspect tftp + parents: ['policy-map p1', 'class c1'] + match: strict + register: result + +- assert: + that: + - "result.changed == true" + - "'inspect ftp' in result.updates" + - "'inspect tftp' in result.updates" + +- name: change sub level command order and config with strict match + asa_config: + lines: + - inspect tftp + - inspect ftp + parents: ['policy-map p1', 'class c1'] + match: strict + register: result + +- assert: + that: + - "result.changed == true" + - "'inspect ftp' in result.updates" + - "'inspect tftp' in result.updates" + +- name: Config sub level command with strict match (Idempotency) + asa_config: + lines: +#ASA does not change order of class action if reconfigured +#so we have to use old order for Idempotency + - inspect ftp + - inspect tftp + parents: ['policy-map p1', 'class c1'] + match: strict + register: result + +- assert: + that: + - "result.changed == false" + +- name: teardown + asa_config: + lines: + - no policy-map p1 + - no class-map c1 + match: strict + +- debug: msg="END cli/sublevel_strict_mul_parents.yaml on connection={{ ansible_connection }}" diff --git a/test/integration/targets/eos_config/tests/cli/sublevel_strict_mul_parents.yaml b/test/integration/targets/eos_config/tests/cli/sublevel_strict_mul_parents.yaml new file mode 100644 index 00000000000..36204438fc1 --- /dev/null +++ b/test/integration/targets/eos_config/tests/cli/sublevel_strict_mul_parents.yaml @@ -0,0 +1,71 @@ +--- +- debug: msg="START cli/sublevel_strict_mul_parents.yaml on connection={{ ansible_connection }}" + +- name: setup + eos_config: + lines: + - class-map type qos match-any c1 + - match ip access-group 10 + - policy-map type qos p1 + - class c1 + before: ['no policy-map type qos p1', 'no class-map type qos match-any c1'] + match: none + become: yes + +- name: configure sub level command using strict match + eos_config: + lines: + - set cos 1 + - set dscp 62 + parents: ['policy-map type qos p1', 'class c1'] + match: strict + register: result + become: yes + +- assert: + that: + - "result.changed == true" + - "'set cos 1' in result.updates" + - "'set dscp 62' in result.updates" + +- name: change sub level command order and config with strict match + eos_config: + lines: + - set dscp 62 + - set cos 1 + parents: ['policy-map type qos p1', 'class c1'] + match: strict + register: result + become: yes + +- assert: + that: + - "result.changed == true" + - "'set cos 1' in result.updates" + - "'set dscp 62' in result.updates" + +- name: Config sub level command with strict match (Idempotency) + eos_config: + lines: +#EOS does not change order of class action if reconfigured +#so we have to use old order for Idempotency + - set cos 1 + - set dscp 62 + parents: ['policy-map type qos p1', 'class c1'] + match: strict + register: result + become: yes + +- assert: + that: + - "result.changed == false" + +- name: teardown + eos_config: + lines: + - no policy-map type qos p1 + - no class-map type qos match-any c1 + match: none + become: yes + +- debug: msg="END cli/sublevel_strict_mul_parents.yaml on connection={{ ansible_connection }}" diff --git a/test/integration/targets/ios_config/tests/cli/sublevel_strict_mul_parents.yaml b/test/integration/targets/ios_config/tests/cli/sublevel_strict_mul_parents.yaml new file mode 100644 index 00000000000..f99f77e3415 --- /dev/null +++ b/test/integration/targets/ios_config/tests/cli/sublevel_strict_mul_parents.yaml @@ -0,0 +1,66 @@ +--- +- debug: msg="START cli/sublevel_strict_mul_parents.yaml on connection={{ ansible_connection }}" + +- name: setup + ios_config: + lines: + - class-map c1 + - match precedence 7 + - policy-map p1 + - class c1 + before: ['no policy-map p1', 'no class-map c1'] + match: none + +- name: configure sub level command using strict match + ios_config: + lines: + - set ip precedence 5 + - police cir percent 10 + parents: ['policy-map p1', 'class c1'] + match: strict + register: result + +- assert: + that: + - "result.changed == true" + - "'set ip precedence 5' in result.updates" + - "'police cir percent 10' in result.updates" + +- name: change sub level command order and config with strict match + ios_config: + lines: + - police cir percent 10 + - set ip precedence 5 + parents: ['policy-map p1', 'class c1'] + match: strict + register: result + +- assert: + that: + - "result.changed == true" + - "'set ip precedence 5' in result.updates" + - "'police cir percent 10' in result.updates" + +- name: Config sub level command with strict match (Idempotency) + ios_config: + lines: +#IOS does not change orded of class action if reconfigured +#so we have to use old order for Idempoteny + - set ip precedence 5 + - police cir percent 10 + parents: ['policy-map p1', 'class c1'] + match: strict + register: result + +- assert: + that: + - "result.changed == false" + +- name: teardown + ios_config: + lines: + - no policy-map p1 + - no class-map c1 + match: none + +- debug: msg="END cli/sublevel_strict_mul_parents.yaml on connection={{ ansible_connection }}" diff --git a/test/integration/targets/iosxr_config/tests/cli/sublevel_strict_mul_parents.yaml b/test/integration/targets/iosxr_config/tests/cli/sublevel_strict_mul_parents.yaml new file mode 100644 index 00000000000..b06c0570d58 --- /dev/null +++ b/test/integration/targets/iosxr_config/tests/cli/sublevel_strict_mul_parents.yaml @@ -0,0 +1,67 @@ +--- +- debug: msg="START cli/sublevel_strict_mul_parents.yaml on connection={{ ansible_connection }}" + +- name: setup + iosxr_config: + lines: + - class-map match-any c1 + - match precedence 7 + - policy-map p1 + - class c1 + - set precedence 2 + before: ['no policy-map p1', 'no class-map match-any c1'] + match: none + +- name: configure sub level command using strict match + iosxr_config: + lines: + - set precedence 5 + - police rate percent 10 + parents: ['policy-map p1', 'class c1'] + match: strict + register: result + +- assert: + that: + - "result.changed == true" + - "'set precedence 5' in result.commands" + - "'police rate percent 10' in result.commands" + +- name: change sub level command order and config with strict match + iosxr_config: + lines: + - police rate percent 10 + - set precedence 5 + parents: ['policy-map p1', 'class c1'] + match: strict + register: result + +- assert: + that: + - "result.changed == true" + - "'set precedence 5' in result.commands" + - "'police rate percent 10' in result.commands" + +- name: Config sub level command with strict match (Idempotency) + iosxr_config: + lines: +#IOSxr does not change order of class action if reconfigured +#so we have to use old order for Idempotency + - set precedence 5 + - police rate percent 10 + parents: ['policy-map p1', 'class c1'] + match: strict + register: result + +- assert: + that: + - "result.changed == false" + +- name: teardown + iosxr_config: + lines: + - no policy-map p1 + - no class-map match-any c1 + match: none + +- debug: msg="END cli/sublevel_strict_mul_parents.yaml on connection={{ ansible_connection }}"