RX stats two stage API (stop and remove RX filters)

9 files changed, 152 insertions, 12 deletions

diff --git a/scripts/automation/trex_control_plane/stl/examples/stl_imix.py b/scripts/automation/trex_control_plane/stl/examples/stl_imix.py
index 7e43488b..0ca932c8 100644
--- a/scripts/automation/trex_control_plane/stl/examples/stl_imix.py
+++ b/scripts/automation/trex_control_plane/stl/examples/stl_imix.py
@@ -16,7 +16,8 @@ def imix_test (server, mult):
     
 
     # create client
-    c = STLClient(server = server)
+    c = STLClient(server = server, verbose_level = LoggerApi.VERBOSE_REGULAR)
+    
     passed = True
 
 
@@ -27,6 +28,7 @@ def imix_test (server, mult):
 
         # take all the ports
         c.reset()
+        
 
         # map ports - identify the routes
         table = stl_map_ports(c)
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 6fdc3454..f6b5d49c 100644
--- 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
@@ -852,8 +852,26 @@ class STLClient(object):
         return RC_OK()
 
 
- 
- 
+    # remove all RX filters in a safe manner
+    def _remove_rx_filters (self, ports, rx_delay_ms):
+
+        # get the enabled RX ports
+        rx_ports = [port_id for port_id in ports if self.ports[port_id].has_rx_enabled()]
+
+        if not rx_ports:
+            return RC_OK()
+
+        # block while any RX configured port has not yet have it's delay expired
+        while any([not self.ports[port_id].has_rx_delay_expired(rx_delay_ms) for port_id in rx_ports]):
+            time.sleep(0.01)
+
+        # remove RX filters
+        rc = RC()
+        for port_id in rx_ports:
+            rc.add(self.ports[port_id].remove_rx_filters())
+
+        return rc
+
 
     #################################
     # ------ private methods ------ #
@@ -1089,6 +1107,7 @@ class STLClient(object):
                 for port_id, port_obj in self.ports.items()
                 if port_obj.is_active()]
 
+
     # get paused ports
     def get_paused_ports (self):
         return [port_id
@@ -1336,7 +1355,7 @@ class STLClient(object):
         ports = self._validate_port_list(ports)
 
         self.acquire(ports, force = True)
-        self.stop(ports)
+        self.stop(ports, rx_delay_ms = 0)
         self.remove_all_streams(ports)
         self.clear_stats(ports)
 
@@ -1535,7 +1554,7 @@ class STLClient(object):
 
     
     @__api_check(True)
-    def stop (self, ports = None):
+    def stop (self, ports = None, rx_delay_ms = 10):
         """
             stop port(s)
 
@@ -1543,6 +1562,13 @@ class STLClient(object):
                 ports : list
                     ports to execute the command
 
+                rx_delay_ms : int
+                    time to wait until RX filters are removed
+                    this value should reflect the time it takes
+                    packets which were transmitted to arrive
+                    to the destination.
+                    after this time the RX filters will be removed
+
             :raises:
                 + :exc:`STLError`
 
@@ -1561,6 +1587,11 @@ class STLClient(object):
         if not rc:
             raise STLError(rc)
 
+        # remove any RX filters
+        rc = self._remove_rx_filters(ports, rx_delay_ms = rx_delay_ms)
+        if not rc:
+            raise STLError(rc)
+
         
     @__api_check(True)
     def update (self, ports = None, mult = "1", total = False, force = False):
@@ -2025,7 +2056,7 @@ class STLClient(object):
             self.logger.log(format_text("No active traffic on provided ports\n", 'bold'))
             return
 
-        self.stop(ports)
+        self.stop(ports, rx_delay_ms = 2000)
 
         # true means print time
         return True
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 47124114..049929ae 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
@@ -7,8 +7,8 @@ from .trex_stl_types import *
 from . import trex_stl_stats
 
 import base64
-import time
 import copy
+from datetime import datetime, timedelta
 
 StreamOnPort = namedtuple('StreamOnPort', ['compiled_stream', 'metadata'])
 
@@ -61,6 +61,8 @@ class Port(object):
         self.port_stats = trex_stl_stats.CPortStats(self)
 
         self.next_available_id = 1
+        self.tx_stopped_ts = None
+        self.has_rx_streams = False
 
 
     def err(self, msg):
@@ -239,6 +241,9 @@ class Port(object):
                                            'rate' : streams_list[i].get_rate()}
 
                 ret.add(RC_OK(data = stream_id))
+
+                self.has_rx_streams = self.has_rx_streams or streams_list[i].has_flow_stats()
+
             else:
                 ret.add(RC(*single_rc))
 
@@ -283,6 +288,9 @@ class Port(object):
 
         self.state = self.STATE_STREAMS if (len(self.streams) > 0) else self.STATE_IDLE
 
+        # recheck if any RX stats streams present on the port
+        self.has_rx_streams = any([stream.has_flow_stats() for stream in self.streams])
+
         return self.ok() if rc else self.err(rc.err())
 
 
@@ -305,6 +313,7 @@ class Port(object):
         self.streams = {}
 
         self.state = self.STATE_IDLE
+        self.has_rx_streams = False
 
         return self.ok()
 
@@ -351,7 +360,7 @@ class Port(object):
     # stop traffic
     # with force ignores the cached state and sends the command
     def stop (self, force = False):
-
+        
         if not self.is_acquired():
             return self.err("port is not owned")
 
@@ -360,7 +369,6 @@ class Port(object):
             if (self.state == self.STATE_IDLE) or (self.state == self.state == self.STATE_STREAMS):
                 return self.ok()
 
-
         params = {"handler": self.handler,
                   "port_id": self.port_id}
 
@@ -370,8 +378,56 @@ class Port(object):
 
         self.state = self.STATE_STREAMS
 
+        # timestamp for last tx
+        self.tx_stopped_ts = datetime.now()
+
+        return self.ok()
+
+
+    # return True if port has any stream configured with RX stats
+    def has_rx_enabled (self):
+        return self.has_rx_streams
+
+
+    # return true if rx_delay_ms has passed since the last port stop
+    def has_rx_delay_expired (self, rx_delay_ms):
+        assert(self.has_rx_enabled())
+
+        # if active - it's not safe to remove RX filters
+        if self.is_active():
+            return False
+
+        # either no timestamp present or time has already passed
+        return not self.tx_stopped_ts or (datetime.now() - self.tx_stopped_ts) > timedelta(milliseconds = rx_delay_ms)
+
+
+
+    def remove_rx_filters (self):
+        assert(self.has_rx_enabled())
+
+        if not self.is_acquired():
+            return self.err("port is not owned")
+
+        if self.state == self.STATE_DOWN:
+            return self.err("Unable to remove RX filters - port is down")
+
+        if self.state == self.STATE_TX:
+            return self.err("Unable to remove RX filters - port is transmitting")
+
+        if self.state == self.STATE_IDLE:
+            return self.ok()
+
+
+        params = {"handler": self.handler,
+                  "port_id": self.port_id}
+
+        rc = self.transmit("remove_rx_filters", params)
+        if rc.bad():
+            return self.err(rc.err())
+
         return self.ok()
 
+
     def pause (self):
 
         if not self.is_acquired():
@@ -597,6 +653,8 @@ class Port(object):
 
   ################# events handler ######################
     def async_event_port_job_done (self):
+        # until thread is locked - order is important
+        self.tx_stopped_ts = datetime.now()
         self.state = self.STATE_STREAMS
 
     # rest of the events are used for TUI / read only sessions
diff --git a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_streams.py b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_streams.py
index 4f8ce3e6..b6780c5e 100644
--- a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_streams.py
+++ b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_streams.py
@@ -430,6 +430,10 @@ class STLStream(object):
         return self.next
 
 
+    def has_flow_stats (self):
+        """ Return True if stream was configured with flow stats """
+        return self.fields['flow_stats']['enabled']
+
     def get_pkt (self):
         """ Get packet as string """
         return self.pkt
diff --git a/src/rpc-server/commands/trex_rpc_cmd_stream.cpp b/src/rpc-server/commands/trex_rpc_cmd_stream.cpp
index ea24c33a..40719325 100644
--- a/src/rpc-server/commands/trex_rpc_cmd_stream.cpp
+++ b/src/rpc-server/commands/trex_rpc_cmd_stream.cpp
@@ -590,6 +590,27 @@ TrexRpcCmdStopTraffic::_run(const Json::Value &params, Json::Value &result) {
 }
 
 /***************************
+ * remove all hardware filters
+ * 
+ **************************/
+trex_rpc_cmd_rc_e
+TrexRpcCmdRemoveRXFilters::_run(const Json::Value &params, Json::Value &result) {
+
+    uint8_t port_id = parse_port(params, result);
+    TrexStatelessPort *port = get_stateless_obj()->get_port_by_id(port_id);
+
+    try {
+        port->remove_rx_filters();
+    } catch (const TrexException &ex) {
+        generate_execute_err(result, ex.what());
+    }
+
+    result["result"] = Json::objectValue;
+
+    return (TREX_RPC_CMD_OK);
+}
+
+/***************************
  * get all streams
  * 
  **************************/
diff --git a/src/rpc-server/commands/trex_rpc_cmds.h b/src/rpc-server/commands/trex_rpc_cmds.h
index c4b01b85..dbf90fef 100644
--- a/src/rpc-server/commands/trex_rpc_cmds.h
+++ b/src/rpc-server/commands/trex_rpc_cmds.h
@@ -116,6 +116,7 @@ TREX_RPC_CMD_DEFINE(TrexRpcCmdGetStream, "get_stream", 3, false);
 
 TREX_RPC_CMD_DEFINE(TrexRpcCmdStartTraffic,  "start_traffic", 4, true);
 TREX_RPC_CMD_DEFINE(TrexRpcCmdStopTraffic,   "stop_traffic", 1, true);
+TREX_RPC_CMD_DEFINE(TrexRpcCmdRemoveRXFilters, "remove_rx_filters", 1, true);
 TREX_RPC_CMD_DEFINE(TrexRpcCmdPauseTraffic,  "pause_traffic", 1, true);
 TREX_RPC_CMD_DEFINE(TrexRpcCmdResumeTraffic, "resume_traffic", 1, true);
 
diff --git a/src/rpc-server/trex_rpc_cmds_table.cpp b/src/rpc-server/trex_rpc_cmds_table.cpp
index e1bd3eee..c9b41595 100644
--- a/src/rpc-server/trex_rpc_cmds_table.cpp
+++ b/src/rpc-server/trex_rpc_cmds_table.cpp
@@ -61,6 +61,8 @@ TrexRpcCommandsTable::TrexRpcCommandsTable() {
     register_command(new TrexRpcCmdResumeTraffic());
     register_command(new TrexRpcCmdUpdateTraffic());
 
+    register_command(new TrexRpcCmdRemoveRXFilters());
+
     register_command(new TrexRpcCmdValidate());
 }
 
diff --git a/src/stateless/cp/trex_stateless_port.cpp b/src/stateless/cp/trex_stateless_port.cpp
index 90589d7a..6a33fcee 100644
--- a/src/stateless/cp/trex_stateless_port.cpp
+++ b/src/stateless/cp/trex_stateless_port.cpp
@@ -272,6 +272,22 @@ TrexStatelessPort::stop_traffic(void) {
 }
 
 /**
+ * remove all RX filters from port
+ * 
+ * @author imarom (28-Mar-16)
+ */
+void
+TrexStatelessPort::remove_rx_filters(void) {
+    /* only valid when IDLE or with streams and not TXing */
+    verify_state(PORT_STATE_STREAMS);
+
+    for (auto entry : m_stream_table) {
+        get_stateless_obj()->m_rx_flow_stat.stop_stream(entry.second);
+    }
+
+}
+
+/**
  * when a port stops, perform various actions
  * 
  */
@@ -287,9 +303,6 @@ TrexStatelessPort::common_port_stop_actions(bool async) {
         get_stateless_obj()->get_publisher()->publish_event(TrexPublisher::EVENT_PORT_STOPPED, data);
     }
 
-    for (auto entry : m_stream_table) {
-        get_stateless_obj()->m_rx_flow_stat.stop_stream(entry.second);
-    }
 }
 
 void
diff --git a/src/stateless/cp/trex_stateless_port.h b/src/stateless/cp/trex_stateless_port.h
index 7e1838d4..7aa3bfa8 100644
--- a/src/stateless/cp/trex_stateless_port.h
+++ b/src/stateless/cp/trex_stateless_port.h
@@ -178,6 +178,14 @@ public:
     void stop_traffic(void);
 
     /**
+     * remove all RX filters 
+     * valid only when port is stopped 
+     * 
+     * @author imarom (28-Mar-16)
+     */
+    void remove_rx_filters(void);
+
+    /**
      * pause traffic
      * throws TrexException in case of an error
      */