fyb/p4tutorials-turkce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add March 2021 VM based on Ubuntu 20.04 (#403)

Browse Source 
* 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>
This commit is contained in:
Andy Fingerhut
2021-09-07 19:34:30 -07:00
committed by GitHub
parent 4914893445
commit c7f3139533
47 changed files with 1482 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
utils/run_exercise.py
View File

@@ -1,4 +1,4 @@
#!/usr/bin/env python2
#!/usr/bin/env python3
# Copyright 2013-present Barefoot Networks, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -45,7 +45,7 @@ def configureP4Switch(**switch_args):
P4RuntimeSwitch.__init__(self, *opts, **kwargs)
def describe(self):
print "%s -> gRPC port: %d" % (self.name, self.grpc_port)
print("%s -> gRPC port: %d" % (self.name, self.grpc_port))
return ConfiguredP4RuntimeSwitch
else:
@@ -59,7 +59,7 @@ def configureP4Switch(**switch_args):
P4Switch.__init__(self, *opts, **kwargs)
def describe(self):
print "%s -> Thrift port: %d" % (self.name, self.thrift_port)
print("%s -> Thrift port: %d" % (self.name, self.thrift_port))
return ConfiguredP4Switch
@@ -79,7 +79,7 @@ class ExerciseTopo(Topo):
else:
switch_links.append(link)
for sw, params in switches.iteritems():
for sw, params in switches.items():
if "program" in params:
switchClass = configureP4Switch(
sw_path=bmv2_exe,
@@ -143,7 +143,7 @@ class ExerciseRunner:
def format_latency(self, l):
""" Helper method for parsing link latencies from the topology json. """
if isinstance(l, (str, unicode)):
if isinstance(l, str):
return l
else:
return str(l) + "ms"
@@ -297,7 +297,7 @@ class ExerciseRunner:
P4Runtime, depending if any command or runtime JSON files were
provided for the switches.
"""
for sw_name, sw_dict in self.switches.iteritems():
for sw_name, sw_dict in self.switches.items():
if 'cli_input' in sw_dict:
self.program_switch_cli(sw_name, sw_dict)
if 'runtime_json' in sw_dict:
@@ -306,7 +306,7 @@ class ExerciseRunner:
def program_hosts(self):
""" Execute any commands provided in the topology.json file on each Mininet host
"""
for host_name, host_info in self.hosts.items():
for host_name, host_info in list(self.hosts.items()):
h = self.net.get(host_name)
if "commands" in host_info:
for cmd in host_info["commands"]: