Fix/#2755 signaling the data source that has a problem #2953
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Created class: DataPointUnreliableUtils; Signaling added in: * Meta Data Source; * SNMP; * HTTP Retriever; * BACnet I/P; * DNP3 (IP/Serial); Signaling use DataPointUnreliableUtils in: * Modbus IP/Serial; * Viconics; * Pachube; * MQTT/AMQP
…ing on graphical views
…ing on graphical views
- fixed feature refresh point value
…gnaling_the_Data_Source_that_has_a_problem
- DataPointUnreliableUtilsTest.java; - use methods returnToNormal and raiseEvent from DataSourceRT; - added methods: LoggingUtils.info, LoggingUtils.dataPointInfo, LoggingUtils.dataPointRtInfo, PollingDataSource.getDataPoints, EventDataSource.getDataPoints, DataSourceRT.getDataPoints;
…gnaling_the_Data_Source_that_has_a_problem
- fixed Data Source use serial port - System Exception;
- corrected terminate method for: Alpha2DataSource, Dnp3DataSource, DrStorageHt5bDataSource, IEC101DataSource, OPCDataSource, RadiuinoEventDataSource, RadiuinoPollingDataSource; - fixed reset unreliable HttpImageDataSourceRT when error retriever; - refactor DataPointUnreliableUtils; - fixed RuntimeManager.startDataPoint;
- added tests: InitializeDataSourceRtTest, InitializeWithErrorsDataSourceRtTest; - corrected test: DataPointUnreliableUtilsTest; - replacing class CommPortIdentifier from RXTXcomm.jar with a new class ScadaCommPortIdentifier: ASCIISerialDataSource, DrStorageHt5bDataSource, RadiuinoEventDataSource, RadiuinoPollingDataSource; - corrected signaling errors in: BACnetIPDataSourceRT, HttpReceiverDataSourceRT, ModbusDataSource, NmeaDataSourceRT, PachubeDataSourceRT, PersistentDataSourceRT, SnmpDataSourceRT, ViconicsDataSourceRT; - try catch Throwable; - change logging level from WARN to ERROR for dataSourceRtLoggingLevel, dataPointRtLoggingLevel (log4j2.xml); - refactoring DataPointUnreliableUtils; - added methods: DataPointRT.isUnreliable, DataPointRT.isSetUnreliable, DataSourceUtils.checkInitialized;
- corrected test: InitializeWithErrorsDataSourceRtTest; - change type catch from IOException to Throwable;
- corrected test: InitializeWithErrorsDataSourceRtTest for VMStatDataSourceRT - update PrepareForTest annotation, if dataSourceRT instanceof VMStatDataSourceRT, for MessagingDataSourceRT with MQTT throw MessagingServiceException after invoke MessageService.open;
- fixed generate many events by ModbusDataSource; - corrected test InitializeDataSourceRtTest; - refactor InitializeDataSourceRtMockUtils;
- added class: RuntimeMockUtils
- fixed generate many events by: Pop3DataSourceRT, PachubeDataSourceRT, NmeaDataSourceRT, HttpRetrieverDataSourceRT, BACnetIPDataSourceRT, change to active events; - change logging fatal to debug level in methods: MBusDataSourceRT.initialize(), MBusDataSourceRT.terminate(); - fixed DataPointUnreliableUtilsTest, InitializeDataSourceRtTest, InitializeWithErrorsDataSourceRtTest, mocking TimeoutTask;
- corrected terminate method for: Alpha2DataSource, Dnp3DataSource, DrStorageHt5bDataSource, IEC101DataSource, OPCDataSource, RadiuinoEventDataSource, RadiuinoPollingDataSource; - fixed reset unreliable HttpImageDataSourceRT when error retriever; - refactor DataPointUnreliableUtils; - fixed RuntimeManager.startDataPoint;
- added tests: InitializeDataSourceRtTest, InitializeWithErrorsDataSourceRtTest; - corrected test: DataPointUnreliableUtilsTest; - replacing class CommPortIdentifier from RXTXcomm.jar with a new class ScadaCommPortIdentifier: ASCIISerialDataSource, DrStorageHt5bDataSource, RadiuinoEventDataSource, RadiuinoPollingDataSource; - corrected signaling errors in: BACnetIPDataSourceRT, HttpReceiverDataSourceRT, ModbusDataSource, NmeaDataSourceRT, PachubeDataSourceRT, PersistentDataSourceRT, SnmpDataSourceRT, ViconicsDataSourceRT; - try catch Throwable; - change logging level from WARN to ERROR for dataSourceRtLoggingLevel, dataPointRtLoggingLevel (log4j2.xml); - refactoring DataPointUnreliableUtils; - added methods: DataPointRT.isUnreliable, DataPointRT.isSetUnreliable, DataSourceUtils.checkInitialized;
- corrected test: InitializeWithErrorsDataSourceRtTest; - change type catch from IOException to Throwable;
- corrected test: InitializeWithErrorsDataSourceRtTest for VMStatDataSourceRT - update PrepareForTest annotation, if dataSourceRT instanceof VMStatDataSourceRT, for MessagingDataSourceRT with MQTT throw MessagingServiceException after invoke MessageService.open;
- fixed generate many events by ModbusDataSource; - corrected test InitializeDataSourceRtTest; - refactor InitializeDataSourceRtMockUtils;
- added class: RuntimeMockUtils
- fixed generate many events by: Pop3DataSourceRT, PachubeDataSourceRT, NmeaDataSourceRT, HttpRetrieverDataSourceRT, BACnetIPDataSourceRT, change to active events; - change logging fatal to debug level in methods: MBusDataSourceRT.initialize(), MBusDataSourceRT.terminate(); - fixed DataPointUnreliableUtilsTest, InitializeDataSourceRtTest, InitializeWithErrorsDataSourceRtTest, mocking TimeoutTask;
… of https://github.com/SCADA-LTS/Scada-LTS into fix/#2755_Signaling_the_Data_Source_that_has_a_problem
- fixed generate many events by SqlDataSourceRT;
- fixed export DrStorageHt5bDataSourceVO by removed @JsonRemoteProperty from validate method;
…_that_has_a_problem
…_that_has_a_problem
…ce_that_has_a_problem
…ce_that_has_a_problem
…gnaling_the_Data_Source_that_has_a_problem
…gnaling_the_Data_Source_that_has_a_problem
…_that_has_a_problem
- fixed updateAttemptsCounters; - test.failFast, testLogging.exceptionFormat = full;
Java Script Mocha Unit Test Results268 tests 268 ✅ 4s ⏱️ Results for commit a38938c. ♻️ This comment has been updated with latest results. |
Java JUnit Test Results2 357 tests 2 357 ✅ 42s ⏱️ Results for commit a38938c. ♻️ This comment has been updated with latest results. |
…_that_has_a_problem
…gnaling_the_Data_Source_that_has_a_problem # Conflicts: # webapp-resources/messages_de.properties # webapp-resources/messages_en.properties # webapp-resources/messages_es.properties # webapp-resources/messages_fi.properties # webapp-resources/messages_fr.properties # webapp-resources/messages_nl.properties # webapp-resources/messages_pt.properties # webapp-resources/messages_ru.properties # webapp-resources/messages_zh.properties
- Corrected config log4j2.xml for script: ScriptExecutor, ContextualizedScriptRT; - Added new event type DataSourcePointEventType; - Added migration V2_8_0_1__AddTypeRef3ColumnToEvents;
…_that_has_a_problem
…_that_has_a_problem
- fixed alarmAck.tag for new event type; - fixed double actions for eventList.jsp;
- fixed url: scripting.jsp, dataPointEdit.jsp, systemSettings.jsp; - corrected MetaPointLocatorRT - reduce generate events, DataSourceEditDwr, PointValueService, ContextualizedScriptRT - catch Exception; - fixed ScriptExecutor, event per point; - set IGNORE_SAME_MESSAGE for DataSourcePointEventType.duplicateHandling;
…gnaling_the_Data_Source_that_has_a_problem
- fixed ASCIIFileDataSource, BACnetIPDataSourceRT;
…_that_has_a_problem
- set ERROR logging level for dataSourceRtLoggingLevel
Patrykb0802
approved these changes
Sep 17, 2024
There was a problem hiding this comment.
Ad.1. After corrections meta data point is signalling error when context points are disabled.
Ad.2. Imported given cofigruation, after disabling virtual/sql data source you can see on watchlist that points might be unreliable as well as alarms which are visible on alarms view.
Ad.3. Case from issue to check, you can check it first on the old code; --->
I created 3 points, 1 virtual, 2 meta,
virtual was context point for one of the meta data point (mdp1) and second meta point (mdp2) had mdp1 as context. So hierarchy looked like this:
mdp2<-<
|
mdp1<-^
|
vdp1>--^
vdp1 is context of mdp1, mdp1 is context of mdp2
Old version:
All points are toggled on, let's turn off vdp1, only mdp1 is signalling issue with context.
New version:
All points are toggled on, let's turn off vdp1, both mdp1 and mdp2 are signaling issue. -> correct
Ad.4. Created such configuration, only one alarm is generated, works correctly
Ad.5. Generation of multiple events works correctly:
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.