martinzink commented on code in PR #2044: URL: https://github.com/apache/nifi-minifi-cpp/pull/2044#discussion_r2466572045
########## behave_framework/src/minifi_test_framework/containers/minifi_container.py: ########## @@ -0,0 +1,85 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# 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 docker.models.networks import Network +from minifi_test_framework.containers.file import File +from minifi_test_framework.minifi.flow_definition import FlowDefinition +from typing import Dict + +from .container import Container + + +class MinifiContainer(Container): + def __init__(self, image_name: str, scenario_id: str, network: Network): + super().__init__(image_name, f"minifi-{scenario_id}", network) + self.flow_config_str: str = "" + self.flow_definition = FlowDefinition() + self.properties: Dict[str, str] = {} + self.log_properties: Dict[str, str] = {} + + self.is_fhs = 'MINIFI_INSTALLATION_TYPE=FHS' in str(self.client.images.get(image_name).history()) + + self._fill_default_properties() + self._fill_default_log_properties() + + def deploy(self) -> bool: + if self.is_fhs: + self.files.append(File("/etc/nifi-minifi-cpp", "config.yml", self.flow_definition.to_yaml())) + self.files.append(File("/etc/nifi-minifi-cpp", "minifi.properties", self._get_properties_file_content())) + self.files.append( + File("/etc/nifi-minifi-cpp", "minifi-log.properties", self._get_log_properties_file_content())) + else: + self.files.append(File("/opt/minifi/minifi-current/conf", "config.yml", self.flow_definition.to_yaml())) + self.files.append( + File("/opt/minifi/minifi-current/conf", "minifi.properties", self._get_properties_file_content())) + self.files.append(File("/opt/minifi/minifi-current/conf", "minifi-log.properties", + self._get_log_properties_file_content())) Review Comment: that file should be there on the container and we probably dont need to change it during testing ########## behave_framework/src/minifi_test_framework/containers/container.py: ########## @@ -0,0 +1,266 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# 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. +# + +import logging +import os +import shlex +import tempfile +from docker.models.networks import Network +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 typing import Dict, Any, List + +import docker + + +class Container: + def __init__(self, image_name: str, container_name: str, network: Network): + self.image_name: str = image_name + self.container_name: str = container_name + self.network: Network = network + self.user: str = "0:0" + self.client = docker.from_env() + self.container = None + self.files: List[File] = [] + self.dirs: List[Directory] = [] + self.host_files: List[HostFile] = [] + self.volumes = {} + self.command = None + self._temp_dir = None + self.ports = None + self.environment: List[str] = [] + + def deploy(self) -> bool: + self._temp_dir = tempfile.TemporaryDirectory() + + if len(self.files) != 0 or len(self.dirs) != 0 or len(self.host_files) != 0: + for file in self.files: + temp_path = self._temp_dir.name + "/" + file.host_filename + with open(temp_path, "w") as temp_file: + temp_file.write(file.content) + self.volumes[temp_path] = { + "bind": file.path + "/" + file.host_filename, + "mode": file.mode + } + for directory in self.dirs: + temp_path = self._temp_dir.name + directory.path + for file_name, content in directory.files.items(): + file_path = temp_path + "/" + file_name + os.makedirs(temp_path, exist_ok=True) + with open(file_path, "w") as temp_file: + temp_file.write(content) + self.volumes[temp_path] = { + "bind": directory.path, + "mode": directory.mode + } + for host_file in self.host_files: + self.volumes[host_file.container_path] = { + "bind": host_file.host_path, + "mode": host_file.mode + } + + try: + existing_container = self.client.containers.get(self.container_name) + logging.warning(f"Found existing container '{self.container_name}'. Removing it first.") + existing_container.remove(force=True) + except docker.errors.NotFound: + pass + try: + print(f"Creating and starting container '{self.container_name}'...") + self.container = self.client.containers.run( + image=self.image_name, + name=self.container_name, + ports=self.ports, + environment=self.environment, + volumes=self.volumes, + network=self.network.name, + command=self.command, + user=self.user, + detach=True # Always run in the background + ) + except Exception as e: + logging.error(f"Error starting container: {e}") + raise + return True + + def clean_up(self): + if self.container is not None: + self.container.remove(force=True) + + def exec_run(self, command): + if self.container: + (code, output) = self.container.exec_run(command) + return code, output.decode("utf-8") + return None, "Container not running." + + def directory_contains_file_with_content(self, directory_path: str, expected_content: str) -> bool: + if not self.container: + return False + + escaped_content = expected_content.replace("\"", "\\\"") + + command = f"sh -c \"grep -l -F -- '{escaped_content}' {directory_path}/*\"" Review Comment: good idea 👍 https://github.com/apache/nifi-minifi-cpp/pull/2044/commits/621be5a3eb5f4905a8b3f832d8dd5411de022267#diff-b9acc60a55b3f931c457c238886505df8e3401fcb942eae49005cac3f96c397bR110 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
