[Neo-report] r1939 gregory - in /trunk: neo/neoctl/app.py neo/neoctl/neoctl.py neoctl
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Mar 16 17:07:11 CET 2010
Author: gregory
Date: Tue Mar 16 17:07:10 2010
New Revision: 1939
Log:
Fix informations displayed by neoctl tool.
Modified:
trunk/neo/neoctl/app.py
trunk/neo/neoctl/neoctl.py
trunk/neoctl
Modified: trunk/neo/neoctl/app.py
==============================================================================
--- trunk/neo/neoctl/app.py [iso-8859-1] (original)
+++ trunk/neo/neoctl/app.py [iso-8859-1] Tue Mar 16 17:07:10 2010
@@ -61,6 +61,8 @@
for (offset, cell_list) in row_list)
def formatNodeList(self, node_list):
+ if not node_list:
+ return 'Empty list!'
result = []
for node_type, address, uuid, state in node_list:
if address is None:
@@ -89,9 +91,8 @@
max_offset = int(max_offset)
if node is not None:
node = self.asNode(node)
- ptid, row_list = self.neoctl.getPartitionRowList(min_offset=min_offset,
- max_offset=max_offset,
- node=node)
+ ptid, row_list = self.neoctl.getPartitionRowList(
+ min_offset=min_offset, max_offset=max_offset, node=node)
# TODO: return ptid
return self.formatRowList(row_list)
@@ -132,7 +133,7 @@
update_partition_table = not(not(int(params[2])))
else:
update_partition_table = False
- self.neoctl.setNodeState(node, state,
+ return self.neoctl.setNodeState(node, state,
update_partition_table=update_partition_table)
def setClusterState(self, params):
@@ -142,7 +143,7 @@
state: state to put the cluster in
"""
assert len(params) == 1
- self.neoctl.setClusterState(self.asClusterState(params[0]))
+ return self.neoctl.setClusterState(self.asClusterState(params[0]))
def startCluster(self, params):
"""
@@ -166,7 +167,7 @@
uuid_list = [node[2] for node in node_list]
else:
uuid_list = [self.asNode(x) for x in params]
- self.neoctl.enableStorageList(uuid_list)
+ return self.neoctl.enableStorageList(uuid_list)
def dropNode(self, params):
"""
@@ -177,7 +178,7 @@
set node state (node) DOWN
"""
assert len(params) == 1
- self.neoctl.dropNode(self.asNode(params[0]))
+ return self.neoctl.dropNode(self.asNode(params[0]))
def getPrimary(self, params):
"""
@@ -206,20 +207,15 @@
isinstance(current_action, dict):
current_action = current_action.get(args[level])
level += 1
+ action = None
if isinstance(current_action, basestring):
action = getattr(self.neoctl, current_action, None)
- else:
- action = None
if action is None:
- result = self.usage('unknown command')
- if result is None:
- result = 'Ok'
- else:
- try:
- result = action(args[level:])
- except NotReadyException, message:
- result = message
- return result
+ return self.usage('unknown command')
+ try:
+ return action(args[level:])
+ except NotReadyException, message:
+ return 'ERROR: %s' % (message, )
def _usage(self, action_dict, level=0):
result = []
Modified: trunk/neo/neoctl/neoctl.py
==============================================================================
--- trunk/neo/neoctl/neoctl.py [iso-8859-1] (original)
+++ trunk/neo/neoctl/neoctl.py [iso-8859-1] Tue Mar 16 17:07:10 2010
@@ -72,6 +72,7 @@
response = self.__ask(packet)
assert response[0] == Packets.Error
assert response[1] == ErrorCodes.ACK
+ return response[2]
def setClusterState(self, state):
"""
@@ -81,7 +82,7 @@
response = self.__ask(packet)
assert response[0] == Packets.Error
assert response[1] == ErrorCodes.ACK
- return response[1]
+ return response[2]
def setNodeState(self, node, state, update_partition_table=False):
"""
@@ -95,7 +96,7 @@
response = self.__ask(packet)
assert response[0] == Packets.Error
assert response[1] == ErrorCodes.ACK
- return response[1]
+ return response[2]
def getClusterState(self):
"""
@@ -113,7 +114,7 @@
packet = Packets.AskNodeList(node_type)
response = self.__ask(packet)
assert response[0] == Packets.AnswerNodeList
- return response[1]
+ return response[1] # node_list
def getPartitionRowList(self, min_offset=0, max_offset=0, node=None):
"""
@@ -123,7 +124,7 @@
packet = Packets.AskPartitionList(min_offset, max_offset, node)
response = self.__ask(packet)
assert response[0] == Packets.AnswerPartitionList
- return (response[1], response[2])
+ return response[1:3] # ptid, row_list
def startCluster(self):
"""
Modified: trunk/neoctl
==============================================================================
--- trunk/neoctl [iso-8859-1] (original)
+++ trunk/neoctl [iso-8859-1] Tue Mar 16 17:07:10 2010
@@ -40,10 +40,6 @@
setupLog('NEOCTL', options.verbose)
from neo.neoctl.app import Application
-app = Application(address, port, handler)
-result = app.execute(args)
-if result is None:
- print "failure"
- sys.exit(1)
-print result
+print Application(address, port, handler).execute(args)
+
More information about the Neo-report
mailing list