Skip to content
Snippets Groups Projects
Commit 398350e0 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Alignment of "optional" resource attributes types to the original resource attribute types 


Signed-off-by: Miguel Angel Reina Ortega's avatarreinaortega <miguelangel.reinaortega@etsi.org>
parent 44ea33ec
No related branches found
Tags TST-2016-0121-TS-0019_TTCN-3_Test_cases
1 merge request!25Ae fixes
Expand all Hide whitespace changes
Inline Side-by-side
LibOneM2M/OneM2M_Templates.ttcn
+ 18
− 9
View file @ 398350e0
......@@ -7,7 +7,7 @@
*
* @author oneM2M
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Templates.ttcn $
* $Id: OneM2M_Templates.ttcn 296 2017-06-02 13:16:50Z reinaortega $
* $Id: OneM2M_Templates.ttcn 297 2017-06-02 14:21:45Z reinaortega $
* @desc Module containing templates for oneM2M
*
*/
......@@ -585,7 +585,7 @@ module OneM2M_Templates {
template (value) RequestPrimitive m_createMgmtObjBase modifies m_create := {
requestIdentifier := testcasename() & "-m_createMgmtObj" & f_rnd(1, 1000000),
resourceType := int13,
primitiveContent := {mgmtObj_optional := m_contentCreateMgmtObj (-,-)}
primitiveContent := {mgmtResource_optional := m_contentCreateMgmtObj (-,-)}
};
/**
......@@ -594,7 +594,7 @@ module OneM2M_Templates {
template (value) RequestPrimitive m_createMgmtObj modifies m_create := {
requestIdentifier := testcasename() & "-m_createMgmtObj" & f_rnd(1, 1000000),
resourceType := int13,
primitiveContent := {mgmtObj_optional := m_contentCreateMgmtObj (-, -)}
primitiveContent := {mgmtResource_optional := m_contentCreateMgmtObj (-, -)}
};
/**
......@@ -602,7 +602,7 @@ module OneM2M_Templates {
*/
template RequestPrimitive mw_createMgmtObjAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
resourceType := int10013,
primitiveContent := {mgmtObjAnnc_optional := ?}
primitiveContent := {announcedMgmtResource_optional := ?}
};
/**
......@@ -610,7 +610,7 @@ module OneM2M_Templates {
*/
template RequestPrimitive mw_createMgmtObjAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
resourceType := int10013,
primitiveContent := {mgmtObjAnnc_optional := mw_contentCreateMgmtObjAnncBase}
primitiveContent := {announcedMgmtResource_optional := mw_contentCreateMgmtObjAnncBase}
};
/**
......@@ -1073,6 +1073,7 @@ module OneM2M_Templates {
memberTypeValidated := omit,//NP
consistencyStrategy := p_consistencyStrategy,//O
groupName := omit,//O
semanticSupportIndicator := omit,//O
choice := omit//NP
};
......@@ -1099,6 +1100,7 @@ module OneM2M_Templates {
memberTypeValidated := *, //OA
consistencyStrategy := *, //OA
groupName := *, //OA
semanticSupportIndicator := *,//OA
choice := omit //NA
};
......@@ -1107,7 +1109,7 @@ module OneM2M_Templates {
* @param p_name Resource name
* @param p_accessControlPolicyIds ACP IDs for the AE
*/
template (value) MgmtObj_optional m_contentCreateMgmtObj (in template (omit) AcpType p_accessControlPolicyIds := omit, in template (omit) XSD.String p_name := c_defaultMgmtObjResourceName) := {
template (value) MgmtResource_optional m_contentCreateMgmtObj (in template (omit) AcpType p_accessControlPolicyIds := omit, in template (omit) XSD.String p_name := c_defaultMgmtObjResourceName) := {
resourceName := p_name,//O
resourceType := omit,//NP
......@@ -1130,7 +1132,7 @@ module OneM2M_Templates {
/**
* @desc Base reception template of primitiveContent for CREATE operation for MgmtObjAnnc resource
*/
template MgmtObjAnnc_optional mw_contentCreateMgmtObjAnncBase := {
template AnnouncedMgmtResource_optional mw_contentCreateMgmtObjAnncBase := {
resourceName := omit,//NA M
resourceType := omit,//NA M
resourceID := omit,//NA M
......@@ -1169,6 +1171,7 @@ module OneM2M_Templates {
announcedAttribute := omit,//O
nodeID := p_nodeId,//M
hostedCSELink := omit,//O
mgmtClientAddress := omit,//O
choice := omit//O
};
......@@ -1240,6 +1243,7 @@ module OneM2M_Templates {
applicableCredIDs := p_applicableCredIDs,//O
allowedApp_IDs := p_allowedAppIDs,//O
allowedAEs := p_allowedAEs,//O
allowedRole_IDs := omit,//O
choice := omit //O
}
......@@ -1439,7 +1443,7 @@ module OneM2M_Templates {
announceTo := omit, //O
announcedAttribute := omit, //O
locationSource := p_locationSource, //M
locationUpdatePeriod := p_locationUpdatePeriod, //O
locationUpdatePeriod := {p_locationUpdatePeriod}, //O
locationTargetID := p_locationTargetID, //O
locationServer := p_locationServerAddress,//O
locationContainerID := omit, //NP
......@@ -1607,6 +1611,7 @@ module OneM2M_Templates {
memberTypeValidated := omit,//NP
consistencyStrategy := omit,//NP
groupName := omit,//O
semanticSupportIndicator := omit,//O
choice := omit//NP
};
......@@ -1742,7 +1747,7 @@ module OneM2M_Templates {
announceTo := omit,//O
announcedAttribute := omit,//O
locationSource := omit,//NP
locationUpdatePeriod := p_locationUpdatePeriod, //O
locationUpdatePeriod := {p_locationUpdatePeriod}, //O
locationTargetID := omit, //NP
locationServer := omit, //NP
locationContainerID := omit, //NP
......@@ -1944,6 +1949,7 @@ module OneM2M_Templates {
memberTypeValidated := *,//O
consistencyStrategy := *,//O
groupName := *,//O
semanticSupportIndicator := *,//O
choice := *//O
};
......@@ -1969,6 +1975,7 @@ module OneM2M_Templates {
memberTypeValidated := *,//M
consistencyStrategy := *,//O
groupName := *,//O
semanticSupportIndicator := *,//O
choice := *//O
}
......@@ -1994,6 +2001,7 @@ module OneM2M_Templates {
memberTypeValidated := omit,//M
consistencyStrategy := omit,//O
groupName := omit,//O
semanticSupportIndicator := omit,//O
choice := omit//O
}
......@@ -2038,6 +2046,7 @@ module OneM2M_Templates {
memberTypeValidated := omit,//M
consistencyStrategy := omit,//O
groupName := omit,//O
semanticSupportIndicator := omit,//O
choice := {childResource_list := ?}//O
}
......
LibOneM2M/OneM2M_Types.ttcn
+ 975
− 939
View file @ 398350e0
This diff is collapsed.
OneM2M_Testcases.ttcn
+ 7
− 7
View file @ 398350e0
......@@ -7,7 +7,7 @@
*
* @author oneM2M
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Testcases.ttcn $
* $Id: OneM2M_Testcases.ttcn 296 2017-06-02 13:16:50Z reinaortega $
* $Id: OneM2M_Testcases.ttcn 297 2017-06-02 14:21:45Z reinaortega $
* @desc Module containing test cases for oneM2M
*
*/
......@@ -3027,7 +3027,7 @@ module OneM2M_Testcases {
var template RequestPrimitive v_createRequest := m_createMgmtObjBase;
var ResponsePrimitive v_responsePrimitive;
v_createRequest.primitiveContent.mgmtObj_optional.announceTo := {f_getAnnouncementTargetPoA()};
v_createRequest.primitiveContent.mgmtResource_optional.announceTo := {f_getAnnouncementTargetPoA()};
f_CSE_DMR_CRE_BV_016(int13, v_createRequest, mw_createMgmtObjAnncBase);//MgmtObj
}
......@@ -3220,16 +3220,16 @@ module OneM2M_Testcases {
var RequestPrimitive v_requestPrimitive;
var XSD.String description := "Description of mgmtObj"; //Correct value? Shall be indicated in TP?
v_createRequest.primitiveContent.mgmtObj_optional.announceTo := {f_getAnnouncementTargetPoA()};
v_createRequest.primitiveContent.mgmtObj_optional.description := description;
v_createRequest.primitiveContent.mgmtObj_optional.announcedAttribute := {"description"}; //Correct value? Shall be indicated in TP?
v_createRequest.primitiveContent.mgmtResource_optional.announceTo := {f_getAnnouncementTargetPoA()};
v_createRequest.primitiveContent.mgmtResource_optional.description := description;
v_createRequest.primitiveContent.mgmtResource_optional.announcedAttribute := {"description"}; //Correct value? Shall be indicated in TP?
v_requestPrimitive := f_CSE_DMR_CRE_BV_017(int13, v_createRequest, mw_createMgmtObjAnncBase());//MgmtObj
if(getverdict == pass){
//Check if description attribute has been announced
if (ispresent(v_requestPrimitive.primitiveContent.mgmtObjAnnc_optional.description)){
if(v_requestPrimitive.primitiveContent.mgmtObjAnnc_optional.description != description){
if (ispresent(v_requestPrimitive.primitiveContent.announcedMgmtResource_optional.description)){
if(v_requestPrimitive.primitiveContent.announcedMgmtResource_optional.description != description){
setverdict(fail, testcasename() & ": Error: Value of description has not been announced successfully");
}else{
setverdict(pass, testcasename() & ": Value of description has been announced successfully");
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment