Skip to content

Commit

Permalink
More iosxr integration zuul CI test fixes (ansible#57909)
Browse files Browse the repository at this point in the history
* Ignore `<rpc-reply>` node from candidate and
  running configuration in xml diff

* Add route-policy as prerequisite to BGP coonfiguration
  in integration test
  • Loading branch information
ganeshrn authored and danielmellado committed Jun 17, 2019
1 parent a096fa5 commit 4a3e14f
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 3 deletions.
8 changes: 6 additions & 2 deletions lib/ansible/module_utils/network/iosxr/iosxr.py
Original file line number Diff line number Diff line change
Expand Up @@ -345,8 +345,12 @@ def get_config_diff(module, running=None, candidate=None):
return response
elif is_netconf(module):
if running and candidate:
running_data = running.split("\n", 1)[-1].rsplit("\n", 1)[0]
candidate_data = candidate.split("\n", 1)[-1].rsplit("\n", 1)[0]
# ignore rpc-reply root node and diff from data element onwards
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:
d = Differ()
diff = list(d.compare(running_data.splitlines(), candidate_data.splitlines()))
Expand Down
14 changes: 13 additions & 1 deletion test/integration/targets/iosxr_bgp/tests/cli/basic.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,14 @@
that:
- '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
iosxr_bgp: &af_net
operation: merge
Expand Down Expand Up @@ -228,7 +236,11 @@
- assert:
that:
- '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'

- debug: msg="END iosxr cli/iosxr_bgp.yaml on connection={{ ansible_connection }}"

0 comments on commit 4a3e14f

Please sign in to comment.