Auto Generated INFO.yaml file

[domino.git] / DominoClient.py

diff --git a/DominoClient.py b/DominoClient.py
index d02027b..b417186 100755 (executable)
--- a/DominoClient.py
+++ b/DominoClient.py
@@ -17,8 +17,6 @@ import getopt, socket
 import logging, errno
 import uuid
 
-#sys.path.append('gen-py')
-#sys.path.insert(0, glob.glob('./lib/py/build/lib.*')[0])
 sys.path.insert(0, glob.glob('./lib')[0])
 
 from dominoRPC import Communication
@@ -129,7 +127,7 @@ class CLIHandler:
     self.CLIservice = CLIservice
 
   def d_CLI(self, msg):
-    logging.info('Received CLI %s', msg.CLI_input)
+    #logging.info('Received CLI %s', msg.CLI_input) #breaks testing due to random TUIDs
 
     CLIrespmsg = CLIResponse()
     CLIrespmsg.CLI_response = self.CLIservice.process_input(msg.CLI_input)
@@ -440,13 +438,13 @@ class DominoClient:
     elif RPCmessage.messageType == QUERY:
       logging.debug('RPC Timeout for message type: QUERY') 
 
-def main(argv):
+def main():
   client = DominoClient()
   loglevel = LOGLEVEL
   interactive = INTERACTIVE
   #process input arguments
   try:
-      opts, args = getopt.getopt(argv,"hc:p:i:l:",["conf=","port=","ipaddr=","log=","iac=","cliport=","uuid=","regmod="])
+      opts, args = getopt.getopt(sys.argv[1:],"hc:p:i:l:",["conf=","port=","ipaddr=","log=","iac=","cliport=","uuid=","regmod="])
   except getopt.GetoptError:
       print 'DominoClient.py -c/--conf <configfile> -p/--port <socketport> -i/--ipaddr <IPaddr> -l/--log <loglevel> --iac=true/false --cliport <cliport>'
       sys.exit(2)
@@ -488,5 +486,4 @@ def main(argv):
   client.start_communicationService()
 
 if __name__ == "__main__":
-   main(sys.argv[1:])
-
+  sys.exit(main())