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

Updating p4runtime solution (#171)

Browse Source
This commit is contained in:
Brian O'Connor 2018-06-07 15:09:48 -07:00 committed by Nate Foster
parent 2fe7ddf108
commit 6c37638818
1 changed files with 53 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
exercises/p4runtime/solution/mycontroller.py
View File

@ -1,5 +1,6 @@
#!/usr/bin/env python2 #!/usr/bin/env python2
import argparse import argparse
import grpc
import os import os
import sys import sys
from time import sleep from time import sleep
@ -10,6 +11,7 @@ sys.path.append(
os.path.join(os.path.dirname(os.path.abspath(__file__)), os.path.join(os.path.dirname(os.path.abspath(__file__)),
'../../utils/')) '../../utils/'))
import p4runtime_lib.bmv2 import p4runtime_lib.bmv2
from p4runtime_lib.switch import ShutdownAllSwitchConnections
import p4runtime_lib.helper import p4runtime_lib.helper
SWITCH_TO_HOST_PORT = 1 SWITCH_TO_HOST_PORT = 1
@ -109,7 +111,7 @@ def readTableRules(p4info_helper, sw):
for entity in response.entities: for entity in response.entities:
entry = entity.table_entry entry = entity.table_entry
# TODO For extra credit, you can use the p4info_helper to translate # TODO For extra credit, you can use the p4info_helper to translate
# the IDs the entry to names # the IDs in the entry to names
table_name = p4info_helper.get_tables_name(entry.table_id) table_name = p4info_helper.get_tables_name(entry.table_id)
print '%s: ' % table_name, print '%s: ' % table_name,
for m in entry.match: for m in entry.match:
@ -123,7 +125,6 @@ def readTableRules(p4info_helper, sw):
print '%r' % p.value, print '%r' % p.value,
print print
def printCounter(p4info_helper, sw, counter_name, index): def printCounter(p4info_helper, sw, counter_name, index):
""" """
Reads the specified counter at the specified index from the switch. In our Reads the specified counter at the specified index from the switch. In our
@ -143,11 +144,18 @@ def printCounter(p4info_helper, sw, counter_name, index):
counter.data.packet_count, counter.data.byte_count counter.data.packet_count, counter.data.byte_count
) )
def printGrpcError(e):
print "gRPC Error:", e.details(),
status_code = e.code()
print "(%s)" % status_code.name,
traceback = sys.exc_info()[2]
print "[%s:%d]" % (traceback.tb_frame.f_code.co_filename, traceback.tb_lineno)
def main(p4info_file_path, bmv2_file_path): def main(p4info_file_path, bmv2_file_path):
# Instantiate a P4Runtime helper from the p4info file # Instantiate a P4Runtime helper from the p4info file
p4info_helper = p4runtime_lib.helper.P4InfoHelper(p4info_file_path) p4info_helper = p4runtime_lib.helper.P4InfoHelper(p4info_file_path)
try:
# Create a switch connection object for s1 and s2; # Create a switch connection object for s1 and s2;
# this is backed by a P4Runtime gRPC connection. # this is backed by a P4Runtime gRPC connection.
# Also, dump all P4Runtime messages sent to switch to given txt files. # Also, dump all P4Runtime messages sent to switch to given txt files.
@ -188,7 +196,6 @@ def main(p4info_file_path, bmv2_file_path):
readTableRules(p4info_helper, s2) readTableRules(p4info_helper, s2)
# Print the tunnel counters every 2 seconds # Print the tunnel counters every 2 seconds
try:
while True: while True:
sleep(2) sleep(2)
print '\n----- Reading tunnel counters -----' print '\n----- Reading tunnel counters -----'
@ -196,9 +203,13 @@ def main(p4info_file_path, bmv2_file_path):
printCounter(p4info_helper, s2, "MyIngress.egressTunnelCounter", 100) printCounter(p4info_helper, s2, "MyIngress.egressTunnelCounter", 100)
printCounter(p4info_helper, s2, "MyIngress.ingressTunnelCounter", 200) printCounter(p4info_helper, s2, "MyIngress.ingressTunnelCounter", 200)
printCounter(p4info_helper, s1, "MyIngress.egressTunnelCounter", 200) printCounter(p4info_helper, s1, "MyIngress.egressTunnelCounter", 200)
except KeyboardInterrupt: except KeyboardInterrupt:
print " Shutting down." print " Shutting down."
except grpc.RpcError as e:
printGrpcError(e)
ShutdownAllSwitchConnections()
if __name__ == '__main__': if __name__ == '__main__':
parser = argparse.ArgumentParser(description='P4Runtime Controller') parser = argparse.ArgumentParser(description='P4Runtime Controller')
@ -218,5 +229,4 @@ if __name__ == '__main__':
parser.print_help() parser.print_help()
print "\nBMv2 JSON file not found: %s\nHave you run 'make'?" % args.bmv2_json print "\nBMv2 JSON file not found: %s\nHave you run 'make'?" % args.bmv2_json
parser.exit(1) parser.exit(1)
main(args.p4info, args.bmv2_json) main(args.p4info, args.bmv2_json)