Test architecture changes for AE testing - Removal of AeTester component

Signed-off-by: Miguel Angel Reina Ortega's avatarMiguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
parent 22a210c1
......@@ -405,7 +405,7 @@ module OneM2M_Functions {
var integer v_serviceSubscribedProfileIndex := -1;
var template RequestPrimitive m_request := m_createM2mServiceSubscriptionProfileBase;
m_request.primitiveContent.m2mServiceSubscriptionProfile.choice.choice_list[0].serviceSubscribedNode := m_contentServiceSubscribedNode;
//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)));
m_request.primitiveContent.m2mServiceSubscriptionProfile.choice.choice_list[0].serviceSubscribedNode.ruleLinks := {f_getResourceAddress(v_serviceSubscribedAppRuleIndex)};
v_serviceSubscribedProfileIndex := f_cse_createResource(int11, m_request);
......@@ -1191,7 +1191,7 @@ module OneM2M_Functions {
}
v_responsePrimitive.requestIdentifier := v_request.primitive.requestPrimitive.requestIdentifier;
if(getverdict() == pass) {
if(getverdict == pass) {
mcaPortIn.send(m_httpResponse(v_responsePrimitive));
} else {
v_responsePrimitive.responseStatusCode := int4000;
......@@ -1383,7 +1383,7 @@ module OneM2M_Functions {
* @param p_requestPrimitive Template request primitive
* @return Internal resource index of the created resource
*/
function f_cse_registerRemoteCse(in template RequestPrimitive p_requestPrimitive) runs on MnCseSimu return integer {
function f_cse_registerRemoteCse(in template RequestPrimitive p_requestPrimitive) runs on CseSimu return integer {
var MsgIn v_response;
var RequestPrimitive v_request;
......@@ -1424,7 +1424,7 @@ module OneM2M_Functions {
* @param p_requestPrimitive Template request primitive
* @return Internal resource index of the created resource
*/
function f_cse_registrationRemoteCse(in template RequestPrimitive p_requestPrimitive := ?) runs on InCseSimu return integer {
function f_cse_registrationRemoteCse(in template RequestPrimitive p_requestPrimitive := ?) runs on CseSimu return integer {
var MsgIn v_request;
var ResponsePrimitive v_response;
......@@ -1433,12 +1433,12 @@ module OneM2M_Functions {
tc_ac.start;
alt {
[] mccPort.receive(mw_request(p_requestPrimitive)) -> value v_request {
[] mccPortIn.receive(mw_request(p_requestPrimitive)) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__&":INFO: Resource type RemoteCSE created successfuly");
v_resourceIndex := f_cse_createLocalResource(v_request.primitive.requestPrimitive.primitiveContent, 1, int16, v_remoteCSEResource);//TODO Get index from v_request.primitive.requestPrimitive.to_
}
[] mccPort.receive {
[] mccPortIn.receive {
tc_ac.stop;
setverdict(inconc, __SCOPE__&":INFO: Unexpected message received");
}
......@@ -1675,7 +1675,7 @@ module OneM2M_Functions {
* @param p_modifiedResource Assigned and/or modified fields
* @return Internal resource index of the saved resource or -1
*/
function f_ae_createResource(in PrimitiveContent p_resource, in integer p_parentIndex, in ResourceType p_resourceType, out PrimitiveContent p_modifiedResource) runs on AeTester return integer {
function f_ae_createResource(in PrimitiveContent p_resource, in integer p_parentIndex, in ResourceType p_resourceType, out PrimitiveContent p_modifiedResource) runs on CseSimu return integer {
var integer v_resourceIndex;
......@@ -1723,7 +1723,7 @@ module OneM2M_Functions {
/**
* @desc Ae altstep
*/
altstep a_ae_default() runs on AeTester {
altstep a_ae_default() runs on CseSimu {
var MsgIn v_request;
......@@ -1744,7 +1744,7 @@ module OneM2M_Functions {
* @remark This altstep includes a_ae_default
* @see a_ae_default
*/
altstep a_ae_cf03() runs on AeTester {
altstep a_ae_cf03() runs on CseSimu {
var MsgIn v_request;
var PrimitiveContent v_modifiedResource;
......@@ -2271,7 +2271,7 @@ module OneM2M_Functions {
* @param p_targetResourceIndex Internal resource index of the given resource
* @return AE_ID of the given resource
*/
function f_getAeId(integer p_targetResourceIndex := -1) runs on AeTester return XSD.ID {
function f_getAeId(integer p_targetResourceIndex := -1) runs on Tester return XSD.ID {
if(ischosen(vc_resourcesList[p_targetResourceIndex].resource.aE)) {
return vc_resourcesList[p_targetResourceIndex].resource.aE.aE_ID;
......
......@@ -2157,7 +2157,7 @@ module OneM2M_Templates {
choice := omit
}
template (value) AEAnnc_optional m_contentUpdateAEAnnc (template XSD.ID p_appId := omit, template XSD.ID p_stemId := omit) := {
template (value) AEAnnc_optional m_contentUpdateAEAnnc (template (omit) XSD.ID p_appId := omit, template (omit) XSD.ID p_stemId := omit) := {
resourceName := omit,
resourceType := omit,
resourceID := omit,
......
......@@ -55,6 +55,7 @@ module OneM2M_TestSystem {
type component CseSimu extends Tester {
port OneM2MPort mcaPort;
port OneM2MPort mccPort;
port OneM2MPort mccPortIn;
//global variables
var AeSimu vc_aeSimu;//For CF02 when CseSimu is master
......@@ -66,12 +67,6 @@ module OneM2M_TestSystem {
type component InCseSimu extends CseSimu {}
type component MnCseSimu extends CseSimu {}
type component AeTester extends Tester {
port OneM2MPort mcaPort;
//global variables
}
type component CseSystem {
port OneM2MPort mcaPort;
......
......@@ -12622,7 +12622,7 @@ module OneM2M_Testcases {
}
}
function f_CSE_DMR_UPD_017(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive, out AcpType p_acpi, boolean p_secondAcp := false) runs on AeSimu {
function f_CSE_DMR_UPD_017(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive, inout AcpType p_acpi, boolean p_secondAcp := false) runs on AeSimu {
//Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment