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

Jump to bottom

Apply device inactivity threshold at initial import time #632

Merged
merged 3 commits into from
Oct 12, 2024
Merged

Apply device inactivity threshold at initial import time #632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6684f81
Apply device inactivity threshold at initial import time
Andrew-Dickinson Oct 6, 2024
67c50c9
Fix formatting on spacer line
Andrew-Dickinson Oct 6, 2024
9774499
Merge branch 'main' into andrew/device-inactive-threshold-at-import
Andrew-Dickinson Oct 12, 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
23 changes: 16 additions & 7 deletions src/meshdb/utils/spreadsheet_import/parse_devices.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@

import django

from meshapi.util.uisp_import.constants import UISP_OFFLINE_DURATION_BEFORE_MARKING_INACTIVE

os.environ.setdefault("DJANGO_SETTINGS_MODULE", "meshdb.settings")
django.setup()

import dateutil.parser

from meshapi.models import AccessPoint, Device, Install, Node, Sector
from meshapi.util.uisp_import.fetch_uisp import get_uisp_devices
Expand Down Expand Up @@ -99,25 +100,33 @@ def create_device(nn: int, uisp_device: dict, spreadsheet_sector: Optional[Sprea
notes=sector_notes if sector_notes else None,
)
else:
uisp_last_seen = (
parse_uisp_datetime(uisp_device["overview"]["lastSeen"]) if uisp_device["overview"]["lastSeen"] else None
)

if not uisp_device["overview"]["status"]:
# If UISP doesn't have a status value, assume active
status = Device.DeviceStatus.ACTIVE
elif uisp_device["overview"]["status"] == "active":
status = Device.DeviceStatus.ACTIVE
else:
status = Device.DeviceStatus.INACTIVE
if (
not uisp_last_seen
or (datetime.datetime.now(datetime.timezone.utc) - uisp_last_seen)
> UISP_OFFLINE_DURATION_BEFORE_MARKING_INACTIVE
):
# Only use an offline status if the device has been offline long enough
status = Device.DeviceStatus.INACTIVE
else:
status = Device.DeviceStatus.ACTIVE

device = Device(
node=node,
name=uisp_device["identification"]["name"],
uisp_id=uisp_device["identification"]["id"],
status=status,
install_date=parse_uisp_datetime(uisp_device["overview"]["createdAt"]).date(),
abandon_date=(
parse_uisp_datetime(uisp_device["overview"]["lastSeen"]).date()
if status == Device.DeviceStatus.INACTIVE
else None
),
abandon_date=(uisp_last_seen.date() if status == Device.DeviceStatus.INACTIVE and uisp_last_seen else None),
notes=f"Automatically imported from UISP on {datetime.date.today().isoformat()}\n\n",
)

Expand Down
2 changes: 1 addition & 1 deletion src/meshdb/utils/spreadsheet_import/parse_install.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def get_spreadsheet_install_notes(row: SpreadsheetRow) -> str:
notes = f"Spreadsheet Contact Notes:\n{row.contactNotes}"

if notes:
notes += f"-------\n\n"
notes += f"\n-------\n\n"

return notes

Expand Down
Loading