osc-lib: timing

Dean Troyer · Dean Troyer · commit a55eb915a0d5 · 2016-06-13T11:08:21.000-05:00
Change-Id: I3fe27d98efa5090e084c676f7f8e6dad0157ed21
diff --git a/openstackclient/common/timing.py b/openstackclient/common/timing.py
@@ -11,31 +11,15 @@
 #   under the License.
 #
 
-"""Timing Implementation"""
+# NOTE(dtroyer): This file is deprecated in Jun 2016, remove after 4.x release
+#                or Jun 2017.
 
-from osc_lib.command import command
+import sys
 
+from osc_lib.command.timing import *  # noqa
 
-class Timing(command.Lister):
-    """Show timing data"""
 
-    def take_action(self, parsed_args):
-        column_headers = (
-            'URL',
-            'Seconds',
-        )
-
-        results = []
-        total = 0.0
-        for url, td in self.app.timing_data:
-            # NOTE(dtroyer): Take the long way here because total_seconds()
-            #                was added in py27.
-            sec = (td.microseconds + (td.seconds + td.days *
-                                      86400) * 1e6) / 1e6
-            total += sec
-            results.append((url, sec))
-        results.append(('Total', total))
-        return (
-            column_headers,
-            results,
-        )
+sys.stderr.write(
+    "WARNING: %s is deprecated and will be removed after Jun 2017. "
+    "Please use osc_lib.command.timing\n" % __name__
+)
diff --git a/openstackclient/shell.py b/openstackclient/shell.py
@@ -26,6 +26,7 @@
 from cliff import command
 from cliff import complete
 from cliff import help
+from osc_lib.command import timing
 from osc_lib import exceptions as exc
 from osc_lib import logs
 from osc_lib import utils
@@ -35,7 +36,6 @@
 import openstackclient
 from openstackclient.common import clientmanager
 from openstackclient.common import commandmanager
-from openstackclient.common import timing
 
 from os_client_config import config as cloud_config
 
diff --git a/openstackclient/tests/common/test_timing.py b/openstackclient/tests/common/test_timing.py
