holado 0.10.2__tar.gz → 0.11.1__tar.gz

{holado-0.10.2 → holado-0.11.1}/.gitlab-ci.yml

@@ -2,8 +2,8 @@ stages:
   - publish-holado-dockerhub
   - publish-holado-gitlab
   - publish-test-server-dockerhub
-  - publish-docker-controller-dockerhub
-  - publish-docker-viewer-dockerhub
+  - publish-host-controller-dockerhub
+  - publish-host-viewer-dockerhub
 #  - publish-holado-pypi
 
 variables:
@@ -16,7 +16,7 @@ publish-holado-dockerhub-latest:
 
   image:
     name: docker:${DOCKER_IMAGE_TAG}
-    
+  
   variables:
     IMAGE_TAG: index.docker.io/holado/python:latest
 
@@ -58,7 +58,7 @@ publish-test-server-dockerhub-latest:
     IMAGE_TAG: index.docker.io/holado/test_server:latest
 
   script:
-    - docker build ./src/holado_test/test_server/server/ -t ${IMAGE_TAG}
+    - docker build ./src/holado_test/tools/test_server/server/ -t ${IMAGE_TAG}
     - echo "$DOCKERHUB_TOKEN" | docker login docker.io -u holado --password-stdin
     - docker push ${IMAGE_TAG}
   
@@ -78,7 +78,7 @@ publish-test-server-dockerhub-tag:
     IMAGE_TAG: index.docker.io/holado/test_server:$CI_COMMIT_TAG
 
   script:
-    - docker build ./src/holado_test/test_server/server/ -t ${IMAGE_TAG}
+    - docker build ./src/holado_test/tools/test_server/server/ -t ${IMAGE_TAG}
     - echo "$DOCKERHUB_TOKEN" | docker login docker.io -u holado --password-stdin
     - docker push ${IMAGE_TAG}
   
@@ -87,17 +87,17 @@ publish-test-server-dockerhub-tag:
   when: manual
 
 
-publish-docker-controller-dockerhub-latest:
-  stage: publish-docker-controller-dockerhub
+publish-host-controller-dockerhub-latest:
+  stage: publish-host-controller-dockerhub
 
   image:
     name: docker:${DOCKER_IMAGE_TAG}
     
   variables:
-    IMAGE_TAG: index.docker.io/holado/docker_controller:latest
+    IMAGE_TAG: index.docker.io/holado/host_controller:latest
 
   script:
-    - docker build ./src/holado_docker/tools/docker_controller/server/ -t ${IMAGE_TAG}
+    - docker build ./src/holado_tools/tools/host_controller/server/ -t ${IMAGE_TAG}
     - echo "$DOCKERHUB_TOKEN" | docker login docker.io -u holado --password-stdin
     - docker push ${IMAGE_TAG}
   
@@ -107,17 +107,17 @@ publish-docker-controller-dockerhub-latest:
     - if: $CI_COMMIT_BRANCH == "main"
   when: manual
 
-publish-docker-controller-dockerhub-tag:
-  stage: publish-docker-controller-dockerhub
+publish-host-controller-dockerhub-tag:
+  stage: publish-host-controller-dockerhub
 
   image:
     name: docker:${DOCKER_IMAGE_TAG}
     
   variables:
-    IMAGE_TAG: index.docker.io/holado/docker_controller:$CI_COMMIT_TAG
+    IMAGE_TAG: index.docker.io/holado/host_controller:$CI_COMMIT_TAG
 
   script:
-    - docker build ./src/holado_docker/tools/docker_controller/server/ -t ${IMAGE_TAG}
+    - docker build ./src/holado_tools/tools/host_controller/server/ -t ${IMAGE_TAG}
     - echo "$DOCKERHUB_TOKEN" | docker login docker.io -u holado --password-stdin
     - docker push ${IMAGE_TAG}
   
@@ -126,17 +126,17 @@ publish-docker-controller-dockerhub-tag:
   when: manual
 
 
-publish-docker-viewer-dockerhub-latest:
-  stage: publish-docker-viewer-dockerhub
+publish-host-viewer-dockerhub-latest:
+  stage: publish-host-viewer-dockerhub
 
   image:
     name: docker:${DOCKER_IMAGE_TAG}
     
   variables:
-    IMAGE_TAG: index.docker.io/holado/docker_viewer:latest
+    IMAGE_TAG: index.docker.io/holado/host_viewer:latest
 
   script:
-    - docker build ./src/holado_docker/tools/docker_viewer/server/ -t ${IMAGE_TAG}
+    - docker build ./src/holado_tools/tools/host_viewer/server/ -t ${IMAGE_TAG}
     - echo "$DOCKERHUB_TOKEN" | docker login docker.io -u holado --password-stdin
     - docker push ${IMAGE_TAG}
   
@@ -146,17 +146,17 @@ publish-docker-viewer-dockerhub-latest:
     - if: $CI_COMMIT_BRANCH == "main"
   when: manual
 
-publish-docker-viewer-dockerhub-tag:
-  stage: publish-docker-viewer-dockerhub
+publish-host-viewer-dockerhub-tag:
+  stage: publish-host-viewer-dockerhub
 
   image:
     name: docker:${DOCKER_IMAGE_TAG}
     
   variables:
-    IMAGE_TAG: index.docker.io/holado/docker_viewer:$CI_COMMIT_TAG
+    IMAGE_TAG: index.docker.io/holado/host_viewer:$CI_COMMIT_TAG
 
   script:
-    - docker build ./src/holado_docker/tools/docker_viewer/server/ -t ${IMAGE_TAG}
+    - docker build ./src/holado_tools/tools/host_viewer/server/ -t ${IMAGE_TAG}
     - echo "$DOCKERHUB_TOKEN" | docker login docker.io -u holado --password-stdin
     - docker push ${IMAGE_TAG}
   

{holado-0.10.2 → holado-0.11.1}/Dockerfile

@@ -2,10 +2,9 @@
 
 ### Build
 
-#FROM python:3.10.15-alpine3.20 AS build
-#FROM python:3.11.10-alpine3.20 AS build
-#FROM python:3.12.8-alpine3.21 AS build
-FROM python:3.12.9-alpine3.21 AS build
+#FROM python:3.12.9-alpine3.21 AS build
+#FROM python:3.12.12-alpine3.21 AS build
+FROM python:3.12.12-alpine3.22 AS build
 #FROM python:3.13.2-alpine3.21 AS build
 
 # Install to build python requirements
@@ -45,10 +44,9 @@ RUN python -m venv /code/env \
 
 ### Runtime
 
-#FROM python:3.10.15-alpine3.20 AS runtime
-#FROM python:3.11.10-alpine3.20 AS runtime
-#FROM python:3.12.8-alpine3.21 AS runtime
-FROM python:3.12.9-alpine3.21 AS runtime
+#FROM python:3.12.9-alpine3.21 AS runtime
+#FROM python:3.12.12-alpine3.21 AS runtime
+FROM python:3.12.12-alpine3.22 AS runtime
 #FROM python:3.13.2-alpine3.21 AS runtime
 
 # Install for python requirements

{holado-0.10.2 → holado-0.11.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: holado
-Version: 0.10.2
+Version: 0.11.1
 Summary: HolAdo framework
 Project-URL: Homepage, https://gitlab.com/holado_framework/python
 Project-URL: Issues, https://gitlab.com/holado_framework/python/-/issues

{holado-0.10.2 → holado-0.11.1}/build/Dockerfile_with_docker

@@ -1,6 +1,7 @@
 ### Build
 
-FROM python:3.12.9-alpine3.21 AS build
+#FROM python:3.12.9-alpine3.21 AS build
+FROM python:3.12.12-alpine3.22 AS build
 
 # Install to build python requirements
 RUN apk update \
@@ -39,7 +40,8 @@ RUN python -m venv /code/env \
 
 ### Runtime
 
-FROM python:3.12.9-alpine3.21 AS runtime
+#FROM python:3.12.9-alpine3.21 AS runtime
+FROM python:3.12.12-alpine3.22 AS runtime
 
 # Install for python requirements
 RUN apk update \

holado-0.11.1/packaging/VERSION

@@ -0,0 +1 @@
+0.11.1

{holado-0.10.2 → holado-0.11.1}/requirements_docker.txt

@@ -1,5 +1,5 @@
-#behave
-behave==1.2.7.dev6
+behave
+#behave==1.2.7.dev6
 #git+https://github.com/behave/behave@v1.2.7.dev5
 
 python-dateutil

{holado-0.10.2 → holado-0.11.1}/src/holado_helper/docker/run_holado_test_nonreg_in_docker.sh

@@ -109,7 +109,7 @@ echo
 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_RUNNER_NAME} \
+docker run --rm -t $(docker info --format '{{.SecurityOptions}}' | grep -q rootless && 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} \

{holado-0.10.2 → holado-0.11.1}/src/holado_helper/docker/run_terminal_in_docker.sh

@@ -90,7 +90,7 @@ fi
 echo
 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_RUNNER_NAME} \
+docker run --rm -it $(docker info --format '{{.SecurityOptions}}' | grep -q rootless && 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_OUTPUT_BASEDIR=/output \

holado-0.11.1/src/holado_python/standard_library/ssl/resources/certificates/tcpbin.crt

@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDZTCCAk2gAwIBAgIBKjANBgkqhkiG9w0BAQsFADCBizELMAkGA1UEBhMCVVMx
+CzAJBgNVBAgMAkNBMRYwFAYDVQQHDA1TYW4gRnJhbmNpc2NvMQ8wDQYDVQQKDAZ0
+Y3BiaW4xDDAKBgNVBAsMA29wczETMBEGA1UEAwwKdGNwYmluLmNvbTEjMCEGCSqG
+SIb3DQEJARYUaGFycnliYWdkaUBnbWFpbC5jb20wHhcNMjUxMDIyMDkwOTA0WhcN
+MjUxMDIzMDkwOTA0WjAcMRowGAYDVQQDDBF0Y3BiaW4uY29tLWNsaWVudDCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKxBxWBybXhqGWMhtI3vpad9SP9k
+0IsZSIHRRPI27FU/kfoTfMrQayKVggdlyenD3OojsEfNd8mvjz9ApIpogouYgZD4
+0zqHT8G4B15RASWP2K20WWNuKr7HgvraPwTbjDbtg8XU4kwgGOs1XftPhSi9N2DU
+/O6sEkgprqpkNAAZvn8bHRTpDB4FMqbTmH3ojawtz6PeW4I9YJLvbYFYwmmYrNpD
+L5pLnfyt6MS5/x5MGlpvcCaiQU3hWS8JOKpgP6XrIIsu65fQC+UU4MJIYg/StGPj
+rJ7eRBUoi11tGMCfF38AtYUgdNXdVjDM93F+Oks8tVGSZ9d7cwQknKMUgwECAwEA
+AaNCMEAwHQYDVR0OBBYEFBOraPFlFALkITNnlh3s4B564QvFMB8GA1UdIwQYMBaA
+FOLuMowBSAZfV5v82LmlaIIOvU/DMA0GCSqGSIb3DQEBCwUAA4IBAQA/LgtD4+3x
+myJUWPz8TAJ41zIK2AxUgLmlinQnKzvXdHFjJZtYQPxadOdZon7q3Jw7J2FpaQLh
+cc1h9pKIVaPXiR6I4CStKzw6peBtKJ2oN6uaZpSCQza+TC7Bg50uMbJmW+ph8tkY
+t2wmNFh6Q3+yC8kxQM5u0Cg2NDYGepwNhdUfVy1HpgLaM8Gr5gPSD01p1fyb7pcJ
+MWBK0kK6f0JcxZsIvSVuDX4Fc51LppEqv1THL5G4q3sWacksy0VG/izxLgB3hXs1
+VJBUWAMgbvAjAV15XCmvC3k5mMlyIrfXRO8uPpD5iIDdgQQJ5/Bo4UPFGJPOkLV3
+OEqtvNchmuBf
+-----END CERTIFICATE-----

holado-0.11.1/src/holado_python/standard_library/ssl/resources/certificates/tcpbin.key

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCsQcVgcm14ahlj
+IbSN76WnfUj/ZNCLGUiB0UTyNuxVP5H6E3zK0GsilYIHZcnpw9zqI7BHzXfJr48/
+QKSKaIKLmIGQ+NM6h0/BuAdeUQElj9ittFljbiq+x4L62j8E24w27YPF1OJMIBjr
+NV37T4UovTdg1PzurBJIKa6qZDQAGb5/Gx0U6QweBTKm05h96I2sLc+j3luCPWCS
+722BWMJpmKzaQy+aS538rejEuf8eTBpab3AmokFN4VkvCTiqYD+l6yCLLuuX0Avl
+FODCSGIP0rRj46ye3kQVKItdbRjAnxd/ALWFIHTV3VYwzPdxfjpLPLVRkmfXe3ME
+JJyjFIMBAgMBAAECggEBAIfNwqJrFEseuq0g4YwVJ3CIoYhYHuHLKRLPvZ+IFYKP
+/7I8suHittQpMr5KTYly1TPytwOkxY/ITRL9D7ve8SzFK0D0KvO1wfdj8ss06caH
+RbiMuvxc2m5WNLk4Xv6haEXVs1HAqDiEBaFKDbIX209m/cXlpRM1raQe2ImVPjnk
+xtdzpLYgRIf4MHtjAI22knlsSgypay6cpUF+PArmgepmsIaw+ioy5ItSWTmvq8QU
+9KhnEtdn8UOciLiP2rnLgql+qF8RCL9R/NTTZo+kC00AMEliQBFaLHsLHuFuAQwT
+6X9ueOtEOAewWhhelScbfub5ZlVwvvWhawLqoyGiRZECgYEA1TAlMXhZCrtAIyk/
+Q0dCbrMl24Mr6Yv+PC8Z9N/EC5UrddPwk2W4/L+e8kU6XyyJ4Gw3ZQgJd8gTb1/0
+zpnaFXdK2VhyHxWz3UNzQ4lRuMVB1qK/5/yByqRhysKczzhufhf2XuIcDqiYsWHg
+C4VwpQAQSp9Vbcpd1biXEv1O8AMCgYEAztliCAXlExU3DmcRWbV0RpIjREAm9f6w
+uX8RRuFYZsHVY1pEkv5iACjofeZz9s/EC8QGo4ixcELEou5pFX1HYFyjjw2CwBmS
+a63l5KJyQcChF2tkDaEFsspM0Tri001h8LpChep6cZK4CkHkJ3MTXD4mqa+vpYgr
+RDUwZhdYu6sCgYBO0nE9/Dg3zonlNi/sySEX2ubpZXNL83W5fNTFBCLxAWNDOmxd
+oyOlV5gGDXCKleYYcwp8MV+GyRPefwT9ikbm3uduutPfCGArM/AfDVuIzG4OVLhN
+pr+6U9LQa+ocd8nqlyOBa2piRRXHp991gw3mA8MCRC0K3eKZzZkV7VBNTwKBgCTu
+UP9ntgebMRJEOqfOquzyqJNF9O7Uw07LLhV+pF7sWqH7euTXwD2REDlyTOATJkiH
+fjvyauPFOABzGpX4oSbGQ3mGCwMrTaYmDTat/kJZFynsRZfdWPwb/G0a22aomUT2
+rGvmemgOrwc9znNwq1M70YFYWb7vOfJaoMKJhpEzAoGBAKQCWrZWZRBEeid9QsQ3
+SVedImc8PN5IOC0vyydrkF5qV8LYsPmqMzfkOx0XAx6xrEUyjtSzZRgz/na1EzE6
+juGFIBW30Dx3Ej2A/pKQ7/Yuhdrhl5Nd/Dv5sBgtziBeC+5PYI0XqCV7nIGGOu2/
+8SjHFk7En45EM/cT8l/VahAv
+-----END PRIVATE KEY-----

holado-0.11.1/src/holado_report/report/builders/summary_scenario_by_category_report_builder.py

@@ -0,0 +1,87 @@
+
+#################################################
+# HolAdo (Holistic Automation do)
+#
+# (C) Copyright 2021-2025 by Eric Klumpp
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+# The Software is provided “as is”, without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In no event shall the authors or copyright holders be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the software or the use or other dealings in the Software.
+#################################################
+
+import logging
+from holado_report.report.builders.report_builder import ReportBuilder
+from holado_system.system.filesystem.file import File
+
+logger = logging.getLogger(__name__)
+
+
+
+class SummaryScenarioByCategoryReportBuilder(ReportBuilder):
+    def __init__(self, filepath, exclude_categories=['Always Success']):
+        self.__filepath = filepath
+        self.__exclude_categories = exclude_categories
+        self.__scenarios_by_category = {}
+        self.__categories_order = [
+                'Regression',
+                'Always Failed',
+                'Random',
+                'Regression but Not Relevant',
+                'Always Not Relevant',
+                'Random but Not Relevant',
+                'Fixed',
+                'Always Success',
+                'Unknown'
+            ]
+        
+    def build(self):
+        '''
+        The file is built after each scenario
+        '''
+        pass
+        
+    def after_scenario(self, scenario, scenario_report=None):
+        from holado_report.report.report_manager import ReportManager
+        category_validation, status_validation, step_failed, step_number = ReportManager.get_current_scenario_status_information(scenario)
+        
+        if category_validation is not None:
+            ind = category_validation.find(' (')
+            category = category_validation[:ind] if ind > 0 else category_validation
+            
+            # Manage excluded categories
+            if category in self.__exclude_categories:
+                return
+            
+            # Add scenario information into category
+            category_str = f" => {category_validation}" if category_validation else ""
+            if step_failed is not None:
+                scenario_txt = f"scenario in {scenario.filename} at l.{scenario.line} - step {step_number} (l.{step_failed.line}) - {status_validation}{category_str}"
+            else:
+                scenario_txt = f"scenario in {scenario.filename} at l.{scenario.line} - step ? (missing step implementation ?) - {status_validation}{category_str}"
+            
+            if category not in self.__scenarios_by_category:
+                self.__scenarios_by_category[category] = []
+            self.__scenarios_by_category[category].append(scenario_txt)
+            
+            # Update categories order with unexpected category
+            if category not in self.__categories_order:
+                self.__categories_order.append(category)
+            
+            self.__update_file()
+        
+    def __update_file(self):
+        with File(self.__filepath, mode='wt', auto_flush=False) as fout:
+            for category in self.__categories_order:
+                if category in self.__scenarios_by_category:
+                    fout.writelines([
+                        f"## {category}",
+                        ""
+                        ])
+                    fout.writelines(self.__scenarios_by_category[category])
+                    fout.writelines([
+                        ""
+                        ""
+                        ])
+    

{holado-0.10.2 → holado-0.11.1}/src/holado_report/report/report_manager.py

@@ -23,6 +23,7 @@ from holado_report.report.reports.base_report import BaseReport
 from holado_scripting.common.tools.evaluate_parameters import EvaluateParameters
 from holado_report.report.builders.summary_scenario_report_builder import SummaryScenarioReportBuilder
 from holado_report.report.builders.failure_report_builder import FailureReportBuilder
+from holado_report.report.builders.summary_scenario_by_category_report_builder import SummaryScenarioByCategoryReportBuilder
 # from holado_core.scenario.scenario_duration_manager import ScenarioDurationManager
 
 logger = logging.getLogger(__name__)
@@ -66,6 +67,9 @@ class ReportManager(BaseReport):
             fn = self.get_path("report_summary_scenario_failed.txt")
             self.add_report_builder(SummaryScenarioFailedReportBuilder(fn))
             
+            fn = self.get_path("report_summary_scenario_failed_by_category.txt")
+            self.add_report_builder(SummaryScenarioByCategoryReportBuilder(fn))
+            
             fn = self.get_path("report_summary_scenario_all.txt")
             self.add_report_builder(SummaryScenarioReportBuilder(fn))
             
@@ -283,7 +287,7 @@ class ReportManager(BaseReport):
                     else:
                         category = f'Unknown (unmanaged sequence: {passed_sequences})'
                 
-                logger.print(f"++++++++++ {category} <= {statuses}")
+                logger.debug(f"Category of scenario '{scenario}': {category}  (computed from last statuses: {statuses})")
                 
             cls._scenario_status_information_by_uid[scenario_uid] = [category, status, step_failed, step_nb]
         

{holado-0.10.2 → holado-0.11.1}/src/holado_test/__init__.py

@@ -23,7 +23,7 @@ def register():
     from holado_test.behave.behave_manager import BehaveManager
     SessionContext.instance().services.register_service_type("behave_manager", BehaveManager)
     
-    from holado_test.test_server.client.rest.test_server_client import TestServerClient
+    from holado_test.tools.test_server.client.rest.test_server_client import TestServerClient
     SessionContext.instance().services.register_service_type("test_server_client", TestServerClient.new_client)
     
 

{holado-0.10.2/src/holado_test → holado-0.11.1/src/holado_test/tools}/test_server/server/Dockerfile

@@ -1,20 +1,14 @@
 ### Build
 
 #FROM python:3.12.9-alpine3.21 AS build
-FROM python:3.12.11-alpine3.22 AS build
+#FROM python:3.12.11-alpine3.22 AS build
+FROM python:3.12.12-alpine3.22 AS build
 
 # Install to build python requirements
 RUN apk update \
     && apk --no-cache --update add build-base \
     && apk --update add alpine-sdk \
-    && apk add libffi-dev \
-    && apk add postgresql-dev gcc python3-dev musl-dev \
-    && apk add protobuf-dev
-
-# Add tools
-RUN apk --no-cache add bash \
-    && apk --no-cache add nano \
-    && apk --no-cache add curl
+    && apk add libffi-dev 
 
 # Create user
 RUN addgroup appuser \
@@ -32,19 +26,15 @@ COPY --chown=appuser ./requirements.txt /code/test_server/requirements.txt
 WORKDIR /code/test_server
 RUN python -m venv /code/env \
     && source /code/env/bin/activate \
-    && pip install -r requirements.txt
+    && pip install --no-cache-dir -r requirements.txt
 
 
 
 ### Runtime
 
 #FROM python:3.12.9-alpine3.21 AS runtime
-FROM python:3.12.11-alpine3.22 AS runtime
-
-# Install for python requirements
-#RUN apk update \
-#    && apk --no-cache add libstdc++ \
-#    && apk --no-cache add postgresql-dev gcc python3-dev musl-dev
+#FROM python:3.12.11-alpine3.22 AS runtime
+FROM python:3.12.12-alpine3.22 AS runtime
 
 # Add tools
 RUN apk --no-cache add bash \
@@ -59,7 +49,7 @@ USER appuser
 # Copy /code from build
 COPY --chown=appuser --from=build /code /code
 
-# Copy docker controller sources
+# Copy test server sources
 COPY --chown=appuser ./rest /code/test_server
 
 # Activate permanently python venv

{holado-0.10.2/src/holado_test → holado-0.11.1/src/holado_test/tools}/test_server/server/core/server_context.py

@@ -21,7 +21,7 @@ class TestServerSessionContext(SessionContext):
         
         # Register new modules
         
-        from holado_test.test_server.server.core.server_manager import TestServerManager
+        from holado_test.tools.test_server.server.core.server_manager import TestServerManager
         self.services.register_service_type("server_manager", TestServerManager,
                             lambda m: m.initialize(self.resource_manager) )
         

{holado-0.10.2/src/holado_test → holado-0.11.1/src/holado_test/tools}/test_server/server/rest/run.py

@@ -23,7 +23,7 @@ insert_holado_source_paths(with_test_behave=False)
 
 # Initialize HolAdo
 import holado
-from holado_test.test_server.server.core.server_context import TestServerSessionContext
+from holado_test.tools.test_server.server.core.server_context import TestServerSessionContext
 holado.initialize(TSessionContext=TestServerSessionContext, 
                   logging_config_file_path=os.path.join(here, 'logging.conf'), log_level=logging.INFO, 
                   log_on_console=True, log_in_file=False,

holado-0.11.1/src/holado_tools/__init__.py

@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+
+#################################################
+# HolAdo (Holistic Automation do)
+#
+# (C) Copyright 2021-2025 by Eric Klumpp
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+# The Software is provided “as is”, without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In no event shall the authors or copyright holders be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the software or the use or other dealings in the Software.
+#################################################
+
+
+def configure_module():
+    """
+    Configure this module
+    Example: set new attributes in holado.holado_config.Config class
+    """
+    pass
+
+def dependencies():
+    """
+    Return None or the list of names of modules it depend on
+    """
+    return None
+
+def register():
+    """
+    Register the services of this module
+    """
+    # from holado.common.context.session_context import SessionContext
+    
+    # from holado_xxx.xxx import XXXManager
+    # SessionContext.instance().services.register_service_type("xxx_manager", XXXManager)
+    pass
+

holado-0.11.1/src/holado_tools/tests/behave/steps/__init__.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+
+#################################################
+# HolAdo (Holistic Automation do)
+#
+# (C) Copyright 2021-2025 by Eric Klumpp
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+# The Software is provided “as is”, without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In no event shall the authors or copyright holders be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the software or the use or other dealings in the Software.
+#################################################
+
+
+from .tools.host_controller.client_steps import *

{holado-0.10.2/src/holado_docker/tests/behave/steps/tools/docker_controller → holado-0.11.1/src/holado_tools/tests/behave/steps/tools/host_controller}/client_steps.py

@@ -19,7 +19,7 @@ import logging
 from holado_test.scenario.step_tools import StepTools
 from holado_test.behave.scenario.behave_step_tools import BehaveStepTools
 from holado_value.common.tables.converters.value_table_converter import ValueTableConverter
-from holado_docker.tools.docker_controller.client.rest.docker_controller_client import DockerControllerClient
+from holado_tools.tools.host_controller.client.rest.host_controller_client import HostControllerClient
 
 logger = logging.getLogger(__name__)
 
@@ -31,7 +31,7 @@ def __get_variable_manager():
     return __get_scenario_context().get_variable_manager()
 
 
-@Given(r"(?P<var_name>{Variable}) = new Docker Controller client")
+@Given(r"(?P<var_name>{Variable}) = new Host Controller client")
 def step_impl(context, var_name):
     var_name = StepTools.evaluate_variable_name(var_name)
     table = BehaveStepTools.get_step_table(context)
@@ -40,11 +40,11 @@ def step_impl(context, var_name):
     else:
         kwargs = {}
     
-    res = DockerControllerClient.new_client(**kwargs)
+    res = HostControllerClient.new_client(**kwargs)
 
     __get_variable_manager().register_variable(var_name, res)
 
-@Step(r"(?P<var_name>{Variable}) = list containers \(Docker Controller client: (?P<var_client>{Variable})\)")
+@Step(r"(?P<var_name>{Variable}) = list containers \(Host Controller client: (?P<var_client>{Variable})\)")
 def step_impl(context, var_name, var_client):
     var_name = StepTools.evaluate_variable_name(var_name)
     client = StepTools.evaluate_variable_value(var_client)
@@ -53,7 +53,7 @@ def step_impl(context, var_name, var_client):
     
     __get_variable_manager().register_variable(var_name, res)
 
-@Step(r"(?P<var_name>{Variable}) = get information on container (?P<name>{Str}) \(Docker Controller client: (?P<var_client>{Variable})\)")
+@Step(r"(?P<var_name>{Variable}) = get information on container (?P<name>{Str}) \(Host Controller client: (?P<var_client>{Variable})\)")
 def step_impl(context, var_name, name, var_client):
     var_name = StepTools.evaluate_variable_name(var_name)
     name = StepTools.evaluate_scenario_parameter(name)
@@ -63,7 +63,7 @@ def step_impl(context, var_name, name, var_client):
     
     __get_variable_manager().register_variable(var_name, res)
 
-@Step(r"(?:(?P<or_start_str>start or ))?restart container (?P<name>{Str}) \(Docker Controller client: (?P<var_client>{Variable})\)")
+@Step(r"(?:(?P<or_start_str>start or ))?restart container (?P<name>{Str}) \(Host Controller client: (?P<var_client>{Variable})\)")
 def step_impl(context, or_start_str, name, var_client):
     or_start = or_start_str is not None
     name = StepTools.evaluate_scenario_parameter(name)
@@ -71,14 +71,14 @@ def step_impl(context, or_start_str, name, var_client):
     
     client.restart_container(name, start_if_gone=or_start)
 
-@Step(r"start container (?P<name>{Str}) \(Docker Controller client: (?P<var_client>{Variable})\)")
+@Step(r"start container (?P<name>{Str}) \(Host Controller client: (?P<var_client>{Variable})\)")
 def step_impl(context, name, var_client):
     name = StepTools.evaluate_scenario_parameter(name)
     client = StepTools.evaluate_variable_value(var_client)
     
     client.start_container(name)
 
-@Step(r"stop container (?P<name>{Str})(?:(?P<if_started_str> if started))? \(Docker Controller client: (?P<var_client>{Variable})\)")
+@Step(r"stop container (?P<name>{Str})(?:(?P<if_started_str> if started))? \(Host Controller client: (?P<var_client>{Variable})\)")
 def step_impl(context, name, if_started_str, var_client):
     name = StepTools.evaluate_scenario_parameter(name)
     if_started = if_started_str is not None
@@ -86,7 +86,7 @@ def step_impl(context, name, if_started_str, var_client):
     
     client.stop_container(name, raise_if_gone=not if_started)
 
-@Step(r"wait container (?P<name>{Str})(?:(?P<if_started_str> if started))? \(Docker Controller client: (?P<var_client>{Variable})\)")
+@Step(r"wait container (?P<name>{Str})(?:(?P<if_started_str> if started))? \(Host Controller client: (?P<var_client>{Variable})\)")
 def step_impl(context, name, if_started_str, var_client):
     name = StepTools.evaluate_scenario_parameter(name)
     if_started = if_started_str is not None