From 926635c961a7ed313ab65a06d9bc2daeca27d863 Mon Sep 17 00:00:00 2001 From: Dmitry Novikov Date: Tue, 30 Apr 2019 16:05:54 +0300 Subject: [PATCH] add ip-source-guard to ZTE-F660 config --- devapp/expect_scripts/base.py | 1 + devapp/expect_scripts/f660.py | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/devapp/expect_scripts/base.py b/devapp/expect_scripts/base.py index a5687e4..0be5db1 100644 --- a/devapp/expect_scripts/base.py +++ b/devapp/expect_scripts/base.py @@ -77,6 +77,7 @@ def get_free_registered_onu_number(lines): def sn_to_mac(sn: str): + if not sn: return t = sn[4:].lower() r = tuple(t[i:i + 2] for i in range(0, len(t), 2)) return '45:47:%s' % ':'.join(r) diff --git a/devapp/expect_scripts/f660.py b/devapp/expect_scripts/f660.py index a7086e0..403149e 100644 --- a/devapp/expect_scripts/f660.py +++ b/devapp/expect_scripts/f660.py @@ -8,13 +8,14 @@ from . import base def get_onu_template(vlan_id: int, mac_addr: str): template = ( 'switchport mode hybrid vport 1', - 'switchport vlan %d tag vport 1' % vlan_id, + 'service-port 1 vport 1 user-vlan 100 vlan %d' % vlan_id, 'port-location format flexible-syntax vport 1', 'port-location sub-option remote-id enable vport 1', 'port-location sub-option remote-id name %s vport 1' % mac_addr, 'dhcp-option82 enable vport 1', 'dhcp-option82 trust true replace vport 1', - 'ip dhcp snooping enable vport 1' + 'ip dhcp snooping enable vport 1', + 'ip-service ip-source-guard enable sport 1' ) return template