Skip to content

Commit

Permalink
[ignore] Modify conditions to configure child objects for aci_tenant_…
Browse files Browse the repository at this point in the history 
…action_rule_profile.
  • Loading branch information
@gmicol
gmicol committed Nov 1, 2023
1 parent 1bbfbf4 commit 6dcc43b
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 48 deletions.
10 changes: 0 additions & 10 deletions plugins/module_utils/aci.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -336,16 +336,6 @@ def action_rule_set_dampening_spec():
)


def check_all_none_values_dict(x):
if isinstance(x, dict):
for value in x.values():
if value is not None:
return False
return True
else:
return False


class ACIModule(object):
def __init__(self, module):
self.module = module
Expand Down
70 changes: 32 additions & 38 deletions plugins/modules/aci_tenant_action_rule_profile.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,6 @@
aci_annotation_spec,
action_rule_set_comm_spec,
action_rule_set_dampening_spec,
check_all_none_values_dict
)
from ansible_collections.cisco.aci.plugins.module_utils.constants import MATCH_ACTION_RULE_SET_METRIC_TYPE_MAPPING

Expand Down Expand Up @@ -369,16 +368,6 @@ def main():
)

action_rule = module.params.get("action_rule")
set_community = module.params.get("set_community")
set_dampening = module.params.get("set_dampening")
set_next_hop = module.params.get("set_next_hop")
next_hop_propagation = module.params.get("next_hop_propagation")
multipath = module.params.get("multipath")
set_preference = module.params.get("set_preference")
set_metric = module.params.get("set_metric")
set_metric_type = MATCH_ACTION_RULE_SET_METRIC_TYPE_MAPPING.get(module.params.get("set_metric_type"))
set_route_tag = module.params.get("set_route_tag")
set_weight = module.params.get("set_weight")
description = module.params.get("description")
state = module.params.get("state")
tenant = module.params.get("tenant")
Expand All @@ -387,17 +376,21 @@ def main():
aci = ACIModule(module)

# This dict contains the name of the child classes as well as the corresping attribute input (and attribute name if the input is a string)
# this dict is deviating from normal child classes list structure in order to determine which child classes should be created, modified, deleted or ignored.
child_classes = dict(
rtctrlSetComm=dict(attribute_input=set_community),
rtctrlSetDamp=dict(attribute_input=set_dampening),
rtctrlSetNh=dict(attribute_input=set_next_hop, attribute_name="addr"),
rtctrlSetNhUnchanged=dict(attribute_input=next_hop_propagation),
rtctrlSetPref=dict(attribute_input=set_preference, attribute_name="localPref"),
rtctrlSetRedistMultipath=dict(attribute_input=multipath),
rtctrlSetRtMetric=dict(attribute_input=set_metric, attribute_name="metric"),
rtctrlSetRtMetricType=dict(attribute_input=set_metric_type, attribute_name="metricType"),
rtctrlSetTag=dict(attribute_input=set_route_tag, attribute_name="tag"),
rtctrlSetWeight=dict(attribute_input=set_weight, attribute_name="weight"),
rtctrlSetComm=dict(attribute_input=module.params.get("set_community")),
rtctrlSetDamp=dict(attribute_input=module.params.get("set_dampening")),
rtctrlSetNh=dict(attribute_input=module.params.get("set_next_hop"), attribute_name="addr"),
rtctrlSetNhUnchanged=dict(attribute_input=module.params.get("next_hop_propagation")),
rtctrlSetPref=dict(attribute_input=module.params.get("set_preference"), attribute_name="localPref"),
rtctrlSetRedistMultipath=dict(attribute_input=module.params.get("multipath")),
rtctrlSetRtMetric=dict(attribute_input=module.params.get("set_metric"), attribute_name="metric"),
rtctrlSetRtMetricType=dict(
attribute_input=MATCH_ACTION_RULE_SET_METRIC_TYPE_MAPPING.get(module.params.get("set_metric_type")),
attribute_name="metricType"
),
rtctrlSetTag=dict(attribute_input=module.params.get("set_route_tag"), attribute_name="tag"),
rtctrlSetWeight=dict(attribute_input=module.params.get("set_weight"), attribute_name="weight"),
)

aci.construct_url(
Expand All @@ -421,14 +414,15 @@ def main():
if state == "present":
child_configs = []
for class_name, attribute in child_classes.items():
# The following condition enables to user to keep its previous configurations if they are not passing anyting in the payload.
if attribute.get("attribute_input") is not None:
attribute_input = attribute.get("attribute_input")
# This condition enables to user to keep its previous configurations if they are not passing anyting in the payload.
if attribute_input is not None:
# This condition checks if the attribute input is a dict and checks if all of its values are None (stored as a boolean in only_none).
only_none = False
if isinstance(attribute_input, dict):
only_none = all(value is None for value in attribute_input.values())
# This condition checks if the child object needs to be deleted depending on the type of the corresponding attribute input (bool, str, dict).
if (
attribute.get("attribute_input") == ""
or attribute.get("attribute_input") is False
or check_all_none_values_dict(attribute.get("attribute_input"))
):
if attribute_input == "" or attribute_input is False or only_none:
if isinstance(aci.existing, list) and len(aci.existing) > 0:
for child in aci.existing[0].get("rtctrlAttrP", {}).get("children", {}):
if child.get(class_name):
Expand All @@ -440,35 +434,35 @@ def main():
}
)
# This condition checks if the child object needs to be modified or created depending on the type of the corresponding attribute input.
elif attribute.get("attribute_input") != "" or attribute.get("attribute_input") is True or attribute.get("attribute_input") != {}:
if class_name == "rtctrlSetComm" and isinstance(attribute.get("attribute_input"), dict):
elif attribute_input != "" or attribute_input is True or attribute_input != {}:
if class_name == "rtctrlSetComm" and isinstance(attribute_input, dict):
child_configs.append(
{
class_name: dict(
attributes=dict(
community=attribute.get("attribute_input").get("community"),
setCriteria=attribute.get("attribute_input").get("criteria"),
community=attribute_input.get("community"),
setCriteria=attribute_input.get("criteria"),
),
)
}
)
elif class_name == "rtctrlSetDamp" and isinstance(attribute.get("attribute_input"), dict):
elif class_name == "rtctrlSetDamp" and isinstance(attribute_input, dict):
child_configs.append(
{
class_name: dict(
attributes=dict(
halfLife=attribute.get("attribute_input").get("half_life"),
maxSuppressTime=attribute.get("attribute_input").get("max_suppress_time"),
reuse=attribute.get("attribute_input").get("reuse"),
suppress=attribute.get("attribute_input").get("suppress"),
halfLife=attribute_input.get("half_life"),
maxSuppressTime=attribute_input.get("max_suppress_time"),
reuse=attribute_input.get("reuse"),
suppress=attribute_input.get("suppress"),
),
)
}
)
elif class_name in ["rtctrlSetNhUnchanged", "rtctrlSetRedistMultipath"]:
child_configs.append({class_name: dict(attributes=dict(descr=""))})
else:
child_configs.append({class_name: dict(attributes={attribute.get("attribute_name"): attribute.get("attribute_input")})})
child_configs.append({class_name: dict(attributes={attribute.get("attribute_name"): attribute_input})})

aci.payload(
aci_class="rtctrlAttrP",
Expand Down

0 comments on commit 6dcc43b

Please sign in to comment.