update LOC TC
Showing
- OneM2M_Functions.ttcn 16 additions, 9 deletionsOneM2M_Functions.ttcn
- OneM2M_Pixits.ttcn 36 additions, 16 deletionsOneM2M_Pixits.ttcn
- OneM2M_Templates.ttcn 25 additions, 25 deletionsOneM2M_Templates.ttcn
- OneM2M_Testcases.ttcn 78 additions, 116 deletionsOneM2M_Testcases.ttcn
- OneM2M_TypesAndValues.ttcn 5 additions, 5 deletionsOneM2M_TypesAndValues.ttcn
... | ... | @@ -65,7 +65,7 @@ module OneM2M_Functions { |
v_request.to_ := f_addPrefix(f_getResourceAddress()); | ||
mcaPort.send(m_request(v_request)); | ||
//mcaPort.send(m_request(m_createAeAux(p_name, {PX_URI_CSE & PX_CSE_NAME & "/" & c_acpAuxName}))); | ||
//mcaPort.send(m_request(m_createAeAux(p_name, {PX_URI_CSE & PX_CSE_NAME & "/" & PX_ACPAUX_NAME}))); | ||
|
||
} else { | ||
mcaPort.send(m_request(m_createAeAux())); | ||
} | ||
... | ... | @@ -190,7 +190,11 @@ module OneM2M_Functions { |
p_request.from_ := f_getOriginator(p_parentIndex); | ||
p_request.to_ := f_addPrefix(f_getResourceAddress(p_parentIndex)); | ||
p_request.to_ := f_addPrefix(f_getResourceAddress(p_parentIndex)); | ||
//@Martin | ||
p_request.resultContent := PX_RESULT_CONTENT_CREATE; | ||
p_request.requestIdentifier := valueof(p_request.from_) & f_rnd(1, 1000000);//p_request.from_ & int2str(float2int(rnd())); | ||
//p_request.name := p_name; | ||
... | ... | @@ -215,7 +219,7 @@ module OneM2M_Functions { |
p_request.primitiveContent.any_1[0].Subscription_optional.notificationURI := {PX_CSE_ID & "/" & vc_aeAux.aE_ID}; | ||
} | ||
} else { | ||
p_request.primitiveContent.any_1[0].Subscription_optional.notificationURI := {"/" & PX_CSE_NAME & "/" & c_aeAuxName}; | ||
p_request.primitiveContent.any_1[0].Subscription_optional.notificationURI := {"/" & PX_CSE_NAME & "/" & PX_AEAUX_NAME};//c_aeAuxName | ||
}*/ | ||
} | ||
... | ... | @@ -224,11 +228,14 @@ module OneM2M_Functions { |
function f_getUpdateRequestPrimitive(in ResourceType p_resourceType, integer p_resourceIndex, template RequestPrimitive p_request) runs on M2M return RequestPrimitive { | ||
p_request.from_ := f_getOriginator(p_resourceIndex); | ||
p_request.from_ := f_getOriginator(p_resourceIndex); | ||
p_request.to_ := f_addPrefix(f_getResourceAddress(p_resourceIndex)); | ||
p_request.to_ := f_addPrefix(f_getResourceAddress(p_resourceIndex)); | ||
//p_request.name := p_name; | ||
//@Martin | ||
p_request.resultContent := PX_RESULT_CONTENT_UPDATE; | ||
p_request.requestIdentifier := valueof(p_request.from_) & f_rnd(1, 1000000);//p_request.from_ & int2str(float2int(rnd())); | ||
//p_request.name := p_name; | ||
if (p_resourceType == int3) {//Container | ||
... | ... | @@ -445,8 +452,8 @@ module OneM2M_Functions { |
return v_resourceIndex; | ||
} | ||
function f_createAccessControlPolicyAux(in template (value) XSD.String p_acpName := "MyAcp", in template (value) AccessControlOperations p_allowedOperations := int63) runs on M2M return integer{ | ||
// "MyAcp" | ||
function f_createAccessControlPolicyAux(in template (value) XSD.String p_acpName := PX_ACPAUX_NAME, in template (value) AccessControlOperations p_allowedOperations := int63) runs on M2M return integer{ | ||
var RequestPrimitive v_request; | ||
var M2MResponsePrimitive v_response; | ||
var integer v_acpAuxIndex := -1; | ||
... | ... | @@ -489,7 +496,7 @@ module OneM2M_Functions { |
var integer v_acpAuxIndex := -1; | ||
var integer v_containerResourceIndex := -1; | ||
v_acpAuxIndex := f_createAccessControlPolicyAux(p_acpName := "MyAcp_2"); | ||
v_acpAuxIndex := f_createAccessControlPolicyAux(p_acpName := PX_ACPAUX_NAME);//"MyAcp_2" | ||
v_request := valueof(m_createContainerBase); | ||
v_request.primitiveContent.any_1[0].Container_optional.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}; | ||
... | ... |
This diff is collapsed.