Skip to content
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

refactored mac addresses into lists, rather than strings #31

Merged
merged 2 commits into from
Jun 21, 2024
Merged

refactored mac addresses into lists, rather than strings #31

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b53749e
refactored mac addresses into lists, rather than strings
jamesgreen-moj Jun 21, 2024
b009012
Commit changes made by code formatters
github-actions[bot] Jun 21, 2024
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
40 changes: 25 additions & 15 deletions src/juniper_ap_staging.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@ def format_site_and_mac_reservations(ap_csv: list['dict']
if existing_site:
# Update the mac_addresses field by appending the new MAC address
if mac_address not in existing_site["mac_addresses"]:
existing_site["mac_addresses"] += f",{mac_address}"
existing_site["mac_addresses"].append(mac_address.lower())
else:
# Create a new dictionary with the desired keys and values
new_item = {
""
"SiteName": site_name,
"mac_addresses": mac_address
"mac_addresses": [mac_address.lower()]
}
# Append the new dictionary to the output list
site_and_mac_reservations.append(new_item)
Expand Down Expand Up @@ -103,9 +103,7 @@ def get_site_payload_for_inventory_assign_to_site(
{
"op": "assign",
"site_id": site['site_id'],
"macs": [
site['mac_addresses']
],
"macs": site['mac_addresses'],
"no_reassign": False,
"disable_auto_config": False,
"managed": False
Expand Down Expand Up @@ -137,7 +135,7 @@ def build_rename_ap_payload(
for site in inventory_payloads:
for mac in site['macs']:
inventory_item = find_inventory_item_by_mac_address(
mist_inventory, mac.lower())
mist_inventory, mac)
csv_item = find_csv_item_by_mac_address(ap_csv, mac)
payload.append(
{
Expand All @@ -150,25 +148,37 @@ def build_rename_ap_payload(
return payload


def find_value_in_list_of_dicts(list_of_dicts, key, value):
for dictionary in list_of_dicts:
if dictionary.get(key) == value:
return dictionary
raise ValueError(
f"Value '{value}' not found for key '{key}' in the list of dictionaries.")


def find_inventory_item_by_mac_address(
mist_inventory: list['dict'],
mac: str
) -> dict:
for item in mist_inventory:
if item['mac'] == mac:
return item
raise ValueError(f"Unable to find item with Mac Address: '{mac}'")

try:
result = find_value_in_list_of_dicts(mist_inventory, "mac", mac)
return result
except ValueError as e:
print(e)


def find_csv_item_by_mac_address(
ap_csv: list['dict'],
mac: str
) -> list[dict]:
for item in ap_csv:
if item['MAC Address'].replace(":", "") == mac:
return item
raise ValueError(
f"Unable to find item name with Mac Address: '{mac}' in csv")

try:
result = find_value_in_list_of_dicts(
ap_csv, "MAC Address", mac.upper())
return result
except ValueError as e:
print(e)


def juniper_ap_assign(
Expand Down
Loading