From 1f6143f09f40ff7d2c8dac576d93b842b8167b5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Engelmann?= Date: Wed, 18 Sep 2024 14:47:22 +0200 Subject: [PATCH 01/13] added 3 manipulations for REMOVABLE SUBSYSTEMS. --- src/t2iapi/device/device_responses.proto | 16 ++++++++++++++++ src/t2iapi/device/service.proto | 23 +++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/src/t2iapi/device/device_responses.proto b/src/t2iapi/device/device_responses.proto index 7791096..b0022f4 100644 --- a/src/t2iapi/device/device_responses.proto +++ b/src/t2iapi/device/device_responses.proto @@ -54,3 +54,19 @@ message GetComponentHwVersionResponse { BasicResponse status = 1; // status of the rpc string hardware_version = 2; // Hardware version of the requested device component } + +/* +Response containing a boolean answer. + */ +message TrueFalseResponse { + BasicResponse status = 1; // status of the rpc + bool answer = 2; // Boolean answer +} + +/* +Response containing the mdib version from which on the requested change will be effective. + */ +message MdibVersionResponse { + BasicResponse status = 1; // status of the rpc + string mdibVersion = 2; // Mdib Version from which on the change will be effective. +} diff --git a/src/t2iapi/device/service.proto b/src/t2iapi/device/service.proto index 6a14d69..b00ee40 100644 --- a/src/t2iapi/device/service.proto +++ b/src/t2iapi/device/service.proto @@ -170,4 +170,27 @@ service DeviceService { */ rpc IndicateTimeOfNextCalibrationToUser (BasicHandleRequest) returns (BasicResponse); + + /* + Determine whether or not the given descriptor represents a Removable Subsystem in the sense of + IEEE Std 11073-10700-2022: + */ + rpc DoesDescriptorRepresentARemovableSubsystem(BasicHandleRequest) + returns (TrueFalseResponse); + + /* + Physically disconnect the REMOVABLE SUBSYSTEM represented by the given descriptor. Ensure that it stays disconnected + at least until the next manipulation call. + Returns the mdib version starting from which the REMOVABLE SUBSYSTEM is disconnected. + */ + rpc DisconnectRemovableSubsystem(BasicHandleRequest) + returns (MdibVersionResponse); + + /* + Physically connect the Removable Subsystem represented by the given descriptor. Ensure that it stays connected + at least until the next manipulation call. + Returns the mdib version starting from which the REMOVABLE SUBSYSTEM is connected. + */ + rpc ConnectRemovableSubsystem(BasicHandleRequest) + returns (MdibVersionResponse); } From c89de63aeac33fcbfadc296cf9050fd19a72478f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Engelmann?= Date: Wed, 18 Sep 2024 15:16:37 +0200 Subject: [PATCH 02/13] fixed Linter warning. --- src/t2iapi/device/device_responses.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/t2iapi/device/device_responses.proto b/src/t2iapi/device/device_responses.proto index b0022f4..83d812f 100644 --- a/src/t2iapi/device/device_responses.proto +++ b/src/t2iapi/device/device_responses.proto @@ -68,5 +68,5 @@ Response containing the mdib version from which on the requested change will be */ message MdibVersionResponse { BasicResponse status = 1; // status of the rpc - string mdibVersion = 2; // Mdib Version from which on the change will be effective. + string mdib_version = 2; // Mdib Version from which on the change will be effective. } From 658e6db05d7c54d4f95e170a3c3e14fe4e05fc72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Engelmann?= Date: Mon, 23 Sep 2024 15:49:32 +0200 Subject: [PATCH 03/13] mdibVersion should be a BigInteger. Improved Documentation. --- src/t2iapi/device/device_responses.proto | 2 +- src/t2iapi/device/service.proto | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/t2iapi/device/device_responses.proto b/src/t2iapi/device/device_responses.proto index 8eb75e3..695e67e 100644 --- a/src/t2iapi/device/device_responses.proto +++ b/src/t2iapi/device/device_responses.proto @@ -77,5 +77,5 @@ Response containing the mdib version from which on the requested change will be */ message MdibVersionResponse { BasicResponse status = 1; // status of the rpc - string mdib_version = 2; // Mdib Version from which on the change will be effective. + int64 mdib_version = 2; // Mdib Version from which on the change will be effective. } diff --git a/src/t2iapi/device/service.proto b/src/t2iapi/device/service.proto index 542e806..07ca4bb 100644 --- a/src/t2iapi/device/service.proto +++ b/src/t2iapi/device/service.proto @@ -81,22 +81,22 @@ service DeviceService { returns (t2iapi.device.GetRemovableDescriptorsResponse); /* - Remove a descriptor from the device MDIB. + Remove a descriptor from the device MDIB using a DescriptionManipulationReport. */ rpc RemoveDescriptor(BasicHandleRequest) returns (BasicResponse); /* - Insert a descriptor into the device MDIB. + Insert a descriptor into the device MDIB using a DescriptionManipulationReport. */ rpc InsertDescriptor(BasicHandleRequest) returns (BasicResponse); /* - Insert an mds descriptor into the device MDIB. + Insert an mds descriptor into the device MDIB using a DescriptionManipulationReport. */ rpc InsertMdsDescriptor (google.protobuf.Empty) returns (t2iapi.device.InsertMdsDescriptorResponse); /* - Remove an mds descriptor from the device MDIB. + Remove an mds descriptor from the device MDIB using a DescriptionManipulationReport. */ rpc RemoveMdsDescriptor (BasicHandleRequest) returns (BasicResponse); @@ -184,8 +184,8 @@ service DeviceService { returns (BasicResponse); /* - Determine whether or not the given descriptor represents a Removable Subsystem in the sense of - IEEE Std 11073-10700-2022: + Determine whether the given descriptor represents a REMOVABLE SUBSYSTEM in the sense of + IEEE Std 11073-10700-2022. */ rpc DoesDescriptorRepresentARemovableSubsystem(BasicHandleRequest) returns (TrueFalseResponse); @@ -199,7 +199,7 @@ service DeviceService { returns (MdibVersionResponse); /* - Physically connect the Removable Subsystem represented by the given descriptor. Ensure that it stays connected + Physically connect the REMOVABLE SUBSYSTEM represented by the given descriptor. Ensure that it stays connected at least until the next manipulation call. Returns the mdib version starting from which the REMOVABLE SUBSYSTEM is connected. */ From 1e041fcc7d2ee00f59aa5c1ccdaf8dd32d3f8f07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Engelmann?= Date: Mon, 23 Sep 2024 15:53:34 +0200 Subject: [PATCH 04/13] Updated CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2187369..04e38a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added +- manipulation DoesDescriptorRepresentARemovableSubsystem for devices +- manipulation DisconnectRemovableSubsystem for devices +- manipulation ConnectRemovableSubsystem for devices - manipulation PhysicallyDisconnectRemovableSubsystemAfterSettingActivationStateOnOrStndBy - manipulation RequestIndicationOfNextCalibrationTimeRequired for devices - manipulation IndicateTimeOfNextCalibrationToUser for devices From 8bd6cf672727ac04a254ad2958b6dab5998cd27b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Engelmann?= Date: Mon, 30 Sep 2024 15:55:33 +0200 Subject: [PATCH 05/13] added the sequenceId to the Response. --- src/t2iapi/device/device_responses.proto | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/t2iapi/device/device_responses.proto b/src/t2iapi/device/device_responses.proto index 300333a..c65f926 100644 --- a/src/t2iapi/device/device_responses.proto +++ b/src/t2iapi/device/device_responses.proto @@ -87,5 +87,6 @@ Response containing the mdib version from which on the requested change will be */ message MdibVersionResponse { BasicResponse status = 1; // status of the rpc - int64 mdib_version = 2; // Mdib Version from which on the change will be effective. + string sequenceId = 2; // SequenceId of MdibVersion. + int64 mdib_version = 3; // Mdib Version from which on the change will be effective. } From 199688349671c7fd001e5a99fa29c3018be750aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Engelmann?= Date: Mon, 30 Sep 2024 16:36:02 +0200 Subject: [PATCH 06/13] fixed linter warning. --- src/t2iapi/device/device_responses.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/t2iapi/device/device_responses.proto b/src/t2iapi/device/device_responses.proto index c65f926..edcc801 100644 --- a/src/t2iapi/device/device_responses.proto +++ b/src/t2iapi/device/device_responses.proto @@ -87,6 +87,6 @@ Response containing the mdib version from which on the requested change will be */ message MdibVersionResponse { BasicResponse status = 1; // status of the rpc - string sequenceId = 2; // SequenceId of MdibVersion. + string sequence_id = 2; // SequenceId of MdibVersion. int64 mdib_version = 3; // Mdib Version from which on the change will be effective. } From 8c518ff566a81e605ac02b79ae4dbb624792cebf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn?= Date: Mon, 7 Oct 2024 11:53:08 +0200 Subject: [PATCH 07/13] Update src/t2iapi/device/device_responses.proto Co-authored-by: Ilja Antipov <157796749+antipovi-draeger@users.noreply.github.com> --- src/t2iapi/device/device_responses.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/t2iapi/device/device_responses.proto b/src/t2iapi/device/device_responses.proto index edcc801..493e105 100644 --- a/src/t2iapi/device/device_responses.proto +++ b/src/t2iapi/device/device_responses.proto @@ -83,7 +83,7 @@ message TrueFalseResponse { } /* -Response containing the mdib version from which on the requested change will be effective. +Response containing the @MdibVersion from which on the requested change will be effective. */ message MdibVersionResponse { BasicResponse status = 1; // status of the rpc From bbfeaf3d95d0800a2bdaf7bb5d28576a572ff682 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn?= Date: Mon, 7 Oct 2024 12:09:36 +0200 Subject: [PATCH 08/13] Update src/t2iapi/device/service.proto Co-authored-by: Ilja Antipov <157796749+antipovi-draeger@users.noreply.github.com> --- src/t2iapi/device/service.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/t2iapi/device/service.proto b/src/t2iapi/device/service.proto index 8fc8b04..fdf75a0 100644 --- a/src/t2iapi/device/service.proto +++ b/src/t2iapi/device/service.proto @@ -81,7 +81,7 @@ service DeviceService { returns (t2iapi.device.GetRemovableDescriptorsResponse); /* - Remove a descriptor from the device MDIB using a DescriptionManipulationReport. + Remove a descriptor from the device MDIB resulting in a DescriptionModificationReport. */ rpc RemoveDescriptor(BasicHandleRequest) returns (BasicResponse); From 6ec5da439ddd231495a8816d1b37be0f54e9785c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn?= Date: Mon, 7 Oct 2024 12:10:08 +0200 Subject: [PATCH 09/13] Update src/t2iapi/device/service.proto Co-authored-by: Ilja Antipov <157796749+antipovi-draeger@users.noreply.github.com> --- src/t2iapi/device/service.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/t2iapi/device/service.proto b/src/t2iapi/device/service.proto index fdf75a0..1bc2ca8 100644 --- a/src/t2iapi/device/service.proto +++ b/src/t2iapi/device/service.proto @@ -91,7 +91,7 @@ service DeviceService { rpc InsertDescriptor(BasicHandleRequest) returns (BasicResponse); /* - Insert an mds descriptor into the device MDIB using a DescriptionManipulationReport. + Insert an mds descriptor into the device MDIB resulting in a DescriptionModificationReport. */ rpc InsertMdsDescriptor (google.protobuf.Empty) returns (t2iapi.device.InsertMdsDescriptorResponse); From 50bc949502d7fc7a54937596875fca0982eb8f6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Engelmann?= Date: Mon, 7 Oct 2024 12:15:09 +0200 Subject: [PATCH 10/13] Changes proposed by Reviewers. --- src/t2iapi/device/device_responses.proto | 4 ++-- src/t2iapi/device/service.proto | 12 ++++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/t2iapi/device/device_responses.proto b/src/t2iapi/device/device_responses.proto index 493e105..c5b7031 100644 --- a/src/t2iapi/device/device_responses.proto +++ b/src/t2iapi/device/device_responses.proto @@ -87,6 +87,6 @@ Response containing the @MdibVersion from which on the requested change will be */ message MdibVersionResponse { BasicResponse status = 1; // status of the rpc - string sequence_id = 2; // SequenceId of MdibVersion. - int64 mdib_version = 3; // Mdib Version from which on the change will be effective. + string sequence_id = 2; // @SequenceId of Mdib. + int64 mdib_version = 3; // @MdibVersion from which on the change will be effective. } diff --git a/src/t2iapi/device/service.proto b/src/t2iapi/device/service.proto index 8fc8b04..9b64746 100644 --- a/src/t2iapi/device/service.proto +++ b/src/t2iapi/device/service.proto @@ -231,16 +231,20 @@ service DeviceService { returns (TrueFalseResponse); /* - Physically disconnect the REMOVABLE SUBSYSTEM represented by the given descriptor. Ensure that it stays disconnected - at least until the next manipulation call. + Physically disconnect the REMOVABLE SUBSYSTEM (as defined in IEEE Std 11073-10700-2022) + represented by the given descriptor. 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. Returns the mdib version starting from which the REMOVABLE SUBSYSTEM is disconnected. */ rpc DisconnectRemovableSubsystem(BasicHandleRequest) returns (MdibVersionResponse); /* - Physically connect the REMOVABLE SUBSYSTEM represented by the given descriptor. Ensure that it stays connected - at least until the next manipulation call. + Physically connect the REMOVABLE SUBSYSTEM (as defined in IEEE Std 11073-10700-2022) + represented by the given descriptor. 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. Returns the mdib version starting from which the REMOVABLE SUBSYSTEM is connected. */ rpc ConnectRemovableSubsystem(BasicHandleRequest) From 5c417144039cea75b5f0c5f9626da6eb70159137 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn?= Date: Mon, 7 Oct 2024 12:17:31 +0200 Subject: [PATCH 11/13] Update src/t2iapi/device/service.proto Co-authored-by: Ilja Antipov <157796749+antipovi-draeger@users.noreply.github.com> --- src/t2iapi/device/service.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/t2iapi/device/service.proto b/src/t2iapi/device/service.proto index b04268e..fdfc167 100644 --- a/src/t2iapi/device/service.proto +++ b/src/t2iapi/device/service.proto @@ -224,7 +224,7 @@ service DeviceService { returns (InsertContainmentTreeEntryForSequenceIdResponse); /* - Determine whether the given descriptor represents a REMOVABLE SUBSYSTEM in the sense of + Determine whether the given descriptor represents a REMOVABLE SUBSYSTEM as defined in IEEE Std 11073-10700-2022. */ rpc DoesDescriptorRepresentARemovableSubsystem(BasicHandleRequest) From 7888bdcb7ce2106adfbc55724def0fd8074f01f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn?= Date: Mon, 7 Oct 2024 12:17:58 +0200 Subject: [PATCH 12/13] Update src/t2iapi/device/service.proto Co-authored-by: Ilja Antipov <157796749+antipovi-draeger@users.noreply.github.com> --- src/t2iapi/device/service.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/t2iapi/device/service.proto b/src/t2iapi/device/service.proto index fdfc167..a635934 100644 --- a/src/t2iapi/device/service.proto +++ b/src/t2iapi/device/service.proto @@ -96,7 +96,7 @@ service DeviceService { rpc InsertMdsDescriptor (google.protobuf.Empty) returns (t2iapi.device.InsertMdsDescriptorResponse); /* - Remove an mds descriptor from the device MDIB using a DescriptionManipulationReport. + Remove an mds descriptor from the device MDIB resulting in a DescriptionModificationReport. */ rpc RemoveMdsDescriptor (BasicHandleRequest) returns (BasicResponse); From 111e7561255fcaeabb429f5c3e5aa60ece7519fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn?= Date: Mon, 7 Oct 2024 12:18:06 +0200 Subject: [PATCH 13/13] Update src/t2iapi/device/service.proto Co-authored-by: Ilja Antipov <157796749+antipovi-draeger@users.noreply.github.com> --- src/t2iapi/device/service.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/t2iapi/device/service.proto b/src/t2iapi/device/service.proto index a635934..1bbcf88 100644 --- a/src/t2iapi/device/service.proto +++ b/src/t2iapi/device/service.proto @@ -86,7 +86,7 @@ service DeviceService { rpc RemoveDescriptor(BasicHandleRequest) returns (BasicResponse); /* - Insert a descriptor into the device MDIB using a DescriptionManipulationReport. + Insert a descriptor into the device MDIB resulting in a DescriptionModificationReport. */ rpc InsertDescriptor(BasicHandleRequest) returns (BasicResponse);