File struct refactoring

Author: Isaac Hill

hotfix_checker.py

@@ -2,7 +2,7 @@
 import os
 import sys
 from util.channel_access import ChannelAccessUtils
-import paramiko
+from util.ssh_access import runSSHCommand
 import requests
 
 EPICS_DIR = "C:\\Instrument\\Apps\\EPICS\\"
@@ -54,36 +54,6 @@ def get_insts_on_latest_ibex_via_inst_congif():
     return insts_on_latest_ibex
 
 
-def runSSHCommand(host, username, password, command):
-    """ Run a command on a remote host using SSH.
-
-    Args:
-        host (str): The hostname to connect to.
-        username (str): The username to use to connect.
-        password (str): The password to use to connect.
-        command (str): The command to run on the remote host.
-
-    Returns:
-        dict: A dictionary with the success status and the output of the command.
-    """
-    try:
-        client = paramiko.SSHClient()
-        client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
-        client.connect(host, port=SSH_PORT,
-                       username=username, password=password)
-        stdin, stdout, stderr = client.exec_command(command)
-        output = stdout.read().decode('utf-8')
-        error = stderr.read().decode('utf-8')
-        client.close()
-        if error:
-            return {'success': False, 'output': error}
-        else:
-            return {'success': True, 'output': output}
-    except Exception as e:
-        print(str(e))
-        return {'success': False, 'output': str(e)}
-
-
 def check_for_uncommitted_changes(hostname):
     """ Check if there are any uncommitted changes on the instrument via SSH.
 

util/ssh_access.py

@@ -0,0 +1,34 @@
+import paramiko
+
+
+class SSHAccessUtils(object):
+
+    @staticmethod
+    def runSSHCommand(host, username, password, command):
+        """ Run a command on a remote host using SSH.
+
+        Args:
+            host (str): The hostname to connect to.
+            username (str): The username to use to connect.
+            password (str): The password to use to connect.
+            command (str): The command to run on the remote host.
+
+        Returns:
+            dict: A dictionary with the success status and the output of the command.
+        """
+        try:
+            client = paramiko.SSHClient()
+            client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
+            client.connect(host, port=SSH_PORT,
+                           username=username, password=password)
+            stdin, stdout, stderr = client.exec_command(command)
+            output = stdout.read().decode('utf-8')
+            error = stderr.read().decode('utf-8')
+            client.close()
+            if error:
+                return {'success': False, 'output': error}
+            else:
+                return {'success': True, 'output': output}
+        except Exception as e:
+            print(str(e))
+            return {'success': False, 'output': str(e)}