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/cxn.py

diff --git a/tests/cxn.py b/tests/cxn.py
index 37c2e52..1a00f1f 100644
--- a/tests/cxn.py
+++ b/tests/cxn.py
@@ -13,9 +13,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
 
 from oftest.testutils import *
 
@@ -90,7 +88,7 @@
         logging.info("TCP Connected " + 
                      str(self.controllers[0].switch_addr))
         logging.info("Sending hello")
-        self.controllers[0].message_send(message.hello())
+        self.controllers[0].message_send(ofp.message.hello())
 
         logging.info("Features request not sent, waiting for timeout")
 
@@ -163,7 +161,7 @@
                     if con.cstate == 0:
                         logging.info(condesc + "Sending hello to " +
                                      str(con.switch_addr))
-                        con.message_send(message.hello())
+                        con.message_send(ofp.message.hello())
                         con.cstate = 1
                         con.count = 0
                     elif con.cstate == 1:
@@ -185,7 +183,7 @@
                     elif con.cstate == 2:
                         logging.info(condesc + "Sending features request to " +
                                      str(con.switch_addr))
-                        con.message_send(message.features_request())
+                        con.message_send(ofp.message.features_request())
                         con.cstate = 3
                         con.count = 0
                     elif con.cstate == 3: