Merge branch 'devel' of https://github.com/nerosketch/djing into devel

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())

devapp/locale/ru/LC_MESSAGES/django.po

@@ -606,3 +606,6 @@ msgstr "Устройство %(device_name)s получило не опреде
 
 msgid "View"
 msgstr "Посмотреть"
+
+msgid "Unregistered units"
+msgstr "Незарегистрированные юниты"

devapp/templates/devapp/custom_dev_page/olt_ztec320.html

@@ -18,7 +18,7 @@
                         <div class="port{% if fiber.fb_onu_num > 0 %} mega{% endif %} text-center">
                             <b>{{ fiber.fb_name }}</b>
                             {% if fiber.fb_onu_num > 0 %}
-                                <a href="{% url 'devapp:zte_port_view' grp dev.id fiber.fb_id %}" class="port-img">
+                                <a href="{% url 'devapp:zte_port_view_uncfg' grp dev.id fiber.fb_id %}" class="port-img">
                                     <b>{{ fiber.fb_onu_num }}</b>
                                 </a>
                             {% else %}

devapp/templates/devapp/custom_dev_page/olt_ztec320_ports.html → devapp/templates/devapp/custom_dev_page/olt_ztec320_units_uncfg.html

@@ -16,6 +16,10 @@
     </ol>
 {% endblock %}
 
+{% block page-header %}
+    <h3>{{ dev.comment|default:_('Not assigned') }}. {% trans 'Unregistered units' %}</h3>
+{% endblock %}
+
 {% block content %}
     <div class="row">
         <div class="col-sm-12">
@@ -24,10 +28,10 @@
                     <thead>
                     <tr>
                         <th class="col-xs-1">#</th>
-                        <th class="col-xs-2">{% trans 'Onu type' %}</th>
-                        <th class="col-xs-3">{% trans 'Onu port' %}</th>
-                        <th class="col-xs-3">{% trans 'Onu signal' %}</th>
-                        <th class="col-xs-2">{% trans 'Serial' %}</th>
+                        <th class="col-xs-2">{% trans 'Mac' %}</th>
+                        <th class="col-xs-3">{% trans 'Firmware version' %}</th>
+                        <th class="col-xs-3">{% trans 'LOID password' %}</th>
+                        <th class="col-xs-2">{% trans 'LOID' %}</th>
                         <th class="col-xs-1">#</th>
                     </tr>
                     </thead>
@@ -35,14 +39,13 @@
                     <tbody>
                     {% for onu in onu_list %}
                         <tr>
-                            <td>-
-                            </td>
-                            <td>{{ onu.onu_type }}</td>
-                            <td>{{ onu.onu_port }}</td>
-                            <td>{{ onu.onu_signal }}</td>
-                            <td>{{ onu.onu_sn }}</td>
+                            <td>-</td>
+                            <td>{{ onu.mac }}</td>
+                            <td>{{ onu.firmware_ver }}</td>
+                            <td>{{ onu.loid_passw }}</td>
+                            <td>{{ onu.loid }}</td>
                             <td>
-                                <a href="{% url 'devapp:add' grp %}?t=Zo&pdev={{ dev.pk }}&c={{ onu.onu_sn }}&n={{ onu.snmp_extra }}" title="{% trans 'Create device' %}">
+                                <a href="{% url 'devapp:add' grp %}?t=Zo&pdev={{ dev.pk }}&c={{ onu.loid }}&n={{ onu.extra_snmp }}&mac={{ onu.mac }}" title="{% trans 'Create device' %}">
                                     <span class="glyphicon glyphicon-plus"></span>
                                 </a>
                             </td>

devapp/templates/devapp/ext.htm

@@ -18,7 +18,9 @@
     {% include 'message_block.html' %}
 
     <div class="page-header">
-        <h2>{{ dev.comment|default:_('Not assigned') }}</h2>
+        {% block page-header %}
+            <h2>{{ dev.comment|default:_('Not assigned') }}</h2>
+        {% endblock %}
     </div>
 
     <ul class="nav nav-tabs">

devapp/urls.py

@@ -26,7 +26,7 @@ urlpatterns = [
     url(r'^search_dev$', views.search_dev),
 
     # ZTE ports under fibers
-    url(r'^(?P<group_id>\d+)/(?P<device_id>\d+)/(?P<fiber_id>\d+)$', views.zte_port_view, name='zte_port_view'),
+    url(r'^(?P<group_id>\d+)/(?P<device_id>\d+)/(?P<fiber_id>\d+)$', views.zte_port_view_uncfg, name='zte_port_view_uncfg'),
 
     # Monitoring api
     url(r'^on_device_event/$', views.OnDeviceMonitoringEvent.as_view()),

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