From 944864d81f3bb5a4616ad8090680352f811ab1a6 Mon Sep 17 00:00:00 2001 From: Dmitry Novikov Date: Wed, 1 Aug 2018 10:30:46 +0300 Subject: [PATCH] Fix reg --- devapp/dev_types.py | 2 +- djing/lib/tln/tln.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/devapp/dev_types.py b/devapp/dev_types.py index 93220c4..b7d1af2 100644 --- a/devapp/dev_types.py +++ b/devapp/dev_types.py @@ -522,7 +522,7 @@ class ZteOnuDevice(OnuDevice): ' prompt for telnet access in extra_data') stack_num, rack_num, fiber_num, new_onu_port_num = register_onu_ZTE_F660( olt_ip=ip, onu_sn=sn, login_passwd=(login.encode(), password.encode()), - onu_mac=mac, prompt_title=prompt.encode() + onu_mac=mac, prompt_title=prompt.encode(), vlan_id=132 ) bin_snmp_fiber_number = "10000{0:08b}{1:08b}00000000".format(rack_num, fiber_num) snmp_fiber_num = int(bin_snmp_fiber_number, base=2) diff --git a/djing/lib/tln/tln.py b/djing/lib/tln/tln.py index a93556c..2c42fe9 100755 --- a/djing/lib/tln/tln.py +++ b/djing/lib/tln/tln.py @@ -107,6 +107,7 @@ class OltZTERegister(TelnetApi): def __init__(self, screen_size: Tuple[int, int], prompt_title: bytes, *args, **kwargs): super().__init__(prompt_string=prompt_title, *args, **kwargs) self.prompt_title = prompt_title + self.set_prompt_string(b'%s#' % prompt_title) self.resize_screen(*screen_size) def enter(self, username: bytes, passw: bytes) -> None: @@ -203,7 +204,7 @@ class OltZTERegister(TelnetApi): @process_lock -def register_onu_ZTE_F660(olt_ip: str, onu_sn: bytes, login_passwd: Tuple[bytes, bytes], onu_mac: bytes, prompt_title: bytes) -> Tuple: +def register_onu_ZTE_F660(olt_ip: str, onu_sn: bytes, login_passwd: Tuple[bytes, bytes], onu_mac: bytes, prompt_title: bytes, vlan_id: int) -> Tuple: onu_type = b'ZTE-F660' line_profile = b'ZTE-F660-LINE' remote_profile = b'ZTE-F660-ROUTER' @@ -253,7 +254,7 @@ def register_onu_ZTE_F660(olt_ip: str, onu_sn: bytes, login_passwd: Tuple[bytes, r = tn.go_to_onu_interface(stack_num, rack_num, fiber_num, new_onu_port_num) print(r) - tn.apply_conf_to_onu(onu_mac, 145) + tn.apply_conf_to_onu(onu_mac, vlan_id) sleep(1) return stack_num, rack_num, fiber_num, new_onu_port_num