Commit 609d3929 authored by Yann Garcia's avatar Yann Garcia
Browse files

Adding UpperTester to manage UEs using AT commands

parent b394e28b
Loading
Loading
Loading
Loading
+1 −1
Changes for NAS_ETSI.code-workspace: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@
			"path": "../UERANSIM"
		},
		{
			"path": "../titan-test-system-framework-Release3-onwards"
			"path": "../titan-test-system-framework-Release4-onwards"
		}
	],
	"settings": {
−614 B (2.05 KiB)

File changed.

No diff preview for this file type.

+1 −1
Changes for ccsrc/Externals/ia2_128.cc: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -384,7 +384,7 @@ int ia2_128::generate_input_block(const uint32_t count,

  loggers::get_instance().log("ia2_128::generate_input_block: *input_block_length: %d", *input_block_length);
  *input_block_length = total_length;
  loggers::get_instance().log_to_hexa("<<< ia2_128::generate_input_block: ptr", static_cast<const uint8_t*>(*input_block), *input_block_length * sizeof(uint32_t));
  loggers::get_instance().log_to_hexa("<<< ia2_128::generate_input_block: ptr", static_cast<const uint8_t*>(*input_block), *input_block_length);
  return 0;
}
+2 −0
Changes for ccsrc/Externals/upper_terster.cc: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@ INTEGER fx__ut__start__ue(const CHARSTRING& p__binary__file, const CHARSTRING& p
        ue_proc.start(static_cast<const char*>(p__binary__file), {}, opts);
      } else {
        ue_proc.start(static_cast<const char*>(p__binary__file), { "-c", static_cast<const char*>(p__config__file) }, opts);
        // Add timout to wait for the UE to start and reach stable state
        std::this_thread::sleep_for(std::chrono::seconds(2));
      }
    }
  catch (const std::exception& e) {
+140 −0
Changes for ccsrc/Ports/UpperTester/MTC_System_Ut.cc: 140 added lines, 0 removed lines.
Original line number Diff line number Diff line
/*!
 * \file      MTC__System__Ut.cc
 * \brief     CC file for MTC__System__Ut.
 * \author    ETSI TTF041
 * \copyright ETSI Copyright Notification
 *            No part may be reproduced except as authorized by written permission.
 *            The copyright and the foregoing restriction extend to reproduction in all media.
 *            All rights reserved.
 * \version   0.1
 */

#include "loggers.hh"

#include "MTC_System_Ut.hh"
#include "ut_layer_factory.hh"

#include "layer.hh"
#include "params.hh"

namespace UpperTesterCommon{
  class UT__SYSTEM__REQ;
  class UT__COMMON__CNF;
}
namespace UpperTesterCommon {

  MTC__System__Ut::MTC__System__Ut(const char *par_port_name): MTC__System__Ut_BASE(par_port_name), _cfg_params(), _layer_params(), _layer(nullptr), _time_key("MTC__System__Ut::") {
    // Nothing to do
  } // End of constructor

  MTC__System__Ut::~MTC__System__Ut() {
    loggers::get_instance().log(">>> MTC__System__Ut::~MTC__System__Ut");

    if (_layer != nullptr) {
      delete _layer;
    }
  } // End of destructor

  void MTC__System__Ut::set_parameter(const char * parameter_name, const char * parameter_value)
  {
    loggers::get_instance().log("MTC__System__Ut::set_parameter: %s=%s", parameter_name, parameter_value);
    _cfg_params.insert(std::pair<std::string, std::string>(std::string(parameter_name), std::string(parameter_value)));
  }

  /*void HttpPort::Handle_Fd_Event(int fd, boolean is_readable,
    boolean is_writable, boolean is_error) {}*/
  
  void MTC__System__Ut::Handle_Fd_Event_Error(int /*fd*/)
  {

  }

  void MTC__System__Ut::Handle_Fd_Event_Writable(int /*fd*/)
  {

  }

  void MTC__System__Ut::Handle_Fd_Event_Readable(int /*fd*/)
  {

  }

  /*void HttpPort::Handle_Timeout(double time_since_last_call) {}*/
  
  void MTC__System__Ut::user_map(const char * system_port)
  {
    loggers::get_instance().log(">>> MTC__System__Ut::user_map: %s", system_port);
    // Build layer stack
    params::iterator it = _cfg_params.find(std::string("params"));
    if (it != _cfg_params.end()) {
      loggers::get_instance().log("MTC__System__Ut::user_map: %s", it->second.c_str());
      // Setup parameters
      params::convert(_layer_params, it->second); // TODO This _layer_params seems to be useless
      // Create layer
      _layer = layer_stack_builder::get_instance()->create_layer_stack(it->second.c_str());

      if (static_cast<ut_layer*>(_layer) == nullptr) {
        loggers::get_instance().error("MTC__System__Ut::user_map: Invalid stack configurationi - NOT SCTP: %s", it->second.c_str());
      }
      static_cast<ut_layer*>(_layer)->add_upper_port(this);
     
      /*IJ commented out // Create layer
      _layer = layer_stack_builder::get_instance()->create_layer_stack(it->second.c_str());
      if (static_cast<ut_layer*>(_layer) == NULL) {
        loggers::get_instance().error("MTC__System__Ut::user_map: Invalid stack configuration: %s", it->second.c_str());
      } 
      static_cast<ut_layer*>(_layer)->add_upper_port(this);*/
    } else {
      loggers::get_instance().error("MTC__System__Ut::user_map: No layers defined in configuration file");
    }
  } // End of user_map method

  void MTC__System__Ut::user_unmap(const char * system_port)
  {
    loggers::get_instance().log(">>> MTC__System__Ut:user_unmap: %s", system_port);

    // Reset layers
    if (_layer != nullptr) {
      delete _layer;
      _layer = nullptr;
    }
  } // End of user_unmap method

  void MTC__System__Ut::user_start()
  {
    loggers::get_instance().log(">>> MTC__System__Ut::user_start");

  } // End of user_start method

  void MTC__System__Ut::user_stop()
  {
    loggers::get_instance().log(">>> MTC__System__Ut::user_stop");

  } // End of user_stop method

  void MTC__System__Ut::outgoing_send(const UpperTesterCommon::UT__SYSTEM__REQ& send_par)
  {
    loggers::get_instance().log_msg(">>> MTC__System__Ut::outgoing_send: payload=", send_par);
    
    float duration;
    loggers::get_instance().set_start_time(_time_key);
    params params;
        static_cast<ut_layer*>(_layer)->sendMsg(send_par, params);
    loggers::get_instance().set_stop_time(_time_key, duration);
  }

  void MTC__System__Ut::receiveMsg (const  UpperTesterCommon::UT__COMMON__CNF& p_ind, const params& p_params) {
    loggers::get_instance().log_msg(">>> MTC__System__Ut::receive_msg: ", p_ind);
    float duration;
    loggers::get_instance().set_start_time(_time_key);
    // Sanity check
    if (!p_ind.is_bound()) {
      return;
    }

    incoming_message(p_ind);
    loggers::get_instance().set_stop_time(_time_key, duration);
  }
  
} // End of namespace UpperTesterCommon
Loading