commit 68883836c220cd67d226e1d3ce2c27d1a33fd786
author Zsolt Haraszti <zharaszt@ciena.com> Wed Mar 02 05:45:11 2016 +0000
committer Zsolt Haraszti <zharaszt@ciena.com> Wed Mar 02 05:46:32 2016 +0000
tree 2f00837b28319fbe0f944b2ef9d186cf57dc23fd
parent e165af2d984971fb301bb8a16a16217a4775a6e1

Fix some of the refactoring/merge bugs

Change-Id: Icb8180dbf04800282b019d3b3d11684007a89d2e

olt.py

diff --git a/olt.py b/olt.py
index cc55ba9..67f1044 100644
--- a/olt.py
+++ b/olt.py
@@ -926,27 +926,27 @@
     logging.info("Testing s-tag %d, c-tag %d" % (s_vlan_id, c_vlan_id))
 
     # test upstream untagged packet got double tag at OLT
-    self.dataplane.send(onu_port, str(zeroTaggedPkt))
-    verify_packet(self, upstreamDoubleTaggedPkt, olt_port)
+    test.dataplane.send(onu_port, str(zeroTaggedPkt))
+    verify_packet(test, upstreamDoubleTaggedPkt, olt_port)
 
     # test downstream doubletagged packet got untagged at ONU
-    self.dataplane.send(olt_port, str(upstreamDoubleTaggedPkt))
+    test.dataplane.send(olt_port, str(upstreamDoubleTaggedPkt))
     if device_type == "pmc":
-        verify_packet(self, zeroTaggedPkt, onu_port)
+        verify_packet(test, zeroTaggedPkt, onu_port)
     else:
-        verify_packet(self, untaggedPkt, onu_port)
+        verify_packet(test, untaggedPkt, onu_port)
 
     # test upstream doubletagged packet got dropped
-    self.dataplane.send(onu_port, str(upstreamDoubleTaggedPkt))
-    verify_no_packet(self, upstreamDoubleTaggedPkt, olt_port)
+    test.dataplane.send(onu_port, str(upstreamDoubleTaggedPkt))
+    verify_no_packet(test, upstreamDoubleTaggedPkt, olt_port)
 
     # test downstream untagged packet got dropped at ONU
-    self.dataplane.send(olt_port, str(untaggedPkt))
-    verify_no_packet(self, untaggedPkt, onu_port)
+    test.dataplane.send(olt_port, str(untaggedPkt))
+    verify_no_packet(test, untaggedPkt, onu_port)
 
     # test upstream icorrectly tagged packet; should get dropped
-    self.dataplane.send(onu_port, str(incorrectTagPkt))
-    verify_no_packet(self, upstreamDoubleTaggedPkt, olt_port)
+    test.dataplane.send(onu_port, str(incorrectTagPkt))
+    verify_no_packet(test, upstreamDoubleTaggedPkt, olt_port)
 
 
 def installDoubleTaggingRules(s_vlan_id, c_vlan_id, controller, cookie=42):
@@ -975,7 +975,7 @@
         cookie=cookie,
         match=match,
         instructions=[
-            ofp.instruction.apply_actions(actions=action),
+            ofp.instruction.apply_actions(actions=actions),
             ofp.instruction.goto_table(1)],
         buffer_id=ofp.OFP_NO_BUFFER,
         priority=1000)