support for reacquire command

also better sync with the server about ownership of ports

3 files changed, 70 insertions, 15 deletions

diff --git a/scripts/automation/trex_control_plane/stl/console/trex_console.py b/scripts/automation/trex_control_plane/stl/console/trex_console.py
index 00d2a028..589f1d35 100755
--- a/scripts/automation/trex_control_plane/stl/console/trex_console.py
+++ b/scripts/automation/trex_control_plane/stl/console/trex_console.py
@@ -421,6 +421,9 @@ class TRexConsole(TRexGeneralCmd):
         '''Release ports\n'''
         self.stateless_client.release_line(line)
 
+    def do_reacquire (self, line):
+        '''reacquire all the ports under your logged user name'''
+        self.stateless_client.reacquire_line(line)
 
     def help_acquire (self):
         self.do_acquire("-h")
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 12ed1f81..76fbf3b8 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}
 
@@ -2122,6 +2157,17 @@ class STLClient(object):
 
 
     @__console
+    def reacquire_line (self, line):
+        '''reacquire all the ports under your username'''
+        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()
         
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 = ''
+