diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 14bd53e18c0a54de48237a99e4e9386fbd1ac614..49eba4e92757d47fbca8aa6601b21771a2b40dfe 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -351,24 +351,24 @@ module OneM2M_Functions {
vc_cSEBaseIndex := f_setLocalResource(v_cSEBaseResource, int5, -1);
// Map
- map(self:mcaPortIn, system:mcaPortIn) param (PX_TS_AE1.mcaPort);//TODO To be consistent, we should use mcaPortIn for AE testing
+ map(self:mcaPortIn, system:mcaPortIn) param (PX_TS_CSE1.mcaPortIn);//TODO To be consistent, we should use mcaPortIn for AE testing
map(self:acPort, system:acPort);
- if (ischosen(PX_TS_AE2.mcaPort.binding.httpBindingDesc)) {
+ if (ischosen(PX_TS_CSE1.mcaPortIn.binding.httpBindingDesc)) {
v_binding := "HTTP";
- v_host := PX_TS_AE2.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE2.mcaPort.binding.httpBindingDesc.bindingDesc.remotePort);
- } else if (ischosen(PX_TS_AE2.mcaPort.binding.coapBindingDesc)) {
+ v_host := PX_TS_CSE1.mcaPortIn.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_CSE1.mcaPortIn.binding.httpBindingDesc.bindingDesc.remotePort);
+ } else if (ischosen(PX_TS_CSE1.mcaPortIn.binding.coapBindingDesc)) {
v_binding := "COAP";
- v_host := PX_TS_AE2.mcaPort.binding.coapBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE2.mcaPort.binding.coapBindingDesc.bindingDesc.remotePort);
- } else if (ischosen(PX_TS_AE2.mcaPort.binding.mqttBindingDesc)) {
+ v_host := PX_TS_CSE1.mcaPortIn.binding.coapBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_CSE1.mcaPortIn.binding.coapBindingDesc.bindingDesc.remotePort);
+ } else if (ischosen(PX_TS_CSE1.mcaPortIn.binding.mqttBindingDesc)) {
v_binding := "MQTT";
- v_host := PX_TS_AE2.mcaPort.binding.mqttBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE2.mcaPort.binding.mqttBindingDesc.bindingDesc.remotePort);
+ v_host := PX_TS_CSE1.mcaPortIn.binding.mqttBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_CSE1.mcaPortIn.binding.mqttBindingDesc.bindingDesc.remotePort);
} else {
v_binding := "WSCK";
- v_host := PX_TS_AE2.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE2.mcaPort.binding.wsBindingDesc.bindingDesc.remotePort);
+ v_host := PX_TS_CSE1.mcaPortIn.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_CSE1.mcaPortIn.binding.wsBindingDesc.bindingDesc.remotePort);
}
- vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_in_port))] := { mcaPortIn, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE2.mcaPortIn.serialization)] };
+ vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_in_port))] := { mcaPortIn, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_CSE1.mcaPortIn.serialization)] };
if(PX_UT_IMPLEMENTED) {
map(self:utPort, system:utPort) param (PX_TS_UT);
@@ -1073,7 +1073,7 @@ module OneM2M_Functions {
var integer v_serviceSubscribedAppRuleIndex := -1;
- v_serviceSubscribedAppRuleIndex := f_cse_createResource(int19, m_createServiceSubscribedAppRule({"None"}, {PX_APP_ID}, valueof(p_allowedAEs)));
+ v_serviceSubscribedAppRuleIndex := f_cse_createResource(int19, m_createServiceSubscribedAppRule({"None"}, {PX_TS_AE1.appId}, valueof(p_allowedAEs)));
return v_serviceSubscribedAppRuleIndex;
@@ -1092,7 +1092,7 @@ module OneM2M_Functions {
var template RequestPrimitive m_request := m_createM2mServiceSubscriptionProfileBase;
//TODO Create/Update serviceSubscribedNode //m_request.primitiveContent.m2mServiceSubscriptionProfile.choice.choice_list[0].serviceSubscribedNode := m_contentServiceSubscribedNode;
- v_serviceSubscribedAppRuleIndex := f_cse_createResource(int19, m_createServiceSubscribedAppRule({"None"}, {PX_APP_ID}, valueof(p_allowedAEs)));
+ v_serviceSubscribedAppRuleIndex := f_cse_createResource(int19, m_createServiceSubscribedAppRule({"None"}, {PX_TS_AE1.appId}, valueof(p_allowedAEs)));
m_request.primitiveContent.m2mServiceSubscriptionProfile.choice.choice_list[0].serviceSubscribedNode.ruleLinks := {f_getResourceAddress(v_serviceSubscribedAppRuleIndex)};
v_serviceSubscribedProfileIndex := f_cse_createResource(int11, m_request);
@@ -1114,7 +1114,7 @@ module OneM2M_Functions {
vc_ae2.start(f_cse_createAccessControlPolicyAux("SubscriptionVerificationAcp",{"all"}, int63));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
- vc_ae2.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, c_defaultAE2Name, {f_getCompletePoA(PX_TS_AE2.mcaPortIn, "")}), -1)); // AE2 is registred
+ vc_ae2.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_TS_AE2.appId, -, PX_TS_AE2.aeIdStem, c_defaultAE2Name, {f_getCompletePoA(PX_TS_AE2.mcaPortIn, "")}), -1)); // AE2 is registred
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
p_ae2Index := f_getResourceFromAeSimu(vc_ae2);
@@ -2170,7 +2170,7 @@ module OneM2M_Functions {
}
}
}
- v_responsePrimitive.from_ := PX_CSE1_ID;
+ v_responsePrimitive.from_ := PX_TS_CSE1.cseId;
v_responsePrimitive.to_ := v_request.primitive.requestPrimitive.from_;
f_send(e_mcc_in_port, m_response(v_responsePrimitive));
}
@@ -2386,7 +2386,7 @@ module OneM2M_Functions {
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.from_ := PX_TS_CSE1.cseId;
v_response.to_ := vc_request.primitive.requestPrimitive.from_;
f_send(e_mcc_in_port, m_response(v_response));
}
@@ -2723,7 +2723,7 @@ module OneM2M_Functions {
vc_localRemoteCseIndex := f_setLocalResource(v_localRemoteCSEResource, int16, vc_cSEBaseIndex);
v_response := valueof(m_responsePrimitive(int2001,v_request.primitive.requestPrimitive.requestIdentifier));
- v_response.from_ := PX_CSE1_ID;
+ v_response.from_ := PX_TS_CSE1.cseId;
v_response.to_ := v_request.primitive.requestPrimitive.from_;
v_response.primitiveContent.remoteCSE := vc_localResourcesList[vc_localRemoteCseIndex].resource.remoteCSE;
f_send(e_mcc_in_port, m_response(v_response));
@@ -2817,15 +2817,15 @@ module OneM2M_Functions {
// TODO To review the code (use of indexes, generation of value for certain attributes, etc..)
if(p_resourceType == int5) { //CSEBase
- v_myResource.cSEBase.resourceName := PX_CSE1_NAME;
+ v_myResource.cSEBase.resourceName := PX_TS_CSE1.cseName;
v_myResource.cSEBase.resourceType := p_resourceType;
- v_myResource.cSEBase.resourceID := f_resourceIdCleaner(PX_CSE1_RESOURCE_ID);
+ v_myResource.cSEBase.resourceID := f_resourceIdCleaner(PX_TS_CSE1.cseResourceId);
v_myResource.cSEBase.parentID := "";//Following TS-0001, it must be NULL. Set to a value for Codec to set it to null
v_myResource.cSEBase.creationTime := fx_generateTimestamp();
v_myResource.cSEBase.creationTime := "20171231T012345";
v_myResource.cSEBase.lastModifiedTime := v_myResource.cSEBase.creationTime;
- v_myResource.cSEBase.cSE_ID := PX_CSE1_ID;
- v_myResource.cSEBase.supportedResourceType := PX_CSE1_SRT;
+ v_myResource.cSEBase.cSE_ID := PX_TS_CSE1.cseId;
+ v_myResource.cSEBase.supportedResourceType := PX_TS_CSE1.supportedResourceType;
v_myResource.cSEBase.pointOfAccess := {f_getCompletePoA(PX_TS_CSE1.mccPortIn, "")};
v_myResource.cSEBase.cseType := vc_cseType;
v_myResource.cSEBase.supportedReleaseVersions := {"2a"};
@@ -4016,7 +4016,7 @@ module OneM2M_Functions {
if((p_resourceType != int2) and (p_resourceType != int10002)) {
if(p_resourceType == int16) {
- p_request.from_ := PX_CSE1_ID;
+ p_request.from_ := PX_TS_CSE1.cseId;
} else {
p_request.from_ := f_getOriginator(p_parentIndex, vc_testSystemRole);
}
@@ -4622,13 +4622,13 @@ module OneM2M_Functions {
if(p_addressingMethod == e_nonHierarchical) {
if(p_targetResourceIndex == 0) {
- return PX_CSE1_RESOURCE_ID;
+ return PX_TS_CSE1.cseResourceId;
} else {
return f_getResourceId(vc_localResourcesList[p_targetResourceIndex].resource);
}
} else {
if(p_targetResourceIndex == 0) {
- return PX_CSE1_NAME;
+ return PX_TS_CSE1.cseName;
} else {
v_resourceAddress := f_getLocalResourceAddress(vc_localResourcesList[p_targetResourceIndex].parentIndex, p_addressingMethod, p_primitiveScope) & "/" & f_getResourceName(vc_localResourcesList[p_targetResourceIndex].resource);
return v_resourceAddress;
@@ -4638,14 +4638,14 @@ module OneM2M_Functions {
} else if (p_primitiveScope == e_spRelative) {
if(p_addressingMethod == e_nonHierarchical) {
if(p_targetResourceIndex == 0) {
- return PX_CSE1_ID & "/" & PX_CSE1_RESOURCE_ID;
+ return PX_TS_CSE1.cseId & "/" & PX_TS_CSE1.cseResourceId;
} else {
- v_resourceAddress := PX_CSE1_ID & "/" & f_getResourceId(vc_localResourcesList[p_targetResourceIndex].resource);
+ v_resourceAddress := PX_TS_CSE1.cseId & "/" & f_getResourceId(vc_localResourcesList[p_targetResourceIndex].resource);
return v_resourceAddress;
}
} else {
if(p_targetResourceIndex == 0) {
- return PX_CSE1_ID & "/" & PX_CSE1_NAME;
+ return PX_TS_CSE1.cseId & "/" & PX_TS_CSE1.cseName;
} else {
v_resourceAddress := f_getLocalResourceAddress(vc_localResourcesList[p_targetResourceIndex].parentIndex, p_addressingMethod, p_primitiveScope) & "/" & f_getResourceName(vc_localResourcesList[p_targetResourceIndex].resource);
return v_resourceAddress;
@@ -4654,14 +4654,14 @@ module OneM2M_Functions {
} else if (p_primitiveScope == e_absolute) {
if(p_addressingMethod == e_nonHierarchical) {
if(p_targetResourceIndex == 0) {
- return PX_SP1_ID & PX_CSE1_ID & "/" & PX_CSE1_RESOURCE_ID;
+ return PX_TS_CSE1.spId & PX_TS_CSE1.cseId & "/" & PX_TS_CSE1.cseResourceId;
} else {
- v_resourceAddress := PX_SP1_ID & PX_CSE1_ID & "/" & f_getResourceId(vc_localResourcesList[p_targetResourceIndex].resource);
+ v_resourceAddress := PX_TS_CSE1.spId & PX_TS_CSE1.cseId & "/" & f_getResourceId(vc_localResourcesList[p_targetResourceIndex].resource);
return v_resourceAddress;
}
} else {
if(p_targetResourceIndex == 0) {
- return PX_SP1_ID & PX_CSE1_ID & "/" & PX_CSE1_NAME;
+ return PX_TS_CSE1.spId & PX_TS_CSE1.cseId & "/" & PX_TS_CSE1.cseName;
} else {
v_resourceAddress := f_getLocalResourceAddress(vc_localResourcesList[p_targetResourceIndex].parentIndex, p_addressingMethod, p_primitiveScope) & "/" & f_getResourceName(vc_localResourcesList[p_targetResourceIndex].resource);
return v_resourceAddress;
@@ -5386,7 +5386,7 @@ module OneM2M_Functions {
* @param p_action Description of the given action to be performed by the IUT
* @verdict
*/
- function f_sendUtPrimitive(template UtTriggerPrimitive p_utRequest, in universal charstring p_action) runs on Tester {
+ function f_sendUtPrimitive(template UtTriggerPrimitive p_utRequest, in universal charstring p_action) runs on CseSimu {
if (PX_UT_IMPLEMENTED){
@@ -5410,8 +5410,11 @@ module OneM2M_Functions {
}
}
+ f_checkCseSimuStatus();
+
activate(a_default());
- if(vc_config == e_cf01) {
+ //In case UtPrimitive is used from AeSimu
+ /*if(vc_config == e_cf01) {
vc_aeSimu := activate(a_cse_cf01());
} else if ((vc_config == e_cf02) or (vc_config == e_cf02CseSimuMaster)) {
if(vc_testSystemRole == e_ae) {
@@ -5419,7 +5422,8 @@ module OneM2M_Functions {
} else if (vc_testSystemRole == e_cse) {
vc_cseSimu := activate(a_cse_cf02_cse1());
}
- } else if (vc_config == e_cf03) {
+ } else */
+ if (vc_config == e_cf03) {
vc_cseSimu := activate(a_ae_cf03());
} else if (vc_config == e_cf04) {
vc_cseSimu := activate(a_cse_cf04());
@@ -5457,7 +5461,7 @@ module OneM2M_Functions {
vc_response.primitive.responsePrimitive := valueof(m_responsePrimitive(int2001,p_request.requestIdentifier));
vc_response.primitive.responsePrimitive.primitiveContent := vc_localResourcesList[v_localResourceIndex].resource;
}
- vc_response.primitive.responsePrimitive.from_ := PX_CSE1_ID;
+ vc_response.primitive.responsePrimitive.from_ := PX_TS_CSE1.cseId;
vc_response.primitive.responsePrimitive.to_ := p_request.from_;
return v_localResourceIndex;
@@ -5481,7 +5485,7 @@ module OneM2M_Functions {
vc_response.primitive.responsePrimitive := valueof(m_responsePrimitive(int2004,p_request.requestIdentifier));
vc_response.primitive.responsePrimitive.primitiveContent := vc_localResourcesList[v_targetLocalResourceIndex].resource;
}
- vc_response.primitive.responsePrimitive.from_ := PX_CSE1_ID;
+ vc_response.primitive.responsePrimitive.from_ := PX_TS_CSE1.cseId;
vc_response.primitive.responsePrimitive.to_ := p_request.from_;
return v_targetLocalResourceIndex;
@@ -5504,7 +5508,7 @@ module OneM2M_Functions {
vc_response.primitive.responsePrimitive := valueof(m_responsePrimitive(int2000,p_request.requestIdentifier));
vc_response.primitive.responsePrimitive.primitiveContent := vc_localResourcesList[v_targetLocalResourceIndex].resource;
}
- vc_response.primitive.responsePrimitive.from_ := PX_CSE1_ID;
+ vc_response.primitive.responsePrimitive.from_ := PX_TS_CSE1.cseId;
vc_response.primitive.responsePrimitive.to_ := p_request.from_;
return v_targetLocalResourceIndex;
@@ -5526,7 +5530,7 @@ module OneM2M_Functions {
setverdict(pass, __SCOPE__&":INFO: Resource deleted successfuly");
vc_response.primitive.responsePrimitive := valueof(m_responsePrimitive(int2002,p_request.requestIdentifier));
}
- vc_response.primitive.responsePrimitive.from_ := PX_CSE1_ID;
+ vc_response.primitive.responsePrimitive.from_ := PX_TS_CSE1.cseId;
vc_response.primitive.responsePrimitive.to_ := p_request.from_;
return v_targetLocalResourceIndex;
diff --git a/LibOneM2M/OneM2M_Pixits.ttcn b/LibOneM2M/OneM2M_Pixits.ttcn
index f10dda2bd6f6802ecdb12310c7090264666798fa..67732cb50bcaea2759893f4176d760078dbed7a8 100644
--- a/LibOneM2M/OneM2M_Pixits.ttcn
+++ b/LibOneM2M/OneM2M_Pixits.ttcn
@@ -104,11 +104,13 @@ module OneM2M_Pixits {
*/
modulepar PrimitiveScope PX_PRIMITIVE_SCOPE := e_cseRelative;
-
+ //WebSocket parameters
modulepar charstring PX_WS_PROTOCOL := "oneM2M.R2.0.xml";
- modulepar charstring PX_HOSTING_CSE_ID := "CSE-Dekra-ID";
- modulepar charstring PX_CREDENTIAL_ID := "admin:admin";
modulepar charstring PX_REQUEST_URI := "/";
+ //MQTT parameters
+ modulepar charstring PX_HOSTING_CSE_ID := "CSE-ID";
+ modulepar charstring PX_CREDENTIAL_ID := "admin:admin";
+
/**
* @desc Namespace composed of "prefix" = "xml namespace" to use during test execution
@@ -133,6 +135,8 @@ module OneM2M_Pixits {
* @desc Test System settings
*/
modulepar AeSimuComponentDesc PX_TS_AE1 := { // AE1 component settings
+ aeIdStem := "",
+ appId := "NMyApp1Id",
mcaPort := {
binding := {
httpBindingDesc := {
@@ -163,6 +167,8 @@ module OneM2M_Pixits {
}
};
modulepar AeSimuComponentDesc PX_TS_AE2 := { // AE2 component settings
+ aeIdStem := "",
+ appId := "NMyApp2Id",
mcaPort := {
binding := {
httpBindingDesc := {
@@ -193,6 +199,11 @@ module OneM2M_Pixits {
}
};
modulepar CseSimuComponentDesc PX_TS_CSE1 := { // CSE1 component settings
+ cseName := "CSE1_NAME",
+ cseId := "/CSE1_ID",
+ cseResourceId := "CSE1_RESOURCE_ID",
+ spId := "//onem2m.org",
+ supportedResourceType := {int1, int2, int3, int16},
mcaPort := {
binding := {
httpBindingDesc := {
@@ -252,47 +263,7 @@ module OneM2M_Pixits {
};
modulepar UtDesc PX_TS_UT := { url := "http://127.0.0.1:43000/" };
-
- /**
- * @desc Test System CSE1 Name
- */
- modulepar XSD.ID PX_CSE1_NAME := "CSE1_NAME";
-
- /**
- * @desc Test System CSE1-ID with SP-relative-CSE-ID format (relative) according to TS-0001-7.2-1
- */
- modulepar XSD.ID PX_CSE1_ID := "/CSE1_ID";
-
- /**
- * @desc Test System CSE1 resource ID with Unstructured-CSE-relative-Resource-ID (relative) format according to TS-0001-7.2-1
- */
- modulepar XSD.ID PX_CSE1_RESOURCE_ID := "CSE1_RESOURCE_ID";
-
- /**
- * @desc CSE1 Supported resource type
- */
- modulepar ResourceTypeList_1 PX_CSE1_SRT := {int1, int2, int3, int16};
-
- /**
- * @desc Test System M2M-SP1-ID with M2M-SP-ID format (absolute) according to TS-0001-7.2-1 Unstructured-CSE-relative -Resource-ID
- */
- modulepar XSD.ID PX_SP1_ID := "//onem2m.org";
-
- /**
- * @desc Test System AE1-ID with AE-ID-Stem format (relative) according to TS-0001-7.2-1
- */
- modulepar XSD.ID PX_AE1_ID_STEM := "";
-
- /**
- * @desc Test System AE2-ID with AE-ID-Stem format (relative) according to TS-0001-7.2-1
- */
- modulepar XSD.ID PX_AE2_ID_STEM := "";
-
- /**
- * @desc Test System APP-ID with App-ID format according to TS-0001-7.2-1
- */
- modulepar XSD.ID PX_APP_ID := "NMyAppId";
-
+
}
group ExecutionParameters {
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 72354360c35019a2aca84cfdc217d488d05fa5ce..1de71aa2f978128c4aa7755231ec3f53dfb15319 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -836,7 +836,7 @@ module OneM2M_Templates {
};
template (value) RequestPrimitive m_createAeAux(template (omit) AcpType p_accessControlPolicyIds := omit, in template (omit) PoaList p_poaList) modifies m_create := {
- from_ := PX_AE1_ID_STEM,//TODO We should use omit, "s", or "c"
+ from_ := PX_TS_AE1.aeIdStem,//TODO We should use omit, "s", or "c"
requestIdentifier := testcasename() & "-m_createAe",
resourceType := int2,
primitiveContent := {aE := m_contentCreateAe(p_accessControlPolicyIds, c_aeAuxName, -, p_poaList)}
@@ -941,7 +941,7 @@ module OneM2M_Templates {
/**
* @desc Base CREATE request primitive for remoteCSE resource
*/
- template (value) RequestPrimitive m_createRemoteCSEBase(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) modifies m_create := {
+ template (value) RequestPrimitive m_createRemoteCSEBase(template (omit) AcpType p_accessControlPolicyIds := omit, template (omit) ResourceName p_resourceName := c_defaultRemoteCSEResourceName, in template (omit) XSD.AnyURI p_cSEBase := PX_TS_CSE1.cseId, in template (omit) XSD.ID p_cSE_ID := PX_TS_CSE1.cseId) modifies m_create := {
requestIdentifier := testcasename() & "-m_createRemoteCSE",
resourceType := int16,
primitiveContent := {remoteCSE := m_contentCreateRemoteCSE(p_resourceName, p_accessControlPolicyIds,p_cSEBase, p_cSE_ID)}
@@ -950,7 +950,7 @@ module OneM2M_Templates {
/**
* @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 := {
+ 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_TS_CSE1.cseId, in template (omit) XSD.ID p_cSE_ID := PX_TS_CSE1.cseId, in PoaList p_poaList) modifies m_createRemoteCSEBase := {
primitiveContent := {remoteCSE := m_contentCreateRemoteCSE_poa(p_resourceName, p_accessControlPolicyIds,p_cSEBase, p_cSE_ID, p_poaList)}
};
@@ -1654,7 +1654,7 @@ module OneM2M_Templates {
* @param p_appId App ID
* @param p_nodeLink Node link
*/
- template (value) AEAnnc_optional m_contentCreateAEAnnc (in template (omit) Labels p_labels, in template (omit) AcpType p_accessControlPolicyIds, XSD.ID p_appId := PX_APP_ID, in template (omit) XSD.AnyURI p_link := omit) := {
+ template (value) AEAnnc_optional m_contentCreateAEAnnc (in template (omit) Labels p_labels, in template (omit) AcpType p_accessControlPolicyIds, XSD.ID p_appId := PX_TS_AE1.appId, in template (omit) XSD.AnyURI p_link := omit) := {
resourceName := omit,//O TODO
resourceType := omit,//NP
resourceID := omit,//NP
@@ -1746,7 +1746,7 @@ module OneM2M_Templates {
* @param p_name Resource name
* @param p_accessControlPolicyIds ACP IDs for the AE
*/
- template (value) AE_optional m_contentCreateAe (in template (omit) AcpType p_accessControlPolicyIds, in template (omit) XSD.String p_name := c_defaultAeResourceName, in template (omit) XSD.ID p_appId := PX_APP_ID, in template (omit) PoaList p_poaList) := {
+ template (value) AE_optional m_contentCreateAe (in template (omit) AcpType p_accessControlPolicyIds, in template (omit) XSD.String p_name := c_defaultAeResourceName, in template (omit) XSD.ID p_appId := PX_TS_AE1.appId, in template (omit) PoaList p_poaList) := {
resourceName := p_name,//O
resourceType := omit,//NP
@@ -2627,7 +2627,7 @@ module OneM2M_Templates {
* @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):= {
+ 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_TS_CSE1.cseId, in template (omit) XSD.ID p_cSE_ID := PX_TS_CSE1.cseId):= {
resourceName := p_name,//O
resourceType := omit,//NP
resourceID := omit,//NP
@@ -2658,7 +2658,7 @@ module OneM2M_Templates {
* @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):= {
+ 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_TS_CSE1.cseId, in template (omit) XSD.ID p_cSE_ID := PX_TS_CSE1.cseId, in PoaList p_poaList):= {
resourceName := p_name,//O
resourceType := omit,//NP
resourceID := omit,//NP
@@ -4270,12 +4270,12 @@ module OneM2M_Templates {
};
template (value) RemoteCSE_optional m_contentMyRemoteCSEResource(in charstring p_pointOfAccess) modifies m_contentRemoteCSE_allOmit := {
- resourceName := PX_CSE1_NAME,//M
+ resourceName := PX_TS_CSE1.cseName,//M
resourceType := int16,//M
- resourceID := PX_CSE1_RESOURCE_ID,//M
+ resourceID := PX_TS_CSE1.cseResourceId,//M
pointOfAccess := { p_pointOfAccess }, //O
- cSEBase := f_getCompletePoA(PX_TS_CSE1.mccPortIn, "") & PX_CSE1_ID & "/" & PX_CSE1_NAME,//M
- cSE_ID := PX_CSE1_ID,//M
+ cSEBase := f_getCompletePoA(PX_TS_CSE1.mccPortIn, "") & PX_TS_CSE1.cseId & "/" & PX_TS_CSE1.cseName,//M
+ cSE_ID := PX_TS_CSE1.cseId,//M
requestReachability := true//M
};
@@ -5709,7 +5709,7 @@ module OneM2M_Templates {
contentOffset := *,
assignedTokenIdentifiers := *,
tokenRequestInformation := *,
- releaseVersionIndicator := ?,//FIXME
+ releaseVersionIndicator := *,
vendorInformation := *
}
@@ -5727,7 +5727,7 @@ module OneM2M_Templates {
contentOffset := *,
assignedTokenIdentifiers := *,
tokenRequestInformation := *,
- releaseVersionIndicator := ?,//FIXME
+ releaseVersionIndicator := *,
vendorInformation := *
}
diff --git a/LibOneM2M/OneM2M_Types.ttcn b/LibOneM2M/OneM2M_Types.ttcn
index c1518eb5b6e654a13d30c37918453fe2e661ccbb..2e97194770bc4f8d085281ea4829af5ecd2d32da 100644
--- a/LibOneM2M/OneM2M_Types.ttcn
+++ b/LibOneM2M/OneM2M_Types.ttcn
@@ -6672,11 +6672,36 @@ with {
encode "UpperTester"
}
- type ResponsePrimitive UtTriggerAckPrimitive
+ type UtResponsePrimitive UtTriggerAckPrimitive
with {
encode "UpperTester"
}
+ type record UtResponsePrimitive
+ {
+ ResponseStatusCode responseStatusCode,
+ RequestID requestIdentifier,
+ PrimitiveContent primitiveContent optional,
+ XSD.ID to_ optional,
+ XSD.ID from_ optional,
+ Timestamp originatingTimestamp optional,
+ AbsRelTimestamp resultExpirationTimestamp optional,
+ EventCat eventCategory optional,
+ ContentStatus contentStatus optional,
+ XSD.PositiveInteger contentOffset optional,
+ DynAuthLocalTokenIdAssignments assignedTokenIdentifiers optional,
+ DynAuthTokenReqInfo tokenRequestInformation optional,
+ ReleaseVersion releaseVersionIndicator optional,
+ XSD.String vendorInformation optional
+ }
+ with {
+ variant "name as uncapitalized";
+ variant "element";
+ variant (to_) "name as 'to'";
+ variant (from_) "name as 'from'";
+ };
+
+
type record AttributeAux {
XSD.NCName name,
charstring value_ optional
@@ -8931,7 +8956,7 @@ type record SutDesc {
* @member url Test System IP address
*/
type record UtDesc {
- charstring url
+ charstring url
}
/**
@@ -8940,8 +8965,16 @@ type record UtDesc {
* @member mcaPortIn TTCN-3 'mca' protocol for receiving from the SUT
*/
type record AeSimuComponentDesc {
- PortDesc mcaPort,
- PortDesc mcaPortIn
+ /**
+ * @desc Test System AE-ID with AE-ID-Stem format (relative) according to TS-0001-7.2-1
+ */
+ XSD.ID aeIdStem,
+ /**
+ * @desc Test System APP-ID with App-ID format according to TS-0001-7.2-1
+ */
+ XSD.ID appId,
+ PortDesc mcaPort,
+ PortDesc mcaPortIn
}
/**
@@ -8952,10 +8985,30 @@ type record AeSimuComponentDesc {
* @member mccPortIn TTCN-3 'mcc' protocol for receiving from the SUT
*/
type record CseSimuComponentDesc {
- PortDesc mcaPort,
- PortDesc mcaPortIn,
- PortDesc mccPort,
- PortDesc mccPortIn
+ /**
+ * @desc Test System CSE Name
+ */
+ 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,
+ /**
+ * @desc Test System CSE Supported resource type
+ */
+ ResourceTypeList_1 supportedResourceType,
+ PortDesc mcaPort,
+ PortDesc mcaPortIn,
+ PortDesc mccPort,
+ PortDesc mccPortIn
}
}
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index de918eeca6ca473367b6756073d2d90138c94981..a40e346d0ac6b58a3e56311d332f13598f011379 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -1746,7 +1746,7 @@ module OneM2M_PermutationFunctions {
f_sleepIgnoreDef(PX_TCONFIG_IUT);
//Test Body
- v_request := valueof(m_createAe(PX_APP_ID, omit, PX_CSE_ID & "/" & v_aeIdStem));
+ v_request := valueof(m_createAe(PX_TS_AE1.appId, omit, PX_CSE_ID & "/" & v_aeIdStem));
v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
@@ -1799,7 +1799,7 @@ module OneM2M_PermutationFunctions {
//Preamble
//Test Body
- v_request := valueof(m_createAe(PX_APP_ID, omit, v_aeIdStem));
+ v_request := valueof(m_createAe(PX_TS_AE1.appId, omit, v_aeIdStem));
v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
@@ -2508,7 +2508,7 @@ module OneM2M_PermutationFunctions {
vc_ae2.start(f_cse_preamble_createAcpAux("SubscriptionVerificationAcp", int63));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
- vc_ae2.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, c_defaultAE2Name, v_poaList), -1)); // AE2 is registred
+ vc_ae2.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_TS_AE2.appId, -, PX_TS_AE2.aeIdStem, c_defaultAE2Name, v_poaList), -1)); // AE2 is registred
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
v_ae2Index := f_getResourceFromAeSimu(vc_ae2);
@@ -2546,7 +2546,7 @@ module OneM2M_PermutationFunctions {
if(match(int23, p_requestPrimitive.resourceType)){
vc_ae2.start(f_cse_preamble_createAcpAux("SubscriptionVerificationAcp", int63));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
- vc_ae2.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, c_defaultAE2Name, v_poaList), -1)); // AE2 is registred
+ vc_ae2.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_TS_AE2.appId, -, PX_TS_AE2.aeIdStem, c_defaultAE2Name, v_poaList), -1)); // AE2 is registred
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
v_ae2Index := f_getResourceFromAeSimu(vc_ae2);
p_requestPrimitive.primitiveContent.subscription.notificationURI := {f_getResourceAddress(v_ae2Index)};
@@ -2620,7 +2620,7 @@ module OneM2M_PermutationFunctions {
if(match(int23, p_resourceType)){
vc_ae1.start(f_cse_preamble_createAcpAux("SubscriptionVerificationAcp", int63));
f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
- vc_ae1.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM, "MyAe", v_poaList), -1)); // AE1 is registered
+ vc_ae1.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_TS_AE1.appId, -, PX_TS_AE1.aeIdStem, "MyAe", v_poaList), -1)); // AE1 is registered
f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
v_ae1Index := f_getResourceFromAeSimu(vc_ae1);
p_requestPrimitive.primitiveContent.subscription.notificationURI := {f_getResourceAddress(v_ae1Index)};
@@ -3690,7 +3690,7 @@ module OneM2M_PermutationFunctions {
// Preamble
vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
- v_aEAnncIndex := f_cse_createResource_cseSimu(int10002, m_createAEAnnc(omit, omit, omit, PX_CSE1_ID, PX_CSE1_ID), vc_remoteCseIndex); //AEAnnnc under RemoteCSE
+ v_aEAnncIndex := f_cse_createResource_cseSimu(int10002, m_createAEAnnc(omit, omit, omit, PX_TS_CSE1.cseId, PX_TS_CSE1.cseId), vc_remoteCseIndex); //AEAnnnc under RemoteCSE
// Test Body
@@ -3802,7 +3802,7 @@ module OneM2M_PermutationFunctions {
vc_cse1.done;
vc_cse1.start(f_cse_announcementProcedure_createHandler());
- v_resourceIndex := f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, omit));
+ v_resourceIndex := f_cse_createResource(int2, m_createAe(PX_TS_AE1.appId, omit, omit));
vc_cse1.done;
if(p_resourceType == int4) {
@@ -6038,8 +6038,8 @@ module OneM2M_PermutationFunctions {
var integer v_aeIndex := -1;
var integer v_latestResourceIndex;
var ResponsePrimitive v_responsePrimitive;
- var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
- v_create.primitiveContent.aE.announceTo := {PX_CSE1_ID};
+ var template RequestPrimitive v_create := m_createAe(PX_TS_AE1.appId, omit, omit);
+ v_create.primitiveContent.aE.announceTo := {PX_TS_CSE1.cseId};
//Test control
@@ -6103,9 +6103,9 @@ module OneM2M_PermutationFunctions {
var integer v_aeIndex := -1;
var integer v_latestResourceIndex;
var ResponsePrimitive v_responsePrimitive;
- var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+ var template RequestPrimitive v_create := m_createAe(PX_TS_AE1.appId, omit, omit);
- v_create.primitiveContent.aE.announceTo := {PX_CSE1_ID};
+ v_create.primitiveContent.aE.announceTo := {PX_TS_CSE1.cseId};
//Test control
@@ -6141,7 +6141,7 @@ module OneM2M_PermutationFunctions {
setverdict(pass, __SCOPE__ & ":INFO: Announcement received");
v_responsePrimitive := valueof(m_responsePrimitive(int2004,v_request.primitive.requestPrimitive.requestIdentifier));
- v_responsePrimitive.from_ := PX_CSE1_ID;
+ v_responsePrimitive.from_ := PX_TS_CSE1.cseId;
v_responsePrimitive.to_ := v_request.primitive.requestPrimitive.from_;
f_send(e_mcc_in_port, m_response(v_responsePrimitive));
}
@@ -6992,7 +6992,7 @@ module OneM2M_PermutationFunctions {
vc_ae2.start(f_cse_createAccessControlPolicyAux("Ae2Acp",{"all"}, int63));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
- vc_ae2.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, c_defaultAE2Name, {f_getCompletePoA(PX_TS_AE2.mcaPortIn, "")}), -1)); // AE2 is registred
+ vc_ae2.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_TS_AE2.appId, -, PX_TS_AE2.aeIdStem, c_defaultAE2Name, {f_getCompletePoA(PX_TS_AE2.mcaPortIn, "")}), -1)); // AE2 is registred
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
v_ae2Index := f_getLatestResource(vc_ae2);
@@ -7457,7 +7457,7 @@ module OneM2M_PermutationFunctions {
// Preamble
v_aeIndex_1 := f_cse_preamble_registerAe(-, -); //c_CRUDNDi
- v_aeIndex_2 := f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, c_defaultAE2Name, omit), -1); // AE2 is registred
+ v_aeIndex_2 := f_cse_createResource(int2, m_createAe(PX_TS_AE2.appId, -, PX_TS_AE2.aeIdStem, c_defaultAE2Name, omit), -1); // AE2 is registred
v_acpIndex := f_cse_createResource(int1, v_createAcp, -1); // AE child resource
v_containerIndex_1 := f_cse_createResource(int3, m_createContainerBase, v_aeIndex_1); // AE1 child resource
v_containerIndex_2 := f_cse_createResource(int3, m_createContainerBase, v_aeIndex_2); // AE2 child resource
@@ -8451,8 +8451,8 @@ module OneM2M_PermutationFunctions {
var integer v_resourceIndex;
var ResponsePrimitive v_responsePrimitive;
var integer v_AEAnncResourceIndex;
- var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
- v_create.primitiveContent.aE.announceTo := {PX_CSE1_ID};
+ var template RequestPrimitive v_create := m_createAe(PX_TS_AE1.appId, omit, omit);
+ v_create.primitiveContent.aE.announceTo := {PX_TS_CSE1.cseId};
// Test control
@@ -8524,8 +8524,8 @@ module OneM2M_PermutationFunctions {
var integer v_aeIndex := -1;
var integer v_resourceIndex;
var ResponsePrimitive v_responsePrimitive;
- var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
- v_create.primitiveContent.aE.announceTo := {PX_CSE1_ID};
+ var template RequestPrimitive v_create := m_createAe(PX_TS_AE1.appId, omit, omit);
+ v_create.primitiveContent.aE.announceTo := {PX_TS_CSE1.cseId};
//Test control
//Test component configuration
@@ -8605,7 +8605,7 @@ module OneM2M_PermutationFunctions {
f_updateLocalResource(v_localResourceIndex, v_request.primitive.requestPrimitive.primitiveContent);
v_responsePrimitive.primitiveContent := vc_localResourcesList[v_localResourceIndex].resource;
}
- v_responsePrimitive.from_ := PX_CSE1_ID;
+ v_responsePrimitive.from_ := PX_TS_CSE1.cseId;
v_responsePrimitive.to_ := v_request.primitive.requestPrimitive.from_;
f_send(e_mcc_in_port, m_response(valueof(v_responsePrimitive)));
}
@@ -8654,7 +8654,7 @@ module OneM2M_PermutationFunctions {
var integer v_resourceIndex;
var integer v_containerAnncResourceIndex;
var template RequestPrimitive v_createContainer := m_createContainerBase;
- v_createContainer.primitiveContent.container.announceTo := {PX_CSE1_ID};
+ v_createContainer.primitiveContent.container.announceTo := {PX_TS_CSE1.cseId};
// Test control
@@ -8719,9 +8719,9 @@ module OneM2M_PermutationFunctions {
var integer v_resourceIndex;
var integer v_aEAnncIndex := -1;
var ResponsePrimitive v_responsePrimitive;
- var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+ var template RequestPrimitive v_create := m_createAe(PX_TS_AE1.appId, omit, omit);
- v_create.primitiveContent.aE.announceTo := {PX_CSE1_ID};
+ v_create.primitiveContent.aE.announceTo := {PX_TS_CSE1.cseId};
// Test control
@@ -8763,7 +8763,7 @@ module OneM2M_PermutationFunctions {
var integer v_aEAnncIndex := -1;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_announcedResource;
- var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+ var template RequestPrimitive v_create := m_createAe(PX_TS_AE1.appId, omit, omit);
var template RequestPrimitive v_createContainer := m_createContainerBase;
// Test control
@@ -8855,7 +8855,7 @@ module OneM2M_PermutationFunctions {
var integer v_resourceIndex;
var integer v_aEAnncIndex := -1;
var ResponsePrimitive v_responsePrimitive;
- var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+ var template RequestPrimitive v_create := m_createAe(PX_TS_AE1.appId, omit, omit);
// Test control
@@ -8896,7 +8896,7 @@ module OneM2M_PermutationFunctions {
var integer v_aEAnncIndex := -1;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_announcedResource;
- var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+ var template RequestPrimitive v_create := m_createAe(PX_TS_AE1.appId, omit, omit);
var template RequestPrimitive v_createContainer := m_createContainerBase;
// Test control
@@ -8985,8 +8985,8 @@ module OneM2M_PermutationFunctions {
var integer v_aeIndex := -1;
var integer v_aEAnncIndex := -1;
var ResponsePrimitive v_responsePrimitive;
- var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
- v_create.primitiveContent.aE.announceTo := {PX_CSE1_ID};
+ var template RequestPrimitive v_create := m_createAe(PX_TS_AE1.appId, omit, omit);
+ v_create.primitiveContent.aE.announceTo := {PX_TS_CSE1.cseId};
// Test control
@@ -9026,8 +9026,8 @@ module OneM2M_PermutationFunctions {
var integer v_resourceIndex;
var integer v_aEAnncIndex := -1;
var ResponsePrimitive v_responsePrimitive;
- var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
- v_create.primitiveContent.aE.announceTo := {PX_CSE1_ID};
+ var template RequestPrimitive v_create := m_createAe(PX_TS_AE1.appId, omit, omit);
+ v_create.primitiveContent.aE.announceTo := {PX_TS_CSE1.cseId};
// Test control
@@ -9070,8 +9070,8 @@ module OneM2M_PermutationFunctions {
var integer v_parentIndex := -1;
var integer v_aeIndex := -1;
var integer v_resourceIndex;
- var template RequestPrimitive v_createAE := m_createAe(PX_APP_ID, omit, omit);
- var template RequestPrimitive v_createAEAnnc := m_createAEAnnc(omit, omit, omit, PX_CSE1_ID, PX_CSE1_ID);
+ var template RequestPrimitive v_createAE := m_createAe(PX_TS_AE1.appId, omit, omit);
+ var template RequestPrimitive v_createAEAnnc := m_createAEAnnc(omit, omit, omit, PX_TS_CSE1.cseId, PX_TS_CSE1.cseId);
var template RequestPrimitive v_createAcp := m_createAcp("NotInitialized", "MyAcp", -, int61);
var integer v_aeAnncIndex;
var integer v_resourceAnncIndex;
@@ -9133,8 +9133,8 @@ module OneM2M_PermutationFunctions {
var integer v_parentIndex := -1;
var integer v_aeIndex := -1;
var integer v_resourceIndex;
- var template RequestPrimitive v_createAE := m_createAe(PX_APP_ID, omit, omit);
- var template RequestPrimitive v_createAEAnnc := m_createAEAnnc(omit, omit, omit, PX_CSE1_ID, PX_CSE1_ID);
+ var template RequestPrimitive v_createAE := m_createAe(PX_TS_AE1.appId, omit, omit);
+ var template RequestPrimitive v_createAEAnnc := m_createAEAnnc(omit, omit, omit, PX_TS_CSE1.cseId, PX_TS_CSE1.cseId);
var template RequestPrimitive v_createAcp := m_createAcp("NotInitialized", "MyAcp", -, int61);
var integer v_aeAnncIndex;
var integer v_resourceAnncIndex;
@@ -9184,7 +9184,7 @@ module OneM2M_PermutationFunctions {
var integer v_aeIndex := -1;
var integer v_latestResourceIndex;
var ResponsePrimitive v_responsePrimitive;
- var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+ var template RequestPrimitive v_create := m_createAe(PX_TS_AE1.appId, omit, omit);
v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
@@ -9252,7 +9252,7 @@ module OneM2M_PermutationFunctions {
var integer v_aEAnncIndex := -1;
var integer v_latestResourceIndex;
var ResponsePrimitive v_responsePrimitive;
- var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+ var template RequestPrimitive v_create := m_createAe(PX_TS_AE1.appId, omit, omit);
v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
@@ -9312,7 +9312,7 @@ module OneM2M_PermutationFunctions {
var integer v_aeIndex := -1;
var integer v_resourceIndex;
var ResponsePrimitive v_responsePrimitive;
- var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+ var template RequestPrimitive v_create := m_createAe(PX_TS_AE1.appId, omit, omit);
v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
//Test control
@@ -9380,7 +9380,7 @@ module OneM2M_PermutationFunctions {
var integer v_aEAnncIndex := -1;
var integer v_latestResourceIndex;
var ResponsePrimitive v_responsePrimitive;
- var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+ var template RequestPrimitive v_create := m_createAe(PX_TS_AE1.appId, omit, omit);
v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
@@ -9420,7 +9420,7 @@ module OneM2M_PermutationFunctions {
var integer v_aeIndex := -1;
var integer v_latestResourceIndex;
var ResponsePrimitive v_responsePrimitive;
- var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+ var template RequestPrimitive v_create := m_createAe(PX_TS_AE1.appId, omit, omit);
v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
@@ -9458,7 +9458,7 @@ module OneM2M_PermutationFunctions {
setverdict(pass, __SCOPE__ & ":INFO: Announcement received");
v_responsePrimitive := valueof(m_responsePrimitive(int2004,vc_request.primitive.requestPrimitive.requestIdentifier));
- v_responsePrimitive.from_ := PX_CSE1_ID;
+ v_responsePrimitive.from_ := PX_TS_CSE1.cseId;
v_responsePrimitive.to_ := vc_request.primitive.requestPrimitive.from_;
f_send(e_mcc_in_port, m_response(v_responsePrimitive));
}
@@ -9485,7 +9485,7 @@ module OneM2M_PermutationFunctions {
var integer v_aeIndex := -1;
var integer v_latestResourceIndex;
var ResponsePrimitive v_responsePrimitive;
- var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+ var template RequestPrimitive v_create := m_createAe(PX_TS_AE1.appId, omit, omit);
v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
@@ -9544,7 +9544,7 @@ module OneM2M_PermutationFunctions {
var integer v_aeIndex := -1;
var integer v_latestResourceIndex;
var ResponsePrimitive v_responsePrimitive;
- var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+ var template RequestPrimitive v_create := m_createAe(PX_TS_AE1.appId, omit, omit);
v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
@@ -9600,7 +9600,7 @@ module OneM2M_PermutationFunctions {
var integer v_aeIndex := -1;
var integer v_resourceIndex;
var ResponsePrimitive v_responsePrimitive;
- var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+ var template RequestPrimitive v_create := m_createAe(PX_TS_AE1.appId, omit, omit);
v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
//Test control
@@ -9666,7 +9666,7 @@ module OneM2M_PermutationFunctions {
var integer v_aeIndex := -1;
var integer v_latestResourceIndex;
var ResponsePrimitive v_responsePrimitive;
- var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+ var template RequestPrimitive v_create := m_createAe(PX_TS_AE1.appId, omit, omit);
v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
@@ -9704,7 +9704,7 @@ module OneM2M_PermutationFunctions {
setverdict(pass, __SCOPE__ & ":INFO: Announcement received");
v_responsePrimitive := valueof(m_responsePrimitive(int2004,v_request.primitive.requestPrimitive.requestIdentifier));
- v_responsePrimitive.from_ := PX_CSE1_ID;
+ v_responsePrimitive.from_ := PX_TS_CSE1.cseId;
v_responsePrimitive.to_ := v_request.primitive.requestPrimitive.from_;
f_send(e_mcc_in_port, m_response(v_responsePrimitive));
}
@@ -9731,7 +9731,7 @@ module OneM2M_PermutationFunctions {
var integer v_aeIndex := -1;
var integer v_latestResourceIndex;
var ResponsePrimitive v_responsePrimitive;
- var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+ var template RequestPrimitive v_create := m_createAe(PX_TS_AE1.appId, omit, omit);
v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
@@ -9769,7 +9769,7 @@ module OneM2M_PermutationFunctions {
setverdict(pass, __SCOPE__ & ":INFO: Announcement received");
v_responsePrimitive := valueof(m_responsePrimitive(int2004,v_request.primitive.requestPrimitive.requestIdentifier));
- v_responsePrimitive.from_ := PX_CSE1_ID;
+ v_responsePrimitive.from_ := PX_TS_CSE1.cseId;
v_responsePrimitive.to_ := v_request.primitive.requestPrimitive.from_;
f_send(e_mcc_in_port, m_response(v_responsePrimitive));
}
@@ -9796,7 +9796,7 @@ module OneM2M_PermutationFunctions {
var integer v_aeIndex := -1;
var integer v_latestResourceIndex;
var ResponsePrimitive v_responsePrimitive;
- var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+ var template RequestPrimitive v_create := m_createAe(PX_TS_AE1.appId, omit, omit);
v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
@@ -9834,7 +9834,7 @@ module OneM2M_PermutationFunctions {
setverdict(pass, __SCOPE__ & ":INFO: Announcement received");
v_responsePrimitive := valueof(m_responsePrimitive(int2004,v_request.primitive.requestPrimitive.requestIdentifier));
- v_responsePrimitive.from_ := PX_CSE1_ID;
+ v_responsePrimitive.from_ := PX_TS_CSE1.cseId;
v_responsePrimitive.to_ := v_request.primitive.requestPrimitive.from_;
f_send(e_mcc_in_port, m_response(v_responsePrimitive));
}
@@ -9860,7 +9860,7 @@ module OneM2M_PermutationFunctions {
var integer v_aeIndex := -1;
var integer v_latestResourceIndex;
var ResponsePrimitive v_responsePrimitive;
- var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+ var template RequestPrimitive v_create := m_createAe(PX_TS_AE1.appId, omit, omit);
v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
@@ -9898,7 +9898,7 @@ module OneM2M_PermutationFunctions {
setverdict(pass, __SCOPE__ & ":INFO: Announcement received");
v_responsePrimitive := valueof(m_responsePrimitive(int2004,vc_request.primitive.requestPrimitive.requestIdentifier));
- v_responsePrimitive.from_ := PX_CSE1_ID;
+ v_responsePrimitive.from_ := PX_TS_CSE1.cseId;
v_responsePrimitive.to_ := vc_request.primitive.requestPrimitive.from_;
f_send(e_mcc_in_port, m_response(v_responsePrimitive));
}
@@ -9922,7 +9922,7 @@ module OneM2M_PermutationFunctions {
var integer v_aeIndex := -1;
var integer v_resourceIndex;
var ResponsePrimitive v_responsePrimitive;
- var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+ var template RequestPrimitive v_create := m_createAe(PX_TS_AE1.appId, omit, omit);
v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
//Test control
@@ -9986,7 +9986,7 @@ module OneM2M_PermutationFunctions {
var integer v_resourceIndex;
var integer v_AEAnncResourceIndex;
var ResponsePrimitive v_responsePrimitive;
- var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+ var template RequestPrimitive v_create := m_createAe(PX_TS_AE1.appId, omit, omit);
v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
//Test control
@@ -10052,7 +10052,7 @@ module OneM2M_PermutationFunctions {
var integer v_aeIndex := -1;
var integer v_resourceIndex;
var ResponsePrimitive v_responsePrimitive;
- var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+ var template RequestPrimitive v_create := m_createAe(PX_TS_AE1.appId, omit, omit);
v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
//Test control
@@ -10120,7 +10120,7 @@ module OneM2M_PermutationFunctions {
var integer v_aeIndex := -1;
var integer v_latestResourceIndex;
var ResponsePrimitive v_responsePrimitive;
- var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+ var template RequestPrimitive v_create := m_createAe(PX_TS_AE1.appId, omit, omit);
v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
@@ -10207,7 +10207,7 @@ module OneM2M_PermutationFunctions {
v_aeIndex1 := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);//c_CRDNDi);
- vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, {f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, PX_AE2_ID_STEM, c_defaultAE2Name, -), -1)); // AE2 is registred
+ vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_TS_AE2.appId, {f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, PX_TS_AE2.aeIdStem, c_defaultAE2Name, -), -1)); // AE2 is registred
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
v_aeIndex2 := f_getResourceFromAeSimu(vc_ae2);
@@ -10903,7 +10903,7 @@ module OneM2M_PermutationFunctions {
f_checkAeSimuStatus();
- vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, c_defaultAE2Name, {f_getCompletePoA(PX_TS_AE2.mcaPortIn, "")}))); // AE2 is registred
+ vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_TS_AE2.appId, -, PX_TS_AE2.aeIdStem, c_defaultAE2Name, {f_getCompletePoA(PX_TS_AE2.mcaPortIn, "")}))); // AE2 is registred
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
diff --git a/OneM2M_TestControl_IN_profile.ttcn b/OneM2M_TestControl_IN_profile.ttcn
index 90433b9bf2c50c97ac6713d203ef485ce355cd32..f611c26d6a64de2f79a8da11a51aa6b2740b47c3 100644
--- a/OneM2M_TestControl_IN_profile.ttcn
+++ b/OneM2M_TestControl_IN_profile.ttcn
@@ -115,7 +115,7 @@ module OneM2M_TestControl_IN_profile {
if(true) {execute (TC_CSE_DMR_CRE_001_CNT_CNT());}
if(true) {execute (TC_CSE_DMR_CRE_002_CNT());}
if(true) {execute (TC_CSE_DMR_CRE_003_CNT());}
- if(true) {execute (TC_CSE_DMR_CRE_007 ());}
+ if(true) {execute (TC_CSE_DMR_CRE_007_CNT_CIN ());}
if(true) {execute (TC_CSE_DMR_CRE_008 ());}
if(true) {execute (TC_CSE_DMR_CRE_009 ());}
if(true) {execute (TC_CSE_DMR_CRE_010 ());}
@@ -130,7 +130,7 @@ module OneM2M_TestControl_IN_profile {
if(true) {execute (TC_CSE_DMR_UPD_005());}
if(true) {execute (TC_CSE_DMR_UPD_007_CNT_CT());}
if(true) {execute (TC_CSE_DMR_UPD_009_CNT_EXC());}
- if(true) {execute (TC_CSE_DMR_UPD_010 ());}
+ if(true) {execute (TC_CSE_DMR_UPD_010_CNT ());}
if(true) {execute (TC_CSE_DMR_UPD_016_CNT_ET());}
if(true) {execute (TC_CSE_DMR_DEL_001_CNT());}
if(true) {execute (TC_CSE_DMR_DEL_005 ());}
@@ -147,7 +147,7 @@ module OneM2M_TestControl_IN_profile {
if(true) {execute (TC_CSE_DMR_CRE_005_MBS());}
if(true) {execute (TC_CSE_DMR_CRE_006_MBS());}
if(PICS_CNT_MBS) {execute (TC_CSE_DMR_CRE_012_CNT_MBS());}
- if(true) {execute (TC_CSE_DMR_CRE_013());}
+ if(true) {execute (TC_CSE_DMR_CRE_013_CNT_CIN());}
if(PICS_CNT_MBS) {execute (TC_CSE_DMR_UPD_014_CNT_MBS());}
if(PICS_CNT_MBS) {execute (TC_CSE_DMR_UPD_015_CNT_MBS());}
if(true) {execute (TC_CSE_DMR_CRE_005_MIA());}
@@ -159,7 +159,7 @@ module OneM2M_TestControl_IN_profile {
//CE_DMR_00002
if(true) {execute (TC_CSE_DMR_CRE_001_CIN_CNT());}
if(true) {execute (TC_CSE_DMR_RET_001_CIN());}
- if(true) {execute (TC_CSE_DMR_UPD_011());}
+ if(true) {execute (TC_CSE_DMR_UPD_011_CNT_CIN());}
if(true) {execute (TC_CSE_DMR_DEL_001_CIN());}
if(PICS_CIN_LBL) {execute (TC_CSE_DMR_CRE_012_CIN_LBL());}
if(PICS_CIN_CR) {execute (TC_CSE_DMR_CRE_012_CIN_CR());}
diff --git a/OneM2M_TestControl_MN_profile.ttcn b/OneM2M_TestControl_MN_profile.ttcn
index 4b59fa6cc97f266f346f7113ed4ede6f6b9839b0..7ea593c7b53dde80d13b084b3c08444e14818ddf 100644
--- a/OneM2M_TestControl_MN_profile.ttcn
+++ b/OneM2M_TestControl_MN_profile.ttcn
@@ -138,7 +138,7 @@ module OneM2M_TestControl_MN_profile {
if(true) {execute (TC_CSE_DMR_CRE_001_CNT_CNT());}
if(true) {execute (TC_CSE_DMR_CRE_002_CNT());}
if(true) {execute (TC_CSE_DMR_CRE_003_CNT());}
- if(true) {execute (TC_CSE_DMR_CRE_007 ());}
+ if(true) {execute (TC_CSE_DMR_CRE_007_CNT_CIN ());}
if(true) {execute (TC_CSE_DMR_CRE_008 ());}
if(true) {execute (TC_CSE_DMR_CRE_009 ());}
if(true) {execute (TC_CSE_DMR_CRE_010 ());}
@@ -153,7 +153,7 @@ module OneM2M_TestControl_MN_profile {
if(true) {execute (TC_CSE_DMR_UPD_005());}
if(true) {execute (TC_CSE_DMR_UPD_007_CNT_CT());}
if(true) {execute (TC_CSE_DMR_UPD_009_CNT_EXC());}
- if(true) {execute (TC_CSE_DMR_UPD_010());}
+ if(true) {execute (TC_CSE_DMR_UPD_010_CNT());}
if(true) {execute (TC_CSE_DMR_UPD_016_CNT_ET());}
if(true) {execute (TC_CSE_DMR_DEL_001_CNT());}
if(true) {execute (TC_CSE_DMR_DEL_005 ());}
@@ -170,7 +170,7 @@ module OneM2M_TestControl_MN_profile {
if(true) {execute (TC_CSE_DMR_CRE_005_MBS());}
if(true) {execute (TC_CSE_DMR_CRE_006_MBS());}
if(PICS_CNT_MBS) {execute (TC_CSE_DMR_CRE_012_CNT_MBS());}
- if(true) {execute (TC_CSE_DMR_CRE_013());}
+ if(true) {execute (TC_CSE_DMR_CRE_013_CNT_CIN());}
if(PICS_CNT_MBS) {execute (TC_CSE_DMR_UPD_014_CNT_MBS());}
if(PICS_CNT_MBS) {execute (TC_CSE_DMR_UPD_015_CNT_MBS());}
if(true) {execute (TC_CSE_DMR_CRE_005_MIA());}
@@ -182,7 +182,7 @@ module OneM2M_TestControl_MN_profile {
//CE_DMR_00002
if(true) {execute (TC_CSE_DMR_CRE_001_CIN_CNT());}
if(true) {execute (TC_CSE_DMR_RET_001_CIN());}
- if(true) {execute (TC_CSE_DMR_UPD_011());}
+ if(true) {execute (TC_CSE_DMR_UPD_011_CNT_CIN());}
if(true) {execute (TC_CSE_DMR_DEL_001_CIN());}
if(PICS_CIN_LBL) {execute (TC_CSE_DMR_CRE_012_CIN_LBL());}
if(PICS_CIN_CR) {execute (TC_CSE_DMR_CRE_012_CIN_CR());}
diff --git a/OneM2M_Testcases_AE_Release_1.ttcn b/OneM2M_Testcases_AE_Release_1.ttcn
index 346f114608a5b560ae036c46cf68a50bacffeaf8..08c00b34b38bf4db7e09f8279aa08829e41dd999 100644
--- a/OneM2M_Testcases_AE_Release_1.ttcn
+++ b/OneM2M_Testcases_AE_Release_1.ttcn
@@ -2220,7 +2220,7 @@ module OneM2M_Testcases_AE_Release_1 {
tc_ac.stop;
setverdict(pass, __SCOPE__&":INFO: Polling request received successfuly");
v_response_rsp1 := valueof(m_responsePrimitive(int2000,v_request_req1.primitive.requestPrimitive.requestIdentifier));
- v_response_rsp1.from_ := PX_CSE1_ID;
+ v_response_rsp1.from_ := PX_TS_CSE1.cseId;
v_response_rsp1.to_ := v_request_req1.primitive.requestPrimitive.from_;
//Put in the primitiveContent a Notify request (req2) (simulated) from another node CSE
v_request_req2 := valueof(m_notify(f_getLocalResourceAddress(v_pollingChannelIndex)));
diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index afd9c5d85b0309819ffd80891cc11334779a6f33..4c85bb386ecefad4d7c4d367a035b68ce4c60ef4 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -463,7 +463,7 @@ module OneM2M_Testcases_CSE_Release_1 {
vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSE);
//Test Body
- vc_ae1.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_ALLOWED_S_AE_IDS[0])));
+ vc_ae1.start(f_cse_createResource(int2, m_createAe(PX_TS_AE1.appId, -, PX_ALLOWED_S_AE_IDS[0])));
v_requestPrimitive := mw_createAEAnnc_s_ae_id(PX_CSE_ID & "/" & PX_ALLOWED_S_AE_IDS[0], -, -, PX_CSE_ID & "/" & PX_ALLOWED_S_AE_IDS[0]);
@@ -536,7 +536,7 @@ module OneM2M_Testcases_CSE_Release_1 {
//Test Body
//v_request := valueof(m_createAe(PX_APP_ID, omit, "C-AE-ID-STEM"));
- v_request := f_getCreateRequestPrimitive(int2, m_createAe(PX_APP_ID, omit, PX_NOT_ALLOWED_C_AE_IDS[0]), -1);
+ v_request := f_getCreateRequestPrimitive(int2, m_createAe(PX_TS_AE1.appId, omit, PX_NOT_ALLOWED_C_AE_IDS[0]), -1);
f_send(e_mca_port, m_request(v_request));
tc_ac.start;
@@ -598,10 +598,10 @@ module OneM2M_Testcases_CSE_Release_1 {
vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSE);
//Test Body
- vc_ae1.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, -, "S")));
+ vc_ae1.start(f_cse_createResource(int2, m_createAe(PX_TS_AE1.appId, -, "S")));
v_requestPrimitive := mw_createAEAnnc_s_ae_id(PX_CSE_ID & "/S", -, -, v_link);
- v_requestPrimitive.primitiveContent.aEAnnc.app_ID := PX_APP_ID;
+ v_requestPrimitive.primitiveContent.aEAnnc.app_ID := PX_TS_AE1.appId;
tc_ac.start;
alt{
@@ -665,7 +665,7 @@ module OneM2M_Testcases_CSE_Release_1 {
vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSE);
//Test Body
- vc_ae1.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, -, "S")));
+ vc_ae1.start(f_cse_createResource(int2, m_createAe(PX_TS_AE1.appId, -, "S")));
v_requestPrimitive := mw_createAEAnnc_s_ae_id(PX_CSE_ID & "/S", -, -, v_link);
@@ -737,7 +737,7 @@ module OneM2M_Testcases_CSE_Release_1 {
vc_cse1.start(f_cse_announcementProcedure_createHandler(v_requestPrimitive));
- f_send(e_mca_port, m_request(f_getCreateRequestPrimitive(int2, m_createAe(PX_APP_ID, omit, "S"),-1)));
+ f_send(e_mca_port, m_request(f_getCreateRequestPrimitive(int2, m_createAe(PX_TS_AE1.appId, omit, "S"),-1)));
//Test Body
tc_ac.start;
@@ -808,7 +808,7 @@ module OneM2M_Testcases_CSE_Release_1 {
//Preamble
vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSE);
- vc_ae1.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, "S")));
+ vc_ae1.start(f_cse_createResource(int2, m_createAe(PX_TS_AE1.appId, omit, "S")));
v_aeAnncIndex := f_cse_announcementProcedure_createHandler(-, -, -);
@@ -826,7 +826,7 @@ module OneM2M_Testcases_CSE_Release_1 {
f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
//Test Body
- vc_ae1.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, vc_resourcesList[v_aeIndex].resource.aE.aE_ID)));
+ vc_ae1.start(f_cse_createResource(int2, m_createAe(PX_TS_AE1.appId, omit, vc_resourcesList[v_aeIndex].resource.aE.aE_ID)));
tc_ac.start;
@@ -891,7 +891,7 @@ module OneM2M_Testcases_CSE_Release_1 {
vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
//Create AEAnnc
- v_aeAnncIndex := f_cse_announcementProcedure_announceResource(int2, m_createAEAnnc(-, f_getResourceAddress(vc_remoteCseIndex), PX_CSE1_ID & "/" & "S", PX_APP_ID, PX_CSE1_ID & "/" & "S"));
+ v_aeAnncIndex := f_cse_announcementProcedure_announceResource(int2, m_createAEAnnc(-, f_getResourceAddress(vc_remoteCseIndex), PX_TS_CSE1.cseId & "/" & "S", PX_TS_AE1.appId, PX_TS_CSE1.cseId & "/" & "S"));
//Update AEAnnc to simulate deregistration of AE
v_request := f_getUpdateRequestPrimitive(f_getAnnouncedResourceType(int2),v_aeAnncIndex, valueof(m_updateAEAnncBase));//TODO
@@ -904,7 +904,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_request := f_getUpdateRequestPrimitive(f_getAnnouncedResourceType(int2),v_aeAnncIndex, v_request);//TODO
v_request.primitiveContent.aEAnnc.labels := {"Credential-ID:None"};
- v_request.primitiveContent.aEAnnc.link := PX_CSE1_ID & "/" & vc_resourcesList[v_aeAnncIndex].resource.aEAnnc.aE_ID;
+ v_request.primitiveContent.aEAnnc.link := PX_TS_CSE1.cseId & "/" & vc_resourcesList[v_aeAnncIndex].resource.aEAnnc.aE_ID;
f_send(e_mcc_port, m_request(v_request));
tc_ac.start;
@@ -968,7 +968,7 @@ module OneM2M_Testcases_CSE_Release_1 {
vc_cse1.start(f_cse_announcementProcedure_createHandler());
- v_aeIndex := f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, PX_ALLOWED_S_AE_IDS[0]));
+ v_aeIndex := f_cse_createResource(int2, m_createAe(PX_TS_AE1.appId, omit, PX_ALLOWED_S_AE_IDS[0]));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
@@ -984,7 +984,7 @@ module OneM2M_Testcases_CSE_Release_1 {
vc_cse1.start(f_cse_announcementProcedure_updateHandler(v_updateAeAnnc));
- v_request := valueof(m_createAe(PX_APP_ID, omit, f_getResourceId(vc_resourcesList[v_aeIndex].resource)));
+ v_request := valueof(m_createAe(PX_TS_AE1.appId, omit, f_getResourceId(vc_resourcesList[v_aeIndex].resource)));
f_send(e_mca_port, m_request(v_request));
tc_ac.start;
@@ -1051,7 +1051,7 @@ module OneM2M_Testcases_CSE_Release_1 {
//Preamble
//Test Body
- v_request := valueof(m_createAe(PX_APP_ID, omit, "C"));
+ v_request := valueof(m_createAe(PX_TS_AE1.appId, omit, "C"));
v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
@@ -1097,7 +1097,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_REG_CRE_012_AE_LBL() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, PX_AE1_ID_STEM);
+ var template RequestPrimitive v_create := m_createAe(PX_TS_AE1.appId, omit, PX_TS_AE1.aeIdStem);
v_create.primitiveContent.aE.labels := {"labels"};
v_ae1.start(f_CSE_REG_CRE_012(v_create));
v_ae1.done;
@@ -1105,7 +1105,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_REG_CRE_012_AE_APN() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, PX_AE1_ID_STEM);
+ var template RequestPrimitive v_create := m_createAe(PX_TS_AE1.appId, omit, PX_TS_AE1.aeIdStem);
v_create.primitiveContent.aE.appName := "AeAppName";
v_ae1.start(f_CSE_REG_CRE_012(v_create));
@@ -1114,7 +1114,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_REG_CRE_012_AE_POA() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, PX_AE1_ID_STEM);
+ var template RequestPrimitive v_create := m_createAe(PX_TS_AE1.appId, omit, PX_TS_AE1.aeIdStem);
v_create.primitiveContent.aE.pointOfAccess := {f_getCompletePoA(PX_TS_AE1.mcaPortIn)};
v_ae1.start(f_CSE_REG_CRE_012(v_create));
v_ae1.done;
@@ -1201,7 +1201,7 @@ module OneM2M_Testcases_CSE_Release_1 {
var RequestPrimitive v_request;
var integer v_cseBaseIndex := -1;
var ResourceType v_resourceType := int2;
- var universal charstring v_action := __SCOPE__ & ": Please, make sure that the following AppId is not allowed to register: " & PX_APP_ID;
+ var universal charstring v_action := __SCOPE__ & ": Please, make sure that the following AppId is not allowed to register: " & PX_NOT_ALLOWED_APP_ID;
//Test control
@@ -1213,7 +1213,7 @@ module OneM2M_Testcases_CSE_Release_1 {
f_sleepIgnoreDef(PX_TCONFIG_IUT);
// Test Body
- v_request := valueof(m_createAe(PX_NOT_ALLOWED_APP_ID, -, PX_AE1_ID_STEM, -, -));
+ v_request := valueof(m_createAe(PX_NOT_ALLOWED_APP_ID, -, PX_TS_AE1.aeIdStem, -, -));
v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, v_cseBaseIndex);
@@ -1257,7 +1257,7 @@ module OneM2M_Testcases_CSE_Release_1 {
//Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM);
+ var template RequestPrimitive v_createRequest := m_createAe(PX_TS_AE1.appId, -, PX_TS_AE1.aeIdStem);
v_createRequest.primitiveContent.aE.app_ID := omit; //Mandatory app_ID field is being set empty
v_ae1.start(f_CSE_REG_CRE_017(v_createRequest));
@@ -1268,7 +1268,7 @@ module OneM2M_Testcases_CSE_Release_1 {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM);
+ var template RequestPrimitive v_createRequest := m_createAe(PX_TS_AE1.appId, -, PX_TS_AE1.aeIdStem);
v_createRequest.primitiveContent.aE.requestReachability := omit; //Mandatory requestReachability field is being set empty
v_ae1.start(f_CSE_REG_CRE_017(v_createRequest));
@@ -1433,7 +1433,7 @@ module OneM2M_Testcases_CSE_Release_1 {
//Preamble
//Test Body
- v_request := valueof(m_createAe(PX_APP_ID, omit, "S"));
+ v_request := valueof(m_createAe(PX_TS_AE1.appId, omit, "S"));
v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
@@ -1564,7 +1564,7 @@ module OneM2M_Testcases_CSE_Release_1 {
//Preamble
//Test Body
- v_request := valueof(m_createAe(PX_APP_ID, omit, "C"));
+ v_request := valueof(m_createAe(PX_TS_AE1.appId, omit, "C"));
v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
@@ -1634,7 +1634,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
//Test Body
- v_request := valueof(m_createAe(PX_APP_ID, omit, vc_resourcesList[v_aeIndex].resource.aE.aE_ID));
+ v_request := valueof(m_createAe(PX_TS_AE1.appId, omit, vc_resourcesList[v_aeIndex].resource.aE.aE_ID));
v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
@@ -1722,7 +1722,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_response.primitiveContent := vc_localResourcesList[vc_localRemoteCseIndex].resource;
v_cseRegistered := true;
}
- v_response.from_ := PX_CSE1_ID;
+ v_response.from_ := PX_TS_CSE1.cseId;
v_response.to_ := v_request.primitive.requestPrimitive.from_;
f_send(e_mcc_in_port, m_response(v_response));
tc_ac.start(10.0);
@@ -2036,7 +2036,7 @@ module OneM2M_Testcases_CSE_Release_1 {
vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
//Test Body
- v_request := valueof(m_createAEAnnc(-, f_getResourceAddress(vc_remoteCseIndex), PX_CSE1_ID & "/" & PX_ALLOWED_S_AE_IDS[0], PX_APP_ID, PX_CSE1_ID & "/" & PX_ALLOWED_S_AE_IDS[0]));
+ v_request := valueof(m_createAEAnnc(-, f_getResourceAddress(vc_remoteCseIndex), PX_TS_CSE1.cseId & "/" & PX_ALLOWED_S_AE_IDS[0], PX_TS_AE1.appId, PX_TS_CSE1.cseId & "/" & PX_ALLOWED_S_AE_IDS[0]));
v_request := f_getCreateRequestPrimitive(int10002, v_request, vc_remoteCseIndex);
v_primitiveContent.aEAnnc := mw_contentAeAnnc_base;
@@ -2051,7 +2051,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_aeAnncIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int10002);
setverdict(pass, __SCOPE__ & ": AEAnnc successfully created.");
- if(v_response.primitive.responsePrimitive.primitiveContent.aEAnnc.link != PX_CSE1_ID & "/" & PX_ALLOWED_S_AE_IDS[0]) {
+ if(v_response.primitive.responsePrimitive.primitiveContent.aEAnnc.link != PX_TS_CSE1.cseId & "/" & PX_ALLOWED_S_AE_IDS[0]) {
setverdict(fail, __SCOPE__ & ": Link attribute not correct");
}
if(v_response.primitive.responsePrimitive.primitiveContent.aEAnnc.labels != {"Credential-ID:None"}) {
@@ -2109,7 +2109,7 @@ module OneM2M_Testcases_CSE_Release_1 {
vc_cse1.start(f_cse_announcementProcedure_createHandler(mw_createAEAnnc_s_ae_id(PX_CSE_ID & "/" & PX_ALLOWED_S_AE_IDS[0], -, -, -)));
- v_request := valueof(m_createAe(PX_APP_ID, omit, PX_ALLOWED_S_AE_IDS[0]));
+ v_request := valueof(m_createAe(PX_TS_AE1.appId, omit, PX_ALLOWED_S_AE_IDS[0]));
v_request := f_getCreateRequestPrimitive(int2, v_request, -1);
f_send(e_mca_port, m_request(v_request));
@@ -2182,7 +2182,7 @@ module OneM2M_Testcases_CSE_Release_1 {
vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
//Test Body
- v_request := valueof(m_createAEAnnc(-, f_getResourceAddress(vc_remoteCseIndex), PX_CSE1_ID & "/" & "S", PX_APP_ID, PX_CSE1_ID & "/" & "S"));
+ v_request := valueof(m_createAEAnnc(-, f_getResourceAddress(vc_remoteCseIndex), PX_TS_CSE1.cseId & "/" & "S", PX_TS_AE1.appId, PX_TS_CSE1.cseId & "/" & "S"));
v_request := f_getCreateRequestPrimitive(int10002, v_request, vc_remoteCseIndex);
v_primitiveContent.aEAnnc := mw_contentAeAnnc_base;
@@ -2405,7 +2405,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_REG_RET_004_LBL() runs on Tester system CseSystem {
// Local variables
var Labels v_labels_1 := {"VALUE_1"};
- var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM);
+ var template RequestPrimitive v_createRequest := m_createAe(PX_TS_AE1.appId, -, PX_TS_AE1.aeIdStem);
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
@@ -2423,7 +2423,7 @@ module OneM2M_Testcases_CSE_Release_1 {
//Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM);
+ var template RequestPrimitive v_createRequest := m_createAe(PX_TS_AE1.appId, -, PX_TS_AE1.aeIdStem);
var template PrimitiveContent v_contentResponse;
v_createRequest.primitiveContent.aE.appName := "AeAppName";
@@ -2438,7 +2438,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_REG_RET_004_POA() runs on Tester system CseSystem {
//Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM);
+ var template RequestPrimitive v_createRequest := m_createAe(PX_TS_AE1.appId, -, PX_TS_AE1.aeIdStem);
var template PrimitiveContent v_contentResponse;
v_createRequest.primitiveContent.aE.pointOfAccess := {f_getCompletePoA(PX_TS_AE1.mcaPortIn)};
@@ -2810,7 +2810,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_response := valueof(m_responsePrimitive(int2000,v_request.primitive.requestPrimitive.requestIdentifier));
v_response.primitiveContent := vc_localResourcesList[v_localResourceIndex].resource;
}
- v_response.from_ := PX_CSE1_ID;
+ v_response.from_ := PX_TS_CSE1.cseId;
v_response.to_ := v_request.primitive.requestPrimitive.from_;
f_send(e_mcc_in_port, m_response(v_response));
}
@@ -3324,7 +3324,7 @@ module OneM2M_Testcases_CSE_Release_1 {
setverdict(pass, __SCOPE__ & ": <remoteCSE> delete request has been received");
v_response := valueof(m_responsePrimitive(int2002,v_request.primitive.requestPrimitive.requestIdentifier));
}
- v_response.from_ := PX_CSE1_ID;
+ v_response.from_ := PX_TS_CSE1.cseId;
v_response.to_ := v_request.primitive.requestPrimitive.from_;
f_send(e_mcc_in_port, m_response(v_response));
}
@@ -3375,7 +3375,7 @@ module OneM2M_Testcases_CSE_Release_1 {
// Test adapter configuration
// Preamble
- v_aeIndex := f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, "S"));//c_CRUDNDi);
+ v_aeIndex := f_cse_createResource(int2, m_createAe(PX_TS_AE1.appId, omit, "S"));//c_CRUDNDi);
// Test Body
v_request := valueof(m_delete(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex)));
@@ -3444,7 +3444,7 @@ module OneM2M_Testcases_CSE_Release_1 {
//Preamble
vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSE);
- vc_ae1.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, "S")));
+ vc_ae1.start(f_cse_createResource(int2, m_createAe(PX_TS_AE1.appId, omit, "S")));
v_aeAnncIndex := f_cse_announcementProcedure_createHandler(-, -, -);
@@ -3518,7 +3518,7 @@ module OneM2M_Testcases_CSE_Release_1 {
vc_cse1.start(f_cse_registrationRemoteCse(mw_createRemoteCSE));
vc_cse1.done;
- v_aeIndex := f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, "S"));
+ v_aeIndex := f_cse_createResource(int2, m_createAe(PX_TS_AE1.appId, omit, "S"));
vc_cse1.start(f_cse_announcementProcedure_createHandler());
f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
@@ -4131,89 +4131,29 @@ module OneM2M_Testcases_CSE_Release_1 {
}// end group g_CSE_DMR_CRE_006
+ group g_CSE_DMR_CRE_007 {
+
/**
- * @desc Check that the IUT responds with error when the newly created <contentInstance> results in that the field value of attribute currentNrOfInstances exceeds the field value of maxNrOfInstances in the parent container resource.
+ * @desc Checks that the IUT accepts a newly created RESOURCE_TYPE when the currentNrOfInstances exceeds the field value set in maxNrOfInstances in the PARENT_RESOURCE_TYPE resource by removing enough of the oldest RESOURCE_TYPE resources to allow the creation of the new RESOURCE_TYPE resource
*
*/
- testcase TC_CSE_DMR_CRE_007() runs on Tester system CseSystem {
-
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-
- v_ae1.start(f_CSE_DMR_CRE_007());
-
- v_ae1.done;
-
- }
-
- function f_CSE_DMR_CRE_007() runs on AeSimu system CseSystem {
+ testcase TC_CSE_DMR_CRE_007_CNT_CIN() runs on Tester system CseSystem {
// Local variables
var template RequestPrimitive v_createRequestContainer := m_createContainerBase;
- var template RequestPrimitive v_createRequestContentInstance := m_createContentInstanceBase;
- var MsgIn v_response;
- var RequestPrimitive v_request;
- var integer v_aeIndex := -1;
- var integer v_containerIndex := -1;
- var integer v_contentInstanceIndex := -1;
+ var template RequestPrimitive v_createRequestContentInstance1 := m_createContentInstanceBase;
+ var template RequestPrimitive v_createRequestContentInstance2 := m_createContentInstanceBase;
const integer c_maxNumberOfInstances := 1;
- // Test control
-
- // Test component configuration
- f_cf01Up();
-
- // Test adapter configuration
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- // Preamble
- v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-
v_createRequestContainer.primitiveContent.container.maxNrOfInstances := c_maxNumberOfInstances;
+ v_createRequestContentInstance2.primitiveContent.contentInstance.resourceName := c_defaultContentInstanceResourceName & "2"; //Resource 2
- v_containerIndex := f_cse_createResource(int3, v_createRequestContainer, v_aeIndex); //Container
-
- v_contentInstanceIndex := f_cse_createResource(int4, m_createContentInstanceBase, v_containerIndex); //ContentInstance
-
- // Test Body
-
- v_createRequestContentInstance.primitiveContent.contentInstance.resourceName := c_defaultContentInstanceResourceName & "2"; //ContentInstance 2
- v_request := f_getCreateRequestPrimitive(int4, v_createRequestContentInstance, v_containerIndex);
-
- f_send(e_mca_port, m_request(v_request));
- tc_ac.start;
- alt {
- [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
- tc_ac.stop;
- setverdict(pass, __SCOPE__ & ": ContentInstance created");
- }
- [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Wrong response status code in the response");
+ v_ae1.start(f_CSE_DMR_CRE_007(int3, v_createRequestContainer, int4, v_createRequestContentInstance1, v_createRequestContentInstance2, c_defaultContentInstanceResourceName));//ContentInstance under Container
+ v_ae1.done;
}
- [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Error while creating resource type contentInstance");
- }
- [] tc_ac.timeout {
- setverdict(fail, __SCOPE__ & ": No answer while creating resource type contentInstance");
- }
- }
+ }// end group g_CSE_DMR_CRE_007
- f_checkAeSimuStatus();
-
- //Check to see if the resource is NOT present
- if(f_cse_isResourceNotPresent(v_containerIndex, c_defaultContentInstanceResourceName)){
- setverdict(pass, __SCOPE__ & ":INFO: Oldest contentInstance has been removed to allow the creation of the new contentInstance");
- } else {
- setverdict(fail, __SCOPE__ & ":ERROR: Oldest contentInstance has not been removed to allow the creation of the new contentInstance");
- }
-
- // Postamble
- f_cse_postamble_deleteResources();
-
- // Tear down
- f_cf01Down();
-
- }//end f_CSE_DMR_CRE_007
-
/**
* @desc Checks that the IUT accepts a newly created contentInstance when the currentByteSize exceeds the field value set in maxByteSize in the parent container resource by removing enough of the oldest <contentInstance> resources to allow the creation of the new <contentInstance> resource.
*
@@ -4695,74 +4635,27 @@ module OneM2M_Testcases_CSE_Release_1 {
}// end group g_CSE_DMR_CRE_012
+ group g_CSE_DMR_CRE_013 {
+
/**
- * @desc Check that the IUT rejects the CREATE Request of a contentInstance resource with error “NOT_ACCEPTABLE†when contentSize exceeds maxByteSize
+ * @desc Check that the IUT rejects the CREATE Request of a RESOURCE_TYPE resource with error “NOT_ACCEPTABLE†when contentSize exceeds maxByteSize of the PARENT_RESOURCE_TYPE
*
*/
- testcase TC_CSE_DMR_CRE_013() runs on Tester system CseSystem {
-
+ testcase TC_CSE_DMR_CRE_013_CNT_CIN() runs on Tester system CseSystem {
+ // Local variables
+ var template RequestPrimitive v_createRequestContainer := m_createContainerBase;
+ var template RequestPrimitive v_createRequestContentInstance := m_createContentInstanceBase;
+ const integer c_maxByteSize := 1;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- v_ae1.start(f_CSE_DMR_CRE_013());
+ v_createRequestContainer.primitiveContent.container.maxByteSize := c_maxByteSize;
+ v_ae1.start(f_CSE_DMR_CRE_013(int3, v_createRequestContainer, int4, v_createRequestContentInstance));//ContentInstance under Container
v_ae1.done;
-
}
- function f_CSE_DMR_CRE_013() runs on AeSimu system CseSystem {
- // Local variables
- var template RequestPrimitive v_createRequest := m_createContainerBase;
- var MsgIn v_response;
- var RequestPrimitive v_request;
- var integer v_aeIndex := -1;
- var integer v_containerIndex := -1;
- const integer c_maxByteSize := 1;
- // Test control
-
- // Test component configuration
- f_cf01Up();
+ }// end group g_CSE_DMR_CRE_013
- // Test adapter configuration
-
- // Preamble
- v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-
- v_createRequest.primitiveContent.container.maxByteSize := c_maxByteSize;
-
- v_containerIndex := f_cse_createResource(int3, v_createRequest, v_aeIndex);
-
- // Test Body
- v_request := f_getCreateRequestPrimitive(int4, m_createContentInstanceBase, v_containerIndex);
-
- f_send(e_mca_port, m_request(v_request));
- tc_ac.start;
- alt {
- [] mcaPort.receive(mw_response(mw_responsePrimitive(int5207))) -> value v_response {
- tc_ac.stop;
- setverdict(pass, __SCOPE__ & ": Maximum byte size exceeded");
- }
- [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Bad responseStatusCode in response");
- }
-
- [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Accepted creation of contentInstance exceding maximum byte size");
- }
- [] tc_ac.timeout {
- setverdict(fail, __SCOPE__ & ": No answer while creating resource type 4");
- }
- }
-
- // Postamble
- f_cse_postamble_deleteResources();
-
- // Tear down
- f_cf01Down();
-
- }//end f_CSE_DMR_CRE_013
-
group g_CSE_DMR_CRE_014 {
/**
@@ -5077,7 +4970,7 @@ module OneM2M_Testcases_CSE_Release_1 {
var template PrimitiveContent v_contentResponse;
v_contentResponse.aE := mw_contentAeBase;
- v_ae1.start(f_CSE_DMR_RET_013(int2, m_createAe(PX_APP_ID,-,PX_AE1_ID_STEM), v_contentResponse));//AE
+ v_ae1.start(f_CSE_DMR_RET_013(int2, m_createAe(PX_TS_AE1.appId,-,PX_TS_AE1.aeIdStem), v_contentResponse));//AE
v_ae1.done;
}
@@ -5149,7 +5042,7 @@ module OneM2M_Testcases_CSE_Release_1 {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- v_ae1.start(f_CSE_DMR_RET_014(int2, m_createAe(PX_APP_ID,-,PX_AE1_ID_STEM)));//AE
+ v_ae1.start(f_CSE_DMR_RET_014(int2, m_createAe(PX_TS_AE1.appId,-,PX_TS_AE1.aeIdStem)));//AE
v_ae1.done;
}
@@ -6428,144 +6321,63 @@ module OneM2M_Testcases_CSE_Release_1 {
} // end g_CSE_DMR_UPD_009
+ group g_CSE_DMR_UPD_010{
+
/**
- * @desc Check that the stateTag attribute of a container resource is increased when an update operation has been performed on its child resource
+ * @desc Check that the stateTag attribute of a RESOURCE_TYPE resource is increased when an update operation has been performed on its child resource
*
*/
- testcase TC_CSE_DMR_UPD_010() runs on Tester system CseSystem {
-
+ testcase TC_CSE_DMR_UPD_010_CNT() runs on Tester system CseSystem {
+ // Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-
- v_ae1.start(f_CSE_DMR_UPD_010());
-
- v_ae1.done;
-
- }
- function f_CSE_DMR_UPD_010() runs on AeSimu system CseSystem {
- var MsgIn v_response;
- var integer v_aeIndex := -1;
- var integer v_containerIndex := -1;
var RequestPrimitive v_updateRequest := valueof(m_updateContainerBase);
+ var template RequestPrimitive v_createRequest := m_createContainerBase;
var Labels v_labels_1:= {"VALUE_1"};
- v_updateRequest.primitiveContent.container.labels := v_labels_1;
+ var PrimitiveContent v_primitiveContentRetrieveResource;
- // Test control
-
- // Test component configuration
- f_cf01Up();
- // Test adapter configuration
-
- // Preamble
- v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-
- v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
-
- // Test Body
- if(ispresent(vc_resourcesList[v_containerIndex].resource.container.stateTag)) {
-
- f_cse_updateResource(int3, v_containerIndex, v_updateRequest);
+ v_updateRequest.primitiveContent.container.labels := v_labels_1;
- f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_containerIndex), f_getOriginator(v_containerIndex))));
+ v_ae1.start(f_CSE_DMR_UPD_010(int3, v_createRequest, v_updateRequest));//Container
+ v_ae1.done;
- tc_ac.start;
- alt {
- [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
- tc_ac.stop;
- if(v_response.primitive.responsePrimitive.primitiveContent.container.stateTag == 1) { //(Create and Delete)
+ if(getverdict == pass){
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+ //Check that stateTag has been incremented
+ if(ischosen(v_primitiveContentRetrieveResource.container)) {
+ if(v_primitiveContentRetrieveResource.container.stateTag == 1){
setverdict(pass, __SCOPE__ & ": The stateTag attribute is incremented");
- }
- else{
+ }else{
setverdict(fail, __SCOPE__ & ": Error the stateTag attribute is not incremented");
}
}
- [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Error while retrieving resource attributes");
}
- [] tc_ac.timeout {
- setverdict(fail, __SCOPE__ & ": No answer while retrieving resource attributes");
}
- }
- }//end if
- else{
- setverdict(fail, __SCOPE__ & ": Error the stateTag attribute is empty");
- }
+ } // end g_CSE_DMR_UPD_010
- // Postamble
- f_cse_postamble_deleteResources();
+ group g_CSE_DMR_UPD_011{
- // Tear down
- f_cf01Down();
-
- }//end f_CSE_DMR_UPD_010
-
/**
- * @desc Check that the IUT rejects the UPDATE Request of an existing contentInstance resource with error “OPERATION_NOT_ALLOWEDâ€
+ * @desc Check that the IUT rejects the UPDATE Request of an existing RESOURCE_TYPE resource with error “OPERATION_NOT_ALLOWEDâ€
*
*/
- testcase TC_CSE_DMR_UPD_011() runs on Tester system CseSystem {
-
+ testcase TC_CSE_DMR_UPD_011_CNT_CIN() runs on Tester system CseSystem {
+ // Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-
- v_ae1.start(f_CSE_DMR_UPD_011());
-
- v_ae1.done;
-
- }
- function f_CSE_DMR_UPD_011() runs on AeSimu system CseSystem {
- // Local variables
- var MsgIn v_response;
- var RequestPrimitive v_request;
- var integer v_aeIndex := -1;
- var integer v_containerIndex := -1;
- var integer v_contentInstanceIndex := -1;
var template RequestPrimitive v_updateRequest := m_updateContentInstanceBase;
var Labels v_labels:= {"LABEL"};
+ var template RequestPrimitive v_createParentRequest := m_createContainerBase;
+ var template RequestPrimitive v_createChildRequest := m_createContentInstanceBase;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.contentInstance.labels := v_labels;
- // Test control
-
- // Test component configuration
- f_cf01Up();
-
- // Test adapter configuration
+ v_ae1.start(f_CSE_DMR_UPD_011(int3, v_createParentRequest, int4, v_createChildRequest, v_updateRequest));//ContentInstance under Container
+ v_ae1.done;
- // Preamble
- v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-
- v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
-
- v_contentInstanceIndex := f_cse_createResource(int4, m_createContentInstanceBase, v_containerIndex);
-
- //Test Body
- v_request := f_getUpdateRequestPrimitive(int4, v_contentInstanceIndex, v_updateRequest);
-
- f_send(e_mca_port, m_request(v_request));
- tc_ac.start;
- alt {
- [] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) -> value v_response {
- tc_ac.stop;
- setverdict(pass, __SCOPE__ & ": Not allowed to update a contentInstance with error OPERATION_NOT_ALLOWED");
- }
- [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Wrong response status code");
- }
- [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Accepted update of contentInstance");
- }
- [] tc_ac.timeout {
- setverdict(fail, __SCOPE__ & ": No answer while updating contentInstance");
- }
- }
-
- v_primitiveContentRetrieveResource:=f_cse_retrieveResource(v_contentInstanceIndex);
if(getverdict == pass){
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has NOT been udpated
if(ischosen(v_primitiveContentRetrieveResource.contentInstance)) {
if(v_primitiveContentRetrieveResource.contentInstance.labels == v_labels){
@@ -6573,15 +6385,10 @@ module OneM2M_Testcases_CSE_Release_1 {
}
}
}
+ }
- // Postamble
- f_cse_postamble_deleteResources();
-
- // Tear down
- f_cf01Down();
+ } // end g_CSE_DMR_UPD_011
- }//end f_CSE_DMR_UPD_011
-
/**
* @desc Check that the IUT rejects the UPDATE Request of a latest resource as a direct child of a <container> resource with error “OPERATION_NOT_ALLOWEDâ€
*
@@ -7097,7 +6904,7 @@ module OneM2M_Testcases_CSE_Release_1 {
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.aE.labels := v_labels;
- v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM), v_updateRequest));//AE
+ v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_TS_AE1.appId, -, PX_TS_AE1.aeIdStem), v_updateRequest));//AE
v_ae1.done;
@@ -7128,7 +6935,7 @@ module OneM2M_Testcases_CSE_Release_1 {
var RequestPrimitive v_updateRequestPrimitive;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
- v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM), v_updateRequest, true));//AE
+ v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_TS_AE1.appId, -, PX_TS_AE1.aeIdStem), v_updateRequest, true));//AE
v_ae1.done;
@@ -7162,7 +6969,7 @@ module OneM2M_Testcases_CSE_Release_1 {
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.aE.appName := v_appName;
- v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM), v_updateRequest));//AE
+ v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_TS_AE1.appId, -, PX_TS_AE1.aeIdStem), v_updateRequest));//AE
v_ae1.done;
@@ -7194,7 +7001,7 @@ module OneM2M_Testcases_CSE_Release_1 {
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.aE.pointOfAccess := v_poaList;
- v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM), v_updateRequest));//AE
+ v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_TS_AE1.appId, -, PX_TS_AE1.aeIdStem), v_updateRequest));//AE
v_ae1.done;
@@ -7690,7 +7497,7 @@ module OneM2M_Testcases_CSE_Release_1 {
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.aE.expirationTime := v_expirationTime;
- v_ae1.start(f_CSE_DMR_UPD_016(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM), v_updateRequest));//AE
+ v_ae1.start(f_CSE_DMR_UPD_016(int2, m_createAe(PX_TS_AE1.appId, -, PX_TS_AE1.aeIdStem), v_updateRequest));//AE
v_ae1.done;
@@ -7723,7 +7530,7 @@ module OneM2M_Testcases_CSE_Release_1 {
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.aE.requestReachability := v_requestReachability;
- v_ae1.start(f_CSE_DMR_UPD_016(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM), v_updateRequest));//AE
+ v_ae1.start(f_CSE_DMR_UPD_016(int2, m_createAe(PX_TS_AE1.appId, -, PX_TS_AE1.aeIdStem), v_updateRequest));//AE
v_ae1.done;
diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index baad91bf61bc612e9ab9a833617e130e8c20d6fe..19cc1cce141fb1ec4951ef409b6f7c5e62eb051e 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -754,29 +754,6 @@ module OneM2M_Testcases_CSE_Release_2 {
}// end group g_CSE_DMR_CRE_006
- group g_CSE_DMR_CRE_007 {
-
- /**
- * @desc Checks that the IUT accepts a newly created RESOURCE_TYPE when the currentNrOfInstances exceeds the field value set in maxNrOfInstances in the PARENT_RESOURCE_TYPE resource by removing enough of the oldest RESOURCE_TYPE resources to allow the creation of the new RESOURCE_TYPE resource
- *
- */
- testcase TC_CSE_DMR_CRE_007_CNT_CIN() runs on Tester system CseSystem {
- // Local variables
- var template RequestPrimitive v_createRequestContainer := m_createContainerBase;
- var template RequestPrimitive v_createRequestContentInstance1 := m_createContentInstanceBase;
- var template RequestPrimitive v_createRequestContentInstance2 := m_createContentInstanceBase;
- const integer c_maxNumberOfInstances := 1;
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-
- v_createRequestContainer.primitiveContent.container.maxNrOfInstances := c_maxNumberOfInstances;
- v_createRequestContentInstance2.primitiveContent.contentInstance.resourceName := c_defaultContentInstanceResourceName & "2"; //Resource 2
-
- v_ae1.start(f_CSE_DMR_CRE_007(int3, v_createRequestContainer, int4, v_createRequestContentInstance1, v_createRequestContentInstance2, c_defaultContentInstanceResourceName));//ContentInstance under Container
- v_ae1.done;
- }
-
- }// end group g_CSE_DMR_CRE_007
-
group g_CSE_DMR_CRE_008 {
/**
@@ -803,29 +780,7 @@ module OneM2M_Testcases_CSE_Release_2 {
}
}// end group g_CSE_DMR_CRE_008
-
-
- group g_CSE_DMR_CRE_013 {
-
- /**
- * @desc Check that the IUT rejects the CREATE Request of a RESOURCE_TYPE resource with error “NOT_ACCEPTABLE†when contentSize exceeds maxByteSize of the PARENT_RESOURCE_TYPE
- *
- */
- testcase TC_CSE_DMR_CRE_013_CNT_CIN() runs on Tester system CseSystem {
- // Local variables
- var template RequestPrimitive v_createRequestContainer := m_createContainerBase;
- var template RequestPrimitive v_createRequestContentInstance := m_createContentInstanceBase;
- const integer c_maxByteSize := 1;
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-
- v_createRequestContainer.primitiveContent.container.maxByteSize := c_maxByteSize;
-
- v_ae1.start(f_CSE_DMR_CRE_013(int3, v_createRequestContainer, int4, v_createRequestContentInstance));//ContentInstance under Container
- v_ae1.done;
- }
-
- }// end group g_CSE_DMR_CRE_013
-
+
group g_CSE_DMR_CRE_015 {
/**
@@ -1757,74 +1712,6 @@ module OneM2M_Testcases_CSE_Release_2 {
} // end g_CSE_DMR_UPD_009
- group g_CSE_DMR_UPD_010{
-
- /**
- * @desc Check that the stateTag attribute of a RESOURCE_TYPE resource is increased when an update operation has been performed on its child resource
- *
- */
- testcase TC_CSE_DMR_UPD_010_CNT() runs on Tester system CseSystem {
- // Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var RequestPrimitive v_updateRequest := valueof(m_updateContainerBase);
- var template RequestPrimitive v_createRequest := m_createContainerBase;
- var Labels v_labels_1:= {"VALUE_1"};
- var PrimitiveContent v_primitiveContentRetrieveResource;
-
-
- v_updateRequest.primitiveContent.container.labels := v_labels_1;
-
- v_ae1.start(f_CSE_DMR_UPD_010(int3, v_createRequest, v_updateRequest));//Container
- v_ae1.done;
-
- if(getverdict == pass){
- v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
- //Check that stateTag has been incremented
- if(ischosen(v_primitiveContentRetrieveResource.container)) {
- if(v_primitiveContentRetrieveResource.container.stateTag == 1){
- setverdict(pass, __SCOPE__ & ": The stateTag attribute is incremented");
- }else{
- setverdict(fail, __SCOPE__ & ": Error the stateTag attribute is not incremented");
- }
- }
- }
- }
-
- } // end g_CSE_DMR_UPD_010
-
- group g_CSE_DMR_UPD_011{
-
- /**
- * @desc Check that the IUT rejects the UPDATE Request of an existing RESOURCE_TYPE resource with error “OPERATION_NOT_ALLOWEDâ€
- *
- */
- testcase TC_CSE_DMR_UPD_011_CNT_CNI() runs on Tester system CseSystem {
- // Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var template RequestPrimitive v_updateRequest := m_updateContentInstanceBase;
- var Labels v_labels:= {"LABEL"};
- var template RequestPrimitive v_createParentRequest := m_createContainerBase;
- var template RequestPrimitive v_createChildRequest := m_createContentInstanceBase;
- var PrimitiveContent v_primitiveContentRetrieveResource;
-
- v_updateRequest.primitiveContent.contentInstance.labels := v_labels;
-
- v_ae1.start(f_CSE_DMR_UPD_011(int3, v_createParentRequest, int4, v_createChildRequest, v_updateRequest));//ContentInstance under Container
- v_ae1.done;
-
- if(getverdict == pass){
- v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
- //Check that the resource has NOT been udpated
- if(ischosen(v_primitiveContentRetrieveResource.contentInstance)) {
- if(v_primitiveContentRetrieveResource.contentInstance.labels == v_labels){
- setverdict(fail, __SCOPE__ & ": Error: Labels attribute updated")
- }
- }
- }
- }
-
- } // end g_CSE_DMR_UPD_011
-
group g_CSE_DMR_UPD_014 {
/**
@@ -2764,7 +2651,7 @@ module OneM2M_Testcases_CSE_Release_2 {
vc_ae2.start(f_cse_createAccessControlPolicyAux("Ae2Acp",{"all"}, int63));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
- vc_ae2.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, c_defaultAE2Name, {f_getCompletePoA(PX_TS_AE2.mcaPortIn, "")}), -1)); // AE2 is registred
+ vc_ae2.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_TS_AE2.appId, -, PX_TS_AE2.aeIdStem, c_defaultAE2Name, {f_getCompletePoA(PX_TS_AE2.mcaPortIn, "")}), -1)); // AE2 is registred
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
v_ae2Index := f_getLatestResource(vc_ae2);
@@ -4045,11 +3932,11 @@ module OneM2M_Testcases_CSE_Release_2 {
v_req1 := valueof(m_retrievePollingRequest(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
f_send(e_mca_port, m_request(v_req1));
- v_req2 := valueof(m_notifyNotification(f_getResourceAddress(v_aeIndex), m_contentNotification_subscriptionVerification(PX_CSE1_ID)));
+ v_req2 := valueof(m_notifyNotification(f_getResourceAddress(v_aeIndex), m_contentNotification_subscriptionVerification(PX_TS_CSE1.cseId)));
vc_cse1.start(f_cse_notifyProcedure_notify(v_req2));
- v_req2.from_ := PX_CSE1_ID;
+ v_req2.from_ := PX_TS_CSE1.cseId;
tc_ac.start;
alt {
@@ -4151,10 +4038,10 @@ module OneM2M_Testcases_CSE_Release_2 {
v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex);
- v_req2 := valueof(m_notifyNotification(f_getResourceAddress(v_aeIndex), m_contentNotification_subscriptionVerification(PX_CSE1_ID)));
+ v_req2 := valueof(m_notifyNotification(f_getResourceAddress(v_aeIndex), m_contentNotification_subscriptionVerification(PX_TS_CSE1.cseId)));
vc_cse1.start(f_cse_notifyProcedure_notify(v_req2));
- v_req2.from_ := PX_CSE1_ID;
+ v_req2.from_ := PX_TS_CSE1.cseId;
v_req1 := valueof(m_retrievePollingRequest(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
f_send(e_mca_port, m_request(v_req1));
@@ -4262,10 +4149,10 @@ module OneM2M_Testcases_CSE_Release_2 {
v_req1 := valueof(m_retrievePollingRequest(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
f_send(e_mca_port, m_request(v_req1));
- v_req2 := valueof(m_notifyNotification(f_getResourceAddress(v_aeIndex), m_contentNotification_subscriptionVerification(PX_CSE1_ID)));
+ v_req2 := valueof(m_notifyNotification(f_getResourceAddress(v_aeIndex), m_contentNotification_subscriptionVerification(PX_TS_CSE1.cseId)));
vc_cse1.start(f_cse_notifyProcedure_notify(v_req2));
- v_req2.from_ := PX_CSE1_ID;
+ v_req2.from_ := PX_TS_CSE1.cseId;
tc_ac.start;
alt {
@@ -4380,7 +4267,7 @@ module OneM2M_Testcases_CSE_Release_2 {
tc_ac.stop;
setverdict(pass, __SCOPE__&":INFO: Polling request received successfuly");
v_response_rsp1 := valueof(m_responsePrimitive(int2000,v_request_req1.primitive.requestPrimitive.requestIdentifier));
- v_response_rsp1.from_ := PX_CSE1_ID;
+ v_response_rsp1.from_ := PX_TS_CSE1.cseId;
v_response_rsp1.to_ := v_request_req1.primitive.requestPrimitive.from_;
//Put in the primitiveContent a Notify request (req2) (simulated) from another node CSE
v_request_req2 := valueof(m_notify(f_getResourceAddress(vc_remoteCseIndex)));