diff --git a/LibOneM2M/OneM2M_Pixits.ttcn b/LibOneM2M/OneM2M_Pixits.ttcn index 4c23f67ecbb7dfcc99547baff845620d3cd18f86..951705a53cba5509ca67a6d25d3046d3b594bd4d 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 a41a756d74a3924e1e2f1cdce05d6a49a3f6d0ce..e38c7f43c0130183f3ada473ed43476e2acb7919 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 := ?}) }