1 files changed, 91 insertions, 13 deletions

diff --git a/src/mock/trex_rpc_server_mock.cpp b/src/mock/trex_rpc_server_mock.cpp
index de43f92f..6e14390a 100644
--- a/src/mock/trex_rpc_server_mock.cpp
+++ b/src/mock/trex_rpc_server_mock.cpp
@@ -23,10 +23,65 @@ limitations under the License.
 #include <trex_stateless.h>
 
 #include <iostream>
+#include <sstream>
 #include <unistd.h>
+#include <string.h>
+#include <zmq.h>
 
 using namespace std;
 
+static TrexStateless *g_trex_stateless;
+static uint16_t g_rpc_port;
+
+static bool
+verify_tcp_port_is_free(uint16_t port) {
+    void *m_context = zmq_ctx_new();
+    void *m_socket  = zmq_socket (m_context, ZMQ_REP);
+    std::stringstream ss;
+    ss << "tcp://*:";
+    ss << port;
+
+    int rc = zmq_bind (m_socket, ss.str().c_str());
+
+    zmq_close(m_socket);
+    zmq_term(m_context);
+
+    return (rc == 0);
+}
+
+static uint16_t
+find_free_tcp_port(uint16_t start_port = 5050) {
+    void *m_context = zmq_ctx_new();
+    void *m_socket  = zmq_socket (m_context, ZMQ_REP);
+
+    uint16_t port = start_port;
+    while (true) {
+        std::stringstream ss;
+        ss << "tcp://*:";
+        ss << port;
+
+        int rc = zmq_bind (m_socket, ss.str().c_str());
+        if (rc == 0) {
+            break;
+        }
+
+        port++;
+    }
+
+    zmq_close(m_socket);
+    zmq_term(m_context);
+
+    return port;
+}
+
+TrexStateless * get_stateless_obj() {
+    return g_trex_stateless;
+}
+
+uint16_t gtest_get_mock_server_port() {
+    return g_rpc_port;
+}
+
 /**
  * on simulation this is not rebuild every version 
  * (improved stub) 
@@ -42,44 +97,66 @@ extern "C" const char * get_build_time(void){
 
 int gtest_main(int argc, char **argv);
 
-int main(int argc, char *argv[]) {
+static bool parse_uint16(const string arg, uint16_t &port) {
+    stringstream ss(arg);
+
+    bool x = (ss >> port);
+
+    return (x);
+}
 
+int main(int argc, char *argv[]) {
     bool is_gtest = false;
 
      // gtest ?
     if (argc > 1) {
-        if (string(argv[1]) != "--ut") {
-            cout << "\n[Usage] " << argv[0] << ": " << " [--ut]\n\n";
+        string arg = string(argv[1]);
+
+        if (arg == "--ut") {
+            g_rpc_port = find_free_tcp_port();
+            is_gtest = true;
+        } else if (parse_uint16(arg, g_rpc_port)) {
+            bool rc = verify_tcp_port_is_free(g_rpc_port);
+            if (!rc) {
+                cout << "port " << g_rpc_port << " is not available to use\n";
+                exit(-1);
+            }
+        } else {
+
+            cout << "\n[Usage] " << argv[0] << ": " << " [--ut] or [port number < 65535]\n\n";
             exit(-1);
         }
-        is_gtest = true;
+
+    } else {
+        g_rpc_port = find_free_tcp_port();
     }
 
     /* configure the stateless object with 4 ports */
     TrexStatelessCfg cfg;
 
-    TrexRpcServerConfig rpc_req_resp_cfg(TrexRpcServerConfig::RPC_PROT_TCP, 5050);
-    TrexRpcServerConfig rpc_async_cfg(TrexRpcServerConfig::RPC_PROT_TCP, 5051);
+    TrexRpcServerConfig rpc_req_resp_cfg(TrexRpcServerConfig::RPC_PROT_TCP, g_rpc_port);
+    //TrexRpcServerConfig rpc_async_cfg(TrexRpcServerConfig::RPC_PROT_TCP, 5051);
 
     cfg.m_port_count         = 4;
-    cfg.m_dp_core_count      = 2;
     cfg.m_rpc_req_resp_cfg   = &rpc_req_resp_cfg;
-    cfg.m_rpc_async_cfg      = &rpc_async_cfg;
+    cfg.m_rpc_async_cfg      = NULL;
     cfg.m_rpc_server_verbose = (is_gtest ? false : true);
+    cfg.m_platform_api       = new TrexMockPlatformApi();
 
-    TrexStateless::configure(cfg);
+    g_trex_stateless = new TrexStateless(cfg);
 
-    TrexStateless::get_instance().launch_control_plane();
+    g_trex_stateless->launch_control_plane();
 
     /* gtest handling */
     if (is_gtest) {
         int rc = gtest_main(argc, argv);
-        TrexStateless::destroy();
+        delete g_trex_stateless;
+        g_trex_stateless = NULL;
         return rc;
     }
 
     cout << "\n-= Starting RPC Server Mock =-\n\n";
-    cout << "Listening on tcp://localhost:5050 [ZMQ]\n\n";
+    cout << "Listening on tcp://localhost:" << g_rpc_port << " [ZMQ]\n\n";
 
     cout << "Server Started\n\n";
 
@@ -87,6 +164,7 @@ int main(int argc, char *argv[]) {
         sleep(1);
     }
 
-    TrexStateless::destroy();
+    delete g_trex_stateless;
+    g_trex_stateless = NULL;
 }