Browse Source

Fix reg

devel
Dmitry Novikov 8 years ago
parent
commit
944864d81f
  1. 2
      devapp/dev_types.py
  2. 5
      djing/lib/tln/tln.py

2
devapp/dev_types.py

@ -522,7 +522,7 @@ class ZteOnuDevice(OnuDevice):
' prompt for telnet access in extra_data') ' prompt for telnet access in extra_data')
stack_num, rack_num, fiber_num, new_onu_port_num = register_onu_ZTE_F660( 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()), 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) 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) snmp_fiber_num = int(bin_snmp_fiber_number, base=2)

5
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): def __init__(self, screen_size: Tuple[int, int], prompt_title: bytes, *args, **kwargs):
super().__init__(prompt_string=prompt_title, *args, **kwargs) super().__init__(prompt_string=prompt_title, *args, **kwargs)
self.prompt_title = prompt_title self.prompt_title = prompt_title
self.set_prompt_string(b'%s#' % prompt_title)
self.resize_screen(*screen_size) self.resize_screen(*screen_size)
def enter(self, username: bytes, passw: bytes) -> None: def enter(self, username: bytes, passw: bytes) -> None:
@ -203,7 +204,7 @@ class OltZTERegister(TelnetApi):
@process_lock @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' onu_type = b'ZTE-F660'
line_profile = b'ZTE-F660-LINE' line_profile = b'ZTE-F660-LINE'
remote_profile = b'ZTE-F660-ROUTER' 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) r = tn.go_to_onu_interface(stack_num, rack_num, fiber_num, new_onu_port_num)
print(r) print(r)
tn.apply_conf_to_onu(onu_mac, 145)
tn.apply_conf_to_onu(onu_mac, vlan_id)
sleep(1) sleep(1)
return stack_num, rack_num, fiber_num, new_onu_port_num return stack_num, rack_num, fiber_num, new_onu_port_num

Loading…
Cancel
Save