internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-08 22:33:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

MSO: Clean up internal references (#53242)

Browse Source 
During the development of the new site modules the use of references is
more common and this urged making the mechanism more simple overall.
This commit is contained in:
Dag Wieers
2019-03-04 01:26:47 +01:00
committed by GitHub
parent e4093fbad4
commit 85eb8c30a6
3 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ansible/modules/network/aci/mso_schema_template_anp_epg_contract.py
View File

@@ -211,7 +211,7 @@ def main():
if contract:
contracts = [(c['contractRef'],
c['relationshipType']) for c in schema_obj['templates'][template_idx]['anps'][anp_idx]['epgs'][epg_idx]['contractRelationships']]
contract_ref = mso.contract_ref(contract)
contract_ref = mso.contract_ref(**contract)
if (contract_ref, contract['type']) in contracts:
contract_idx = contracts.index((contract_ref, contract['type']))
# FIXME: Changes based on index are DANGEROUS

17
lib/ansible/modules/network/aci/mso_schema_template_contract_filter.py
View File

@@ -234,7 +234,7 @@ def main():
contract_idx = contracts.index(contract)
filters = [f['filterRef'] for f in schema_obj['templates'][template_idx]['contracts'][contract_idx][filter_key]]
filter_ref = mso.filter_ref(filter_schema_id, filter_template, filter_name)
filter_ref = mso.filter_ref(schema_id=filter_schema_id, template=filter_template, filter=filter_name)
if filter_ref in filters:
filter_idx = filters.index(filter_ref)
# FIXME: Changes based on index are DANGEROUS
@@ -289,13 +289,14 @@ def main():
mso.existing = mso.sent
if contract_idx is None:
# COntract does not exist, so we have to create it
if contract_display_name is None:
contract_display_name = contract
if contract_filter_type is None:
contract_ftype = 'bothWay'
if contract_scope is None:
contract_scope = 'context'
if not mso.existing:
# Contract does not exist, so we have to create it
if contract_display_name is None:
contract_display_name = contract
if contract_filter_type is None:
contract_ftype = 'bothWay'
if contract_scope is None:
contract_scope = 'context'
payload = {
'name': contract,