ACI: Make querying links and nodes possible (#43441)

This functionality was not considered when the module was written, but
there's no reason why it shouldn't be supported.

We had to rework the query string construction and object filtering.
This new functionality allows to filter on arbitrary keys and supports
None values.

This PR fixes various issues with the existing framework, including
querying specific objects using construct_url_4 (i.e.
aci_epg_to_contract and aci_static_binding_to_epg)
This commit is contained in:
Dag Wieers 2018-08-07 23:54:54 +02:00 committed by GitHub
commit d8ba8c03f3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
105 changed files with 1236 additions and 1052 deletions

View file

@ -42,7 +42,8 @@
- name: Verify add_domain
assert:
that:
- cm_add_domain.changed == nm_add_domain.changed == true
- cm_add_domain is changed
- nm_add_domain is changed
- 'cm_add_domain.sent == nm_add_domain.sent == {"fcDomP": {"attributes": {"name": "fc_dom"}}}'
- 'cm_add_domain.proposed == nm_add_domain.proposed == {"fcDomP": {"attributes": {"name": "fc_dom"}}}'
- cm_add_domain.current == cm_add_domain.previous == nm_add_domain.previous == []
@ -60,7 +61,8 @@
- name: Verify add_domain_again
assert:
that:
- cm_add_domain_again.changed == nm_add_domain_again.changed == false
- cm_add_domain_again is not changed
- nm_add_domain_again is not changed
# QUERY ALL DOMAINS
@ -85,7 +87,8 @@
- name: Verify query_all_domains
assert:
that:
- cm_query_all_domains.changed == nm_query_all_domains.changed == false
- cm_query_all_domains is not changed
- nm_query_all_domains is not changed
- cm_query_all_domains == nm_query_all_domains
- nm_query_all_domains.current|length >= 1
@ -107,7 +110,8 @@
- name: Verify query_domain
assert:
that:
- cm_query_domain.changed == nm_query_domain.changed == false
- cm_query_domain is not changed
- nm_query_domain is not changed
- cm_query_domain == nm_query_domain
- nm_query_domain.current.0.fcDomP.attributes.dn == 'uni/fc-fc_dom'
- nm_query_domain.current.0.fcDomP.attributes.name == 'fc_dom'
@ -126,7 +130,8 @@
- name: Verify remove_domain
assert:
that:
- cm_remove_domain.changed == nm_remove_domain.changed == true
- cm_remove_domain is changed
- nm_remove_domain is changed
- 'cm_remove_domain.current == cm_remove_domain.previous == nm_remove_domain.previous == [{"fcDomP": {"attributes": {"dn": "uni/fc-fc_dom", "name": "fc_dom", "nameAlias": "", "ownerKey": "", "ownerTag": ""}}}]'
- nm_remove_domain.current == []
@ -142,7 +147,8 @@
- name: Verify remove_domain_again
assert:
that:
- cm_remove_domain_again.changed == nm_remove_domain_again.changed == false
- cm_remove_domain_again is not changed
- nm_remove_domain_again is not changed
# QUERY NON-EXISTING DOMAIN
@ -162,6 +168,7 @@
- name: Verify query_non_domain
assert:
that:
- cm_query_non_domain.changed == nm_query_non_domain.changed == false
- cm_query_non_domain is not changed
- nm_query_non_domain is not changed
- cm_query_non_domain == nm_query_non_domain
- nm_query_non_domain.current == []

View file

@ -42,7 +42,8 @@
- name: Verify add_domain
assert:
that:
- cm_add_domain.changed == nm_add_domain.changed == true
- cm_add_domain is changed
- nm_add_domain is changed
- 'cm_add_domain.sent == nm_add_domain.sent == {"l2extDomP": {"attributes": {"name": "l2_dom"}}}'
- 'cm_add_domain.proposed == nm_add_domain.proposed == {"l2extDomP": {"attributes": {"name": "l2_dom"}}}'
- cm_add_domain.current == cm_add_domain.previous == nm_add_domain.previous == []
@ -60,7 +61,8 @@
- name: Verify add_domain_again
assert:
that:
- cm_add_domain_again.changed == nm_add_domain_again.changed == false
- cm_add_domain_again is not changed
- nm_add_domain_again is not changed
# QUERY ALL DOMAINS
@ -85,7 +87,8 @@
- name: Verify query_all_domains
assert:
that:
- cm_query_all_domains.changed == nm_query_all_domains.changed == false
- cm_query_all_domains is not changed
- nm_query_all_domains is not changed
- cm_query_all_domains == nm_query_all_domains
- nm_query_all_domains.current|length >= 1
@ -107,7 +110,8 @@
- name: Verify query_domain
assert:
that:
- cm_query_domain.changed == nm_query_domain.changed == false
- cm_query_domain is not changed
- nm_query_domain is not changed
- cm_query_domain == nm_query_domain
- nm_query_domain.current.0.l2extDomP.attributes.dn == 'uni/l2dom-l2_dom'
- nm_query_domain.current.0.l2extDomP.attributes.name == 'l2_dom'
@ -126,7 +130,8 @@
- name: Verify remove_domain
assert:
that:
- cm_remove_domain.changed == nm_remove_domain.changed == true
- cm_remove_domain is changed
- nm_remove_domain is changed
- 'cm_remove_domain.current == cm_remove_domain.previous == nm_remove_domain.previous == [{"l2extDomP": {"attributes": {"dn": "uni/l2dom-l2_dom", "name": "l2_dom", "nameAlias": "", "ownerKey": "", "ownerTag": ""}}}]'
- nm_remove_domain.current == []
@ -142,7 +147,8 @@
- name: Verify remove_domain_again
assert:
that:
- cm_remove_domain_again.changed == nm_remove_domain_again.changed == false
- cm_remove_domain_again is not changed
- nm_remove_domain_again is not changed
# QUERY NON-EXISTING DOMAIN
@ -162,6 +168,7 @@
- name: Verify query_non_domain
assert:
that:
- cm_query_non_domain.changed == nm_query_non_domain.changed == false
- cm_query_non_domain is not changed
- nm_query_non_domain is not changed
- cm_query_non_domain == nm_query_non_domain
- nm_query_non_domain.current == []

View file

@ -42,7 +42,8 @@
- name: Verify add_domain
assert:
that:
- cm_add_domain.changed == nm_add_domain.changed == true
- cm_add_domain is changed
- nm_add_domain is changed
- 'cm_add_domain.sent == nm_add_domain.sent == {"l3extDomP": {"attributes": {"name": "l3_dom"}}}'
- 'cm_add_domain.proposed == nm_add_domain.proposed == {"l3extDomP": {"attributes": {"name": "l3_dom"}}}'
- cm_add_domain.current == cm_add_domain.previous == nm_add_domain.previous == []
@ -60,7 +61,8 @@
- name: Verify add_domain_again
assert:
that:
- cm_add_domain_again.changed == nm_add_domain_again.changed == false
- cm_add_domain_again is not changed
- nm_add_domain_again is not changed
# QUERY ALL DOMAINS
@ -85,7 +87,8 @@
- name: Verify query_all_domains
assert:
that:
- cm_query_all_domains.changed == nm_query_all_domains.changed == false
- cm_query_all_domains is not changed
- nm_query_all_domains is not changed
- cm_query_all_domains == nm_query_all_domains
- nm_query_all_domains.current|length >= 1
@ -107,7 +110,8 @@
- name: Verify query_domain
assert:
that:
- cm_query_domain.changed == nm_query_domain.changed == false
- cm_query_domain is not changed
- nm_query_domain is not changed
- cm_query_domain == nm_query_domain
- nm_query_domain.current.0.l3extDomP.attributes.dn == 'uni/l3dom-l3_dom'
- nm_query_domain.current.0.l3extDomP.attributes.name == 'l3_dom'
@ -126,7 +130,8 @@
- name: Verify remove_domain
assert:
that:
- cm_remove_domain.changed == nm_remove_domain.changed == true
- cm_remove_domain is changed
- nm_remove_domain is changed
- 'cm_remove_domain.current == cm_remove_domain.previous == nm_remove_domain.previous == [{"l3extDomP": {"attributes": {"dn": "uni/l3dom-l3_dom", "name": "l3_dom", "nameAlias": "", "ownerKey": "", "ownerTag": ""}}}]'
- nm_remove_domain.current == []
@ -142,7 +147,8 @@
- name: Verify remove_domain_again
assert:
that:
- cm_remove_domain_again.changed == nm_remove_domain_again.changed == false
- cm_remove_domain_again is not changed
- nm_remove_domain_again is not changed
# QUERY NON-EXISTING DOMAIN
@ -162,6 +168,7 @@
- name: Verify query_non_domain
assert:
that:
- cm_query_non_domain.changed == nm_query_non_domain.changed == false
- cm_query_non_domain is not changed
- nm_query_non_domain is not changed
- cm_query_non_domain == nm_query_non_domain
- nm_query_non_domain.current == []

View file

@ -42,7 +42,8 @@
- name: Verify add_domain
assert:
that:
- cm_add_domain.changed == nm_add_domain.changed == true
- cm_add_domain is changed
- nm_add_domain is changed
- 'cm_add_domain.sent == nm_add_domain.sent == {"physDomP": {"attributes": {"name": "phys_dom"}}}'
- 'cm_add_domain.proposed == nm_add_domain.proposed == {"physDomP": {"attributes": {"name": "phys_dom"}}}'
- cm_add_domain.current == cm_add_domain.previous == nm_add_domain.previous == []
@ -60,7 +61,8 @@
- name: Verify add_domain_again
assert:
that:
- cm_add_domain_again.changed == nm_add_domain_again.changed == false
- cm_add_domain_again is not changed
- nm_add_domain_again is not changed
# QUERY ALL DOMAINS
@ -85,7 +87,8 @@
- name: Verify query_all_domains
assert:
that:
- cm_query_all_domains.changed == nm_query_all_domains.changed == false
- cm_query_all_domains is not changed
- nm_query_all_domains is not changed
- cm_query_all_domains == nm_query_all_domains
- nm_query_all_domains.current|length >= 1
@ -107,7 +110,8 @@
- name: Verify query_domain
assert:
that:
- cm_query_domain.changed == nm_query_domain.changed == false
- cm_query_domain is not changed
- nm_query_domain is not changed
- cm_query_domain == nm_query_domain
- nm_query_domain.current.0.physDomP.attributes.dn == 'uni/phys-phys_dom'
- nm_query_domain.current.0.physDomP.attributes.name == 'phys_dom'
@ -126,7 +130,8 @@
- name: Verify remove_domain
assert:
that:
- cm_remove_domain.changed == nm_remove_domain.changed == true
- cm_remove_domain is changed
- nm_remove_domain is changed
- 'cm_remove_domain.current == cm_remove_domain.previous == nm_remove_domain.previous == [{"physDomP": {"attributes": {"dn": "uni/phys-phys_dom", "name": "phys_dom", "nameAlias": "", "ownerKey": "", "ownerTag": ""}}}]'
- nm_remove_domain.current == []
@ -142,7 +147,8 @@
- name: Verify remove_domain_again
assert:
that:
- cm_remove_domain_again.changed == nm_remove_domain_again.changed == false
- cm_remove_domain_again is not changed
- nm_remove_domain_again is not changed
# QUERY NON-EXISTING DOMAIN
@ -162,6 +168,7 @@
- name: Verify query_non_domain
assert:
that:
- cm_query_non_domain.changed == nm_query_non_domain.changed == false
- cm_query_non_domain is not changed
- nm_query_non_domain is not changed
- cm_query_non_domain == nm_query_non_domain
- nm_query_non_domain.current == []

View file

@ -44,7 +44,8 @@
- name: Verify add_domain
assert:
that:
- cm_add_domain.changed == nm_add_domain.changed == true
- cm_add_domain is changed
- nm_add_domain is changed
- 'cm_add_domain.sent == nm_add_domain.sent == {"vmmDomP": {"attributes": {"name": "vmm_dom"}}}'
- 'cm_add_domain.proposed == nm_add_domain.proposed == {"vmmDomP": {"attributes": {"name": "vmm_dom"}}}'
- cm_add_domain.current == cm_add_domain.previous == nm_add_domain.previous == []
@ -63,7 +64,8 @@
- name: Verify add_domain_again
assert:
that:
- cm_add_domain_again.changed == nm_add_domain_again.changed == false
- cm_add_domain_again is not changed
- nm_add_domain_again is not changed
# QUERY ALL DOMAINS
@ -89,7 +91,8 @@
- name: Verify query_all_domains
assert:
that:
- cm_query_all_domains.changed == nm_query_all_domains.changed == false
- cm_query_all_domains is not changed
- nm_query_all_domains is not changed
- cm_query_all_domains == nm_query_all_domains
- nm_query_all_domains.current|length >= 1
@ -113,7 +116,8 @@
- name: Verify query_domain
assert:
that:
- cm_query_domain.changed == nm_query_domain.changed == false
- cm_query_domain is not changed
- nm_query_domain is not changed
- cm_query_domain == nm_query_domain
- nm_query_domain.current.0.vmmDomP.attributes.dn == 'uni/vmmp-VMware/dom-vmm_dom'
- nm_query_domain.current.0.vmmDomP.attributes.name == 'vmm_dom'
@ -132,7 +136,8 @@
- name: Verify remove_domain
assert:
that:
- cm_remove_domain.changed == nm_remove_domain.changed == true
- cm_remove_domain is changed
- nm_remove_domain is changed
- cm_remove_domain.current == cm_remove_domain.previous == nm_remove_domain.previous
- nm_remove_domain.previous.0.vmmDomP.attributes.dn == 'uni/vmmp-VMware/dom-vmm_dom'
- nm_remove_domain.previous.0.vmmDomP.attributes.name == 'vmm_dom'
@ -150,7 +155,8 @@
- name: Verify remove_domain_again
assert:
that:
- cm_remove_domain_again.changed == nm_remove_domain_again.changed == false
- cm_remove_domain_again is not changed
- nm_remove_domain_again is not changed
# QUERY NON-EXISTING DOMAIN
@ -172,6 +178,7 @@
- name: Verify query_non_domain
assert:
that:
- cm_query_non_domain.changed == nm_query_non_domain.changed == false
- cm_query_non_domain is not changed
- nm_query_non_domain is not changed
- cm_query_non_domain == nm_query_non_domain
- nm_query_non_domain.current == []