cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

More iosxr integration zuul CI test fixes (#57909)

Browse source 
* Ignore `<rpc-reply>` node from candidate and
  running configuration in xml diff

* Add route-policy as prerequisite to BGP coonfiguration
  in integration test
This commit is contained in:
Ganesh Nalawade 2019-06-17 20:52:47 +05:30 committed by Daniel Mellado Area
parent a096fa5c12
commit 4a3e14f90b
2 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/module_utils/network/iosxr/iosxr.py
View file

@ -345,8 +345,12 @@ def get_config_diff(module, running=None, candidate=None):
return response return response
elif is_netconf(module): elif is_netconf(module):
if running and candidate: if running and candidate:
running_data = running.split("\n", 1)[-1].rsplit("\n", 1)[0] # ignore rpc-reply root node and diff from data element onwards
candidate_data = candidate.split("\n", 1)[-1].rsplit("\n", 1)[0] running_data_ele = etree.fromstring(to_bytes(running.strip())).getchildren()[0]
candidate_data_ele = etree.fromstring(to_bytes(candidate.strip())).getchildren()[0]
running_data = to_text(etree.tostring(running_data_ele)).strip()
candidate_data = to_text(etree.tostring(candidate_data_ele)).strip()
if running_data != candidate_data: if running_data != candidate_data:
d = Differ() d = Differ()
diff = list(d.compare(running_data.splitlines(), candidate_data.splitlines())) diff = list(d.compare(running_data.splitlines(), candidate_data.splitlines()))

14
test/integration/targets/iosxr_bgp/tests/cli/basic.yaml
View file

@ -108,6 +108,14 @@
that: that:
- 'result.changed == false' - 'result.changed == false'
- name: create route-policy as prerequisite for BGP configuration
iosxr_config:
lines:
- no route-policy RMAP_1
- route-policy RMAP_1
- exit
register: result
- name: Configure networks under address family - name: Configure networks under address family
iosxr_bgp: &af_net iosxr_bgp: &af_net
operation: merge operation: merge
@ -228,7 +236,11 @@
- assert: - assert:
that: that:
- 'result.changed == false' - 'result.changed == false'
- name: delete route-policy configures as prerequisite for BGP configuration (teardown)
iosxr_config:
lines: no route-policy RMAP_1
when: facts['ansible_facts']['ansible_net_version'].split('[')[0] == '6.1.3' when: facts['ansible_facts']['ansible_net_version'].split('[')[0] == '6.1.3'
- debug: msg="END iosxr cli/iosxr_bgp.yaml on connection={{ ansible_connection }}" - debug: msg="END iosxr cli/iosxr_bgp.yaml on connection={{ ansible_connection }}"