rework manipulation and mode of operation

CHANGELOG.md

@@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- manipulation SetOperationModeStatusAndSetOperatingMode for combined settings
+- manipulation SetModeOfOperationAndSetOperatingMode for combined settings
 - manipulation ConveyMetricDemoValues for metrics
 - manipulation SetAlertConditionAndAlertSignalActivationState for alert activation states
 

src/t2iapi/combined/combined_requests.proto

@@ -60,12 +60,12 @@ message SetAlertActivationAndSetOperatingModeRequest {
 }
 
 /*
-Request to set the status of an operation mode of an enum metric with the given handle to the requested value and
-set the @OperatingMode of the operation with the given handle to the requested OperatingMode value.
+Request to set the non-exclusive mode of operation represented by an enum metric with the given handle to the
+requested value and set the @OperatingMode of the operation with the given handle to the requested OperatingMode value.
 */
-message SetOperationModeStatusAndSetOperatingModeRequest {
-    string metric_descriptor_handle = 1; // handle of the enum metric, which represents the operation mode
-    t2iapi.metric.OperationModeStatus operation_mode_status = 2;  // defines the operation mode status to be applied
+message SetModeOfOperationAndSetOperatingModeRequest {
+    string metric_descriptor_handle = 1; // handle of the enum metric, which represents the mode of operation
+    t2iapi.metric.ModeOfOperation mode_of_operation = 2;  // defines the mode of operation to be applied
     string operation_descriptor_handle = 3; // the operation descriptor handle for which the OperatingMode value
                                             // shall be set
     t2iapi.operation.OperatingMode operating_mode = 4; // OperatingMode value to be set for the operation

src/t2iapi/combined/service.proto

@@ -53,12 +53,13 @@ service CombinedService {
       returns (BasicResponse);
 
   /*
-  Request to set the status of an operation mode of an enum metric with the given handle to the requested value and
-  set the @OperatingMode of the operation with the given handle to the requested OperatingMode value.
+  Request to set the non-exclusive mode of operation represented by an enum metric with the given handle to the
+  requested value and set the @OperatingMode of the operation with the given handle to the requested OperatingMode
+  value.
   The manipulated states shall be persistent until a next manipulation call or an SDC operation invocation.
   If the device is not able to maintain the static states, it shall return RESULT_NOT_SUPPORTED.
   */
-  rpc SetOperationModeStatusAndSetOperatingMode (
-  t2iapi.combined.SetOperationModeStatusAndSetOperatingModeRequest)
+  rpc SetModeOfOperationAndSetOperatingMode (
+  t2iapi.combined.SetModeOfOperationAndSetOperatingModeRequest)
       returns (BasicResponse);
 }

src/t2iapi/metric/types.proto

@@ -45,6 +45,16 @@ enum OperationModeStatus {
     OPERATION_MODE_STATUS_PAUSED = 2;  // operation mode is not applied, but available
 }
 
+/*
+Defines the possible non-exclusive MODE OF OPERATION according to MPKP (11073-10701-2022).
+These are represented as an enum metric where the instances of pm:AllowedValue have given pm:Type.
+ */
+enum ModeOfOperation {
+    MDC_MODE_OF_OPERATION_ON = 0;  // mode of operation is applied
+    MDC_MODE_OF_OPERATION_OFF = 1;  // mode of operation is not applied, but available
+    MDC_MODE_OF_OPERATION_PAUSED = 2;  // mode of operation is not applied, but available
+}
+
 /*
 The MetricStatus is intended to reflect the state of the device and is not the ActivationState.
 This state in turn should trigger the setting of the ActivationState, it is linked to the