Commit 5553cd15 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

review of announcement create group test cases


Signed-off-by: Miguel Angel Reina Ortega's avatarreinaortega <miguelangel.reinaortega@etsi.org>
parent f7223230
......@@ -391,6 +391,28 @@ module OneM2M_Functions {
return v_resourceIndex;
}
/**
* @desc Getting last local resourceIndex saved in the vc_localResourcesList
* @param p_tester Given component
*/
function f_getLatestLocalResourceIndex(in CseSimu p_component) runs on Tester return integer {
var integer v_resourceIndex;
f_connectInfoPort(p_component);
p_component.start(f_sendLatestLocalResourceIndex());
alt {
[]infoPort.receive(mw_resourceIndex) -> value v_resourceIndex{
}
}
p_component.done;
f_disconnectInfoPort(p_component);
return v_resourceIndex;
}
/**
* @desc Getting primitiveContent retrieved in an AeSimu component
......@@ -490,6 +512,15 @@ module OneM2M_Functions {
}
/**
* @desc Sending of last local resourceIndex saved in the vc_localResourcesList
*/
function f_sendLatestLocalResourceIndex() runs on CseSimu {
infoPort.send(lengthof(vc_localResourcesList)-1);
}
/**
* @desc Sending of last primitiveContent retrieved (vc_primitiveContentRetrievedResource) through InfoPort
*/
......@@ -938,6 +969,54 @@ module OneM2M_Functions {
}
/**
* @desc Message exchange for the creation of a resource
* @param p_resourceType Resource type of the resource to be created
* @param p_requestPrimitive UPDATE request primitive to be used
* @param p_resourceIndex Internal resource index which indicates the resource to be updated
* @verdict
*/
function f_cse_createResourceHandler(template RequestPrimitive p_request) runs on CseSimu return integer{
var integer v_localResourceIndex := -1;
var integer v_parentResourceIndex := -1;
var ResponsePrimitive v_response;
var PrimitiveContent v_localResource;
//Activate defaults when running on a PTC
f_cse_activateDefaults_cse1();
tc_ac.start;
alt {
[] mccPortIn.receive(mw_request(p_request)) -> value vc_request {
tc_ac.stop;
v_parentResourceIndex := f_getResourceIndex(vc_request.primitive.requestPrimitive.to_);
if(v_parentResourceIndex == -1) {
log(__SCOPE__&": ERROR: Target resource not found");
v_response := valueof(m_responsePrimitive(int4004,vc_request.primitive.requestPrimitive.requestIdentifier));
} else {
v_localResource := f_generateLocalResource(vc_request.primitive.requestPrimitive.primitiveContent, v_parentResourceIndex, vc_request.primitive.requestPrimitive.resourceType);
v_localResourceIndex := f_setLocalResource(v_localResource, vc_request.primitive.requestPrimitive.resourceType, v_parentResourceIndex);
v_response := valueof(m_responsePrimitive(int2001,vc_request.primitive.requestPrimitive.requestIdentifier));
v_response.primitiveContent := vc_localResourcesList[v_localResourceIndex].resource;
}
v_response.from_ := PX_CSE1_ID;
v_response.to_ := vc_request.primitive.requestPrimitive.from_;
mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));
}
[] tc_ac.timeout {
setverdict(inconc, __SCOPE__&":INFO: No creation for resource received");
}
}
f_checkCseSimuStatus();
return v_localResourceIndex;
}// end f_cse_createResourceHandler
/**
* @desc Creation of a local resource
* @param p_resourceType Resource type of the resource to be created
......@@ -1967,7 +2046,7 @@ module OneM2M_Functions {
if(valueof(p_expectedResourceIndex) == v_parentIndex){
setverdict(pass, __SCOPE__ & ":INFO: Announcement Parent Resource Address matched");
v_responsePrimitive := valueof(m_responsePrimitive(p_responseStatusCode,v_request.primitive.requestPrimitive.requestIdentifier));
v_responsePrimitive.primitiveContent := vc_localResourcesList[p_expectedResourceIndex].resource;
v_responsePrimitive.primitiveContent := vc_localResourcesList[v_announcedResourceIndex].resource;
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Announcement Parent Resource Address not matched");
v_responsePrimitive := valueof(m_responsePrimitive(int4000,v_request.primitive.requestPrimitive.requestIdentifier));
......@@ -1988,6 +2067,8 @@ module OneM2M_Functions {
}
[] mccPortIn.receive(mw_request(?)) -> value v_request {
setverdict(fail, __SCOPE__ & ":ERROR: Request received with unexpected parameters");
v_responsePrimitive := valueof(m_responsePrimitive(int4000,v_request.primitive.requestPrimitive.requestIdentifier));
mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ":ERROR: No announcement received");
......@@ -2230,7 +2311,7 @@ module OneM2M_Functions {
setverdict(pass, __SCOPE__&":INFO: Resource type remoteCSE created successfuly");
f_checkAttributesToBeSaved(int16, v_request, v_response.primitive.responsePrimitive);
vc_remoteCseIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int16, -1);
v_localRemoteCSEResource := f_generateLocalResource(m_primitiveContentRemoteCSE(m_contentCreateRemoteCSE(f_resourceIdCleaner(v_response.primitive.responsePrimitive.from_),omit,v_response.primitive.responsePrimitive.from_,v_response.primitive.responsePrimitive.from_)),vc_cSEBaseIndex, int16);
v_localRemoteCSEResource := f_generateLocalResource(m_primitiveContentRemoteCSE(m_contentCreateRemoteCSE(PX_CSE_NAME,omit,PX_CSE_ID,PX_CSE_ID)),vc_cSEBaseIndex, int16);
vc_localRemoteCseIndex := f_setLocalResource(v_localRemoteCSEResource, int16, vc_cSEBaseIndex);
}
[] mccPort.receive(mw_response(mw_responsePrimitiveKO)) {
......@@ -2410,7 +2491,7 @@ module OneM2M_Functions {
v_myResource.aEAnnc.resourceName := "aEAnnc" & int2str(v_resourceIndex);
v_myResource.aEAnnc.resourceType := p_resourceType;
v_myResource.aEAnnc.resourceID := f_resourceIdCleaner(v_myResource.aEAnnc.aE_ID);
v_myResource.aEAnnc.resourceID := "ae" & int2str(v_resourceIndex);
v_myResource.aEAnnc.parentID := f_getResourceId(vc_localResourcesList[p_parentIndex].resource);
v_myResource.aEAnnc.creationTime := fx_generateTimestamp();
v_myResource.aEAnnc.lastModifiedTime := v_myResource.aEAnnc.creationTime;
......@@ -2421,7 +2502,7 @@ module OneM2M_Functions {
v_myResource.accessControlPolicyAnnc.resourceName := "accessControlPolicyAnnc" & int2str(v_resourceIndex);
v_myResource.accessControlPolicyAnnc.resourceType := p_resourceType;
v_myResource.accessControlPolicyAnnc.resourceID := f_resourceIdCleaner(v_myResource.accessControlPolicyAnnc.resourceID);
v_myResource.accessControlPolicyAnnc.resourceID := "acpA" & int2str(v_resourceIndex);
v_myResource.accessControlPolicyAnnc.parentID := f_getResourceId(vc_localResourcesList[p_parentIndex].resource);
v_myResource.accessControlPolicyAnnc.creationTime := fx_generateTimestamp();
v_myResource.accessControlPolicyAnnc.lastModifiedTime := v_myResource.accessControlPolicyAnnc.creationTime;
......@@ -2432,7 +2513,7 @@ module OneM2M_Functions {
v_myResource.containerAnnc.resourceName := "containerAnnc" & int2str(v_resourceIndex);
v_myResource.containerAnnc.resourceType := p_resourceType;
v_myResource.containerAnnc.resourceID := f_resourceIdCleaner(v_myResource.containerAnnc.resourceID);
v_myResource.containerAnnc.resourceID := "cntA" & int2str(v_resourceIndex);
v_myResource.containerAnnc.parentID := f_getResourceId(vc_localResourcesList[p_parentIndex].resource);
v_myResource.containerAnnc.creationTime := fx_generateTimestamp();
v_myResource.containerAnnc.lastModifiedTime := v_myResource.containerAnnc.creationTime;
......@@ -2443,18 +2524,18 @@ module OneM2M_Functions {
v_myResource.groupAnnc.resourceName := "groupAnnc" & int2str(v_resourceIndex);
v_myResource.groupAnnc.resourceType := p_resourceType;
v_myResource.groupAnnc.resourceID := f_resourceIdCleaner(v_myResource.groupAnnc.resourceID);
v_myResource.groupAnnc.resourceID := "grpA" & int2str(v_resourceIndex);
v_myResource.groupAnnc.parentID := f_getResourceId(vc_localResourcesList[p_parentIndex].resource);
v_myResource.groupAnnc.creationTime := fx_generateTimestamp();
v_myResource.groupAnnc.lastModifiedTime := v_myResource.groupAnnc.creationTime;
}
} else if (p_resourceType == int10014 and ispresent (p_resource)) { //ContentInstance Annc
} else if (p_resourceType == int10004 and ispresent (p_resource)) { //ContentInstance Annc
if(ischosen(p_resource.contentInstanceAnnc)) {
v_myResource.contentInstanceAnnc := valueof(p_resource.contentInstanceAnnc);
v_myResource.contentInstanceAnnc.resourceName := "contentInstanceAnnc" & int2str(v_resourceIndex);
v_myResource.contentInstanceAnnc.resourceType := p_resourceType;
v_myResource.contentInstanceAnnc.resourceID := f_resourceIdCleaner(v_myResource.contentInstanceAnnc.resourceID);
v_myResource.contentInstanceAnnc.resourceID := "cinA" & int2str(v_resourceIndex);
v_myResource.contentInstanceAnnc.parentID := f_getResourceId(vc_localResourcesList[p_parentIndex].resource);
v_myResource.contentInstanceAnnc.creationTime := fx_generateTimestamp();
v_myResource.contentInstanceAnnc.lastModifiedTime := v_myResource.contentInstanceAnnc.creationTime;
......@@ -2793,6 +2874,27 @@ module OneM2M_Functions {
tc_ac.start(10.0);
repeat;
}
[] mccPortIn.receive(mw_request(mw_delete())) -> value v_request {
tc_ac.stop;
log(__SCOPE__&": WARNING: Unexpected DELETE message received");
v_localResourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
if(v_localResourceIndex == -1)
{
log(__SCOPE__&": ERROR: Resource Index not valid");
v_response := valueof(m_responsePrimitive(int4004,v_request.primitive.requestPrimitive.requestIdentifier));
v_response.from_ := PX_CSE1_ID;
v_response.to_ := v_request.primitive.requestPrimitive.from_;
mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));
} else {
v_response := valueof(m_responsePrimitive(int2002,v_request.primitive.requestPrimitive.requestIdentifier));
v_response.from_ := PX_CSE1_ID;
v_response.to_ := v_request.primitive.requestPrimitive.from_;
mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));
}
tc_ac.start(10.0);
repeat;
}
[] mccPortIn.receive (mw_request(?)){
log(__SCOPE__&": WARNING: Unexpected message received");
repeat;
......@@ -3263,6 +3365,9 @@ module OneM2M_Functions {
if(ischosen(p_contentResource.container)) {
return f_resourceIdCleaner(p_contentResource.container.resourceID);
}
if(ischosen(p_contentResource.containerAnnc)) {
return f_resourceIdCleaner(p_contentResource.containerAnnc.resourceID);
}
if(ischosen(p_contentResource.contentInstance)) {
return f_resourceIdCleaner(p_contentResource.contentInstance.resourceID);
}
......@@ -3739,6 +3844,79 @@ module OneM2M_Functions {
return valueof(p_requestPrimitive);
}
/**
* @desc Set parentID into the resource
* @param p_resource Resource to be modified
* @param p_parentID ParentID to be set
* @return
* @verdict
*/
function f_setParentID(PrimitiveContent p_resource, XSD.ID p_parentID) runs on Tester return PrimitiveContent {
if (ischosen(p_resource.aE)){
p_resource.aE.parentID := p_parentID;
}
else if (ischosen(p_resource.accessControlPolicy)){
p_resource.accessControlPolicy.parentID := p_parentID;
}
else if (ischosen(p_resource.accessControlPolicyAnnc)){
p_resource.accessControlPolicyAnnc.parentID := p_parentID;
}
else if (ischosen(p_resource.container)){
p_resource.container.parentID := p_parentID;
}
else if (ischosen(p_resource.containerAnnc)){
p_resource.containerAnnc.parentID := p_parentID;
}
else if (ischosen(p_resource.group_)){
p_resource.group_.parentID := p_parentID;
}
else if (ischosen(p_resource.groupAnnc)){
p_resource.groupAnnc.parentID := p_parentID;
}
else if (ischosen(p_resource.serviceSubscribedAppRule)){
p_resource.serviceSubscribedAppRule.parentID := p_parentID;
}
else if (ischosen(p_resource.subscription)){
p_resource.subscription.parentID := p_parentID;
}
else if (ischosen(p_resource.locationPolicy)){
p_resource.locationPolicy.parentID := p_parentID;
}
else if (ischosen(p_resource.delivery)){
p_resource.delivery.parentID := p_parentID;
}
else if (ischosen(p_resource.mgmtCmd)){
p_resource.mgmtCmd.parentID := p_parentID;
}
else if (ischosen(p_resource.node)){
p_resource.node.parentID := p_parentID;
}
else if (ischosen(p_resource.remoteCSE)){
p_resource.remoteCSE.parentID := p_parentID;
}
else if (ischosen(p_resource.remoteCSE)){
p_resource.remoteCSE.parentID := p_parentID;
}
else if (ischosen(p_resource.request)){
p_resource.request.parentID := p_parentID;
}
else if (ischosen(p_resource.statsCollect)){
p_resource.statsCollect.parentID := p_parentID;
}
else if (ischosen(p_resource.statsConfig)){
p_resource.statsConfig.parentID := p_parentID;
}
else if (ischosen(p_resource.timeSeries)){
p_resource.timeSeries.parentID := p_parentID;
}
else if (ischosen(p_resource.timeSeriesAnnc)){
p_resource.timeSeriesAnnc.parentID := p_parentID;
} else {
log( __SCOPE__, ":INFO: Resource not having acpi attribute. Not possible to set acpi")
}
return valueof(p_resource);
}
/**
* @desc Retrieve AE_ID for a given AE resource
* @param p_targetResourceIndex Internal resource index of the given resource
......@@ -3929,13 +4107,13 @@ module OneM2M_Functions {
* @param data Corresponding information for the correct execution of the given action
* @verdict
*/
function f_aeSimu_checkComponentDoneAndGetVerdict(AeSimu p_ae) runs on AeSimu {
function f_aeSimu_checkComponentDoneAndGetVerdict(Tester p_component) runs on AeSimu {
var verdicttype v_verdict := none;
tc_ac.start(15.0);
alt {
[] p_ae.done -> value v_verdict {
[] p_component.done -> value v_verdict {
tc_ac.stop;
}
[] tc_ac.timeout {
......@@ -3974,13 +4152,13 @@ module OneM2M_Functions {
* @param data Corresponding information for the correct execution of the given action
* @verdict
*/
function f_cseSimu_checkComponentDoneAndGetVerdict(AeSimu p_ae) runs on CseSimu {
function f_cseSimu_checkComponentDoneAndGetVerdict(Tester p_component) runs on CseSimu {
var verdicttype v_verdict := none;
tc_ac.start(15.0);
alt {
[] p_ae.done -> value v_verdict {
[] p_component.done -> value v_verdict {
tc_ac.stop;
}
[] tc_ac.timeout {
......
......@@ -762,12 +762,19 @@ module OneM2M_Templates {
};
/**
* @desc Reception template for CREATE AEAnnc
* @desc Reception template for CREATE AEAnnc for registration when AE-ID-Stem starts with S
*/
template RequestPrimitive mw_createAEAnnc(template XSD.ID p_from := ?, template XSD.ID p_to := ?, template AcpType p_accessControlPolicyIds := ?, template XSD.AnyURI p_link := ?) modifies mw_create := {
template RequestPrimitive mw_createAEAnnc_s_ae_id(template XSD.ID p_from := ?, template XSD.ID p_to := ?, template AcpType p_accessControlPolicyIds := ?, template XSD.AnyURI p_link := ?) modifies mw_create := {
primitiveContent := {aEAnnc := mw_contentCreateAEAnnc({"Credential-ID:None"}, p_accessControlPolicyIds)}
};
/**
* @desc Reception template for CREATE AEAnnc as announced resource
*/
template RequestPrimitive mw_createAEAnnc(template XSD.ID p_from := ?, template XSD.ID p_to := ?, template AcpType p_accessControlPolicyIds := ?, template XSD.AnyURI p_link := ?) modifies mw_create := {
primitiveContent := {aEAnnc := mw_contentCreateAEAnnc(-, p_accessControlPolicyIds)}
};
template (value) RequestPrimitive m_createAe(XSD.ID p_appId, template (omit) AcpType p_accessControlPolicyIds := omit,template (omit) XSD.ID p_from := omit, template (omit) ResourceName p_resourceName := c_aeAuxName, in template (omit) PoaList p_poaList := omit) modifies m_create := {
from_ := p_from,//PX_AE_ID_STEM,//TODO We should use omit, "s", or "c"
requestIdentifier := testcasename() & "-m_createAe",
......@@ -895,6 +902,13 @@ module OneM2M_Templates {
primitiveContent := {remoteCSE := m_contentCreateRemoteCSE(p_resourceName, p_accessControlPolicyIds,p_cSEBase, p_cSE_ID)}
};
/**
* @desc CREATE request primitive for remoteCSE resource with poa
*/
template (value) RequestPrimitive m_createRemoteCSE_poa(template (omit) AcpType p_accessControlPolicyIds := omit, template (omit) ResourceName p_resourceName := c_defaultRemoteCSEResourceName, in template (omit) XSD.AnyURI p_cSEBase := PX_CSE1_ID, in template (omit) XSD.ID p_cSE_ID := PX_CSE1_ID, in PoaList p_poaList) modifies m_createRemoteCSEBase := {
primitiveContent := {remoteCSE := m_contentCreateRemoteCSE_poa(p_resourceName, p_accessControlPolicyIds,p_cSEBase, p_cSE_ID, p_poaList)}
};
/**
* @desc Reception template for CREATE RemoteCSE
*/
......@@ -985,7 +999,7 @@ module OneM2M_Templates {
* @desc Reception template for CREATE ContentInstanceAnnc
*/
template RequestPrimitive mw_createContentInstanceAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
resourceType := int10014,
resourceType := int10004,
primitiveContent := {contentInstanceAnnc := ?}
};
......@@ -1646,7 +1660,7 @@ module OneM2M_Templates {
* @param p_appId App ID
* @param p_nodeLink Node link
*/
template AEAnnc_optional mw_contentCreateAEAnnc (in template Labels p_labels := ?, in template AcpType p_accessControlPolicyIds := ?, template XSD.AnyURI p_link := ?) := {
template AEAnnc_optional mw_contentCreateAEAnnc (in template Labels p_labels := *, in template AcpType p_accessControlPolicyIds := ?, template XSD.AnyURI p_link := ?) := {
resourceName := omit,//NA M
resourceType := omit,//NA M
resourceID := omit,//NA M
......@@ -1666,8 +1680,8 @@ module OneM2M_Templates {
nodeLink := *,//OA
requestReachability := *,//OA
contentSerialization := *,//OA
e2eSecInfo := ?, //MA
supportedReleaseVersions := ?, //MA
e2eSecInfo := *, //MA
supportedReleaseVersions := *, //MA//TODO It should be mandatory for AEAnnc
choice := omit//NA
};
......@@ -1678,7 +1692,7 @@ module OneM2M_Templates {
* @param p_appId App ID
* @param p_nodeLink Node link
*/
template RemoteCSEAnnc_optional mw_contentCreateRemoteCSEAnnc (in template Labels p_labels := ?, in template AcpType p_accessControlPolicyIds := ?, template XSD.AnyURI p_link := ?) := {
template RemoteCSEAnnc_optional mw_contentCreateRemoteCSEAnnc (in template Labels p_labels := *, in template AcpType p_accessControlPolicyIds := ?, template XSD.AnyURI p_link := ?) := {
resourceName := omit,//NA M
resourceType := omit,//NA M
resourceID := omit,//NA M
......@@ -1788,7 +1802,7 @@ module OneM2M_Templates {
* @desc Base reception template of primitiveContent for CREATE operation for AccessControlPolicyAnnc resource
* @param p_labels Labels
*/
template AccessControlPolicyAnnc_optional mw_contentCreateAcpAnnc (in template Labels p_labels := ?) := {
template AccessControlPolicyAnnc_optional mw_contentCreateAcpAnnc (in template Labels p_labels := *) := {
resourceName := omit,//NA M
resourceType := omit,//NA M
resourceID := omit,//NA M
......@@ -1977,7 +1991,7 @@ module OneM2M_Templates {
parentID := omit,//NA M
creationTime := omit,//NA M
lastModifiedTime := omit,//NA M
labels := ?,//MA
labels := *,//MA
accessControlPolicyIDs := ?,//MA
expirationTime := ?,//MA M
link := ?,
......@@ -2054,7 +2068,7 @@ module OneM2M_Templates {
parentID := omit,//NA M
creationTime := omit,//NA M
lastModifiedTime := omit,//NA M
labels := ?,//MA
labels := *,//MA
accessControlPolicyIDs := ?,//MA
expirationTime := ?,//MA M
link := ?,
......@@ -2154,7 +2168,7 @@ module OneM2M_Templates {
parentID := omit,//NA M
creationTime := omit,//NA M
lastModifiedTime := omit,//NA M
labels := ?,//MA
labels := *,//MA
expirationTime := ?,//MA M
link := ?,
scheduleElement := * //OA
......@@ -2313,7 +2327,7 @@ module OneM2M_Templates {
parentID := omit,//NA M
creationTime := omit,//NA M
lastModifiedTime := omit,//NA M
labels := ?,//MA
labels := *,//MA
expirationTime := omit,//O NA
link := omit, //O NA
stateTag := *,// OA
......@@ -2444,6 +2458,37 @@ module OneM2M_Templates {
choice := omit//O
};
/**
* @desc PrimitiveContent for CREATE operation for RemoteCSE resource with poa
* @param p_name Resource name
*/
template (value) RemoteCSE_optional m_contentCreateRemoteCSE_poa (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, in PoaList p_poaList):= {
resourceName := p_name,//O
resourceType := omit,//NP
resourceID := omit,//NP
parentID := omit,//NP
creationTime := omit,//NP
lastModifiedTime := omit,//NP
labels := omit,//O
accessControlPolicyIDs := p_accessControlPolicyIds,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit,
announceTo := omit,//O
announcedAttribute := omit,//O
cseType := omit,//O
pointOfAccess := p_poaList,//O
cSEBase := valueof(p_cSEBase),//M
cSE_ID := valueof(p_cSE_ID),//M
m2M_Ext_ID := omit,//O
trigger_Recipient_ID := omit,//O
requestReachability := true,//M
nodeLink := omit,//O
triggerReferenceNumber := omit,//O
e2eSecInfo := omit,//O
supportedReleaseVersions := {"2a"}, //M
choice := omit//O
};
/**
* @desc Base reception template of primitiveContent for CREATE operation for ContainerAnnc resource
*/
......@@ -2454,7 +2499,7 @@ module OneM2M_Templates {
parentID := omit,//NA M
creationTime := omit,//NA M
lastModifiedTime := omit,//NA M
labels := ?,//MA M
labels := *,//MA M
accessControlPolicyIDs := ?,//MA
expirationTime := ?,//MA M
link := ?, //M
......@@ -2528,7 +2573,7 @@ module OneM2M_Templates {
parentID := omit,//NA M
creationTime := omit,//NA M
lastModifiedTime := omit,//NA M
labels := ?,//MA
labels := *,//MA
accessControlPolicyIDs := ?,//MA
expirationTime := ?,//MA M
link := ?,
......@@ -2777,7 +2822,7 @@ module OneM2M_Templates {
parentID := omit,//NA M
creationTime := omit,//NA M
lastModifiedTime := omit,//NA M
labels := ?,//MA
labels := *,//MA
accessControlPolicyIDs := ?,//MA
expirationTime := ?,//MA M
link := omit, //O NA
......@@ -2808,7 +2853,7 @@ module OneM2M_Templates {
parentID := omit,//NA M
creationTime := omit,//NA M
lastModifiedTime := omit,//NA M
labels := ?,//MA
labels := *,//MA
expirationTime := omit,//NA M
link := omit, //O NA
dataGenerationTime := *,//M OA
......
This diff is collapsed.
......@@ -694,7 +694,7 @@ module OneM2M_Testcases_CSE_Release_1 {
vc_ae1.start(f_cse_sendCreateRequestPrimitive(int2, m_createAe(PX_APP_ID, -, "S", omit)));
vc_ae1.done;
v_requestPrimitive := mw_createAEAnnc(PX_CSE_ID & "/S", -, -, -);
v_requestPrimitive := mw_createAEAnnc_s_ae_id(PX_CSE_ID & "/S", -, -, -);
v_requestPrimitive.primitiveContent.aEAnnc.app_ID := PX_APP_ID;
tc_ac.start;
......@@ -773,7 +773,7 @@ module OneM2M_Testcases_CSE_Release_1 {
tc_ac.start;
alt {
[] mccPortIn.receive(mw_request(mw_createAEAnnc(PX_CSE_ID, f_getLocalResourceAddress(vc_cSEBaseIndex), -))) {
[] mccPortIn.receive(mw_request(mw_createAEAnnc_s_ae_id(PX_CSE_ID, f_getLocalResourceAddress(vc_cSEBaseIndex), -))) {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": AE creation redirected.");
}
......@@ -908,11 +908,11 @@ module OneM2M_Testcases_CSE_Release_1 {
tc_ac.start;
alt {
[] mccPortIn.receive(mw_request(mw_createAEAnnc(f_getResourceAddress(-1,e_hierarchical, e_spRelative) & "/S", "CSE_ID", -))) {
[] mccPortIn.receive(mw_request(mw_createAEAnnc_s_ae_id(f_getResourceAddress(-1,e_hierarchical, e_spRelative) & "/S", "CSE_ID", -))) {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": AE creation redirected.");
}
[] mccPortIn.receive(mw_request(mw_createAEAnnc(f_getResourceAddress(-1,e_hierarchical, e_absolute) & "/S", "CSE_ID", -))) {
[] mccPortIn.receive(mw_request(mw_createAEAnnc_s_ae_id(f_getResourceAddress(-1,e_hierarchical, e_absolute) & "/S", "CSE_ID", -))) {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": AE creation redirected.");
}
......@@ -1061,7 +1061,7 @@ module OneM2M_Testcases_CSE_Release_1 {
//Test Body
f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, f_getResourceId(vc_resourcesList[v_aeIndex].resource)));
vc_cse1.start(f_cse_announcementProcedure_createHandler(mw_createAEAnnc(PX_CSE_ID, -, -, -)));
vc_cse1.start(f_cse_announcementProcedure_createHandler(mw_createAEAnnc_s_ae_id(PX_CSE_ID, -, -, -)));
vc_cse1.done;
tc_ac.start;
......
......@@ -10327,12 +10327,13 @@ module OneM2M_Testcases_CSE_Release_2 {
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
var template RequestPrimitive v_updateRequest := m_updateAcpBase;
var template RequestPrimitive v_createRequest := m_createAcpBase;
var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
v_cse1.done;
v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {"/CSE2_ID"};
v_cse1.start(f_CSE_ANNC_CRE_002(int1, v_createRequest, v_updateRequest));//AccessControlPolicy
v_cse1.start(f_CSE_ANNC_CRE_002(int1, v_createRequest, v_updateRequest, v_createRequestAnnc));//AccessControlPolicy
v_cse1.done;
}
 
......@@ -10341,12 +10342,13 @@ module OneM2M_Testcases_CSE_Release_2 {
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
var template RequestPrimitive v_createRequest := m_createContainerBase;
var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
v_cse1.done;
v_updateRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
v_updateRequest.primitiveContent.container.announceTo := {"/CSE2_ID"};
v_cse1.start(f_CSE_ANNC_CRE_002(int3, v_createRequest, v_updateRequest));//Container
v_cse1.start(f_CSE_ANNC_CRE_002(int3, v_createRequest, v_updateRequest, v_createRequestAnnc));//Container
v_cse1.done;
}
 
......@@ -10355,12 +10357,13 @@ module OneM2M_Testcases_CSE_Release_2 {
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
var template RequestPrimitive v_updateRequest := m_updateGroupBase;
var template RequestPrimitive v_createRequest := m_createGroupBase;
var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
v_cse1.done;
v_updateRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
v_updateRequest.primitiveContent.group_.announceTo := {"/CSE2_ID"};
v_cse1.start(f_CSE_ANNC_CRE_002(int9, v_createRequest, v_updateRequest));//Group
v_cse1.start(f_CSE_ANNC_CRE_002(int9, v_createRequest, v_updateRequest, v_createRequestAnnc));//Group
v_cse1.done;
}
......@@ -10369,12 +10372,13 @@ module OneM2M_Testcases_CSE_Release_2 {
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;