From fe7d30b762357ac4ec1fe2b173320d463267ac82 Mon Sep 17 00:00:00 2001
From: Kenny Woodson <kwoodson@redhat.com>
Date: Wed, 4 Feb 2015 12:06:41 -0500
Subject: Renamed ossh.py and added bash completion function

---
 bin/ossh | 235 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 235 insertions(+)
 create mode 100755 bin/ossh

(limited to 'bin/ossh')

diff --git a/bin/ossh b/bin/ossh
new file mode 100755
index 000000000..2fa4bde37
--- /dev/null
+++ b/bin/ossh
@@ -0,0 +1,235 @@
+#!/usr/bin/env python
+
+import pdb
+import argparse
+import ansibleutil
+import traceback
+import sys
+import os
+import re
+
+
+# use dynamic inventory
+# list instances
+# symlinked to ~/bin
+# list instances that match pattern
+# python!
+
+# list environment stuff as well
+# 3 states:
+#  - an exact match; return result
+#  - a partial match; return all regex results
+#  - no match; None
+
+class Ossh(object):
+    def __init__(self):
+        self.file_path = os.path.join(os.path.dirname(os.path.realpath(__file__)))
+        self.parse_cli_args()
+
+        if self.args.host == '' and not self.args.list:
+            self.parser.print_help()
+            return
+
+        self.ansible = ansibleutil.AnsibleUtil()
+
+        self.host_inventory = self.get_hosts()
+
+
+        if self.args.debug:
+            print self.args
+
+        # get a dict of host inventory
+        self.get_hosts()
+
+        # parse host and user
+        self.process_host()
+
+        # perform the SSH
+        if self.args.list:
+            self.list_hosts()
+        else:
+            self.ssh()
+
+    def parse_cli_args(self):
+        parser = argparse.ArgumentParser(description='Openshift Online SSH Tool.')
+        parser.add_argument('-r', '--random', action="store",
+                          help="Choose a random host")
+        parser.add_argument('-e', '--env', action="store",
+                          help="Which environment to search for the host ")
+        parser.add_argument('-d', '--debug', default=False,
+                          action="store_true", help="debug mode")
+        parser.add_argument('-v', '--verbose', default=False,
+                          action="store_true", help="Verbose?")
+        parser.add_argument('--list', default=False,
+                          action="store_true", help="list out hosts")
+        parser.add_argument('-c', '--command', action='store',
+                            help='Command to run on remote host')
+        parser.add_argument('-l', '--login_name', action='store',
+                            help='User in which to ssh as')
+
+        parser.add_argument('-o', '--ssh_opts', action='store',
+                            help='options to pass to SSH.\n \
+                                  "-o ForwardX11 yes"')
+        parser.add_argument('host', nargs='?', default='')
+
+        self.args = parser.parse_args()
+        self.parser = parser
+
+
+    def process_host(self):
+        '''Determine host name and user name for SSH.
+        '''
+        self.env = None
+
+        re_env = re.compile('\.(int|stg|prod|ops)')
+        search = re_env.search(self.args.host)
+        if self.args.env:
+            self.env = self.args.env
+        elif search:
+            # take the first?
+            self.env = search.groups()[0]
+
+        # remove env from hostname command line arg if found
+        if search:
+            self.args.host = re_env.split(self.args.host)[0]
+
+        # parse username if passed
+        if '@' in self.args.host:
+            self.user, self.host = self.args.host.split('@')
+        else:
+            self.host = self.args.host
+            if self.args.login_name:
+                self.user = self.args.login_name
+            else:
+                self.user = os.environ['USER']
+
+
+
+    def get_hosts(self):
+        '''Query our host inventory and return a dict where the format
+           equals:
+
+           dict['servername'] = dns_name
+        '''
+        # TODO: perform a numerical sort on these hosts
+        # and display them
+        self.host_inventory = self.ansible.build_host_dict()
+
+    def select_host(self, regex=False):
+        '''select host attempts to match the host specified
+           on the command line with a list of hosts.
+
+           if regex is specified then we will attempt to match
+           all *{host_string}* equivalents.
+        '''
+# list environment stuff as well
+# 3 states:
+#  - an exact match; return result
+#  - a partial match; return all regex results
+#  - no match; None
+        re_host = re.compile(self.host)
+
+        exact = []
+        results = []
+        for hostname, server_info in self.host_inventory[self.env].items():
+            if hostname.split(':')[0] == self.host:
+                exact.append((hostname, server_info))
+                break
+            elif re_host.search(hostname):
+                results.append((hostname, server_info))
+
+        if exact:
+            return exact
+        elif results:
+            return results
+        else:
+            print "Could not find specified host: %s in %s" % (self.host, self.env)
+
+        # default - no results found.
+        return None
+
+
+    def list_hosts(self, limit=None):
+        '''Function to print out the host inventory.
+
+           Takes a single parameter to limit the number of hosts printed.
+        '''
+
+        if self.env:
+            results = self.select_host(True)
+            if len(results) == 1:
+                hostname, server_info = results[0]
+                sorted_keys = server_info.keys()
+                sorted_keys.sort()
+                for key in sorted_keys:
+                    print '{0:<35} {1}'.format(key, server_info[key])
+            else:
+                for host_id, server_info in results[:limit]:
+                    name = server_info['ec2_tag_Name']
+                    ec2_id = server_info['ec2_id']
+                    ip = server_info['ec2_ip_address']
+                    print '{ec2_tag_Name:<35} {ec2_tag_environment:<8} {ec2_id:<15} {ec2_ip_address}'.format(**server_info)
+
+                if limit:
+                    print
+                    print 'Showing only the first %d results...' % limit
+                    print
+
+        else:
+            for env, host_ids in self.host_inventory.items():
+                for host_id, server_info in host_ids.items():
+                    name = server_info['ec2_tag_Name']
+                    ec2_id = server_info['ec2_id']
+                    ip = server_info['ec2_ip_address']
+                    print '{ec2_tag_Name:<35} {ec2_tag_environment:<5} {ec2_id:<15} {ec2_ip_address}'.format(**server_info)
+
+    def ssh(self):
+        '''SSH to a specified host
+        '''
+        try:
+            cmd = '/usr/bin/ssh'
+            ssh_args = [cmd, '-l%s' % self.user]
+            #ssh_args = [cmd, ]
+
+            if self.args.verbose:
+                ssh_args.append('-vvv')
+
+            if self.args.ssh_opts:
+                ssh_args.append("-o%s" % self.args.ssh_opts)
+
+            result = self.select_host()
+            if not result:
+                return # early exit, no results
+
+            if len(result) > 1:
+                self.list_hosts(10)
+                return # early exit, too many results
+
+            # Assume we have one and only one.
+            hostname, server_info = result[0]
+            ip = server_info['ec2_ip_address']
+
+            ssh_args.append(ip)
+
+            #last argument
+            if self.args.command:
+                ssh_args.append("%s" % self.args.command)
+
+            if self.args.debug:
+                print "SSH to %s in %s as %s" % (hostname, self.env, self.user)
+
+            print "Running: %s\n" % ' '.join(ssh_args)
+
+            os.execve('/usr/bin/ssh', ssh_args, os.environ)
+        except:
+            print traceback.print_exc()
+            print sys.exc_info()
+
+
+def main():
+    ossh = Ossh()
+
+
+if __name__ == '__main__':
+    main()
+
-- 
cgit v1.2.3


From d124436d94a1e502f7f31a6958d01a513c8cb1a5 Mon Sep 17 00:00:00 2001
From: Kenny Woodson <kwoodson@redhat.com>
Date: Wed, 4 Feb 2015 13:37:34 -0500
Subject: Adding [tab] completion for bash and zsh.

---
 bin/ossh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'bin/ossh')

diff --git a/bin/ossh b/bin/ossh
index 2fa4bde37..1cef1b4fa 100755
--- a/bin/ossh
+++ b/bin/ossh
@@ -26,6 +26,13 @@ class Ossh(object):
         self.file_path = os.path.join(os.path.dirname(os.path.realpath(__file__)))
         self.parse_cli_args()
 
+        # parse host and user
+        self.process_host()
+
+        if not self.args.list and not self.env:
+            print "Please specify an environment."
+            return
+
         if self.args.host == '' and not self.args.list:
             self.parser.print_help()
             return
@@ -34,15 +41,12 @@ class Ossh(object):
 
         self.host_inventory = self.get_hosts()
 
-
         if self.args.debug:
             print self.args
 
         # get a dict of host inventory
         self.get_hosts()
 
-        # parse host and user
-        self.process_host()
 
         # perform the SSH
         if self.args.list:
-- 
cgit v1.2.3


From 55b7f22404da7a0cfcdbce467e9581f6b8509320 Mon Sep 17 00:00:00 2001
From: Kenny Woodson <kwoodson@redhat.com>
Date: Thu, 5 Feb 2015 14:18:09 -0500
Subject: Updated tab completion as well as respecting ssh config files.

---
 bin/ossh | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'bin/ossh')

diff --git a/bin/ossh b/bin/ossh
index 1cef1b4fa..7f7acc6c2 100755
--- a/bin/ossh
+++ b/bin/ossh
@@ -84,6 +84,7 @@ class Ossh(object):
         '''Determine host name and user name for SSH.
         '''
         self.env = None
+        self.user = None
 
         re_env = re.compile('\.(int|stg|prod|ops)')
         search = re_env.search(self.args.host)
@@ -104,10 +105,6 @@ class Ossh(object):
             self.host = self.args.host
             if self.args.login_name:
                 self.user = self.args.login_name
-            else:
-                self.user = os.environ['USER']
-
-
 
     def get_hosts(self):
         '''Query our host inventory and return a dict where the format
@@ -192,8 +189,12 @@ class Ossh(object):
         '''
         try:
             cmd = '/usr/bin/ssh'
-            ssh_args = [cmd, '-l%s' % self.user]
-            #ssh_args = [cmd, ]
+
+            # shell args start with the program name in position 1
+            ssh_args = [cmd, ]
+
+            if self.user:
+                ssh_args.append('-l%s' % self.user)
 
             if self.args.verbose:
                 ssh_args.append('-vvv')
@@ -211,9 +212,9 @@ class Ossh(object):
 
             # Assume we have one and only one.
             hostname, server_info = result[0]
-            ip = server_info['ec2_ip_address']
+            dns = server_info['ec2_public_dns_name']
 
-            ssh_args.append(ip)
+            ssh_args.append(dns)
 
             #last argument
             if self.args.command:
-- 
cgit v1.2.3


From ee96928a2d1c21c5d2319418f4cf6ca774a3e010 Mon Sep 17 00:00:00 2001
From: Kenny Woodson <kwoodson@redhat.com>
Date: Thu, 5 Feb 2015 16:02:36 -0500
Subject: Attempting to only refresh cache when doing --list on ossh.

---
 bin/ossh | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'bin/ossh')

diff --git a/bin/ossh b/bin/ossh
index 7f7acc6c2..1fa987d21 100755
--- a/bin/ossh
+++ b/bin/ossh
@@ -39,15 +39,15 @@ class Ossh(object):
 
         self.ansible = ansibleutil.AnsibleUtil()
 
-        self.host_inventory = self.get_hosts()
+        # get a dict of host inventory
+        if self.args.list:
+            self.get_hosts()
+        else:
+            self.get_hosts(True)
 
         if self.args.debug:
             print self.args
 
-        # get a dict of host inventory
-        self.get_hosts()
-
-
         # perform the SSH
         if self.args.list:
             self.list_hosts()
@@ -106,7 +106,7 @@ class Ossh(object):
             if self.args.login_name:
                 self.user = self.args.login_name
 
-    def get_hosts(self):
+    def get_hosts(self, cache=False):
         '''Query our host inventory and return a dict where the format
            equals:
 
@@ -114,7 +114,11 @@ class Ossh(object):
         '''
         # TODO: perform a numerical sort on these hosts
         # and display them
-        self.host_inventory = self.ansible.build_host_dict()
+
+        if not cache:
+            self.host_inventory = self.ansible.build_host_dict()
+        else:
+            self.host_inventory = self.ansible.build_host_dict(['--cache-only'])
 
     def select_host(self, regex=False):
         '''select host attempts to match the host specified
-- 
cgit v1.2.3


From cedef18d9450a1b3c8c0f72c10174735529cda04 Mon Sep 17 00:00:00 2001
From: Kenny Woodson <kwoodson@redhat.com>
Date: Thu, 5 Feb 2015 17:01:06 -0500
Subject: Removed comments and cleaned up code.

---
 bin/ossh | 75 +++++++++++++++++++---------------------------------------------
 1 file changed, 22 insertions(+), 53 deletions(-)

(limited to 'bin/ossh')

diff --git a/bin/ossh b/bin/ossh
index 1fa987d21..f41eedadf 100755
--- a/bin/ossh
+++ b/bin/ossh
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
+# vim: expandtab:tabstop=4:shiftwidth=4
 
-import pdb
 import argparse
 import ansibleutil
 import traceback
@@ -8,24 +8,19 @@ import sys
 import os
 import re
 
-
-# use dynamic inventory
-# list instances
-# symlinked to ~/bin
-# list instances that match pattern
-# python!
-
-# list environment stuff as well
-# 3 states:
-#  - an exact match; return result
-#  - a partial match; return all regex results
-#  - no match; None
-
 class Ossh(object):
     def __init__(self):
         self.file_path = os.path.join(os.path.dirname(os.path.realpath(__file__)))
         self.parse_cli_args()
 
+        self.ansible = ansibleutil.AnsibleUtil()
+
+        # get a dict of host inventory
+        if self.args.list:
+            self.get_hosts()
+        else:
+            self.get_hosts(True)
+
         # parse host and user
         self.process_host()
 
@@ -37,13 +32,6 @@ class Ossh(object):
             self.parser.print_help()
             return
 
-        self.ansible = ansibleutil.AnsibleUtil()
-
-        # get a dict of host inventory
-        if self.args.list:
-            self.get_hosts()
-        else:
-            self.get_hosts(True)
 
         if self.args.debug:
             print self.args
@@ -56,8 +44,6 @@ class Ossh(object):
 
     def parse_cli_args(self):
         parser = argparse.ArgumentParser(description='Openshift Online SSH Tool.')
-        parser.add_argument('-r', '--random', action="store",
-                          help="Choose a random host")
         parser.add_argument('-e', '--env', action="store",
                           help="Which environment to search for the host ")
         parser.add_argument('-d', '--debug', default=False,
@@ -73,7 +59,7 @@ class Ossh(object):
 
         parser.add_argument('-o', '--ssh_opts', action='store',
                             help='options to pass to SSH.\n \
-                                  "-o ForwardX11 yes"')
+                                  "-oForwardX11=yes,TCPKeepAlive=yes"')
         parser.add_argument('host', nargs='?', default='')
 
         self.args = parser.parse_args()
@@ -86,7 +72,7 @@ class Ossh(object):
         self.env = None
         self.user = None
 
-        re_env = re.compile('\.(int|stg|prod|ops)')
+        re_env = re.compile("\.(" + "|".join(self.host_inventory.keys()) + ")")
         search = re_env.search(self.args.host)
         if self.args.env:
             self.env = self.args.env
@@ -106,19 +92,16 @@ class Ossh(object):
             if self.args.login_name:
                 self.user = self.args.login_name
 
-    def get_hosts(self, cache=False):
+    def get_hosts(self, cache_only=False):
         '''Query our host inventory and return a dict where the format
            equals:
 
            dict['servername'] = dns_name
         '''
-        # TODO: perform a numerical sort on these hosts
-        # and display them
-
-        if not cache:
-            self.host_inventory = self.ansible.build_host_dict()
-        else:
+        if cache_only:
             self.host_inventory = self.ansible.build_host_dict(['--cache-only'])
+        else:
+            self.host_inventory = self.ansible.build_host_dict()
 
     def select_host(self, regex=False):
         '''select host attempts to match the host specified
@@ -127,25 +110,17 @@ class Ossh(object):
            if regex is specified then we will attempt to match
            all *{host_string}* equivalents.
         '''
-# list environment stuff as well
-# 3 states:
-#  - an exact match; return result
-#  - a partial match; return all regex results
-#  - no match; None
         re_host = re.compile(self.host)
 
-        exact = []
         results = []
         for hostname, server_info in self.host_inventory[self.env].items():
             if hostname.split(':')[0] == self.host:
-                exact.append((hostname, server_info))
-                break
+                # an exact match, return it!
+                return [(hostname, server_info)]
             elif re_host.search(hostname):
                 results.append((hostname, server_info))
 
-        if exact:
-            return exact
-        elif results:
+        if results:
             return results
         else:
             print "Could not find specified host: %s in %s" % (self.host, self.env)
@@ -153,7 +128,6 @@ class Ossh(object):
         # default - no results found.
         return None
 
-
     def list_hosts(self, limit=None):
         '''Function to print out the host inventory.
 
@@ -192,10 +166,8 @@ class Ossh(object):
         '''SSH to a specified host
         '''
         try:
-            cmd = '/usr/bin/ssh'
-
             # shell args start with the program name in position 1
-            ssh_args = [cmd, ]
+            ssh_args = ['/usr/bin/ssh']
 
             if self.user:
                 ssh_args.append('-l%s' % self.user)
@@ -204,7 +176,8 @@ class Ossh(object):
                 ssh_args.append('-vvv')
 
             if self.args.ssh_opts:
-                ssh_args.append("-o%s" % self.args.ssh_opts)
+                for arg in self.args.ssh_opts.split(","):
+                    ssh_args.append("-o%s" % arg)
 
             result = self.select_host()
             if not result:
@@ -235,10 +208,6 @@ class Ossh(object):
             print sys.exc_info()
 
 
-def main():
-    ossh = Ossh()
-
-
 if __name__ == '__main__':
-    main()
+    ossh = Ossh()
 
-- 
cgit v1.2.3


From 04582ead281239524df87f1dabc53125038ff9a5 Mon Sep 17 00:00:00 2001
From: Kenny Woodson <kwoodson@redhat.com>
Date: Thu, 5 Feb 2015 17:01:52 -0500
Subject: Removed unneeded debug statement.

---
 bin/ossh | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'bin/ossh')

diff --git a/bin/ossh b/bin/ossh
index f41eedadf..0b48ca46c 100755
--- a/bin/ossh
+++ b/bin/ossh
@@ -197,9 +197,6 @@ class Ossh(object):
             if self.args.command:
                 ssh_args.append("%s" % self.args.command)
 
-            if self.args.debug:
-                print "SSH to %s in %s as %s" % (hostname, self.env, self.user)
-
             print "Running: %s\n" % ' '.join(ssh_args)
 
             os.execve('/usr/bin/ssh', ssh_args, os.environ)
-- 
cgit v1.2.3