diff --git a/devapp/dev_types.py b/devapp/dev_types.py
index b2db57d..f6e04fe 100644
--- a/devapp/dev_types.py
+++ b/devapp/dev_types.py
@@ -392,6 +392,23 @@ class Olt_ZTE_C320(OLTDevice):
return onu_list
+ def get_units_unregistered(self, fiber_num: int) -> Iterable:
+ sn_num_list = self.get_list_keyval('.1.3.6.1.4.1.3902.1012.3.13.3.1.2.%d' % fiber_num)
+ firmware_ver = self.get_list('.1.3.6.1.4.1.3902.1012.3.13.3.1.11.%d' % fiber_num)
+ loid_passws = self.get_list('.1.3.6.1.4.1.3902.1012.3.13.3.1.9.%d' % fiber_num)
+ loids = self.get_list('.1.3.6.1.4.1.3902.1012.3.13.3.1.8.%d' % fiber_num)
+
+ return ({
+ 'mac': ':'.join('%x' % ord(i) for i in sn[-6:]),
+ 'firmware_ver': frm_ver,
+ 'loid_passw': loid_passw,
+ 'loid': loid,
+ 'sn': sn,
+ 'extra_snmp': '%d.%d' % (fiber_num, int(num))
+ } for frm_ver, loid_passw, loid, (sn, num) in zip(
+ firmware_ver, loid_passws, loids, sn_num_list
+ ))
+
def uptime(self):
up_timestamp = safe_int(self.get_item('.1.3.6.1.2.1.1.3.0'))
tm = RuTimedelta(timedelta(seconds=up_timestamp / 100)) or RuTimedelta(timedelta())
diff --git a/devapp/locale/ru/LC_MESSAGES/django.po b/devapp/locale/ru/LC_MESSAGES/django.po
index 4fb0495..c21ce0d 100644
--- a/devapp/locale/ru/LC_MESSAGES/django.po
+++ b/devapp/locale/ru/LC_MESSAGES/django.po
@@ -606,3 +606,6 @@ msgstr "Устройство %(device_name)s получило не опреде
msgid "View"
msgstr "Посмотреть"
+
+msgid "Unregistered units"
+msgstr "Незарегистрированные юниты"
diff --git a/devapp/templates/devapp/custom_dev_page/olt_ztec320.html b/devapp/templates/devapp/custom_dev_page/olt_ztec320.html
index 43c146f..ee910f1 100644
--- a/devapp/templates/devapp/custom_dev_page/olt_ztec320.html
+++ b/devapp/templates/devapp/custom_dev_page/olt_ztec320.html
@@ -18,7 +18,7 @@
{{ fiber.fb_name }}
{% if fiber.fb_onu_num > 0 %}
-
+
{{ fiber.fb_onu_num }}
{% else %}
diff --git a/devapp/templates/devapp/custom_dev_page/olt_ztec320_ports.html b/devapp/templates/devapp/custom_dev_page/olt_ztec320_units_uncfg.html
similarity index 69%
rename from devapp/templates/devapp/custom_dev_page/olt_ztec320_ports.html
rename to devapp/templates/devapp/custom_dev_page/olt_ztec320_units_uncfg.html
index adfaf39..4a112b8 100644
--- a/devapp/templates/devapp/custom_dev_page/olt_ztec320_ports.html
+++ b/devapp/templates/devapp/custom_dev_page/olt_ztec320_units_uncfg.html
@@ -16,6 +16,10 @@
{% endblock %}
+{% block page-header %}
+
{{ dev.comment|default:_('Not assigned') }}. {% trans 'Unregistered units' %}
+{% endblock %}
+
{% block content %}
@@ -24,10 +28,10 @@
| # |
- {% trans 'Onu type' %} |
- {% trans 'Onu port' %} |
- {% trans 'Onu signal' %} |
- {% trans 'Serial' %} |
+ {% trans 'Mac' %} |
+ {% trans 'Firmware version' %} |
+ {% trans 'LOID password' %} |
+ {% trans 'LOID' %} |
# |
@@ -35,14 +39,13 @@
{% for onu in onu_list %}
- | -
- |
- {{ onu.onu_type }} |
- {{ onu.onu_port }} |
- {{ onu.onu_signal }} |
- {{ onu.onu_sn }} |
+ - |
+ {{ onu.mac }} |
+ {{ onu.firmware_ver }} |
+ {{ onu.loid_passw }} |
+ {{ onu.loid }} |
-
+
|
diff --git a/devapp/templates/devapp/ext.htm b/devapp/templates/devapp/ext.htm
index ac23656..b7ee865 100644
--- a/devapp/templates/devapp/ext.htm
+++ b/devapp/templates/devapp/ext.htm
@@ -18,7 +18,9 @@
{% include 'message_block.html' %}
diff --git a/devapp/urls.py b/devapp/urls.py
index 8b4c51a..62353a8 100644
--- a/devapp/urls.py
+++ b/devapp/urls.py
@@ -26,7 +26,7 @@ urlpatterns = [
url(r'^search_dev$', views.search_dev),
# ZTE ports under fibers
- url(r'^(?P\d+)/(?P\d+)/(?P\d+)$', views.zte_port_view, name='zte_port_view'),
+ url(r'^(?P\d+)/(?P\d+)/(?P\d+)$', views.zte_port_view_uncfg, name='zte_port_view_uncfg'),
# Monitoring api
url(r'^on_device_event/$', views.OnDeviceMonitoringEvent.as_view()),
diff --git a/devapp/views.py b/devapp/views.py
index 708ebc4..8b45b26 100644
--- a/devapp/views.py
+++ b/devapp/views.py
@@ -454,12 +454,12 @@ def devview(request, device_id):
@login_required
-def zte_port_view(request, group_id: str, device_id: str, fiber_id: str):
+def zte_port_view_uncfg(request, group_id: str, device_id: str, fiber_id: str):
fiber_id = safe_int(fiber_id)
zte_olt_device = get_object_or_404(Device, id=device_id)
manager = zte_olt_device.get_manager_object()
- onu_list = manager.get_ports_on_fiber(fiber_id)
- return render(request, 'devapp/custom_dev_page/olt_ztec320_ports.html', {
+ onu_list = manager.get_units_unregistered(fiber_id)
+ return render(request, 'devapp/custom_dev_page/olt_ztec320_units_uncfg.html', {
'onu_list': onu_list,
'dev': zte_olt_device,
'grp': group_id