Skip to content

GitLab

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

Cleanup of use of auxiliar ACP resource on test cases: 


- global component variable used to store acp resource index
- removal of duplicated templates
Signed-off-by: Miguel Angel Reina Ortega's avatarreinaortega <miguelangel.reinaortega@etsi.org>
parent cb6a4da3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 147 additions and 213 deletions
LibOneM2M/OneM2M_Functions.ttcn
View file @ d508abf0
......@@ -987,19 +987,6 @@ module OneM2M_Functions {
group PreambleFunctions {
/**
* @desc Creation of auxiliar resources ACP for correct execution of the test case
* @param p_allowedOperations Allowed operations for the auxiliar AE resource
* @return Internal ACP resource index
* @verdict
*/
function f_cse_preamble_createAcpAux(in template (value) XSD.String p_acpName := c_acpAuxName, in template (value) AccessControlOperations p_allowedOperations := int63) runs on AeSimu return integer {//c_CRUDNDi
return f_cse_createAccessControlPolicyAux(p_acpName, -, p_allowedOperations);
}
/**
* @desc Creation of auxiliar resource AE for correct execution of the test case
* @param p_accessControlPolicyIDs AccessControlPolicyIDs for the auxiliar AE resource
......@@ -1072,12 +1059,12 @@ module OneM2M_Functions {
f_cse_activateDefaults_ae();
if(PICS_ACP_SUPPORT){
vc_acpAuxIndex := f_cse_createAccessControlPolicyAux(p_allowedOperations := p_allowedOperations);
f_cse_createAccessControlPolicyAux(p_allowedOperations := p_allowedOperations);
}
if(vc_acpAuxIndex != -1) {
vc_resourcesIndexToBeDeleted := {vc_acpAuxIndex};//TODO Not needed
v_request := valueof(m_createAe(p_appId, {f_getResourceId(vc_resourcesList[vc_acpAuxIndex].resource)}, -));
if(vc_acpIndex != -1) {
vc_resourcesIndexToBeDeleted := {vc_acpIndex};//TODO Not needed
v_request := valueof(m_createAe(p_appId, {f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -));
//Set CSEBase IUT as target
v_request.to_ := f_getResourceAddress();
......@@ -1463,8 +1450,8 @@ module OneM2M_Functions {
//Activate defaults when running on a PTC
f_cse_activateDefaults_ae();
if(vc_acpAuxIndex != -1) {
p_requestPrimitive := f_setAcpId(p_requestPrimitive, {vc_resourcesList[vc_acpAuxIndex].resource.accessControlPolicy.resourceID});
if(vc_acpIndex != -1) {
p_requestPrimitive := f_setAcpId(p_requestPrimitive, {vc_resourcesList[vc_acpIndex].resource.accessControlPolicy.resourceID});
}
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, p_parentIndex);
......@@ -1477,14 +1464,12 @@ module OneM2M_Functions {
* @desc Creation of the auxiliar ACP resource
* @param p_acpName ACP name
* @param p_allowedOperations Allowed operations
* @return Internal resource index of the created auxiliar ACP resource
* @verdict
*/
function f_cse_createAccessControlPolicyAux(in template (value) XSD.String p_acpName := c_acpAuxName, in template (value) ListOfURIs p_acor := PX_ACOR, in template (value) AccessControlOperations p_allowedOperations := int63) runs on AeSimu return integer{
function f_cse_createAccessControlPolicyAux(in template (value) XSD.String p_acpName := c_defaultAcpResourceName, in template (value) ListOfURIs p_acor := PX_ACOR, in template (value) AccessControlOperations p_allowedOperations := int63) runs on AeSimu {
var RequestPrimitive v_request;
var integer v_acpAuxIndex := -1;
v_request := valueof(m_createAcpAux(p_acpName := p_acpName, p_acor := p_acor, p_allowedOperations := p_allowedOperations));
v_request := valueof(m_createAcp(p_acpName, p_acor, p_allowedOperations));
v_request := f_getCreateRequestPrimitive(int1, v_request, -1);
......@@ -1495,8 +1480,7 @@ module OneM2M_Functions {
tc_ac.stop;
setverdict(pass, __SCOPE__&":INFO: Resource type " & int2str(1) & " created successfuly");
f_checkAttributesToBeSaved(int1, v_request, vc_response.primitive.responsePrimitive);
v_acpAuxIndex := f_setResource(vc_response.primitive.responsePrimitive.primitiveContent, int1);
vc_acpAuxIndex := v_acpAuxIndex;
vc_acpIndex := f_setResource(vc_response.primitive.responsePrimitive.primitiveContent, int1);
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
......@@ -1513,8 +1497,6 @@ module OneM2M_Functions {
f_checkAeSimuStatus();
return v_acpAuxIndex;
}
/**
......@@ -1734,8 +1716,8 @@ module OneM2M_Functions {
v_request.requestIdentifier := valueof(v_request.requestIdentifier) & f_rnd(1, 1000000);
v_request.to_ := f_getResourceAddress(vc_acpAuxIndex);
v_request.from_ := f_getOriginator(vc_acpAuxIndex);
v_request.to_ := f_getResourceAddress(vc_acpIndex);
v_request.from_ := f_getOriginator(vc_acpIndex);
v_request.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {valueof(m_createAcr(PX_ACOR, p_allowedOperations))};
f_send(e_mca_port, m_request(v_request));
......@@ -4148,8 +4130,8 @@ module OneM2M_Functions {
p_request.primitiveContent.container.locationID := f_getResourceId(vc_resourcesList[p_parentIndex].resource);//resourceID of the locationPolicy
}
if(ispresent(p_request.primitiveContent.container.accessControlPolicyIDs)) {
if((match(valueof(p_request.primitiveContent.container.accessControlPolicyIDs), v_defaultAcpIDs )) and (isbound(vc_acpAuxIndex))){
p_request.primitiveContent.container.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[vc_acpAuxIndex].resource)};
if((match(valueof(p_request.primitiveContent.container.accessControlPolicyIDs), v_defaultAcpIDs )) and (isbound(vc_acpIndex))){
p_request.primitiveContent.container.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[vc_acpIndex].resource)};
}
}
} else if (p_resourceType == int15) {//pollingChannel
......@@ -4171,7 +4153,7 @@ module OneM2M_Functions {
//accessControlPolicyIds
if(ispresent(p_request.primitiveContent.subscription.accessControlPolicyIDs)) {
if(match(valueof(p_request.primitiveContent.subscription.accessControlPolicyIDs), v_defaultAcpIDs )){
p_request.primitiveContent.subscription.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[vc_acpAuxIndex].resource)};
p_request.primitiveContent.subscription.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[vc_acpIndex].resource)};
}
}
} else if (p_resourceType == int4) {//contentInstance
......
LibOneM2M/OneM2M_Templates.ttcn
View file @ d508abf0
......@@ -853,8 +853,7 @@ module OneM2M_Templates {
primitiveContent := {accessControlPolicyAnnc := m_contentCreateAcpAnnc ()}
};
template (value) RequestPrimitive m_createAcp(XSD.ID p_parentResourceAddress, in template (omit) XSD.String p_name := c_defaultAccessControlPolicyResourceName, in template (value) ListOfURIs p_acor := PX_ACOR, in template (value) AccessControlOperations p_allowedOperations := int63) modifies m_create := {
to_ := p_parentResourceAddress,
template (value) RequestPrimitive m_createAcp(in template (omit) XSD.String p_name := c_defaultAccessControlPolicyResourceName, in template (value) ListOfURIs p_acor := PX_ACOR, in template (value) AccessControlOperations p_allowedOperations := int63) modifies m_create := {
requestIdentifier := testcasename() & "-m_createAcp",
resourceType := int1,
primitiveContent := {accessControlPolicy := m_contentCreateAcp (p_name, p_acor, p_allowedOperations)}
......@@ -877,23 +876,7 @@ module OneM2M_Templates {
resourceType := int10016,
primitiveContent := {remoteCSEAnnc := mw_contentCreateRemoteCSEAnnc({"Credential-ID:None"}, p_accessControlPolicyIds)}
};
/**
* @desc Base CREATE request primitive for AccessControlPolicy resource (AUX)
*/
template (value) RequestPrimitive m_createAcpAux(in template (value) XSD.String p_acpName := c_acpAuxName, in template (value) ListOfURIs p_acor := PX_ACOR, in template (value) AccessControlOperations p_allowedOperations := int63 ) modifies m_create := {
requestIdentifier := testcasename() & "-m_createAcpAux",
resourceType := int1,
primitiveContent := {accessControlPolicy := m_contentCreateAcp (p_acpName, p_acor, p_allowedOperations)}
};
/*template (value) RequestPrimitive m_createCSEBase (in ServiceSubscribedAppRule p_serviceSubscribedAppRule) modifies m_create := {
from_ := PX_SUPER_USER,
requestIdentifier := testcasename() & "-m_createCSE" & f_rnd(1, 1000000),
resourceType := int1,//FIXME Is this the value for CSEBase? In any case, this template is not used at all
primitiveContent := {cSEBase := m_contentCreateCSEBase (p_serviceSubscribedAppRule)}
};*/
/**
* @desc Base CREATE request primitive for CSEBase resource
*/
......
LibOneM2M/OneM2M_TestSystem.ttcn
View file @ d508abf0
......@@ -15,75 +15,88 @@ module OneM2M_TestSystem {
import from LibCommon_Time all;
import from OneM2M_Ports all;
/* ***************************************
* Test System Components
* ***************************************
*/
/* ***************************************
* Test System Components
* ***************************************
*/
type enumerated InterfaceIds {
e_mca_port (0),
e_mca_in_port (1),
e_mcc_port (2),
e_mcc_in_port (3)
}
type enumerated InterfaceIds {
e_mca_port (0),
e_mca_in_port (1),
e_mcc_port (2),
e_mcc_in_port (3)
}
type record Interface {
OneM2MPort myPort,
charstring myHost,
charstring myProtocolBinding,
charstring mySerialization
}
type record Interface {
OneM2MPort myPort,
charstring myHost,
charstring myProtocolBinding,
charstring mySerialization
}
type record of Interface Interfaces;
type record of Interface Interfaces;
type component Tester {
//Common Ports
port AdapterControlPort acPort;
port InfoPort infoPort;
port UpperTesterPort utPort;
//timers
//Common timers
timer tc_ac := PX_TAC;
timer tc_wait := PX_TWAIT;
timer tc_done := PX_TDONE;
//global variables
//About configuration of the component
var Configurations vc_config;
var TestSystemRole vc_testSystemRole;
var MyResourcesList vc_resourcesList;
var IntegerList vc_resourcesIndexToBeDeleted := {};
var integer vc_acpAuxIndex := -1;
var MsgIn vc_request;
var MsgIn vc_response;
//Default behaviour
var default vc_aeSimu := null;
var default vc_cseSimu := null;
var PrimitiveContent vc_primitiveContentRetrievedResource;
//Interfaces
var Interfaces vc_myInterfaces := {};
//In/Out messages
var MsgIn vc_request;
var MsgIn vc_response;
var PrimitiveContent vc_primitiveContentRetrievedResource;
//Resources list
var MyResourcesList vc_resourcesList;
//Resource index
var IntegerList vc_resourcesIndexToBeDeleted := {};
var integer vc_acpIndex := -1;
};
type component AeSimu extends Tester {
//Attached components depending on config
var AeSimu vc_ae2;
var CseSimu vc_cse1;//For CF02 when AeSimu is master
//Ports
port OneM2MPort mcaPort;
port OneM2MPort mcaPortIn;
//global variables
//var PrimitiveContent vc_primitiveContentRetrievedResource;
var CseSimu vc_cse1;//For CF02 when AeSimu is master
//About configuration of the component
//Resource Index
var integer vc_aeIndex := -1;
//Status of attached component
var boolean vc_auxiliaryAe2Up := false;
var integer vc_aeIndex := -1;//Specific to AeSimu
};
type component CseSimu extends Tester {
//Attached components depending on config
var AeSimu vc_ae1;//For CF02 when CseSimu is master
//Ports
port OneM2MPort mcaPort;
port OneM2MPort mcaPortIn;
port OneM2MPort mccPort;
port OneM2MPort mccPortIn;
//global variables
//About configuration of the component
var CseTypeID vc_cseType; //cseType of the simulated CSE. IN =1, MN = 2
//Resources list
var MyResourcesList vc_localResourcesList := {};
var AeSimu vc_ae1;//For CF02 when CseSimu is master
var integer vc_localRemoteCseIndex := -1;
//Resource index
var integer vc_cSEBaseIndex := -1; //Index of the CSEBase resource of the Tester inside vc_localResourcesList
var CseTypeID vc_cseType; //cseType of the simulated CSE. IN =1, MN = 2
var integer vc_remoteCseIndex := -1;//Specific to CseSimu
var integer vc_localRemoteCseIndex := -1;
};
type component InCseSimu extends CseSimu {
......@@ -108,10 +121,6 @@ module OneM2M_TestSystem {
port UpperTesterPort utPort;
}
}// end of module
with {
extension "anytype charstring"
......
LibOneM2M/OneM2M_TypesAndValues.ttcn
View file @ d508abf0
......@@ -43,7 +43,7 @@ module OneM2M_TypesAndValues {
const XSD.String c_defaultGenericInterworkingServiceResourceName := "MyGenericInterworkingServiceResource"; //<genericInterworkingService>
const XSD.String c_defaultAe1ResourceName := "MyAe1";
const XSD.String c_defaultAe2ResourceName := "MyAe2";
const XSD.String c_acpAuxName := "MyAcp";
const XSD.String c_defaultAcpResourceName := "MyAcp";
const charstring c_invalid_location_update_period := "-PT30M10S" ;//duration set to invalid value (minus value)
const XSD.ID c_resourceShortNameLatest := "la"; //<latest>
const XSD.ID c_resourceShortNameOldest := "ol"; //<oldest>
......
OneM2M_PermutationFunctions.ttcn
View file @ d508abf0
This diff is collapsed.
OneM2M_Testcases_CSE_Release_1.ttcn
View file @ d508abf0
......@@ -8250,7 +8250,6 @@ module OneM2M_Testcases_CSE_Release_1 {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
var integer v_acpAuxIndex := -1;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
var RequestPrimitive v_request;
......@@ -8266,9 +8265,9 @@ module OneM2M_Testcases_CSE_Release_1 {
// Test adapter configuration
// Preamble
v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int61);//c_CUDNDi)
f_cse_createAccessControlPolicyAux(-, -, int61);//c_CUDNDi)
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);//c_CRDNDi);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);//c_CRDNDi);
v_request := f_getCreateRequestPrimitive(int23, v_createRequest, v_aeIndex);//Subscription
......@@ -9060,8 +9059,8 @@ module OneM2M_Testcases_CSE_Release_1 {
var integer v_aeIndex := -1;
var integer v_acpIndex1 := -1;
var integer v_acpIndex2 := -1;
var RequestPrimitive v_createRequestAcp1 := valueof(m_createAcp(f_getResourceAddress(-1), omit));
var RequestPrimitive v_createRequestAcp2 := valueof(m_createAcp(f_getResourceAddress(-1), omit));
var RequestPrimitive v_createRequestAcp1 := valueof(m_createAcp(omit, -, -));
var RequestPrimitive v_createRequestAcp2 := valueof(m_createAcp(omit, -, -));
var RequestPrimitive v_updateRequest;
var AccessControlRule v_accessControlRule_1;
var AccessControlRule v_accessControlRule_2;
......@@ -9152,8 +9151,8 @@ module OneM2M_Testcases_CSE_Release_1 {
var integer v_aeIndex := -1;
var integer v_acpIndex1 := -1;
var integer v_acpIndex2 := -1;
var RequestPrimitive v_createRequestAcp1 := valueof(m_createAcp(f_getResourceAddress(-1), omit));
var RequestPrimitive v_createRequestAcp2 := valueof(m_createAcp(f_getResourceAddress(-1), omit));
var RequestPrimitive v_createRequestAcp1 := valueof(m_createAcp(omit, -, -));
var RequestPrimitive v_createRequestAcp2 := valueof(m_createAcp(omit, -, -));
var RequestPrimitive v_updateRequest;
var AccessControlRule v_accessControlRule_1;
var AccessControlRule v_accessControlRule_2;
......@@ -10009,7 +10008,6 @@ module OneM2M_Testcases_CSE_Release_1 {
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var RequestPrimitive v_request;
var integer v_acpAuxIndex := -1;
const ResourceType c_containerResourceType := int3;
// Test control
......@@ -10024,11 +10022,11 @@ module OneM2M_Testcases_CSE_Release_1 {
// Test adapter configuration
// Preamble
v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int31);//c_CRUN)
f_cse_createAccessControlPolicyAux(-, -, int31);//c_CRUN)
v_aeIndex := f_cse_preamble_registerAe();//AE1 is registred;
v_requestPrimitive := f_setAcpId(v_requestPrimitive, {f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)});
v_requestPrimitive := f_setAcpId(v_requestPrimitive, {f_getResourceId(vc_resourcesList[vc_acpIndex].resource)});
v_resourceIndex := f_cse_createResource(c_containerResourceType, v_requestPrimitive, v_aeIndex);
v_request := valueof(m_retrieveFilterUsageOption(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), int1));
......@@ -10290,7 +10288,6 @@ module OneM2M_Testcases_CSE_Release_1 {
var MsgIn v_response;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var integer v_acpAuxIndex := -1;
var RequestPrimitive v_request;
const ResourceType c_containerResourceType := int3;
var Labels v_labels := {"VALUE_1"};
......@@ -10304,14 +10301,14 @@ module OneM2M_Testcases_CSE_Release_1 {
// Test adapter configuration
// Preamble
v_acpAuxIndex := f_cse_preamble_createAcpAux(-, -);//c_CRUDNDi)
f_cse_createAccessControlPolicyAux(-, -);//c_CRUDNDi)
//v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)});
//v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)});
v_aeIndex := f_cse_preamble_registerAe();
f_cse_updateAcpAuxResource(int31); //Not include DISCOVERY permission
v_createRequest.primitiveContent.container.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)};
v_createRequest.primitiveContent.container.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[vc_acpIndex].resource)};
v_createRequest.primitiveContent.container.labels := v_labels;
v_resourceIndex := f_cse_createResource(c_containerResourceType, v_createRequest, v_aeIndex);
......@@ -11075,7 +11072,7 @@ module OneM2M_Testcases_CSE_Release_1 {
var integer i;
var ListOfURIs v_memberIDs;
var ListOfURIs v_membersAcpIds;
var template RequestPrimitive v_createAcp := m_createAcp("NotInitialized", "MyACP", -, -);
var template RequestPrimitive v_createAcp := m_createAcpBase;
var template PrimitiveContent v_contentResponse;
var XSD.AnyURI v_fanoutPointAddress;
var RequestPrimitive v_containerRequestPrimitive := valueof(m_createContainer_noResourceName);
......
OneM2M_Testcases_CSE_Release_2.ttcn
View file @ d508abf0
......@@ -3341,7 +3341,6 @@ module OneM2M_Testcases_CSE_Release_2 {
// Local variables
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var integer v_acpAuxIndex := -1;
var RequestPrimitive v_req1, v_req2, v_req3;
var MsgIn v_resp1, v_resp3;
var ResponsePrimitive v_resp2;
......@@ -3357,9 +3356,9 @@ module OneM2M_Testcases_CSE_Release_2 {
vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSEBase));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
v_acpAuxIndex := f_cse_preamble_createAcpAux();
f_cse_createAccessControlPolicyAux();
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);//AE1 is registred;
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);//AE1 is registred;
v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex);
......@@ -3449,7 +3448,7 @@ module OneM2M_Testcases_CSE_Release_2 {
function f_CSE_PCH_002() runs on AeSimu system CseSystem {
// Local variables
var integer v_aeIndex, v_acpAuxIndex := -1;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var RequestPrimitive v_req1, v_req2, v_req3;
var MsgIn v_resp1, v_resp3;
......@@ -3466,9 +3465,9 @@ module OneM2M_Testcases_CSE_Release_2 {
vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSEBase));
vc_cse1.done;
v_acpAuxIndex := f_cse_preamble_createAcpAux();
f_cse_createAccessControlPolicyAux();
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);//AE1 is registred;
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);//AE1 is registred;
v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex);
......@@ -3554,7 +3553,7 @@ module OneM2M_Testcases_CSE_Release_2 {
function f_CSE_PCH_003() runs on AeSimu system CseSystem {
//Local variables
var integer v_aeIndex, v_acpAuxIndex := -1;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var RequestPrimitive v_req1;
var RequestPrimitive v_req2;
......@@ -3574,9 +3573,9 @@ module OneM2M_Testcases_CSE_Release_2 {
vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSEBase));
vc_cse1.done;
v_acpAuxIndex := f_cse_preamble_createAcpAux();
f_cse_createAccessControlPolicyAux();
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);//AE1 is registred;
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);//AE1 is registred;
v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex);
......@@ -3785,7 +3784,7 @@ module OneM2M_Testcases_CSE_Release_2 {
function f_CSE_PCH_006() runs on AeSimu system CseSystem {
// Local variables
var integer v_aeIndex, v_acpAuxIndex := -1;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var RequestPrimitive v_req1;
......@@ -3800,9 +3799,9 @@ module OneM2M_Testcases_CSE_Release_2 {
vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSEBase));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
v_acpAuxIndex := f_cse_preamble_createAcpAux();
f_cse_createAccessControlPolicyAux();
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);//AE1 is registred;
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);//AE1 is registred;
v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex);
......@@ -4014,7 +4013,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_updateRequest.primitiveContent.container.labels := v_labels_1;
v_ae1.start(f_CSE_RT_NBS_003(m_updateContainerBase, m_createContainerBase, int3)); //Update Container
v_ae1.start(f_CSE_RT_NBS_003(v_updateRequest, m_createContainerBase, int3)); //Update Container
v_ae1.done;
}
......
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