Typo issues

Fixed issues in remoteCSE templates
New TCs created: TC_CSE_REG_CRE_024, TC_CSE_REG_CRE_025, TC_CSE_REG_CRE_026_RN, TC_CSE_REG_CRE_026_ET, TC_CSE_REG_CRE_026_LBL, TC_CSE_REG_CRE_026_POA, TC_CSE_REG_CRE_026_NL
Signed-off-by: Antonio Castillo Verdugo's avataracverdugo <acverdugo@at4wireless.com>
parent a1a029a0
......@@ -1572,7 +1572,7 @@ module OneM2M_Functions {
alt {
[] mccPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
tc_ac.stop;
setverdict(pass, __SCOPE__&":INFO: Resource type RemoteCSE created successfuly");
setverdict(pass, __SCOPE__&":INFO: Resource type remoteCSE created successfuly");
f_checkAttributesToBeSaved(int16, v_request, v_response.primitive.responsePrimitive);
v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int16, -1);
v_remoteCSEResource := f_cse_generateLocalResource(v_response.primitive.responsePrimitive.primitiveContent, vc_cSEBaseIndex, int16);
......@@ -1580,14 +1580,14 @@ module OneM2M_Functions {
}
[] mccPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
setverdict(inconc, __SCOPE__&":INFO: Error while creating resource type RemoteCSE");
setverdict(inconc, __SCOPE__&":INFO: Error while creating resource type remoteCSE");
}
[] mccPort.receive {
tc_ac.stop;
setverdict(inconc, __SCOPE__&":INFO: Unexpected message received");
}
[] tc_ac.timeout {
setverdict(inconc, __SCOPE__&":INFO: No answer while creating resource type RemoteCSE");
setverdict(inconc, __SCOPE__&":INFO: No answer while creating resource type remoteCSE");
}
}
......@@ -1610,7 +1610,7 @@ module OneM2M_Functions {
var integer v_localResourceIndex := -1;
var integer v_resourceIndex := -1;
var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
var charstring v_action := "Please, register CSE on the Tester";
var charstring v_action := "Please, send a CSE registration request";
//send triggering primitive to SUT
f_sendUtPrimitive(v_utRequest,v_action);
......@@ -1619,7 +1619,7 @@ module OneM2M_Functions {
alt {
[] mccPortIn.receive(mw_request(p_requestPrimitive)) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__&":INFO: Resource type RemoteCSE created successfuly");
setverdict(pass, __SCOPE__&":INFO: Resource type remoteCSE created successfuly");
v_remoteCSEResource := f_cse_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, vc_cSEBaseIndex, int16);//TODO Get index from v_request.primitive.requestPrimitive.to_
v_localResourceIndex := f_setLocalResource(v_remoteCSEResource, int16, vc_cSEBaseIndex);
......@@ -1636,7 +1636,7 @@ module OneM2M_Functions {
setverdict(inconc, __SCOPE__&":INFO: Unexpected message received");
}
[] tc_ac.timeout {
setverdict(inconc, __SCOPE__&":INFO: No request received for creating resource type RemoteCSE");
setverdict(inconc, __SCOPE__&":INFO: No request received for creating resource type remoteCSE");
}
}
......
......@@ -656,11 +656,19 @@ module OneM2M_Templates {
};
/**
* @desc CREATE request primitive for remoteCSE resource
* @desc Reception template for CREATE RemoteCSE
*/
template RequestPrimitive mw_createRemoteCSE(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
resourceType := int16,
primitiveContent := {remoteCSE := ?} //{remoteCSE := m_contentCreateRemoteCSE(p_resourceName, p_accessControlPolicyIds,p_cSEBase, p_cSE_ID)}
};
/**
* @desc Base reception template for CREATE RemoteCSE
*/
template RequestPrimitive mw_createRemoteCSEBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
resourceType := int16,
primitiveContent := ?//{remoteCSE := m_contentCreateRemoteCSE(p_resourceName, p_accessControlPolicyIds,p_cSEBase, p_cSE_ID)}
primitiveContent := {remoteCSE := mw_contentCreateRemoteCSEBase}
};
/**
......@@ -1821,7 +1829,7 @@ module OneM2M_Templates {
};
/**
* @desc Base primitiveContent for CREATE operation for Container resource
* @desc Base primitiveContent for CREATE operation for RemoteCSE resource
* @param p_name Resource name
*/
template (value) RemoteCSE_optional m_contentCreateRemoteCSE (in template (omit) XSD.String p_name := c_defaultRemoteCSEResourceName, in template (omit) AcpType p_accessControlPolicyIds, in template (omit) XSD.AnyURI p_cSEBase := PX_CSE1_ID, in template (omit) XSD.ID p_cSE_ID := PX_CSE1_ID):= {
......@@ -1846,6 +1854,32 @@ module OneM2M_Templates {
nodeLink := omit,//O
choice := omit//O
};
/**
* @desc Base reception template of primitiveContent for CREATE operation for remoteCSE resource
*/
template RemoteCSE_optional mw_contentCreateRemoteCSEBase := {
resourceName := *,//O
resourceType := omit,//NP
resourceID := omit,//NP
parentID := omit,//NP
creationTime := omit,//NP
lastModifiedTime := omit,//NP
labels := *,//O
accessControlPolicyIDs := *,//O
expirationTime := *,//O
announceTo := *,//O
announcedAttribute := *,//O
cseType := *,//O
pointOfAccess := *,//O
cSEBase := ?,//M
cSE_ID := ?,//M
m2M_Ext_ID := *,//O
trigger_Recipient_ID := *,//O
requestReachability := ?,//M
nodeLink := *,//O
choice := *//O
};
/**
* @desc Base reception template of primitiveContent for CREATE operation for ContainerAnnc resource
......
......@@ -58,6 +58,13 @@ module OneM2M_TestControl_IN_profile {
execute(TC_CSE_REG_CRE_019());
execute(TC_CSE_REG_CRE_021());
execute(TC_CSE_REG_CRE_023());
execute(TC_CSE_REG_CRE_024());
execute(TC_CSE_REG_CRE_025());
execute(TC_CSE_REG_CRE_026_RN());
execute(TC_CSE_REG_CRE_026_ET());
execute(TC_CSE_REG_CRE_026_LBL());
execute(TC_CSE_REG_CRE_026_POA());
execute(TC_CSE_REG_CRE_026_NL());
execute(TC_CSE_REG_CRE_027());
execute(TC_CSE_REG_CRE_028_ET());
execute(TC_CSE_REG_CRE_028_LBL());
......
This diff is collapsed.
This diff is collapsed.
Markdown is supported
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