scottk/wlan-lanforge-scripts
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-lanforge-scripts.git synced 2025-10-31 10:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

create_qvlan: Fix possible reference before creation error

Browse Source 
Signed-off-by: Matthew Stidham <stidmatt@gmail.com>
This commit is contained in:
Matthew Stidham
2021-11-24 13:26:15 -08:00
parent 15424cc7a3
commit 2576a7977f
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
py-scripts/create_qvlan.py
View File

@@ -86,6 +86,7 @@ def main():
default=None) default=None)
parser.add_argument( parser.add_argument(
'--num_ports', '--num_ports',
type=int,
help='number of ports to create', help='number of ports to create',
default=1) default=1)
parser.add_argument( parser.add_argument(
@@ -135,29 +136,26 @@ def main():
update_group_args['cxs'] = args.cxs update_group_args['cxs'] = args.cxs
port_list = [] port_list = []
ip_list = [] ip_list = []
if args.first_port is not None and args.use_ports is not None: if args.first_port and args.use_ports:
if args.first_port.startswith("sta"): if args.first_port.startswith("sta"):
if (args.num_ports is not None) and (int(args.num_ports) > 0): if args.num_ports and args.num_ports > 0:
start_num = int(args.first_port[3:]) start_num = int(args.first_port[3:])
num_ports = int(args.num_ports)
port_list = LFUtils.port_name_series( port_list = LFUtils.port_name_series(
prefix="sta", prefix="sta",
start_id=start_num, start_id=start_num,
end_id=start_num + num_ports - 1, end_id=start_num + args.num_ports - 1,
padding_number=10000, padding_number=10000,
radio=args.radio) radio=args.radio)
print(1) print(1)
else: else:
if (args.num_ports is not None) and args.qvlan_parent is not None and ( if args.num_ports and args.qvlan_parent and (args.num_ports > 0) and args.qvlan_parent in args.first_port:
int(args.num_ports) > 0) and args.qvlan_parent in args.first_port:
start_num = int( start_num = int(
args.first_port[args.first_port.index('#') + 1:]) args.first_port[args.first_port.index('#') + 1:])
num_ports = int(args.num_ports)
port_list = LFUtils.port_name_series( port_list = LFUtils.port_name_series(
prefix=str( prefix=str(
args.qvlan_parent) + "#", args.qvlan_parent) + "#",
start_id=start_num, start_id=start_num,
end_id=start_num + num_ports - 1, end_id=start_num + args.num_ports - 1,
padding_number=10000, padding_number=10000,
radio=args.radio) radio=args.radio)
print(2) print(2)
@@ -167,7 +165,7 @@ def main():
"first_port must contain parent port and num_ports must be greater than 0" % "first_port must contain parent port and num_ports must be greater than 0" %
(args.num_ports, args.qvlan_parent, args.first_port)) (args.num_ports, args.qvlan_parent, args.first_port))
else: else:
if args.use_ports is None: if not args.use_ports:
num_ports = int(args.num_ports) num_ports = int(args.num_ports)
port_list = LFUtils.port_name_series( port_list = LFUtils.port_name_series(
prefix=str( prefix=str(
@@ -204,7 +202,7 @@ def main():
ip_list=ip_list, ip_list=ip_list,
debug=args.debug) debug=args.debug)
create_qvlan.build() create_qvlan.build()
print('Created %s QVLAN stations' % num_ports) print('Created %s QVLAN stations' % args.num_ports)
if __name__ == "__main__": if __name__ == "__main__":