Commit 57cd07aa authored by Elian Kraja's avatar Elian Kraja
Browse files

Solving merge conflict

parents e2a121d9 347d2da6

TODO.md

+37 −0
Original line number Diff line number Diff line
@@ -3,6 +3,43 @@ 
## Introduction

This file provides the list of the TODOs related to the STF 569.



## MEO



### UEAPPCTX



ETSI GS MEC 016 V2.1.1



https://forge.etsi.org/rep/mec/gs032p2-test-purposes/blob/master/Test%20Purposes/MEO/UEAPPCTX/SysUeAppsContext.tplan2





- TC_MEC_MEO_UEAPPCTX_001_OK       <font color="color:green">To be tested</font>



- TC_MEC_MEO_UEAPPCTX_001_BR       <font color="color:green">To be tested</font>



- TC_MEC_MEO_UEAPPCTX_002_OK       <font color="color:green">To be tested</font>



- TC_MEC_MEO_UEAPPCTX_002_BR       <font color="color:green">To be tested</font>



- TC_MEC_MEO_UEAPPCTX_002_NF       <font color="color:green">To be tested</font>



- TC_MEC_MEO_UEAPPCTX_003_OK       <font color="color:green">To be tested</font>



- TC_MEC_MEO_UEAPPCTX_003_NF       <font color="color:green">To be tested</font>



- TC_MEC_MEO_UEAPPS_001_OK         <font color="color:green">To be tested</font>



- TC_MEC_MEO_UEAPPS_001_BR         <font color="color:green">To be tested</font>



- TC_MEC_MEO_UEAPPS_001_NF         <font color="color:green">To be tested</font>





### UEAPPS



ETSI GS MEC 016 V2.1.1



https://forge.etsi.org/rep/mec/gs032p2-test-purposes/blob/master/Test%20Purposes/MEO/UEAPPS/SysUeApplications.tplan2





## SRV



### AMS

ccsrc/Protocols/Json/json_codec.cc

+12 −0
Original line number Diff line number Diff line
@@ -28,6 +28,10 @@ int json_codec::encode (const LibItsHttp__JsonMessageBodyTypes::JsonBody& msg, O 
    const RnisAPI__TypesAndValues::CellChangeSubscription& cell_change_subscription = msg.cellChangeSubscription();

    cell_change_subscription.encode(RnisAPI__TypesAndValues::CellChangeSubscription_descr_, encoding_buffer, TTCN_EncDec::CT_JSON);

    data = char2oct(CHARSTRING("{\"CellChangeSubscription\": ")) + OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()) + char2oct(CHARSTRING("}"));

  } else if (msg.ischosen(LibItsHttp__JsonMessageBodyTypes::JsonBody::ALT_appContext)) {

    const UEAppInterfaceAPI__TypesAndValues::AppContext& appContext = msg.appContext();

    appContext.encode(UEAppInterfaceAPI__TypesAndValues::AppContext_descr_, encoding_buffer, TTCN_EncDec::CT_JSON);

    data = char2oct(CHARSTRING("{\"AppContext\": ")) + OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()) + char2oct(CHARSTRING("}"));

  } else {

    loggers::get_instance().error("json_codec::encode: Not supported");

  }
@@ -235,6 +239,14 @@ int json_codec::decode (const OCTETSTRING& p_data, LibItsHttp__JsonMessageBodyTy 
    RnisAPI__TypesAndValues::RabRelSubscription rab_rel_subscription;

    rab_rel_subscription.decode(RnisAPI__TypesAndValues::RabRelSubscription_descr_, decoding_buffer, TTCN_EncDec::CT_JSON);

    msg.rabRelSubscription() = rab_rel_subscription;

  } else if (it->second.find("\"AppContext\"") != std::string::npos) {

    UEAppInterfaceAPI__TypesAndValues::AppContext appContext;

    appContext.decode(UEAppInterfaceAPI__TypesAndValues::AppContext_descr_, decoding_buffer, TTCN_EncDec::CT_JSON);

    msg.appContext() = appContext;

  } else if (it->second.find("\"AppInfo\"") != std::string::npos) {

    UEAppInterfaceAPI__TypesAndValues::AppInfo appInfo;

    appInfo.decode(UEAppInterfaceAPI__TypesAndValues::AppInfo_descr_, decoding_buffer, TTCN_EncDec::CT_JSON);

    msg.appInfo() = appInfo;

  } else if (it->second.find("\"bwInfo\"") != std::string::npos) {

    BwManagementAPI__TypesAndValues::BwInfo bw_info;

ttcn/AtsMec/AtsMec_AppEnablementAPI_TestCases.ttcn

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ module AtsMec_AppEnablementAPI_TestCases { 
  import from LibItsHttp_JsonTemplates all;

  import from LibItsHttp_TestSystem all;

  

  // LibMec_AppEnablementAPI

  // LibMec/AppEnablementAPI

  import from AppEnablementAPI_Templates all;

  import from AppEnablementAPI_Pics all;

  import from AppEnablementAPI_Pixits all;

ttcn/AtsMec/AtsMec_LocationAPI_TestCases.ttcn

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ module AtsMec_LocationAPI_TestCases { 
  import from LibItsHttp_JsonTemplates all;

  import from LibItsHttp_TestSystem all;

  

  // LibMec_LocationAPI

  // LibMec/LocationAPI

  import from LocationAPI_Templates all;

  import from LocationAPI_Pics all;

  import from LocationAPI_Pixits all;

ttcn/AtsMec/AtsMec_RadioNodeLocationAPI_TestCases.ttcn

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ module AtsMec_RadioNodeLocationAPI_TestCases { 
  import from LibItsHttp_JsonTemplates all;

  import from LibItsHttp_TestSystem all;

  

  // LibMec_LocationAPI

  // LibMec/LocationAPI

  import from LocationAPI_TypesAndValues all;

  import from LocationAPI_Templates all;

  import from LocationAPI_Pics all;