first refactor

3 files changed, 17 insertions, 13 deletions

diff --git a/scripts/automation/trex_control_plane/console/__init__.py b/scripts/automation/trex_control_plane/console/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/scripts/automation/trex_control_plane/console/__init__.py
diff --git a/scripts/automation/trex_control_plane/console/trex_console.py b/scripts/automation/trex_control_plane/console/trex_console.py
index c8624626..45428b89 100755
--- a/scripts/automation/trex_control_plane/console/trex_console.py
+++ b/scripts/automation/trex_control_plane/console/trex_console.py
@@ -27,14 +27,16 @@ import string
 import os
 import sys
 import tty, termios
-import trex_root_path
-from common.trex_streams import *
-from client.trex_stateless_client import STLClient, LoggerApi
-from common.text_opts import *
-from client_utils.general_utils import user_input, get_current_user
-from client_utils import parsing_opts
+
+from trex_control_plane.stl.api import *
+
+from trex_control_plane.common.text_opts import *
+from trex_control_plane.client_utils.general_utils import user_input, get_current_user
+from trex_control_plane.client_utils import parsing_opts
+
+
 import trex_tui
-from common.trex_stl_exceptions import *
+
 from functools import wraps
 
 __version__ = "1.1"
diff --git a/scripts/automation/trex_control_plane/console/trex_tui.py b/scripts/automation/trex_control_plane/console/trex_tui.py
index 1e22b005..1ecf0868 100644
--- a/scripts/automation/trex_control_plane/console/trex_tui.py
+++ b/scripts/automation/trex_control_plane/console/trex_tui.py
@@ -2,13 +2,15 @@ import termios
 import sys
 import os
 import time
-from common.text_opts import *
-from common import trex_stats
-from client_utils import text_tables
 from collections import OrderedDict
 import datetime
 from cStringIO import StringIO
-from client.trex_stateless_client import STLError
+
+from common.text_opts import *
+from client_utils import text_tables
+
+# for STL exceptions
+from trex_control_plane.stl.api import *
 
 class SimpleBar(object):
     def __init__ (self, desc, pattern):
@@ -61,7 +63,7 @@ class TrexTUIDashBoard(TrexTUIPanel):
 
 
     def show (self):
-        stats = self.stateless_client._get_formatted_stats(self.ports, trex_stats.COMPACT)
+        stats = self.stateless_client._get_formatted_stats(self.ports)
         # print stats to screen
         for stat_type, stat_data in stats.iteritems():
             text_tables.print_table_with_header(stat_data.text_table, stat_type)
@@ -148,7 +150,7 @@ class TrexTUIPort(TrexTUIPanel):
 
 
     def show (self):
-        stats = self.stateless_client._get_formatted_stats([self.port_id], trex_stats.COMPACT)
+        stats = self.stateless_client._get_formatted_stats([self.port_id])
         # print stats to screen
         for stat_type, stat_data in stats.iteritems():
             text_tables.print_table_with_header(stat_data.text_table, stat_type)