Commit 264df5dd authored by Yann Garcia's avatar Yann Garcia
Browse files

Review README.md file and move switch_its_r2.sh into install.sh

parent ddcd3ef7
Loading
Loading
Loading
Loading
+14 −28
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ See the attached LICENSE file or visit https://forge.etsi.org/legal-matters.
## STFs/TTFs

The following STFs were or are currently involved in the evolutions of the ETSI ITS protocols project:
- STF 405, STF 422, STF 424, STF 455, STF 462, STF 481, STF 484, STF 507, STF 517, STF 525, STF 538, STF 545, STF 594, TTF T002, TTF T011
- STF 405, STF 422, STF 424, STF 455, STF 462, STF 481, STF 484, STF 507, STF 517, STF 525, STF 538, STF 545, STF 594, TTF T002, TTF T011, TTF T024, TTF T025


# Installation
@@ -82,7 +82,7 @@ Procedure on the host machine:
- Clone the ETSI ITS Test System

```sh
$ git clone --recurse-submodules https://forge.etsi.org/gitlab/ITS/TS.ITS.git ./TS.ITS_r1
$ git clone --recurse-submodules https://forge.etsi.org/gitlab/ITS/TS.ITS.git ./TS.ITS
```

- Select the branch you need:
@@ -288,27 +288,13 @@ Procedure:
- Clone the ETSI ITS protocols project into $HOME/dev folder

```sh
$ git clone --recurse-submodules https://forge.etsi.org/gitlab/ITS/TS.ITS.git ./TS.ITS_r1
$ git clone --recurse-submodules --branch=devel2 https://forge.etsi.org/gitlab/ITS/TS.ITS.git ./TS.ITS
```

- Select the branch you need:

 ITS Release 1 (this example)

```sh
$ git checkout devel
```

 ITS Release 2

```sh
$ git checkout ttf_t024
```

- Apply the configuration
- Execute the script install.sh

```sh
$ ./switch_its_r2.sh
$ ./install.sh
```

- Build a test suite (e.g. AtsCAM)
@@ -332,7 +318,7 @@ Pre-requisites:
- Your are logged as 'etsi' or 'vagrant' user
- Procedure using TITAN command line (only):
    - Open several SSH session (PuTTY...)
    - Change to the directory ~/dev/TS.ITS_r1/
    - Change to the directory ~/dev/TS.ITS/
    - Modify the file config.mk according to your system:
        - On Linux, comment all the lines using the '#' character
        - On Windows, update the path accordingly
@@ -351,7 +337,7 @@ $ make
- To run the test suitem, execute the following command:

```sh
$ cd ~/dev/TS.ITS_r1/scripts
$ cd ~/dev/TS.ITS/scripts
$ ../run_all.bash
...
```
@@ -385,22 +371,22 @@ $ make

### Generate the certificates

After applying the previous clause, change to the folder '~/dev/TS.ITS_r1/data/certificates' and execute 'make' command:
After applying the previous clause, change to the folder '~/dev/TS.ITS/data/certificates' and execute 'make' command:
```
$ cd ~/dev/TS.ITS_r1/data/certificates
$ cd ~/dev/TS.ITS/data/certificates
$ CERTGEN=~/dev/itscertgen/ make
$ CERTGEN=~/dev/itscertgen/ make install
```
The certificates will be located in the folder '~/dev/TS.ITS_r1/data/certificates/certificates'.
The certificates will be located in the folder '~/dev/TS.ITS/data/certificates/certificates'.

To use this newly generated certificates, you shall update two parameters located in the TTCN-3 file LibItsSecurity_Pixits. These are:
- LibItsSecurity_Pixits.PX_CERTIFICATE_POOL_PATH, which is the path the certificates folder (e.g. LibItsSecurity_Pixits.PX_CERTIFICATE_POOL_PATH := "/home/<user>/dev/TS.ITS_r1/data/certificates")
- LibItsSecurity_Pixits.PX_CERTIFICATE_POOL_PATH, which is the path the certificates folder (e.g. LibItsSecurity_Pixits.PX_CERTIFICATE_POOL_PATH := "/home/<user>/dev/TS.ITS/data/certificates")
- LibItsSecurity_Pixits.PX_IUT_SEC_CONFIG_NAME, which is the name of the certificates folder (e.g. LibItsSecurity_Pixits.PX_IUT_SEC_CONFIG_NAME := "certificates")


### Modify or create new certificates

The folder '~/dev/TS.ITS_r1/data/profiles' contains an XML file for each certificate to be generated.
The folder '~/dev/TS.ITS/data/profiles' contains an XML file for each certificate to be generated.
This XML file describes the certificate content (e.g. CERT_IUT_A_RCA.xml describes the root certificate for all CERT_IUT_A certificates).

By modifying these files, you can change create new certificate with different geographical area, different validity periods or different SSPs.
@@ -421,7 +407,7 @@ In this cases, the following parameters shall be modified to match the ITS devic
In addition, the Test System shall be configured to support the security modifying the following settings as described below:
- device_mode=1
- secured_mode=1
- sec_db_path=/home/<user>/dev/TS.ITS_r1/data/certificates/certificates
- sec_db_path=/home/<user>/dev/TS.ITS/data/certificates/certificates


### ITS Protocol Test suites for Transport layer
@@ -434,7 +420,7 @@ In this cases, the following parameters shall be modified to match the ITS devic
In addition, the Test System shall be configured to support the security modifying the following settings as described below:
- device_mode=1
- secured_mode=1
- sec_db_path=/home/<user>/dev/TS.ITS_r1/data/certificates/certificates
- sec_db_path=/home/<user>/dev/TS.ITS/data/certificates/certificates


### ITS Protocol Test suites for Security
+0 −0

File moved.

switch_its_r1.sh

deleted100755 → 0
+0 −53
Original line number Diff line number Diff line
#!/bin/bash

#set -e
set -vx

BASE_PATH=`pwd`

git checkout devel
git submodule update --init --recursive --remote

cd $BASE_PATH/ttcn
git checkout devel

for i in `find $BASE_PATH/ttcn -type d -name "Ats*"`
do
    cd $i
    git checkout devel
done
for i in `find $BASE_PATH/ttcn/Ats* -type d -name "asn1"`
do
    cd $i
    git checkout testing
    SUB_DIRS=`find . -type d`
    if [ "SUB_DIRS" != "" ]
    then
        for j in $SUB_DIRS
        do
            cd $j
            git checkout testing
            cd -
        done
    fi
done

cd $BASE_PATH
if [ ! -d ./titan-test-system-framework ]
then
    git clone --recurse-submodules --single-branch --branch devel https://labs.etsi.org/rep/cti-tools/titan-test-system-framework.git
    cd ./titan-test-system-framework
else
    cd ./titan-test-system-framework
    git checkout devel
fi
cd ./ttcn/LibHttp
ln module_its.mk module.mk

cd $BASE_PATH/ttcn/LibIts
git checkout devel

cd $BASE_PATH
ln ./ttcn/patch_lib_common_titan/module.mk ./ttcn/LibCommon/

exit 0