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

Use name_to_eid to parser parent name if it includes resource and shelf information

Browse Source 
Signed-off-by: Matthew Stidham <stidmatt@gmail.com>
This commit is contained in:
Matthew Stidham
2021-12-15 15:43:50 -08:00
parent 1e942b30fa
commit 94d15d1800
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
py-scripts/test_fileio.py
View File

@@ -641,6 +641,8 @@ Generic command layout:
default=None) default=None)
args = parser.parse_args() args = parser.parse_args()
parent = LFUtils.name_to_eid(args.macvlan_parent)
macvlan_parent = parent[2]
update_group_args = { update_group_args = {
"name": None, "name": None,
"action": None, "action": None,
@@ -666,17 +668,17 @@ Generic command layout:
padding_number=10000, padding_number=10000,
radio=args.radio) radio=args.radio)
else: else:
if args.num_ports and args.macvlan_parent and (int(args.num_ports) > 0) \ if args.num_ports and macvlan_parent and (int(args.num_ports) > 0) \
and args.macvlan_parent in args.first_port: and macvlan_parent in args.first_port:
start_num = int(args.first_port[args.first_port.index('#') + 1:]) start_num = int(args.first_port[args.first_port.index('#') + 1:])
num_ports = int(args.num_ports) num_ports = int(args.num_ports)
port_list = LFUtils.port_name_series(prefix=args.macvlan_parent + "#", start_id=start_num, port_list = LFUtils.port_name_series(prefix=macvlan_parent + "#", start_id=start_num,
end_id=start_num + num_ports - 1, padding_number=100000, end_id=start_num + num_ports - 1, padding_number=100000,
radio=args.radio) radio=args.radio)
else: else:
raise ValueError("Invalid values for num_ports [%s], macvlan_parent [%s], and/or first_port [%s].\n" raise ValueError("Invalid values for num_ports [%s], macvlan_parent [%s], and/or first_port [%s].\n"
"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.macvlan_parent, args.first_port)) % (args.num_ports, macvlan_parent, args.first_port))
else: else:
if args.use_ports is None: if args.use_ports is None:
num_ports = int(args.num_ports) num_ports = int(args.num_ports)
@@ -685,7 +687,7 @@ Generic command layout:
padding_number=10000, padding_number=10000,
radio=args.radio) radio=args.radio)
else: else:
port_list = LFUtils.port_name_series(prefix=args.macvlan_parent + "#", start_id=0, port_list = LFUtils.port_name_series(prefix=macvlan_parent + "#", start_id=0,
end_id=num_ports - 1, padding_number=100000, end_id=num_ports - 1, padding_number=100000,
radio=args.radio) radio=args.radio)
else: else:
@@ -725,7 +727,7 @@ Generic command layout:
test_duration=args.test_duration, test_duration=args.test_duration,
upstream_port=args.upstream_port, upstream_port=args.upstream_port,
_debug_on=args.debug, _debug_on=args.debug,
macvlan_parent=args.macvlan_parent, macvlan_parent=macvlan_parent,
use_macvlans=args.use_macvlans, use_macvlans=args.use_macvlans,
first_mvlan_ip=args.first_mvlan_ip, first_mvlan_ip=args.first_mvlan_ip,
netmask=args.netmask, netmask=args.netmask,