Commit 9a282ebd authored by Yann Garcia's avatar Yann Garcia
Browse files

Enhance virtualization/docker procedure

parent b8ccaede

README.md

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ Pre-requisites on your host machine: 
Procedure on the host machine:

- Open a Terminal

- Clone the ETSI CISE Test System

- [Install Test System certificates](#generate-certificates-for-tls-and-cise-security-support)



```sh

$ git clone --recurse-submodules --branch stf637 https://forge.etsi.org/rep/cdm/cise-data-model ./cise-data-model

etc/AtsCise/AtsCise_Cnit.cf_

+6 −6
Original line number Diff line number Diff line
@@ -6,14 +6,14 @@ LibCise_Pics.PICS_IUT_CDM_NODE := true 
LibCise_Pics.PICS_IUT_CDM_ADAPTOR := true



# LibCise

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

LibCise_Pics.PICS_CISE_CERTIFICATES_DB_PATH      := "/home/y.garcia/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"

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

#LibCise_Pics.PICS_CISE_TS_CERTIFICATE            := "cert.pem"

#LibCise_Pics.PICS_CISE_TS_SIGNING_PRIVATE_KEY    := "privkey.pem"

LibCise_Pics.PICS_CISE_TS_SIGNING_PRIVATE_PASSWD := ""

LibCise_Pics.PICS_HEADER_HOST_UT                 := "192.168.1.44"

LibCise_Pics.PICS_HEADER_HOST_UT                 := "172.25.1.58"



# LibHttp

LibHttp_Pics.PICS_HEADER_HOST         := "172.18.1.101"
@@ -44,11 +44,11 @@ LogEventTypes:= Yes 
system.httpPort.params := "HTTP(codecs=xml:xml_codec;json:json_codec)/TCP(debug=1,server=172.18.1.101,port=8200)"

system.httpPort_notif.params := "HTTP(codecs=xml:xml_codec;json:json_codec)/TCP(debug=1,server_mode=1,local_port=8200)"

# TLS

#system.httpPort.params := "HTTP(codecs=xml:xml_codec;json:json_codec)/TCP(debug=1,server=172.18.1.101,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=xml:xml_codec;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=xml:xml_codec;json:json_codec)/TCP(debug=1,server=172.18.1.101,port=443,use_ssl=1,trusted_ca_list=/home/y.garcia/var/ssl/archive/yanngarcia.ddns.net/fullchain1.pem,privkey=/home/y.garcia/var/ssl/archive/yanngarcia.ddns.net/privkey1.pem,certificate=/home/y.garcia/var/ssl/archive/yanngarcia.ddns.net/fullchain1.pem)"

#system.httpPort_notif.params := "HTTP(codecs=xml:xml_codec;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/y.garcia/var/ssl/archive/yanngarcia.ddns.net/fullchain1.pem,privkey=/home/y.garcia/var/ssl/archive/yanngarcia.ddns.net/privkey1.pem,certificate=/home/y.garcia/var/ssl/archive/yanngarcia.ddns.net/fullchain1.pem)"



# UpperTester port

system.utPort.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server=192.168.1.44,port=8200)"

system.utPort.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server=172.25.1.58,port=14000)"



[DEFINE]

# In this section you can create macro definitions,

scripts/run_ptcs.bash

+2 −2
Original line number Diff line number Diff line
@@ -28,9 +28,9 @@ fi 


if [ "$ATS" == "AtsRSUsSimulator" ]

then

    sudo LD_LIBRARY_PATH=$TTCN3_DIR/lib:/home/yann/lib:/usr/local/lib ../bin/$ATS 127.0.0.1 12001

    sudo LD_LIBRARY_PATH=$TTCN3_DIR/lib:/home/$USER/lib:/usr/local/lib ../bin/$ATS 127.0.0.1 12001

else

    sudo LD_LIBRARY_PATH=$TTCN3_DIR/lib:/home/yann/lib:/usr/local/lib ../bin/$ATS 127.0.0.1 12000

    sudo LD_LIBRARY_PATH=$TTCN3_DIR/lib:/home/$USER/lib:/usr/local/lib ../bin/$ATS 127.0.0.1 12000

fi



cd ${CURPWD}

virtualization/docker/Dockerfile

+2 −2
Original line number Diff line number Diff line 
FROM alpine:latest

FROM alpine:3.16



# Install dependencies

RUN apk update && \
@@ -49,4 +49,4 @@ ENV ATS=AtsCise 


EXPOSE 30181/tcp



ENTRYPOINT /home/yann/dev/cise/virtualization/docker/docker-entrypoint.sh
 
ENTRYPOINT /home/$USER/dev/cise/virtualization/docker/docker-entrypoint.sh