From 503676105819de55e0faead32ae0293feaad3f6c Mon Sep 17 00:00:00 2001 From: bashmak Date: Tue, 5 Jun 2018 14:50:01 +0300 Subject: [PATCH] fix template generation for monitoring --- devapp/dev_types.py | 16 ++++++++++++++-- mapapp/forms.py | 1 - 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/devapp/dev_types.py b/devapp/dev_types.py index 22567ef..b4fe877 100644 --- a/devapp/dev_types.py +++ b/devapp/dev_types.py @@ -280,11 +280,17 @@ class OnuDevice(DevBase, SNMPBaseWorker): host_name = _norm_name("%d%s" % (device.pk, translit(device.comment, language_code='ru', reversed=True))) snmp_item = device.snmp_extra mac = device.mac_addr + if device.ip_address: + address = device.ip_address + elif device.parent_dev: + address = device.parent_dev.ip_address + else: + address = None r = ( "define host{", "\tuse device-onu", "\thost_name %s" % host_name, - # "\taddress %s" % device.ip_address, + "\taddress %s" % address if address else None, "\t_snmp_item %s" % snmp_item if snmp_item is not None else '', "\t_mac_addr %s" % mac if mac is not None else '', "}\n" @@ -473,11 +479,17 @@ class ZteOnuDevice(OnuDevice): host_name = _norm_name("%d%s" % (device.pk, translit(device.comment, language_code='ru', reversed=True))) snmp_item = device.snmp_extra mac = device.mac_addr + if device.ip_address: + address = device.ip_address + elif device.parent_dev: + address = device.parent_dev.ip_address + else: + address = None r = ( "define host{", "\tuse dev-onu-zte-f660", "\thost_name %s" % host_name, - # "\taddress %s" % device.ip_address, + "\taddress %s" % address if address else None, "\t_snmp_item %s" % snmp_item if snmp_item is not None else '', "\t_mac_addr %s" % mac if mac is not None else '', "}\n" diff --git a/mapapp/forms.py b/mapapp/forms.py index fc4e8c3..2812e00 100644 --- a/mapapp/forms.py +++ b/mapapp/forms.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from django import forms from .models import Dot