Commit 11478dee authored by Yann Garcia's avatar Yann Garcia
Browse files

Merge branch 'master' of https://forge.etsi.org/gitlab/mec/gs032p3-ttcn-test-suite

parents 545bec69 2cade7b1

.jenkins.sh

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
# See: https://forge.etsi.org/etsi-forge-copyright-statement.txt



#set -vx

set -e

#set -e



cd "$(dirname "$0")"

docker/build-container.sh

+4 −4
Original line number Diff line number Diff line 
#!/bin/bash

# Copyright ETSI 2018

# Copyright ETSI 2019

# See: https://forge.etsi.org/etsi-forge-copyright-statement.txt



#set -e
@@ -8,15 +8,15 @@ 
DOCKER_FILE=./docker/Dockerfile

if [ -f ${DOCKER_FILE} ]

then

    docker rm --force stf549_ng112

    docker build --tag stf549_ng112 --force-rm -f ${DOCKER_FILE} .

    docker rm --force stf569_Mec

    docker build --tag stf569_Mec --force-rm -f ${DOCKER_FILE} .

    if [ "$?" != "0" ]

    then

        echo "Docker build failed: $?"

        exit -1

    fi

    docker image ls -a

    docker inspect stf549_ng112:latest

    docker inspect stf569_Mec:latest

    if [ "$?" != "0" ]

    then

        echo "Docker inspect failed: $?"

docker/run-container.sh

+3 −3
Original line number Diff line number Diff line 
#!/bin/bash

# Copyright ETSI 2018

# Copyright ETSI 2019

# See: https://forge.etsi.org/etsi-forge-copyright-statement.txt



#set -e

#set -vx



docker run stf549_ng112:latest "/bin/bash" \

docker run stf569_Mec:latest "/bin/bash" \

	-c "source /home/etsi/devenv.bash \

	    && cd /home/etsi/dev/etsi_emcom/src/AtsNg112/objs \

	    && cd /home/etsi/dev/etsi_emcom/src/AtsMec/objs \

	    && ../bin/run_all.bash \

      && ls -ltr ../logs"

etc/AtsMec/AtsMec.cfg

+6 −4
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ LibCommon_Time.PX_TAC := 30.0 
LibCommon_Sync.PX_TSYNC_TIME_LIMIT := 30.0;

LibCommon_Sync.PX_TSHUT_DOWN_TIME_LIMIT := 30.0;



#LibItsHttp_Pics.PICS_HEADER_HOST := "172.28.4.87"

LibItsHttp_Pics.PICS_HEADER_HOST := "192.168.0.17"

LibItsHttp_Pics.PICS_HEADER_HOST := "172.28.4.87"

#LibItsHttp_Pics.PICS_HEADER_HOST := "192.168.0.17"



LibItsHttp_Pics.PICS_HEADER_CONTENT_TYPE := "application/json"
@@ -38,7 +38,7 @@ 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=192.168.0.17,port=8081,use_ssl=0)"

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



[DEFINE]

# In this section you can create macro definitions,
@@ -67,8 +67,10 @@ system.httpPort.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server=192.1 
#AtsMec_UEidentityAPI_TestCases.TC_MEC_SRV_UETAG_001_OK

#AtsMec_UEidentityAPI_TestCases.TC_MEC_SRV_UETAG_001_BR

#AtsMec_UEidentityAPI_TestCases.TC_MEC_SRV_UETAG_001_NF

AtsMec_UEidentityAPI_TestCases.TC_MEC_SRV_UETAG_002_OK

#AtsMec_UEidentityAPI_TestCases.TC_MEC_SRV_UETAG_002_OK

#AtsMec_UEidentityAPI_TestCases.TC_MEC_SRV_UETAG_002_BR

AtsMec_UEidentityAPI_TestCases.TC_MEC_SRV_UETAG_002_PF



#AtsMec_UEidentityAPI_TestCases.TC_MEC_SRV_UELOC_001_OK

#AtsMec_UEidentityAPI_TestCases.TC_MEC_SRV_UELOC_001_BR

#AtsMec_UEidentityAPI_TestCases.TC_MEC_SRV_UELOC_001_NF

ttcn/AtsMec/AtsMec_TestControl.ttcn

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ module AtsMec_TestControl { 
        execute(TC_MEC_SRV_UETAG_001_NF());

        execute(TC_MEC_SRV_UETAG_002_OK());

        execute(TC_MEC_SRV_UETAG_002_BR());

        execute(TC_MEC_SRV_UETAG_002_PF());

      }

      if (PICS_LOCATION_API_SUPPORTED) {

        execute(TC_MEC_SRV_UELOC_001_OK());