* Updated the utils/run_exercise.py to allow exercises to customize host configuration from the topology.json file. Now hosts and `ping` each other in the basic exercise. Other Linux utilities should work as well (e.g. iperf). ``` mininet> h1 ping h2 PING 10.0.2.2 (10.0.2.2) 56(84) bytes of data. 64 bytes from 10.0.2.2: icmp_seq=1 ttl=62 time=3.11 ms 64 bytes from 10.0.2.2: icmp_seq=2 ttl=62 time=2.34 ms 64 bytes from 10.0.2.2: icmp_seq=3 ttl=62 time=2.15 ms ^C --- 10.0.2.2 ping statistics --- 3 packets transmitted, 3 received, 0% packet loss, time 2003ms rtt min/avg/max/mdev = 2.153/2.540/3.118/0.416 ms mininet> pingall *** Ping: testing ping reachability h1 -> h2 h3 h2 -> h1 h3 h3 -> h1 h2 *** Results: 0% dropped (6/6 received) ``` Only updated basic exercise, still need to update other exercises. Also, updated the root-bootstrap.sh because I was running into issues with latest version of vagrant. * Accidentially added the solution to the basic exercise in the previous commit. Undoing that here ... * Updated the topology.json file and table entries for the basic_tunnel exercise. * Updated P4Runtime exercise with new topology and table entries. * Fixed MAC addresses in P4Runtime exercise. It is working now. * Fixed MAC addresses in P4Runtime exercise starter code * Updated ECN exercise to use new topology.json file. Updated the table entries / MAC addresses as well. * Updated the topology.json file and table entries for the MRI exercise. * Updated source_routing exercise with new topology file and verified correct functionality. * Updated load_balance exercise with new topology. * Moved basic exercise triangle topology into a separate folder * Added new topology for the basic exercise: a single pod of a fat-tree. * Updated Makefiles and run_exercise.py to allow exercises to configure each switch with a different P4 program. This is mainly for the firewall exercise. * Updated Makefiles of project to work with new utils/Makefile * Updated load_balance and p4runtime exercise Makefiles * Initial commit of the firewall exercise, which is a simple stateful firewall that uses a bloom filter. Need to update README files * Initial commit of the path_monitor exercise. It is working but still need to update the README and figure out what we want the tutorial attendees to implement. * Updated README file in firewall exercise. Also removed the bits from the starter code that we want the tutorial attendees to implement * Renamed path_monitor exercise to link_monitor * Updated the README in the link_monitor exercise and removed the bits from the starter code that we want the tutorial attendees to implement. * Updated README for the firewall exercise * Adding pod-topo.png image to basic exercise * Added firewall-topo.png image to firewall exercise * Added link-monitor-topo.png to link_monitor exercise * Updated README files to point to topology images * Updated top-level README to point to new exercises. * Fixed link for VM dependencies script in README * Updated bmv2/pi/p4c commits * Updated README files for exercises to fix some typos and added a note about the V1Model architecture. * Added a note about food for thought in the link_monitor README * Updated the firewall.p4 program to use two register arrays rather than a single one. This is to make the design more portable to high line rate devices which can only support a single access to each register array. * Minor fix to firewall exercise to get rid of compiler warning. * Updated comment in firewall exercise. * Minor (typo) fixes in the firewall ReadMe * More info in firewall exercise ReadMe step 2 * Updated firewall.p4 to reuse direction variable * More testing steps, small fixes in firewall exercise Readme * Added food for thought to firewall Readme * Cosmetic fixes to firewall ReadMe * Made a few updates to the basic exercise README and added more details to the link_monitor exercise README. Also added a command to install grip when provisioning the VM. This could be useful for rendering the markdown README files offline. * Updated top level README so it can be merged into the master branch. * Moved cmd to install grip from root-bootstrap to user-bootstrap
138 lines
4.9 KiB
Python
138 lines
4.9 KiB
Python
# Copyright 2017-present Barefoot Networks, Inc.
|
|
# Copyright 2017-present Open Networking Foundation
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
#
|
|
|
|
import sys, os, tempfile, socket
|
|
from time import sleep
|
|
|
|
from mininet.node import Switch
|
|
from mininet.moduledeps import pathCheck
|
|
from mininet.log import info, error, debug
|
|
|
|
from p4_mininet import P4Switch, SWITCH_START_TIMEOUT
|
|
from netstat import check_listening_on_port
|
|
|
|
class P4RuntimeSwitch(P4Switch):
|
|
"BMv2 switch with gRPC support"
|
|
next_grpc_port = 50051
|
|
next_thrift_port = 9090
|
|
|
|
def __init__(self, name, sw_path = None, json_path = None,
|
|
grpc_port = None,
|
|
thrift_port = None,
|
|
pcap_dump = False,
|
|
log_console = False,
|
|
verbose = False,
|
|
device_id = None,
|
|
enable_debugger = False,
|
|
log_file = None,
|
|
**kwargs):
|
|
Switch.__init__(self, name, **kwargs)
|
|
assert (sw_path)
|
|
self.sw_path = sw_path
|
|
# make sure that the provided sw_path is valid
|
|
pathCheck(sw_path)
|
|
|
|
if json_path is not None:
|
|
# make sure that the provided JSON file exists
|
|
if not os.path.isfile(json_path):
|
|
error("Invalid JSON file: {}\n".format(json_path))
|
|
exit(1)
|
|
self.json_path = json_path
|
|
else:
|
|
self.json_path = None
|
|
|
|
if grpc_port is not None:
|
|
self.grpc_port = grpc_port
|
|
else:
|
|
self.grpc_port = P4RuntimeSwitch.next_grpc_port
|
|
P4RuntimeSwitch.next_grpc_port += 1
|
|
|
|
if thrift_port is not None:
|
|
self.thrift_port = thrift_port
|
|
else:
|
|
self.thrift_port = P4RuntimeSwitch.next_thrift_port
|
|
P4RuntimeSwitch.next_thrift_port += 1
|
|
|
|
if check_listening_on_port(self.grpc_port):
|
|
error('%s cannot bind port %d because it is bound by another process\n' % (self.name, self.grpc_port))
|
|
exit(1)
|
|
|
|
self.verbose = verbose
|
|
logfile = "/tmp/p4s.{}.log".format(self.name)
|
|
self.output = open(logfile, 'w')
|
|
self.pcap_dump = pcap_dump
|
|
self.enable_debugger = enable_debugger
|
|
self.log_console = log_console
|
|
if log_file is not None:
|
|
self.log_file = log_file
|
|
else:
|
|
self.log_file = "/tmp/p4s.{}.log".format(self.name)
|
|
if device_id is not None:
|
|
self.device_id = device_id
|
|
P4Switch.device_id = max(P4Switch.device_id, device_id)
|
|
else:
|
|
self.device_id = P4Switch.device_id
|
|
P4Switch.device_id += 1
|
|
self.nanomsg = "ipc:///tmp/bm-{}-log.ipc".format(self.device_id)
|
|
|
|
|
|
def check_switch_started(self, pid):
|
|
for _ in range(SWITCH_START_TIMEOUT * 2):
|
|
if not os.path.exists(os.path.join("/proc", str(pid))):
|
|
return False
|
|
if check_listening_on_port(self.grpc_port):
|
|
return True
|
|
sleep(0.5)
|
|
|
|
def start(self, controllers):
|
|
info("Starting P4 switch {}.\n".format(self.name))
|
|
args = [self.sw_path]
|
|
for port, intf in self.intfs.items():
|
|
if not intf.IP():
|
|
args.extend(['-i', str(port) + "@" + intf.name])
|
|
if self.pcap_dump:
|
|
args.append("--pcap %s" % self.pcap_dump)
|
|
if self.nanomsg:
|
|
args.extend(['--nanolog', self.nanomsg])
|
|
args.extend(['--device-id', str(self.device_id)])
|
|
P4Switch.device_id += 1
|
|
if self.json_path:
|
|
args.append(self.json_path)
|
|
else:
|
|
args.append("--no-p4")
|
|
if self.enable_debugger:
|
|
args.append("--debugger")
|
|
if self.log_console:
|
|
args.append("--log-console")
|
|
if self.thrift_port:
|
|
args.append('--thrift-port ' + str(self.thrift_port))
|
|
if self.grpc_port:
|
|
args.append("-- --grpc-server-addr 0.0.0.0:" + str(self.grpc_port))
|
|
cmd = ' '.join(args)
|
|
info(cmd + "\n")
|
|
|
|
|
|
pid = None
|
|
with tempfile.NamedTemporaryFile() as f:
|
|
self.cmd(cmd + ' >' + self.log_file + ' 2>&1 & echo $! >> ' + f.name)
|
|
pid = int(f.read())
|
|
debug("P4 switch {} PID is {}.\n".format(self.name, pid))
|
|
if not self.check_switch_started(pid):
|
|
error("P4 switch {} did not start correctly.\n".format(self.name))
|
|
exit(1)
|
|
info("P4 switch {} has been started.\n".format(self.name))
|
|
|