tum пре 2 година
родитељ
комит
b27e2eda76

BIN
app/Output/excel_out_test_excel_formatter_update.xlsx


+ 1 - 0
app/backend/templates/backend/service_status.html

79
   <li>{{ si.test_name }} 
79
   <li>{{ si.test_name }} 
80
     <a href="{% url "backend:service_status" %}?cmd={{ si.test_defn_uri }}&section=test_define" class='text-decoration-none badge bg-primary'>Test Define</a>
80
     <a href="{% url "backend:service_status" %}?cmd={{ si.test_defn_uri }}&section=test_define" class='text-decoration-none badge bg-primary'>Test Define</a>
81
     <a href="{% url "backend:service_status" %}?cmd={{ si.test_type_uri }}&section=test_type" class='text-decoration-none badge bg-primary'>Test Type</a>
81
     <a href="{% url "backend:service_status" %}?cmd={{ si.test_type_uri }}&section=test_type" class='text-decoration-none badge bg-primary'>Test Type</a>
82
+    <a href="{% url "backend:service_status" %}?cmd={{ si.test_name|config_cur }}&section=ConfigCur" class='text-decoration-none badge bg-primary'>Config Cur</a>
82
   </li>
83
   </li>
83
   {% endfor %}
84
   {% endfor %}
84
 </ul>
85
 </ul>

+ 7 - 0
app/backend/templatetags/backend_tags.py

1
 from django import template
1
 from django import template
2
+from django.utils.http import urlencode
3
+
2
 
4
 
3
 register = template.Library()
5
 register = template.Library()
4
 
6
 
7
 def to_label(value):
9
 def to_label(value):
8
     value = value.replace('_', ' ')
10
     value = value.replace('_', ' ')
9
     return value.title()
11
     return value.title()
12
+
13
+@register.filter
14
+def config_cur(test_name):
15
+    import urllib.parse
16
+    return urllib.parse.quote_plus(f"/API/REST/Test/v1/ConfigCur?sections=all&test_type_name={test_name}&size=0")

+ 4 - 1
app/backend/views.py

112
 
112
 
113
 def service_status(request):
113
 def service_status(request):
114
     cmd = request.GET.get('cmd', None)
114
     cmd = request.GET.get('cmd', None)
115
+    import urllib.parse
115
     section = request.GET.get('section', 'all')
116
     section = request.GET.get('section', 'all')
116
     # exfo = Exfo("administrator", "exf0w0rxC@t4dm!n")
117
     # exfo = Exfo("administrator", "exf0w0rxC@t4dm!n")
117
     # exfo.login()
118
     # exfo.login()
118
-    r = exfo.call_remote_api(cmd+"?sections=all&size=0")
119
+    cmd = urllib.parse.unquote(cmd)
120
+    pprint(f" cmd = {cmd}")
121
+    r = exfo.call_remote_api(cmd)
119
     pprint(r.json())
122
     pprint(r.json())
120
     # return JsonResponse(r.json())
123
     # return JsonResponse(r.json())
121
     return render(request, 'backend/service_status.html', {'res': r, 'section': section})
124
     return render(request, 'backend/service_status.html', {'res': r, 'section': section})

+ 1 - 1
app/exfo/lib.py

41
           'Accept': 'application/json'
41
           'Accept': 'application/json'
42
         }
42
         }
43
         if service == "sla":
43
         if service == "sla":
44
-            ep = "/SLAs/v1/SLA?size=100"
44
+            ep = "/SLAs/v1/SLA?size=0"
45
         url = self.BASE_URL + ep
45
         url = self.BASE_URL + ep
46
         response = self.session.get(url, headers=headers, data=payload, verify=False)
46
         response = self.session.get(url, headers=headers, data=payload, verify=False)
47
         pprint(response.json())
47
         pprint(response.json())