commit 28fa927a64e367d2fa0c8d2f300e2f7963d98127
author Rich Lane <rlane@bigswitch.com> Fri Mar 08 16:00:25 2013 -0800
committer Rich Lane <rlane@bigswitch.com> Tue Mar 12 10:45:50 2013 -0700
tree c7799042196181bf14fbee14bbffcfa62a8fa1f2
parent d7b0ffabfde4d7b10fc34d91b79b9fd9638c8760

loxi-prep: access message/action modules through the ofp module

tests/flow_expire.py

diff --git a/tests/flow_expire.py b/tests/flow_expire.py
index 6b497cc..f5b0773 100644
--- a/tests/flow_expire.py
+++ b/tests/flow_expire.py
@@ -12,9 +12,7 @@
 from oftest import config
 import oftest.controller as controller
 import ofp
-import oftest.message as message
 import oftest.dataplane as dataplane
-import oftest.action as action
 import oftest.parse as parse
 import oftest.base_tests as base_tests
 
@@ -44,7 +42,7 @@
         match.wildcards &= ~ofp.OFPFW_IN_PORT
         self.assertTrue(match is not None, 
                         "Could not generate flow match from pkt")
-        act = action.action_output()
+        act = ofp.action.action_output()
 
         of_ports = config["port_map"].keys()
         of_ports.sort()
@@ -57,7 +55,7 @@
         
         match.in_port = ingress_port
         
-        request = message.flow_mod()
+        request = ofp.message.flow_mod()
         request.match = match
         request.cookie = random.randint(0,9007199254740992)
         request.buffer_id = 0xffffffff