tum 1 ano atrás
pai
commit
ef34c49a1f
1 arquivos alterados com 3 adições e 3 exclusões
  1. 3 3
      app/backend/views.py

+ 3 - 3
app/backend/views.py

371
     df0 = pd.DataFrame(data)
371
     df0 = pd.DataFrame(data)
372
     df0 = df0.explode(["header", "results"])
372
     df0 = df0.explode(["header", "results"])
373
     try:
373
     try:
374
-        df1 = df0[["header", "results", "dt", "sla_name", "test_display_name", "verifier_name", "network", "address", "interface"]]
374
+        df1 = df0[["header", "results", "dt", "sla_name", "test_display_name", "verifier_name", "network", "address", "interface", "ts"]]
375
     except:
375
     except:
376
         df1 = df0[["header", "results", "dt", "sla_name", "test_display_name", "verifier_name",]]
376
         df1 = df0[["header", "results", "dt", "sla_name", "test_display_name", "verifier_name",]]
377
 
377
 
381
     #df1['results_text'] = df1['results'].apply(con_human)
381
     #df1['results_text'] = df1['results'].apply(con_human)
382
     df1['results_text'] = df1.apply(con_human, axis=1)
382
     df1['results_text'] = df1.apply(con_human, axis=1)
383
     try:
383
     try:
384
-        df1['network_str'] = df1['network'] + " / " + df1['interface'] 
384
+        df1['network_str'] = df1['network'] + " / " + df1['interface'] + " / " + df1['ts'] 
385
     except:
385
     except:
386
         df1['network_str'] = "N/A"
386
         df1['network_str'] = "N/A"
387
 
387
 
478
         pprint(f"dump = {r.status_code}")
478
         pprint(f"dump = {r.status_code}")
479
 
479
 
480
     # 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)
480
     # 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)
481
-    r = requests.get(f'http://web:8000/backend/gen_report/?genReport=Gen+Report', timeout=None)
481
+    r = requests.get(f'http://web:8000/backend/gen_report/?genReport=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', timeout=None)
482
     if r.status_code == 200:
482
     if r.status_code == 200:
483
         pprint("genreport OK")
483
         pprint("genreport OK")
484
     else:
484
     else: