list report

app/backend/templates/backend/list_reports.html

@@ -0,0 +1,15 @@
+{% extends "base_raw.html" %}
+{% load backend_tags %}
+{% block content %}
+<h2>List Reports</h2>
+<ul>
+  {% for f in file_list %}
+  <li><a href="/media/{{ f }}">{{ f }}</a></li>
+  {% endfor %}
+</ul>
+<style>
+th {
+  text-align:center;
+}
+</style>
+{% endblock %}

app/backend/urls.py

@@ -13,4 +13,5 @@ urlpatterns = [
     path('dump_fixed_results/', views.dump_fixed_results, name='dump_fixed_results'),
     path('print_table/', views.print_table, name='print_table'),
     path('gen_report/', views.gen_report, name='gen_report'), 
+    path('list_reports/', views.list_reports, name='list_reports'), 
 ]

app/backend/views.py

@@ -359,13 +359,21 @@ def gen_report_notebook():
 
     df0 = pd.DataFrame(data)
     df0 = df0.explode(["header", "results"])
-    df1 = df0[["header", "results", "dt", "sla_name", "test_display_name", "verifier_name", "network", "address", "interface"]]
+    try:
+        df1 = df0[["header", "results", "dt", "sla_name", "test_display_name", "verifier_name", "network", "address", "interface"]]
+    except:
+        df1 = df0[["header", "results", "dt", "sla_name", "test_display_name", "verifier_name",]]
+
     df1 = df1.query('sla_name == sla_name')
     #pprint(df1['sla_name'].unique())
     
     #df1['results_text'] = df1['results'].apply(con_human)
     df1['results_text'] = df1.apply(con_human, axis=1)
-    df1['network_str'] = df1['network'] + " / " + df1['interface'] 
+    try:
+        df1['network_str'] = df1['network'] + " / " + df1['interface'] 
+    except:
+        df1['network_str'] = "N/A"
+
     table = df1.pivot(index=['sla_name', 'dt', 'verifier_name', 'network_str'],columns=['test_display_name','header'], values='results_text').sort_values(by=['sla_name', 'dt'], ascending=[True, False])
     table = table.dropna(how='all', axis=0)
     return (table,df1)
@@ -404,7 +412,10 @@ def gen_report(request):
     report_link = None
     if gen_report:
         import time
-        ts = int(time.time())
+        # ts = int(time.time())
+        import pytz
+        tz = pytz.timezone('Asia/Bangkok')
+        ts = datetime.now(tz).strftime("%Y%m%d_%H%M%S")
         fn = f"report_{ts}.xlsx"
 
         table.to_excel(f'/code/media/{fn}')
@@ -432,3 +443,33 @@ def mikro_dump_task():
         col.insert_one(temp)
     pprint("dump ip complete")
 
+@shared_task
+def gen_report_task():
+    import requests
+    import socket
+    ip = socket.gethostbyname(socket.gethostname())
+
+    r = requests.get(f'http://web:8000/backend/dump_fixed_results/', timeout=None)
+    if r.status_code == 200:
+        pprint("dump OK")
+    else:
+        pprint(f"dump = {r.status_code}")
+
+    r = requests.get(f'http://web:8000/backend/gen_report/?sla_name=BNG-144-VLAN20-Public&sla_name=BNG-144-VLAN10-Private&sla_name=BRAS-88-VLAN20-Public&sla_name=BRAS-88-VLAN10-Private&genReport=Gen+Report', timeout=None)
+    if r.status_code == 200:
+        pprint("genreport OK")
+    else:
+        pprint(f"genreport = {r.status_code}")
+
+def list_reports(request):
+    import os
+    from django.conf import settings
+    
+    mr = settings.MEDIA_ROOT
+    file_list =os.listdir(mr)  
+
+    def get_creation_time(item):
+        item_path = os.path.join(mr, item)
+        return os.path.getctime(item_path)
+    file_list = sorted(file_list, key=get_creation_time, reverse=True)
+    return render(request, 'backend/list_reports.html', {'file_list': file_list})

app/network_report/settings.py

@@ -206,4 +206,8 @@ CELERY_BEAT_SCHEDULE = {
         "task": "backend.views.mikro_dump_task",
         "schedule": crontab(minute="*/3"),
     },
+    "gen_report": {
+        "task": "backend.views.gen_report_task",
+        "schedule": crontab(minute="*/10"),
+    },
 }