Commit bb00840e authored by YannGarcia's avatar YannGarcia
Browse files

Update LibCommon submodule

parent c73d3bb4

.gitmodules

+2 −3
Original line number Diff line number Diff line 
[submodule "ttcn\\LibCommon"]

	path = ttcn\\LibCommon

	url = https://forge.etsi.org/rep/LIBS/LibCommon.git

[submodule "ttcn/LibCommon"]

	path = ttcn/LibCommon

[submodule "titan-test-system-framework"]

	path = titan-test-system-framework

	url = https://labs.etsi.org/rep/cti-tools/titan-test-system-framework.git

README.md

+30 −2
Original line number Diff line number Diff line
@@ -81,12 +81,41 @@ Pre-requisites on your host machine: 
Procedure on the host machine:

- Open a Terminal

- Clone the ETSI MEC Test System



```sh

$ git clone --recurse-submodules --branch devel https://forge.etsi.org/rep/mec/gs032p3-ttcn-test-suite.git

$ cd ./gs032p3-ttcn-test-suite/titan-test-system-framework/

$ git checkout devel

$ cd ./ttcn/LibHttp

$ ln -sf module_mec.mk module.mk

```



- Apply patches



```sh

$ cd ../../..

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

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

```



$ 

```



- From the ETSI MEC Test System root directory, build the Docker image executing the following commands:



```sh

$ cd ./virtualization/docker

$ docker build --no-cache --tag alpine-mec -f Dockerfile --force-rm .

$ docker images

REPOSITORY              TAG       IMAGE ID       CREATED          SIZE

alpine-mec              latest    dafa00e36515   23 seconds ago   623MB

alpine                  latest    49176f190c7e   13 days ago      7.05MB

```



To check that TITAN is well installed, execute the following command:



```sh

$ ./docker-run.sh version

```



To build the MEC Test Suite, execute the following command:
@@ -263,7 +292,7 @@ Procedure: 
- Clone the ETSI MEC Testing Framework project into $HOME/dev folder



```sh

$ git clone --recurse-submodules --branch gs032p3-ttcn-test-suite https://forge.etsi.org/rep/mec/gs032p3-ttcn-test-suite.git ./gs032p3-ttcn-test-suite

$ git clone --recurse-submodules --branch devel https://forge.etsi.org/rep/mec/gs032p3-ttcn-test-suite.git ./gs032p3-ttcn-test-suite

$ cd /home/etsi/dev/gs032p3-ttcn-test-suite/titan-test-system-framework

$ git checkout devel

$ cd /home/etsi/dev/gs032p3-ttcn-test-suite/titan-test-system-framework/ttcn/LibHttp
@@ -276,7 +305,6 @@ $ ln -sf module_mec.mk module.mk 
$ 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_http/*.ttcn ./ttcn/LibIts/ttcn/Http/

```



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

virtualization/docker/docker-entrypoint.sh

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ usage() { 
	done

}



commands="help,build,clean,list,modulepar,rebuild,run,version"

commands="help,build Mec_location,clean Mec_location,list Mec_location,modulepar,rebuild Mec_location,run Mec_location,version"



if [ $# == 0 ]; then

  usage

virtualization/docker/docker-run.sh

+5 −4
Original line number Diff line number Diff line
@@ -3,11 +3,12 @@ set -exo pipefail 


cd "$(dirname ${BASH_SOURCE})"



PWD=`pwd`/../..

docker run --rm -it \

        -w /home/yann/dev/gs032p3-ttcn-test-suite \

        -e GEN_DIR=/home/yann/dev/gs032p3-ttcn-test-suite \

        -w $PWD \

        -e GEN_DIR=$PWD \

        -p 0.0.0.0:443:443 \

        -u "$(id -u):$(id -g)" \

        -v "${PWD}/../..:/home/yann/dev/gs032p3-ttcn-test-suite" \

        --entrypoint /home/yann/dev/gs032p3-ttcn-test-suite/virtualization/docker/docker-entrypoint.sh \

        -v "${PWD}:$PWD" \

        --entrypoint $PWD/virtualization/docker/docker-entrypoint.sh \

        alpine-mec:latest "$@"