IntenseWebs/LibreQoS
3
0
Fork 0
mirror of https://github.com/LibreQoE/LibreQoS.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add files via upload

Browse Source
This commit is contained in:
Robert Chacón 2022-02-06 10:01:32 -07:00 committed by GitHub
parent 2ea75c5161
commit 20b58a8ab9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 106 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

185
v1.1/LibreQoS.py
View File

@ -72,6 +72,15 @@ def refreshShapers():
with open('network.json', 'r') as j: with open('network.json', 'r') as j:
network = json.loads(j.read()) network = json.loads(j.read())
#Confirm that network.json is <= 7 levels deep
def traverse(data, depth):
if depth > 7:
raise ValueError('File network.json has more than 7 levels of heirarchy. Cannot parse.')
for elem in data:
if 'children' in data[elem]:
traverse(data[elem]['children'], depth+1)
traverse(network, 0)
#Clear Prior Settings #Clear Prior Settings
clearPriorSettings(interfaceA, interfaceB) clearPriorSettings(interfaceA, interfaceB)
@ -137,7 +146,8 @@ def refreshShapers():
# :1 and :2 are used for root and default classes, so start each queue's counter at :3 # :1 and :2 are used for root and default classes, so start each queue's counter at :3
for queueNum in range(queuesAvailable): for queueNum in range(queuesAvailable):
queueMinorCounterDict[queueNum+1] = 3 queueMinorCounterDict[queueNum+1] = 3
devicesShaped = []
#Parse network.json. For each tier, create corresponding HTB and leaf classes #Parse network.json. For each tier, create corresponding HTB and leaf classes
for tier1 in network: for tier1 in network:
tabs = '' tabs = ''
@ -159,31 +169,33 @@ def refreshShapers():
if tier1 == device['AP']: if tier1 == device['AP']:
maxDownload = min(device['downloadMax'],tier1download) maxDownload = min(device['downloadMax'],tier1download)
maxUpload = min(device['uploadMax'],tier1upload) maxUpload = min(device['uploadMax'],tier1upload)
minDownload = device['downloadMin'] minDownload = min(device['downloadMin'],maxDownload)
minUpload = device['uploadMin'] minUpload = min(device['uploadMin'],maxUpload)
print(tabs + '\t' + device['hostname']) print(tabs + ' ' + device['hostname'])
print(tabs + '\t' + "Download: " + str(minDownload) + " to " + str(maxDownload) + " Mbps") print(tabs + ' ' + "Download: " + str(minDownload) + " to " + str(maxDownload) + " Mbps")
print(tabs + '\t' + "Upload: " + str(minUpload) + " to " + str(maxUpload) + " Mbps") print(tabs + ' ' + "Upload: " + str(minUpload) + " to " + str(maxUpload) + " Mbps")
print(tabs + '\t', end='') print(tabs + ' ', end='')
shell('tc class add dev ' + interfaceA + ' parent ' + tier1classID + ' classid ' + str(minor) + ' htb rate '+ str(minDownload) + 'mbit ceil '+ str(maxDownload) + 'mbit prio 3') shell('tc class add dev ' + interfaceA + ' parent ' + tier1classID + ' classid ' + str(minor) + ' htb rate '+ str(minDownload) + 'mbit ceil '+ str(maxDownload) + 'mbit prio 3')
print(tabs + '\t', end='') print(tabs + ' ', end='')
shell('tc qdisc add dev ' + interfaceA + ' parent ' + str(major) + ':' + str(minor) + ' ' + fqOrCAKE) shell('tc qdisc add dev ' + interfaceA + ' parent ' + str(major) + ':' + str(minor) + ' ' + fqOrCAKE)
print(tabs + '\t', end='') print(tabs + ' ', end='')
shell('tc class add dev ' + interfaceB + ' parent ' + tier1classID + ' classid ' + str(minor) + ' htb rate '+ str(minUpload) + 'mbit ceil '+ str(maxUpload) + 'mbit prio 3') shell('tc class add dev ' + interfaceB + ' parent ' + tier1classID + ' classid ' + str(minor) + ' htb rate '+ str(minUpload) + 'mbit ceil '+ str(maxUpload) + 'mbit prio 3')
print(tabs + '\t', end='') print(tabs + ' ', end='')
shell('tc qdisc add dev ' + interfaceB + ' parent ' + str(major) + ':' + str(minor) + ' ' + fqOrCAKE) shell('tc qdisc add dev ' + interfaceB + ' parent ' + str(major) + ':' + str(minor) + ' ' + fqOrCAKE)
if device['ipv4']: if device['ipv4']:
parentString = str(major) + ':' parentString = str(major) + ':'
flowIDstring = str(major) + ':' + str(minor) flowIDstring = str(major) + ':' + str(minor)
print(tabs + '\t', end='') print(tabs + ' ', end='')
shell('./xdp-cpumap-tc/src/xdp_iphash_to_cpu_cmdline --add --ip ' + device['ipv4'] + ' --cpu ' + str(currentQueueCounter-1) + ' --classid ' + flowIDstring) shell('./xdp-cpumap-tc/src/xdp_iphash_to_cpu_cmdline --add --ip ' + device['ipv4'] + ' --cpu ' + str(currentQueueCounter-1) + ' --classid ' + flowIDstring)
if device['hostname'] not in devicesShaped:
devicesShaped.append(device['hostname'])
print() print()
minor += 1 minor += 1
minor += 1 minor += 1
if 'children' in network[tier1]: if 'children' in network[tier1]:
for tier2 in network[tier1]['children']: for tier2 in network[tier1]['children']:
tier2classID = str(currentQueueCounter) + ':' + str(minor) tier2classID = str(currentQueueCounter) + ':' + str(minor)
tabs = '\t' tabs = ' '
print(tabs + tier2) print(tabs + tier2)
tier2download = min(network[tier1]['children'][tier2]['downloadBandwidthMbps'],tier1download) tier2download = min(network[tier1]['children'][tier2]['downloadBandwidthMbps'],tier1download)
tier2upload = min(network[tier1]['children'][tier2]['uploadBandwidthMbps'],tier1upload) tier2upload = min(network[tier1]['children'][tier2]['uploadBandwidthMbps'],tier1upload)
@ -203,31 +215,33 @@ def refreshShapers():
if tier2 == device['AP']: if tier2 == device['AP']:
maxDownload = min(device['downloadMax'],tier2download) maxDownload = min(device['downloadMax'],tier2download)
maxUpload = min(device['uploadMax'],tier2upload) maxUpload = min(device['uploadMax'],tier2upload)
minDownload = device['downloadMin'] minDownload = min(device['downloadMin'],maxDownload)
minUpload = device['uploadMin'] minUpload = min(device['uploadMin'],maxUpload)
print(tabs + '\t' + device['hostname']) print(tabs + ' ' + device['hostname'])
print(tabs + '\t' + "Download: " + str(minDownload) + " to " + str(maxDownload) + " Mbps") print(tabs + ' ' + "Download: " + str(minDownload) + " to " + str(maxDownload) + " Mbps")
print(tabs + '\t' + "Upload: " + str(minUpload) + " to " + str(maxUpload) + " Mbps") print(tabs + ' ' + "Upload: " + str(minUpload) + " to " + str(maxUpload) + " Mbps")
print(tabs + '\t', end='') print(tabs + ' ', end='')
shell('tc class add dev ' + interfaceA + ' parent ' + tier2classID + ' classid ' + str(minor) + ' htb rate '+ str(minDownload) + 'mbit ceil '+ str(maxDownload) + 'mbit prio 3') shell('tc class add dev ' + interfaceA + ' parent ' + tier2classID + ' classid ' + str(minor) + ' htb rate '+ str(minDownload) + 'mbit ceil '+ str(maxDownload) + 'mbit prio 3')
print(tabs + '\t', end='') print(tabs + ' ', end='')
shell('tc qdisc add dev ' + interfaceA + ' parent ' + str(major) + ':' + str(minor) + ' ' + fqOrCAKE) shell('tc qdisc add dev ' + interfaceA + ' parent ' + str(major) + ':' + str(minor) + ' ' + fqOrCAKE)
print(tabs + '\t', end='') print(tabs + ' ', end='')
shell('tc class add dev ' + interfaceB + ' parent ' + tier2classID + ' classid ' + str(minor) + ' htb rate '+ str(minUpload) + 'mbit ceil '+ str(maxUpload) + 'mbit prio 3') shell('tc class add dev ' + interfaceB + ' parent ' + tier2classID + ' classid ' + str(minor) + ' htb rate '+ str(minUpload) + 'mbit ceil '+ str(maxUpload) + 'mbit prio 3')
print(tabs + '\t', end='') print(tabs + ' ', end='')
shell('tc qdisc add dev ' + interfaceB + ' parent ' + str(major) + ':' + str(minor) + ' ' + fqOrCAKE) shell('tc qdisc add dev ' + interfaceB + ' parent ' + str(major) + ':' + str(minor) + ' ' + fqOrCAKE)
if device['ipv4']: if device['ipv4']:
parentString = str(major) + ':' parentString = str(major) + ':'
flowIDstring = str(major) + ':' + str(minor) flowIDstring = str(major) + ':' + str(minor)
print(tabs + '\t', end='') print(tabs + ' ', end='')
shell('./xdp-cpumap-tc/src/xdp_iphash_to_cpu_cmdline --add --ip ' + device['ipv4'] + ' --cpu ' + str(currentQueueCounter-1) + ' --classid ' + flowIDstring) shell('./xdp-cpumap-tc/src/xdp_iphash_to_cpu_cmdline --add --ip ' + device['ipv4'] + ' --cpu ' + str(currentQueueCounter-1) + ' --classid ' + flowIDstring)
if device['hostname'] not in devicesShaped:
devicesShaped.append(device['hostname'])
print() print()
minor += 1 minor += 1
minor += 1 minor += 1
if 'children' in network[tier1]['children'][tier2]: if 'children' in network[tier1]['children'][tier2]:
for tier3 in network[tier1]['children'][tier2]['children']: for tier3 in network[tier1]['children'][tier2]['children']:
tier3classID = str(currentQueueCounter) + ':' + str(minor) tier3classID = str(currentQueueCounter) + ':' + str(minor)
tabs = '\t\t' tabs = ' '
print(tabs + tier3) print(tabs + tier3)
tier3download = min(network[tier1]['children'][tier2]['children'][tier3]['downloadBandwidthMbps'],tier2download) tier3download = min(network[tier1]['children'][tier2]['children'][tier3]['downloadBandwidthMbps'],tier2download)
tier3upload = min(network[tier1]['children'][tier2]['children'][tier3]['uploadBandwidthMbps'],tier2upload) tier3upload = min(network[tier1]['children'][tier2]['children'][tier3]['uploadBandwidthMbps'],tier2upload)
@ -247,31 +261,33 @@ def refreshShapers():
if tier3 == device['AP']: if tier3 == device['AP']:
maxDownload = min(device['downloadMax'],tier3download) maxDownload = min(device['downloadMax'],tier3download)
maxUpload = min(device['uploadMax'],tier3upload) maxUpload = min(device['uploadMax'],tier3upload)
minDownload = device['downloadMin'] minDownload = min(device['downloadMin'],maxDownload)
minUpload = device['uploadMin'] minUpload = min(device['uploadMin'],maxUpload)
print(tabs + '\t' + device['hostname']) print(tabs + ' ' + device['hostname'])
print(tabs + '\t' + "Download: " + str(minDownload) + " to " + str(maxDownload) + " Mbps") print(tabs + ' ' + "Download: " + str(minDownload) + " to " + str(maxDownload) + " Mbps")
print(tabs + '\t' + "Upload: " + str(minUpload) + " to " + str(maxUpload) + " Mbps") print(tabs + ' ' + "Upload: " + str(minUpload) + " to " + str(maxUpload) + " Mbps")
print(tabs + '\t', end='') print(tabs + ' ', end='')
shell('tc class add dev ' + interfaceA + ' parent ' + tier3classID + ' classid ' + str(minor) + ' htb rate '+ str(minDownload) + 'mbit ceil '+ str(maxDownload) + 'mbit prio 3') shell('tc class add dev ' + interfaceA + ' parent ' + tier3classID + ' classid ' + str(minor) + ' htb rate '+ str(minDownload) + 'mbit ceil '+ str(maxDownload) + 'mbit prio 3')
print(tabs + '\t', end='') print(tabs + ' ', end='')
shell('tc qdisc add dev ' + interfaceA + ' parent ' + str(major) + ':' + str(minor) + ' ' + fqOrCAKE) shell('tc qdisc add dev ' + interfaceA + ' parent ' + str(major) + ':' + str(minor) + ' ' + fqOrCAKE)
print(tabs + '\t', end='') print(tabs + ' ', end='')
shell('tc class add dev ' + interfaceB + ' parent ' + tier3classID + ' classid ' + str(minor) + ' htb rate '+ str(minUpload) + 'mbit ceil '+ str(maxUpload) + 'mbit prio 3') shell('tc class add dev ' + interfaceB + ' parent ' + tier3classID + ' classid ' + str(minor) + ' htb rate '+ str(minUpload) + 'mbit ceil '+ str(maxUpload) + 'mbit prio 3')
print(tabs + '\t', end='') print(tabs + ' ', end='')
shell('tc qdisc add dev ' + interfaceB + ' parent ' + str(major) + ':' + str(minor) + ' ' + fqOrCAKE) shell('tc qdisc add dev ' + interfaceB + ' parent ' + str(major) + ':' + str(minor) + ' ' + fqOrCAKE)
if device['ipv4']: if device['ipv4']:
parentString = str(major) + ':' parentString = str(major) + ':'
flowIDstring = str(major) + ':' + str(minor) flowIDstring = str(major) + ':' + str(minor)
print(tabs + '\t', end='') print(tabs + ' ', end='')
shell('./xdp-cpumap-tc/src/xdp_iphash_to_cpu_cmdline --add --ip ' + device['ipv4'] + ' --cpu ' + str(currentQueueCounter-1) + ' --classid ' + flowIDstring) shell('./xdp-cpumap-tc/src/xdp_iphash_to_cpu_cmdline --add --ip ' + device['ipv4'] + ' --cpu ' + str(currentQueueCounter-1) + ' --classid ' + flowIDstring)
if device['hostname'] not in devicesShaped:
devicesShaped.append(device['hostname'])
print() print()
minor += 1 minor += 1
minor += 1 minor += 1
if 'children' in network[tier1]['children'][tier2]['children'][tier3]: if 'children' in network[tier1]['children'][tier2]['children'][tier3]:
for tier4 in network[tier1]['children'][tier2]['children'][tier3]['children']: for tier4 in network[tier1]['children'][tier2]['children'][tier3]['children']:
tier4classID = str(currentQueueCounter) + ':' + str(minor) tier4classID = str(currentQueueCounter) + ':' + str(minor)
tabs = '\t\t\t' tabs = ' '
print(tabs + tier4) print(tabs + tier4)
tier4download = min(network[tier1]['children'][tier2]['children'][tier3]['children'][tier4]['downloadBandwidthMbps'],tier3download) tier4download = min(network[tier1]['children'][tier2]['children'][tier3]['children'][tier4]['downloadBandwidthMbps'],tier3download)
tier4upload = min(network[tier1]['children'][tier2]['children'][tier3]['children'][tier4]['uploadBandwidthMbps'],tier3upload) tier4upload = min(network[tier1]['children'][tier2]['children'][tier3]['children'][tier4]['uploadBandwidthMbps'],tier3upload)
@ -291,31 +307,33 @@ def refreshShapers():
if tier4 == device['AP']: if tier4 == device['AP']:
maxDownload = min(device['downloadMax'],tier4download) maxDownload = min(device['downloadMax'],tier4download)
maxUpload = min(device['uploadMax'],tier4upload) maxUpload = min(device['uploadMax'],tier4upload)
minDownload = device['downloadMin'] minDownload = min(device['downloadMin'],maxDownload)
minUpload = device['uploadMin'] minUpload = min(device['uploadMin'],maxUpload)
print(tabs + '\t' + device['hostname']) print(tabs + ' ' + device['hostname'])
print(tabs + '\t' + "Download: " + str(minDownload) + " to " + str(maxDownload) + " Mbps") print(tabs + ' ' + "Download: " + str(minDownload) + " to " + str(maxDownload) + " Mbps")
print(tabs + '\t' + "Upload: " + str(minUpload) + " to " + str(maxUpload) + " Mbps") print(tabs + ' ' + "Upload: " + str(minUpload) + " to " + str(maxUpload) + " Mbps")
print(tabs + '\t', end='') print(tabs + ' ', end='')
shell('tc class add dev ' + interfaceA + ' parent ' + tier4classID + ' classid ' + str(minor) + ' htb rate '+ str(minDownload) + 'mbit ceil '+ str(maxDownload) + 'mbit prio 3') shell('tc class add dev ' + interfaceA + ' parent ' + tier4classID + ' classid ' + str(minor) + ' htb rate '+ str(minDownload) + 'mbit ceil '+ str(maxDownload) + 'mbit prio 3')
print(tabs + '\t', end='') print(tabs + ' ', end='')
shell('tc qdisc add dev ' + interfaceA + ' parent ' + str(major) + ':' + str(minor) + ' ' + fqOrCAKE) shell('tc qdisc add dev ' + interfaceA + ' parent ' + str(major) + ':' + str(minor) + ' ' + fqOrCAKE)
print(tabs + '\t', end='') print(tabs + ' ', end='')
shell('tc class add dev ' + interfaceB + ' parent ' + tier4classID + ' classid ' + str(minor) + ' htb rate '+ str(minUpload) + 'mbit ceil '+ str(maxUpload) + 'mbit prio 3') shell('tc class add dev ' + interfaceB + ' parent ' + tier4classID + ' classid ' + str(minor) + ' htb rate '+ str(minUpload) + 'mbit ceil '+ str(maxUpload) + 'mbit prio 3')
print(tabs + '\t', end='') print(tabs + ' ', end='')
shell('tc qdisc add dev ' + interfaceB + ' parent ' + str(major) + ':' + str(minor) + ' ' + fqOrCAKE) shell('tc qdisc add dev ' + interfaceB + ' parent ' + str(major) + ':' + str(minor) + ' ' + fqOrCAKE)
if device['ipv4']: if device['ipv4']:
parentString = str(major) + ':' parentString = str(major) + ':'
flowIDstring = str(major) + ':' + str(minor) flowIDstring = str(major) + ':' + str(minor)
print(tabs + '\t', end='') print(tabs + ' ', end='')
shell('./xdp-cpumap-tc/src/xdp_iphash_to_cpu_cmdline --add --ip ' + device['ipv4'] + ' --cpu ' + str(currentQueueCounter-1) + ' --classid ' + flowIDstring) shell('./xdp-cpumap-tc/src/xdp_iphash_to_cpu_cmdline --add --ip ' + device['ipv4'] + ' --cpu ' + str(currentQueueCounter-1) + ' --classid ' + flowIDstring)
if device['hostname'] not in devicesShaped:
devicesShaped.append(device['hostname'])
print() print()
minor += 1 minor += 1
minor += 1 minor += 1
if 'children' in network[tier1]['children'][tier2]['children'][tier3]['children'][tier4]: if 'children' in network[tier1]['children'][tier2]['children'][tier3]['children'][tier4]:
for tier5 in network[tier1]['children'][tier2]['children'][tier3]['children'][tier4]['children']: for tier5 in network[tier1]['children'][tier2]['children'][tier3]['children'][tier4]['children']:
tier5classID = str(currentQueueCounter) + ':' + str(minor) tier5classID = str(currentQueueCounter) + ':' + str(minor)
tabs = '\t\t\t\t' tabs = ' '
print(tabs + tier5) print(tabs + tier5)
tier5download = min(network[tier1]['children'][tier2]['children'][tier3]['children'][tier4]['children'][tier5]['downloadBandwidthMbps'],tier4download) tier5download = min(network[tier1]['children'][tier2]['children'][tier3]['children'][tier4]['children'][tier5]['downloadBandwidthMbps'],tier4download)
tier5upload = min(network[tier1]['children'][tier2]['children'][tier3]['children'][tier4]['children'][tier5]['uploadBandwidthMbps'],tier4upload) tier5upload = min(network[tier1]['children'][tier2]['children'][tier3]['children'][tier4]['children'][tier5]['uploadBandwidthMbps'],tier4upload)
@ -335,32 +353,34 @@ def refreshShapers():
if tier5 == device['AP']: if tier5 == device['AP']:
maxDownload = min(device['downloadMax'],tier5download) maxDownload = min(device['downloadMax'],tier5download)
maxUpload = min(device['uploadMax'],tier5upload) maxUpload = min(device['uploadMax'],tier5upload)
minDownload = device['downloadMin'] minDownload = min(device['downloadMin'],maxDownload)
minUpload = device['uploadMin'] minUpload = min(device['uploadMin'],maxUpload)
minMaxString = "Min: " + str(minDownload) + '/' + str(minUpload) + " Mbps | Max: " + str(maxDownload) + '/' + str(maxUpload) + " Mbps" minMaxString = "Min: " + str(minDownload) + '/' + str(minUpload) + " Mbps | Max: " + str(maxDownload) + '/' + str(maxUpload) + " Mbps"
print(tabs + '\t' + device['hostname']) print(tabs + ' ' + device['hostname'])
print(tabs + '\t' + "Download: " + str(minDownload) + " to " + str(maxDownload) + " Mbps") print(tabs + ' ' + "Download: " + str(minDownload) + " to " + str(maxDownload) + " Mbps")
print(tabs + '\t' + "Upload: " + str(minUpload) + " to " + str(maxUpload) + " Mbps") print(tabs + ' ' + "Upload: " + str(minUpload) + " to " + str(maxUpload) + " Mbps")
print(tabs + '\t', end='') print(tabs + ' ', end='')
shell('tc class add dev ' + interfaceA + ' parent ' + tier5classID + ' classid ' + str(minor) + ' htb rate '+ str(minDownload) + 'mbit ceil '+ str(maxDownload) + 'mbit prio 3') shell('tc class add dev ' + interfaceA + ' parent ' + tier5classID + ' classid ' + str(minor) + ' htb rate '+ str(minDownload) + 'mbit ceil '+ str(maxDownload) + 'mbit prio 3')
print(tabs + '\t', end='') print(tabs + ' ', end='')
shell('tc qdisc add dev ' + interfaceA + ' parent ' + str(major) + ':' + str(minor) + ' ' + fqOrCAKE) shell('tc qdisc add dev ' + interfaceA + ' parent ' + str(major) + ':' + str(minor) + ' ' + fqOrCAKE)
print(tabs + '\t', end='') print(tabs + ' ', end='')
shell('tc class add dev ' + interfaceB + ' parent ' + tier5classID + ' classid ' + str(minor) + ' htb rate '+ str(minUpload) + 'mbit ceil '+ str(maxUpload) + 'mbit prio 3') shell('tc class add dev ' + interfaceB + ' parent ' + tier5classID + ' classid ' + str(minor) + ' htb rate '+ str(minUpload) + 'mbit ceil '+ str(maxUpload) + 'mbit prio 3')
print(tabs + '\t', end='') print(tabs + ' ', end='')
shell('tc qdisc add dev ' + interfaceB + ' parent ' + str(major) + ':' + str(minor) + ' ' + fqOrCAKE) shell('tc qdisc add dev ' + interfaceB + ' parent ' + str(major) + ':' + str(minor) + ' ' + fqOrCAKE)
if device['ipv4']: if device['ipv4']:
parentString = str(major) + ':' parentString = str(major) + ':'
flowIDstring = str(major) + ':' + str(minor) flowIDstring = str(major) + ':' + str(minor)
print(tabs + '\t', end='') print(tabs + ' ', end='')
shell('./xdp-cpumap-tc/src/xdp_iphash_to_cpu_cmdline --add --ip ' + device['ipv4'] + ' --cpu ' + str(currentQueueCounter-1) + ' --classid ' + flowIDstring) shell('./xdp-cpumap-tc/src/xdp_iphash_to_cpu_cmdline --add --ip ' + device['ipv4'] + ' --cpu ' + str(currentQueueCounter-1) + ' --classid ' + flowIDstring)
if device['hostname'] not in devicesShaped:
devicesShaped.append(device['hostname'])
print() print()
minor += 1 minor += 1
minor += 1 minor += 1
if 'children' in network[tier1]['children'][tier2]['children'][tier3]['children'][tier4]['children'][tier5]: if 'children' in network[tier1]['children'][tier2]['children'][tier3]['children'][tier4]['children'][tier5]:
for tier6 in network[tier1]['children'][tier2]['children'][tier3]['children'][tier4]['children'][tier5]['children']: for tier6 in network[tier1]['children'][tier2]['children'][tier3]['children'][tier4]['children'][tier5]['children']:
tier6classID = str(currentQueueCounter) + ':' + str(minor) tier6classID = str(currentQueueCounter) + ':' + str(minor)
tabs = '\t\t\t\t\t' tabs = ' '
print(tabs + tier6) print(tabs + tier6)
tier6download = min(network[tier1]['children'][tier2]['children'][tier3]['children'][tier4]['children'][tier5]['children'][tier6]['downloadBandwidthMbps'],tier5download) tier6download = min(network[tier1]['children'][tier2]['children'][tier3]['children'][tier4]['children'][tier5]['children'][tier6]['downloadBandwidthMbps'],tier5download)
tier6upload = min(network[tier1]['children'][tier2]['children'][tier3]['children'][tier4]['children'][tier5]['children'][tier6]['uploadBandwidthMbps'],tier5upload) tier6upload = min(network[tier1]['children'][tier2]['children'][tier3]['children'][tier4]['children'][tier5]['children'][tier6]['uploadBandwidthMbps'],tier5upload)
@ -380,31 +400,33 @@ def refreshShapers():
if tier6 == device['AP']: if tier6 == device['AP']:
maxDownload = min(device['downloadMax'],tier6download) maxDownload = min(device['downloadMax'],tier6download)
maxUpload = min(device['uploadMax'],tier6upload) maxUpload = min(device['uploadMax'],tier6upload)
minDownload = device['downloadMin'] minDownload = min(device['downloadMin'],maxDownload)
minUpload = device['uploadMin'] minUpload = min(device['uploadMin'],maxUpload)
print(tabs + '\t' + device['hostname']) print(tabs + ' ' + device['hostname'])
print(tabs + '\t' + "Download: " + str(minDownload) + " to " + str(maxDownload) + " Mbps") print(tabs + ' ' + "Download: " + str(minDownload) + " to " + str(maxDownload) + " Mbps")
print(tabs + '\t' + "Upload: " + str(minUpload) + " to " + str(maxUpload) + " Mbps") print(tabs + ' ' + "Upload: " + str(minUpload) + " to " + str(maxUpload) + " Mbps")
print(tabs + '\t', end='') print(tabs + ' ', end='')
shell('tc class add dev ' + interfaceA + ' parent ' + tier6classID + ' classid ' + str(minor) + ' htb rate '+ str(minDownload) + 'mbit ceil '+ str(maxDownload) + 'mbit prio 3') shell('tc class add dev ' + interfaceA + ' parent ' + tier6classID + ' classid ' + str(minor) + ' htb rate '+ str(minDownload) + 'mbit ceil '+ str(maxDownload) + 'mbit prio 3')
print(tabs + '\t', end='') print(tabs + ' ', end='')
shell('tc qdisc add dev ' + interfaceA + ' parent ' + str(major) + ':' + str(minor) + ' ' + fqOrCAKE) shell('tc qdisc add dev ' + interfaceA + ' parent ' + str(major) + ':' + str(minor) + ' ' + fqOrCAKE)
print(tabs + '\t', end='') print(tabs + ' ', end='')
shell('tc class add dev ' + interfaceB + ' parent ' + tier6classID + ' classid ' + str(minor) + ' htb rate '+ str(minUpload) + 'mbit ceil '+ str(maxUpload) + 'mbit prio 3') shell('tc class add dev ' + interfaceB + ' parent ' + tier6classID + ' classid ' + str(minor) + ' htb rate '+ str(minUpload) + 'mbit ceil '+ str(maxUpload) + 'mbit prio 3')
print(tabs + '\t', end='') print(tabs + ' ', end='')
shell('tc qdisc add dev ' + interfaceB + ' parent ' + str(major) + ':' + str(minor) + ' ' + fqOrCAKE) shell('tc qdisc add dev ' + interfaceB + ' parent ' + str(major) + ':' + str(minor) + ' ' + fqOrCAKE)
if device['ipv4']: if device['ipv4']:
parentString = str(major) + ':' parentString = str(major) + ':'
flowIDstring = str(major) + ':' + str(minor) flowIDstring = str(major) + ':' + str(minor)
print(tabs + '\t', end='') print(tabs + ' ', end='')
shell('./xdp-cpumap-tc/src/xdp_iphash_to_cpu_cmdline --add --ip ' + device['ipv4'] + ' --cpu ' + str(currentQueueCounter-1) + ' --classid ' + flowIDstring) shell('./xdp-cpumap-tc/src/xdp_iphash_to_cpu_cmdline --add --ip ' + device['ipv4'] + ' --cpu ' + str(currentQueueCounter-1) + ' --classid ' + flowIDstring)
if device['hostname'] not in devicesShaped:
devicesShaped.append(device['hostname'])
print() print()
minor += 1 minor += 1
minor += 1 minor += 1
if 'children' in tier6: if 'children' in tier6:
for tier7 in network[tier1]['children'][tier2]['children'][tier3]['children'][tier4]['children'][tier5]['children'][tier6]['children']: for tier7 in network[tier1]['children'][tier2]['children'][tier3]['children'][tier4]['children'][tier5]['children'][tier6]['children']:
tier7classID = str(currentQueueCounter) + ':' + str(minor) tier7classID = str(currentQueueCounter) + ':' + str(minor)
tabs = '\t\t\t\t\t\t' tabs = ' '
print(tabs + tier7) print(tabs + tier7)
tier7download = min(network[tier1]['children'][tier2]['children'][tier3]['children'][tier4]['children'][tier5]['children'][tier6]['children'][tier7]['downloadBandwidthMbps'],tier6download) tier7download = min(network[tier1]['children'][tier2]['children'][tier3]['children'][tier4]['children'][tier5]['children'][tier6]['children'][tier7]['downloadBandwidthMbps'],tier6download)
tier7upload = min(network[tier1]['children'][tier2]['children'][tier3]['children'][tier4]['children'][tier5]['children'][tier6]['children'][tier7]['uploadBandwidthMbps'],tier6upload) tier7upload = min(network[tier1]['children'][tier2]['children'][tier3]['children'][tier4]['children'][tier5]['children'][tier6]['children'][tier7]['uploadBandwidthMbps'],tier6upload)
@ -424,34 +446,39 @@ def refreshShapers():
if tier7 == device['AP']: if tier7 == device['AP']:
maxDownload = min(device['downloadMax'],tier7download) maxDownload = min(device['downloadMax'],tier7download)
maxUpload = min(device['uploadMax'],tier7upload) maxUpload = min(device['uploadMax'],tier7upload)
minDownload = device['downloadMin'] minDownload = min(device['downloadMin'],maxDownload)
minUpload = device['uploadMin'] minUpload = min(device['uploadMin'],maxUpload)
print(tabs + '\t' + device['hostname']) print(tabs + ' ' + device['hostname'])
print(tabs + '\t' + "Download: " + str(minDownload) + " to " + str(maxDownload) + " Mbps") print(tabs + ' ' + "Download: " + str(minDownload) + " to " + str(maxDownload) + " Mbps")
print(tabs + '\t' + "Upload: " + str(minUpload) + " to " + str(maxUpload) + " Mbps") print(tabs + ' ' + "Upload: " + str(minUpload) + " to " + str(maxUpload) + " Mbps")
print(tabs + '\t', end='') print(tabs + ' ', end='')
shell('tc class add dev ' + interfaceA + ' parent ' + tier7classID + ' classid ' + str(minor) + ' htb rate '+ str(minDownload) + 'mbit ceil '+ str(maxDownload) + 'mbit prio 3') shell('tc class add dev ' + interfaceA + ' parent ' + tier7classID + ' classid ' + str(minor) + ' htb rate '+ str(minDownload) + 'mbit ceil '+ str(maxDownload) + 'mbit prio 3')
print(tabs + '\t', end='') print(tabs + ' ', end='')
shell('tc qdisc add dev ' + interfaceA + ' parent ' + str(major) + ':' + str(minor) + ' ' + fqOrCAKE) shell('tc qdisc add dev ' + interfaceA + ' parent ' + str(major) + ':' + str(minor) + ' ' + fqOrCAKE)
print(tabs + '\t', end='') print(tabs + ' ', end='')
shell('tc class add dev ' + interfaceB + ' parent ' + tier7classID + ' classid ' + str(minor) + ' htb rate '+ str(minUpload) + 'mbit ceil '+ str(maxUpload) + 'mbit prio 3') shell('tc class add dev ' + interfaceB + ' parent ' + tier7classID + ' classid ' + str(minor) + ' htb rate '+ str(minUpload) + 'mbit ceil '+ str(maxUpload) + 'mbit prio 3')
print(tabs + '\t', end='') print(tabs + ' ', end='')
shell('tc qdisc add dev ' + interfaceB + ' parent ' + str(major) + ':' + str(minor) + ' ' + fqOrCAKE) shell('tc qdisc add dev ' + interfaceB + ' parent ' + str(major) + ':' + str(minor) + ' ' + fqOrCAKE)
if device['ipv4']: if device['ipv4']:
parentString = str(major) + ':' parentString = str(major) + ':'
flowIDstring = str(major) + ':' + str(minor) flowIDstring = str(major) + ':' + str(minor)
print(tabs + '\t', end='') print(tabs + ' ', end='')
shell('./xdp-cpumap-tc/src/xdp_iphash_to_cpu_cmdline --add --ip ' + device['ipv4'] + ' --cpu ' + str(currentQueueCounter-1) + ' --classid ' + flowIDstring) shell('./xdp-cpumap-tc/src/xdp_iphash_to_cpu_cmdline --add --ip ' + device['ipv4'] + ' --cpu ' + str(currentQueueCounter-1) + ' --classid ' + flowIDstring)
if device['hostname'] not in devicesShaped:
devicesShaped.append(device['hostname'])
print() print()
minor += 1 minor += 1
minor += 1 minor += 1
if 'children' in tier7:
raise ValueError('File network.json has more than 7 levels of heirarchy. Cannot parse.')
queueMinorCounterDict[currentQueueCounter] = minor queueMinorCounterDict[currentQueueCounter] = minor
currentQueueCounter += 1 currentQueueCounter += 1
if currentQueueCounter > queuesAvailable: if currentQueueCounter > queuesAvailable:
currentQueueCounter = 1 currentQueueCounter = 1
#Recap
for device in devices:
if device['hostname'] not in devicesShaped:
print('Device ' + device['hostname'] + ' was not shaped. Please check to ensure its parent Node is listed in network.json.')
# Done # Done
currentTimeString = datetime.now().strftime("%d/%m/%Y %H:%M:%S") currentTimeString = datetime.now().strftime("%d/%m/%Y %H:%M:%S")
print("Successful run completed on " + currentTimeString) print("Successful run completed on " + currentTimeString)