Commit 2b5c06a6 authored by Yann Garcia's avatar Yann Garcia
Browse files

Merge branch 'TTF_T027' into 'devel' 

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

See merge request !3
parents 31c49a2b 99dfd91d

.jenkins.sh

+12 −2
Original line number Diff line number Diff line
@@ -10,8 +10,16 @@ cd $(dirname $0) 
run_dir=`pwd`



# Docker version 2

cd ./virtualization/docker

cd ./virtualization/docker-dev

./build.sh #--force-stfubuntu

ret_code=`echo $?`



if [ $ret_code != 0 ]

then

   cd $run_dir

   exit -1

fi



#./run.sh



if [ "$1" == "--remove" ]
@@ -19,4 +27,6 @@ then 
    docker rmi --force mec_devel:latest

fi



cd -
 
cd $run_dir



exit 0

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ $(cc_objects) : $(outdir)/%.o : %.cc 
$(gen_sources): $(outdir)/.generate



$(outdir)/.generate: Makefile $(tt_sources)

	$(TTCN3_DIR)/bin/compiler -b -d -e -f -g -l -L -M -n -O -r -R -U none -x -X -o $(outdir) $(tt_sources)

	$(TTCN3_DIR)/bin/compiler $(TTCN3_COMPILER_OPTIONS) -o $(outdir) $(tt_sources)

	touch $@



$(foreach S, $(ttcn_sources),  $(eval $(outdir)/$(notdir $(patsubst %.ttcn, %.cc,  $(S))): $(S)))

README.md

+2 −2
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ $ ln -sf module_mec.mk module.mk 
```sh

$ cd ../../..

$ cp ./ttcn/patch_lib_common_titan/module.mk ./ttcn/LibCommon/

$ cp ./ttcn/patch_lib_common_titan/*.ttcn ./ttcn/LibCommon/ttcn

$ cp ./ttcn/patch_lib_common_titan/ttcn/*.ttcn ./ttcn/LibCommon/ttcn

```



- From the ETSI MEC Test System root directory, build the Docker image executing the following commands:
@@ -301,7 +301,7 @@ $ ln -sf module_mec.mk module.mk 
```sh

$ cd /home/etsi/dev/gs032p3-ttcn-test-suite

$ cp ./ttcn/patch_lib_common_titan/module.mk ./ttcn/LibCommon/

$ cp ./ttcn/patch_lib_common_titan/*.ttcn ./ttcn/LibCommon/

$ cp ./ttcn/patch_lib_common_titan/ttcn/*.ttcn ./ttcn/LibCommon/ttcn

```



- Update your default environment with the content of the script $HOME/dev/gs032p3-ttcn-test-suite/scripts/devenv.bash.ubuntu

ccsrc/Protocols/Http/http_codec_mec.cc

+6 −3
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

+105 −54

File changed.

Preview size limit exceeded, changes collapsed.