Commit 6a8f7c13 authored by Yann Garcia's avatar Yann Garcia
Browse files

Validate IVIM & MAPEM ATS

parent de017eb8

ccsrc/EncDec/LibItsMapemSpatem_Encdec.cc

+4 −4
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ namespace LibItsMapemSpatem__EncdecDeclarations { 
    return 0;

  }



  BITSTRING fx__enc__Mapem(const MAPEM__PDU__Descriptions::MAPEM& p_mapem)

  BITSTRING fx__enc__MAPEM(const MAPEM__PDU__Descriptions::MAPEM& p_mapem)

  {

    loggers::get_instance().log_msg(">>> fx__enc__Mapem: ", p_mapem);
@@ -182,7 +182,7 @@ namespace LibItsMapemSpatem__EncdecDeclarations { 
    return oct2bit(os);

  }



  INTEGER fx__dec__Mapem(BITSTRING& b, MAPEM__PDU__Descriptions::MAPEM& p)

  INTEGER fx__dec__MAPEM(BITSTRING& b, MAPEM__PDU__Descriptions::MAPEM& p)

  {

    loggers::get_instance().log(">>> fx__dec__Mapem");

    mapem_codec codec;
@@ -360,7 +360,7 @@ namespace LibItsMapemSpatem__EncdecDeclarations { 
    return 0;

  }



  BITSTRING fx__enc__Spatem(const SPATEM__PDU__Descriptions::SPATEM& p_spatem)

  BITSTRING fx__enc__SPATEM(const SPATEM__PDU__Descriptions::SPATEM& p_spatem)

  {

    loggers::get_instance().log_msg(">>> fx__enc__Spatem: ", p_spatem);
@@ -370,7 +370,7 @@ namespace LibItsMapemSpatem__EncdecDeclarations { 
    return oct2bit(os);

  }



  INTEGER fx__dec__Spatem(BITSTRING& b, SPATEM__PDU__Descriptions::SPATEM& p_spatem)

  INTEGER fx__dec__SPATEM(BITSTRING& b, SPATEM__PDU__Descriptions::SPATEM& p_spatem)

  {

    loggers::get_instance().log(">>> fx__dec__Spatem");

ccsrc/Framework/params.hh

+3 −2
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ public: //! \publicsection 
  static const std::string& btp_destination_port;  //! BTP DestinationPort parameter name

  static const std::string& btp_info;              //! BTP Info parameter name

  static const std::string& ssem_destination_port; //! BTP Destination port for SSEM

  static const std::string& spatem_destination_port;//! BTP Destination port for SPATEM



  static const std::string& nic;                   //! Network Interface Card parameter name

  static const std::string& ll_address;            //! Test system GeoNetworking LL-Address parameter name

ccsrc/Framework/src/params.cc

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ const std::string& params::btp_payload = std::string("btp_payload"); 
const std::string& params::btp_destination_port = std::string("dst_port");

const std::string& params::btp_info = std::string("btp_info");

const std::string& params::ssem_destination_port = std::string("ssem_port");

const std::string& params::spatem_destination_port = std::string("spatem_port");



const std::string& params::nic = std::string("nic");

const std::string& params::latitude = std::string("latitude");

ccsrc/Ports/LibIts_ports/IVIM_ports/UpperTesterPort_IVIM.partC

+3 −1
Original line number Diff line number Diff line
@@ -132,7 +132,9 @@ namespace LibItsIvim__TestSystem { 
    loggers::get_instance().log("UpperTesterPort_Ivim::receive_msg: %s", p_ind.get_descriptor()->name);

    if (std::string(p_ind.get_descriptor()->name).compare("@LibItsIvim_TypesAndValues.UtIvimResults") == 0) { // TODO To be refined

      incoming_message((LibItsIvim__TypesAndValues::UtIvimResults&)p_ind);

    } // TODO Implement UtIvimEventInd part

    } else if (std::string(p_ind.get_descriptor()->name).compare("@LibItsIvim_TypesAndValues.UtIvimEventInd") == 0) {

      incoming_message(static_cast<const LibItsIvim__TypesAndValues::UtIvimEventInd&>(p_ind));

    }

  }



} /* end of namespace */

ccsrc/Ports/LibIts_ports/MapemSpatem_ports/UpperTesterPort_MapemSpatem.partC

+7 −1
Original line number Diff line number Diff line
@@ -112,7 +112,13 @@ namespace LibItsMapemSpatem__TestSystem { 
    loggers::get_instance().log("UpperTesterPort_MapemSpatem::receive_msg: %s", p_ind.get_descriptor()->name);

    if (std::string(p_ind.get_descriptor()->name).compare("@LibItsMapemSpatem_TypesAndValues.UtMapemSpatemResults") == 0) { // TODO To be refined

      incoming_message((LibItsMapemSpatem__TypesAndValues::UtMapemSpatemResults&)p_ind);

    } // TODO Implement UtMapemSpatemEventInd part

    } else if (std::string(p_ind.get_descriptor()->name).compare("@LibItsMapemSpatem_TypesAndValues.UtMapemEventInd") == 0) {

      incoming_message(static_cast<const LibItsMapemSpatem__TypesAndValues::UtMapemEventInd&>(p_ind));

    } else if (std::string(p_ind.get_descriptor()->name).compare("@LibItsMapemSpatem_TypesAndValues.UtSpatemEventInd") == 0) {

      incoming_message(static_cast<const LibItsMapemSpatem__TypesAndValues::UtSpatemEventInd&>(p_ind));

    } else {

      loggers::get_instance().warning("UpperTesterPort_MapemSpatem::receive_msg: Message not processed: %s", p_ind.get_descriptor()->name);

    }

  }



} /* end of namespace */