Skip to content

[Wireless design]: The break statement in the requested_profile.item() loop causes parameters to be skipped #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 6, 2025
Merged

[Wireless design]: The break statement in the requested_profile.item() loop causes parameters to be skipped #150

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f3a5bbc
test in progress
SyedKhadeerAhmed Oct 17, 2025
120b950
bug completed
SyedKhadeerAhmed Oct 22, 2025
62fda3a
bug completed
SyedKhadeerAhmed Oct 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
165 changes: 74 additions & 91 deletions plugins/modules/wireless_design_workflow_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13245,16 +13245,15 @@ def recursive_update(self, existing, updates):
)
existing[key] = value

def verify_create_update_access_point_profiles_requirement(
self, access_point_profiles
):
def verify_create_update_access_point_profiles_requirement(self, access_point_profiles):
"""
Determines whether access point profiles need to be created, updated, or require no updates.
Args:
access_point_profiles (list): A list of dictionaries containing the requested access point profile parameters.
Returns:
tuple: Three lists containing access point profiles to be created, updated, and not updated.
"""

# Update requested profiles with default values where needed
updated_access_point_profiles = self.map_access_point_profiles_params(
access_point_profiles
Expand All @@ -13268,129 +13267,115 @@ def verify_create_update_access_point_profiles_requirement(
self.log("Retrieved existing access point profiles from the system.", "DEBUG")

self.log(
"Existing Access Point Profiles: {0}".format(
existing_access_point_profiles
),
"Existing Access Point Profiles: {0}".format(existing_access_point_profiles),
"DEBUG",
)
self.log(
"Requested Access Point Profiles: {0}".format(
updated_access_point_profiles
),
"Requested Access Point Profiles: {0}".format(updated_access_point_profiles),
"DEBUG",
)

# Initialize lists to store profiles that need to be created, updated, or not changed
create_profiles = []
update_profiles = []
no_update_profiles = []

# Create a dictionary of existing profiles for quick lookup using the profile name
existing_profiles_dict = {
profile["apProfileName"]: profile
for profile in existing_access_point_profiles
profile["apProfileName"]: profile for profile in existing_access_point_profiles
}
self.log(
"Converted existing profiles to a dictionary for quick lookup.", "DEBUG"
)

# Iterate over the updated requested access point profiles
for requested_profile in updated_access_point_profiles:
profile_name = requested_profile["apProfileName"]
self.log("Checking profile: {0}".format(profile_name), "DEBUG")
update_needed = False

# Check if the profile already exists
tz = requested_profile.get("timeZone")
if tz in ("NOT CONFIGURED", "CONTROLLER"):
requested_profile["timeZoneOffsetHour"] = 0
requested_profile["timeZoneOffsetMinutes"] = 0
self.log(
"For profile '{0}', 'timeZone' is set to '{1}'. Setting 'timeZoneOffsetHour' and 'timeZoneOffsetMinutes' to 0.".format(
profile_name, tz
),
"DEBUG",
)

if "calendarPowerProfiles" in requested_profile and isinstance(
requested_profile["calendarPowerProfiles"], list
):
self.log(
"Normalizing calendarPowerProfiles for profile '{0}'.".format(
profile_name
),
"DEBUG",
)
for calendar_profile in requested_profile["calendarPowerProfiles"]:
if "duration" not in calendar_profile or calendar_profile["duration"] is None:
calendar_profile["duration"] = {}

scheduler_type = calendar_profile.get("schedulerType")
if scheduler_type == "DAILY":
calendar_profile["duration"]["schedulerDay"] = None
calendar_profile["duration"]["schedulerDate"] = None
self.log(
"Set 'schedulerDay' and 'schedulerDate' to None for schedulerType 'DAILY' in profile '{0}'.".format(
profile_name
),
"DEBUG",
)
elif scheduler_type == "WEEKLY":
calendar_profile["duration"]["schedulerDate"] = None
self.log(
"Set 'schedulerDate' to None for schedulerType 'WEEKLY' in profile '{0}'.".format(
profile_name
),
"DEBUG",
)
elif scheduler_type == "MONTHLY":
calendar_profile["duration"]["schedulerDay"] = None
self.log(
"Set 'schedulerDay' to None for schedulerType 'MONTHLY' in profile '{0}'.".format(
profile_name
),
"DEBUG",
)
else:
self.log(
"Unknown schedulerType '{0}' in calendarPowerProfiles for profile '{1}'.".format(
scheduler_type, profile_name
),
"DEBUG",
)

if profile_name in existing_profiles_dict:
existing_profile = existing_profiles_dict[profile_name]
self.log(
"Profile '{0}' exists in the system.".format(profile_name), "DEBUG"
)

# Iterate over each parameter in the requested profile
for key, requested_value in requested_profile.items():
if key in existing_profile:
existing_value = existing_profile[key]

# Compare requested and existing values
if not self.compare_values(requested_value, existing_value):
update_needed = True
self.log(
"Mismatch found in parameter '{0}' for profile '{1}'. "
"Requested value: {2}, Existing value: {3}".format(
"Mismatch found in parameter '{0}' for profile '{1}'. Requested: {2}, Existing: {3}".format(
key, profile_name, requested_value, existing_value
),
"DEBUG",
)

# Handle the specific case for time_zone
if key == "timeZone" and requested_value in [
"NOT CONFIGURED",
"CONTROLLER",
]:
# Ensure timeZoneOffsetHour and timeZoneOffsetMinutes are set to zero
requested_profile["timeZoneOffsetHour"] = 0
requested_profile["timeZoneOffsetMinutes"] = 0
self.log(
"For profile '{0}', 'timeZone' is set to '{1}'. Setting 'timeZoneOffsetHour' and 'timeZoneOffsetMinutes' to 0.".format(
profile_name, requested_value
),
"DEBUG",
)

# Handle the specific case for calendarPowerProfiles
if key == "calendarPowerProfiles":
self.log(
"Updating calendarPowerProfiles for profile '{0}'.".format(
profile_name
),
"DEBUG",
)
for calendar_profile in requested_value:
# Ensure the 'duration' field exists
if "duration" not in calendar_profile:
calendar_profile["duration"] = {}

# Update fields based on the schedulerType
scheduler_type = calendar_profile.get(
"schedulerType"
)
if scheduler_type == "DAILY":
calendar_profile["duration"][
"schedulerDay"
] = None
calendar_profile["duration"][
"schedulerDate"
] = None
self.log(
"Set 'schedulerDay' to None and 'schedulerDate' to None for schedulerType 'DAILY' "
"in profile '{0}'.".format(profile_name),
"DEBUG",
)
elif scheduler_type == "WEEKLY":
calendar_profile["duration"][
"schedulerDate"
] = None
self.log(
"Set 'schedulerDate' to None for schedulerType 'WEEKLY' in profile '{0}'.".format(
profile_name
),
"DEBUG",
)
elif scheduler_type == "MONTHLY":
calendar_profile["duration"][
"schedulerDay"
] = None
self.log(
"Unknown schedulerType '{0}' in calendarPowerProfiles for profile '{1}'.".format(
scheduler_type, profile_name
),
"DEBUG",
)
break
else:
update_needed = True
self.log(
"Requested key '{0}' not present in existing profile '{1}', marking for update.".format(
key, profile_name
),
"DEBUG",
)

if update_needed:
# Copy the existing profile and update it with the requested values
updated_profile = existing_profile.copy()
self.recursive_update(updated_profile, requested_profile)
update_profiles.append(updated_profile)
Expand All @@ -13401,8 +13386,7 @@ def verify_create_update_access_point_profiles_requirement(
# No changes needed for this profile
no_update_profiles.append(existing_profile)
self.log(
"Profile '{0}' requires no updates.".format(profile_name),
"DEBUG",
"Profile '{0}' requires no updates.".format(profile_name), "DEBUG"
)

else:
Expand Down Expand Up @@ -13431,10 +13415,10 @@ def verify_create_update_access_point_profiles_requirement(
"DEBUG",
)

# Validate that the total number of processed profiles matches the number of requested profiles
total_profiles_processed = (
len(create_profiles) + len(update_profiles) + len(no_update_profiles)
)

if total_profiles_processed == len(updated_access_point_profiles):
self.log(
"Match in total counts: Processed={0}, Requested={1}.".format(
Expand All @@ -13450,7 +13434,6 @@ def verify_create_update_access_point_profiles_requirement(
"ERROR",
)

# Return the categorized profiles
return create_profiles, update_profiles, no_update_profiles

def verify_delete_access_point_profiles_requirement(self, access_point_profiles):
Expand Down
Loading