removing extraneous references to self
diff --git a/olt.py b/olt.py
index 3bed782..8c89699 100644
--- a/olt.py
+++ b/olt.py
@@ -855,7 +855,7 @@
# push inner vlan (c-vlan) for upstream
request = ofp.message.flow_add(
table_id=test_param_get("table", 0),
- cookie=self.cookie,
+ cookie=cookie,
match=match,
instructions=[
ofp.instruction.apply_actions(
@@ -866,8 +866,8 @@
priority=1000)
controller.message_send(request)
- do_barrier(self.controller)
- verify_no_errors(self.controller)
+ do_barrier(controller)
+ verify_no_errors(controller)
# push outer vlan (s-vlan) for upstream
match = ofp.match()
@@ -878,7 +878,7 @@
request = ofp.message.flow_add(
table_id=test_param_get("table", 1),
- cookie=self.cookie,
+ cookie=cookie,
match=match,
instructions=[
ofp.instruction.apply_actions(
@@ -892,8 +892,8 @@
priority=1000)
controller.message_send(request)
- do_barrier(self.controller)
- verify_no_errors(self.controller)
+ do_barrier(controller)
+ verify_no_errors(controller)
cookie += 1
# strip outer vlan (s-vlan) for downstream
@@ -903,7 +903,7 @@
match.oxm_list.append(ofp.oxm.vlan_pcp(0))
request = ofp.message.flow_add(
table_id=test_param_get("table", 0),
- cookie=self.cookie,
+ cookie=cookie,
match=match,
instructions=[
ofp.instruction.apply_actions(
@@ -913,8 +913,8 @@
priority=1000)
controller.message_send(request)
- do_barrier(self.controller)
- verify_no_errors(self.controller)
+ do_barrier(controller)
+ verify_no_errors(controller)
# rewrite inner vlan (c-vlan) to default (0) for downstream
match = ofp.match()
@@ -925,7 +925,7 @@
request = ofp.message.flow_add(
table_id=test_param_get("table", 1),
- cookie=self.cookie,
+ cookie=cookie,
match=match,
instructions=[
ofp.instruction.apply_actions(
@@ -937,8 +937,8 @@
priority=1000)
controller.message_send(request)
- do_barrier(self.controller)
- verify_no_errors(self.controller)
+ do_barrier(controller)
+ verify_no_errors(controller)