Cleaned up the imports in testrunner

Cleaned up the imports and made the appropriate dirs packages.

ci/infra/testrunner/platforms/__init__.py

@@ -0,0 +1 @@
+from platforms.openstack import Openstack

ci/infra/testrunner/platforms/openstack.py

@@ -1,7 +1,9 @@
-from format import Format
 import os
 from timeout_decorator import timeout
-from terraform import Terraform
+
+from platforms.terraform import Terraform
+from utils import Format
+
 
 class Openstack(Terraform):
     def __init__(self, conf):

ci/infra/testrunner/platforms/terraform.py

@@ -1,10 +1,8 @@
 import os
-from shutil import copyfile
 import subprocess
-from utils import step
-from utils import Utils
-from constants import Constant
-from format import Format
+from shutil import copyfile
+
+from utils import (Constant, Format, step, Utils)
 
 
 class Terraform:

ci/infra/testrunner/testrunner.py

@@ -5,21 +5,12 @@
     This script can be run from Jenkins or manually, on developer desktops or servers.
 """
 
-import os, sys
+import sys
 from argparse import ArgumentParser
 
-testrunner_path = os.path.dirname(os.path.abspath(__file__))
-sys.path.append(os.path.join(testrunner_path,"utils"))
-sys.path.append(os.path.join(testrunner_path,"platforms"))
-sys.path.append(os.path.join(testrunner_path,"tests"))
-
-from constants import BaseConfig
-from constants import Constant
-from format import Format
-from utils import Utils
-from skuba import Skuba
-from openstack import Openstack
+from platforms import Openstack
 from tests import Tests
+from utils import (BaseConfig, Format, Skuba, Utils)
 
 __version__ = "0.0.3"
 

ci/infra/testrunner/tests/__init__.py

@@ -0,0 +1 @@
+from tests.tests import Tests

ci/infra/testrunner/tests/tests.py

@@ -1,8 +1,8 @@
-from skuba import Skuba
-from utils import step
-from utils import Utils
 from timeout_decorator import timeout
 
+from utils import (Skuba, step, Utils)
+
+
 class Tests:
     def __init__(self, conf):
         self.conf = conf

ci/infra/testrunner/utils/__init__.py

@@ -0,0 +1,4 @@
+from utils.constants import (BaseConfig, Constant)
+from utils.format import Format
+from utils.skuba import Skuba
+from utils.utils import (Utils, step)

ci/infra/testrunner/utils/constants.py

@@ -1,5 +1,8 @@
-import yaml, os
-from format import Format
+import os
+import yaml
+
+from utils.format import Format
+
 
 class Constant:
     TERRAFORM_EXAMPLE="terraform.tfvars.ci.example"

ci/infra/testrunner/utils/skuba.py

@@ -1,8 +1,11 @@
-import os, json
+import json
+import os
+
 from timeout_decorator import timeout
-from format import Format
-from utils import step
-from utils import Utils
+
+from utils.format import Format
+from utils.utils import (step, Utils)
+
 
 class Skuba:
 
@@ -98,7 +101,7 @@ def node_bootstrap(self):
     def node_join(self, role="worker", nr=0):
         self._load_tfstate()
         self._verify_bootstrap_dependency()
-        
+
         try:
             if role == "master":
                 ip_addr = self._get_masters_ipaddrs()[nr]
@@ -138,7 +141,7 @@ def cluster_status(self):
         self._run_skuba("cluster status")
 
     def num_of_nodes(self):
-        
+
         test_cluster = os.path.join(self.conf.workspace, "test-cluster")
         binpath = os.path.join(self.conf.workspace, 'go/bin/skuba')
         cmd = "cd " + test_cluster + "; " +binpath + " cluster status"

ci/infra/testrunner/utils/utils.py

@@ -1,11 +1,18 @@
 
-import subprocess, os, sys, requests
+import os
+import subprocess
+import sys
 from functools import wraps
+
+import requests
 from timeout_decorator import timeout
-from constants import Constant
-from format import Format
+
+from utils.format import Format
+from utils.constants import Constant
 
 _stepdepth = 0
+
+
 def step(f):
     @wraps(f)
     def wrapped(*args, **kwargs):
@@ -21,7 +28,7 @@ def wrapped(*args, **kwargs):
 
 
 class Utils:
-    
+
     def __init__(self, conf):
         self.conf = conf