latest

app/backend/views.py

@@ -1,6 +1,6 @@
 from django.shortcuts import render, redirect
 from backend.mongodb import db
-from exfo.lib import Exfo, Mikrotik
+from exfo.lib import Exfo, Mikrotik, SLA_MAP
 from pprint import pprint
 
 from ttp import ttp
@@ -272,8 +272,11 @@ def dump_fixed_results(request):
         #pprint(r)
         try:
             r0 = r['result']
+            pprint(r0)
             if len(r0) > 0:
                 col.insert_many(r0)
+            else:
+                pprint("Empty Result")
         except Exception as e:
             pprint(e)
 
@@ -334,15 +337,23 @@ def gen_report_notebook():
         if not d['sla_name']:
             continue
 
-        sla_splt = d['sla_name'].split('-')
+        # sla_splt = d['sla_name'].split('-')
+        sla_splt = d['verifier_name'].split('_')
         if len(sla_splt) > 1:
-            reg_cond = f'(?=^pppoe-out)(?=.*{sla_splt[0]})(?=.*{sla_splt[-1]})'
+            # reg_cond = f'(?=^pppoe-out)(?=.*{sla_splt[0]})(?=.*{sla_splt[-1]})'
+            # reg_cond = f'(?=^pppoe-out)(?=.*{sla_splt[-1]})'
+            reg_cond = f'(?=.*pppoe-out)(?=.*{sla_splt[-1]})'
 
             pprint(reg_cond)
-            temp_addr = list(c2.find({'ts': {'$lte': utc, '$gte': yest }, 'interface': {'$regex': reg_cond,  '$not': { '$regex': '^pppoe-out5'}, '$options': 'i' }, 'invalid': 'false'}).sort("ts", -1))
+            temp_addr = list(c2.find({'ts': {'$lte': utc, '$gte': yest }, 'interface': {'$regex': reg_cond,  '$not': { '$regex': 'pppoe-out5'}, '$options': 'i' }, 'invalid': 'false'}).sort("ts", -1))
+            # temp_addr = list(c2.find({'ts': {'$lte': utc, '$gte': yest }, 'interface': {'$regex': reg_cond, '$options': 'i' }, 'invalid': 'false'}).sort("ts", -1))
+            # temp_addr = list(c2.find({'interface': {'$regex': reg_cond, '$options': 'i' }, 'invalid': 'false'}).sort("ts", -1))
+            pprint("-------")
             pprint("temp addr")
             pprint(d['sla_name'])
-            # //pprint(temp_addr)
+
+            pprint(temp_addr)
+
             target_address = None
             if temp_addr:
                 target_address = temp_addr[0]
@@ -360,7 +371,7 @@ def gen_report_notebook():
     df0 = pd.DataFrame(data)
     df0 = df0.explode(["header", "results"])
     try:
-        df1 = df0[["header", "results", "dt", "sla_name", "test_display_name", "verifier_name", "network", "address", "interface"]]
+        df1 = df0[["header", "results", "dt", "sla_name", "test_display_name", "verifier_name", "network", "address", "interface", "ts"]]
     except:
         df1 = df0[["header", "results", "dt", "sla_name", "test_display_name", "verifier_name",]]
 
@@ -370,7 +381,7 @@ def gen_report_notebook():
     #df1['results_text'] = df1['results'].apply(con_human)
     df1['results_text'] = df1.apply(con_human, axis=1)
     try:
-        df1['network_str'] = df1['network'] + " / " + df1['interface']
+        df1['network_str'] = df1['network'] + " / " + df1['interface'] + " / " + df1['ts']
     except:
         df1['network_str'] = "N/A"
 
@@ -407,10 +418,10 @@ def gen_report(request):
     table = table.dropna(how='all', axis=0)
     table = table.dropna(how='all', axis=1)
 
-    gen_report = request.GET.get('genReport', None)
+    is_gen_report = request.GET.get('genReport', None)
 
     report_link = None
-    if gen_report:
+    if is_gen_report:
         import time
         # ts = int(time.time())
         import pytz
@@ -422,8 +433,12 @@ def gen_report(request):
         report_link = f'/media/{fn}'
 
     try:
-        mk_ips = mkt.call_remote("ip/route")
-        mk_address = mkt.call_remote("ip/address")
+        mk_ips = []
+        mk_address = []
+        for v in SLA_MAP.values():
+            mkt = Mikrotik(v)
+            mk_ips.append(mkt.call_remote("ip/route"))
+            mk_address.append(mkt.call_remote("ip/address"))
     except:
         mk_ips = []
         mk_address = []
@@ -436,15 +451,19 @@ def gen_report(request):
 def mikro_dump_task():
     #look at only pppoe only ( excloude pppoe5 )
     col  = db['ip_address']
-    try:
-        mk_address = mkt.call_remote("ip/address")
-        for i in mk_address:
-            temp = {'ts': datetime.utcnow()}
-            temp = temp | i
-            col.insert_one(temp)
-        pprint("dump ip complete")
-    except Exception as e:
-        pprint(f"error = {e}")
+    pprint(SLA_MAP.values())
+    for v in SLA_MAP.values():
+        for v0 in v.split(','):
+            mkt = Mikrotik(v0)
+            try:
+                mk_address = mkt.call_remote("ip/address")
+                for i in mk_address:
+                    temp = {'ts': datetime.utcnow()}
+                    temp = temp | i
+                    col.insert_one(temp)
+                pprint("dump ip complete")
+            except Exception as e:
+                pprint(e)
 
 @shared_task
 def gen_report_task():
@@ -458,7 +477,8 @@ def gen_report_task():
     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)
+    # 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)
+    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)
     if r.status_code == 200:
         pprint("genreport OK")
     else:

app/exfo/lib.py

@@ -55,7 +55,9 @@ class Exfo:
           'Accept': 'application/json'
         }
         url = self.BASE_IP + ep
+        pprint("--- call remote ---")
         pprint(url)
+        pprint(payload)
         response = self.session.get(url, headers=headers, data=payload, verify=False)
         pprint(response)
         return response
@@ -121,15 +123,14 @@ SLA_MAP = {
         "RBI BV-110":"61.7.161.162",	
         "NSN":"61.7.161.164",	
         "CBI":"61.7.161.163",	
-        "CMI":"61.7.161.171",	
+        "CMI":"61.7.161.171,61.7.161.172",	
         "HYI":"61.7.161.180",	
         "NMA":"61.7.161.179",	
         "CRI":"61.7.161.178",	
         "SNI":"61.7.161.177",	
         "SPI":"61.7.161.175",	
         "PTY BV-110":"61.7.161.174",	
-        "PTY":"61.7.161.159",	
-        "PTY":"61.7.161.161",	
+        "PTY":"61.7.161.159,61.7.161.161",	
         "PLK":"61.7.161.169",	
         "HYI _BV-100":"61.7.161.168",	
         "CMI BV-110":"61.7.161.167",	
@@ -147,10 +148,14 @@ class Mikrotik:
       'Authorization': 'Basic YWRtaW46RGlnaXRpbnNfMDE='
     }
 
+    def __init__(self, ip=None):
+        if ip:
+            self.BASE_URL = f"https://{ip}/rest/"
+
     def call_remote(self, cmd, payload={}):
         url = self.BASE_URL + cmd
         pprint(url)
-        response = requests.get(url, auth=self.basic,  data=payload, verify=False)
+        response = requests.get(url, auth=self.basic,  data=payload, verify=False, timeout=3)
         return response.json()
 
 

app/templates/base.html

@@ -7,7 +7,7 @@
     <meta name="description" content="">
     <meta name="author" content="Mark Otto, Jacob Thornton, and Bootstrap contributors">
     <meta name="generator" content="Hugo 0.84.0">
-    <title>Dashboard Template · Bootstrap v5.0</title>
+    <title>Network Report System</title>
 
     <link rel="canonical" href="https://getbootstrap.com/docs/5.0/examples/dashboard/">
 
@@ -43,7 +43,7 @@
   <body>
     
 <header class="navbar navbar-dark sticky-top bg-dark flex-md-nowrap p-0 shadow">
-  <a class="navbar-brand col-md-3 col-lg-2 me-0 px-3" href="#">Company name</a>
+  <a class="navbar-brand col-md-3 col-lg-2 me-0 px-3" href="#">Network Report System</a>
   <button class="navbar-toggler position-absolute d-md-none collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#sidebarMenu" aria-controls="sidebarMenu" aria-expanded="false" aria-label="Toggle navigation">
     <span class="navbar-toggler-icon"></span>
   </button>

app/templates/base_raw.html

@@ -7,7 +7,7 @@
     <meta name="description" content="">
     <meta name="author" content="Mark Otto, Jacob Thornton, and Bootstrap contributors">
     <meta name="generator" content="Hugo 0.84.0">
-    <title>Dashboard Template · Bootstrap v5.0</title>
+    <title>Network Report System</title>
 
     <link rel="canonical" href="https://getbootstrap.com/docs/5.0/examples/dashboard/">
 
@@ -43,7 +43,7 @@
   <body>
     
 <header class="navbar navbar-dark sticky-top bg-dark flex-md-nowrap p-0 shadow">
-  <a class="navbar-brand col-md-3 col-lg-2 me-0 px-3" href="#">Company name</a>
+  <a class="navbar-brand col-md-3 col-lg-2 me-0 px-3" href="#">Network Report System</a>
   <button class="navbar-toggler position-absolute d-md-none collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#sidebarMenu" aria-controls="sidebarMenu" aria-expanded="false" aria-label="Toggle navigation">
     <span class="navbar-toggler-icon"></span>
   </button>