commit 4e361bb5b280268aab5cab94fadfc01e0d94555e
author Rich Lane <rlane@bigswitch.com> Mon Mar 11 13:57:31 2013 -0700
committer Rich Lane <rlane@bigswitch.com> Tue Mar 12 10:45:56 2013 -0700
tree 6356f6026aca8ee507872c449278ab1f3cbb7d50
parent 5fd6faf673cf448933155ad43b9933bf47764e2c

loxi-prep: rename error 'type' field to 'err_type'

tests/basic.py

diff --git a/tests/basic.py b/tests/basic.py
index 82670b4..83291fc 100644
--- a/tests/basic.py
+++ b/tests/basic.py
@@ -394,7 +394,7 @@
         self.assertTrue(reply is not None, "Did not get response to bad req")
         self.assertTrue(reply.header.type == ofp.OFPT_ERROR,
                         "reply not an error message")
-        self.assertTrue(reply.type == ofp.OFPET_BAD_REQUEST,
+        self.assertTrue(reply.err_type == ofp.OFPET_BAD_REQUEST,
                         "reply error type is not bad request")
         self.assertTrue(reply.code == ofp.OFPBRC_BAD_TYPE,
                         "reply error code is not bad type")

tests/detailed_contr_sw_messages.py

diff --git a/tests/detailed_contr_sw_messages.py b/tests/detailed_contr_sw_messages.py
index 8cb8baa..65e7201 100644
--- a/tests/detailed_contr_sw_messages.py
+++ b/tests/detailed_contr_sw_messages.py
@@ -73,7 +73,7 @@
                                                timeout=5)
         self.assertTrue(response is not None, 
                                'Switch did not reply with error message') 
-        self.assertTrue(response.type==ofp.OFPET_FLOW_MOD_FAILED, 
+        self.assertTrue(response.err_type==ofp.OFPET_FLOW_MOD_FAILED, 
                                'Error message type is not flow mod failed ') 
         self.assertTrue(response.code==ofp.OFPFMFC_OVERLAP, 
                                'Error Message code is not overlap')
@@ -194,7 +194,7 @@
                                                timeout=5)
         self.assertTrue(response is not None, 
                                'Switch did not reply with error message') 
-        self.assertTrue(response.type==ofp.OFPET_FLOW_MOD_FAILED, 
+        self.assertTrue(response.err_type==ofp.OFPET_FLOW_MOD_FAILED, 
                                'Error message type is not flow mod failed ') 
         self.assertTrue(response.code==ofp.OFPFMFC_BAD_EMERG_TIMEOUT, 
                                'Error Message code is not bad emergency timeout')

tests/message_types.py

diff --git a/tests/message_types.py b/tests/message_types.py
index 07e3e29..eacaee6 100644
--- a/tests/message_types.py
+++ b/tests/message_types.py
@@ -103,7 +103,7 @@
                                                timeout=5)
         self.assertTrue(response is not None, 
                                'Switch did not reply with error message')
-        self.assertTrue(response.type==ofp.OFPET_BAD_REQUEST, 
+        self.assertTrue(response.err_type==ofp.OFPET_BAD_REQUEST, 
                                'Message field type is not OFPET_BAD_REQUEST') 
         self.assertTrue(response.code==ofp.OFPBRC_BAD_VERSION,
                         'Message field code is not OFPBRC_BAD_VERSION')