update import statements

Author: Michael-Doyle Hudson

.testr.conf

@@ -1,3 +1,3 @@
 [DEFAULT]
 test_command=python -m subunit.run $IDLIST
-test_id_list_default=lava.dispatcher.tests.test_suite
+test_id_list_default=lava_dispatcher.tests.test_suite

README

@@ -49,7 +49,7 @@ to your PATH environment variable, to provide easy access to the tools.
 The Dispatcher
 --------------
 
-The code for the dispatcher lives in lava.dispatcher.
+The code for the dispatcher lives in lava_dispatcher.
 
 XXX write this -- reference ./doc/QUICKSTART or copy it here.
 

lava-dispatch

@@ -21,7 +21,7 @@
 
 import sys
 
-from lava.dispatcher import LavaTestJob
+from lava_dispatcher import LavaTestJob
 
 
 def usage(status):

lava_dispatcher/__init__.py

@@ -20,9 +20,9 @@
 
 from datetime import datetime
 import json
-from lava.dispatcher.actions import get_all_cmds
-from lava.dispatcher.client import LavaClient
-from lava.dispatcher.android_client import LavaAndroidClient
+from lava_dispatcher.actions import get_all_cmds
+from lava_dispatcher.client import LavaClient
+from lava_dispatcher.android_client import LavaAndroidClient
 from uuid import uuid1
 import base64
 

lava_dispatcher/actions/android_0xbench.py

@@ -19,7 +19,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses>.
 
-from lava.dispatcher.actions import BaseAndroidAction
+from lava_dispatcher.actions import BaseAndroidAction
 import time
 import pexpect
 

lava_dispatcher/actions/android_basic.py

@@ -19,14 +19,14 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses>.
 
-from lava.dispatcher.actions import BaseAndroidAction
-from lava.dispatcher.client import OperationFailed
-from lava.dispatcher.android_config import TESTER_STR
+from lava_dispatcher.actions import BaseAndroidAction
+from lava_dispatcher.client import OperationFailed
+from lava_dispatcher.android_config import TESTER_STR
 import time
 import pexpect
 import sys
 from datetime import datetime
-from lava.dispatcher.android_util import savebundlefile
+from lava_dispatcher.android_util import savebundlefile
 
 class cmd_test_android_monkey(BaseAndroidAction):
     def run(self):

lava_dispatcher/actions/android_deploy.py

@@ -19,12 +19,12 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses>.
 
-from lava.dispatcher.actions import BaseAction
-from lava.dispatcher.config import LAVA_IMAGE_TMPDIR, LAVA_IMAGE_URL, MASTER_STR
+from lava_dispatcher.actions import BaseAction
+from lava_dispatcher.config import LAVA_IMAGE_TMPDIR, LAVA_IMAGE_URL, MASTER_STR
 import os
 import shutil
 from tempfile import mkdtemp
-from lava.dispatcher.utils import download, download_with_cache
+from lava_dispatcher.utils import download, download_with_cache
 
 class cmd_deploy_linaro_android_image(BaseAction):
     def run(self, boot, system, data, use_cache=True):

lava_dispatcher/actions/boot_control.py

@@ -20,7 +20,7 @@
 # along
 # with this program; if not, see <http://www.gnu.org/licenses>.
 
-from lava.dispatcher.actions import BaseAction, BaseAndroidAction
+from lava_dispatcher.actions import BaseAction, BaseAndroidAction
 
 class cmd_boot_linaro_android_image(BaseAndroidAction):
     """ Call client code to boot to the master image

lava_dispatcher/actions/deploy.py

@@ -24,9 +24,9 @@
 import shutil
 from tempfile import mkdtemp
 
-from lava.dispatcher.actions import BaseAction
-from lava.dispatcher.config import LAVA_IMAGE_TMPDIR, LAVA_IMAGE_URL, MASTER_STR
-from lava.dispatcher.utils import download, download_with_cache
+from lava_dispatcher.actions import BaseAction
+from lava_dispatcher.config import LAVA_IMAGE_TMPDIR, LAVA_IMAGE_URL, MASTER_STR
+from lava_dispatcher.utils import download, download_with_cache
 
 
 class cmd_deploy_linaro_image(BaseAction):

lava_dispatcher/actions/launch_control.py

@@ -21,8 +21,8 @@
 # with this program; if not, see <http://www.gnu.org/licenses>.
 
 import json
-from lava.dispatcher.actions import BaseAction
-from lava.dispatcher.config import LAVA_RESULT_DIR, MASTER_STR, LAVA_SERVER_IP
+from lava_dispatcher.actions import BaseAction
+from lava_dispatcher.config import LAVA_RESULT_DIR, MASTER_STR, LAVA_SERVER_IP
 import socket
 from threading import Thread
 import time

lava_dispatcher/actions/lava-test.py

@@ -20,9 +20,9 @@
 # along
 # with this program; if not, see <http://www.gnu.org/licenses>.
 
-from lava.dispatcher.actions import BaseAction
-from lava.dispatcher.client import OperationFailed
-from lava.dispatcher.config import LAVA_RESULT_DIR, MASTER_STR, TESTER_STR
+from lava_dispatcher.actions import BaseAction
+from lava_dispatcher.client import OperationFailed
+from lava_dispatcher.config import LAVA_RESULT_DIR, MASTER_STR, TESTER_STR
 
 class cmd_lava_test_run(BaseAction):
     def run(self, test_name, timeout=-1):

lava_dispatcher/android_client.py

@@ -19,8 +19,8 @@
 
 import pexpect
 import sys
-from lava.dispatcher.client import LavaClient
-from lava.dispatcher.android_config import BOARDS, TESTER_STR
+from lava_dispatcher.client import LavaClient
+from lava_dispatcher.android_config import BOARDS, TESTER_STR
 
 class LavaAndroidClient(LavaClient):
     def __init__(self, hostname):

lava_dispatcher/android_config.py

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses>.
 
-from lava.dispatcher.config import Board
+from lava_dispatcher.config import Board
 
 class BeagleBoard(Board):
     uboot_cmds = ["mmc init",

lava_dispatcher/android_util.py

@@ -22,7 +22,7 @@
 from datetime import datetime
 import json
 import subprocess
-from lava.dispatcher.config import LAVA_RESULT_DIR
+from lava_dispatcher.config import LAVA_RESULT_DIR
 import time
 
 # TODO: Result saving could be replaced by linaro_dashboard_bundle probably.

lava_dispatcher/client.py

@@ -23,7 +23,7 @@
 import time
 from cStringIO import StringIO
 
-from lava.dispatcher.config import (
+from lava_dispatcher.config import (
     BOARDS,
     LAVA_SERVER_IP,
     MASTER_STR,

lava_dispatcher/tests/__init__.py

@@ -1,6 +1,6 @@
 import unittest
 
 def test_suite():
-    module_names = ['lava.dispatcher.tests.test_config',]
+    module_names = ['lava_dispatcher.tests.test_config',]
     loader = unittest.TestLoader()
     return loader.loadTestsFromNames(module_names)

lava_dispatcher/tests/test_config.py

@@ -19,7 +19,7 @@
 
 from unittest import TestCase
 
-from lava.dispatcher.config import BOARDS, LAVA_SERVER_IP
+from lava_dispatcher.config import BOARDS, LAVA_SERVER_IP
 
 class TestConfigData(TestCase):
     def test_beagle01_uboot_cmds(self):

lava_dispatcher/utils.py

@@ -23,7 +23,7 @@
 import urllib2
 import urlparse
 
-from lava.dispatcher.config import LAVA_CACHEDIR
+from lava_dispatcher.config import LAVA_CACHEDIR
 
 def download(url, path=""):
     urlpath = urlparse.urlsplit(url).path