From d7b7c1d838944ebae7db3d081e0830fc17e389b4 Mon Sep 17 00:00:00 2001 From: Ilja Antipov <33315542+antipovi@users.noreply.github.com> Date: Mon, 17 Jul 2023 10:00:45 +0200 Subject: [PATCH 01/10] adapt manipulation SetMetricValuesInRange (#51) Better description for the manipulation SetMetricValuesInRange # Checklist The following aspects have been respected by the author of this pull request, confirmed by both pull request assignee **and** reviewer: * Changelog update (necessity checked and entry added or not added respectively) * [x] Pull Request Assignee * [ ] Reviewer * README update (necessity checked and entry added or not added respectively) * [x] Pull Request Assignee * [ ] Reviewer --------- Co-authored-by: Ilja Antipov Co-authored-by: Lukas Deichmann <8513777+ldeichmann@users.noreply.github.com> --- CHANGELOG.md | 2 +- src/t2iapi/metric/metric_requests.proto | 11 +++++------ src/t2iapi/metric/service.proto | 7 +++++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 76c814b..36adcbd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,7 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - TriggerAnyDescriptorUpdate manipulation ### Changed - +- semantics for the SetMetricValuesInRange manipulation - semantics for the SetAlertConditionPresence manipulation - semantics for SetOperatingMode manipulation - manipulation SetInvalidValue to SetIncorrectValue, changed semantics diff --git a/src/t2iapi/metric/metric_requests.proto b/src/t2iapi/metric/metric_requests.proto index e953881..a67bf97 100644 --- a/src/t2iapi/metric/metric_requests.proto +++ b/src/t2iapi/metric/metric_requests.proto @@ -33,14 +33,13 @@ message SetMetricValuesWithQualityModeRequest { } /* -Request to set metric values within a given range. +Request to set new pm:MetricValue/@Value resp. @Samples within the given range for the metric with the +given handle. */ message SetMetricValuesInRangeRequest { - string handle = 1; // handle of the metric state for which values shall be set - // Lower and upper limit values which should not be violated by metric values. - // If both limit values are not defined (empty string) a valid metric value shall be set. - string lower = 2; - string upper = 3; + string handle = 1; // handle of the metric for which new pm:MetricValue/@Value or @Samples shall be set + string lower = 2; // lower limit for setting the new pm:MetricValue/@Value or @Samples + string upper = 3; // upper limit for setting the new pm:MetricValue/@Value or @Samples } /* diff --git a/src/t2iapi/metric/service.proto b/src/t2iapi/metric/service.proto index c3db411..2bd4eb8 100644 --- a/src/t2iapi/metric/service.proto +++ b/src/t2iapi/metric/service.proto @@ -68,8 +68,11 @@ service MetricService { returns (BasicResponse); /* - Set metric values within a given range. If no limit value is defined, random but valid metric values shall be set. - If a limit is defined, it shall not be violated by metric values. + Set new metric value(s) (resulting in new pm:MetricValue/@Value resp. pm:MetricValue/@Samples) within a given range. + The range is defined by lower and upper limit values which shall not be violated. + If no limit values are requested (empty strings), a random but valid metric @Value or @Samples shall be set. + If a limit is requested, it shall not be violated by the new metric @Value or @Samples. + Even if a metric @Value or @Samples is already present, a new metric @Value or @Samples shall be provided. */ rpc SetMetricValuesInRange (t2iapi.metric.SetMetricValuesInRangeRequest) returns (BasicResponse); From 4f05b9490724712d096978c6a914ac3e710903cd Mon Sep 17 00:00:00 2001 From: jannast <104557199+jannast@users.noreply.github.com> Date: Fri, 28 Jul 2023 08:45:18 +0200 Subject: [PATCH 02/10] new manipulation for express no metric value (#52) Remove manipulation SetNoValue and add a new manipulation TransitionProvideValueToExpressNoValueAvailable for metrics. # Checklist The following aspects have been respected by the author of this pull request, confirmed by both pull request assignee **and** reviewer: * Changelog update (necessity checked and entry added or not added respectively) * [x] Pull Request Assignee * [x] Reviewer * README update (necessity checked and entry added or not added respectively) * [x] Pull Request Assignee * [x] Reviewer --- CHANGELOG.md | 2 ++ src/t2iapi/metric/service.proto | 15 ++++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 36adcbd..cfc4b67 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added +- manipulation TransitionProvideValueToExpressNoValueAvailable for metrics - manipulation ProvideMetricValueOrSamples for metrics - manipulation SetSomeAlertSignalPresence for alerts - manipulation CreateContextStateWithAssociationAndSetOperatingMode for contexts and operations @@ -37,6 +38,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Removed +- manipulation SetNoValue - manipulation SetAlertSignalPresence - manipulation ChangeMdibSequenceId - manipulation SetUserConfirmableValue diff --git a/src/t2iapi/metric/service.proto b/src/t2iapi/metric/service.proto index 2bd4eb8..5c35299 100644 --- a/src/t2iapi/metric/service.proto +++ b/src/t2iapi/metric/service.proto @@ -28,13 +28,6 @@ service MetricService { rpc SetMetricQualityValidity (t2iapi.metric.SetMetricQualityValidityRequest) returns (BasicResponse); - /* - Set no metric values for the provided metric handle. - The manipulated state can be set temporarily or persistent until a next manipulation call. - */ - rpc SetNoValue (BasicHandleRequest) - returns (BasicResponse); - /* For the metric with the provided handle do the following: - set the @ActivationState to the provided value @@ -112,4 +105,12 @@ service MetricService { */ rpc ProvideMetricValueOrSamples (BasicHandleRequest) returns (BasicResponse); + + /* + For the metric with the provided handle perform the following transition: + - provide pm:MetricValue/@Value resp. @Samples and then + - express for the metric that no value is available. + */ + rpc TransitionProvideValueToExpressNoValueAvailable (BasicHandleRequest) + returns (BasicResponse); } From 5db3d59139ef881be25700a3e7e7527dbece6782 Mon Sep 17 00:00:00 2001 From: jannast <104557199+jannast@users.noreply.github.com> Date: Thu, 3 Aug 2023 10:58:49 +0200 Subject: [PATCH 03/10] remove and add new context transition manipulations (#53) remove manipulation CreateContextStateWithAssociationAndUniqueIdentification, RemoveIdentificationOfContextState, ChangeIdentificationOfContextState and new manipulation TransitionFromCreateStateWithIdentificationToRemoveIdentification, TransitionFromCreateStateWithIdentificationToChangeIdentification # Checklist The following aspects have been respected by the author of this pull request, confirmed by both pull request assignee **and** reviewer: * Changelog update (necessity checked and entry added or not added respectively) * [x] Pull Request Assignee * [ ] Reviewer * README update (necessity checked and entry added or not added respectively) * [x] Pull Request Assignee * [ ] Reviewer --- CHANGELOG.md | 4 +++ src/t2iapi/context/context_responses.proto | 12 -------- src/t2iapi/context/service.proto | 34 ++++++++-------------- 3 files changed, 16 insertions(+), 34 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cfc4b67..a9d5e1c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added +- manipulation TransitionFromCreateStateWithIdentificationToRemoveIdentification for contexts +- manipulation TransitionFromCreateStateWithIdentificationToChangeIdentification for contexts - manipulation TransitionProvideValueToExpressNoValueAvailable for metrics - manipulation ProvideMetricValueOrSamples for metrics - manipulation SetSomeAlertSignalPresence for alerts @@ -38,6 +40,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Removed +- manipulation CreateContextStateWithAssociationAndUniqueIdentification, RemoveIdentificationOfContextState, + ChangeIdentificationOfContextState - manipulation SetNoValue - manipulation SetAlertSignalPresence - manipulation ChangeMdibSequenceId diff --git a/src/t2iapi/context/context_responses.proto b/src/t2iapi/context/context_responses.proto index fb5ebcd..b75955f 100644 --- a/src/t2iapi/context/context_responses.proto +++ b/src/t2iapi/context/context_responses.proto @@ -24,18 +24,6 @@ message CreateContextStateWithAssociationResponse { string context_state_handle = 2; // handle of the context state, that was created or adapted } -/* -Response containing the handle of the newly created context state and its unique identification. -In case of a PatientContextState having multiple pm:InstanceIdentifier, the @Extension and @Root shall be returned -for the pm:InstanceIdentifier with pm:Type/@Code = MDC_ATTR_PT_ID. - */ -message CreateContextStateWithAssociationAndUniqueIdentificationResponse { - BasicResponse status = 1; - string context_state_handle = 2; // handle of the context state, that was created - string extension = 3; // value of the identifier (from pm:InstanceIdentifier/@Extension) - string root = 4; // value of the identifier (from pm:InstanceIdentifier/@Root) -} - /* Response which contains all context types supported by the DUT. */ diff --git a/src/t2iapi/context/service.proto b/src/t2iapi/context/service.proto index 389a717..c2c9536 100644 --- a/src/t2iapi/context/service.proto +++ b/src/t2iapi/context/service.proto @@ -69,16 +69,6 @@ service ContextService { t2iapi.context.CreateContextStateWithAssociationAndValidatorsRequest) returns (t2iapi.context.CreateContextStateWithAssociationResponse); - /* - Create a new ContextState instance with the given ContextAssociation value for the given descriptor handle - and provide the unique identification. - The manipulated state shall be persistent until a next manipulation call. If the device is not able to maintain - the static state, it shall return RESULT_NOT_SUPPORTED. - */ - rpc CreateContextStateWithAssociationAndUniqueIdentification( - t2iapi.context.CreateContextStateWithAssociationRequest) - returns (t2iapi.context.CreateContextStateWithAssociationAndUniqueIdentificationResponse); - /* Create a new ContextState instance with the given ContextAssociation value for the given descriptor handle and provide at least one Identification and Validator for this ContextState. @@ -90,22 +80,22 @@ service ContextService { returns (BasicResponse); /* - Remove at least one pm:Identification element for the pm:AbstractContextState/@Handle. - The manipulated state shall be persistent until a next manipulation call. If the device is not able to maintain - the static state, it shall return RESULT_NOT_SUPPORTED. + For the Context with the provided descriptor handle perform the following transition: + - create a new associated pm:AbstractContextState instance with at least one unique pm:Identification element + for the Context with the given descriptor handle + - remove at least one pm:Identification element for the previously created pm:AbstractContextState. */ - rpc RemoveIdentificationOfContextState( - t2iapi.context.ContextStateHandleRequest) - returns (BasicResponse); + rpc TransitionFromCreateStateWithIdentificationToRemoveIdentification (BasicHandleRequest) + returns (CreateContextStateWithAssociationResponse); /* - Change at least one pm:Identification element for the pm:AbstractContextState/@Handle. - The manipulated state shall be persistent until a next manipulation call. If the device is not able to maintain - the static state, it shall return RESULT_NOT_SUPPORTED. + For the Context with the provided descriptor handle perform the following transition: + - create a new associated pm:AbstractContextState instance with at least one unique pm:Identification element + for the Context with the given descriptor handle + - change at least one already present pm:Identification element for the previously created pm:AbstractContextState. */ - rpc ChangeIdentificationOfContextState( - t2iapi.context.ContextStateHandleRequest) - returns (BasicResponse); + rpc TransitionFromCreateStateWithIdentificationToChangeIdentification (BasicHandleRequest) + returns (CreateContextStateWithAssociationResponse); /* Create a new ContextState instance with the given ContextAssociation value for the given descriptor handle, From 2c71bea910e7cc59d9cb3dea5a441a6b6a2cf573 Mon Sep 17 00:00:00 2001 From: a-kleinf <87371692+a-kleinf@users.noreply.github.com> Date: Tue, 8 Aug 2023 12:40:15 +0200 Subject: [PATCH 04/10] Adapt ensemble context indicate membership with identification (#54) Adapt description and return value of the manipulation to indicate membership in an SDC PARTICIPANT ENSEMBLE. # Checklist The following aspects have been respected by the author of this pull request, confirmed by both pull request assignee **and** reviewer: * Changelog update (necessity checked and entry added or not added respectively) * [x] Pull Request Assignee * [x] Reviewer * README update (necessity checked and entry added or not added respectively) * [x] Pull Request Assignee * [x] Reviewer --------- Co-authored-by: Albrecht Kleinfeld --- CHANGELOG.md | 8 ++++---- src/t2iapi/context/context_responses.proto | 6 +++--- src/t2iapi/context/service.proto | 10 +++++++--- src/t2iapi/response_types.proto | 8 +++++++- 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a9d5e1c..98eab46 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,16 +24,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - TriggerAnyDescriptorUpdate manipulation ### Changed +- semantics for the EnsembleContextIndicateMembershipWithIdentification manipulation - semantics for the SetMetricValuesInRange manipulation - semantics for the SetAlertConditionPresence manipulation - semantics for SetOperatingMode manipulation - manipulation SetInvalidValue to SetIncorrectValue, changed semantics - semantics for SetAlertActivation, SetComponentActivation, SetAlarmSignalInactivationState, SetAlertSystemNotFunctional, SetLocationDetail, RemoveAllContextStateValidators, SetContextStateAssociation, - CreateContextStateWithAssociation, CreateContextStateWithAssociationAndUniqueIdentification, - CreateContextStateWithAssocIdentificationAndValidator, RemoveIdentificationOfContextState, - ChangeIdentificationOfContextState, CreateContextStateWithAssocAndSpecificValidator, - SetClockDevice, SetLanguage, SetNoValue, SetMetricValuesWithQualityMode + CreateContextStateWithAssociation, CreateContextStateWithAssocIdentificationAndValidator, + CreateContextStateWithAssocAndSpecificValidator, SetClockDevice, SetLanguage, SetNoValue, + SetMetricValuesWithQualityMode - semantics for CreateContextStateWithAssociationAndValidators manipulation - semantics for SetDeviceOperatingMode manipulation - message PartialIdentification to message PartialInstanceIdentifier diff --git a/src/t2iapi/context/context_responses.proto b/src/t2iapi/context/context_responses.proto index b75955f..a394b58 100644 --- a/src/t2iapi/context/context_responses.proto +++ b/src/t2iapi/context/context_responses.proto @@ -33,10 +33,10 @@ message GetSupportedContextTypesResponse { } /* -Response which contains Identification including a list of InstanceIdentifier elements -which identify an ensemble and thus enables the caller to distinguish ensembles from each other. +Response which contains a list of lists with pm:Identification elements. Each list of pm:Identification elements +identifies a pm:EnsembleContextState and thus enables the differentiation of ensembles from each other. */ message EnsembleContextIndicateMembershipWithIdentificationResponse { BasicResponse status = 1; - repeated PartialInstanceIdentifier identification = 2; + repeated IdentificationList identification_list = 3; } diff --git a/src/t2iapi/context/service.proto b/src/t2iapi/context/service.proto index c2c9536..d2f58a0 100644 --- a/src/t2iapi/context/service.proto +++ b/src/t2iapi/context/service.proto @@ -129,9 +129,13 @@ service ContextService { returns (BasicResponse); /* - Indicate membership in an SDC PARTICIPANT ENSEMBLE using an ensemble context that has the provided descriptor handle - and return a list of pm:Identification elements which identify an ensemble and thus enable the caller to distinguish - ensembles from each other. + Indicate membership in an SDC PARTICIPANT ENSEMBLE using ensemble context state(s) that have the provided descriptor + handle and return a list of pm:Identification elements which identify the ensemble context state(s). + If already one or more pm:EnsembleContextState(s) indicate the membership, it is not needed to create a new + pm:EnsembleContextState(s). In this case it is sufficient to only return the BasicResponse and the pm:Identification + elements. + The state shall be persistent until a next manipulation call. If the device is not able to maintain the static state, + it shall return RESULT_NOT_SUPPORTED. */ rpc EnsembleContextIndicateMembershipWithIdentification (BasicHandleRequest) returns (EnsembleContextIndicateMembershipWithIdentificationResponse); diff --git a/src/t2iapi/response_types.proto b/src/t2iapi/response_types.proto index f66923d..9abaaec 100644 --- a/src/t2iapi/response_types.proto +++ b/src/t2iapi/response_types.proto @@ -22,9 +22,15 @@ enum Result { RESULT_NOT_IMPLEMENTED = 3; } +/* +Represents pm:Identification (defined in IEEE Std 11073-10207-2017). +*/ +message IdentificationList { + repeated PartialInstanceIdentifier identification = 1; // list of identifiers for contexts +} /* -Represents InstanceIdentifier (defined in IEEE Std 11073-10207-2017). +Represents pm:InstanceIdentifier (defined in IEEE Std 11073-10207-2017). Following combinations of InstanceIdentifier/@Root and InstanceIdentifier/@Extension are allowed: +------------------------------------------------------------------------+ From 095d01d98847583ac5845125b1434f7f4c48d90b Mon Sep 17 00:00:00 2001 From: jannast <104557199+jannast@users.noreply.github.com> Date: Wed, 16 Aug 2023 08:07:18 +0200 Subject: [PATCH 05/10] changed description wording (#55) // changed the wording of the first step for the transition of the manipulations TransitionFromCreateStateWithIdentificationToRemoveIdentification and TransitionFromCreateStateWithIdentificationToChangeIdentification # Checklist The following aspects have been respected by the author of this pull request, confirmed by both pull request assignee **and** reviewer: * Changelog update (necessity checked and entry added or not added respectively) * [x] Pull Request Assignee * [x] Reviewer * README update (necessity checked and entry added or not added respectively) * [x] Pull Request Assignee * [x] Reviewer --- src/t2iapi/context/service.proto | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/t2iapi/context/service.proto b/src/t2iapi/context/service.proto index d2f58a0..62ea204 100644 --- a/src/t2iapi/context/service.proto +++ b/src/t2iapi/context/service.proto @@ -81,18 +81,18 @@ service ContextService { /* For the Context with the provided descriptor handle perform the following transition: - - create a new associated pm:AbstractContextState instance with at least one unique pm:Identification element + - associate a pm:AbstractContextState instance with at least one unique pm:Identification element for the Context with the given descriptor handle - - remove at least one pm:Identification element for the previously created pm:AbstractContextState. + - remove at least one pm:Identification element for the previously associated pm:AbstractContextState. */ rpc TransitionFromCreateStateWithIdentificationToRemoveIdentification (BasicHandleRequest) returns (CreateContextStateWithAssociationResponse); /* For the Context with the provided descriptor handle perform the following transition: - - create a new associated pm:AbstractContextState instance with at least one unique pm:Identification element + - associate a pm:AbstractContextState instance with at least one unique pm:Identification element for the Context with the given descriptor handle - - change at least one already present pm:Identification element for the previously created pm:AbstractContextState. + - change at least one already present pm:Identification element for the previously associated pm:AbstractContextState. */ rpc TransitionFromCreateStateWithIdentificationToChangeIdentification (BasicHandleRequest) returns (CreateContextStateWithAssociationResponse); From 87ef9e4dc6c826848ef5375adb30b20d4ac15dba Mon Sep 17 00:00:00 2001 From: jannast <104557199+jannast@users.noreply.github.com> Date: Thu, 17 Aug 2023 14:13:24 +0200 Subject: [PATCH 06/10] update CalibrateMetric description (#56) // update CalibrateMetric description # Checklist The following aspects have been respected by the author of this pull request, confirmed by both pull request assignee **and** reviewer: * Changelog update (necessity checked and entry added or not added respectively) * [x] Pull Request Assignee * [x] Reviewer * README update (necessity checked and entry added or not added respectively) * [x] Pull Request Assignee * [x] Reviewer --- CHANGELOG.md | 2 ++ src/t2iapi/metric/metric_responses.proto | 11 +++++++---- src/t2iapi/metric/service.proto | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 98eab46..0efba4f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - TriggerAnyDescriptorUpdate manipulation ### Changed + +- semantics for the CalibrateMetric manipulation - semantics for the EnsembleContextIndicateMembershipWithIdentification manipulation - semantics for the SetMetricValuesInRange manipulation - semantics for the SetAlertConditionPresence manipulation diff --git a/src/t2iapi/metric/metric_responses.proto b/src/t2iapi/metric/metric_responses.proto index 75b6279..ba6b32e 100644 --- a/src/t2iapi/metric/metric_responses.proto +++ b/src/t2iapi/metric/metric_responses.proto @@ -15,13 +15,16 @@ option java_package = "com.draeger.medical.t2iapi.metric"; option java_outer_classname = "MetricResponses"; /* -This message is used as a response for the CalibrateMetric manipulation. It returns a list of NumericMetricValue/@Value -or SampleArrayValue/@Samples as strings measured during the calibration. An empty list is returned if no values -can be provided. +This message is used as a response for the CalibrateMetric manipulation. +It returns a list of pm:MetricValue/@Value or pm:MetricValue/@Samples as strings measured during the calibration. +For further comparison of the value(s) it is required that each returned string value has the same representation +of the whole and fractional part that would be transmitted via SDC, i.e. if the value is represented as '0.01' +via SDC, do not provide it as '00.010'. +An empty list is returned if no values can be provided. */ message CalibrateMetricResponse { BasicResponse response = 1; - repeated string values = 2; + repeated string values = 2; // pm:MetricValue/@Value or pm:MetricValue/@Samples } // Response indicating whether a metric is computer-controlled diff --git a/src/t2iapi/metric/service.proto b/src/t2iapi/metric/service.proto index 5c35299..ed9510b 100644 --- a/src/t2iapi/metric/service.proto +++ b/src/t2iapi/metric/service.proto @@ -47,7 +47,7 @@ service MetricService { returns (BasicResponse); /* - Calibrate the metric for the provided handle and return the calibration values. + Start a new calibration for the metric with the provided handle and return the calibration values. */ rpc CalibrateMetric (BasicHandleRequest) returns (t2iapi.metric.CalibrateMetricResponse); From 3dd5541c6089dba7cbb7958caa9b006209cc6546 Mon Sep 17 00:00:00 2001 From: jannast <104557199+jannast@users.noreply.github.com> Date: Fri, 18 Aug 2023 13:44:20 +0200 Subject: [PATCH 07/10] remove unused type AlertConditionPresence (#57) remove unused type AlertConditionPresence # Checklist The following aspects have been respected by the author of this pull request, confirmed by both pull request assignee **and** reviewer: * Changelog update (necessity checked and entry added or not added respectively) * [x] Pull Request Assignee * [x] Reviewer * README update (necessity checked and entry added or not added respectively) * [x] Pull Request Assignee * [x] Reviewer --- src/t2iapi/alert/types.proto | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/t2iapi/alert/types.proto b/src/t2iapi/alert/types.proto index d3c2f88..d7dc45c 100644 --- a/src/t2iapi/alert/types.proto +++ b/src/t2iapi/alert/types.proto @@ -39,13 +39,4 @@ Defines the state of AlarmSignalInactivation, Enabled or Disabled. enum AlarmSignalInactivationState { ALARM_SIGNAL_INACTIVATION_STATE_ENABLED = 0; ALARM_SIGNAL_INACTIVATION_STATE_DISABLED = 1; -} - -/* -The Presence is set to "true" if the AlertCondition has been detected and is still present. Otherwise it -is set to "false". - */ -enum AlertConditionPresence { - ALERT_CONDITION_PRESENCE_TRUE = 0; - ALERT_CONDITION_PRESENCE_FALSE = 1; } \ No newline at end of file From 2753aef8f809ccd2687f0a6b4f8a2806b0cf0beb Mon Sep 17 00:00:00 2001 From: jannast <104557199+jannast@users.noreply.github.com> Date: Tue, 22 Aug 2023 09:22:20 +0200 Subject: [PATCH 08/10] change message SetAlarmSignalInactivationStateRequest (#58) change message SetAlarmSignalInactivationStateRequest # Checklist The following aspects have been respected by the author of this pull request, confirmed by both pull request assignee **and** reviewer: * Changelog update (necessity checked and entry added or not added respectively) * [x] Pull Request Assignee * [x] Reviewer * README update (necessity checked and entry added or not added respectively) * [x] Pull Request Assignee * [x] Reviewer --- CHANGELOG.md | 1 + src/t2iapi/alert/alert_requests.proto | 2 +- src/t2iapi/alert/types.proto | 8 -------- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0efba4f..0690e41 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - semantics for the CalibrateMetric manipulation +- message SetAlarmSignalInactivationStateRequest - semantics for the EnsembleContextIndicateMembershipWithIdentification manipulation - semantics for the SetMetricValuesInRange manipulation - semantics for the SetAlertConditionPresence manipulation diff --git a/src/t2iapi/alert/alert_requests.proto b/src/t2iapi/alert/alert_requests.proto index 64a6ab6..34917e1 100644 --- a/src/t2iapi/alert/alert_requests.proto +++ b/src/t2iapi/alert/alert_requests.proto @@ -33,7 +33,7 @@ to do so, because it is not directly modelled in the MDIB. */ message SetAlarmSignalInactivationStateRequest{ string handle = 1; // handle reference of the alert condition - AlarmSignalInactivationState enable = 2; + bool enable = 2; // if enable is True, the AlertConditionState/@Presence is requested to be True, otherwise False } /* diff --git a/src/t2iapi/alert/types.proto b/src/t2iapi/alert/types.proto index d7dc45c..16a8ac6 100644 --- a/src/t2iapi/alert/types.proto +++ b/src/t2iapi/alert/types.proto @@ -32,11 +32,3 @@ enum AlertConditionEscalationProcess { ALERT_CONDITION_ESCALATION_PROCESS_START_DEESCALATION = 2; ALERT_CONDITION_ESCALATION_PROCESS_STOP_DEESCALATION = 3; } - -/* -Defines the state of AlarmSignalInactivation, Enabled or Disabled. - */ -enum AlarmSignalInactivationState { - ALARM_SIGNAL_INACTIVATION_STATE_ENABLED = 0; - ALARM_SIGNAL_INACTIVATION_STATE_DISABLED = 1; -} \ No newline at end of file From 80f739bbc254400f580bebb43af017d00933eecd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malte=20Grebe-L=C3=BCth?= <104556762+belagertem@users.noreply.github.com> Date: Tue, 22 Aug 2023 10:01:52 +0200 Subject: [PATCH 09/10] changed SetMetricStatus description (#59) Changed the description of the SetMetricStatus manipulation, since the result needs to be persistent. # Checklist The following aspects have been respected by the author of this pull request, confirmed by both pull request assignee **and** reviewer: * Changelog update (necessity checked and entry added or not added respectively) * [x] Pull Request Assignee * [ ] Reviewer * README update (necessity checked and entry added or not added respectively) * [x] Pull Request Assignee * [ ] Reviewer --- CHANGELOG.md | 1 + src/t2iapi/metric/service.proto | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0690e41..d16c3cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +- semantics for SetMetricStatus manipulation - semantics for the CalibrateMetric manipulation - message SetAlarmSignalInactivationStateRequest - semantics for the EnsembleContextIndicateMembershipWithIdentification manipulation diff --git a/src/t2iapi/metric/service.proto b/src/t2iapi/metric/service.proto index ed9510b..280eb7b 100644 --- a/src/t2iapi/metric/service.proto +++ b/src/t2iapi/metric/service.proto @@ -84,6 +84,8 @@ service MetricService { /* Set the provided measurement, calculation or setting status for the metric of the provided handle. This is not the AbstractMetricState/@ActivationState, but the internal state of the device. + The resulting AbstractMetricState/@ActivationState shall be persistent until the next manipulation call. + If the device is not able to maintain the static state, it shall return RESULT_NOT_SUPPORTED. */ rpc SetMetricStatus (t2iapi.metric.SetMetricStatusRequest) returns (BasicResponse); From 245ec721a3dc937191dcfb340b51fa129cbda76f Mon Sep 17 00:00:00 2001 From: Ilja Antipov <33315542+antipovi@users.noreply.github.com> Date: Fri, 25 Aug 2023 09:57:07 +0200 Subject: [PATCH 10/10] Adapt create context state with association and validators (#60) adapt semantics for the manipulation CreateContextStateWithAssociationAndValidators. The manipulation does not expect the static state anymore # Checklist The following aspects have been respected by the author of this pull request, confirmed by both pull request assignee **and** reviewer: * Changelog update (necessity checked and entry added or not added respectively) * [x] Pull Request Assignee * [x] Reviewer * README update (necessity checked and entry added or not added respectively) * [x] Pull Request Assignee * [x] Reviewer --------- Co-authored-by: Ilja Antipov --- CHANGELOG.md | 2 +- src/t2iapi/context/service.proto | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d16c3cc..bdc8077 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +- semantics for CreateContextStateWithAssociationAndValidators manipulation - semantics for SetMetricStatus manipulation - semantics for the CalibrateMetric manipulation - message SetAlarmSignalInactivationStateRequest @@ -38,7 +39,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 CreateContextStateWithAssociation, CreateContextStateWithAssocIdentificationAndValidator, CreateContextStateWithAssocAndSpecificValidator, SetClockDevice, SetLanguage, SetNoValue, SetMetricValuesWithQualityMode -- semantics for CreateContextStateWithAssociationAndValidators manipulation - semantics for SetDeviceOperatingMode manipulation - message PartialIdentification to message PartialInstanceIdentifier diff --git a/src/t2iapi/context/service.proto b/src/t2iapi/context/service.proto index 62ea204..40e9e8c 100644 --- a/src/t2iapi/context/service.proto +++ b/src/t2iapi/context/service.proto @@ -62,8 +62,6 @@ service ContextService { Create a new pm:AbstractContextState instance with the given @ContextAssociation value for the given descriptor handle and provide at least the number of pm:Validator elements for this ContextState. If the number of pm:Validator elements is zero, zero pm:Validator elements shall be provided. - The manipulated state shall be persistent until a next manipulation call. If the device is not able to maintain - the static state, it shall return RESULT_NOT_SUPPORTED. */ rpc CreateContextStateWithAssociationAndValidators( t2iapi.context.CreateContextStateWithAssociationAndValidatorsRequest)