Commit 7668addc authored by Jorge Moratinos's avatar Jorge Moratinos
Browse files

Parametrize robot tests and script to allow setup CCF interconnection variables

parent 3a480f22

helm/scripts/run_remote_capif_tests.sh

+9 −1
Changes for helm/scripts/run_remote_capif_tests.sh: 9 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -37,6 +37,10 @@ echo "CAPIF_HTTPS_PORT = $CAPIF_HTTPS_PORT" 
echo "CAPIF_VAULT = $VAULT_INTERNAL_HOSTNAME"

echo "CAPIF_VAULT_PORT = $VAULT_PORT"

echo "CAPIF_VAULT_TOKEN = $VAULT_ACCESS_TOKEN"

echo "CAPIF_INTERCONNECTION_HOSTNAME = $CAPIF_INTERCONNECTION_HOSTNAME"

echo "CAPIF_INTERCONNECTION_PORT = $CAPIF_INTERCONNECTION_PORT"

echo "CAPIF_INTERCONNECTION_REGISTER_HOSTNAME = $CAPIF_INTERCONNECTION_REGISTER_HOSTNAME"

echo "CAPIF_INTERCONNECTION_REGISTER_PORT = $CAPIF_INTERCONNECTION_REGISTER_PORT"

echo "MOCK_SERVER_URL = $MOCK_SERVER_URL"

echo "DOCKER_ROBOT_IMAGE = $DOCKER_ROBOT_IMAGE:$DOCKER_ROBOT_IMAGE_VERSION"

echo "REGISTER_ADMIN_PASSWORD = $REGISTER_ADMIN_PASSWORD"
@@ -88,4 +92,8 @@ docker run $DOCKER_ROBOT_TTY_OPTIONS --rm --network="host" \ 
    --variable NOTIFICATION_DESTINATION_URL:$NOTIFICATION_DESTINATION_URL \

    --variable MOCK_SERVER_URL:$MOCK_SERVER_URL \

    --variable REGISTER_ADMIN_USER:$REGISTER_ADMIN_USER \

    --variable REGISTER_ADMIN_PASSWORD:$REGISTER_ADMIN_PASSWORD $INPUT_OPTIONS
 
    --variable REGISTER_ADMIN_PASSWORD:$REGISTER_ADMIN_PASSWORD \

    --variable CAPIF_INTERCONNECTION_HOSTNAME:$CAPIF_INTERCONNECTION_HOSTNAME \

    --variable CAPIF_INTERCONNECTION_PORT:$CAPIF_INTERCONNECTION_PORT \

    --variable CAPIF_INTERCONNECTION_REGISTER_HOSTNAME:$CAPIF_INTERCONNECTION_REGISTER_HOSTNAME \

    --variable CAPIF_INTERCONNECTION_REGISTER_PORT:$CAPIF_INTERCONNECTION_REGISTER_PORT $INPUT_OPTIONS

helm/scripts/variables.sh

+6 −0
Changes for helm/scripts/variables.sh: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -160,6 +160,12 @@ export DOCKER_ROBOT_TTY_OPTIONS="-ti" 
export TEST_FOLDER=$CAPIF_BASE_DIR/tests

export RESULT_FOLDER=$CAPIF_BASE_DIR/results

export ROBOT_DOCKER_FILE_FOLDER=$CAPIF_BASE_DIR/tools/robot

## Interconnection Testing

# Capif interconnection

export CAPIF_INTERCONNECTION_HOSTNAME=capif-b.testbed.develop

export CAPIF_INTERCONNECTION_PORT=1443

export CAPIF_INTERCONNECTION_REGISTER_HOSTNAME=register-b.testbed.develop

export CAPIF_INTERCONNECTION_REGISTER_PORT=8184



# Load environment variables from file

## Directory for environment variables

services/envs/dev1.env

+3 −0
Changes for services/envs/dev1.env: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
export CAPIF_NETWORK_NAME=capif-network-a

export COMPOSE_PROJECT_NAME=ocf_a

export CAPIF_INTERCONNECTION_HOSTNAME=capifcore-b

export CAPIF_INTERCONNECTION_PORT=1443

export CAPIF_INTERCONNECTION_REGISTER_HOSTNAME=register-b

export CAPIF_INTERCONNECTION_REGISTER_PORT=8184



# Capif vault configuration

export CAPIF_VAULT_PORT=8200

services/envs/dev2.env

+3 −0
Changes for services/envs/dev2.env: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
export CAPIF_NETWORK_NAME=capif-network-b

export COMPOSE_PROJECT_NAME=ocf_b

export CAPIF_INTERCONNECTION_HOSTNAME=capifcore-a

export CAPIF_INTERCONNECTION_PORT=443

export CAPIF_INTERCONNECTION_REGISTER_HOSTNAME=register-a

export CAPIF_INTERCONNECTION_REGISTER_PORT=8084



# Capif vault configuration

export DEPLOY_VAULT=false

services/run_capif_tests.sh

+8 −1
Changes for services/run_capif_tests.sh: 8 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -20,6 +20,9 @@ fi 
echo "CAPIF_HOSTNAME = $CAPIF_HOSTNAME"

echo "CAPIF_REGISTER = $CAPIF_REGISTER"

echo "CAPIF_INTERCONNECTION_HOSTNAME = $CAPIF_INTERCONNECTION_HOSTNAME"

echo "CAPIF_INTERCONNECTION_PORT = $CAPIF_INTERCONNECTION_PORT"

echo "CAPIF_INTERCONNECTION_REGISTER_HOSTNAME = $CAPIF_INTERCONNECTION_REGISTER_HOSTNAME"

echo "CAPIF_INTERCONNECTION_REGISTER_PORT = $CAPIF_INTERCONNECTION_REGISTER_PORT"

echo "CAPIF_HTTP_PORT = $CAPIF_HTTP_PORT"

echo "CAPIF_HTTPS_PORT = $CAPIF_HTTPS_PORT"

echo "CAPIF_VAULT = $CAPIF_VAULT"
@@ -169,4 +172,8 @@ docker run $DOCKER_ROBOT_TTY_OPTIONS --rm --network="host" \ 
    --variable CAPIF_VAULT_PORT:$CAPIF_VAULT_PORT \

    --variable CAPIF_VAULT_TOKEN:$CAPIF_VAULT_TOKEN \

    --variable NOTIFICATION_DESTINATION_URL:$NOTIFICATION_DESTINATION_URL \

    --variable MOCK_SERVER_URL:$MOCK_SERVER_URL $INPUT_OPTIONS
 
    --variable MOCK_SERVER_URL:$MOCK_SERVER_URL \

    --variable CAPIF_INTERCONNECTION_HOSTNAME:$CAPIF_INTERCONNECTION_HOSTNAME \

    --variable CAPIF_INTERCONNECTION_PORT:$CAPIF_INTERCONNECTION_PORT \

    --variable CAPIF_INTERCONNECTION_REGISTER_HOSTNAME:$CAPIF_INTERCONNECTION_REGISTER_HOSTNAME \

    --variable CAPIF_INTERCONNECTION_REGISTER_PORT:$CAPIF_INTERCONNECTION_REGISTER_PORT $INPUT_OPTIONS