Review typing for MEC 010-2 V3.1.1; Rebuild all test suites before starting...

Yann Garciarequested to merge
TTF_T027 into devel

Review typing for MEC 010-2 V3.1.1; Rebuild all test suites before starting reviewing and implementations

Merge request reports

ccsrc/Protocols/Http/http_codec_mec.cc

+6 −3
Changes for ccsrc/Protocols/Http/http_codec_mec.cc: 6 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -28,13 +28,16 @@ bool http_codec_mec::decode_body_json(const OCTETSTRING &p_data, LibHttp__JsonMe 
  loggers::get_instance().log(">>> http_codec_mec::decode_body_json");



  if (_codecs["json"].get() != nullptr) {

    loggers::get_instance().log("http_codec::decode_body: Call 'json_codec'");

    loggers::get_instance().log("http_codec::decode_body_json: Call 'json_codec'");

    if (_codecs["json"]->decode(p_data, (Record_Type&)p_json_body, p_params) == -1) {

      loggers::get_instance().warning("http_codec::decode_body: Failed to decode JSON message");

      loggers::get_instance().warning("http_codec::decode_body_json: Failed to decode JSON message");

      p_json_body.raw() = CHARSTRING(p_data.lengthof(), (char*)static_cast<const unsigned char*>(p_data));

    } else {

      loggers::get_instance().log_msg("http_codec::decode_body: Decoded message:", p_json_body);

      loggers::get_instance().log_msg("http_codec::decode_body_json: Decoded message:", p_json_body);

    }

  } else {

      loggers::get_instance().error("http_codec::decode_body_json: Codec not found");

      return false;

  }



  return true;

ccsrc/Protocols/Json/json_codec.cc

+104 −53

File changed.

Preview size limit exceeded, changes collapsed.

etc/AtsMec_V2XInformationService/AtsMec_V2XInformationService.cfg→etc/AtsMec_FederationEnablement/AtsMec_FederationEnablement_Mockoon.cf_

+15 −11
Changes for etc/AtsMec_FederationEnablement/AtsMec_FederationEnablement_Mockoon.cf_: 15 added lines, 11 removed lines.
Original line number Diff line number Diff line
@@ -8,25 +8,26 @@ LibCommon_Time.PX_TAC := 30.0 
LibCommon_Sync.PX_TSYNC_TIME_LIMIT := 30.0;

LibCommon_Sync.PX_TSHUT_DOWN_TIME_LIMIT := 30.0;



LibHttp_Pics.PICS_HEADER_HOST := "sandbox-mec.etsi.org" #"192.168.1.39"

LibHttp_Pics.PICS_HEADER_HOST := "try-mec.etsi.org" #"192.168.1.39"



LibHttp_Pics.PICS_HEADER_CONTENT_TYPE := "application/json"

LibHttp_Pics.PICS_USE_TOKEN_HEADER    := true

#LibHttp_Pics.PICS_TOKEN_HEADER        := "Basic WrongToken"



LibMec_Pics.PICS_ROOT_API                := "/sbx8tunqyy/mep1" # Need to sign in on https://sandbox-mec.etsi.org/, section 'Try-it from your MEC application'

LibMec_Pics.PICS_ROOT_API                := "/sbx1y8q0x9/mep1" # Need to sign in on https://try-mec.etsi.org/, section 'Try-it from your MEC application'



# LibMec_Pixits



LibMec_Pics.PICS_MEC_PLAT := true



[LOGGING]

# In this section you can specify the name of the log file and the classes of events

# you want to log into the file or display on console (standard error).



LogFile := "../logs/AtsMec_V2XInformationService/%e.%h-%r.%s"

#FileMask := LOG_ALL | USER | DEBUG | MATCHING

#ConsoleMask := LOG_ALL | USER | DEBUG | MATCHING

FileMask := ERROR | WARNING | USER | MATCHING | EXECUTOR_RUNTIME | VERDICTOP | PORTEVENT

ConsoleMask := ERROR | WARNING | USER | MATCHING | EXECUTOR_RUNTIME | VERDICTOP | PORTEVENT

LogFile := "../logs/AtsMec/%e.%h-%r.%s"

FileMask := LOG_ALL | USER | DEBUG | MATCHING

ConsoleMask := LOG_ALL | USER | DEBUG | MATCHING

#FileMask := ERROR | WARNING | USER | MATCHING | EXECUTOR_RUNTIME | VERDICTOP | PORTEVENT | TESTCASE

#ConsoleMask := ERROR | WARNING | USER | MATCHING | EXECUTOR_RUNTIME | VERDICTOP | PORTEVENT | TESTCASE

LogSourceInfo := Stack

LogEntityName:= Yes

LogEventTypes:= Yes
@@ -34,8 +35,10 @@ LogEventTypes:= Yes 


[TESTPORT_PARAMETERS]

# 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=sandbox-mec.etsi.org,port=443,use_ssl=1,trusted_ca_list=/home/yann/var/ssl/archive/yanngarcia.ddns.net/fullchain1.pem,privkey=/home/yann/var/ssl/archive/yanngarcia.ddns.net/privkey1.pem,certificate=/home/yann/var/ssl/archive/yanngarcia.ddns.net/fullchain1.pem)"

system.httpPort_notif.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server_mode=1,local_port=443,use_ssl=1,mutual_auth=1,mutual_tls=1,trusted_ca_list=/home/yann/var/ssl/archive/yanngarcia.ddns.net/fullchain1.pem,privkey=/home/yann/var/ssl/archive/yanngarcia.ddns.net/privkey1.pem,certificate=/home/yann/var/ssl/archive/yanngarcia.ddns.net/fullchain1.pem)"

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

system.httpPort.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server=try-mec.etsi.org,port=443,use_ssl=1)"

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

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



[DEFINE]

# In this section you can create macro definitions,
@@ -60,7 +63,8 @@ system.httpPort_notif.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server 


[EXECUTE]

# In this section you can specify what parts of your test suite you want to execute.

AtsMec_TestControl.control

#AtsMec_TestControl.control





[GROUPS]

# In this section you can specify groups of hosts. These groups can be used inside the

etc/AtsMec_IoT/AtsMec_IoT_Mockoon.cf_

0 → 100644
+81 −0
Changes for etc/AtsMec_IoT/AtsMec_IoT_Mockoon.cf_: 81 added lines, 0 removed lines.
Original line number Diff line number Diff line 
[MODULE_PARAMETERS]

# This section shall contain the values of all parameters that are defined in your TTCN-3 modules.



# IUT roles



LibCommon_Time.PX_TAC := 30.0

#LibCommon_Time.PX_TWAIT := 30.0

LibCommon_Sync.PX_TSYNC_TIME_LIMIT := 30.0;

LibCommon_Sync.PX_TSHUT_DOWN_TIME_LIMIT := 30.0;



LibHttp_Pics.PICS_HEADER_HOST := "try-mec.etsi.org" #"192.168.1.39"



LibHttp_Pics.PICS_HEADER_CONTENT_TYPE := "application/json"

LibHttp_Pics.PICS_USE_TOKEN_HEADER    := true

#LibHttp_Pics.PICS_TOKEN_HEADER        := "Basic WrongToken"



LibMec_Pics.PICS_ROOT_API                := "/sbx1y8q0x9/mep1" # Need to sign in on https://try-mec.etsi.org/, section 'Try-it from your MEC application'



# LibMec_Pixits





[LOGGING]

# In this section you can specify the name of the log file and the classes of events

# you want to log into the file or display on console (standard error).



LogFile := "../logs/AtsMec/%e.%h-%r.%s"

FileMask := LOG_ALL | USER | DEBUG | MATCHING

ConsoleMask := LOG_ALL | USER | DEBUG | MATCHING

#FileMask := ERROR | WARNING | USER | MATCHING | EXECUTOR_RUNTIME | VERDICTOP | PORTEVENT | TESTCASE

#ConsoleMask := ERROR | WARNING | USER | MATCHING | EXECUTOR_RUNTIME | VERDICTOP | PORTEVENT | TESTCASE

LogSourceInfo := Stack

LogEntityName:= Yes

LogEventTypes:= Yes

#TimeStampFormat := DateTime



[TESTPORT_PARAMETERS]

# 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=192.168.1.39,port=30030,use_ssl=0)"

system.httpPort.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server=try-mec.etsi.org,port=443,use_ssl=1)"

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

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



[DEFINE]

# In this section you can create macro definitions,

# that can be used in other configuration file sections except [INCLUDE] and [ORDERED_INCLUDE].



[INCLUDE]

# To use configuration settings given in other configuration files,

# the configuration files just need to be listed in this section, with their full or relative pathnames.



[ORDERED_INCLUDE]

# To use configuration settings given in other configuration files,

# the configuration files just need to be listed in this section, with their full or relative pathnames.



[EXTERNAL_COMMANDS]

# This section can define external commands (shell scripts) to be executed by the ETS

# whenever a control part or test case is started or terminated.



#BeginTestCase := ""

#EndTestCase := ""

#BeginControlPart := ""

#EndControlPart := ""



[EXECUTE]

# In this section you can specify what parts of your test suite you want to execute.

#AtsMec_TestControl.control





[GROUPS]

# In this section you can specify groups of hosts. These groups can be used inside the

# [COMPONENTS] section to restrict the creation of certain PTCs to a given set of hosts.



[COMPONENTS]

# This section consists of rules restricting the location of created PTCs.



[MAIN_CONTROLLER]

# The options herein control the behavior of MC.

KillTimer := 10.0

LocalAddress := 127.0.0.1

TCPPort := 12000

NumHCs := 1

etc/AtsMec_Location/AtsMec_Location_Lewis.cf_

+2 −2
Changes for etc/AtsMec_Location/AtsMec_Location_Lewis.cf_: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ LibHttp_Pics.PICS_USE_TOKEN_HEADER := true 
LibMec_Pics.PICS_ROOT_API               := "etsi-013"



# LibMex_Pixits

LibMec_Pixits.PX_ME_APP_Q_ZONE_ID_URI     := "/location/v2/zones"

LibMec_Pixits.PX_ME_APP_Q_USERS_LIST_URI  := "/location/v2/users"

LibMec_Pixits.PX_ME_APP_Q_ZONE_ID_URI     := "/location/v3/zones"

LibMec_Pixits.PX_ME_APP_Q_USERS_LIST_URI  := "/location/v3/users"

LibMec_Pixits.PX_RNIS_SUBSCRITIONS_URI    := "/rni/v1/subscriptions"

LibMec_Pixits.PX_RNIS_QUERIES_URI         := "/rni/v1/queries"

LibMec_Pixits.PX_MEC_SVC_MGMT_APPS_URI    := "/mec_service_mgmt/v1/applications"