more informative ZTE ONU page

devapp/base_intr.py

@@ -139,4 +139,6 @@ class SNMPBaseWorker(object, metaclass=ABCMeta):
 
     def get_item(self, oid):
         self.start_ses()
-        return self.ses.get(oid).value
+        v = self.ses.get(oid).value
+        if v != 'NOSUCHINSTANCE':
+            return v

devapp/dev_types.py

@@ -432,18 +432,26 @@ class ZteOnuDevice(OnuDevice):
             status = self.get_item('.1.3.6.1.4.1.3902.1012.3.50.12.1.1.1.%s.1' % fiber_addr)
             signal = self.get_item('.1.3.6.1.4.1.3902.1012.3.50.12.1.1.10.%s.1' % fiber_addr)
             distance = self.get_item('.1.3.6.1.4.1.3902.1012.3.50.12.1.1.18.%s.1' % fiber_addr)
-            name = self.get_item('.1.3.6.1.4.1.3902.1012.3.50.11.2.1.1.%s' % fiber_addr)
             ip_addr = self.get_item('.1.3.6.1.4.1.3902.1012.3.50.16.1.1.10.%s' % fiber_addr)
             vlans = self.get_item('.1.3.6.1.4.1.3902.1012.3.50.15.100.1.1.7.%s.1.1' % fiber_addr)
+            int_name = self.get_item('.1.3.6.1.4.1.3902.1012.3.28.1.1.3.%s' % fiber_addr)
+            onu_type = self.get_item('.1.3.6.1.4.1.3902.1012.3.28.1.1.1.%s' % fiber_addr)
+
+            sn = self.get_item('.1.3.6.1.4.1.3902.1012.3.28.1.1.5.%s' % fiber_addr)
+            # sn = sn.encode()
+            sn = ''.join('%.2X' % ord(x) for x in sn[-4:])
+
             return {
                 'status': status,
                 'signal': conv_signal(safe_int(signal)),
-                'name': name,
-                'distance': int(distance) / 10 if distance != 'NOSUCHINSTANCE' else 0,
-                'ip_addr': ip_addr if ip_addr != 'NOSUCHINSTANCE' and ip_addr else None,
-                'vlans': vlans if vlans != 'NOSUCHINSTANCE' else None
+                'distance': int(distance) / 10,
+                'ip_addr': ip_addr if ip_addr else None,
+                'vlans': vlans,
+                'serial': "ZTEG%s" % ''.join(sn),
+                'int_name': int_name,
+                'onu_type': onu_type
             }
-        except ValueError:
+        except IndexError:
             pass
 
     def get_template_name(self):

devapp/locale/ru/LC_MESSAGES/django.po

@@ -337,7 +337,6 @@ msgid "ONU error"
 msgstr "ONU ошибка"
 
 #: templates/devapp/custom_dev_page/onu.html:72
-#: templates/devapp/custom_dev_page/onu_for_zte.html:75
 msgid "Name on OLT"
 msgstr "Имя на OLT"
 
@@ -642,20 +641,26 @@ msgstr "Не заполнено поле 'Техническая информа
 msgid "Fiber"
 msgstr "Интерфейс"
 
-#~ msgid "Device %(device_name)s is up"
-#~ msgstr "%(device_name)s в сети"
+msgid "Onu type"
+msgstr "Тип onu"
 
-#~ msgid "Device %(device_name)s is down"
-#~ msgstr "%(device_name)s не в сети"
+msgid "Serial"
+msgstr "Серийник"
 
-#~ msgid "Device %(device_name)s is unreachable"
-#~ msgstr "%(device_name)s недостижим"
+msgid "Device %(device_name)s is up"
+msgstr "%(device_name)s в сети"
 
-#~ msgid "Device %(device_name)s getting undefined status code"
-#~ msgstr "Устройство %(device_name)s получило не определённый код состояния"
+msgid "Device %(device_name)s is down"
+msgstr "%(device_name)s не в сети"
 
-#~ msgid "View"
-#~ msgstr "Посмотреть"
+msgid "Device %(device_name)s is unreachable"
+msgstr "%(device_name)s недостижим"
 
-#~ msgid "Enter valid JSON"
-#~ msgstr "Введите данные в формате JSON"
+msgid "Device %(device_name)s getting undefined status code"
+msgstr "Устройство %(device_name)s получило не определённый код состояния"
+
+msgid "View"
+msgstr "Посмотреть"
+
+msgid "Enter valid JSON"
+msgstr "Введите данные в формате JSON"

devapp/templates/devapp/custom_dev_page/onu_for_zte.html

@@ -73,15 +73,17 @@
                                 </div>
                                 <div class="media-body">
 
-                                    <b>{% trans 'Name on OLT' %}</b>: {{ onu_details.name }}<br>
                                     <b>{% trans 'Distance(m)' %}</b>: {{ onu_details.distance }}<br>
                                     <b>{% trans 'Signal' %}</b>: {{ onu_details.signal }}<br>
                                     {% if onu_details.ip_addr %}
                                         <b>{% trans 'Ip addr' %}</b>: {{ onu_details.ip_addr }}<br>
                                     {% endif %}
                                     {% if onu_details.vlans %}
-                                        <b>{% trans 'VLan list' %}</b>: {{ onu_details.vlans }}
+                                        <b>{% trans 'VLan list' %}</b>: {{ onu_details.vlans }}<br>
                                     {% endif %}
+                                    <b>{% trans 'Serial' %}</b>: {{ onu_details.serial }}<br>
+                                    <b>{% trans 'Onu type' %}</b>: {{ onu_details.onu_type }}<br>
+                                    <b>{% trans 'Name' %}</b>: {{ onu_details.int_name }}
 
                                 </div>
                             </div>