This is an automated email from the ASF dual-hosted git repository. adebreceni pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 41775606425a9382c7733db066f2c5d732b93344 Author: Gabor Gyimesi <[email protected]> AuthorDate: Mon Jan 30 11:11:17 2023 +0100 MINIFICPP-1983 Modify correct minifi.properties file for test containers Signed-off-by: Adam Debreceni <[email protected]> This closes #1496 --- docker/test/integration/cluster/containers/MinifiContainer.py | 7 ++++--- docker/test/integration/resources/minifi-c2-server-ssl/config.yml | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/docker/test/integration/cluster/containers/MinifiContainer.py b/docker/test/integration/cluster/containers/MinifiContainer.py index f5dde6a62..93d65ddda 100644 --- a/docker/test/integration/cluster/containers/MinifiContainer.py +++ b/docker/test/integration/cluster/containers/MinifiContainer.py @@ -65,7 +65,7 @@ class MinifiContainer(FlowContainer): config_file.write(test_flow_yaml.encode('utf-8')) def _create_properties(self): - properties_file_path = os.path.join(self.config_dir, 'minifi.properties') + properties_file_path = os.path.join(self.container_specific_config_dir, 'minifi.properties') with open(properties_file_path, 'a') as f: if self.options.enable_c2: f.write("nifi.c2.enable=true\n") @@ -82,6 +82,7 @@ class MinifiContainer(FlowContainer): f.write("nifi.c2.rest.url.ack=https://minifi-c2-server:10090/c2/config/acknowledge\n";) f.write("nifi.c2.rest.ssl.context.service=SSLContextService\n") f.write("nifi.c2.flow.base.url=https://minifi-c2-server:10090/c2/config/\n";) + f.write("nifi.c2.root.classes=DeviceInfoNode,AgentInformation,FlowInformation\n") f.write("nifi.c2.full.heartbeat=false\n") f.write("nifi.c2.agent.class=minifi-test-class\n") f.write("nifi.c2.agent.identifier=minifi-test-id\n") @@ -99,9 +100,9 @@ class MinifiContainer(FlowContainer): self._create_config() self._create_properties() - self.vols[os.path.join(self.config_dir, 'minifi.properties')] = {"bind": os.path.join(MinifiContainer.MINIFI_ROOT, 'conf', 'minifi.properties'), "mode": "rw"} + self.vols[os.path.join(self.container_specific_config_dir, 'minifi.properties')] = {"bind": os.path.join(MinifiContainer.MINIFI_ROOT, 'conf', 'minifi.properties'), "mode": "rw"} self.vols[os.path.join(self.container_specific_config_dir, 'config.yml')] = {"bind": os.path.join(MinifiContainer.MINIFI_ROOT, 'conf', 'config.yml'), "mode": "rw"} - self.vols[os.path.join(self.config_dir, 'minifi-log.properties')] = {"bind": os.path.join(MinifiContainer.MINIFI_ROOT, 'conf', 'minifi-log.properties'), "mode": "rw"} + self.vols[os.path.join(self.container_specific_config_dir, 'minifi-log.properties')] = {"bind": os.path.join(MinifiContainer.MINIFI_ROOT, 'conf', 'minifi-log.properties'), "mode": "rw"} def deploy(self): if not self.set_deployed(): diff --git a/docker/test/integration/resources/minifi-c2-server-ssl/config.yml b/docker/test/integration/resources/minifi-c2-server-ssl/config.yml index d4c69534c..239541288 100644 --- a/docker/test/integration/resources/minifi-c2-server-ssl/config.yml +++ b/docker/test/integration/resources/minifi-c2-server-ssl/config.yml @@ -33,11 +33,11 @@ Controller Services: class: SSLContextService Properties: Client Certificate: - - value: /tmp/minifi-c2-server-ssl/minifi-c2-client.crt + - value: /tmp/resources/minifi-c2-server-ssl/minifi-cpp-flow.crt Private Key: - - value: /tmp/minifi-c2-server-ssl/minifi-c2-client.key + - value: /tmp/resources/minifi-c2-server-ssl/minifi-cpp-flow.key Passphrase: - - value: abcdefgh + - value: abcdefgh CA Certificate: - - value: /tmp/minifi-c2-server-ssl/minifi-c2-server.crt + - value: /tmp/resources/minifi-c2-server-ssl/root-ca.pem Remote Process Groups: []
