Fix misspelled BrokenNodeDisallowedError name.

git-svn-id: https://svn.erp5.org/repos/neo/branches/prototype3@512 71dcc9de-d417-0410-9af5-da40c76e7ee4

neo/handler.py

@@ -19,7 +19,7 @@ import logging
 
 from neo import protocol
 from neo.protocol import Packet, PacketMalformedError, UnexpectedPacketError, \
-        BrokenNotDisallowedError, NotReadyError, ProtocolError
+        BrokenNodeDisallowedError, NotReadyError, ProtocolError
 from neo.connection import ServerConnection
 
 from protocol import ERROR, REQUEST_NODE_IDENTIFICATION, ACCEPT_NODE_IDENTIFICATION, \
@@ -190,7 +190,7 @@ class EventHandler(object):
             self.unexpectedPacket(conn, packet, msg)
         except PacketMalformedError, msg:
             self.packetMalformed(conn, packet, msg)
-        except BrokenNotDisallowedError, msg:
+        except BrokenNodeDisallowedError, msg:
             self.brokenNodeDisallowedError(conn, packet, msg)
         except NotReadyError, msg:
             self.notReadyError(conn, packet, msg)

neo/master/election.py

@@ -190,7 +190,7 @@ class ElectionEventHandler(MasterEventHandler):
             # If this node is broken, reject it.
             if node.getUUID() == uuid:
                 if node.getState() == BROKEN_STATE:
-                    raise protocol.BrokenNotDisallowedError
+                    raise protocol.BrokenNodeDisallowedError
 
         # supplied another uuid in case of conflict
         while not app.isValidUUID(uuid, addr):

neo/master/recovery.py

@@ -149,7 +149,7 @@ class RecoveryEventHandler(MasterEventHandler):
                 # If this node is broken, reject it. Otherwise, assume that it is
                 # working again.
                 if node.getState() == BROKEN_STATE:
-                    raise protocol.BrokenNotDisallowedError
+                    raise protocol.BrokenNodeDisallowedError
                 node.setUUID(uuid)
                 node.setState(RUNNING_STATE)
                 app.broadcastNodeInformation(node)

neo/master/service.py

@@ -253,7 +253,7 @@ class ServiceEventHandler(MasterEventHandler):
                 # If this node is broken, reject it. Otherwise, assume that
                 # it is working again.
                 if node.getState() == BROKEN_STATE:
-                    raise protocol.BrokenNotDisallowedError
+                    raise protocol.BrokenNodeDisallowedError
                 node.setUUID(uuid)
                 node.setState(RUNNING_STATE)
                 logging.debug('broadcasting node information')

neo/master/tests/testMasterElectionHandler.py

@@ -146,9 +146,9 @@ server: 127.0.0.1:10023
         """ Check is the identification_required decorator is applied """
         self.checkUnexpectedPacketRaised(method, *args, **kwargs)
 
-    def checkBrokenNotDisallowedErrorRaised(self, method, *args, **kwargs):
-        """ Check if the BrokenNotDisallowedError exception wxas raised """
-        self.assertRaises(protocol.BrokenNotDisallowedError, method, *args, **kwargs)
+    def checkBrokenNodeDisallowedErrorRaised(self, method, *args, **kwargs):
+        """ Check if the BrokenNodeDisallowedError exception wxas raised """
+        self.assertRaises(protocol.BrokenNodeDisallowedError, method, *args, **kwargs)
 
     def checkNotReadyErrorRaised(self, method, *args, **kwargs):
         """ Check if the NotReadyError exception wxas raised """
@@ -591,7 +591,7 @@ server: 127.0.0.1:10023
         self.assertEqual(node.getState(), RUNNING_STATE)
         node.setState(BROKEN_STATE)
         self.assertEqual(node.getState(), BROKEN_STATE)
-        self.checkBrokenNotDisallowedErrorRaised(
+        self.checkBrokenNodeDisallowedErrorRaised(
                 election.handleRequestNodeIdentification,
                 conn,
                 packet=packet,

neo/master/tests/testMasterRecoveryHandler.py

@@ -156,9 +156,9 @@ server: 127.0.0.1:10023
         """ Check is the identification_required decorator is applied """
         self.checkUnexpectedPacketRaised(method, *args, **kwargs)
 
-    def checkBrokenNotDisallowedErrorRaised(self, method, *args, **kwargs):
-        """ Check if the BrokenNotDisallowedError exception wxas raised """
-        self.assertRaises(protocol.BrokenNotDisallowedError, method, *args, **kwargs)
+    def checkBrokenNodeDisallowedErrorRaised(self, method, *args, **kwargs):
+        """ Check if the BrokenNodeDisallowedError exception wxas raised """
+        self.assertRaises(protocol.BrokenNodeDisallowedError, method, *args, **kwargs)
 
     def checkNotReadyErrorRaised(self, method, *args, **kwargs):
         """ Check if the NotReadyError exception wxas raised """
@@ -460,7 +460,7 @@ server: 127.0.0.1:10023
         self.assertEqual(node.getState(), BROKEN_STATE)
         self.assertEqual(node.getUUID(), uuid)
         self.assertEqual(len(self.app.nm.getMasterNodeList()), 2)
-        self.checkBrokenNotDisallowedErrorRaised(
+        self.checkBrokenNodeDisallowedErrorRaised(
                 recovery.handleRequestNodeIdentification,
                 conn,
                 packet=packet,

neo/master/tests/testMasterService.py

@@ -128,9 +128,9 @@ server: 127.0.0.1:10023
         """ Check is the identification_required decorator is applied """
         self.checkUnexpectedPacketRaised(method, *args, **kwargs)
 
-    def checkBrokenNotDisallowedErrorRaised(self, method, *args, **kwargs):
-        """ Check if the BrokenNotDisallowedError exception wxas raised """
-        self.assertRaises(protocol.BrokenNotDisallowedError, method, *args, **kwargs)
+    def checkBrokenNodeDisallowedErrorRaised(self, method, *args, **kwargs):
+        """ Check if the BrokenNodeDisallowedError exception wxas raised """
+        self.assertRaises(protocol.BrokenNodeDisallowedError, method, *args, **kwargs)
 
     # Method to test the kind of packet returned in answer
     def checkCalledAbort(self, conn, packet_number=0):
@@ -377,7 +377,7 @@ server: 127.0.0.1:10023
         sn.setState(BROKEN_STATE)
         self.assertEquals(sn.getState(), BROKEN_STATE)
         
-        self.checkBrokenNotDisallowedErrorRaised(
+        self.checkBrokenNodeDisallowedErrorRaised(
                 service.handleRequestNodeIdentification,
                 conn,
                 packet=packet,

neo/master/tests/testMasterVerificationHandler.py

@@ -135,9 +135,9 @@ server: 127.0.0.1:10023
         """ Check is the identification_required decorator is applied """
         self.checkUnexpectedPacketRaised(method, *args, **kwargs)
 
-    def checkBrokenNotDisallowedErrorRaised(self, method, *args, **kwargs):
-        """ Check if the BrokenNotDisallowedError exception wxas raised """
-        self.assertRaises(protocol.BrokenNotDisallowedError, method, *args, **kwargs)
+    def checkBrokenNodeDisallowedErrorRaised(self, method, *args, **kwargs):
+        """ Check if the BrokenNodeDisallowedError exception wxas raised """
+        self.assertRaises(protocol.BrokenNodeDisallowedError, method, *args, **kwargs)
 
     def checkNotReadyErrorRaised(self, method, *args, **kwargs):
         """ Check if the NotReadyError exception wxas raised """
@@ -482,7 +482,7 @@ server: 127.0.0.1:10023
         self.assertEqual(node.getState(), BROKEN_STATE)
         self.assertEqual(node.getUUID(), uuid)
         self.assertEqual(len(self.app.nm.getMasterNodeList()), 2)
-        self.checkBrokenNotDisallowedErrorRaised(
+        self.checkBrokenNodeDisallowedErrorRaised(
                 verification.handleRequestNodeIdentification,
                 conn,
                 packet=packet,

neo/master/verification.py

@@ -173,7 +173,7 @@ class VerificationEventHandler(MasterEventHandler):
                 # If this node is broken, reject it. Otherwise, assume that it is
                 # working again.
                 if node.getState() == BROKEN_STATE:
-                    raise protocol.BrokenNotDisallowedError
+                    raise protocol.BrokenNodeDisallowedError
                 node.setUUID(uuid)
                 node.setState(RUNNING_STATE)
                 app.broadcastNodeInformation(node)

neo/protocol.py

@@ -334,7 +334,7 @@ class NotReadyError(ProtocolError):
     """ Just close the connection """
     pass
 
-class BrokenNotDisallowedError(ProtocolError): 
+class BrokenNodeDisallowedError(ProtocolError): 
     """ Just close the connection """
     pass 
 

neo/storage/bootstrap.py

@@ -129,7 +129,7 @@ class BootstrapEventHandler(StorageEventHandler):
             # If this node is broken, reject it.
             if node.getUUID() == uuid:
                 if node.getState() == BROKEN_STATE:
-                    raise protocol.BrokenNotDisallowedError
+                    raise protocol.BrokenNodeDisallowedError
 
         # Trust the UUID sent by the peer.
         node.setUUID(uuid)

neo/storage/operation.py

@@ -157,7 +157,7 @@ class OperationEventHandler(StorageEventHandler):
             # If this node is broken, reject it.
             if node.getUUID() == uuid:
                 if node.getState() == BROKEN_STATE:
-                    raise protocol.BrokenNotDisallowedError
+                    raise protocol.BrokenNodeDisallowedError
 
         # Trust the UUID sent by the peer.
         node.setUUID(uuid)

neo/storage/tests/testStorageBootstrapHandler.py

@@ -118,9 +118,9 @@ server: 127.0.0.1:10020
         """ Check is the identification_required decorator is applied """
         self.checkUnexpectedPacketRaised(method, *args, **kwargs)
 
-    def checkBrokenNotDisallowedErrorRaised(self, method, *args, **kwargs):
-        """ Check if the BrokenNotDisallowedError exception wxas raised """
-        self.assertRaises(protocol.BrokenNotDisallowedError, method, *args, **kwargs)
+    def checkBrokenNodeDisallowedErrorRaised(self, method, *args, **kwargs):
+        """ Check if the BrokenNodeDisallowedError exception wxas raised """
+        self.assertRaises(protocol.BrokenNodeDisallowedError, method, *args, **kwargs)
 
     def checkNotReadyErrorRaised(self, method, *args, **kwargs):
         """ Check if the NotReadyError exception wxas raised """
@@ -375,7 +375,7 @@ server: 127.0.0.1:10020
         uuid=self.getNewUUID()
         master.setState(BROKEN_STATE)
         master.setUUID(uuid)
-        self.checkBrokenNotDisallowedErrorRaised(
+        self.checkBrokenNodeDisallowedErrorRaised(
             self.bootstrap.handleRequestNodeIdentification,
             conn=conn,
             uuid=uuid,

neo/storage/tests/testStorageOperation.py

@@ -63,9 +63,9 @@ class StorageOperationTests(unittest.TestCase):
         """ Check is the identification_required decorator is applied """
         self.checkUnexpectedPacketRaised(method, *args, **kwargs)
 
-    def checkBrokenNotDisallowedErrorRaised(self, method, *args, **kwargs):
-        """ Check if the BrokenNotDisallowedError exception wxas raised """
-        self.assertRaises(protocol.BrokenNotDisallowedError, method, *args, **kwargs)
+    def checkBrokenNodeDisallowedErrorRaised(self, method, *args, **kwargs):
+        """ Check if the BrokenNodeDisallowedError exception wxas raised """
+        self.assertRaises(protocol.BrokenNodeDisallowedError, method, *args, **kwargs)
 
     def checkNotReadyErrorRaised(self, method, *args, **kwargs):
         """ Check if the NotReadyError exception wxas raised """
@@ -386,7 +386,7 @@ server: 127.0.0.1:10020
             "getAddress" : ("127.0.0.1", self.master_port),
         })
         count = len(self.app.nm.getNodeList())
-        self.checkBrokenNotDisallowedErrorRaised(
+        self.checkBrokenNodeDisallowedErrorRaised(
             self.operation.handleRequestNodeIdentification,
             conn=conn,
             packet=packet, 

neo/storage/tests/testStorageVerificationHandler.py

@@ -139,9 +139,9 @@ server: 127.0.0.1:10020
         """ Check is the identification_required decorator is applied """
         self.checkUnexpectedPacketRaised(method, *args, **kwargs)
 
-    def checkBrokenNotDisallowedErrorRaised(self, method, *args, **kwargs):
-        """ Check if the BrokenNotDisallowedError exception wxas raised """
-        self.assertRaises(protocol.BrokenNotDisallowedError, method, *args, **kwargs)
+    def checkBrokenNodeDisallowedErrorRaised(self, method, *args, **kwargs):
+        """ Check if the BrokenNodeDisallowedError exception wxas raised """
+        self.assertRaises(protocol.BrokenNodeDisallowedError, method, *args, **kwargs)
 
     def checkNotReadyErrorRaised(self, method, *args, **kwargs):
         """ Check if the NotReadyError exception wxas raised """
@@ -291,7 +291,7 @@ server: 127.0.0.1:10020
         node = self.app.nm.getNodeByServer(conn.getAddress())
         node.setState(BROKEN_STATE)
         self.assertEqual(node.getUUID(), uuid)
-        self.checkBrokenNotDisallowedErrorRaised(
+        self.checkBrokenNodeDisallowedErrorRaised(
             self.verification.handleRequestNodeIdentification,
             conn, p, MASTER_NODE_TYPE,
             uuid, "127.0.0.1", self.master_port, "main")

neo/storage/verification.py

@@ -83,7 +83,7 @@ class VerificationEventHandler(StorageEventHandler):
             # If this node is broken, reject it.
             if node.getUUID() == uuid:
                 if node.getState() == BROKEN_STATE:
-                    raise protocol.BrokenNotDisallowedError
+                    raise protocol.BrokenNodeDisallowedError
 
         # Trust the UUID sent by the peer.
         node.setUUID(uuid)