Commit ead3cfdb authored by YannGarcia's avatar YannGarcia
Browse files

Resolve conflict in scripts/update_mec_project.bash

parents f3d631d4 d9aa64dd

README.md

+1 −1
Original line number Original line Diff line number Diff line
@@ -12,7 +12,7 @@ See the attached LICENSE file or visit https://forge.etsi.org/legal-matters. 








## Standard links

## Standard links

- Mobile-Edge Computation standards, accessible [here](https://www.etsi.org/standards#page=1&search=MEC&title=1&etsiNumber=1&content=1&version=0&onApproval=1&published=1&historical=1&startDate=1988-01-15&endDate=2019-05-06&harmonized=0&keyword=&TB=&stdType=&frequency=&mandate=&collection=&sort=1)

- Multi-access Edge Computating standards, accessible [here](https://www.etsi.org/standards#page=1&search=MEC&title=1&etsiNumber=1&content=1&version=0&onApproval=1&published=1&historical=1&startDate=1988-01-15&endDate=2019-05-06&harmonized=0&keyword=&TB=&stdType=&frequency=&mandate=&collection=&sort=1).





## RFC links

## RFC links

- RFC 7159 - The JavaScript Object Notation (JSON) Data Interchange Format, accessible [here](https://tools.ietf.org/html/rfc7159.html)

- RFC 7159 - The JavaScript Object Notation (JSON) Data Interchange Format, accessible [here](https://tools.ietf.org/html/rfc7159.html)

ccsrc/Protocols/Json/json_codec.cc

+2 −1
Original line number Original line Diff line number Diff line
@@ -56,6 +56,7 @@ int json_codec::decode (const OCTETSTRING& p_data, LibItsHttp__JsonMessageBodyTy 
      return -1;

      return -1;

    }

    }

  }

  }

  loggers::get_instance().log("json_codec::decode: decode_str=%s", it->second.c_str());





  TTCN_EncDec::set_error_behavior(TTCN_EncDec::ET_ALL, TTCN_EncDec::EB_DEFAULT);

  TTCN_EncDec::set_error_behavior(TTCN_EncDec::ET_ALL, TTCN_EncDec::EB_DEFAULT);

  TTCN_EncDec::clear_error();

  TTCN_EncDec::clear_error();

ccsrc/externals/LibMec_ExternalFunctions.cc

+9 −2
Original line number Original line Diff line number Diff line
@@ -17,8 +17,7 @@ namespace LibMec__Functions { 
   * @return  Timestamp - current time since 01/01/2004 in milliseconds

   * @return  Timestamp - current time since 01/01/2004 in milliseconds

   * @see     fx_getCurrentTime() return TimestampIts

   * @see     fx_getCurrentTime() return TimestampIts

   */

   */

  INTEGER fx__getCurrentTime(

  INTEGER fx__getCurrentTime() {

) {

    INTEGER i;

    INTEGER i;

    i.set_long_long_val(base_time::get_instance().get_its_current_time_ms());

    i.set_long_long_val(base_time::get_instance().get_its_current_time_ms());

    loggers::get_instance().log_msg("<<< fx__getCurrentTime: ", i);

    loggers::get_instance().log_msg("<<< fx__getCurrentTime: ", i);
@@ -35,4 +34,12 @@ namespace LibMec__Functions { 
    return i;

    return i;

  }

  }





  /**

   * @desc    Convert a float value into a string

   * @return  The string formated value

   */

  CHARSTRING fx__float2str(const FLOAT& p_value) {

    return float2str(p_value);

  }



} // end of Namespace
 
} // end of Namespace

etc/AtsMec/AtsMec_AdvantEDGE.cfg

+6 −2
Original line number Original line Diff line number Diff line
@@ -49,6 +49,7 @@ LogEventTypes:= Yes 
[TESTPORT_PARAMETERS]

[TESTPORT_PARAMETERS]

# In this section you can specify parameters that are passed to Test Ports.

# In this section you can specify parameters that are passed to Test Ports.

system.httpPort.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server=172.22.1.6,port=31007,use_ssl=0)"

system.httpPort.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server=172.22.1.6,port=31007,use_ssl=0)"

#system.httpPort.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server=172.28.4.253,port=30007,use_ssl=0)"

system.httpPort_notif.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server_mode=1,local_port=8081,use_ssl=0)"

system.httpPort_notif.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server_mode=1,local_port=8081,use_ssl=0)"





[DEFINE]

[DEFINE]
@@ -82,10 +83,10 @@ system.httpPort_notif.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server 
#AtsMec_UEidentityAPI_TestCases.TC_MEC_SRV_UETAG_002_BR

#AtsMec_UEidentityAPI_TestCases.TC_MEC_SRV_UETAG_002_BR

#AtsMec_UEidentityAPI_TestCases.TC_MEC_SRV_UETAG_002_PF

#AtsMec_UEidentityAPI_TestCases.TC_MEC_SRV_UETAG_002_PF





# ETSI GS MEC 013

#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCLOOK_001_OK

#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCLOOK_001_OK

#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCLOOK_001_BR

#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCLOOK_001_BR

AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCLOOK_001_NF

#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCLOOK_001_NF







#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCSUB_001_OK

#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCSUB_001_OK

#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCSUB_001_BR

#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCSUB_001_BR
@@ -106,6 +107,9 @@ AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCLOOK_001_NF 
#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UEINFSUB_002_OK

#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UEINFSUB_002_OK

#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UEINFSUB_002_NF

#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UEINFSUB_002_NF





AtsMec_RadioNodeLocationAPI_TestCases.TC_MEC_SRV_RLOCLOOK_001_OK

AtsMec_RadioNodeLocationAPI_TestCases.TC_MEC_SRV_RLOCLOOK_001_NF



#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_011_OK

#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_011_OK

#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_012_OK

#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_012_OK

#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_011_BR

#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_011_BR

scripts/mec_generate_makefile.bash

+1 −1
Original line number Original line Diff line number Diff line
@@ -52,7 +52,7 @@ find .. -type f -name "*.bak" -exec rm {} \; 
find .. -type f -name "*.log" -exec rm {} \;

find .. -type f -name "*.log" -exec rm {} \;





# Build JSON files if any and put them in objs directory

# Build JSON files if any and put them in objs directory

REFERENCES="LibCommon LibHttp LibMec LibMec/LocationAPI LibMec/RnisAPI LibMec/UEidentityAPI LibMec/BwManagementAPI"

REFERENCES="LibCommon LibHttp LibMec LibMec/Ams LibMec/AppEna LibMec/AppLCM LibMec/BwManagementAPI LibMec/FixedAccessInformationAPI LibMec/Grant LibMec/LocationAPI LibMec/MeoPkgm LibMec/MepmPkgm LibMec/RnisAPI LibMec/UEidentityAPI"

for i in ${REFERENCES}

for i in ${REFERENCES}

do

do

    # TTCN code

    # TTCN code