From d14e9c79714f0eb4113b80dc660ee202ed3de235 Mon Sep 17 00:00:00 2001 From: Dmitry Novikov Date: Mon, 22 Apr 2019 11:33:16 +0300 Subject: [PATCH] check ZTE onu for sn&mac --- devapp/dev_types.py | 4 +++- .../templates/devapp/custom_dev_page/onu_for_zte.html | 11 ++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/devapp/dev_types.py b/devapp/dev_types.py index d241bf2..6365e18 100644 --- a/devapp/dev_types.py +++ b/devapp/dev_types.py @@ -10,6 +10,7 @@ from django.conf import settings from djing.lib import RuTimedelta, safe_int, safe_float from devapp.expect_scripts import register_f601_onu, register_f660_onu, ExpectValidationError, OnuZteRegisterError +from devapp.expect_scripts.base import sn_to_mac from .base_intr import ( DevBase, SNMPBaseWorker, BasePort, DeviceImplementationError, ListOrError, DeviceConfigurationError @@ -512,7 +513,8 @@ class ZteOnuDevice(OnuDevice): 'vlans': vlans, 'serial': sn, 'int_name': int_name, - 'onu_type': onu_type + 'onu_type': onu_type, + 'mac': sn_to_mac(sn) } except IndexError: pass diff --git a/devapp/templates/devapp/custom_dev_page/onu_for_zte.html b/devapp/templates/devapp/custom_dev_page/onu_for_zte.html index 50cf3ee..8575b7b 100644 --- a/devapp/templates/devapp/custom_dev_page/onu_for_zte.html +++ b/devapp/templates/devapp/custom_dev_page/onu_for_zte.html @@ -80,7 +80,16 @@ {% endif %} {% trans 'Serial' %}: {{ onu_details.serial|default:'-' }}
{% trans 'Onu type' %}: {{ onu_details.onu_type|default:'-' }}
- {% trans 'Name' %}: {{ onu_details.int_name|default:'-' }} + {% trans 'Name' %}: {{ onu_details.int_name|default:'-' }}
+ + {% if dev.mac_addr != onu_details.mac %} + + {% trans 'Mac on OLT' %}: {{ onu_details.mac }} +

+
+ {% else %} + {% trans 'Mac on OLT' %}: {{ onu_details.mac }} + {% endif %}