From f12ba55441cdf51c648616adb3c25b8905fd3951 Mon Sep 17 00:00:00 2001 From: Anton M Date: Fri, 10 Jan 2025 22:11:19 +0100 Subject: [PATCH] everything is working --- validity/scripts/runtests/split.py | 9 +++------ validity/urls.py | 5 +++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/validity/scripts/runtests/split.py b/validity/scripts/runtests/split.py index 1713033..14d3c91 100644 --- a/validity/scripts/runtests/split.py +++ b/validity/scripts/runtests/split.py @@ -54,10 +54,7 @@ def sync_datasources( datasources = self.datasources_to_sync(overriding_datasource, device_filter) if datasources.exists(): self.datasource_sync_fn(datasources, device_filter) - logger.info( - "The following Data Sources have been synced: " - + ", ".join(sorted(f'"{ds.name}"' for ds in datasources)) - ) + logger.info("The following Data Sources have been synced: " + ", ".join(md_link(ds) for ds in datasources)) else: logger.warning("No bound Data Sources found. Sync skipped") return datasources @@ -69,8 +66,8 @@ def fail_handler(backup_point, error): backup_points = list(self.backup_queryset.filter(data_source__in=datasources)) self.backup_fn(backup_points, fail_handler=fail_handler) if backup_points: - bp_names = ", ".join(bp.name for bp in backup_points) - logger.info(f"Data Sources have been backed up to the following Backup Points: {bp_names}") + bp_names = ", ".join(md_link(bp) for bp in backup_points) + logger.info(f"Data Sources have been backed up using the following Backup Points: {bp_names}") def _work_slices( self, selector_qs: QuerySet[ComplianceSelector], specific_devices: list[int], devices_per_worker: int diff --git a/validity/urls.py b/validity/urls.py index 028beb6..98340b3 100644 --- a/validity/urls.py +++ b/validity/urls.py @@ -30,8 +30,6 @@ path("namesets//", include(get_model_urls("validity", "nameset"))), path("reports/", views.ComplianceReportListView.as_view(), name="compliancereport_list"), path("reports//", include(get_model_urls("validity", "compliancereport"))), - # hack to display NetBox Job view without an error - path("reports//", views.ComplianceReportView.as_view(), name="compliancereport_jobs"), path("pollers/", views.PollerListView.as_view(), name="poller_list"), path("pollers/add/", views.PollerEditView.as_view(), name="poller_add"), path("pollers/delete/", views.PollerBulkDeleteView.as_view(), name="poller_bulk_delete"), @@ -48,4 +46,7 @@ path("backup-points/delete/", views.BackupPointBulkDeleteView.as_view(), name="backuppoint_bulk_delete"), path("backup-points/import/", views.BackupPointBulkImportView.as_view(), name="backuppoint_import"), path("backup-points//", include(get_model_urls("validity", "backuppoint"))), + # hacks to display native NetBox Job view without an error + path("reports//", views.ComplianceReportView.as_view(), name="compliancereport_jobs"), + path("backup-points//", views.BackupPointView.as_view(), name="backuppoint_jobs"), ]