Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MINIFICPP-2452 Modbus, Elasticsearch and OPC docker tests not running… #1864

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
szaszm marked this conversation as resolved.
Show resolved Hide resolved
SCCACHE_GHA_ENABLE: true
CCACHE_DIR: ${{ GITHUB.WORKSPACE }}/.ccache
jobs:
Expand Down
2 changes: 1 addition & 1 deletion PROCESSORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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. |
Expand Down
4 changes: 2 additions & 2 deletions docker/test/integration/features/fetch_modbus_tcp.feature
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/test/integration/features/opcua.feature
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
4 changes: 2 additions & 2 deletions extensions/standard-processors/modbus/FetchModbusTcp.h
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down