Merge remote-tracking branch 'origin/master'

4 files changed, 104 insertions, 30 deletions

diff --git a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py
index aa95f037..77fa40bb 100755
--- a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py
+++ b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py
@@ -264,22 +264,55 @@ class EventsHandler(object):
             self.__async_event_port_job_done(port_id)
             show_event = True
 
-        # port was stolen...
+        # port was acquired - maybe stolen...
         elif (type == 5):
             session_id = data['session_id']
 
-            # false alarm, its us
+            port_id = int(data['port_id'])
+            who     = data['who']
+            force   = data['force']
+
+            # if we hold the port and it was not taken by this session - show it
+            if port_id in self.client.get_acquired_ports() and session_id != self.client.session_id:
+                show_event = True
+
+            # format the thief/us...
             if session_id == self.client.session_id:
-                return
+                user = 'you'
+            elif who == self.client.username:
+                user = 'another session of you'
+            else:
+                user = "'{0}'".format(who)
 
-            port_id = int(data['port_id'])
-            who = data['who']
+            if force:
+                ev = "Port {0} was forcely taken by {1}".format(port_id, user)
+            else:
+                ev = "Port {0} was taken by {1}".format(port_id, user)
 
-            ev = "Port {0} was forcely taken by '{1}'".format(port_id, who)
+            # call the handler in case its not this session
+            if session_id != self.client.session_id:
+                self.__async_event_port_acquired(port_id, who)
+
+
+        # port was released
+        elif (type == 6):
+            port_id     = int(data['port_id'])
+            who         = data['who']
+            session_id  = data['session_id']
+
+            if session_id == self.client.session_id:
+                user = 'you'
+            elif who == self.client.username:
+                user = 'another session of you'
+            else:
+                user = "'{0}'".format(who)
+
+            ev = "Port {0} was released by {1}".format(port_id, user)
+
+            # call the handler in case its not this session
+            if session_id != self.client.session_id:
+                self.__async_event_port_released(port_id)
 
-            # call the handler
-            self.__async_event_port_forced_acquired(port_id, who)
-            show_event = True
 
         # server stopped
         elif (type == 100):
@@ -317,9 +350,11 @@ class EventsHandler(object):
         self.client.ports[port_id].async_event_port_resumed()
 
 
-    def __async_event_port_forced_acquired (self, port_id, who):
-        self.client.ports[port_id].async_event_forced_acquired(who)
+    def __async_event_port_acquired (self, port_id, who):
+        self.client.ports[port_id].async_event_acquired(who)
 
+    def __async_event_port_released (self, port_id):
+        self.client.ports[port_id].async_event_released()
 
     def __async_event_server_stopped (self):
         self.client.connected = False
@@ -506,7 +541,7 @@ class STLClient(object):
 
 
         # API classes
-        self.api_vers = [ {'type': 'core', 'major': 1, 'minor':1 }
+        self.api_vers = [ {'type': 'core', 'major': 1, 'minor':2 }
                         ]
         self.api_h = {'core': None}
 
@@ -2038,6 +2073,11 @@ class STLClient(object):
 
         return wrap
 
+    @__console
+    def ping_line (self, line):
+        '''pings the server'''
+        self.ping()
+        return True
 
     @__console
     def connect_line (self, line):
@@ -2117,6 +2157,28 @@ class STLClient(object):
 
 
     @__console
+    def reacquire_line (self, line):
+        '''reacquire all the ports under your username which are not acquired by your session'''
+
+        parser = parsing_opts.gen_parser(self,
+                                         "reacquire",
+                                         self.reacquire_line.__doc__)
+
+        opts = parser.parse_args(line.split())
+        if opts is None:
+            return
+
+        # find all the on-owned ports under your name
+        my_unowned_ports = list_difference([k for k, v in self.ports.items() if v.get_owner() == self.username], self.get_acquired_ports())
+        if not my_unowned_ports:
+            self.logger.log("reacquire - no unowned ports under '{0}'".format(self.username))
+            return
+
+        self.acquire(ports = my_unowned_ports, force = True)
+        return True
+
+
+    @__console
     def disconnect_line (self, line):
         self.disconnect()
         
@@ -2491,15 +2553,20 @@ class STLClient(object):
         '''Sets port attributes '''
 
         parser = parsing_opts.gen_parser(self,
-                                         "port",
+                                         "port_attr",
                                          self.set_port_attr_line.__doc__,
                                          parsing_opts.PORT_LIST_WITH_ALL,
                                          parsing_opts.PROMISCUOUS_SWITCH)
 
-        opts = parser.parse_args(line.split())
+        opts = parser.parse_args(line.split(), default_ports = self.get_acquired_ports(), verify_acquired = True)
         if opts is None:
             return
 
+        # if no attributes - fall back to printing the status
+        if opts.prom is None:
+            self.show_stats_line("--ps --port {0}".format(' '.join(str(port) for port in opts.ports)))
+            return
+
         self.set_port_attr(opts.ports, opts.prom)
 
     
@@ -2592,5 +2659,4 @@ class STLClient(object):
 
         if opts.clear:
             self.clear_events()
-            self.logger.log(format_text("\nEvent log was cleared\n"))
-
+         
\ No newline at end of file
diff --git a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_port.py b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_port.py
index 6f6f50b1..16e55d73 100644
--- a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_port.py
+++ b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_port.py
@@ -96,9 +96,12 @@ class Port(object):
                   "handler": self.handler}
 
         rc = self.transmit("release", params)
-        self.handler = None
-
+        
         if rc.good():
+
+            self.handler = None
+            self.owner = ''
+
             return self.ok()
         else:
             return self.err(rc.err())
@@ -679,7 +682,10 @@ class Port(object):
         if not self.is_acquired():
             self.state = self.STATE_TX
 
-    def async_event_forced_acquired (self, who):
+    def async_event_acquired (self, who):
         self.handler = None
         self.owner = who
 
+    def async_event_released (self):
+        self.owner = ''
+
diff --git a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_stats.py b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_stats.py
index 6b1185ef..4057c50d 100644
--- a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_stats.py
+++ b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_stats.py
@@ -201,6 +201,10 @@ class CTRexInfoGenerator(object):
     def _get_rational_block_char(value, range_start, interval):
         # in Konsole, utf-8 is sometimes printed with artifacts, return ascii for now
         #return 'X' if value >= range_start + float(interval) / 2 else ' '
+
+        if sys.__stdout__.encoding != 'UTF-8':
+            return 'X' if value >= range_start + float(interval) / 2 else ' '
+
         value -= range_start
         ratio = float(value) / interval
         if ratio <= 0.0625:
@@ -532,7 +536,12 @@ class CTRexStats(object):
         v = self.get_trend(field, use_raw)
 
         value = abs(v)
-        arrow = u'\u25b2' if v > 0 else u'\u25bc'
+
+        # use arrows if utf-8 is supported
+        if sys.__stdout__.encoding == 'UTF-8':
+            arrow = u'\u25b2' if v > 0 else u'\u25bc'
+        else:
+            arrow = ''
 
         if sys.version_info < (3,0):
             arrow = arrow.encode('utf-8')
diff --git a/scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/text_opts.py b/scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/text_opts.py
index bc2d44f4..5c0dfb14 100644
--- a/scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/text_opts.py
+++ b/scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/text_opts.py
@@ -124,16 +124,9 @@ def underline(text):
 
 
 def text_attribute(text, attribute):
-    if isinstance(text, str):
-        return "{start}{txt}{stop}".format(start=TEXT_CODES[attribute]['start'],
-                                           txt=text,
-                                           stop=TEXT_CODES[attribute]['end'])
-    elif isinstance(text, unicode):
-        return u"{start}{txt}{stop}".format(start=TEXT_CODES[attribute]['start'],
-                                            txt=text,
-                                            stop=TEXT_CODES[attribute]['end'])
-    else:
-        raise Exception("not a string")
+    return "{start}{txt}{stop}".format(start=TEXT_CODES[attribute]['start'],
+                                       txt=text,
+                                       stop=TEXT_CODES[attribute]['end'])
 
 
 FUNC_DICT = {'blue': blue,