c7f3139533
* First draft of Ubuntu 20.04 Vagrantfile and scripts to install 2021-Mar version of open source P4 development tools. * Add more tracing output of what files have been installed at each step * Don't do behavioral-model install_deps.sh before installing PI This is an experiment to see if the end result will be able to run tutorials basic exercise using Python3 only on an Ubuntu 20.04 system. Just before this commit, `vagrant up` resulted in a system that failed to run the basic exercise, because python3 failed to import google.grpc (if I recall correctly -- it may have been a different google.<something> Python3 module name). * Add missing patch file * Fix copy and paste mistake * Add missing patch file * Change how protobuf Python3 module files are installed * Correct a few desktop icon file names, and add clean.sh script * Enhance clean.sh script, and add README for manual steps in creating a VM * Changes to try to always use Python3, never Python2, in tutorials * Update README steps for preparing a VM * More additions to README on steps to create a single file VM image * Add empty-disk-block zeroing to clean.sh script * Also install PTF * Update versions of P4 dev tool source code to 2021-Apr-05 This includes a change to p4lang/PI that allows P4Runtime API clients to send the shortest byte sequences necessary to encode integer values, which I want for a PTF test that I have recently created. * Update README for 2021-Apr-05 version of VM image * Resolve Python 3 compatibility issues Most of the Python 2 to 3 code translation changes were automated with the 2to3 tool. Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org> * Update commit SHAs for 4 p4lang repos to latest as of 2021-May-04 * Update Ubuntu 20.04 README.md for how I created 2021-May-04 version of VM * mycontroller: Use Python 3 shebang line Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org> * Update Ubuntu 20.04 README.md for how I created 2021-Jun-01 version of VM * Update commit SHAs for 4 p4lang repos to latest as of 2021-Jul-07 * Update Ubuntu 20.04 README.md for how I created 2021-Jul-07 version of VM * Update commit SHAs for 4 p4lang repos to latest as of 2021-Aug-01 * Update Ubuntu 20.04 README.md for how I created 2021-Aug-01 version of VM * Update commit SHAs for 4 p4lang repos to latest as of 2021-Sep-07 * Update Ubuntu 20.04 README.md for how I created 2021-Sep-07 version of VM Co-authored-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
71 lines
3.0 KiB
Python
71 lines
3.0 KiB
Python
from mininet.topo import Topo
|
|
|
|
class AppTopo(Topo):
|
|
|
|
def __init__(self, links, latencies={}, manifest=None, target=None,
|
|
log_dir="/tmp", bws={}, **opts):
|
|
Topo.__init__(self, **opts)
|
|
|
|
nodes = sum(list(map(list, list(zip(*links)))), [])
|
|
host_names = sorted(list(set([n for n in nodes if n[0] == 'h'])))
|
|
sw_names = sorted(list(set([n for n in nodes if n[0] == 's'])))
|
|
sw_ports = dict([(sw, []) for sw in sw_names])
|
|
|
|
self._host_links = {}
|
|
self._sw_links = dict([(sw, {}) for sw in sw_names])
|
|
|
|
for sw_name in sw_names:
|
|
self.addSwitch(sw_name, log_file="%s/%s.log" %(log_dir, sw_name))
|
|
|
|
for host_name in host_names:
|
|
host_num = int(host_name[1:])
|
|
|
|
self.addHost(host_name)
|
|
|
|
self._host_links[host_name] = {}
|
|
host_links = [l for l in links if l[0]==host_name or l[1]==host_name]
|
|
|
|
sw_idx = 0
|
|
for link in host_links:
|
|
sw = link[0] if link[0] != host_name else link[1]
|
|
sw_num = int(sw[1:])
|
|
assert sw[0]=='s', "Hosts should be connected to switches, not " + str(sw)
|
|
host_ip = "10.0.%d.%d" % (sw_num, host_num)
|
|
host_mac = '00:00:00:00:%02x:%02x' % (sw_num, host_num)
|
|
delay_key = ''.join([host_name, sw])
|
|
delay = latencies[delay_key] if delay_key in latencies else '0ms'
|
|
bw = bws[delay_key] if delay_key in bws else None
|
|
sw_ports[sw].append(host_name)
|
|
self._host_links[host_name][sw] = dict(
|
|
idx=sw_idx,
|
|
host_mac = host_mac,
|
|
host_ip = host_ip,
|
|
sw = sw,
|
|
sw_mac = "00:00:00:00:%02x:%02x" % (sw_num, host_num),
|
|
sw_ip = "10.0.%d.%d" % (sw_num, 254),
|
|
sw_port = sw_ports[sw].index(host_name)+1
|
|
)
|
|
self.addLink(host_name, sw, delay=delay, bw=bw,
|
|
addr1=host_mac, addr2=self._host_links[host_name][sw]['sw_mac'])
|
|
sw_idx += 1
|
|
|
|
for link in links: # only check switch-switch links
|
|
sw1, sw2 = link
|
|
if sw1[0] != 's' or sw2[0] != 's': continue
|
|
|
|
delay_key = ''.join(sorted([sw1, sw2]))
|
|
delay = latencies[delay_key] if delay_key in latencies else '0ms'
|
|
bw = bws[delay_key] if delay_key in bws else None
|
|
|
|
self.addLink(sw1, sw2, delay=delay, bw=bw)#, max_queue_size=10)
|
|
sw_ports[sw1].append(sw2)
|
|
sw_ports[sw2].append(sw1)
|
|
|
|
sw1_num, sw2_num = int(sw1[1:]), int(sw2[1:])
|
|
sw1_port = dict(mac="00:00:00:%02x:%02x:00" % (sw1_num, sw2_num), port=sw_ports[sw1].index(sw2)+1)
|
|
sw2_port = dict(mac="00:00:00:%02x:%02x:00" % (sw2_num, sw1_num), port=sw_ports[sw2].index(sw1)+1)
|
|
|
|
self._sw_links[sw1][sw2] = [sw1_port, sw2_port]
|
|
self._sw_links[sw2][sw1] = [sw2_port, sw1_port]
|
|
|