Adds new test case, improves .gitignore and README.md
Changes:
- Adds Untagged test for [CORD-84]
- Improves .gitignore
- Improves README.md
Change-Id: Ie5b2ce657b5d9b39dc7955065a784b3ee334af0d
diff --git a/.gitignore b/.gitignore
index 48da841..b04ace3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
*.pyc
profiles/*.pyc
*~
+*.log
+*.patch
+*.pcap
diff --git a/README.md b/README.md
index 69a982b..1ca2172 100755
--- a/README.md
+++ b/README.md
@@ -113,4 +113,7 @@
FloodGroupMod | X | X | ok
PacketInUDP | ok | ok | ok
Unfiltered | X | ok | X
+Untagged | n/a | n/a | ok
+
+n/a means test is not available for that version of the pipeline.
diff --git a/ofdpa/flows.py b/ofdpa/flows.py
index a0ecb0f..851036d 100755
--- a/ofdpa/flows.py
+++ b/ofdpa/flows.py
@@ -1584,3 +1584,60 @@
delete_all_flows( self.controller )
delete_groups( self.controller, Groups )
delete_all_groups( self.controller )
+
+class Untagged( base_tests.SimpleDataPlane ):
+ """
+ Verify VLAN filtering table does not require OFPVID_PRESENT bit to be 0.
+ This should be fixed in OFDPA 2.0 GA and above, the test fails with
+ previous versions of the OFDPA.
+
+ Two rules are necessary in VLAN table (10):
+ 1) Assignment: match 0x0000/(no mask), set_vlan_vid 0x100A, goto 20
+ 2) Filtering: match 0x100A/0x1FFF, goto 20
+
+ In this test case vlan_id = (MAX_INTERNAL_VLAN - port_no).
+ The remaining part of the test is based on the use of the bridging table
+ """
+
+ MAX_INTERNAL_VLAN = 4094
+
+ def runTest( self ):
+ groups = Queue.LifoQueue( )
+ try:
+ if len( config[ "port_map" ] ) < 2:
+ logging.info( "Port count less than 2, can't run this case" )
+ return
+
+ ports = sorted( config[ "port_map" ].keys( ) )
+ for port in ports:
+ vlan_id = Untagged.MAX_INTERNAL_VLAN - port
+ add_one_vlan_table_flow( self.controller, port, vlan_id, flag=VLAN_TABLE_FLAG_ONLY_TAG )
+ add_one_vlan_table_flow( self.controller, port, vlan_id, flag=VLAN_TABLE_FLAG_ONLY_UNTAG )
+ for other_port in ports:
+ if other_port == port:
+ continue
+ L2gid, l2msg = add_one_l2_interface_group( self.controller, other_port, vlan_id, False, False )
+ groups.put( L2gid )
+ add_bridge_flow( self.controller, [ 0x00, 0x12, 0x34, 0x56, 0x78, other_port ], vlan_id, L2gid, True )
+
+ do_barrier( self.controller )
+
+ for out_port in ports:
+ # change dest based on port number
+ mac_dst = '00:12:34:56:78:%02X' % out_port
+ for in_port in ports:
+ if in_port == out_port:
+ continue
+ pkt = str( simple_tcp_packet( eth_dst=mac_dst ) )
+ self.dataplane.send( in_port, pkt )
+ for ofport in ports:
+ if ofport in [ out_port ]:
+ verify_packet( self, pkt, ofport )
+ else:
+ verify_no_packet( self, pkt, ofport )
+ verify_no_other_packets( self )
+ finally:
+ delete_all_flows( self.controller )
+ delete_groups( self.controller, Groups )
+ delete_all_groups( self.controller )
+