Commit 6cda2f65 authored by YannGarcia's avatar YannGarcia
Browse files

Add TITAN patch for LibCommon

parent 49b0d9a0

README.md

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

$ cd /home/etsi/dev/cise-devel

$ 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

```



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

$ cd /home/etsi/dev/cise-devel

$ 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/cise-devel/scripts/devenv.bash.ubuntu

cise.code-workspace

+2 −1
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ 
			"shared_mutex": "cpp",

			"thread": "cpp",

			"numeric": "cpp"

		}

		},

		"java.compile.nullAnalysis.mode": "automatic"

	}

}
 
 No newline at end of file

config.mk

+1 −1
Original line number Diff line number Diff line 
TTCN3_COMPILER_OPTIONS := -b -d -e -f -g -j -l -L -M -O -R -U none -x

#TTCN3_DIR      := /cygdrive/c/Tools/Titan

TTCN3_DIR      := /home/yann/frameworks/titan-8.1.0

#WPCAP_DLL_PATH := /cygdrive/c/windows/system32/npcap/wpcap.dll

#NPCAP_INCLUDE  := /cygdrive/c/PROGRA~1/Npcap/sdk/include

T3Q_PATH=./tools/t3q-v2.0.0b30

etc/AtsCise/AtsCise_mockoon.cf_

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ LibCise_Pics.PICS_IUT_ADAPTOR := true 


# LibCise

LibCise_Pics.PICS_CISE_SECURITY                  := true

LibCise_Pics.PICS_CISE_CERTIFICATES_DB_PATH      := "/home/yann/dev/cise/keystore"

LibCise_Pics.PICS_CISE_CERTIFICATES_DB_PATH      := "/home/yann/dev/cise-data-model/keystore"

LibCise_Pics.PICS_CISE_TS_CERTIFICATE            := "sim1_node01.node01.eucise.fr.pem"

LibCise_Pics.PICS_CISE_TS_SIGNING_PRIVATE_KEY    := "sim1_node01.node01.eucise.fr.pkcs8"

#LibCise_Pics.PICS_CISE_CERTIFICATES_DB_PATH      := "/home/yann/var/ssl/live/yanngarcia.ddns.net"

scripts/run_mtc.bash

+3 −3
Original line number Diff line number Diff line
@@ -34,14 +34,14 @@ CFG_FILES=`find ../etc/$ATS -name '*.cfg'` 
echo "> cmtc: to create the MTC server"

echo "> smtc [module_name[[.control]|.testcase_name|.*]: when MyExample is connected, run the TCs in [EXECUTE] section"

echo "> emtc: Terminate MTC."

mctr ${CFG_FILES}

$TTCN3_DIR/bin/mctr ${CFG_FILES}



sudo chown -R `whoami` ${TITAN_LOG_DIR}

LOG_FILES=`find ${TITAN_LOG_DIR} -name '*.log'`

if [ "${TITAN_LOG_DIR}" != "" ]

then

    ttcn3_logmerge -o ${TITAN_LOG_DIR}/merged.log ${LOG_FILES}

    ttcn3_logformat -o ${TITAN_LOG_DIR}/merged_formated.log ${TITAN_LOG_DIR}/merged.log

    $TTCN3_DIR/bin/ttcn3_logmerge -o ${TITAN_LOG_DIR}/merged.log ${LOG_FILES}

    $TTCN3_DIR/bin/ttcn3_logformat -o ${TITAN_LOG_DIR}/merged_formated.log ${TITAN_LOG_DIR}/merged.log

    echo "log files were merged into ${TITAN_LOG_DIR}/merged.log"

fi