Refactor site_power_status, power_strip modules into client/cros.

client/site_tests/power_LoadTest/power_LoadTest.py

 # Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import logging, os, shutil, time
 from autotest_lib.client.bin import utils
-from autotest_lib.client.common_lib import error, site_power_status
+from autotest_lib.client.common_lib import error
 from autotest_lib.client.cros import backchannel, cros_ui, cros_ui_test
-from autotest_lib.client.cros import httpd, login
-
+from autotest_lib.client.cros import httpd, login, power_status
 from autotest_lib.client.cros import flimflam_test_path
 import flimflam
 
 params_dict = {
     'test_time_ms': '_mseconds',
     'should_scroll': '_should_scroll',
     'should_scroll_up': '_should_scroll_up',
     'scroll_loop': '_scroll_loop',
     'scroll_interval_ms': '_scroll_interval_ms',
     'scroll_by_pixels': '_scroll_by_pixels',
@@ skipping 36 matching lines @@
         self._loop_count = loop_count
         self._mseconds = self._loop_time * 1000
         self._verbose = verbose
         self._low_battery_threshold = low_battery_threshold
         self._should_scroll = should_scroll
         self._should_scroll_up = should_scroll_up
         self._scroll_loop = scroll_loop
         self._scroll_interval_ms = scroll_interval_ms
         self._scroll_by_pixels = scroll_by_pixels
         self._tmp_keyvals = {}
-        self._power_status = site_power_status.get_status()
+        self._power_status = power_status.get_status()
         self._json_path = None
         self._force_wifi = force_wifi
 
         # verify that initial conditions are met:
         if self._power_status.linepower[0].online:
             raise error.TestError(
                 'Running on AC power. Please remove AC power cable')
 
         percent_initial_charge = self._percent_current_charge()
         if percent_initial_charge_min and percent_initial_charge < \
@@ skipping 42 matching lines @@
         self._json_path = os.path.join(self.bindir, '..')
         shutil.copy(os.path.join(self.bindir, 'external_extensions.json'),
                                  self._json_path)
 
         # setup a HTTP Server to listen for status updates from the power
         # test extension
         self._testServer = httpd.HTTPListener(8001, docroot=self.bindir)
         self._testServer.run()
 
         # initialize various interesting power related stats
-        self._usb_stats = site_power_status.USBSuspendStats()
-        self._cpufreq_stats = site_power_status.CPUFreqStats()
-        self._cpuidle_stats = site_power_status.CPUIdleStats()
+        self._usb_stats = power_status.USBSuspendStats()
+        self._cpufreq_stats = power_status.CPUFreqStats()
+        self._cpuidle_stats = power_status.CPUIdleStats()
 
 
         self._usb_stats.refresh()
         self._cpufreq_stats.refresh()
         self._cpuidle_stats.refresh()
         self._power_status.refresh()
 
         self._ah_charge_start = self._power_status.battery[0].charge_now
         self._wh_energy_start = self._power_status.battery[0].energy
 
@@ skipping 174 matching lines @@
         # set backlight level to 40% of max
         cmd = 'backlight-tool --set_brightness %d ' % (
               int(self._max_backlight * 0.4))
         os.system(cmd)
 
         # record brightness level
         cmd = 'backlight-tool --get_brightness'
         level = int(utils.system_output(cmd).rstrip())
         logging.info('backlight level is %d' % level)
         self._tmp_keyvals['level_backlight_current'] = level