nico/master-thesis
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Re-add table entries in commands.txt

Browse source
This commit is contained in:
Nico Schottelius 2019-07-27 21:35:47 +02:00
commit 1ae0294a39
5 changed files with 430 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

31
netpfga/minip4/sw/CLI/p4_tables_api.py
View file

@ -1,13 +1,13 @@
#!/usr/bin/env python
#
# Copyright (c) 2017 Stephen Ibanez
# Copyright (c) 2017 Stephen Ibanez
# All rights reserved.
#
# This software was developed by Stanford University and the University of Cambridge Computer Laboratory
# This software was developed by Stanford University and the University of Cambridge Computer Laboratory
# under National Science Foundation under Grant No. CNS-0855268,
# the University of Cambridge Computer Laboratory under EPSRC INTERNET Project EP/H040536/1 and
# by the University of Cambridge Computer Laboratory under DARPA/AFRL contract FA8750-11-C-0249 ("MRC2"),
# by the University of Cambridge Computer Laboratory under DARPA/AFRL contract FA8750-11-C-0249 ("MRC2"),
# as part of the DARPA MRC research programme.
#
# @NETFPGA_LICENSE_HEADER_START@
@ -42,8 +42,7 @@ p4_px_tables.make_px_tables(SWITCH_INFO_FILE)
PX_CAM_TABLES = {}
PX_TCAM_TABLES = {}
PX_LPM_TABLES = {}
PX_LPM_
def split_px_tables():
for name, table in p4_px_tables.PX_TABLES.items():
if table.info['match_type'] == 'EM':
@ -58,7 +57,7 @@ split_px_tables()
if (len(PX_CAM_TABLES) > 0):
print "loading libcam.."
libcam=cdll.LoadLibrary(os.path.expandvars('$P4_PROJECT_DIR/sw/CLI/libcam.so'))
# argtypes for the functions called from C
libcam.cam_read_entry.argtypes = [c_uint, c_char_p, c_char_p, c_char_p]
libcam.cam_add_entry.argtypes = [c_uint, c_char_p, c_char_p]
@ -71,7 +70,7 @@ if (len(PX_CAM_TABLES) > 0):
if (len(PX_TCAM_TABLES) > 0):
print "loading libtcam.."
libtcam=cdll.LoadLibrary(os.path.expandvars('$P4_PROJECT_DIR/sw/CLI/libtcam.so'))
# argtypes for the functions called from C
libtcam.tcam_clean.argtypes = [c_uint]
libtcam.tcam_get_addr_size.argtypes = []
@ -86,7 +85,7 @@ if (len(PX_TCAM_TABLES) > 0):
if (len(PX_LPM_TABLES) > 0):
print "loading liblpm.."
liblpm=cdll.LoadLibrary(os.path.expandvars('$P4_PROJECT_DIR/sw/CLI/liblpm.so'))
# argtypes for the functions called from C
liblpm.lpm_get_addr_size.argtypes = []
liblpm.lpm_set_log_level.argtypes = [c_uint, c_uint]
@ -148,11 +147,11 @@ def table_cam_read_entry(table_name, keys):
if not check_valid_cam_table_name(table_name):
return "NA", "NA"
tableID = int(p4_tables_info['EM'][table_name]['tableID'])
key = PX_CAM_TABLES[table_name].hexify_key(keys)
tableID = int(p4_tables_info['EM'][table_name]['tableID'])
key = PX_CAM_TABLES[table_name].hexify_key(keys)
hex_key_buf = create_string_buffer("{:X}".format(key))
value = create_string_buffer(1024) # TODO: Fix this ... Must be large enough to hold entire value
found = create_string_buffer(10) # Should only need to hold "True" or "False"
value = create_string_buffer(1024) # TODO: Fix this ... Must be large enough to hold entire value
found = create_string_buffer(10) # Should only need to hold "True" or "False"
rc = libcam.cam_read_entry(tableID, hex_key_buf, value, found)
print libcam.cam_error_decode(rc)
return found.value, value.value
@ -175,12 +174,12 @@ def table_cam_delete_entry(table_name, keys):
key = PX_CAM_TABLES[table_name].hexify_key(keys)
rc = libcam.cam_delete_entry(tableID, "{:X}".format(key))
print libcam.cam_error_decode(rc)
def table_cam_get_size(table_name):
if not check_valid_cam_table_name(table_name):
return 0
tableID = int(p4_tables_info['EM'][table_name]['tableID'])
tableID = int(p4_tables_info['EM'][table_name]['tableID'])
return libcam.cam_get_size(tableID)
@ -269,7 +268,7 @@ def table_lpm_verify_dataset(table_name, filename):
return
tableID = int(p4_tables_info['LPM'][table_name]['tableID'])
return liblpm.lpm_verify_dataset(tableID, filename)
return liblpm.lpm_verify_dataset(tableID, filename)
def table_lpm_set_active_lookup_bank(table_name, bank):
if not check_valid_lpm_table_name(table_name):
@ -281,5 +280,3 @@ def table_lpm_set_active_lookup_bank(table_name, bank):
def table_lpm_error_decode(error):
return liblpm.lpm_error_decode(error)