holado 0.2.4__py3-none-any.whl → 0.2.6__py3-none-any.whl

holado_grpc/api/rpc/grpc_client.py

@@ -47,135 +47,139 @@ class GRpcClient(object):
     def is_available(cls):
         return with_grpc_requests
     
-    def __init__(self, name, endpoint, **kwargs):
-        self.__name = name
-        self.__endpoint = endpoint
-        self.__kwargs = kwargs
-        self.__client = grpc_requests.client.get_by_endpoint(endpoint, **kwargs)
-        
-        self.__func_grpc_services = None
-        self.__func_protobuf_converter = None
-        self.__func_protobuf_messages = None
-    
-    def initialize(self, func_grpc_services, func_protobuf_converter, func_protobuf_messages):
-        self.__func_grpc_services = func_grpc_services
-        self.__func_protobuf_converter = func_protobuf_converter
-        self.__func_protobuf_messages = func_protobuf_messages
+    if with_grpc_requests:
+        def __init__(self, name, endpoint, **kwargs):
+            self.__name = name
+            self.__endpoint = endpoint
+            self.__kwargs = kwargs
+            self.__client = grpc_requests.client.get_by_endpoint(endpoint, **kwargs)
+            
+            self.__func_grpc_services = None
+            self.__func_protobuf_converter = None
+            self.__func_protobuf_messages = None
         
-    @property
-    def __grpc_services(self):
-        return self.__func_grpc_services()
-
-    @property
-    def __protobuf_converter(self):
-        return self.__func_protobuf_converter()
-
-    @property
-    def __protobuf_messages(self):
-        return self.__func_protobuf_messages()
-    
-    @property
-    def name(self):
-        return self.__name
+        def initialize(self, func_grpc_services, func_protobuf_converter, func_protobuf_messages):
+            self.__func_grpc_services = func_grpc_services
+            self.__func_protobuf_converter = func_protobuf_converter
+            self.__func_protobuf_messages = func_protobuf_messages
+            
+        @property
+        def __grpc_services(self):
+            return self.__func_grpc_services()
     
-    @property    
-    def internal_client(self) -> grpc_requests.client.Client:
-        return self.__client
+        @property
+        def __protobuf_converter(self):
+            return self.__func_protobuf_converter()
     
-    def request(self, service, method, request, raw_output=False, **kwargs):
-        """
-        :param request: request data in json or proto format
-        :param raw_output: if method should return a proto object or a json oject (default: False)
-        :param kwargs: other arguments for underlying grpc_requests method, or further underlying grpc method (ex: 'timeout')
-        :returns: if raw_output==True, returns a proto object, else returns a json object with proto data
-        """
-        logger.info(f"Requesting {service}.{method} with data [{request}] (raw_output: {raw_output} ; kwargs:{kwargs})")
+        @property
+        def __protobuf_messages(self):
+            return self.__func_protobuf_messages()
         
-        # Set a default timeout
-        raise_on_timeout = False
-        if kwargs is None:
-            kwargs = {}
-        if 'timeout' not in kwargs:
-            kwargs['timeout'] = Config.join_timeout_seconds
-            raise_on_timeout = True
-        timeout = kwargs['timeout'] if 'timeout' in kwargs else None
+        @property
+        def name(self):
+            return self.__name
         
-        success = False
-        last_exc = None
-        for try_nb in range(1,4):
-            try:
-                # Ask always raw_output=True, so that we get a Protobuf instance, and then conversion is done if needed
-                res_proto = self.internal_client.request(service, method, request, raw_output=True, **kwargs)
-            except Exception as exc:
-                last_exc = exc
-                exc_str = str(exc)
-                msg_list = [
-                    f"Request failed (try {try_nb}):",
-                    f"    method: {service}.{method}",
-                    f"    data:",
-                    Tools.indent_string(8, str(request)),
-                    f"    raw_output: {raw_output}",
-                    f"    kwargs: {kwargs}",
-                    f"    error:",
-                    Tools.indent_string(8, exc_str) ]
-                exc_msg = "\n".join(msg_list)
-                if "status = StatusCode.UNAVAILABLE" in exc_str:
-                    logger.warning("Service temporarily unavailable:\n" + exc_msg)
-                    time.sleep(1)
-                    continue
-                elif "status = StatusCode.DEADLINE_EXCEEDED" in exc_str:
-                    if raise_on_timeout:
-                        raise TimeoutTechnicalException(exc_msg)
-                    else:
-                        logger.warning(f"Timeout ({timeout} s) occured while requesting:\n" + exc_msg)
+        @property    
+        def internal_client(self) -> grpc_requests.client.Client:
+            return self.__client
+        
+        def request(self, service, method, request, raw_output=False, **kwargs):
+            """
+            :param request: request data in json or proto format
+            :param raw_output: if method should return a proto object or a json oject (default: False)
+            :param kwargs: other arguments for underlying grpc_requests method, or further underlying grpc method (ex: 'timeout')
+            :returns: if raw_output==True, returns a proto object, else returns a json object with proto data
+            """
+            logger.info(f"Requesting {service}.{method} with data [{request}] (raw_output: {raw_output} ; kwargs:{kwargs})")
+            
+            # Set a default timeout
+            raise_on_timeout = False
+            if kwargs is None:
+                kwargs = {}
+            if 'timeout' not in kwargs:
+                kwargs['timeout'] = Config.join_timeout_seconds
+                raise_on_timeout = True
+            timeout = kwargs['timeout'] if 'timeout' in kwargs else None
+            
+            success = False
+            last_exc = None
+            for try_nb in range(1,4):
+                try:
+                    # Ask always raw_output=True, so that we get a Protobuf instance, and then conversion is done if needed
+                    res_proto = self.internal_client.request(service, method, request, raw_output=True, **kwargs)
+                except Exception as exc:
+                    last_exc = exc
+                    exc_str = str(exc)
+                    msg_list = [
+                        f"Request failed (try {try_nb}):",
+                        f"    method: {service}.{method}",
+                        f"    data:",
+                        Tools.indent_string(8, str(request)),
+                        f"    raw_output: {raw_output}",
+                        f"    kwargs: {kwargs}",
+                        f"    error:",
+                        Tools.indent_string(8, exc_str) ]
+                    exc_msg = "\n".join(msg_list)
+                    if "status = StatusCode.UNAVAILABLE" in exc_str:
+                        logger.warning("Service temporarily unavailable:\n" + exc_msg)
                         time.sleep(1)
                         continue
-                elif "status = " in exc_str:
-                    raise FunctionalException(exc_msg) from exc
+                    elif "status = StatusCode.DEADLINE_EXCEEDED" in exc_str:
+                        if raise_on_timeout:
+                            raise TimeoutTechnicalException(exc_msg)
+                        else:
+                            logger.warning(f"Timeout ({timeout} s) occured while requesting:\n" + exc_msg)
+                            time.sleep(1)
+                            continue
+                    elif "status = " in exc_str:
+                        raise FunctionalException(exc_msg) from exc
+                    else:
+                        raise TechnicalException(exc_msg) from exc
                 else:
-                    raise TechnicalException(exc_msg) from exc
-            else:
-                success = True
-                break
-        
-        if not success:
-            if "status = " in exc_msg:
-                raise FunctionalException(exc_msg) from last_exc
-            else:
-                raise TechnicalException(exc_msg) from last_exc
+                    success = True
+                    break
             
-        # Manage result conversion if needed
-        # Note: this step is done manually since grpc_requests has some limitations when raw_output=False:
-        #     - Field with default values are not set in json result
-        #     - Some field types are badly managed (ex: uint64 fields appear as string in json)
-        if raw_output == True:
-            if isinstance(res_proto, grpc._channel._MultiThreadedRendezvous):
-                return list(res_proto)
+            if not success:
+                if "status = " in exc_msg:
+                    raise FunctionalException(exc_msg) from last_exc
+                else:
+                    raise TechnicalException(exc_msg) from last_exc
+                
+            # Manage result conversion if needed
+            # Note: this step is done manually since grpc_requests has some limitations when raw_output=False:
+            #     - Field with default values are not set in json result
+            #     - Some field types are badly managed (ex: uint64 fields appear as string in json)
+            if raw_output == True:
+                if isinstance(res_proto, grpc._channel._MultiThreadedRendezvous):
+                    return list(res_proto)
+                else:
+                    return res_proto
             else:
-                return res_proto
-        else:
-            if isinstance(res_proto, grpc._channel._MultiThreadedRendezvous):
-                res = [self.__protobuf_converter.convert_protobuf_object_to_json_object(cur_res) for cur_res in res_proto]
+                if isinstance(res_proto, grpc._channel._MultiThreadedRendezvous):
+                    res = [self.__protobuf_converter.convert_protobuf_object_to_json_object(cur_res) for cur_res in res_proto]
+                else:
+                    res = self.__protobuf_converter.convert_protobuf_object_to_json_object(res_proto)
+                return res
+                
+        def get_request_data_type_fullname(self, service, method):
+            method_descriptor = self.__grpc_services.get_method_descriptor(service, method)
+            return method_descriptor.input_type.full_name
+            
+        def build_request_data(self, service, method, params_table=None, params_dict=None, as_proto=False):
+            if Tools.do_log(logger, logging.TRACE):  # @UndefinedVariable
+                logger.trace(f"Building request data for service method '{service}.{method}'")
+            if as_proto is not None and as_proto:
+                method_descriptor = self.__grpc_services.get_method_descriptor(service, method)
+                res = self.__protobuf_messages.new_message(method_descriptor.input_type.full_name, fields_table=params_table, fields_dict=params_dict)
             else:
-                res = self.__protobuf_converter.convert_protobuf_object_to_json_object(res_proto)
-            return res
+                if params_table is not None:
+                    res = ValueTableConverter.convert_name_value_table_2_json_object(params_table)
+                elif params_dict is not None:
+                    res = params_dict
+                else:
+                    res = {}
             
-    def get_request_data_type_fullname(self, service, method):
-        method_descriptor = self.__grpc_services.get_method_descriptor(service, method)
-        return method_descriptor.input_type.full_name
+            return res
         
-    def build_request_data(self, service, method, params_table=None, params_dict=None, as_proto=False):
-        if Tools.do_log(logger, logging.TRACE):  # @UndefinedVariable
-            logger.trace(f"Building request data for service method '{service}.{method}'")
-        if as_proto is not None and as_proto:
-            method_descriptor = self.__grpc_services.get_method_descriptor(service, method)
-            res = self.__protobuf_messages.new_message(method_descriptor.input_type.full_name, fields_table=params_table, fields_dict=params_dict)
-        else:
-            if params_table is not None:
-                res = ValueTableConverter.convert_name_value_table_2_json_object(params_table)
-            elif params_dict is not None:
-                res = params_dict
-            else:
-                res = {}
         
-        return res
+        

holado_helper/docker/logging.conf

@@ -1,7 +1,9 @@
-[logger_root]
+[holado]
 #level=INFO
 level=DEBUG
 #level=TRACE
+log_on_console=False
+log_in_file=True
 
 [loggers_levels]
 holado=INFO

holado_helper/docker/run_holado_test_nonreg_in_docker.sh

@@ -7,23 +7,23 @@
 #
 # USAGE:
 #     Considering a working directory WORK_DIR, to launch scenarios, open a console in WORK_DIR, and launch the script with wanted parameters (see bellow).
-#     Then a new report is added in folder HOLADO_TEST_OUTPUT_BASEDIR/reports if environment variable HOLADO_TEST_OUTPUT_BASEDIR is defined, else in folder WORK_DIR/reports.
+#     Then a new report is added in folder HOLADO_OUTPUT_BASEDIR/reports if environment variable HOLADO_OUTPUT_BASEDIR is defined, else in folder WORK_DIR/reports.
 #
 # REQUIREMENTS:
 #     Define in .profile the following variables
-#         - HOLADO_TEST_IMAGE_TAG: docker image tag to use (usually "main" or tag associated to any branch)
+#         - HOLADO_IMAGE_TAG: docker image tag to use (usually "main" or tag associated to any branch)
 #         - optional but preferable:
-#             - HOLADO_TEST_OUTPUT_BASEDIR: absolute path to base output directory of testing solution
-#             - HOLADO_TEST_LOCAL_RESOURCES_BASEDIR: absolute path to base local resources directory of testing solution (where data are stored through campaigns)
+#             - HOLADO_OUTPUT_BASEDIR: absolute path to base output directory of testing solution
+#             - HOLADO_LOCAL_RESOURCES_BASEDIR: absolute path to base local resources directory of testing solution (where data are stored through campaigns)
 #         - optional:
-#             - HOLADO_TEST_IMAGE_REGISTRY: docker image registry to use (default: "registry.gitlab.com/testing-solution/python")
-#             - HOLADO_TEST_USE_LOCALHOST: force the container network to 'host'.
-#             - HOLADO_TEST_NETWORK: specify on which network the docker is run.
+#             - HOLADO_IMAGE_REGISTRY: docker image registry to use (default: "registry.gitlab.com/testing-solution/python")
+#             - HOLADO_USE_LOCALHOST: force the container network to 'host'.
+#             - HOLADO_NETWORK: specify on which network the docker is run.
 #     Example:
-#         export HOLADO_TEST_IMAGE_TAG=main
-#         export HOLADO_TEST_USE_LOCALHOST=True
-#         export HOLADO_TEST_OUTPUT_BASEDIR=$HOME/.holado/output
-#         export HOLADO_TEST_LOCAL_RESOURCES_BASEDIR=$HOME/.holado/resources
+#         export HOLADO_IMAGE_TAG=main
+#         export HOLADO_USE_LOCALHOST=True
+#         export HOLADO_OUTPUT_BASEDIR=$HOME/.holado/output
+#         export HOLADO_LOCAL_RESOURCES_BASEDIR=$HOME/.holado/resources
 #
 # If no parameters are added to the script, all features/scenarios are run.
 # Additional parameters can be specified to change runner behaviors, usually used to execute specific features/scenarios.
@@ -35,7 +35,7 @@
 #       For a complete help on possible parameters, simply add "-h" to command. 
 
 
-for v in HOLADO_TEST_IMAGE_TAG; do
+for v in HOLADO_IMAGE_TAG; do
     if [ -z ${!v} ]; then
         echo "Environment variable $v must be set"
         exit 1
@@ -45,26 +45,26 @@ done
 CWD="$(dirname "${BASH_SOURCE[0]}")"
 WORK_DIR="$(pwd)"
 
-if [[ -z "$HOLADO_TEST_IMAGE_REGISTRY" ]]; then
-    HOLADO_TEST_IMAGE_REGISTRY=registry.gitlab.com/testing-solution/python
+if [[ -z "$HOLADO_IMAGE_REGISTRY" ]]; then
+    HOLADO_IMAGE_REGISTRY=registry.gitlab.com/testing-solution/python
 fi
-TEST_IMAGE=${HOLADO_TEST_IMAGE_REGISTRY}:${HOLADO_TEST_IMAGE_TAG}
+TEST_IMAGE=${HOLADO_IMAGE_REGISTRY}:${HOLADO_IMAGE_TAG}
 
 # Update docker image
 echo "Updating docker image ${TEST_IMAGE}..."
 docker pull ${TEST_IMAGE}
 
 # Define test output directory
-if [[ ! -z "$HOLADO_TEST_OUTPUT_BASEDIR" ]]; then
-    OUTPUT_DIR=${HOLADO_TEST_OUTPUT_BASEDIR}
+if [[ ! -z "$HOLADO_OUTPUT_BASEDIR" ]]; then
+    OUTPUT_DIR=${HOLADO_OUTPUT_BASEDIR}
 else
     OUTPUT_DIR=${WORK_DIR}/output
 fi
 echo "Output directory: $OUTPUT_DIR"
 
 # Define test resources directory
-if [[ ! -z "$HOLADO_TEST_LOCAL_RESOURCES_BASEDIR" ]]; then
-    RESOURCES_DIR=${HOLADO_TEST_LOCAL_RESOURCES_BASEDIR}
+if [[ ! -z "$HOLADO_LOCAL_RESOURCES_BASEDIR" ]]; then
+    RESOURCES_DIR=${HOLADO_LOCAL_RESOURCES_BASEDIR}
 else
     RESOURCES_DIR=${WORK_DIR}/resources
 fi
@@ -81,11 +81,11 @@ if [ ! -d ${RESOURCES_DIR} ]; then
 fi
 
 # Define container network
-if [ "$HOLADO_TEST_USE_LOCALHOST" = True ]; then
+if [ "$HOLADO_USE_LOCALHOST" = True ]; then
     NETWORK_DEF_CMD="--network=host"
 else
-    if [[ ! -z "$HOLADO_TEST_NETWORK" ]]; then
-        NETWORK_DEF_CMD="--network $HOLADO_TEST_NETWORK"
+    if [[ ! -z "$HOLADO_NETWORK" ]]; then
+        NETWORK_DEF_CMD="--network $HOLADO_NETWORK"
     else
         NETWORK_DEF_CMD=""
     fi
@@ -101,20 +101,20 @@ else
 fi
 
 # Docker run 
-if [[ -z "$HOLADO_TEST_RUNNER_NAME" ]]; then
-    HOLADO_TEST_RUNNER_NAME=holado_test_runner
+if [[ -z "$HOLADO_RUNNER_NAME" ]]; then
+    HOLADO_RUNNER_NAME=holado_test_runner
 fi
 
 echo
-echo "Running tests (docker name: ${HOLADO_TEST_RUNNER_NAME})..."
+echo "Running tests (docker name: ${HOLADO_RUNNER_NAME})..."
 echo
 # Note: In bellow command, some non-regression scenarios are skipped, those currently not working when run in docker
-docker run --rm -t $((docker info | grep -i rootless > /dev/null && echo -n "--user root") || echo -n "-u $(id -u ${USER}):$(id -g ${USER})") --name ${HOLADO_TEST_RUNNER_NAME} \
+docker run --rm -t $((docker info | grep -i rootless > /dev/null && echo -n "--user root") || echo -n "-u $(id -u ${USER}):$(id -g ${USER})") --name ${HOLADO_RUNNER_NAME} \
 	-v "${OUTPUT_DIR}":/output \
 	-v "${RESOURCES_DIR}":/resources \
 	${LOGGING_CONF_CMD} \
-    -e HOLADO_TEST_OUTPUT_BASEDIR=/output \
-    -e HOLADO_TEST_LOCAL_RESOURCES_BASEDIR=/resources \
+    -e HOLADO_OUTPUT_BASEDIR=/output \
+    -e HOLADO_LOCAL_RESOURCES_BASEDIR=/resources \
 	${NETWORK_DEF_CMD} \
 	${TEST_IMAGE} /bin/bash -c "./run_test_nonreg.sh -t ~grpc -t ~rabbitmq -t ~sftp $*"
 

holado_helper/docker/run_terminal_in_docker-with_docker_control.sh

@@ -12,22 +12,22 @@
 #
 # REQUIREMENTS:
 #     Define in .profile the following variables
-#         - HOLADO_TEST_IMAGE_TAG: docker image tag to use (usually "main" or tag associated to any branch)
+#         - HOLADO_IMAGE_TAG: docker image tag to use (usually "main" or tag associated to any branch)
 #         - optional but preferable:
-#             - HOLADO_TEST_OUTPUT_BASEDIR: absolute path to base output directory of testing solution
-#             - HOLADO_TEST_LOCAL_RESOURCES_BASEDIR: absolute path to base local resources directory of testing solution (where data are stored through campaigns)
+#             - HOLADO_OUTPUT_BASEDIR: absolute path to base output directory of testing solution
+#             - HOLADO_LOCAL_RESOURCES_BASEDIR: absolute path to base local resources directory of testing solution (where data are stored through campaigns)
 #         - optional:
-#             - HOLADO_TEST_USE_LOCALHOST: force the container network to 'host'.
-#             - HOLADO_TEST_NETWORK: specify on which network the docker is run.
+#             - HOLADO_USE_LOCALHOST: force the container network to 'host'.
+#             - HOLADO_NETWORK: specify on which network the docker is run.
 #     Example:
-#         export HOLADO_TEST_IMAGE_TAG=main
-#         export HOLADO_TEST_USE_LOCALHOST=True
-#         export HOLADO_TEST_OUTPUT_BASEDIR=$HOME/.holado/output
-#         export HOLADO_TEST_LOCAL_RESOURCES_BASEDIR=$HOME/.holado/resources
+#         export HOLADO_IMAGE_TAG=main
+#         export HOLADO_USE_LOCALHOST=True
+#         export HOLADO_OUTPUT_BASEDIR=$HOME/.holado/output
+#         export HOLADO_LOCAL_RESOURCES_BASEDIR=$HOME/.holado/resources
 #
 
 
-for v in HOLADO_TEST_IMAGE_TAG; do
+for v in HOLADO_IMAGE_TAG; do
     if [ -z ${!v} ]; then
         echo "Environment variable $v must be set"
         exit 1
@@ -36,26 +36,26 @@ done
 
 WORK_DIR="$(pwd)"
 
-if [[ -z "$HOLADO_TEST_IMAGE_REGISTRY" ]]; then
-    HOLADO_TEST_IMAGE_REGISTRY=registry.gitlab.com/testing-solution/python
+if [[ -z "$HOLADO_IMAGE_REGISTRY" ]]; then
+    HOLADO_IMAGE_REGISTRY=registry.gitlab.com/testing-solution/python
 fi
-TEST_IMAGE=${HOLADO_TEST_IMAGE_REGISTRY}:${HOLADO_TEST_IMAGE_TAG}
+TEST_IMAGE=${HOLADO_IMAGE_REGISTRY}:${HOLADO_IMAGE_TAG}
 
 # Update docker image
 echo "Updating docker image ${TEST_IMAGE}..."
 docker pull ${TEST_IMAGE}
 
 # Define test output directory
-if [[ ! -z "$HOLADO_TEST_OUTPUT_BASEDIR" ]]; then
-    OUTPUT_DIR=${HOLADO_TEST_OUTPUT_BASEDIR}
+if [[ ! -z "$HOLADO_OUTPUT_BASEDIR" ]]; then
+    OUTPUT_DIR=${HOLADO_OUTPUT_BASEDIR}
 else
     OUTPUT_DIR=${WORK_DIR}/output
 fi
 echo "Output directory: $OUTPUT_DIR"
 
 # Define test resources directory
-if [[ ! -z "$HOLADO_TEST_LOCAL_RESOURCES_BASEDIR" ]]; then
-    RESOURCES_DIR=${HOLADO_TEST_LOCAL_RESOURCES_BASEDIR}
+if [[ ! -z "$HOLADO_LOCAL_RESOURCES_BASEDIR" ]]; then
+    RESOURCES_DIR=${HOLADO_LOCAL_RESOURCES_BASEDIR}
 else
     RESOURCES_DIR=${WORK_DIR}/resources
 fi
@@ -72,31 +72,31 @@ if [ ! -d ${RESOURCES_DIR} ]; then
 fi
 
 # Define container network
-if [ "$HOLADO_TEST_USE_LOCALHOST" = True ]; then
+if [ "$HOLADO_USE_LOCALHOST" = True ]; then
 	NETWORK_DEF_COMMAND="--network=host"
 else
-	if [[ ! -z "$HOLADO_TEST_NETWORK" ]]; then
-		NETWORK_DEF_COMMAND="--network $HOLADO_TEST_NETWORK"
+	if [[ ! -z "$HOLADO_NETWORK" ]]; then
+		NETWORK_DEF_COMMAND="--network $HOLADO_NETWORK"
 	else
 		NETWORK_DEF_COMMAND=""
 	fi
 fi
 
 # Docker run 
-if [[ -z "$HOLADO_TEST_RUNNER_NAME" ]]; then
-    HOLADO_TEST_RUNNER_NAME=holado_test_runner
+if [[ -z "$HOLADO_RUNNER_NAME" ]]; then
+    HOLADO_RUNNER_NAME=holado_test_runner
 fi
 
 echo
-echo "Running tests (docker name: ${HOLADO_TEST_RUNNER_NAME})..."
+echo "Running tests (docker name: ${HOLADO_RUNNER_NAME})..."
 echo
-#docker run --rm -it $((docker info | grep -i rootless > /dev/null && echo -n "--user root") || echo -n "-u $(id -u ${USER}):$(id -g ${USER})") --name ${HOLADO_TEST_RUNNER_NAME} \
-docker run --rm -it --user root --name ${HOLADO_TEST_RUNNER_NAME} \
+#docker run --rm -it $((docker info | grep -i rootless > /dev/null && echo -n "--user root") || echo -n "-u $(id -u ${USER}):$(id -g ${USER})") --name ${HOLADO_RUNNER_NAME} \
+docker run --rm -it --user root --name ${HOLADO_RUNNER_NAME} \
     --privileged -v /var/run/docker.sock:/var/run/docker.sock \
     -v "${OUTPUT_DIR}":/output \
     -v "${RESOURCES_DIR}":/resources \
-    -e HOLADO_TEST_OUTPUT_BASEDIR=/output \
-    -e HOLADO_TEST_LOCAL_RESOURCES_BASEDIR=/resources \
+    -e HOLADO_OUTPUT_BASEDIR=/output \
+    -e HOLADO_LOCAL_RESOURCES_BASEDIR=/resources \
     ${NETWORK_DEF_COMMAND} \
     -w /work_dir \
     ${TEST_IMAGE} /bin/bash

holado_helper/docker/run_terminal_in_docker.sh

@@ -12,22 +12,22 @@
 #
 # REQUIREMENTS:
 #     Define in .profile the following variables
-#         - HOLADO_TEST_IMAGE_TAG: docker image tag to use (usually "main" or tag associated to any branch)
+#         - HOLADO_IMAGE_TAG: docker image tag to use (usually "main" or tag associated to any branch)
 #         - optional but preferable:
-#             - HOLADO_TEST_OUTPUT_BASEDIR: absolute path to base output directory of testing solution
-#             - HOLADO_TEST_LOCAL_RESOURCES_BASEDIR: absolute path to base local resources directory of testing solution (where data are stored through campaigns)
+#             - HOLADO_OUTPUT_BASEDIR: absolute path to base output directory of testing solution
+#             - HOLADO_LOCAL_RESOURCES_BASEDIR: absolute path to base local resources directory of testing solution (where data are stored through campaigns)
 #         - optional:
-#             - HOLADO_TEST_USE_LOCALHOST: force the container network to 'host'.
-#             - HOLADO_TEST_NETWORK: specify on which network the docker is run.
+#             - HOLADO_USE_LOCALHOST: force the container network to 'host'.
+#             - HOLADO_NETWORK: specify on which network the docker is run.
 #     Example:
-#         export HOLADO_TEST_IMAGE_TAG=main
-#         export HOLADO_TEST_USE_LOCALHOST=True
-#         export HOLADO_TEST_OUTPUT_BASEDIR=$HOME/.holado/output
-#         export HOLADO_TEST_LOCAL_RESOURCES_BASEDIR=$HOME/.holado/resources
+#         export HOLADO_IMAGE_TAG=main
+#         export HOLADO_USE_LOCALHOST=True
+#         export HOLADO_OUTPUT_BASEDIR=$HOME/.holado/output
+#         export HOLADO_LOCAL_RESOURCES_BASEDIR=$HOME/.holado/resources
 #
 
 
-for v in HOLADO_TEST_IMAGE_TAG; do
+for v in HOLADO_IMAGE_TAG; do
     if [ -z ${!v} ]; then
         echo "Environment variable $v must be set"
         exit 1
@@ -36,26 +36,26 @@ done
 
 WORK_DIR="$(pwd)"
 
-if [[ -z "$HOLADO_TEST_IMAGE_REGISTRY" ]]; then
-    HOLADO_TEST_IMAGE_REGISTRY=registry.gitlab.com/testing-solution/python
+if [[ -z "$HOLADO_IMAGE_REGISTRY" ]]; then
+    HOLADO_IMAGE_REGISTRY=registry.gitlab.com/testing-solution/python
 fi
-TEST_IMAGE=${HOLADO_TEST_IMAGE_REGISTRY}:${HOLADO_TEST_IMAGE_TAG}
+TEST_IMAGE=${HOLADO_IMAGE_REGISTRY}:${HOLADO_IMAGE_TAG}
 
 # Update docker image
 echo "Updating docker image ${TEST_IMAGE}..."
 docker pull ${TEST_IMAGE}
 
 # Define test output directory
-if [[ ! -z "$HOLADO_TEST_OUTPUT_BASEDIR" ]]; then
-    OUTPUT_DIR=${HOLADO_TEST_OUTPUT_BASEDIR}
+if [[ ! -z "$HOLADO_OUTPUT_BASEDIR" ]]; then
+    OUTPUT_DIR=${HOLADO_OUTPUT_BASEDIR}
 else
     OUTPUT_DIR=${WORK_DIR}/output
 fi
 echo "Output directory: $OUTPUT_DIR"
 
 # Define test resources directory
-if [[ ! -z "$HOLADO_TEST_LOCAL_RESOURCES_BASEDIR" ]]; then
-    RESOURCES_DIR=${HOLADO_TEST_LOCAL_RESOURCES_BASEDIR}
+if [[ ! -z "$HOLADO_LOCAL_RESOURCES_BASEDIR" ]]; then
+    RESOURCES_DIR=${HOLADO_LOCAL_RESOURCES_BASEDIR}
 else
     RESOURCES_DIR=${WORK_DIR}/resources
 fi
@@ -72,29 +72,29 @@ if [ ! -d ${RESOURCES_DIR} ]; then
 fi
 
 # Define container network
-if [ "$HOLADO_TEST_USE_LOCALHOST" = True ]; then
+if [ "$HOLADO_USE_LOCALHOST" = True ]; then
 	NETWORK_DEF_COMMAND="--network=host"
 else
-	if [[ ! -z "$HOLADO_TEST_NETWORK" ]]; then
-		NETWORK_DEF_COMMAND="--network $HOLADO_TEST_NETWORK"
+	if [[ ! -z "$HOLADO_NETWORK" ]]; then
+		NETWORK_DEF_COMMAND="--network $HOLADO_NETWORK"
 	else
 		NETWORK_DEF_COMMAND=""
 	fi
 fi
 
 # Docker run 
-if [[ -z "$HOLADO_TEST_RUNNER_NAME" ]]; then
-    HOLADO_TEST_RUNNER_NAME=holado_test_runner
+if [[ -z "$HOLADO_RUNNER_NAME" ]]; then
+    HOLADO_RUNNER_NAME=holado_test_runner
 fi
 
 echo
-echo "Running tests (docker name: ${HOLADO_TEST_RUNNER_NAME})..."
+echo "Running tests (docker name: ${HOLADO_RUNNER_NAME})..."
 echo
-docker run --rm -it $((docker info | grep -i rootless > /dev/null && echo -n "--user root") || echo -n "-u $(id -u ${USER}):$(id -g ${USER})") --name ${HOLADO_TEST_RUNNER_NAME} \
+docker run --rm -it $((docker info | grep -i rootless > /dev/null && echo -n "--user root") || echo -n "-u $(id -u ${USER}):$(id -g ${USER})") --name ${HOLADO_RUNNER_NAME} \
     -v "${OUTPUT_DIR}":/output \
     -v "${RESOURCES_DIR}":/resources \
-    -e HOLADO_TEST_OUTPUT_BASEDIR=/output \
-    -e HOLADO_TEST_LOCAL_RESOURCES_BASEDIR=/resources \
+    -e HOLADO_OUTPUT_BASEDIR=/output \
+    -e HOLADO_LOCAL_RESOURCES_BASEDIR=/resources \
     ${NETWORK_DEF_COMMAND} \
     -w /work_dir \
     ${TEST_IMAGE} /bin/bash