From 21ceb15e4005064edb52405efdb603ef131638b7 Mon Sep 17 00:00:00 2001
From: Zack Cerza <zack@redhat.com>
Date: Tue, 16 Aug 2016 13:52:20 -0600
Subject: [PATCH] Make teuthology.nuke a subpackage

Signed-off-by: Zack Cerza <zack@redhat.com>
---
 teuthology/{nuke.py => nuke/__init__.py} | 46 +++++++++++-------------
 1 file changed, 21 insertions(+), 25 deletions(-)
 rename teuthology/{nuke.py => nuke/__init__.py} (96%)

diff --git a/teuthology/nuke.py b/teuthology/nuke/__init__.py
similarity index 96%
rename from teuthology/nuke.py
rename to teuthology/nuke/__init__.py
index 3a6f6f8057..165ed9aa41 100644
--- a/teuthology/nuke.py
+++ b/teuthology/nuke/__init__.py
@@ -8,27 +8,22 @@ import time
 import yaml
 
 import teuthology
-from . import orchestra
-import orchestra.remote
-from .openstack import OpenStack, OpenStackInstance, enforce_json_dictionary
-from .orchestra import run
-from .config import config, FakeNamespace
-from .lock import list_locks
-from .lock import locked_since_seconds
-from .lock import unlock_one
-from .lock import find_stale_locks
-from .lockstatus import get_status
-from .misc import canonicalize_hostname
-from .misc import config_file
-from .misc import decanonicalize_hostname
-from .misc import merge_configs
-from .misc import get_testdir
-from .misc import get_user
-from .misc import reconnect
-from .misc import sh
-from .parallel import parallel
-from .task import install as install_task
-from .task.internal import check_lock, add_remotes, connect
+
+from ..config import config, FakeNamespace
+from ..lock import (
+    list_locks, locked_since_seconds, unlock_one, find_stale_locks
+)
+from ..lockstatus import get_status
+from ..misc import (
+    canonicalize_hostname, config_file, decanonicalize_hostname, merge_configs,
+    get_testdir, get_user, reconnect, sh
+)
+from ..openstack import OpenStack, OpenStackInstance, enforce_json_dictionary
+from ..orchestra import run
+from ..orchestra.remote import Remote, getRemoteConsole
+from ..parallel import parallel
+from ..task import install as install_task
+from ..task.internal import check_lock, add_remotes, connect
 
 log = logging.getLogger(__name__)
 
@@ -390,8 +385,9 @@ def synch_clocks(remotes):
 
 
 def check_console(hostname):
-    shortname = orchestra.remote.getShortName(hostname)
-    console = orchestra.remote.getRemoteConsole(
+    remote = Remote(hostname)
+    shortname = remote.shortname
+    console = getRemoteConsole(
         name=hostname,
         ipmiuser=config['ipmi_user'],
         ipmipass=config['ipmi_password'],
@@ -445,7 +441,7 @@ def stale_openstack_instances(ctx, instances, locked_nodes):
                       .format(instance=instance_id))
             continue
         if (i.get_created() >
-            config['max_job_time'] + OPENSTACK_DELAY):
+                config['max_job_time'] + OPENSTACK_DELAY):
             log.info(
                 "stale-openstack: destroying instance {instance}"
                 " because it was created {created} seconds ago"
@@ -711,7 +707,7 @@ def nuke_helper(ctx, should_unlock):
 
     remotes = ctx.cluster.remotes.keys()
     reboot(ctx, remotes)
-    #shutdown daemons again incase of startup
+    # shutdown daemons again incase of startup
     log.info('Stop daemons after restart...')
     shutdown_daemons(ctx)
     log.info('All daemons killed.')
-- 
2.39.5