commit 3f3da0e3312b14a2c9d9967fbb0849eb4398725f
author alshabib <alshabibi.ali@gmail.com> Tue Mar 01 23:23:45 2016 -0800
committer alshabib <alshabibi.ali@gmail.com> Tue Mar 01 23:23:45 2016 -0800
tree c5b33b97c9f93a2624527b7c536976723deabef7
parent 5339b7da0418270534bddec3d198f853b4c997da

add multiple double tagged rules test

olt.py

diff --git a/olt.py b/olt.py
index a94e4ad..0105dab 100644
--- a/olt.py
+++ b/olt.py
@@ -707,6 +707,18 @@
 
     def runTests(self):
         logging.info("Testing multiple Q-in-Q rules")
+
+        self.installDoubleTaggingRules(10, 5, cookie=42, onu = onu_port)
+
+        time.sleep(5)
+
+        self.installDoubleTaggingRules(20, 10, cookie=50, onu = onu_port2)
+
+        time.sleep(5)
+
+        self.testPacketFlow(10, 5, onu=onu_port)
+        self.testPacketFlow(20, 10, onu=onu_port2)
+
         pass
 
 
@@ -725,7 +737,7 @@
         time.sleep(10)
 
         # Test packet flows
-        self.testPacketFlow(c_vlan_id, s_vlan_id)
+        self.testPacketFlow(s_vlan_id, c_vlan_id)
 
         # clean up the test
         delete_all_flows(self.controller)
@@ -745,7 +757,7 @@
                 time.sleep(5)
                 self.installDoubleTaggingRules(stag, ctag)
                 time.sleep(5)
-                self.testPacketFlow(ctag, stag)
+                self.testPacketFlow(stag, ctag)
 
 
 

oltbase.py

diff --git a/oltbase.py b/oltbase.py
index be7f0af..fff3740 100644
--- a/oltbase.py
+++ b/oltbase.py
@@ -73,7 +73,7 @@
         self.controller.message_send(request)
         do_barrier(self.controller)
 
-    def testPacketFlow(self, c_vlan_id, s_vlan_id, onu = None):
+    def testPacketFlow(self, s_vlan_id, c_vlan_id, onu = None):
 
         incorrectTagPkt = simple_udp_packet(pktlen=100, dl_vlan_enable=True, vlan_vid=100, vlan_pcp=1)
         zeroTaggedPkt = simple_udp_packet(pktlen=100, dl_vlan_enable=True, vlan_vid=0, vlan_pcp=0)