Implement Egress TPID flow table test
Change-Id: I6a9aaef52f9400877420dabdcc65197a07e9850c
diff --git a/src/python/loxi/of13/action.py b/src/python/loxi/of13/action.py
index a7d6697..4875e74 100755
--- a/src/python/loxi/of13/action.py
+++ b/src/python/loxi/of13/action.py
@@ -2119,3 +2119,87 @@
q.text('}')
ofdpa.subtypes[OFDPA_ACT_OAM_SET_COUNTER_FIELDS] = ofdpa_oam_set_counter_field
+
+class copy_field(action):
+ type = 65535
+ experimenter = 0x4f4e4600 # ONF_EXPERIMENTER_ID
+ exp_type = 3200 # ONFTFP_ET_WRITE_COPYFIELD
+
+ def __init__(self, n_bits=None, src_offset=None, dst_offset=None, oxm_ids=None):
+ if n_bits != None:
+ self.n_bits = n_bits
+ else:
+ self.n_bits = 0
+ if src_offset != None:
+ self.src_offset = src_offset
+ else:
+ self.src_offset = 0
+ if dst_offset != None:
+ self.dst_offset = dst_offset
+ else:
+ self.dst_offset = 0
+ if oxm_ids != None:
+ self.oxm_ids = oxm_ids
+ else:
+ self.oxm_ids = [ ]
+ return
+
+ def pack( self ):
+ packed = [ ]
+ packed.append( struct.pack( "!H", self.type ) )
+ packed.append( struct.pack( "!H", 0 ) ) # placeholder for len at index 1
+ packed.append( struct.pack( "!L", self.experimenter ) )
+ packed.append( struct.pack( "!H", self.exp_type ) )
+ packed.append( '\x00' * 2 )
+ packed.append( struct.pack( "!H", self.n_bits ) )
+ packed.append( struct.pack( "!H", self.src_offset ) )
+ packed.append( struct.pack( "!H", self.dst_offset ) )
+ packed.append( '\x00' * 2 )
+ packed.append( "".join(self.oxm_ids ) )
+ length = sum( [ len( x ) for x in packed ] )
+ packed[ 1 ] = struct.pack( "!H", length )
+ return ''.join( packed )
+
+ @staticmethod
+ def unpack( reader ):
+ obj = copy_field()
+ _type = reader.read( "!H" )[ 0 ]
+ _len = reader.read( "!H" )[ 0 ]
+ orig_reader = reader
+ reader = orig_reader.slice( _len, 4 )
+ obj.n_bits = reader.read( "!H" )[ 0 ]
+ obj.src_offset = reader.read( "!H" )[ 0 ]
+ obj.dst_offset = reader.read( "!H" )[ 0 ]
+ reader.skip( 2 )
+ obj.oxm_ids = loxi.generic_util.unpack_list( reader, ofp.oxm.oxm.unpack )
+ return obj
+
+ def __eq__( self, other ):
+ if type( self ) != type( other ): return False
+ if self.n_bits != other.n_bits: return False
+ if self.src_offset != other.src_offset: return False
+ if self.dst_offset != other.dst_offset: return False
+ if self.oxm_ids != other.oxm_ids: return False
+ return True
+
+ def pretty_print( self, q ):
+ q.text( "copy_field {" )
+ with q.group():
+ with q.indent( 2 ):
+ q.breakable()
+ q.text( "n_bits = " )
+ q.text( "%#x" % self.n_bits )
+ q.text( "," )
+ q.breakable()
+ q.text( "src_offset = " )
+ q.text( "%#x" % self.src_offset )
+ q.text( "," )
+ q.breakable()
+ q.text( "dst_offset = " )
+ q.text( "%#x" % self.dst_offset )
+ q.text( "," )
+ q.breakable()
+ q.text( "oxm_ids = " )
+ q.pp( self.oxm_ids )
+ q.breakable()
+ q.text( '}' )
diff --git a/src/python/loxi/of13/oxm.py b/src/python/loxi/of13/oxm.py
index fa62add..7541ecf 100755
--- a/src/python/loxi/of13/oxm.py
+++ b/src/python/loxi/of13/oxm.py
@@ -6271,10 +6271,11 @@
class exp4ByteValue(oxm):
type_len = 0xffff0008
- def __init__(self, exp_type=0, value=None):
+ def __init__(self, exp_type=0, value=None, experimenter=OFDPA_EXPERIMETER):
if value != None:
self.value = value
self.exp_type=exp_type
+ self.experimenter = experimenter
else:
self.value = 0
return
@@ -6282,7 +6283,7 @@
def pack(self):
packed = []
packed.append(struct.pack("!L", self.type_len | (self.exp_type <<9)))
- packed.append(struct.pack("!L", OFDPA_EXPERIMETER))
+ packed.append(struct.pack("!L", self.experimenter))
packed.append(struct.pack("!L", self.value))
return ''.join(packed)
@@ -6314,3 +6315,14 @@
q.text('}')
oxm.subtypes[0xffff000a] = exp4ByteValue
+
+class exp4ByteReg( oxm ):
+ type_len = 0x80010000
+
+ def __init__( self, oxm_field=0 ):
+ self.oxm_field = oxm_field
+
+ def pack( self ):
+ packed = [ ]
+ packed.append( struct.pack( "!L", self.type_len | (self.oxm_field << 9) ) )
+ return ''.join( packed )
diff --git a/src/python/oftest/testutils.py b/src/python/oftest/testutils.py
index 57fe0b6..abf4a27 100755
--- a/src/python/oftest/testutils.py
+++ b/src/python/oftest/testutils.py
@@ -304,6 +304,7 @@
in_dl_vlan_enable=False,
out_vlan_vid=0,
out_vlan_pcp=0,
+ out_vlan_tpid=0x8100,
out_dl_vlan_cfi=0,
in_vlan_vid=0,
in_vlan_pcp=0,
@@ -346,7 +347,7 @@
# Note Dot1Q.id is really CFI
if (out_dl_vlan_enable and in_dl_vlan_enable):
- pkt = scapy.Ether(dst=eth_dst, src=eth_src)/ \
+ pkt = scapy.Ether(dst=eth_dst, src=eth_src, type=out_vlan_tpid)/ \
scapy.Dot1Q(prio=out_vlan_pcp, id=out_dl_vlan_cfi, vlan=out_vlan_vid)
if in_dl_vlan_enable: