From 92e72dcdcfcff8f202e6c694a820a6aa20c2f03f Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Thu, 18 Nov 2021 12:11:14 +0100
Subject: [PATCH] Addition of scefId into scefSimuComponentDesc
Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
---
LibOneM2M/OneM2M_Pixits.ttcn | 7 +------
LibOneM2M/OneM2M_TypesAndValues.ttcn | 16 ++--------------
2 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/LibOneM2M/OneM2M_Pixits.ttcn b/LibOneM2M/OneM2M_Pixits.ttcn
index 4c23f67..951705a 100644
--- a/LibOneM2M/OneM2M_Pixits.ttcn
+++ b/LibOneM2M/OneM2M_Pixits.ttcn
@@ -395,10 +395,7 @@ module OneM2M_Pixits {
};
modulepar ScefSimuComponentDesc PX_T8_SCEF := {
- cseName := "t8_cseName",
- cseId := "t8_cseId",
- cseResourceId := "t8_cseResourceId",
- spId := "t8_spId",
+ scefId := "scs_as_id_01",
mcnPort := {
t8PortDesc := {
binding := {
@@ -476,7 +473,5 @@ module OneM2M_Pixits {
modulepar Labels PX_LABELS := {"VALUE_1"};
modulepar boolean PX_IS_LOC_CONTAINER := false;//default //set it to true when the container is created to store location information
- modulepar charstring PX_SCEF_ID := "scs_as_id_01";
-
} // end of module
diff --git a/LibOneM2M/OneM2M_TypesAndValues.ttcn b/LibOneM2M/OneM2M_TypesAndValues.ttcn
index a41a756..e38c7f4 100644
--- a/LibOneM2M/OneM2M_TypesAndValues.ttcn
+++ b/LibOneM2M/OneM2M_TypesAndValues.ttcn
@@ -4494,21 +4494,9 @@ group OtherTypes {
*/
type record ScefSimuComponentDesc {
/**
- * @desc Test System CSE Name
+ * @desc Test System SCEF ID
*/
- XSD.ID cseName,
- /**
- * @desc Test System CSE-ID with SP-relative-CSE-ID format (relative) according to TS-0001-7.2-1
- */
- XSD.ID cseId,
- /**
- * @desc Test System CSE resource ID with Unstructured-CSE-relative-Resource-ID (relative) format according to TS-0001-7.2-1
- */
- XSD.ID cseResourceId,
- /**
- * @desc Test System M2M-SP-ID with M2M-SP-ID format (absolute) according to TS-0001-7.2-1 Unstructured-CSE-relative -Resource-ID
- */
- XSD.ID spId,
+ XSD.ID scefId,
McnPortDesc mcnPort ({t8PortDesc := ?}),
McnPortDesc mcnPortIn ({t8PortDesc := ?})
}
--
GitLab