You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by lo...@apache.org on 2024/09/11 07:25:42 UTC
(nifi-minifi-cpp) 02/02: MINIFICPP-2452 Modbus, Elasticsearch and OPC docker tests not running in CI
This is an automated email from the ASF dual-hosted git repository.
lordgamez pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 10911ecdcd5a8ceba399cf19da5351dd29a2dde8
Author: Martin Zink <ma...@apache.org>
AuthorDate: Thu Sep 5 11:22:44 2024 +0200
MINIFICPP-2452 Modbus, Elasticsearch and OPC docker tests not running in CI
Signed-off-by: Gabor Gyimesi <ga...@gmail.com>
This closes #1864
---
.github/workflows/ci.yml | 2 +-
PROCESSORS.md | 2 +-
docker/test/integration/features/fetch_modbus_tcp.feature | 4 ++--
docker/test/integration/features/opcua.feature | 2 +-
docker/test/integration/minifi/controllers/JsonRecordSetWriter.py | 2 +-
extensions/standard-processors/modbus/FetchModbusTcp.h | 4 ++--
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 859dcb0e0..142b040d4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,7 +3,7 @@ on: [push, pull_request, workflow_dispatch]
env:
DOCKER_CMAKE_FLAGS: -DDOCKER_VERIFY_THREAD=3 -DUSE_SHARED_LIBS= -DSTRICT_GSL_CHECKS=AUDIT -DCI_BUILD=ON -DENABLE_AWS=ON -DENABLE_LIBRDKAFKA=ON -DENABLE_MQTT=ON -DENABLE_AZURE=ON -DENABLE_SQL=ON \
-DENABLE_SPLUNK=ON -DENABLE_GCP=ON -DENABLE_OPC=ON -DENABLE_PYTHON_SCRIPTING=ON -DENABLE_LUA_SCRIPTING=ON -DENABLE_KUBERNETES=ON -DENABLE_TEST_PROCESSORS=ON -DENABLE_PROMETHEUS=ON \
- -DENABLE_ELASTICSEARCH=OFF -DENABLE_GRAFANA_LOKI=ON -DDOCKER_BUILD_ONLY=ON
+ -DENABLE_ELASTICSEARCH=ON -DENABLE_GRAFANA_LOKI=ON -DDOCKER_BUILD_ONLY=ON
SCCACHE_GHA_ENABLE: true
CCACHE_DIR: ${{ GITHUB.WORKSPACE }}/.ccache
jobs:
diff --git a/PROCESSORS.md b/PROCESSORS.md
index b1ea31cb3..293c317e4 100644
--- a/PROCESSORS.md
+++ b/PROCESSORS.md
@@ -887,7 +887,7 @@ In the list below, the names of required properties appear in bold. Any other pr
|--------------------------------|---------------|------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------|
| **Hostname** | | | The ip address or hostname of the destination.<br/>**Supports Expression Language: true** |
| **Port** | 502 | | The port or service on the destination.<br/>**Supports Expression Language: true** |
-| **Unit Identifier** | 0 | | The port or service on the destination.<br/>**Supports Expression Language: true** |
+| **Unit Identifier** | 0 | | Unit identifier<br/>**Supports Expression Language: true** |
| **Idle Connection Expiration** | 15 seconds | | The amount of time a connection should be held open without being used before closing the connection. A value of 0 seconds will disable this feature. |
| **Connection Per FlowFile** | false | true<br/>false | Specifies whether to send each FlowFile's content on an individual connection. |
| **Timeout** | 15 seconds | | The timeout for connecting to and communicating with the destination. |
diff --git a/docker/test/integration/features/fetch_modbus_tcp.feature b/docker/test/integration/features/fetch_modbus_tcp.feature
index 6c1eab84e..0ecb56b10 100644
--- a/docker/test/integration/features/fetch_modbus_tcp.feature
+++ b/docker/test/integration/features/fetch_modbus_tcp.feature
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-@MODBUS
+@CORE
Feature: Minifi C++ can act as a modbus tcp master
Background:
@@ -23,7 +23,7 @@ Feature: Minifi C++ can act as a modbus tcp master
Given a FetchModbusTcp processor
And a JsonRecordSetWriter controller service is set up for FetchModbusTcp
And a PutFile processor with the "Directory" property set to "/tmp/output"
- And the "Unit identifier" property of the FetchModbusTcp processor is set to "255"
+ And the "Unit Identifier" property of the FetchModbusTcp processor is set to "255"
And there is an accessible PLC with modbus enabled
And PLC register has been set with h@52=123 command
And PLC register has been set with h@5678/f=1.75 command
diff --git a/docker/test/integration/features/opcua.feature b/docker/test/integration/features/opcua.feature
index b75d39b95..e4217a53d 100644
--- a/docker/test/integration/features/opcua.feature
+++ b/docker/test/integration/features/opcua.feature
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-@ENABLE_OPCUA
+@ENABLE_OPC
Feature: Putting and fetching data to OPC UA server
In order to send and fetch data from an OPC UA server
As a user of MiNiFi
diff --git a/docker/test/integration/minifi/controllers/JsonRecordSetWriter.py b/docker/test/integration/minifi/controllers/JsonRecordSetWriter.py
index cfb15cfd1..9708c6cb6 100644
--- a/docker/test/integration/minifi/controllers/JsonRecordSetWriter.py
+++ b/docker/test/integration/minifi/controllers/JsonRecordSetWriter.py
@@ -21,4 +21,4 @@ class JsonRecordSetWriter(ControllerService):
def __init__(self, name=None, cert=None, key=None, ca_cert=None, passphrase=None, use_system_cert_store=None):
super(JsonRecordSetWriter, self).__init__(name=name)
self.service_class = 'JsonRecordSetWriter'
- self.properties['Output Grouping'] = 'OneLinePerObject'
+ self.properties['Output Grouping'] = 'One Line Per Object'
diff --git a/extensions/standard-processors/modbus/FetchModbusTcp.h b/extensions/standard-processors/modbus/FetchModbusTcp.h
index 847cb885a..229bac411 100644
--- a/extensions/standard-processors/modbus/FetchModbusTcp.h
+++ b/extensions/standard-processors/modbus/FetchModbusTcp.h
@@ -49,9 +49,9 @@ class FetchModbusTcp final : public core::Processor {
.supportsExpressionLanguage(true)
.build();
EXTENSIONAPI static constexpr auto UnitIdentifier = core::PropertyDefinitionBuilder<>::createProperty("Unit Identifier")
- .withDescription("The port or service on the destination.")
+ .withDescription("Unit identifier")
.isRequired(true)
- .withDefaultValue("0")
+ .withDefaultValue("1")
.supportsExpressionLanguage(true)
.build();
EXTENSIONAPI static constexpr auto IdleConnectionExpiration = core::PropertyDefinitionBuilder<>::createProperty("Idle Connection Expiration")