[Neo-report] r2129 gregory - /trunk/neomigrate

[nobody at svn.erp5.org]

Author: gregory
Date: Fri Jun  4 15:44:54 2010
New Revision: 2129

Log:
Unify command line interface of neomigrate script.

- Remove connector option (not available in master, storage or admin)
- Use '-c' to specify the cluster name

Modified:
    trunk/neomigrate

Modified: trunk/neomigrate
==============================================================================
--- trunk/neomigrate [iso-8859-1] (original)
+++ trunk/neomigrate [iso-8859-1] Fri Jun  4 15:44:54 2010
@@ -31,15 +31,13 @@
                   help = 'print verbose messages')
 parser.add_option('-s', '--source', help = 'the source database')
 parser.add_option('-d', '--destination', help = 'the destination database')
-parser.add_option('-c', '--connector', help = 'the NEO connector')
-parser.add_option('-n', '--name', help = 'the NEO cluster name')
+parser.add_option('-c', '--cluster', help = 'the NEO cluster name')
 
 # parse options
 (options, args) = parser.parse_args()
 source = options.source or None
 destination = options.destination or None
-name = options.name or None
-connector = options.connector or 'SocketConnector'
+cluster = options.cluster or None
 
 # check options
 if source is None or destination is None:
@@ -54,12 +52,11 @@
 from ZODB.FileStorage import FileStorage
 #from ZEO.ClientStorage import ClientStorage as ZEOStorage
 from neo.client.Storage import Storage as NEOStorage
-neo_args = { 'connector': connector, 'name': name, }
 if os.path.exists(source):
     src = FileStorage(file_name=source)
-    dst = NEOStorage(master_nodes=destination, **neo_args)
+    dst = NEOStorage(master_nodes=destination, name=cluster)
 else:
-    src = NEOStorage(master_nodes=source, **neo_args)
+    src = NEOStorage(master_nodes=source, name=cluster)
     dst = FileStorage(file_name=destination)
 
 # do the job