aboutsummaryrefslogtreecommitdiffstats
path: root/DominoServer.py
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2017-08-18 16:20:33 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2017-09-02 14:32:49 +0200
commitb5ac0a412e1958cdff581d14b818bf042293267f (patch)
tree6b261838744963cceb60235bef39bf35cc8e86c0 /DominoServer.py
parent21f973902ee4428462564d27719f366b41ce04c5 (diff)
Add domino package
It's required by Functest to ease integrating all OPNFV projects and their requirements. It also synchronizes requirements with stable/ocata and renames domino-cli to domino_cli to conform with common module names. It defines scripts and console_scripts to rely on $PATH. run_multimode.sh is adapted to correctly call client, cli and server. It should be noted that run.sh can raise conflicts if it's already provided by another OPNFV package and that run_on_remote_nodes.sh is not fully updated. Otherwise it obliges all OPNFV installers to be updated as well. run.sh is unchanged and it's called by releng from local directory. It may rise runtime issues if several files are not loaded via pkg_resources. Change-Id: Ibd9dd56f316609180aa432c6b7ee5a375d9af674 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'DominoServer.py')
-rwxr-xr-xDominoServer.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/DominoServer.py b/DominoServer.py
index 8716799..dc4a9b9 100755
--- a/DominoServer.py
+++ b/DominoServer.py
@@ -464,15 +464,15 @@ class DominoServer:
logging.debug('RPC Timeout for message type: PUSH')
# TBD: handle each RPC timeout separately
-def main(argv):
+def main():
server = DominoServer()
loglevel = LOGLEVEL
#process input arguments
try:
- opts, args = getopt.getopt(argv,"hc:l:",["conf=","log="])
+ opts, args = getopt.getopt(sys.argv[1:],"hc:l:",["conf=","log="])
except getopt.GetoptError:
- print 'DominoServer.py -c/--conf <configfile> -l/--log <loglevel>'
- sys.exit(2)
+ print 'DominoServer.py -c/--conf <configfile> -l/--log <loglevel>'
+ sys.exit(2)
for opt, arg in opts:
if opt == '-h':
print 'DominoServer.py -c/--conf <configfile> -l/--log <loglevel>'
@@ -527,4 +527,4 @@ def main(argv):
print 'done.'
if __name__ == "__main__":
- main(sys.argv[1:])
+ sys.exit(main())