This is an automated email from the ASF dual-hosted git repository. martinzink pushed a commit to branch apache-rusty in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 7d1677356b052de7c31fa1acec2ec22c9b47c3ff Author: Martin Zink <[email protected]> AuthorDate: Wed Mar 25 14:36:07 2026 +0100 MINIFICPP-2756 Rename minifi_test_framework to minifi_behave --- behave_framework/.gitignore | 2 +- behave_framework/pyproject.toml | 4 ++-- .../containers/__init__.py | 0 .../containers/container_linux.py | 10 +++++----- .../containers/container_protocol.py | 6 +++--- .../containers/container_windows.py | 10 +++++----- .../containers/directory.py | 0 .../containers/docker_image_builder.py | 0 .../containers/file.py | 0 .../containers/host_file.py | 0 .../containers/http_proxy_container.py | 8 ++++---- .../containers/minifi_controller.py | 2 +- .../containers/minifi_linux_container.py | 12 ++++++------ .../containers/minifi_protocol.py | 0 .../containers/minifi_win_container.py | 6 +++--- .../containers/nifi_container.py | 16 ++++++++-------- .../containers/resources/minifi-controller/config.yml | 0 .../containers/resources/nifi/convert_cert_to_jks.sh | 0 .../core/__init__.py | 0 .../core/helpers.py | 2 +- .../core/hooks.py | 4 ++-- .../core/minifi_test_context.py | 10 +++++----- .../core/ssl_utils.py | 0 .../minifi/__init__.py | 0 .../minifi/connection.py | 0 .../minifi/controller_service.py | 0 .../minifi/flow_definition.py | 0 .../minifi/funnel.py | 0 .../minifi/input_port.py | 0 .../minifi/minifi_flow_definition.py | 0 .../minifi/nifi_flow_definition.py | 0 .../minifi/output_port.py | 0 .../minifi/parameter.py | 0 .../minifi/parameter_context.py | 2 +- .../minifi/processor.py | 0 .../minifi/remote_port.py | 0 .../minifi/remote_process_group.py | 0 .../steps/__init__.py | 0 .../steps/checking_steps.py | 6 +++--- .../steps/configuration_steps.py | 10 +++++----- .../steps/core_steps.py | 10 +++++----- .../steps/flow_building_steps.py | 14 +++++++------- .../features/containers/kinesis_server_container.py | 8 ++++---- .../aws/tests/features/containers/s3_server_container.py | 6 +++--- extensions/aws/tests/features/environment.py | 4 ++-- extensions/aws/tests/features/steps/steps.py | 16 ++++++++-------- .../tests/features/containers/azure_server_container.py | 8 ++++---- extensions/azure/tests/features/environment.py | 4 ++-- extensions/azure/tests/features/steps/steps.py | 14 +++++++------- extensions/civetweb/tests/features/environment.py | 4 ++-- extensions/civetweb/tests/features/steps/steps.py | 8 ++++---- .../features/containers/couchbase_server_container.py | 10 +++++----- extensions/couchbase/tests/features/environment.py | 6 +++--- extensions/couchbase/tests/features/steps/steps.py | 16 ++++++++-------- .../tests/features/containers/elastic_base_container.py | 6 +++--- .../tests/features/containers/elasticsearch_container.py | 8 ++++---- .../tests/features/containers/opensearch_container.py | 8 ++++---- extensions/elasticsearch/tests/features/environment.py | 4 ++-- extensions/elasticsearch/tests/features/steps/steps.py | 14 +++++++------- .../features/containers/fake_gcs_server_container.py | 8 ++++---- extensions/gcp/tests/features/environment.py | 4 ++-- extensions/gcp/tests/features/steps/steps.py | 12 ++++++------ .../tests/features/containers/grafana_loki_container.py | 10 +++++----- .../tests/features/containers/reverse_proxy_container.py | 6 +++--- extensions/grafana-loki/tests/features/environment.py | 6 +++--- extensions/grafana-loki/tests/features/steps/steps.py | 12 ++++++------ .../tests/features/containers/kafka_server_container.py | 10 +++++----- extensions/kafka/tests/features/environment.py | 6 +++--- extensions/kafka/tests/features/steps/steps.py | 12 ++++++------ extensions/kubernetes/tests/features/environment.py | 2 +- .../steps/minifi_as_pod_in_kubernetes_cluster.py | 4 ++-- extensions/kubernetes/tests/features/steps/steps.py | 16 ++++++++-------- extensions/llamacpp/tests/features/environment.py | 10 +++++----- extensions/llamacpp/tests/features/steps/steps.py | 8 ++++---- extensions/lua/tests/features/environment.py | 4 ++-- extensions/lua/tests/features/steps/steps.py | 8 ++++---- .../tests/features/containers/mqtt_broker_container.py | 8 ++++---- extensions/mqtt/tests/features/environment.py | 6 +++--- extensions/mqtt/tests/features/steps/steps.py | 14 +++++++------- .../tests/features/containers/opc_ua_server_container.py | 6 +++--- extensions/opc/tests/features/environment.py | 4 ++-- extensions/opc/tests/features/steps/steps.py | 12 ++++++------ .../tests/features/containers/prometheus_container.py | 12 ++++++------ extensions/prometheus/tests/features/environment.py | 6 +++--- extensions/prometheus/tests/features/steps/steps.py | 12 ++++++------ extensions/python/tests/features/environment.py | 6 +++--- extensions/python/tests/features/steps/steps.py | 12 ++++++------ .../splunk/tests/features/containers/splunk_container.py | 10 +++++----- extensions/splunk/tests/features/environment.py | 4 ++-- extensions/splunk/tests/features/steps/steps.py | 12 ++++++------ .../features/containers/postgress_server_container.py | 8 ++++---- extensions/sql/tests/features/environment.py | 8 ++++---- extensions/sql/tests/features/steps/steps.py | 14 +++++++------- .../tests/features/containers/diag_slave_container.py | 8 ++++---- .../tests/features/containers/syslog_container.py | 2 +- .../tests/features/containers/tcp_client_container.py | 6 +++--- .../standard-processors/tests/features/environment.py | 4 ++-- .../tests/features/steps/minifi_c2_server_container.py | 14 +++++++------- .../tests/features/steps/minifi_controller_steps.py | 4 ++-- .../standard-processors/tests/features/steps/steps.py | 14 +++++++------- 100 files changed, 311 insertions(+), 311 deletions(-) diff --git a/behave_framework/.gitignore b/behave_framework/.gitignore index 7437a57e5..7b610c7b5 100644 --- a/behave_framework/.gitignore +++ b/behave_framework/.gitignore @@ -2,4 +2,4 @@ venv output .venv .idea -src/minifi_test_framework.egg-info +src/minifi_behave.egg-info diff --git a/behave_framework/pyproject.toml b/behave_framework/pyproject.toml index 8bb2a83e1..8c398890e 100644 --- a/behave_framework/pyproject.toml +++ b/behave_framework/pyproject.toml @@ -1,5 +1,5 @@ [project] -name = "minifi-test-framework" +name = "minifi-behave" version = "0.2.0" requires-python = ">= 3.10" description = "A testing framework for MiNiFi extensions." @@ -17,4 +17,4 @@ package-dir = {"" = "src"} [tool.setuptools.packages.find] where = ["src"] -include = ["minifi_test_framework*"] +include = ["minifi_behave*"] diff --git a/behave_framework/src/minifi_test_framework/containers/__init__.py b/behave_framework/src/minifi_behave/containers/__init__.py similarity index 100% rename from behave_framework/src/minifi_test_framework/containers/__init__.py rename to behave_framework/src/minifi_behave/containers/__init__.py diff --git a/behave_framework/src/minifi_test_framework/containers/container_linux.py b/behave_framework/src/minifi_behave/containers/container_linux.py similarity index 98% rename from behave_framework/src/minifi_test_framework/containers/container_linux.py rename to behave_framework/src/minifi_behave/containers/container_linux.py index 6d49a104d..f1161acfc 100644 --- a/behave_framework/src/minifi_test_framework/containers/container_linux.py +++ b/behave_framework/src/minifi_behave/containers/container_linux.py @@ -24,16 +24,16 @@ import tarfile import tempfile import uuid from docker.models.networks import Network -from minifi_test_framework.containers.container_protocol import ContainerProtocol -from minifi_test_framework.containers.directory import Directory -from minifi_test_framework.containers.file import File -from minifi_test_framework.containers.host_file import HostFile +from minifi_behave.containers.container_protocol import ContainerProtocol +from minifi_behave.containers.directory import Directory +from minifi_behave.containers.file import File +from minifi_behave.containers.host_file import HostFile from typing import TYPE_CHECKING import docker if TYPE_CHECKING: - from minifi_test_framework.core.minifi_test_context import MinifiTestContext + from minifi_behave.core.minifi_test_context import MinifiTestContext class LinuxContainer(ContainerProtocol): diff --git a/behave_framework/src/minifi_test_framework/containers/container_protocol.py b/behave_framework/src/minifi_behave/containers/container_protocol.py similarity index 90% rename from behave_framework/src/minifi_test_framework/containers/container_protocol.py rename to behave_framework/src/minifi_behave/containers/container_protocol.py index fdbdf2861..bcc537548 100644 --- a/behave_framework/src/minifi_test_framework/containers/container_protocol.py +++ b/behave_framework/src/minifi_behave/containers/container_protocol.py @@ -15,9 +15,9 @@ from typing import Protocol, List -from minifi_test_framework.containers.directory import Directory -from minifi_test_framework.containers.file import File -from minifi_test_framework.containers.host_file import HostFile +from minifi_behave.containers.directory import Directory +from minifi_behave.containers.file import File +from minifi_behave.containers.host_file import HostFile class ContainerProtocol(Protocol): diff --git a/behave_framework/src/minifi_test_framework/containers/container_windows.py b/behave_framework/src/minifi_behave/containers/container_windows.py similarity index 97% rename from behave_framework/src/minifi_test_framework/containers/container_windows.py rename to behave_framework/src/minifi_behave/containers/container_windows.py index c1a9c755a..022948143 100644 --- a/behave_framework/src/minifi_test_framework/containers/container_windows.py +++ b/behave_framework/src/minifi_behave/containers/container_windows.py @@ -27,13 +27,13 @@ import docker from docker.models.networks import Network from docker.models.containers import Container -from minifi_test_framework.containers.container_protocol import ContainerProtocol -from minifi_test_framework.containers.directory import Directory -from minifi_test_framework.containers.file import File -from minifi_test_framework.containers.host_file import HostFile +from minifi_behave.containers.container_protocol import ContainerProtocol +from minifi_behave.containers.directory import Directory +from minifi_behave.containers.file import File +from minifi_behave.containers.host_file import HostFile if TYPE_CHECKING: - from minifi_test_framework.core.minifi_test_context import MinifiTestContext + from minifi_behave.core.minifi_test_context import MinifiTestContext class WindowsContainer(ContainerProtocol): diff --git a/behave_framework/src/minifi_test_framework/containers/directory.py b/behave_framework/src/minifi_behave/containers/directory.py similarity index 100% rename from behave_framework/src/minifi_test_framework/containers/directory.py rename to behave_framework/src/minifi_behave/containers/directory.py diff --git a/behave_framework/src/minifi_test_framework/containers/docker_image_builder.py b/behave_framework/src/minifi_behave/containers/docker_image_builder.py similarity index 100% rename from behave_framework/src/minifi_test_framework/containers/docker_image_builder.py rename to behave_framework/src/minifi_behave/containers/docker_image_builder.py diff --git a/behave_framework/src/minifi_test_framework/containers/file.py b/behave_framework/src/minifi_behave/containers/file.py similarity index 100% rename from behave_framework/src/minifi_test_framework/containers/file.py rename to behave_framework/src/minifi_behave/containers/file.py diff --git a/behave_framework/src/minifi_test_framework/containers/host_file.py b/behave_framework/src/minifi_behave/containers/host_file.py similarity index 100% rename from behave_framework/src/minifi_test_framework/containers/host_file.py rename to behave_framework/src/minifi_behave/containers/host_file.py diff --git a/behave_framework/src/minifi_test_framework/containers/http_proxy_container.py b/behave_framework/src/minifi_behave/containers/http_proxy_container.py similarity index 90% rename from behave_framework/src/minifi_test_framework/containers/http_proxy_container.py rename to behave_framework/src/minifi_behave/containers/http_proxy_container.py index 430e2abff..6045662eb 100644 --- a/behave_framework/src/minifi_test_framework/containers/http_proxy_container.py +++ b/behave_framework/src/minifi_behave/containers/http_proxy_container.py @@ -17,10 +17,10 @@ from textwrap import dedent -from minifi_test_framework.containers.container_linux import LinuxContainer -from minifi_test_framework.containers.docker_image_builder import DockerImageBuilder -from minifi_test_framework.core.helpers import wait_for_condition -from minifi_test_framework.core.minifi_test_context import MinifiTestContext +from minifi_behave.containers.container_linux import LinuxContainer +from minifi_behave.containers.docker_image_builder import DockerImageBuilder +from minifi_behave.core.helpers import wait_for_condition +from minifi_behave.core.minifi_test_context import MinifiTestContext class HttpProxy(LinuxContainer): diff --git a/behave_framework/src/minifi_test_framework/containers/minifi_controller.py b/behave_framework/src/minifi_behave/containers/minifi_controller.py similarity index 98% rename from behave_framework/src/minifi_test_framework/containers/minifi_controller.py rename to behave_framework/src/minifi_behave/containers/minifi_controller.py index 59f6e4028..756cbc389 100644 --- a/behave_framework/src/minifi_test_framework/containers/minifi_controller.py +++ b/behave_framework/src/minifi_behave/containers/minifi_controller.py @@ -14,7 +14,7 @@ # limitations under the License. import logging -from minifi_test_framework.core.helpers import retry_check +from minifi_behave.core.helpers import retry_check class MinifiController: diff --git a/behave_framework/src/minifi_test_framework/containers/minifi_linux_container.py b/behave_framework/src/minifi_behave/containers/minifi_linux_container.py similarity index 94% rename from behave_framework/src/minifi_test_framework/containers/minifi_linux_container.py rename to behave_framework/src/minifi_behave/containers/minifi_linux_container.py index 62311d9ab..3d012d6df 100644 --- a/behave_framework/src/minifi_test_framework/containers/minifi_linux_container.py +++ b/behave_framework/src/minifi_behave/containers/minifi_linux_container.py @@ -17,13 +17,13 @@ import logging import os -from minifi_test_framework.containers.file import File -from minifi_test_framework.containers.host_file import HostFile -from minifi_test_framework.core.helpers import wait_for_condition -from minifi_test_framework.core.minifi_test_context import MinifiTestContext -from minifi_test_framework.core.ssl_utils import make_cert_without_extended_usage, make_client_cert, make_server_cert, \ +from minifi_behave.containers.file import File +from minifi_behave.containers.host_file import HostFile +from minifi_behave.core.helpers import wait_for_condition +from minifi_behave.core.minifi_test_context import MinifiTestContext +from minifi_behave.core.ssl_utils import make_cert_without_extended_usage, make_client_cert, make_server_cert, \ dump_cert, dump_key -from minifi_test_framework.minifi.minifi_flow_definition import MinifiFlowDefinition +from minifi_behave.minifi.minifi_flow_definition import MinifiFlowDefinition from pathlib import Path from .container_linux import LinuxContainer diff --git a/behave_framework/src/minifi_test_framework/containers/minifi_protocol.py b/behave_framework/src/minifi_behave/containers/minifi_protocol.py similarity index 100% rename from behave_framework/src/minifi_test_framework/containers/minifi_protocol.py rename to behave_framework/src/minifi_behave/containers/minifi_protocol.py diff --git a/behave_framework/src/minifi_test_framework/containers/minifi_win_container.py b/behave_framework/src/minifi_behave/containers/minifi_win_container.py similarity index 93% rename from behave_framework/src/minifi_test_framework/containers/minifi_win_container.py rename to behave_framework/src/minifi_behave/containers/minifi_win_container.py index d39216bd3..3aa9407bc 100644 --- a/behave_framework/src/minifi_test_framework/containers/minifi_win_container.py +++ b/behave_framework/src/minifi_behave/containers/minifi_win_container.py @@ -16,9 +16,9 @@ from typing import Dict -from minifi_test_framework.core.minifi_test_context import MinifiTestContext -from minifi_test_framework.minifi.minifi_flow_definition import MinifiFlowDefinition -from minifi_test_framework.containers.directory import Directory +from minifi_behave.core.minifi_test_context import MinifiTestContext +from minifi_behave.minifi.minifi_flow_definition import MinifiFlowDefinition +from minifi_behave.containers.directory import Directory from .container_windows import WindowsContainer from .minifi_protocol import MinifiProtocol import logging diff --git a/behave_framework/src/minifi_test_framework/containers/nifi_container.py b/behave_framework/src/minifi_behave/containers/nifi_container.py similarity index 91% rename from behave_framework/src/minifi_test_framework/containers/nifi_container.py rename to behave_framework/src/minifi_behave/containers/nifi_container.py index 3d589a8fe..8e36c4a1b 100644 --- a/behave_framework/src/minifi_test_framework/containers/nifi_container.py +++ b/behave_framework/src/minifi_behave/containers/nifi_container.py @@ -19,15 +19,15 @@ import logging import os from pathlib import Path -from minifi_test_framework.containers.file import File -from minifi_test_framework.containers.container_linux import LinuxContainer -from minifi_test_framework.core.helpers import wait_for_condition -from minifi_test_framework.core.minifi_test_context import MinifiTestContext -from minifi_test_framework.minifi.nifi_flow_definition import NifiFlowDefinition -from minifi_test_framework.containers.host_file import HostFile -from minifi_test_framework.core.ssl_utils import make_server_cert +from minifi_behave.containers.file import File +from minifi_behave.containers.container_linux import LinuxContainer +from minifi_behave.core.helpers import wait_for_condition +from minifi_behave.core.minifi_test_context import MinifiTestContext +from minifi_behave.minifi.nifi_flow_definition import NifiFlowDefinition +from minifi_behave.containers.host_file import HostFile +from minifi_behave.core.ssl_utils import make_server_cert -from minifi_test_framework.core.ssl_utils import dump_cert, dump_key +from minifi_behave.core.ssl_utils import dump_cert, dump_key class NifiContainer(LinuxContainer): diff --git a/behave_framework/src/minifi_test_framework/containers/resources/minifi-controller/config.yml b/behave_framework/src/minifi_behave/containers/resources/minifi-controller/config.yml similarity index 100% rename from behave_framework/src/minifi_test_framework/containers/resources/minifi-controller/config.yml rename to behave_framework/src/minifi_behave/containers/resources/minifi-controller/config.yml diff --git a/behave_framework/src/minifi_test_framework/containers/resources/nifi/convert_cert_to_jks.sh b/behave_framework/src/minifi_behave/containers/resources/nifi/convert_cert_to_jks.sh similarity index 100% rename from behave_framework/src/minifi_test_framework/containers/resources/nifi/convert_cert_to_jks.sh rename to behave_framework/src/minifi_behave/containers/resources/nifi/convert_cert_to_jks.sh diff --git a/behave_framework/src/minifi_test_framework/core/__init__.py b/behave_framework/src/minifi_behave/core/__init__.py similarity index 100% rename from behave_framework/src/minifi_test_framework/core/__init__.py rename to behave_framework/src/minifi_behave/core/__init__.py diff --git a/behave_framework/src/minifi_test_framework/core/helpers.py b/behave_framework/src/minifi_behave/core/helpers.py similarity index 98% rename from behave_framework/src/minifi_test_framework/core/helpers.py rename to behave_framework/src/minifi_behave/core/helpers.py index 7b7992056..128aa4e01 100644 --- a/behave_framework/src/minifi_test_framework/core/helpers.py +++ b/behave_framework/src/minifi_behave/core/helpers.py @@ -23,7 +23,7 @@ import functools from collections.abc import Callable import docker -from minifi_test_framework.core.minifi_test_context import MinifiTestContext +from minifi_behave.core.minifi_test_context import MinifiTestContext def log_due_to_failure(context: MinifiTestContext | None): diff --git a/behave_framework/src/minifi_test_framework/core/hooks.py b/behave_framework/src/minifi_behave/core/hooks.py similarity index 96% rename from behave_framework/src/minifi_test_framework/core/hooks.py rename to behave_framework/src/minifi_behave/core/hooks.py index ea440cc30..b3073aacc 100644 --- a/behave_framework/src/minifi_test_framework/core/hooks.py +++ b/behave_framework/src/minifi_behave/core/hooks.py @@ -23,8 +23,8 @@ from pathlib import Path from behave.model import Scenario from behave.runner import Context -from minifi_test_framework.core.ssl_utils import make_self_signed_cert -from minifi_test_framework.core.minifi_test_context import MinifiTestContext +from minifi_behave.core.ssl_utils import make_self_signed_cert +from minifi_behave.core.minifi_test_context import MinifiTestContext def get_minifi_container_image(): diff --git a/behave_framework/src/minifi_test_framework/core/minifi_test_context.py b/behave_framework/src/minifi_behave/core/minifi_test_context.py similarity index 81% rename from behave_framework/src/minifi_test_framework/core/minifi_test_context.py rename to behave_framework/src/minifi_behave/core/minifi_test_context.py index 85970b101..5933264d0 100644 --- a/behave_framework/src/minifi_test_framework/core/minifi_test_context.py +++ b/behave_framework/src/minifi_behave/core/minifi_test_context.py @@ -24,8 +24,8 @@ from cryptography.hazmat.primitives.asymmetric.rsa import RSAPrivateKey from cryptography.x509 import Certificate from docker.models.networks import Network -from minifi_test_framework.containers.container_protocol import ContainerProtocol -from minifi_test_framework.containers.minifi_protocol import MinifiProtocol +from minifi_behave.containers.container_protocol import ContainerProtocol +from minifi_behave.containers.minifi_protocol import MinifiProtocol DEFAULT_MINIFI_CONTAINER_NAME = "minifi-primary" @@ -47,13 +47,13 @@ class MinifiTestContext(Context): def get_or_create_minifi_container(self, container_name: str) -> MinifiContainer: if container_name not in self.containers: if os.name == 'nt': - from minifi_test_framework.containers.minifi_win_container import MinifiWindowsContainer + from minifi_behave.containers.minifi_win_container import MinifiWindowsContainer minifi_container = MinifiWindowsContainer(container_name, self) elif 'MINIFI_INSTALLATION_TYPE=FHS' in str(docker.from_env().images.get(self.minifi_container_image).history()): - from minifi_test_framework.containers.minifi_linux_container import MinifiLinuxContainer, FHSDeployment + from minifi_behave.containers.minifi_linux_container import MinifiLinuxContainer, FHSDeployment minifi_container = MinifiLinuxContainer(container_name, self, FHSDeployment()) else: - from minifi_test_framework.containers.minifi_linux_container import MinifiLinuxContainer, NormalDeployment + from minifi_behave.containers.minifi_linux_container import MinifiLinuxContainer, NormalDeployment minifi_container = MinifiLinuxContainer(container_name, self, NormalDeployment()) self.containers[container_name] = minifi_container return self.containers[container_name] diff --git a/behave_framework/src/minifi_test_framework/core/ssl_utils.py b/behave_framework/src/minifi_behave/core/ssl_utils.py similarity index 100% rename from behave_framework/src/minifi_test_framework/core/ssl_utils.py rename to behave_framework/src/minifi_behave/core/ssl_utils.py diff --git a/behave_framework/src/minifi_test_framework/minifi/__init__.py b/behave_framework/src/minifi_behave/minifi/__init__.py similarity index 100% rename from behave_framework/src/minifi_test_framework/minifi/__init__.py rename to behave_framework/src/minifi_behave/minifi/__init__.py diff --git a/behave_framework/src/minifi_test_framework/minifi/connection.py b/behave_framework/src/minifi_behave/minifi/connection.py similarity index 100% rename from behave_framework/src/minifi_test_framework/minifi/connection.py rename to behave_framework/src/minifi_behave/minifi/connection.py diff --git a/behave_framework/src/minifi_test_framework/minifi/controller_service.py b/behave_framework/src/minifi_behave/minifi/controller_service.py similarity index 100% rename from behave_framework/src/minifi_test_framework/minifi/controller_service.py rename to behave_framework/src/minifi_behave/minifi/controller_service.py diff --git a/behave_framework/src/minifi_test_framework/minifi/flow_definition.py b/behave_framework/src/minifi_behave/minifi/flow_definition.py similarity index 100% rename from behave_framework/src/minifi_test_framework/minifi/flow_definition.py rename to behave_framework/src/minifi_behave/minifi/flow_definition.py diff --git a/behave_framework/src/minifi_test_framework/minifi/funnel.py b/behave_framework/src/minifi_behave/minifi/funnel.py similarity index 100% rename from behave_framework/src/minifi_test_framework/minifi/funnel.py rename to behave_framework/src/minifi_behave/minifi/funnel.py diff --git a/behave_framework/src/minifi_test_framework/minifi/input_port.py b/behave_framework/src/minifi_behave/minifi/input_port.py similarity index 100% rename from behave_framework/src/minifi_test_framework/minifi/input_port.py rename to behave_framework/src/minifi_behave/minifi/input_port.py diff --git a/behave_framework/src/minifi_test_framework/minifi/minifi_flow_definition.py b/behave_framework/src/minifi_behave/minifi/minifi_flow_definition.py similarity index 100% rename from behave_framework/src/minifi_test_framework/minifi/minifi_flow_definition.py rename to behave_framework/src/minifi_behave/minifi/minifi_flow_definition.py diff --git a/behave_framework/src/minifi_test_framework/minifi/nifi_flow_definition.py b/behave_framework/src/minifi_behave/minifi/nifi_flow_definition.py similarity index 100% rename from behave_framework/src/minifi_test_framework/minifi/nifi_flow_definition.py rename to behave_framework/src/minifi_behave/minifi/nifi_flow_definition.py diff --git a/behave_framework/src/minifi_test_framework/minifi/output_port.py b/behave_framework/src/minifi_behave/minifi/output_port.py similarity index 100% rename from behave_framework/src/minifi_test_framework/minifi/output_port.py rename to behave_framework/src/minifi_behave/minifi/output_port.py diff --git a/behave_framework/src/minifi_test_framework/minifi/parameter.py b/behave_framework/src/minifi_behave/minifi/parameter.py similarity index 100% rename from behave_framework/src/minifi_test_framework/minifi/parameter.py rename to behave_framework/src/minifi_behave/minifi/parameter.py diff --git a/behave_framework/src/minifi_test_framework/minifi/parameter_context.py b/behave_framework/src/minifi_behave/minifi/parameter_context.py similarity index 95% rename from behave_framework/src/minifi_test_framework/minifi/parameter_context.py rename to behave_framework/src/minifi_behave/minifi/parameter_context.py index 201aec7bc..58cc9161e 100644 --- a/behave_framework/src/minifi_test_framework/minifi/parameter_context.py +++ b/behave_framework/src/minifi_behave/minifi/parameter_context.py @@ -17,7 +17,7 @@ import uuid -from minifi_test_framework.minifi.parameter import Parameter +from minifi_behave.minifi.parameter import Parameter class ParameterContext: diff --git a/behave_framework/src/minifi_test_framework/minifi/processor.py b/behave_framework/src/minifi_behave/minifi/processor.py similarity index 100% rename from behave_framework/src/minifi_test_framework/minifi/processor.py rename to behave_framework/src/minifi_behave/minifi/processor.py diff --git a/behave_framework/src/minifi_test_framework/minifi/remote_port.py b/behave_framework/src/minifi_behave/minifi/remote_port.py similarity index 100% rename from behave_framework/src/minifi_test_framework/minifi/remote_port.py rename to behave_framework/src/minifi_behave/minifi/remote_port.py diff --git a/behave_framework/src/minifi_test_framework/minifi/remote_process_group.py b/behave_framework/src/minifi_behave/minifi/remote_process_group.py similarity index 100% rename from behave_framework/src/minifi_test_framework/minifi/remote_process_group.py rename to behave_framework/src/minifi_behave/minifi/remote_process_group.py diff --git a/behave_framework/src/minifi_test_framework/steps/__init__.py b/behave_framework/src/minifi_behave/steps/__init__.py similarity index 100% rename from behave_framework/src/minifi_test_framework/steps/__init__.py rename to behave_framework/src/minifi_behave/steps/__init__.py diff --git a/behave_framework/src/minifi_test_framework/steps/checking_steps.py b/behave_framework/src/minifi_behave/steps/checking_steps.py similarity index 98% rename from behave_framework/src/minifi_test_framework/steps/checking_steps.py rename to behave_framework/src/minifi_behave/steps/checking_steps.py index a05a50aca..5f52ee740 100644 --- a/behave_framework/src/minifi_test_framework/steps/checking_steps.py +++ b/behave_framework/src/minifi_behave/steps/checking_steps.py @@ -20,9 +20,9 @@ import re import humanfriendly from behave import then, step -from minifi_test_framework.containers.http_proxy_container import HttpProxy -from minifi_test_framework.core.helpers import wait_for_condition, check_condition_after_wait, log_due_to_failure -from minifi_test_framework.core.minifi_test_context import DEFAULT_MINIFI_CONTAINER_NAME, MinifiTestContext +from minifi_behave.containers.http_proxy_container import HttpProxy +from minifi_behave.core.helpers import wait_for_condition, check_condition_after_wait, log_due_to_failure +from minifi_behave.core.minifi_test_context import DEFAULT_MINIFI_CONTAINER_NAME, MinifiTestContext @then('a file with the content "{content}" is placed on the path "{path}" in less than {duration}') diff --git a/behave_framework/src/minifi_test_framework/steps/configuration_steps.py b/behave_framework/src/minifi_behave/steps/configuration_steps.py similarity index 83% rename from behave_framework/src/minifi_test_framework/steps/configuration_steps.py rename to behave_framework/src/minifi_behave/steps/configuration_steps.py index 7c2dd715c..605879b08 100644 --- a/behave_framework/src/minifi_test_framework/steps/configuration_steps.py +++ b/behave_framework/src/minifi_behave/steps/configuration_steps.py @@ -17,11 +17,11 @@ from behave import step, given -from minifi_test_framework.core.minifi_test_context import MinifiTestContext -from minifi_test_framework.containers.minifi_protocol import enable_openssl_fips_mode -from minifi_test_framework.containers.minifi_protocol import set_up_ssl_properties -from minifi_test_framework.containers.minifi_protocol import enable_log_metrics_publisher -from minifi_test_framework.containers.minifi_protocol import configure_c2_flow_url +from minifi_behave.core.minifi_test_context import MinifiTestContext +from minifi_behave.containers.minifi_protocol import enable_openssl_fips_mode +from minifi_behave.containers.minifi_protocol import set_up_ssl_properties +from minifi_behave.containers.minifi_protocol import enable_log_metrics_publisher +from minifi_behave.containers.minifi_protocol import configure_c2_flow_url @step('MiNiFi configuration "{config_key}" is set to "{config_value}"') diff --git a/behave_framework/src/minifi_test_framework/steps/core_steps.py b/behave_framework/src/minifi_behave/steps/core_steps.py similarity index 95% rename from behave_framework/src/minifi_test_framework/steps/core_steps.py rename to behave_framework/src/minifi_behave/steps/core_steps.py index 70edd47c1..f2efef59b 100644 --- a/behave_framework/src/minifi_test_framework/steps/core_steps.py +++ b/behave_framework/src/minifi_behave/steps/core_steps.py @@ -25,11 +25,11 @@ import uuid import humanfriendly from behave import when, step, given -from minifi_test_framework.containers.http_proxy_container import HttpProxy -from minifi_test_framework.containers.nifi_container import NifiContainer -from minifi_test_framework.containers.directory import Directory -from minifi_test_framework.containers.file import File -from minifi_test_framework.core.minifi_test_context import DEFAULT_MINIFI_CONTAINER_NAME, MinifiTestContext +from minifi_behave.containers.http_proxy_container import HttpProxy +from minifi_behave.containers.nifi_container import NifiContainer +from minifi_behave.containers.directory import Directory +from minifi_behave.containers.file import File +from minifi_behave.core.minifi_test_context import DEFAULT_MINIFI_CONTAINER_NAME, MinifiTestContext @when("both instances start up") diff --git a/behave_framework/src/minifi_test_framework/steps/flow_building_steps.py b/behave_framework/src/minifi_behave/steps/flow_building_steps.py similarity index 97% rename from behave_framework/src/minifi_test_framework/steps/flow_building_steps.py rename to behave_framework/src/minifi_behave/steps/flow_building_steps.py index 94ef4613e..9d2a32b07 100644 --- a/behave_framework/src/minifi_test_framework/steps/flow_building_steps.py +++ b/behave_framework/src/minifi_behave/steps/flow_building_steps.py @@ -19,13 +19,13 @@ import logging import uuid from behave import given, step -from minifi_test_framework.core.minifi_test_context import DEFAULT_MINIFI_CONTAINER_NAME, MinifiTestContext -from minifi_test_framework.minifi.connection import Connection -from minifi_test_framework.minifi.controller_service import ControllerService -from minifi_test_framework.minifi.funnel import Funnel -from minifi_test_framework.minifi.parameter import Parameter -from minifi_test_framework.minifi.parameter_context import ParameterContext -from minifi_test_framework.minifi.processor import Processor +from minifi_behave.core.minifi_test_context import DEFAULT_MINIFI_CONTAINER_NAME, MinifiTestContext +from minifi_behave.minifi.connection import Connection +from minifi_behave.minifi.controller_service import ControllerService +from minifi_behave.minifi.funnel import Funnel +from minifi_behave.minifi.parameter import Parameter +from minifi_behave.minifi.parameter_context import ParameterContext +from minifi_behave.minifi.processor import Processor @given("a MiNiFi CPP server with yaml config") diff --git a/extensions/aws/tests/features/containers/kinesis_server_container.py b/extensions/aws/tests/features/containers/kinesis_server_container.py index d97bb5c83..f7767773c 100644 --- a/extensions/aws/tests/features/containers/kinesis_server_container.py +++ b/extensions/aws/tests/features/containers/kinesis_server_container.py @@ -16,10 +16,10 @@ import logging from pathlib import Path -from minifi_test_framework.containers.container_linux import LinuxContainer -from minifi_test_framework.core.helpers import wait_for_condition, retry_check -from minifi_test_framework.core.minifi_test_context import MinifiTestContext -from minifi_test_framework.containers.docker_image_builder import DockerImageBuilder +from minifi_behave.containers.container_linux import LinuxContainer +from minifi_behave.core.helpers import wait_for_condition, retry_check +from minifi_behave.core.minifi_test_context import MinifiTestContext +from minifi_behave.containers.docker_image_builder import DockerImageBuilder class KinesisServerContainer(LinuxContainer): diff --git a/extensions/aws/tests/features/containers/s3_server_container.py b/extensions/aws/tests/features/containers/s3_server_container.py index 2364b2d0c..9a16700df 100644 --- a/extensions/aws/tests/features/containers/s3_server_container.py +++ b/extensions/aws/tests/features/containers/s3_server_container.py @@ -16,9 +16,9 @@ import json import logging -from minifi_test_framework.containers.container_linux import LinuxContainer -from minifi_test_framework.core.helpers import wait_for_condition -from minifi_test_framework.core.minifi_test_context import MinifiTestContext +from minifi_behave.containers.container_linux import LinuxContainer +from minifi_behave.core.helpers import wait_for_condition +from minifi_behave.core.minifi_test_context import MinifiTestContext class S3ServerContainer(LinuxContainer): diff --git a/extensions/aws/tests/features/environment.py b/extensions/aws/tests/features/environment.py index 225347536..ee812b362 100644 --- a/extensions/aws/tests/features/environment.py +++ b/extensions/aws/tests/features/environment.py @@ -14,8 +14,8 @@ # limitations under the License. -from minifi_test_framework.core.hooks import common_before_scenario -from minifi_test_framework.core.hooks import common_after_scenario +from minifi_behave.core.hooks import common_before_scenario +from minifi_behave.core.hooks import common_after_scenario # These hooks are executed by behave before and after each scenario # The common_before_scenario and common_after_scenario must be called for proper setup and tear down diff --git a/extensions/aws/tests/features/steps/steps.py b/extensions/aws/tests/features/steps/steps.py index 2d8d31c44..ab1094046 100644 --- a/extensions/aws/tests/features/steps/steps.py +++ b/extensions/aws/tests/features/steps/steps.py @@ -20,14 +20,14 @@ import string import humanfriendly from behave import step, then -from minifi_test_framework.containers.directory import Directory -from minifi_test_framework.steps import checking_steps # noqa: F401 -from minifi_test_framework.steps import configuration_steps # noqa: F401 -from minifi_test_framework.steps import core_steps # noqa: F401 -from minifi_test_framework.steps import flow_building_steps # noqa: F401 -from minifi_test_framework.core.minifi_test_context import MinifiTestContext -from minifi_test_framework.minifi.processor import Processor -from minifi_test_framework.core.helpers import wait_for_condition, log_due_to_failure +from minifi_behave.containers.directory import Directory +from minifi_behave.steps import checking_steps # noqa: F401 +from minifi_behave.steps import configuration_steps # noqa: F401 +from minifi_behave.steps import core_steps # noqa: F401 +from minifi_behave.steps import flow_building_steps # noqa: F401 +from minifi_behave.core.minifi_test_context import MinifiTestContext +from minifi_behave.minifi.processor import Processor +from minifi_behave.core.helpers import wait_for_condition, log_due_to_failure from containers.s3_server_container import S3ServerContainer from containers.kinesis_server_container import KinesisServerContainer diff --git a/extensions/azure/tests/features/containers/azure_server_container.py b/extensions/azure/tests/features/containers/azure_server_container.py index cb0d2e5eb..36f81158f 100644 --- a/extensions/azure/tests/features/containers/azure_server_container.py +++ b/extensions/azure/tests/features/containers/azure_server_container.py @@ -18,10 +18,10 @@ import logging from docker.errors import ContainerError -from minifi_test_framework.containers.container_linux import LinuxContainer -from minifi_test_framework.core.helpers import run_cmd_in_docker_image -from minifi_test_framework.core.helpers import wait_for_condition -from minifi_test_framework.core.minifi_test_context import MinifiTestContext +from minifi_behave.containers.container_linux import LinuxContainer +from minifi_behave.core.helpers import run_cmd_in_docker_image +from minifi_behave.core.helpers import wait_for_condition +from minifi_behave.core.minifi_test_context import MinifiTestContext class AzureServerContainer(LinuxContainer): diff --git a/extensions/azure/tests/features/environment.py b/extensions/azure/tests/features/environment.py index 225347536..ee812b362 100644 --- a/extensions/azure/tests/features/environment.py +++ b/extensions/azure/tests/features/environment.py @@ -14,8 +14,8 @@ # limitations under the License. -from minifi_test_framework.core.hooks import common_before_scenario -from minifi_test_framework.core.hooks import common_after_scenario +from minifi_behave.core.hooks import common_before_scenario +from minifi_behave.core.hooks import common_after_scenario # These hooks are executed by behave before and after each scenario # The common_before_scenario and common_after_scenario must be called for proper setup and tear down diff --git a/extensions/azure/tests/features/steps/steps.py b/extensions/azure/tests/features/steps/steps.py index 35ea6b0d8..25409d427 100644 --- a/extensions/azure/tests/features/steps/steps.py +++ b/extensions/azure/tests/features/steps/steps.py @@ -17,13 +17,13 @@ import humanfriendly from behave import step, then -from minifi_test_framework.core.helpers import wait_for_condition -from minifi_test_framework.core.minifi_test_context import MinifiTestContext -from minifi_test_framework.minifi.processor import Processor -from minifi_test_framework.steps import checking_steps # noqa: F401 -from minifi_test_framework.steps import configuration_steps # noqa: F401 -from minifi_test_framework.steps import core_steps # noqa: F401 -from minifi_test_framework.steps import flow_building_steps # noqa: F401 +from minifi_behave.core.helpers import wait_for_condition +from minifi_behave.core.minifi_test_context import MinifiTestContext +from minifi_behave.minifi.processor import Processor +from minifi_behave.steps import checking_steps # noqa: F401 +from minifi_behave.steps import configuration_steps # noqa: F401 +from minifi_behave.steps import core_steps # noqa: F401 +from minifi_behave.steps import flow_building_steps # noqa: F401 from containers.azure_server_container import AzureServerContainer diff --git a/extensions/civetweb/tests/features/environment.py b/extensions/civetweb/tests/features/environment.py index d6c856340..5b3659f58 100644 --- a/extensions/civetweb/tests/features/environment.py +++ b/extensions/civetweb/tests/features/environment.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -from minifi_test_framework.core.hooks import common_before_scenario -from minifi_test_framework.core.hooks import common_after_scenario +from minifi_behave.core.hooks import common_before_scenario +from minifi_behave.core.hooks import common_after_scenario def before_scenario(context, scenario): diff --git a/extensions/civetweb/tests/features/steps/steps.py b/extensions/civetweb/tests/features/steps/steps.py index 90304a7f8..25759880f 100644 --- a/extensions/civetweb/tests/features/steps/steps.py +++ b/extensions/civetweb/tests/features/steps/steps.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from minifi_test_framework.steps import checking_steps # noqa: F401 -from minifi_test_framework.steps import configuration_steps # noqa: F401 -from minifi_test_framework.steps import core_steps # noqa: F401 -from minifi_test_framework.steps import flow_building_steps # noqa: F401 +from minifi_behave.steps import checking_steps # noqa: F401 +from minifi_behave.steps import configuration_steps # noqa: F401 +from minifi_behave.steps import core_steps # noqa: F401 +from minifi_behave.steps import flow_building_steps # noqa: F401 diff --git a/extensions/couchbase/tests/features/containers/couchbase_server_container.py b/extensions/couchbase/tests/features/containers/couchbase_server_container.py index 3f4f1401f..d8febe939 100644 --- a/extensions/couchbase/tests/features/containers/couchbase_server_container.py +++ b/extensions/couchbase/tests/features/containers/couchbase_server_container.py @@ -15,11 +15,11 @@ import logging -from minifi_test_framework.core.helpers import wait_for_condition, retry_check -from minifi_test_framework.core.ssl_utils import make_server_cert, dump_cert, dump_key -from minifi_test_framework.containers.container_linux import LinuxContainer -from minifi_test_framework.containers.file import File -from minifi_test_framework.core.minifi_test_context import MinifiTestContext +from minifi_behave.core.helpers import wait_for_condition, retry_check +from minifi_behave.core.ssl_utils import make_server_cert, dump_cert, dump_key +from minifi_behave.containers.container_linux import LinuxContainer +from minifi_behave.containers.file import File +from minifi_behave.core.minifi_test_context import MinifiTestContext from docker.errors import ContainerError diff --git a/extensions/couchbase/tests/features/environment.py b/extensions/couchbase/tests/features/environment.py index 01c4d4791..9b593f032 100644 --- a/extensions/couchbase/tests/features/environment.py +++ b/extensions/couchbase/tests/features/environment.py @@ -12,9 +12,9 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from minifi_test_framework.containers.docker_image_builder import DockerImageBuilder -from minifi_test_framework.core.hooks import common_before_scenario -from minifi_test_framework.core.hooks import common_after_scenario +from minifi_behave.containers.docker_image_builder import DockerImageBuilder +from minifi_behave.core.hooks import common_before_scenario +from minifi_behave.core.hooks import common_after_scenario def before_all(context): diff --git a/extensions/couchbase/tests/features/steps/steps.py b/extensions/couchbase/tests/features/steps/steps.py index 7a9972a92..9f0edeffc 100644 --- a/extensions/couchbase/tests/features/steps/steps.py +++ b/extensions/couchbase/tests/features/steps/steps.py @@ -14,14 +14,14 @@ # limitations under the License. from behave import step, then -from minifi_test_framework.steps import checking_steps # noqa: F401 -from minifi_test_framework.steps import configuration_steps # noqa: F401 -from minifi_test_framework.steps import core_steps # noqa: F401 -from minifi_test_framework.steps import flow_building_steps # noqa: F401 -from minifi_test_framework.steps.flow_building_steps import add_ssl_context_service_for_minifi -from minifi_test_framework.core.minifi_test_context import MinifiTestContext -from minifi_test_framework.core.helpers import log_due_to_failure -from minifi_test_framework.minifi.controller_service import ControllerService +from minifi_behave.steps import checking_steps # noqa: F401 +from minifi_behave.steps import configuration_steps # noqa: F401 +from minifi_behave.steps import core_steps # noqa: F401 +from minifi_behave.steps import flow_building_steps # noqa: F401 +from minifi_behave.steps.flow_building_steps import add_ssl_context_service_for_minifi +from minifi_behave.core.minifi_test_context import MinifiTestContext +from minifi_behave.core.helpers import log_due_to_failure +from minifi_behave.minifi.controller_service import ControllerService from containers.couchbase_server_container import CouchbaseServerContainer diff --git a/extensions/elasticsearch/tests/features/containers/elastic_base_container.py b/extensions/elasticsearch/tests/features/containers/elastic_base_container.py index 2287278c4..577160c13 100644 --- a/extensions/elasticsearch/tests/features/containers/elastic_base_container.py +++ b/extensions/elasticsearch/tests/features/containers/elastic_base_container.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -from minifi_test_framework.core.helpers import wait_for_condition, retry_check -from minifi_test_framework.containers.container_linux import LinuxContainer -from minifi_test_framework.core.minifi_test_context import MinifiTestContext +from minifi_behave.core.helpers import wait_for_condition, retry_check +from minifi_behave.containers.container_linux import LinuxContainer +from minifi_behave.core.minifi_test_context import MinifiTestContext class ElasticBaseContainer(LinuxContainer): diff --git a/extensions/elasticsearch/tests/features/containers/elasticsearch_container.py b/extensions/elasticsearch/tests/features/containers/elasticsearch_container.py index aec928026..3d87dd0a2 100644 --- a/extensions/elasticsearch/tests/features/containers/elasticsearch_container.py +++ b/extensions/elasticsearch/tests/features/containers/elasticsearch_container.py @@ -19,10 +19,10 @@ import os from elastic_base_container import ElasticBaseContainer from pathlib import Path -from minifi_test_framework.core.ssl_utils import make_server_cert, make_cert_without_extended_usage, dump_cert, dump_key -from minifi_test_framework.containers.file import File -from minifi_test_framework.containers.host_file import HostFile -from minifi_test_framework.core.minifi_test_context import MinifiTestContext +from minifi_behave.core.ssl_utils import make_server_cert, make_cert_without_extended_usage, dump_cert, dump_key +from minifi_behave.containers.file import File +from minifi_behave.containers.host_file import HostFile +from minifi_behave.core.minifi_test_context import MinifiTestContext class ElasticsearchContainer(ElasticBaseContainer): diff --git a/extensions/elasticsearch/tests/features/containers/opensearch_container.py b/extensions/elasticsearch/tests/features/containers/opensearch_container.py index 234a26d12..964e989c0 100644 --- a/extensions/elasticsearch/tests/features/containers/opensearch_container.py +++ b/extensions/elasticsearch/tests/features/containers/opensearch_container.py @@ -18,10 +18,10 @@ import logging from elastic_base_container import ElasticBaseContainer from pathlib import Path -from minifi_test_framework.core.ssl_utils import make_server_cert, dump_cert, dump_key -from minifi_test_framework.containers.file import File -from minifi_test_framework.containers.host_file import HostFile -from minifi_test_framework.core.minifi_test_context import MinifiTestContext +from minifi_behave.core.ssl_utils import make_server_cert, dump_cert, dump_key +from minifi_behave.containers.file import File +from minifi_behave.containers.host_file import HostFile +from minifi_behave.core.minifi_test_context import MinifiTestContext class OpensearchContainer(ElasticBaseContainer): diff --git a/extensions/elasticsearch/tests/features/environment.py b/extensions/elasticsearch/tests/features/environment.py index ab35b52a5..d9f4bcb30 100644 --- a/extensions/elasticsearch/tests/features/environment.py +++ b/extensions/elasticsearch/tests/features/environment.py @@ -12,8 +12,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from minifi_test_framework.core.hooks import common_before_scenario -from minifi_test_framework.core.hooks import common_after_scenario +from minifi_behave.core.hooks import common_before_scenario +from minifi_behave.core.hooks import common_after_scenario def before_scenario(context, scenario): diff --git a/extensions/elasticsearch/tests/features/steps/steps.py b/extensions/elasticsearch/tests/features/steps/steps.py index 7059c1cd4..966c7a3b1 100644 --- a/extensions/elasticsearch/tests/features/steps/steps.py +++ b/extensions/elasticsearch/tests/features/steps/steps.py @@ -14,13 +14,13 @@ # limitations under the License. from behave import step, given, then -from minifi_test_framework.steps import checking_steps # noqa: F401 -from minifi_test_framework.steps import configuration_steps # noqa: F401 -from minifi_test_framework.steps import core_steps # noqa: F401 -from minifi_test_framework.steps import flow_building_steps # noqa: F401 -from minifi_test_framework.core.minifi_test_context import MinifiTestContext -from minifi_test_framework.minifi.controller_service import ControllerService -from minifi_test_framework.core.helpers import log_due_to_failure +from minifi_behave.steps import checking_steps # noqa: F401 +from minifi_behave.steps import configuration_steps # noqa: F401 +from minifi_behave.steps import core_steps # noqa: F401 +from minifi_behave.steps import flow_building_steps # noqa: F401 +from minifi_behave.core.minifi_test_context import MinifiTestContext +from minifi_behave.minifi.controller_service import ControllerService +from minifi_behave.core.helpers import log_due_to_failure from containers.elasticsearch_container import ElasticsearchContainer from containers.opensearch_container import OpensearchContainer diff --git a/extensions/gcp/tests/features/containers/fake_gcs_server_container.py b/extensions/gcp/tests/features/containers/fake_gcs_server_container.py index 5689065bb..2bb63fbf9 100644 --- a/extensions/gcp/tests/features/containers/fake_gcs_server_container.py +++ b/extensions/gcp/tests/features/containers/fake_gcs_server_container.py @@ -14,10 +14,10 @@ # limitations under the License. import logging -from minifi_test_framework.core.helpers import wait_for_condition, retry_check -from minifi_test_framework.containers.container_linux import LinuxContainer -from minifi_test_framework.containers.directory import Directory -from minifi_test_framework.core.minifi_test_context import MinifiTestContext +from minifi_behave.core.helpers import wait_for_condition, retry_check +from minifi_behave.containers.container_linux import LinuxContainer +from minifi_behave.containers.directory import Directory +from minifi_behave.core.minifi_test_context import MinifiTestContext class FakeGcsServerContainer(LinuxContainer): diff --git a/extensions/gcp/tests/features/environment.py b/extensions/gcp/tests/features/environment.py index ab35b52a5..d9f4bcb30 100644 --- a/extensions/gcp/tests/features/environment.py +++ b/extensions/gcp/tests/features/environment.py @@ -12,8 +12,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from minifi_test_framework.core.hooks import common_before_scenario -from minifi_test_framework.core.hooks import common_after_scenario +from minifi_behave.core.hooks import common_before_scenario +from minifi_behave.core.hooks import common_after_scenario def before_scenario(context, scenario): diff --git a/extensions/gcp/tests/features/steps/steps.py b/extensions/gcp/tests/features/steps/steps.py index 57798562d..b2e9308ec 100644 --- a/extensions/gcp/tests/features/steps/steps.py +++ b/extensions/gcp/tests/features/steps/steps.py @@ -14,12 +14,12 @@ # limitations under the License. from behave import step, then -from minifi_test_framework.steps import checking_steps # noqa: F401 -from minifi_test_framework.steps import configuration_steps # noqa: F401 -from minifi_test_framework.steps import core_steps # noqa: F401 -from minifi_test_framework.steps import flow_building_steps # noqa: F401 -from minifi_test_framework.core.minifi_test_context import MinifiTestContext -from minifi_test_framework.core.helpers import log_due_to_failure +from minifi_behave.steps import checking_steps # noqa: F401 +from minifi_behave.steps import configuration_steps # noqa: F401 +from minifi_behave.steps import core_steps # noqa: F401 +from minifi_behave.steps import flow_building_steps # noqa: F401 +from minifi_behave.core.minifi_test_context import MinifiTestContext +from minifi_behave.core.helpers import log_due_to_failure from containers.fake_gcs_server_container import FakeGcsServerContainer diff --git a/extensions/grafana-loki/tests/features/containers/grafana_loki_container.py b/extensions/grafana-loki/tests/features/containers/grafana_loki_container.py index af296c597..9e907e855 100644 --- a/extensions/grafana-loki/tests/features/containers/grafana_loki_container.py +++ b/extensions/grafana-loki/tests/features/containers/grafana_loki_container.py @@ -15,11 +15,11 @@ import logging -from minifi_test_framework.core.helpers import wait_for_condition, retry_check -from minifi_test_framework.containers.container_linux import LinuxContainer -from minifi_test_framework.containers.file import File -from minifi_test_framework.core.minifi_test_context import MinifiTestContext -from minifi_test_framework.core.ssl_utils import make_server_cert, dump_cert, dump_key +from minifi_behave.core.helpers import wait_for_condition, retry_check +from minifi_behave.containers.container_linux import LinuxContainer +from minifi_behave.containers.file import File +from minifi_behave.core.minifi_test_context import MinifiTestContext +from minifi_behave.core.ssl_utils import make_server_cert, dump_cert, dump_key from docker.errors import ContainerError diff --git a/extensions/grafana-loki/tests/features/containers/reverse_proxy_container.py b/extensions/grafana-loki/tests/features/containers/reverse_proxy_container.py index 43efd49c5..f622cbda3 100644 --- a/extensions/grafana-loki/tests/features/containers/reverse_proxy_container.py +++ b/extensions/grafana-loki/tests/features/containers/reverse_proxy_container.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -from minifi_test_framework.core.minifi_test_context import MinifiTestContext -from minifi_test_framework.containers.container_linux import LinuxContainer -from minifi_test_framework.core.helpers import wait_for_condition +from minifi_behave.core.minifi_test_context import MinifiTestContext +from minifi_behave.containers.container_linux import LinuxContainer +from minifi_behave.core.helpers import wait_for_condition class ReverseProxyContainer(LinuxContainer): diff --git a/extensions/grafana-loki/tests/features/environment.py b/extensions/grafana-loki/tests/features/environment.py index 11ab6ba74..4e25390ed 100644 --- a/extensions/grafana-loki/tests/features/environment.py +++ b/extensions/grafana-loki/tests/features/environment.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. from pathlib import Path -from minifi_test_framework.containers.docker_image_builder import DockerImageBuilder -from minifi_test_framework.core.hooks import common_before_scenario -from minifi_test_framework.core.hooks import common_after_scenario +from minifi_behave.containers.docker_image_builder import DockerImageBuilder +from minifi_behave.core.hooks import common_before_scenario +from minifi_behave.core.hooks import common_after_scenario def before_all(context): diff --git a/extensions/grafana-loki/tests/features/steps/steps.py b/extensions/grafana-loki/tests/features/steps/steps.py index eb34ac28f..0ab076923 100644 --- a/extensions/grafana-loki/tests/features/steps/steps.py +++ b/extensions/grafana-loki/tests/features/steps/steps.py @@ -14,12 +14,12 @@ # limitations under the License. from behave import step, then -from minifi_test_framework.steps import checking_steps # noqa: F401 -from minifi_test_framework.steps import configuration_steps # noqa: F401 -from minifi_test_framework.steps import core_steps # noqa: F401 -from minifi_test_framework.steps import flow_building_steps # noqa: F401 -from minifi_test_framework.core.minifi_test_context import MinifiTestContext -from minifi_test_framework.core.helpers import log_due_to_failure +from minifi_behave.steps import checking_steps # noqa: F401 +from minifi_behave.steps import configuration_steps # noqa: F401 +from minifi_behave.steps import core_steps # noqa: F401 +from minifi_behave.steps import flow_building_steps # noqa: F401 +from minifi_behave.core.minifi_test_context import MinifiTestContext +from minifi_behave.core.helpers import log_due_to_failure from containers.grafana_loki_container import GrafanaLokiContainer, GrafanaLokiOptions from containers.reverse_proxy_container import ReverseProxyContainer diff --git a/extensions/kafka/tests/features/containers/kafka_server_container.py b/extensions/kafka/tests/features/containers/kafka_server_container.py index 09e35e131..350a05478 100644 --- a/extensions/kafka/tests/features/containers/kafka_server_container.py +++ b/extensions/kafka/tests/features/containers/kafka_server_container.py @@ -19,11 +19,11 @@ import re from cryptography.hazmat.primitives import serialization import jks -from minifi_test_framework.core.helpers import wait_for_condition -from minifi_test_framework.core.ssl_utils import make_server_cert, dump_cert, dump_key -from minifi_test_framework.containers.container_linux import LinuxContainer -from minifi_test_framework.containers.file import File -from minifi_test_framework.core.minifi_test_context import MinifiTestContext +from minifi_behave.core.helpers import wait_for_condition +from minifi_behave.core.ssl_utils import make_server_cert, dump_cert, dump_key +from minifi_behave.containers.container_linux import LinuxContainer +from minifi_behave.containers.file import File +from minifi_behave.core.minifi_test_context import MinifiTestContext class KafkaServer(LinuxContainer): diff --git a/extensions/kafka/tests/features/environment.py b/extensions/kafka/tests/features/environment.py index 99986cd33..4d9f7006b 100644 --- a/extensions/kafka/tests/features/environment.py +++ b/extensions/kafka/tests/features/environment.py @@ -12,9 +12,9 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from minifi_test_framework.containers.docker_image_builder import DockerImageBuilder -from minifi_test_framework.core.hooks import common_before_scenario -from minifi_test_framework.core.hooks import common_after_scenario +from minifi_behave.containers.docker_image_builder import DockerImageBuilder +from minifi_behave.core.hooks import common_before_scenario +from minifi_behave.core.hooks import common_after_scenario def before_all(context): diff --git a/extensions/kafka/tests/features/steps/steps.py b/extensions/kafka/tests/features/steps/steps.py index 05b2c3f57..7417e709f 100644 --- a/extensions/kafka/tests/features/steps/steps.py +++ b/extensions/kafka/tests/features/steps/steps.py @@ -18,12 +18,12 @@ import time from behave import step, when, given -from minifi_test_framework.steps import checking_steps # noqa: F401 -from minifi_test_framework.steps import configuration_steps # noqa: F401 -from minifi_test_framework.steps import core_steps # noqa: F401 -from minifi_test_framework.steps import flow_building_steps # noqa: F401 -from minifi_test_framework.core.minifi_test_context import MinifiTestContext -from minifi_test_framework.minifi.processor import Processor +from minifi_behave.steps import checking_steps # noqa: F401 +from minifi_behave.steps import configuration_steps # noqa: F401 +from minifi_behave.steps import core_steps # noqa: F401 +from minifi_behave.steps import flow_building_steps # noqa: F401 +from minifi_behave.core.minifi_test_context import MinifiTestContext +from minifi_behave.minifi.processor import Processor from containers.kafka_server_container import KafkaServer diff --git a/extensions/kubernetes/tests/features/environment.py b/extensions/kubernetes/tests/features/environment.py index f25e1dd52..83408016a 100644 --- a/extensions/kubernetes/tests/features/environment.py +++ b/extensions/kubernetes/tests/features/environment.py @@ -16,7 +16,7 @@ import docker import os -from minifi_test_framework.core.hooks import common_after_scenario, common_before_scenario, get_minifi_container_image +from minifi_behave.core.hooks import common_after_scenario, common_before_scenario, get_minifi_container_image from steps.kubernetes_proxy import KubernetesProxy diff --git a/extensions/kubernetes/tests/features/steps/minifi_as_pod_in_kubernetes_cluster.py b/extensions/kubernetes/tests/features/steps/minifi_as_pod_in_kubernetes_cluster.py index b741b185d..320e89686 100644 --- a/extensions/kubernetes/tests/features/steps/minifi_as_pod_in_kubernetes_cluster.py +++ b/extensions/kubernetes/tests/features/steps/minifi_as_pod_in_kubernetes_cluster.py @@ -15,8 +15,8 @@ import logging -from minifi_test_framework.containers.minifi_container import MinifiContainer -from minifi_test_framework.core.minifi_test_context import MinifiTestContext +from minifi_behave.containers.minifi_container import MinifiContainer +from minifi_behave.core.minifi_test_context import MinifiTestContext class MinifiAsPodInKubernetesCluster(MinifiContainer): diff --git a/extensions/kubernetes/tests/features/steps/steps.py b/extensions/kubernetes/tests/features/steps/steps.py index 7e5c2f2ad..b153cadb0 100644 --- a/extensions/kubernetes/tests/features/steps/steps.py +++ b/extensions/kubernetes/tests/features/steps/steps.py @@ -15,14 +15,14 @@ from behave import given -from minifi_test_framework.steps import checking_steps # noqa: F401 -from minifi_test_framework.steps import configuration_steps # noqa: F401 -from minifi_test_framework.steps import core_steps # noqa: F401 -from minifi_test_framework.steps import flow_building_steps # noqa: F401 - -from minifi_test_framework.core.minifi_test_context import DEFAULT_MINIFI_CONTAINER_NAME, MinifiTestContext -from minifi_test_framework.minifi.processor import Processor -from minifi_test_framework.minifi.controller_service import ControllerService +from minifi_behave.steps import checking_steps # noqa: F401 +from minifi_behave.steps import configuration_steps # noqa: F401 +from minifi_behave.steps import core_steps # noqa: F401 +from minifi_behave.steps import flow_building_steps # noqa: F401 + +from minifi_behave.core.minifi_test_context import DEFAULT_MINIFI_CONTAINER_NAME, MinifiTestContext +from minifi_behave.minifi.processor import Processor +from minifi_behave.minifi.controller_service import ControllerService from minifi_as_pod_in_kubernetes_cluster import MinifiAsPodInKubernetesCluster diff --git a/extensions/llamacpp/tests/features/environment.py b/extensions/llamacpp/tests/features/environment.py index 98caaa7d0..9f23b7656 100644 --- a/extensions/llamacpp/tests/features/environment.py +++ b/extensions/llamacpp/tests/features/environment.py @@ -14,11 +14,11 @@ # limitations under the License. from textwrap import dedent -from minifi_test_framework.containers.docker_image_builder import DockerImageBuilder -from minifi_test_framework.core.hooks import common_before_scenario -from minifi_test_framework.core.hooks import common_after_scenario -from minifi_test_framework.core.hooks import get_minifi_container_image -from minifi_test_framework.core.minifi_test_context import MinifiTestContext +from minifi_behave.containers.docker_image_builder import DockerImageBuilder +from minifi_behave.core.hooks import common_before_scenario +from minifi_behave.core.hooks import common_after_scenario +from minifi_behave.core.hooks import get_minifi_container_image +from minifi_behave.core.minifi_test_context import MinifiTestContext # These hooks are executed by behave before and after each scenario # The common_before_scenario and common_after_scenario must be called for proper setup and tear down diff --git a/extensions/llamacpp/tests/features/steps/steps.py b/extensions/llamacpp/tests/features/steps/steps.py index 90304a7f8..25759880f 100644 --- a/extensions/llamacpp/tests/features/steps/steps.py +++ b/extensions/llamacpp/tests/features/steps/steps.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from minifi_test_framework.steps import checking_steps # noqa: F401 -from minifi_test_framework.steps import configuration_steps # noqa: F401 -from minifi_test_framework.steps import core_steps # noqa: F401 -from minifi_test_framework.steps import flow_building_steps # noqa: F401 +from minifi_behave.steps import checking_steps # noqa: F401 +from minifi_behave.steps import configuration_steps # noqa: F401 +from minifi_behave.steps import core_steps # noqa: F401 +from minifi_behave.steps import flow_building_steps # noqa: F401 diff --git a/extensions/lua/tests/features/environment.py b/extensions/lua/tests/features/environment.py index a02cce4c3..7e9fcda28 100644 --- a/extensions/lua/tests/features/environment.py +++ b/extensions/lua/tests/features/environment.py @@ -15,8 +15,8 @@ import os -from minifi_test_framework.core.hooks import common_before_scenario -from minifi_test_framework.core.hooks import common_after_scenario +from minifi_behave.core.hooks import common_before_scenario +from minifi_behave.core.hooks import common_after_scenario def before_scenario(context, scenario): diff --git a/extensions/lua/tests/features/steps/steps.py b/extensions/lua/tests/features/steps/steps.py index 90304a7f8..25759880f 100644 --- a/extensions/lua/tests/features/steps/steps.py +++ b/extensions/lua/tests/features/steps/steps.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from minifi_test_framework.steps import checking_steps # noqa: F401 -from minifi_test_framework.steps import configuration_steps # noqa: F401 -from minifi_test_framework.steps import core_steps # noqa: F401 -from minifi_test_framework.steps import flow_building_steps # noqa: F401 +from minifi_behave.steps import checking_steps # noqa: F401 +from minifi_behave.steps import configuration_steps # noqa: F401 +from minifi_behave.steps import core_steps # noqa: F401 +from minifi_behave.steps import flow_building_steps # noqa: F401 diff --git a/extensions/mqtt/tests/features/containers/mqtt_broker_container.py b/extensions/mqtt/tests/features/containers/mqtt_broker_container.py index c4f4b7416..2ed54d1ba 100644 --- a/extensions/mqtt/tests/features/containers/mqtt_broker_container.py +++ b/extensions/mqtt/tests/features/containers/mqtt_broker_container.py @@ -17,10 +17,10 @@ import logging import re from textwrap import dedent -from minifi_test_framework.containers.container_linux import LinuxContainer -from minifi_test_framework.core.helpers import wait_for_condition -from minifi_test_framework.core.minifi_test_context import MinifiTestContext -from minifi_test_framework.containers.docker_image_builder import DockerImageBuilder +from minifi_behave.containers.container_linux import LinuxContainer +from minifi_behave.core.helpers import wait_for_condition +from minifi_behave.core.minifi_test_context import MinifiTestContext +from minifi_behave.containers.docker_image_builder import DockerImageBuilder from docker.errors import ContainerError diff --git a/extensions/mqtt/tests/features/environment.py b/extensions/mqtt/tests/features/environment.py index b3bbe9df0..a98f91b7d 100644 --- a/extensions/mqtt/tests/features/environment.py +++ b/extensions/mqtt/tests/features/environment.py @@ -14,9 +14,9 @@ # limitations under the License. from pathlib import Path -from minifi_test_framework.containers.docker_image_builder import DockerImageBuilder -from minifi_test_framework.core.hooks import common_before_scenario -from minifi_test_framework.core.hooks import common_after_scenario +from minifi_behave.containers.docker_image_builder import DockerImageBuilder +from minifi_behave.core.hooks import common_before_scenario +from minifi_behave.core.hooks import common_after_scenario def before_all(context): diff --git a/extensions/mqtt/tests/features/steps/steps.py b/extensions/mqtt/tests/features/steps/steps.py index e16b8014e..1bce835ae 100644 --- a/extensions/mqtt/tests/features/steps/steps.py +++ b/extensions/mqtt/tests/features/steps/steps.py @@ -16,13 +16,13 @@ import re from behave import given, step, then, when -from minifi_test_framework.steps import checking_steps # noqa: F401 -from minifi_test_framework.steps import configuration_steps # noqa: F401 -from minifi_test_framework.steps import core_steps # noqa: F401 -from minifi_test_framework.steps import flow_building_steps # noqa: F401 -from minifi_test_framework.core.minifi_test_context import DEFAULT_MINIFI_CONTAINER_NAME, MinifiTestContext -from minifi_test_framework.minifi.processor import Processor -from minifi_test_framework.core.helpers import wait_for_condition +from minifi_behave.steps import checking_steps # noqa: F401 +from minifi_behave.steps import configuration_steps # noqa: F401 +from minifi_behave.steps import core_steps # noqa: F401 +from minifi_behave.steps import flow_building_steps # noqa: F401 +from minifi_behave.core.minifi_test_context import DEFAULT_MINIFI_CONTAINER_NAME, MinifiTestContext +from minifi_behave.minifi.processor import Processor +from minifi_behave.core.helpers import wait_for_condition from containers.mqtt_broker_container import MqttBrokerContainer diff --git a/extensions/opc/tests/features/containers/opc_ua_server_container.py b/extensions/opc/tests/features/containers/opc_ua_server_container.py index 3740b77bd..5894bc0cd 100644 --- a/extensions/opc/tests/features/containers/opc_ua_server_container.py +++ b/extensions/opc/tests/features/containers/opc_ua_server_container.py @@ -14,9 +14,9 @@ # limitations under the License. from typing import List, Optional -from minifi_test_framework.containers.container_linux import LinuxContainer -from minifi_test_framework.core.helpers import wait_for_condition -from minifi_test_framework.core.minifi_test_context import MinifiTestContext +from minifi_behave.containers.container_linux import LinuxContainer +from minifi_behave.core.helpers import wait_for_condition +from minifi_behave.core.minifi_test_context import MinifiTestContext class OPCUAServerContainer(LinuxContainer): diff --git a/extensions/opc/tests/features/environment.py b/extensions/opc/tests/features/environment.py index a02cce4c3..7e9fcda28 100644 --- a/extensions/opc/tests/features/environment.py +++ b/extensions/opc/tests/features/environment.py @@ -15,8 +15,8 @@ import os -from minifi_test_framework.core.hooks import common_before_scenario -from minifi_test_framework.core.hooks import common_after_scenario +from minifi_behave.core.hooks import common_before_scenario +from minifi_behave.core.hooks import common_after_scenario def before_scenario(context, scenario): diff --git a/extensions/opc/tests/features/steps/steps.py b/extensions/opc/tests/features/steps/steps.py index 2c17dbc6a..0dcd61c89 100644 --- a/extensions/opc/tests/features/steps/steps.py +++ b/extensions/opc/tests/features/steps/steps.py @@ -22,12 +22,12 @@ import tarfile import humanfriendly from behave import given, step, then -from minifi_test_framework.steps import checking_steps # noqa: F401 -from minifi_test_framework.steps import configuration_steps # noqa: F401 -from minifi_test_framework.steps import core_steps # noqa: F401 -from minifi_test_framework.steps import flow_building_steps # noqa: F401 -from minifi_test_framework.core.minifi_test_context import MinifiTestContext -from minifi_test_framework.core.helpers import wait_for_condition +from minifi_behave.steps import checking_steps # noqa: F401 +from minifi_behave.steps import configuration_steps # noqa: F401 +from minifi_behave.steps import core_steps # noqa: F401 +from minifi_behave.steps import flow_building_steps # noqa: F401 +from minifi_behave.core.minifi_test_context import MinifiTestContext +from minifi_behave.core.helpers import wait_for_condition from containers.opc_ua_server_container import OPCUAServerContainer diff --git a/extensions/prometheus/tests/features/containers/prometheus_container.py b/extensions/prometheus/tests/features/containers/prometheus_container.py index 829bd892e..4846d9307 100644 --- a/extensions/prometheus/tests/features/containers/prometheus_container.py +++ b/extensions/prometheus/tests/features/containers/prometheus_container.py @@ -14,12 +14,12 @@ # limitations under the License. import logging -from minifi_test_framework.core.helpers import wait_for_condition -from minifi_test_framework.core.minifi_test_context import MinifiTestContext -from minifi_test_framework.core.ssl_utils import make_cert_without_extended_usage -from minifi_test_framework.containers.file import File -from minifi_test_framework.core.ssl_utils import dump_cert, dump_key -from minifi_test_framework.containers.container_linux import LinuxContainer +from minifi_behave.core.helpers import wait_for_condition +from minifi_behave.core.minifi_test_context import MinifiTestContext +from minifi_behave.core.ssl_utils import make_cert_without_extended_usage +from minifi_behave.containers.file import File +from minifi_behave.core.ssl_utils import dump_cert, dump_key +from minifi_behave.containers.container_linux import LinuxContainer class PrometheusContainer(LinuxContainer): diff --git a/extensions/prometheus/tests/features/environment.py b/extensions/prometheus/tests/features/environment.py index 6b7a9bbc0..df890c1fc 100644 --- a/extensions/prometheus/tests/features/environment.py +++ b/extensions/prometheus/tests/features/environment.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. from pathlib import Path -from minifi_test_framework.containers.docker_image_builder import DockerImageBuilder -from minifi_test_framework.core.hooks import common_before_scenario -from minifi_test_framework.core.hooks import common_after_scenario +from minifi_behave.containers.docker_image_builder import DockerImageBuilder +from minifi_behave.core.hooks import common_before_scenario +from minifi_behave.core.hooks import common_after_scenario def before_all(context): diff --git a/extensions/prometheus/tests/features/steps/steps.py b/extensions/prometheus/tests/features/steps/steps.py index 1a181def4..eb27aecb7 100644 --- a/extensions/prometheus/tests/features/steps/steps.py +++ b/extensions/prometheus/tests/features/steps/steps.py @@ -14,12 +14,12 @@ # limitations under the License. from behave import step, then, given -from minifi_test_framework.steps import checking_steps # noqa: F401 -from minifi_test_framework.steps import configuration_steps # noqa: F401 -from minifi_test_framework.steps import core_steps # noqa: F401 -from minifi_test_framework.steps import flow_building_steps # noqa: F401 -from minifi_test_framework.core.helpers import wait_for_condition -from minifi_test_framework.core.minifi_test_context import MinifiTestContext +from minifi_behave.steps import checking_steps # noqa: F401 +from minifi_behave.steps import configuration_steps # noqa: F401 +from minifi_behave.steps import core_steps # noqa: F401 +from minifi_behave.steps import flow_building_steps # noqa: F401 +from minifi_behave.core.helpers import wait_for_condition +from minifi_behave.core.minifi_test_context import MinifiTestContext from containers.prometheus_container import PrometheusContainer diff --git a/extensions/python/tests/features/environment.py b/extensions/python/tests/features/environment.py index d22adcf27..abdf1b69b 100644 --- a/extensions/python/tests/features/environment.py +++ b/extensions/python/tests/features/environment.py @@ -15,9 +15,9 @@ import docker import os from pathlib import Path -from minifi_test_framework.containers.docker_image_builder import DockerImageBuilder -from minifi_test_framework.core.hooks import common_before_scenario -from minifi_test_framework.core.hooks import common_after_scenario +from minifi_behave.containers.docker_image_builder import DockerImageBuilder +from minifi_behave.core.hooks import common_before_scenario +from minifi_behave.core.hooks import common_after_scenario def get_minifi_container_image(): diff --git a/extensions/python/tests/features/steps/steps.py b/extensions/python/tests/features/steps/steps.py index 7180f522f..6b0dc4a47 100644 --- a/extensions/python/tests/features/steps/steps.py +++ b/extensions/python/tests/features/steps/steps.py @@ -16,12 +16,12 @@ import os import docker from behave import given -from minifi_test_framework.steps import checking_steps # noqa: F401 -from minifi_test_framework.steps import configuration_steps # noqa: F401 -from minifi_test_framework.steps import core_steps # noqa: F401 -from minifi_test_framework.steps import flow_building_steps # noqa: F401 -from minifi_test_framework.core.minifi_test_context import MinifiTestContext -from minifi_test_framework.containers.docker_image_builder import DockerImageBuilder +from minifi_behave.steps import checking_steps # noqa: F401 +from minifi_behave.steps import configuration_steps # noqa: F401 +from minifi_behave.steps import core_steps # noqa: F401 +from minifi_behave.steps import flow_building_steps # noqa: F401 +from minifi_behave.core.minifi_test_context import MinifiTestContext +from minifi_behave.containers.docker_image_builder import DockerImageBuilder class PythonWithDependenciesOptions: diff --git a/extensions/splunk/tests/features/containers/splunk_container.py b/extensions/splunk/tests/features/containers/splunk_container.py index 9a1488e63..8eb87b541 100644 --- a/extensions/splunk/tests/features/containers/splunk_container.py +++ b/extensions/splunk/tests/features/containers/splunk_container.py @@ -15,11 +15,11 @@ import json -from minifi_test_framework.containers.container_linux import LinuxContainer -from minifi_test_framework.core.minifi_test_context import MinifiTestContext -from minifi_test_framework.core.helpers import wait_for_condition, retry_check -from minifi_test_framework.containers.file import File -from minifi_test_framework.core.ssl_utils import make_server_cert, dump_cert, dump_key +from minifi_behave.containers.container_linux import LinuxContainer +from minifi_behave.core.minifi_test_context import MinifiTestContext +from minifi_behave.core.helpers import wait_for_condition, retry_check +from minifi_behave.containers.file import File +from minifi_behave.core.ssl_utils import make_server_cert, dump_cert, dump_key class SplunkContainer(LinuxContainer): diff --git a/extensions/splunk/tests/features/environment.py b/extensions/splunk/tests/features/environment.py index 347b35688..ca4d81cfb 100644 --- a/extensions/splunk/tests/features/environment.py +++ b/extensions/splunk/tests/features/environment.py @@ -15,8 +15,8 @@ import platform -from minifi_test_framework.core.hooks import common_before_scenario -from minifi_test_framework.core.hooks import common_after_scenario +from minifi_behave.core.hooks import common_before_scenario +from minifi_behave.core.hooks import common_after_scenario def before_feature(context, feature): diff --git a/extensions/splunk/tests/features/steps/steps.py b/extensions/splunk/tests/features/steps/steps.py index 1656142f2..c89a32955 100644 --- a/extensions/splunk/tests/features/steps/steps.py +++ b/extensions/splunk/tests/features/steps/steps.py @@ -14,12 +14,12 @@ # limitations under the License. from behave import step, then -from minifi_test_framework.steps import checking_steps # noqa: F401 -from minifi_test_framework.steps import configuration_steps # noqa: F401 -from minifi_test_framework.steps import core_steps # noqa: F401 -from minifi_test_framework.steps import flow_building_steps # noqa: F401 -from minifi_test_framework.core.helpers import log_due_to_failure -from minifi_test_framework.core.minifi_test_context import MinifiTestContext +from minifi_behave.steps import checking_steps # noqa: F401 +from minifi_behave.steps import configuration_steps # noqa: F401 +from minifi_behave.steps import core_steps # noqa: F401 +from minifi_behave.steps import flow_building_steps # noqa: F401 +from minifi_behave.core.helpers import log_due_to_failure +from minifi_behave.core.minifi_test_context import MinifiTestContext from containers.splunk_container import SplunkContainer diff --git a/extensions/sql/tests/features/containers/postgress_server_container.py b/extensions/sql/tests/features/containers/postgress_server_container.py index 2dea3058e..b84aef130 100644 --- a/extensions/sql/tests/features/containers/postgress_server_container.py +++ b/extensions/sql/tests/features/containers/postgress_server_container.py @@ -17,10 +17,10 @@ import logging from textwrap import dedent -from minifi_test_framework.containers.container_linux import LinuxContainer -from minifi_test_framework.containers.docker_image_builder import DockerImageBuilder -from minifi_test_framework.core.helpers import wait_for_condition -from minifi_test_framework.core.minifi_test_context import MinifiTestContext +from minifi_behave.containers.container_linux import LinuxContainer +from minifi_behave.containers.docker_image_builder import DockerImageBuilder +from minifi_behave.core.helpers import wait_for_condition +from minifi_behave.core.minifi_test_context import MinifiTestContext class PostgresContainer(LinuxContainer): diff --git a/extensions/sql/tests/features/environment.py b/extensions/sql/tests/features/environment.py index a835e3b2c..ad369afc0 100644 --- a/extensions/sql/tests/features/environment.py +++ b/extensions/sql/tests/features/environment.py @@ -18,10 +18,10 @@ import os from textwrap import dedent -from minifi_test_framework.containers.docker_image_builder import DockerImageBuilder -from minifi_test_framework.core.hooks import common_before_scenario -from minifi_test_framework.core.hooks import common_after_scenario -from minifi_test_framework.core.hooks import get_minifi_container_image +from minifi_behave.containers.docker_image_builder import DockerImageBuilder +from minifi_behave.core.hooks import common_before_scenario +from minifi_behave.core.hooks import common_after_scenario +from minifi_behave.core.hooks import get_minifi_container_image # These hooks are executed by behave before and after each scenario # The common_before_scenario and common_after_scenario must be called for proper setup and tear down diff --git a/extensions/sql/tests/features/steps/steps.py b/extensions/sql/tests/features/steps/steps.py index eb3c90ce7..92b95d22b 100644 --- a/extensions/sql/tests/features/steps/steps.py +++ b/extensions/sql/tests/features/steps/steps.py @@ -18,13 +18,13 @@ import humanfriendly from behave import step, given, then -from minifi_test_framework.steps import checking_steps # noqa: F401 -from minifi_test_framework.steps import configuration_steps # noqa: F401 -from minifi_test_framework.steps import core_steps # noqa: F401 -from minifi_test_framework.steps import flow_building_steps # noqa: F401 -from minifi_test_framework.core.helpers import wait_for_condition -from minifi_test_framework.minifi.controller_service import ControllerService -from minifi_test_framework.core.minifi_test_context import MinifiTestContext +from minifi_behave.steps import checking_steps # noqa: F401 +from minifi_behave.steps import configuration_steps # noqa: F401 +from minifi_behave.steps import core_steps # noqa: F401 +from minifi_behave.steps import flow_building_steps # noqa: F401 +from minifi_behave.core.helpers import wait_for_condition +from minifi_behave.minifi.controller_service import ControllerService +from minifi_behave.core.minifi_test_context import MinifiTestContext from containers.postgress_server_container import PostgresContainer diff --git a/extensions/standard-processors/tests/features/containers/diag_slave_container.py b/extensions/standard-processors/tests/features/containers/diag_slave_container.py index 4741441c4..68f78ae64 100644 --- a/extensions/standard-processors/tests/features/containers/diag_slave_container.py +++ b/extensions/standard-processors/tests/features/containers/diag_slave_container.py @@ -18,10 +18,10 @@ import logging from textwrap import dedent -from minifi_test_framework.containers.container_linux import LinuxContainer -from minifi_test_framework.containers.docker_image_builder import DockerImageBuilder -from minifi_test_framework.core.helpers import wait_for_condition -from minifi_test_framework.core.minifi_test_context import MinifiTestContext +from minifi_behave.containers.container_linux import LinuxContainer +from minifi_behave.containers.docker_image_builder import DockerImageBuilder +from minifi_behave.core.helpers import wait_for_condition +from minifi_behave.core.minifi_test_context import MinifiTestContext class DiagSlave(LinuxContainer): diff --git a/extensions/standard-processors/tests/features/containers/syslog_container.py b/extensions/standard-processors/tests/features/containers/syslog_container.py index c831af6f1..8cbb117d1 100644 --- a/extensions/standard-processors/tests/features/containers/syslog_container.py +++ b/extensions/standard-processors/tests/features/containers/syslog_container.py @@ -15,7 +15,7 @@ # limitations under the License. # -from minifi_test_framework.containers.container_linux import LinuxContainer +from minifi_behave.containers.container_linux import LinuxContainer class SyslogContainer(LinuxContainer): diff --git a/extensions/standard-processors/tests/features/containers/tcp_client_container.py b/extensions/standard-processors/tests/features/containers/tcp_client_container.py index 74fcf1351..37b8cbb31 100644 --- a/extensions/standard-processors/tests/features/containers/tcp_client_container.py +++ b/extensions/standard-processors/tests/features/containers/tcp_client_container.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -from minifi_test_framework.containers.container_linux import LinuxContainer -from minifi_test_framework.core.helpers import wait_for_condition -from minifi_test_framework.core.minifi_test_context import MinifiTestContext +from minifi_behave.containers.container_linux import LinuxContainer +from minifi_behave.core.helpers import wait_for_condition +from minifi_behave.core.minifi_test_context import MinifiTestContext class TcpClientContainer(LinuxContainer): diff --git a/extensions/standard-processors/tests/features/environment.py b/extensions/standard-processors/tests/features/environment.py index a2c3531ce..fb2b3b72c 100644 --- a/extensions/standard-processors/tests/features/environment.py +++ b/extensions/standard-processors/tests/features/environment.py @@ -16,8 +16,8 @@ import os import platform import docker -from minifi_test_framework.core.hooks import common_before_scenario -from minifi_test_framework.core.hooks import common_after_scenario +from minifi_behave.core.hooks import common_before_scenario +from minifi_behave.core.hooks import common_after_scenario # These hooks are executed by behave before and after each scenario # The common_before_scenario and common_after_scenario must be called for proper setup and tear down diff --git a/extensions/standard-processors/tests/features/steps/minifi_c2_server_container.py b/extensions/standard-processors/tests/features/steps/minifi_c2_server_container.py index ff1d5d352..a645499f6 100644 --- a/extensions/standard-processors/tests/features/steps/minifi_c2_server_container.py +++ b/extensions/standard-processors/tests/features/steps/minifi_c2_server_container.py @@ -23,13 +23,13 @@ from cryptography import x509 from pathlib import Path from cryptography.hazmat.primitives.serialization import load_pem_private_key, pkcs12, BestAvailableEncryption -from minifi_test_framework.containers.container_linux import LinuxContainer -from minifi_test_framework.core.helpers import wait_for_condition -from minifi_test_framework.core.minifi_test_context import MinifiTestContext -from minifi_test_framework.core.ssl_utils import make_server_cert -from minifi_test_framework.containers.file import File -from minifi_test_framework.containers.host_file import HostFile -from minifi_test_framework.core.ssl_utils import dump_key, dump_cert +from minifi_behave.containers.container_linux import LinuxContainer +from minifi_behave.core.helpers import wait_for_condition +from minifi_behave.core.minifi_test_context import MinifiTestContext +from minifi_behave.core.ssl_utils import make_server_cert +from minifi_behave.containers.file import File +from minifi_behave.containers.host_file import HostFile +from minifi_behave.core.ssl_utils import dump_key, dump_cert class MinifiC2Server(LinuxContainer): diff --git a/extensions/standard-processors/tests/features/steps/minifi_controller_steps.py b/extensions/standard-processors/tests/features/steps/minifi_controller_steps.py index 02aea2c22..f4dca56f8 100644 --- a/extensions/standard-processors/tests/features/steps/minifi_controller_steps.py +++ b/extensions/standard-processors/tests/features/steps/minifi_controller_steps.py @@ -16,8 +16,8 @@ # from behave import given, when, then -from minifi_test_framework.core.helpers import retry_check -from minifi_test_framework.core.minifi_test_context import MinifiTestContext +from minifi_behave.core.helpers import retry_check +from minifi_behave.core.minifi_test_context import MinifiTestContext @given('controller socket properties are set up') diff --git a/extensions/standard-processors/tests/features/steps/steps.py b/extensions/standard-processors/tests/features/steps/steps.py index 79167ed56..689a6aef9 100644 --- a/extensions/standard-processors/tests/features/steps/steps.py +++ b/extensions/standard-processors/tests/features/steps/steps.py @@ -18,17 +18,17 @@ import humanfriendly from behave import step, then, given -from minifi_test_framework.steps import checking_steps # noqa: F401 -from minifi_test_framework.steps import configuration_steps # noqa: F401 -from minifi_test_framework.steps import core_steps # noqa: F401 -from minifi_test_framework.steps import flow_building_steps # noqa: F401 -from minifi_test_framework.core.minifi_test_context import MinifiTestContext -from minifi_test_framework.core.helpers import wait_for_condition +from minifi_behave.steps import checking_steps # noqa: F401 +from minifi_behave.steps import configuration_steps # noqa: F401 +from minifi_behave.steps import core_steps # noqa: F401 +from minifi_behave.steps import flow_building_steps # noqa: F401 +from minifi_behave.core.minifi_test_context import MinifiTestContext +from minifi_behave.core.helpers import wait_for_condition from containers.syslog_container import SyslogContainer from containers.diag_slave_container import DiagSlave from containers.tcp_client_container import TcpClientContainer -from minifi_test_framework.containers.minifi_protocol import set_up_ssl_properties +from minifi_behave.containers.minifi_protocol import set_up_ssl_properties from minifi_c2_server_container import MinifiC2Server
