Skip to content

Commit

Permalink
[ignore] Removed ENABLED_DISABLED_BOOLEAN_MAP from constants.py file
Browse files Browse the repository at this point in the history
  • Loading branch information
@sajagana
sajagana committed Dec 10, 2024
1 parent a3d118b commit b7f7bcc
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 13 deletions.
2 changes: 0 additions & 2 deletions plugins/module_utils/constants.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,5 +211,3 @@

ORIGINATE_DEFAULT_ROUTE = {"only": "only", "in_addition": "inAddition", "": ""}
L3OUT_ROUTING_PROTOCOLS = {"bgp": ["bgp"], "ospf": ["ospf"], "bgpOspf": ["bgp", "ospf"], None: [None], "": None, "bgpospf": "bgpOspf", "ospfbgp": "bgpOspf"}

ENABLED_DISABLED_BOOLEAN_MAP = {"enabled": True, "disabled": False, True: "enabled", False: "disabled"}
26 changes: 15 additions & 11 deletions plugins/modules/ndo_l3out_interface_routing_policy.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@
from ansible.module_utils.basic import AnsibleModule
from ansible_collections.cisco.mso.plugins.module_utils.mso import MSOModule, mso_argument_spec
from ansible_collections.cisco.mso.plugins.module_utils.template import MSOTemplate
from ansible_collections.cisco.mso.plugins.module_utils.constants import ENABLED_DISABLED_BOOLEAN_MAP
from ansible_collections.cisco.mso.plugins.module_utils.constants import ENABLED_OR_DISABLED_TO_BOOL_STRING_MAP
from ansible_collections.cisco.mso.plugins.module_utils.utils import append_update_ops_data


Expand Down Expand Up @@ -465,7 +465,7 @@ def main():
replace_data[("bfdPol", "minTxInterval")] = bfd_settings.get("min_transmit_interval")
replace_data[("bfdPol", "echoRxInterval")] = bfd_settings.get("echo_receive_interval")
replace_data[("bfdPol", "echoAdminState")] = bfd_settings.get("echo_admin_state")
replace_data[("bfdPol", "ifControl")] = ENABLED_DISABLED_BOOLEAN_MAP.get(bfd_settings.get("interface_control"))
replace_data[("bfdPol", "ifControl")] = ENABLED_OR_DISABLED_TO_BOOL_STRING_MAP.get(bfd_settings.get("interface_control"))

# OSPF Interface Settings
if ospf_interface_settings is not None:
Expand All @@ -484,12 +484,14 @@ def main():
replace_data[("ospfIntfPol", "deadInterval")] = ospf_interface_settings.get("dead_interval")
replace_data[("ospfIntfPol", "retransmitInterval")] = ospf_interface_settings.get("retransmit_interval")
replace_data[("ospfIntfPol", "transmitDelay")] = ospf_interface_settings.get("transmit_delay")
replace_data[("ospfIntfPol", "ifControl", "advertiseSubnet")] = ENABLED_DISABLED_BOOLEAN_MAP.get(
replace_data[("ospfIntfPol", "ifControl", "advertiseSubnet")] = ENABLED_OR_DISABLED_TO_BOOL_STRING_MAP.get(
ospf_interface_settings.get("advertise_subnet")
)
replace_data[("ospfIntfPol", "ifControl", "bfd")] = ENABLED_DISABLED_BOOLEAN_MAP.get(ospf_interface_settings.get("bfd"))
replace_data[("ospfIntfPol", "ifControl", "ignoreMtu")] = ENABLED_DISABLED_BOOLEAN_MAP.get(ospf_interface_settings.get("mtu_ignore"))
replace_data[("ospfIntfPol", "ifControl", "passiveParticipation")] = ENABLED_DISABLED_BOOLEAN_MAP.get(
replace_data[("ospfIntfPol", "ifControl", "bfd")] = ENABLED_OR_DISABLED_TO_BOOL_STRING_MAP.get(ospf_interface_settings.get("bfd"))
replace_data[("ospfIntfPol", "ifControl", "ignoreMtu")] = ENABLED_OR_DISABLED_TO_BOOL_STRING_MAP.get(
ospf_interface_settings.get("mtu_ignore")
)
replace_data[("ospfIntfPol", "ifControl", "passiveParticipation")] = ENABLED_OR_DISABLED_TO_BOOL_STRING_MAP.get(
ospf_interface_settings.get("passive_participation")
)

Expand All @@ -504,16 +506,18 @@ def main():
interface_controls = dict()

if ospf_interface_settings.get("advertise_subnet"):
interface_controls["advertiseSubnet"] = ENABLED_DISABLED_BOOLEAN_MAP.get(ospf_interface_settings.get("advertise_subnet"))
interface_controls["advertiseSubnet"] = ENABLED_OR_DISABLED_TO_BOOL_STRING_MAP.get(ospf_interface_settings.get("advertise_subnet"))

if ospf_interface_settings.get("bfd"):
interface_controls["bfd"] = ENABLED_DISABLED_BOOLEAN_MAP.get(ospf_interface_settings.get("bfd"))
interface_controls["bfd"] = ENABLED_OR_DISABLED_TO_BOOL_STRING_MAP.get(ospf_interface_settings.get("bfd"))

if ospf_interface_settings.get("mtu_ignore"):
interface_controls["ignoreMtu"] = ENABLED_DISABLED_BOOLEAN_MAP.get(ospf_interface_settings.get("mtu_ignore"))
interface_controls["ignoreMtu"] = ENABLED_OR_DISABLED_TO_BOOL_STRING_MAP.get(ospf_interface_settings.get("mtu_ignore"))

if ospf_interface_settings.get("passive_participation"):
interface_controls["passiveParticipation"] = ENABLED_DISABLED_BOOLEAN_MAP.get(ospf_interface_settings.get("passive_participation"))
interface_controls["passiveParticipation"] = ENABLED_OR_DISABLED_TO_BOOL_STRING_MAP.get(
ospf_interface_settings.get("passive_participation")
)

if interface_controls:
ospf_interface_pol["ifControl"] = interface_controls
Expand Down Expand Up @@ -583,7 +587,7 @@ def main():
bfd_settings_map["echoAdminState"] = bfd_settings.get("echo_admin_state")

if bfd_settings.get("interface_control"):
bfd_settings_map["ifControl"] = ENABLED_DISABLED_BOOLEAN_MAP.get(bfd_settings.get("interface_control"))
bfd_settings_map["ifControl"] = ENABLED_OR_DISABLED_TO_BOOL_STRING_MAP.get(bfd_settings.get("interface_control"))

if bfd_settings_map or bfd_settings.get("state") == "enabled":
payload["bfdPol"] = bfd_settings_map
Expand Down

0 comments on commit b7f7bcc

Please sign in to comment.