chore(test): Tidy up python tool (#263)

* Reorganise python code

I don't know whether this is the correct way to structure a python
project, but it was getting a bit messy in that dir so I have moved
things around. Also the Welder package can probably be refactored one day.

* Remove unneeded attributes

test/tools/config.py → test/tools/config/config.py

@@ -8,7 +8,7 @@
 class Config:
     def __init__(self):
         self.dir = dirname(abspath(__file__))
-        self.base = dirname(dirname(dirname(abspath(__file__))))
+        self.base = dirname(dirname(dirname(dirname(abspath(__file__)))))
         self.schema = self.dir + '/schema.yaml'
         self.params = {}
         self.set_default_config()
@@ -108,7 +108,7 @@ def default_device_config(self):
         }
 
     def default_user_data(self):
-        files = ["hack/scripts/bootstrap.sh", "test/tools/userdata.sh"]
+        files = ["hack/scripts/bootstrap.sh", "test/tools/config/userdata.sh"]
         userdata = ""
         for file in files:
             with open(self.base + "/" + file) as f:

test/tools/run.py

@@ -1,8 +1,8 @@
 #!/usr/bin/env python3
 
-from test import Test
-from metal import Welder
-from config import Config
+from test.runner import Test
+from metal.welder import Welder
+from config.config import Config
 import click
 import os
 import sys
@@ -48,16 +48,16 @@ def run_e2e(config_file, org_id, project_name, ssh_key_name, device_name, skip_t
         click.echo(str(e))
         sys.exit()
 
+    key_dir = dirname(abspath(__file__)) + '/metal'
     if cfg['device']['id'] == None:
         click.echo(
             f"Running e2e tests. Will create project `{cfg['project_name']}`, ssh_key `{cfg['device']['ssh_key_name']}` and device `{cfg['device']['name']}`")
         click.echo(
             "Note: this will create and bootstrap a new device in Equinix and may take some time")
     else:
-        tool_dir = dirname(abspath(__file__))
-        if os.path.exists(tool_dir+"/private.key") != True:
+        if os.path.exists(key_dir+"/private.key") != True:
             click.echo(
-                f"`private.key` file must be saved at `{tool_dir}` when `--existing-device-id` flag set")
+                f"`private.key` file must be saved at `{key_dir}` when `--existing-device-id` flag set")
             sys.exit()
         click.echo("running e2e tests using device `{cfg['device']['id']}`")
 
@@ -68,7 +68,7 @@ def run_e2e(config_file, org_id, project_name, ssh_key_name, device_name, skip_t
 
     if cfg['test']['skip_teardown']:
         dev_id, dev_ip = runner.device_details()
-        click.echo(f"Device `{dev_id}` left alive for debugging. Use with `--config-file` setting `device.id` to re-run tests. SSH command `ssh -i test/tools/private.key root@{dev_ip}`. Teardown device with `teardown-device` command.")
+        click.echo(f"Device `{dev_id}` left alive for debugging. Use with `--config-file` setting `device.id` to re-run tests. SSH command `ssh -i {key_dir}/private.key root@{dev_ip}`. Teardown device with `teardown-device` command.")
 
 
 @cli.command()
@@ -105,8 +105,9 @@ def create_device(config_file, org_id, project_id, ssh_key_name, device_name, us
     welder = Welder(token, cfg)
     ip = welder.create_all()
 
+    key_dir = dirname(abspath(__file__)) + '/metal'
     click.echo(
-        f"Device {cfg['device']['name']} created. SSH command `ssh -i test/tools/private.key root@{ip}`. Run tests with `run-e2e`. Teardown with `delete-device`.")
+        f"Device {cfg['device']['name']} created. SSH command `ssh -i {key_dir}/private.key root@{ip}`. Run tests with `run-e2e`. Teardown with `delete-device`.")
 
 
 @cli.command()

test/tools/test.py → test/tools/test/runner.py

@@ -1,4 +1,4 @@
-from metal import Welder
+from metal.welder import Welder
 
 
 class Test:
@@ -7,9 +7,6 @@ def __init__(self, auth_token, config):
         devCfg = config['device']
 
         self.welder = Welder(auth_token, config)
-        self.prj_name = config['project']
-        self.key_name = devCfg['ssh_key_name']
-        self.dev_name = devCfg['name']
         self.skip_teardown = self.testCfg['skip_teardown']
         self.dev_id = devCfg['id']
         self.dev_ip = None