separated arguments out of shell.py

ravchandra · ravchandra · commit 58248f4d0447 · 2017-11-02T11:47:01.000+01:00
diff --git a/arguments.py b/arguments.py
@@ -0,0 +1,25 @@
+import argparse
+import sys
+
+parser = argparse.ArgumentParser(description="Noninteractive and Interactive \
+        command execution. Must provide all the details in cmd_list \
+		in remote_commands.py for interactive commands.")
+
+parser.add_argument("command", help="provide command. If interactive, \
+should be one of commands in remote_commands.py or all which would \
+execute every command in remote_commands.py one after another. e.g.\n \
+python shell.py testshell1 127.0.0.1 root password \n \
+python shell.py all 127.0.0.1 root password")
+
+parser.add_argument("host", help="provide host name", nargs="?",
+        default="localhost")
+parser.add_argument("username", help="provide user name", nargs="?",
+        default="root")
+parser.add_argument("password", help="provide password", nargs="?",
+        default="netsim")
+
+if len(sys.argv) < 2:
+    parser.print_help()
+    sys.exit(1)
+
+args = parser.parse_args()
diff --git a/shell.py b/shell.py
@@ -1,37 +1,15 @@
-import argparse
 import pexpect
 import subprocess
-import sys
 from pexpect import pxssh
 
 from log import logger
 from remote_commands import cmd_list
 
-parser = argparse.ArgumentParser(description="Noninteractive and Interactive \
-        command execution. Must provide all the details in cmd_list \
-		in remote_commands.py for interactive commands.")
+import arguments
 
-parser.add_argument("command", help="provide command. If interactive, \
-should be one of commands in remote_commands.py or all which would \
-execute every command in remote_commands.py one after another. e.g.\n \
-python shell.py testshell1 127.0.0.1 root password \n \
-python shell.py all 127.0.0.1 root password")
-
-parser.add_argument("host", help="provide host name", nargs="?",
-        default="localhost")
-parser.add_argument("username", help="provide user name", nargs="?",
-        default="root")
-parser.add_argument("password", help="provide password", nargs="?",
-        default="netsim")
-#parser.add_argument("cmd_type", nargs='?',
-#        help="provide i for interactive, n for non-interactive", default="n")
-
-if len(sys.argv) < 2:
-    parser.print_help()
-    sys.exit(1)
-
-args = parser.parse_args()
+args = arguments.args
 
+# Setting command type to interactive if given command is found in cmd_list
 interactive = False
 icmd = None
 for i in cmd_list:
@@ -56,7 +34,7 @@ def remote(self):
             password = self.password
             s.login(hostname, username, password)
             if not interactive and args.command != "all":
-                self.exec_remote_normal(s=s)
+                self.exec_remote_noninteractive(s=s)
             elif args.command != "all":
                 self.exec_remote(s=s)
             else:
@@ -95,7 +73,7 @@ def exec_remote_all(self, s):
                 logger.info(s.before)
                 logger.info(s.after)
 
-    def exec_remote_normal(self,s):
+    def exec_remote_noninteractive(self,s):
         logger.info("remote non-interactive")
         cur_cmd = self.command
         logger.info("Executing COMMAND {0}".format(cur_cmd) +
