Skip to content
Snippets Groups Projects
Commit bdeedd60 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Clean up and refactoring 


Signed-off-by: Miguel Angel Reina Ortega's avatarreinaortega <miguelangel.reinaortega@etsi.org>
parent 0cac2e43
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
LibOneM2M/OneM2M_Functions.ttcn
+ 426
− 365
View file @ bdeedd60
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* @author ETSI * @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Functions.ttcn $ * @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Functions.ttcn $
* $Id: OneM2M_Functions.ttcn 103 2016-08-30 09:39:32Z reinaortega $ * $Id: OneM2M_Functions.ttcn 104 2016-08-30 15:13:47Z reinaortega $
* @desc Module containing functions for oneM2M * @desc Module containing functions for oneM2M
* *
*/ */
...@@ -27,7 +27,7 @@ module OneM2M_Functions { ...@@ -27,7 +27,7 @@ module OneM2M_Functions {
/** /**
@desc Ports mapping and default behaviour activation for Config 1 @desc Ports mapping and default behaviour activation for Config 1
*/ */
function f_cf01Up() runs on M2M { function f_cf01Up() runs on CseTester {
// Variables // Variables
...@@ -35,6 +35,7 @@ module OneM2M_Functions { ...@@ -35,6 +35,7 @@ module OneM2M_Functions {
map(self:mcaPort, system:mcaPort); map(self:mcaPort, system:mcaPort);
map(self:acPort, system:acPort); map(self:acPort, system:acPort);
activate(a_default()); activate(a_default());
activate(a_cse_cf01());
// Connect // Connect
...@@ -42,7 +43,7 @@ module OneM2M_Functions { ...@@ -42,7 +43,7 @@ module OneM2M_Functions {
} // end f_cf01Up } // end f_cf01Up
function f_cf02Up() runs on M2M { function f_cf02Up() runs on CseTester {
// Variables // Variables
...@@ -51,192 +52,385 @@ module OneM2M_Functions { ...@@ -51,192 +52,385 @@ module OneM2M_Functions {
map(self:mccPort, system:mccPort); map(self:mccPort, system:mccPort);
map(self:acPort, system:acPort); map(self:acPort, system:acPort);
activate(a_default()); activate(a_default());
activate(a_cse_cf02());
// Connect // Connect
//Initialze the IUT //Initialze the IUT
} // end f_cf02Up } // end f_cf02Up
}//end group configFunctions
group preambleFunctions {
/**
* @desc Creation of auxiliar resources ACP and AE for correct execution of the test case
* @param p_allowedOperations Allowed operations for the auxiliar AE resource
* @return Internal AE resource index
* @verdict
*/
function f_preamble_registerAe(in template (value) AccessControlOperations p_allowedOperations := int63) runs on M2M return integer{//c_CRUDNDi
var RequestPrimitive v_request;
var M2MResponsePrimitive v_response;
var integer v_aeAuxIndex := -1;
var integer v_acpAuxIndex := -1;
if(PX_ACP_SUPPORT){
v_acpAuxIndex := f_createAccessControlPolicyAux(p_allowedOperations := p_allowedOperations);
vc_acpAuxIndex := v_acpAuxIndex;
}
if(v_acpAuxIndex != -1) {
vc_resourcesIndexToBeDeleted := {v_acpAuxIndex};
v_request := valueof(m_createAeAux(p_accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}));
//TODO Test, to be removed
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 & "/" & PX_ACPAUX_NAME})));
} else {
mcaPort.send(m_request(m_createAeAux()));
}
tc_ac.start;
alt {
[] mcaPort.receive(mw_responseOK) -> value v_response {
tc_ac.stop;
log("Preamble: Application registered successfuly");
if(ischosen(v_response.responsePrimitive_.primitiveContent.any_1[0].AE_optional)) {
vc_aeAux := v_response.responsePrimitive_.primitiveContent.any_1[0].AE_optional;
v_aeAuxIndex := f_setResource(v_response.responsePrimitive_.primitiveContent);
vc_resourcesIndexToBeDeleted := vc_resourcesIndexToBeDeleted & {v_aeAuxIndex};
if(ispresent(vc_aeAux.aE_ID)){
f_sendAcPrimitive("AE-ID_changed", oct2char(unichar2oct(vc_aeAux.aE_ID)));
} else {
f_sendAcPrimitive("AE-ID_changed", "0");
}
}
}
[] mcaPort.receive(mw_responseKO) {
tc_ac.stop;
setverdict(inconc, "Preamble: Error while registering application");
stop;
}
[] mcaPort.receive {
tc_ac.stop;
setverdict(inconc, "Preamble: Unexpected message received");
stop;
}
[] tc_ac.timeout {
setverdict(inconc, "Preamble: No answer while registering resource");
stop;
}
}
return v_aeAuxIndex;
}
//Added by @Naum
function f_preamble_prepareCSE(in template ListOfM2MID p_allowedAEs, in template (value) AccessControlOperations p_allowedOperations := int63) runs on M2M return integer{//c_CRUDNDi
var M2MResponsePrimitive v_response;
var integer v_serviceSubscribedAppRuleIndex := -1;
var RequestPrimitive v_request;
v_serviceSubscribedAppRuleIndex := f_createResource(int19, m_createServiceSubscribedAppRule({"None"}, {PX_APP_ID}, valueof(p_allowedAEs)));
return v_serviceSubscribedAppRuleIndex;
}
}//end group preambleFunctions
group postambleFunctions {
/**
* @desc Deletion of all resources created during the test case execution. IUT gets clean and ready for next execution
* @verdict
*/
function f_postamble_deleteResources() runs on M2M {
var integer i;
var XSD.ID v_resourceAddress;
var M2MResponsePrimitive v_response;
var RequestPrimitive v_request;
if (PX_RUN_POSTAMBLE) {
for(i := 0; i < lengthof(vc_resourcesIndexToBeDeleted); i := i + 1) {
v_resourceAddress := f_getResourceAddress(lengthof(vc_resourcesIndexToBeDeleted)-1 - i);
v_request := valueof(m_deleteRequest(v_resourceAddress));
if(PX_FROM_IS_AE_ID){
if(ischosen(vc_resourcesList[i].resource.any_1[0].AccessControlPolicy_optional)) {
v_request.from_ := PX_AE_ID_STEM;
} else {
v_request.from_ := vc_aeAux.aE_ID;
}
}
mcaPort.send(m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_responseOK) {
tc_ac.stop;
log("Postamble: AE Resource deleted");
}
[] mcaPort.receive(mw_responseKO) {
tc_ac.stop;
log("Postamble: Error while deleting resource");
}
[] tc_ac.timeout {
log("Postamble: No answer while deleting resource");
}
}
}
}
f_postamble_default();
}
/** /**
* @desc Ports unmapping * @desc Ports unmapping
* @verdict * @verdict
*/ */
function f_postamble_default() runs on M2M { function f_cf01Down() runs on CseTester {
unmap(self:mcaPort, system:mcaPort); unmap(self:mcaPort, system:mcaPort);
unmap(self:acPort, system:acPort); unmap(self:acPort, system:acPort);
//stop; //stop;
} }
function f_postamble_CF02() runs on M2M { function f_cf02Down() runs on CseTester {
unmap(self:mcaPort, system:mcaPort); unmap(self:mcaPort, system:mcaPort);
unmap(self:mccPort, system:mccPort); unmap(self:mccPort, system:mccPort);
unmap(self:acPort, system:acPort); unmap(self:acPort, system:acPort);
//stop; //stop;
} }
}//end group postambleFunctions }//end group configFunctions
group altstepFunctions { group cseFunctions {
/** group preambleFunctions {
* @desc Default altstep
*/ /**
altstep a_default() runs on M2M { * @desc Creation of auxiliar resources ACP and AE for correct execution of the test case
* @param p_allowedOperations Allowed operations for the auxiliar AE resource
[] mcaPort.receive { * @return Internal AE resource index
log("a_default: WARNING: Unexpected message received"); * @verdict
repeat; */
} function f_cse_preamble_registerAe(in template (value) AccessControlOperations p_allowedOperations := int63) runs on CseTester return integer {//c_CRUDNDi
[] tc_wait.timeout {
setverdict(inconc,"a_default: ERROR: Timeout while awaiting reaction of the IUT prior to Upper Tester action"); var RequestPrimitive v_request;
} var MsgIn v_response;
[] tc_ac.timeout { var integer v_aeAuxIndex := -1;
setverdict(inconc,"a_default: ERROR: Timeout while awaiting the reception of a message"); var integer v_acpAuxIndex := -1;
if(PX_ACP_SUPPORT){
v_acpAuxIndex := f_cse_createAccessControlPolicyAux(p_allowedOperations := p_allowedOperations);
vc_acpAuxIndex := v_acpAuxIndex;
}
if(v_acpAuxIndex != -1) {
vc_resourcesIndexToBeDeleted := {v_acpAuxIndex};
v_request := valueof(m_createAeAux(p_accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}));
//TODO Test, to be removed
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 & "/" & PX_ACPAUX_NAME})));
} else {
mcaPort.send(m_request(m_createAeAux()));
}
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
log("Preamble: Application registered successfuly");
if(ischosen(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].AE_optional)) {
vc_aeAux := v_response.primitive.responsePrimitive.primitiveContent.any_1[0].AE_optional;
v_aeAuxIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent);
vc_resourcesIndexToBeDeleted := vc_resourcesIndexToBeDeleted & {v_aeAuxIndex};
if(ispresent(vc_aeAux.aE_ID)){
f_sendAcPrimitive("AE-ID_changed", oct2char(unichar2oct(vc_aeAux.aE_ID)));
} else {
f_sendAcPrimitive("AE-ID_changed", "0");
}
}
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
setverdict(inconc, "Preamble: Error while registering application");
stop;
}
[] mcaPort.receive {
tc_ac.stop;
setverdict(inconc, "Preamble: Unexpected message received");
stop;
}
[] tc_ac.timeout {
setverdict(inconc, "Preamble: No answer while registering resource");
stop;
}
}
return v_aeAuxIndex;
}
//Added by @Naum
function f_cse_preamble_createServiceSubscribedAppRule(in template ListOfM2MID p_allowedAEs, in template (value) AccessControlOperations p_allowedOperations := int63) runs on CseTester return integer {//c_CRUDNDi
var MsgIn v_response;
var integer v_serviceSubscribedAppRuleIndex := -1;
var RequestPrimitive v_request;
v_serviceSubscribedAppRuleIndex := f_cse_createResource(int19, m_createServiceSubscribedAppRule({"None"}, {PX_APP_ID}, valueof(p_allowedAEs)));
return v_serviceSubscribedAppRuleIndex;
}
}//end group preambleFunctions
group postambleFunctions {
/**
* @desc Deletion of all resources created during the test case execution. IUT gets clean and ready for next execution
* @verdict
*/
function f_cse_postamble_deleteResources() runs on CseTester {
var integer i;
var XSD.ID v_resourceAddress;
var MsgIn v_response;
var RequestPrimitive v_request;
if (PX_RUN_POSTAMBLE) {
for(i := 0; i < lengthof(vc_resourcesIndexToBeDeleted); i := i + 1) {
v_resourceAddress := f_getResourceAddress(lengthof(vc_resourcesIndexToBeDeleted)-1 - i);
v_request := valueof(m_deleteRequest(v_resourceAddress));
if(PX_FROM_IS_AE_ID){
if(ischosen(vc_resourcesList[i].resource.any_1[0].AccessControlPolicy_optional)) {
v_request.from_ := PX_AE_ID_STEM;
} else {
v_request.from_ := vc_aeAux.aE_ID;
}
}
mcaPort.send(m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
tc_ac.stop;
log("Postamble: AE Resource deleted");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
log("Postamble: Error while deleting resource");
}
[] tc_ac.timeout {
log("Postamble: No answer while deleting resource");
}
}
}
}
f_cse_postamble_default();
}
/**
* @desc Default postamble
* @verdict
*/
function f_cse_postamble_default() runs on CseTester {
} }
}
}//end group altstepFunctions
}//end group postambleFunctions
group helpingFunctions {
/**
* @desc Creation of a resource
* @param p_resourceType Resource type of the resource to be created
* @param p_requestPrimitive Template request primitive
* @param p_parentIndex Internal resource index which indicates the parent of the resource to be created
* @return Internal resource index of the created resource
* @verdict
*/
function f_cse_createResource(in ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, integer p_parentIndex := -1) runs on CseTester return integer {
var MsgIn v_response;
var RequestPrimitive v_request;
var XSD.ID v_resourceId;
var integer v_resourceIndex := -1;
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, p_parentIndex);
mcaPort.send(m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
setverdict(pass, "f_createResource: Resource type " & int2str(enum2int(p_resourceType)) & " created successfuly");
v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, p_parentIndex);
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
setverdict(inconc, "f_createResource: Error while creating resource type " & int2str(enum2int(p_resourceType)));
}
[] mcaPort.receive {
tc_ac.stop;
setverdict(inconc, "f_createResource: Unexpected message received");
}
[] tc_ac.timeout {
setverdict(inconc, "f_createResource: No answer while creating resource type " & int2str(enum2int(p_resourceType)));
}
}
return v_resourceIndex;
}
/**
* @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) AccessControlOperations p_allowedOperations := int63) runs on CseTester return integer{
var RequestPrimitive v_request;
var MsgIn v_response;
var integer v_acpAuxIndex := -1;
v_request := valueof(m_createAcpAux(p_acpName := p_acpName, p_allowedOperations := p_allowedOperations));
v_request.to_ := f_addPrefix(f_getResourceAddress());
mcaPort.send(m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
setverdict(pass, "f_createAccessControlPolicy: Resource type " & int2str(1) & " created successfuly");
v_acpAuxIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent);
vc_acpAux := v_response.primitive.responsePrimitive.primitiveContent.any_1[0].AccessControlPolicy_optional;//TODO To be removed
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
setverdict(inconc, "f_createAccessControlPolicy: Error while creating resource type " & int2str(1));
}
[] mcaPort.receive {
tc_ac.stop;
setverdict(inconc, "f_createAccessControlPolicy: Unexpected message received");
}
[] tc_ac.timeout {
setverdict(inconc, "f_createAccessControlPolicy: No answer while creating resource type " & int2str(1));
}
}
return v_acpAuxIndex;
}
/**
* @desc Creation of the auxiliar Container resource
* @param p_parentIndex Internal resource index which indicates the parent of the Container resource to be created
* @return Internal resource index of the created Container resource
* @verdict
*/
function f_cse_createContainerResourceAux (integer p_parentIndex := -1) runs on CseTester return integer {
var MsgIn v_response;
var RequestPrimitive v_request;
var integer v_acpAuxIndex := -1;
var integer v_containerResourceIndex := -1;
v_acpAuxIndex := f_cse_createAccessControlPolicyAux(p_acpName := c_acpAuxName);//"MyAcp_2"
v_request := valueof(m_createContainerBase);
v_request.primitiveContent.any_1[0].Container_optional.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)};
v_request.primitiveContent.any_1[0].Container_optional.resourceName := "MyContainerAux";
v_containerResourceIndex := f_cse_createResource(int3, v_request, p_parentIndex);
return v_containerResourceIndex;
}
/**
* @desc Update of the auxiliar ACP resource
* @param p_allowedOperations New allowed operations
* @verdict
*/
function f_cse_updateAcpAuxResource (in template (value) AccessControlOperations p_allowedOperations) runs on CseTester {
var RequestPrimitive v_request;
v_request := valueof(m_updateAcpBase);
v_request.to_ := f_addPrefix(f_getResourceAddress(vc_acpAuxIndex));
v_request.primitiveContent.any_1[0].AccessControlPolicy_optional.privileges.accessControlRule_list := {
{
accessControlOriginators := PX_ACOR, //{"admin:admin"}
accessControlOperations := valueof(p_allowedOperations),
accessControlContexts_list := omit
}
};
mcaPort.send(m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
tc_ac.stop;
setverdict(pass, "f_updateAcpAuxResource: " & v_request.to_ & " resource updated successfuly");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
setverdict(fail, "f_updateAcpAuxResource: Error while updating " & v_request.to_ & " resource");
}
[] tc_ac.timeout {
setverdict(inconc, "f_updateAcpAuxResource: No answer while updating " & v_request.to_ & " resource" );
}
}
}
}//end group helpingFunctions
group altstepFunctions {
/**
* @desc Cse altstep for config 01
*/
altstep a_cse_cf01() runs on CseTester {
[] mcaPort.receive {
log("a_default: WARNING: Unexpected message received");
repeat;
}
}
/**
* @desc Cse altstep for config 02
*/
altstep a_cse_cf02() runs on CseTester {
[] mcaPort.receive {
log("a_default: WARNING: Unexpected message received");
repeat;
}
[] mccPort.receive {
log("a_default: WARNING: Unexpected message received");
repeat;
}
}
}//end group altstepFunctions
}//end cseFunctions
group getSetFunctions { group aeFunctions {
group altstepFunctions {
/**
* @desc Ae altstep
*/
altstep a_ae_default() runs on AeTester {
[] mcaPort.receive {
log("a_default: WARNING: Unexpected message received");
repeat;
}
}
}//end group altstepFunctions
}//end of aeFunctions
group getSetFunctions {
/** /**
* @desc Creation of a CREATE request primitive from a template request primitive * @desc Creation of a CREATE request primitive from a template request primitive
* @param p_resourceType Type of resource to be created * @param p_resourceType Type of resource to be created
...@@ -245,26 +439,26 @@ module OneM2M_Functions { ...@@ -245,26 +439,26 @@ module OneM2M_Functions {
* @return Created CREATE request primitive * @return Created CREATE request primitive
* @verdict * @verdict
*/ */
function f_getCreateRequestPrimitive(in ResourceType p_resourceType, template RequestPrimitive p_request, integer p_parentIndex) runs on M2M return RequestPrimitive { function f_getCreateRequestPrimitive(in ResourceType p_resourceType, template RequestPrimitive p_request, integer p_parentIndex) runs on CseTester return RequestPrimitive {
p_request.from_ := f_getOriginator(p_parentIndex); 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));
if (p_resourceType == int1) {//AccessControlPolicy if (p_resourceType == int1) {//AccessControlPolicy
} }
if (p_resourceType == int9) {//group if (p_resourceType == int9) {//group
p_request.primitiveContent.any_1[0].Group_optional.memberIDs := {f_getResourceAddress(p_parentIndex)}; p_request.primitiveContent.any_1[0].Group_optional.memberIDs := {f_getResourceAddress(p_parentIndex)};
} }
if (p_resourceType == int15) {//pollingChannel if (p_resourceType == int15) {//pollingChannel
p_request.from_ := vc_aeAux.aE_ID; p_request.from_ := vc_aeAux.aE_ID;
} }
if (p_resourceType == int23) {//subscription if (p_resourceType == int23) {//subscription
p_request.primitiveContent.any_1[0].Subscription_optional.notificationURI := {f_getResourceAddress(p_parentIndex)}; p_request.primitiveContent.any_1[0].Subscription_optional.notificationURI := {f_getResourceAddress(p_parentIndex)};
/*if(PX_FROM_IS_AE_ID) { /*if(PX_FROM_IS_AE_ID) {
if(PX_UNSTRUCTURED){ if(PX_UNSTRUCTURED){
p_request.primitiveContent.any_1[0].Subscription_optional.notificationURI := {vc_aeAux.aE_ID}; p_request.primitiveContent.any_1[0].Subscription_optional.notificationURI := {vc_aeAux.aE_ID};
...@@ -275,10 +469,10 @@ module OneM2M_Functions { ...@@ -275,10 +469,10 @@ module OneM2M_Functions {
p_request.primitiveContent.any_1[0].Subscription_optional.notificationURI := {"/" & PX_CSE_NAME & "/" & PX_AEAUX_NAME};//c_aeAuxName p_request.primitiveContent.any_1[0].Subscription_optional.notificationURI := {"/" & PX_CSE_NAME & "/" & PX_AEAUX_NAME};//c_aeAuxName
}*/ }*/
} }
return valueof(p_request); return valueof(p_request);
} }
/** /**
* @desc Creation of an UPDATE request primitive from a template request primitive * @desc Creation of an UPDATE request primitive from a template request primitive
* @param p_resourceType Type of resource to be created * @param p_resourceType Type of resource to be created
...@@ -287,38 +481,38 @@ module OneM2M_Functions { ...@@ -287,38 +481,38 @@ module OneM2M_Functions {
* @return Created UPDATE request primitive * @return Created UPDATE request primitive
* @verdict * @verdict
*/ */
function f_getUpdateRequestPrimitive(in ResourceType p_resourceType, integer p_resourceIndex, template RequestPrimitive p_request) runs on M2M return RequestPrimitive { function f_getUpdateRequestPrimitive(in ResourceType p_resourceType, integer p_resourceIndex, template RequestPrimitive p_request) runs on CseTester 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));
if (p_resourceType == int3) {//Container if (p_resourceType == int3) {//Container
//TODO //TODO
} }
if (p_resourceType == int9) {//group if (p_resourceType == int9) {//group
//TODO //TODO
} }
if (p_resourceType == int18) {//schedule if (p_resourceType == int18) {//schedule
//TODO //TODO
} }
if (p_resourceType == int15) {//pollingChannel if (p_resourceType == int15) {//pollingChannel
//TODO //TODO
} }
if (p_resourceType == int23) {//subscription if (p_resourceType == int23) {//subscription
//TODO //TODO
} }
return valueof(p_request); return valueof(p_request);
} }
/** /**
* @desc Extraction from a primitiveContent field the resourceID attribute * @desc Extraction from a primitiveContent field the resourceID attribute
* @param p_contentResource primitiveContent field * @param p_contentResource primitiveContent field
...@@ -326,7 +520,7 @@ module OneM2M_Functions { ...@@ -326,7 +520,7 @@ module OneM2M_Functions {
* @verdict * @verdict
*/ */
function f_getResourceId(PrimitiveContent p_contentResource) return XSD.ID { function f_getResourceId(PrimitiveContent p_contentResource) return XSD.ID {
if(ischosen(p_contentResource.any_1[0].AccessControlPolicy_optional)) { if(ischosen(p_contentResource.any_1[0].AccessControlPolicy_optional)) {
return p_contentResource.any_1[0].AccessControlPolicy_optional.resourceID; return p_contentResource.any_1[0].AccessControlPolicy_optional.resourceID;
} }
...@@ -349,9 +543,9 @@ module OneM2M_Functions { ...@@ -349,9 +543,9 @@ module OneM2M_Functions {
return p_contentResource.any_1[0].AE_optional.resourceID; return p_contentResource.any_1[0].AE_optional.resourceID;
} }
return "1"; return "1";
} }
/** /**
* @desc Extraction from a primitiveContent field the resourceName attribute * @desc Extraction from a primitiveContent field the resourceName attribute
* @param p_contentResource primitiveContent field * @param p_contentResource primitiveContent field
...@@ -359,7 +553,7 @@ module OneM2M_Functions { ...@@ -359,7 +553,7 @@ module OneM2M_Functions {
* @verdict * @verdict
*/ */
function f_getResourceName(PrimitiveContent p_contentResource) return XSD.ID { function f_getResourceName(PrimitiveContent p_contentResource) return XSD.ID {
if(ischosen(p_contentResource.any_1[0].AccessControlPolicy_optional)) { if(ischosen(p_contentResource.any_1[0].AccessControlPolicy_optional)) {
return p_contentResource.any_1[0].AccessControlPolicy_optional.resourceName; return p_contentResource.any_1[0].AccessControlPolicy_optional.resourceName;
} }
...@@ -381,23 +575,23 @@ module OneM2M_Functions { ...@@ -381,23 +575,23 @@ module OneM2M_Functions {
if(ischosen(p_contentResource.any_1[0].AE_optional)) { if(ischosen(p_contentResource.any_1[0].AE_optional)) {
return p_contentResource.any_1[0].AE_optional.resourceName; return p_contentResource.any_1[0].AE_optional.resourceName;
} }
return "1"; return "1";
} }
/** /**
* @desc Resolution of the originator field (from) for a given resource * @desc Resolution of the originator field (from) for a given resource
* @param p_targetResourceIndex Internal resource index of the given resource * @param p_targetResourceIndex Internal resource index of the given resource
* @return Originator for a given resource * @return Originator for a given resource
* @verdict * @verdict
*/ */
function f_getOriginator(integer p_targetResourceIndex := -1) runs on M2M return XSD.AnyURI { function f_getOriginator(integer p_targetResourceIndex := -1) runs on CseTester return XSD.AnyURI {
if(p_targetResourceIndex == -1) { if(p_targetResourceIndex == -1) {
return PX_AE_ID_STEM; return PX_AE_ID_STEM;
} }
if(PX_FROM_IS_AE_ID) { if(PX_FROM_IS_AE_ID) {
if(ischosen(vc_resourcesList[p_targetResourceIndex].resource.any_1[0].AE_optional)) { if(ischosen(vc_resourcesList[p_targetResourceIndex].resource.any_1[0].AE_optional)) {
return vc_resourcesList[p_targetResourceIndex].resource.any_1[0].AE_optional.aE_ID; return vc_resourcesList[p_targetResourceIndex].resource.any_1[0].AE_optional.aE_ID;
...@@ -408,7 +602,7 @@ module OneM2M_Functions { ...@@ -408,7 +602,7 @@ module OneM2M_Functions {
return PX_AE_ID_STEM; return PX_AE_ID_STEM;
} }
} }
/** /**
* @desc Return of a index of a specific attribute from an attributeList by attributeName * @desc Return of a index of a specific attribute from an attributeList by attributeName
* @param p_attributeList Target attributeList * @param p_attributeList Target attributeList
...@@ -419,28 +613,28 @@ module OneM2M_Functions { ...@@ -419,28 +613,28 @@ module OneM2M_Functions {
function f_getAttribute(in AttributeList p_attributeList, in XSD.NCName p_attributeName) return integer { function f_getAttribute(in AttributeList p_attributeList, in XSD.NCName p_attributeName) return integer {
var integer i; var integer i;
var Attribute v_attribute := {-, -}; var Attribute v_attribute := {-, -};
for (i:=0; i < lengthof(p_attributeList); i := i + 1){ for (i:=0; i < lengthof(p_attributeList); i := i + 1){
if(p_attributeList[i] == p_attributeName){ if(p_attributeList[i] == p_attributeName){
return i; return i;
} }
} }
return -1; return -1;
} }
/** /**
* @desc Resolution of the resource address field (to) for a given resource depending on addressing and hierarchical format * @desc Resolution of the resource address field (to) for a given resource depending on addressing and hierarchical format
* @param p_targetResourceIndex Internal resource index of the given resource * @param p_targetResourceIndex Internal resource index of the given resource
* @return Resource address for the given resource * @return Resource address for the given resource
* @verdict * @verdict
*/ */
function f_getResourceAddress(integer p_targetResourceIndex := -1) runs on M2M return XSD.ID { function f_getResourceAddress(integer p_targetResourceIndex := -1) runs on CseTester return XSD.ID {
var XSD.ID v_resourceAddress; var XSD.ID v_resourceAddress;
if(PX_ADDRESSING_FORMAT == e_cseRelative) { if(PX_ADDRESSING_FORMAT == e_cseRelative) {
if(PX_UNSTRUCTURED) { if(PX_UNSTRUCTURED) {
if(p_targetResourceIndex == -1) { if(p_targetResourceIndex == -1) {
return ""; return "";
...@@ -455,7 +649,7 @@ module OneM2M_Functions { ...@@ -455,7 +649,7 @@ module OneM2M_Functions {
return v_resourceAddress; return v_resourceAddress;
} }
} }
} else if (PX_ADDRESSING_FORMAT == e_spRelative) { } else if (PX_ADDRESSING_FORMAT == e_spRelative) {
if(PX_UNSTRUCTURED) { if(PX_UNSTRUCTURED) {
if(p_targetResourceIndex == -1) { if(p_targetResourceIndex == -1) {
...@@ -489,7 +683,7 @@ module OneM2M_Functions { ...@@ -489,7 +683,7 @@ module OneM2M_Functions {
} else { } else {
return ""; return "";
} }
} }
/** /**
* @desc Saving of a resource and its parent index in the internal resource list * @desc Saving of a resource and its parent index in the internal resource list
...@@ -498,166 +692,20 @@ module OneM2M_Functions { ...@@ -498,166 +692,20 @@ module OneM2M_Functions {
* @return Internal resource index of the saved resource * @return Internal resource index of the saved resource
* @verdict * @verdict
*/ */
function f_setResource(PrimitiveContent p_resource, integer p_parentIndex := -1) runs on M2M return integer { function f_setResource(PrimitiveContent p_resource, integer p_parentIndex := -1) runs on CseTester return integer {
if(isbound(vc_resourcesList)) { if(isbound(vc_resourcesList)) {
vc_resourcesList[lengthof(vc_resourcesList)] := {p_parentIndex, p_resource}; vc_resourcesList[lengthof(vc_resourcesList)] := {p_parentIndex, p_resource};
} else { } else {
vc_resourcesList[0] := {p_parentIndex, p_resource}; vc_resourcesList[0] := {p_parentIndex, p_resource};
} }
return lengthof(vc_resourcesList)-1; return lengthof(vc_resourcesList)-1;
} }
}//end group getSetFunctions }//end group getSetFunctions
group helpingFunctions { group commonFunctions {
/**
* @desc Creation of a resource
* @param p_resourceType Resource type of the resource to be created
* @param p_requestPrimitive Template request primitive
* @param p_parentIndex Internal resource index which indicates the parent of the resource to be created
* @return Internal resource index of the created resource
* @verdict
*/
function f_createResource(in ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, integer p_parentIndex := -1) runs on M2M return integer {
var M2MResponsePrimitive v_response;
var RequestPrimitive v_request;
var XSD.ID v_resourceId;
var integer v_resourceIndex := -1;
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, p_parentIndex);
mcaPort.send(m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_responseOK) -> value v_response {
tc_ac.stop;
setverdict(pass, "f_createResource: Resource type " & int2str(enum2int(p_resourceType)) & " created successfuly");
v_resourceIndex := f_setResource(v_response.responsePrimitive_.primitiveContent, p_parentIndex);
}
[] mcaPort.receive(mw_responseKO) {
tc_ac.stop;
setverdict(inconc, "f_createResource: Error while creating resource type " & int2str(enum2int(p_resourceType)));
}
[] mcaPort.receive {
tc_ac.stop;
setverdict(inconc, "f_createResource: Unexpected message received");
}
[] tc_ac.timeout {
setverdict(inconc, "f_createResource: No answer while creating resource type " & int2str(enum2int(p_resourceType)));
}
}
return v_resourceIndex;
}
/**
* @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_createAccessControlPolicyAux(in template (value) XSD.String p_acpName := c_acpAuxName, 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;
v_request := valueof(m_createAcpAux(p_acpName := p_acpName, p_allowedOperations := p_allowedOperations));
v_request.to_ := f_addPrefix(f_getResourceAddress());
mcaPort.send(m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_responseOK) -> value v_response {
tc_ac.stop;
setverdict(pass, "f_createAccessControlPolicy: Resource type " & int2str(1) & " created successfuly");
v_acpAuxIndex := f_setResource(v_response.responsePrimitive_.primitiveContent);
vc_acpAux := v_response.responsePrimitive_.primitiveContent.any_1[0].AccessControlPolicy_optional;//TODO To be removed
}
[] mcaPort.receive(mw_responseKO) {
tc_ac.stop;
setverdict(inconc, "f_createAccessControlPolicy: Error while creating resource type " & int2str(1));
}
[] mcaPort.receive {
tc_ac.stop;
setverdict(inconc, "f_createAccessControlPolicy: Unexpected message received");
}
[] tc_ac.timeout {
setverdict(inconc, "f_createAccessControlPolicy: No answer while creating resource type " & int2str(1));
}
}
return v_acpAuxIndex;
}
/**
* @desc Creation of the auxiliar Container resource
* @param p_parentIndex Internal resource index which indicates the parent of the Container resource to be created
* @return Internal resource index of the created Container resource
* @verdict
*/
function f_createContainerResourceAux (integer p_parentIndex := -1) runs on M2M return integer {
var M2MResponsePrimitive v_response;
var RequestPrimitive v_request;
var integer v_acpAuxIndex := -1;
var integer v_containerResourceIndex := -1;
v_acpAuxIndex := f_createAccessControlPolicyAux(p_acpName := c_acpAuxName);//"MyAcp_2"
v_request := valueof(m_createContainerBase);
v_request.primitiveContent.any_1[0].Container_optional.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)};
v_request.primitiveContent.any_1[0].Container_optional.resourceName := "MyContainerAux";
v_containerResourceIndex := f_createResource(int3, v_request, p_parentIndex);
return v_containerResourceIndex;
}
/**
* @desc Update of the auxiliar ACP resource
* @param p_allowedOperations New allowed operations
* @verdict
*/
function f_updateAcpAuxResource (in template (value) AccessControlOperations p_allowedOperations) runs on M2M {
var RequestPrimitive v_request;
v_request := valueof(m_updateAcpBase);
v_request.to_ := f_addPrefix(f_getResourceAddress(vc_acpAuxIndex));
v_request.primitiveContent.any_1[0].AccessControlPolicy_optional.privileges.accessControlRule_list := {
{
accessControlOriginators := PX_ACOR, //{"admin:admin"}
accessControlOperations := valueof(p_allowedOperations),
accessControlContexts_list := omit
}
};
mcaPort.send(m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_responseOK) {
tc_ac.stop;
setverdict(pass, "f_updateAcpAuxResource: " & v_request.to_ & " resource updated successfuly");
}
[] mcaPort.receive(mw_responseKO) {
tc_ac.stop;
setverdict(fail, "f_updateAcpAuxResource: Error while updating " & v_request.to_ & " resource");
}
[] tc_ac.timeout {
setverdict(inconc, "f_updateAcpAuxResource: No answer while updating " & v_request.to_ & " resource" );
}
}
}
/** /**
* @desc Sending of an Adapter Control primitive * @desc Sending of an Adapter Control primitive
...@@ -665,18 +713,31 @@ module OneM2M_Functions { ...@@ -665,18 +713,31 @@ module OneM2M_Functions {
* @param data Corresponding information for the correct execution of the given action * @param data Corresponding information for the correct execution of the given action
* @verdict * @verdict
*/ */
function f_sendAcPrimitive(in charstring event, in charstring data) runs on M2M { function f_sendAcPrimitive(in charstring event, in charstring data) runs on Tester {
var charstring v_data := "" & data; // clear encoding rules (ttwb issue ?) var charstring v_data := "" & data; // clear encoding rules (ttwb issue ?)
acPort.send(AcRequestPrimitive:{event, {charstring := v_data}}); acPort.send(AcRequestPrimitive:{event, {charstring := v_data}});
} }
group altstepFunctions {
/**
* @desc Default altstep
*/
altstep a_default() runs on Tester {
[] tc_wait.timeout {
setverdict(inconc,"a_default: ERROR: Timeout while awaiting reaction of the IUT prior to Upper Tester action");
}
[] tc_ac.timeout {
setverdict(inconc,"a_default: ERROR: Timeout while awaiting the reception of a message");
}
}
}//end group altstepFunctions
}//end group helpingFunctions
}//end of commonFunctions
......
LibOneM2M/OneM2M_Templates.ttcn
+ 66
− 68
View file @ bdeedd60
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* @author ETSI * @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Templates.ttcn $ * @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Templates.ttcn $
* $Id: OneM2M_Templates.ttcn 103 2016-08-30 09:39:32Z reinaortega $ * $Id: OneM2M_Templates.ttcn 105 2016-08-31 13:01:46Z reinaortega $
* @desc Module containing templates for oneM2M * @desc Module containing templates for oneM2M
* *
*/ */
...@@ -19,7 +19,7 @@ module OneM2M_Templates { ...@@ -19,7 +19,7 @@ module OneM2M_Templates {
import from OneM2M_TypesAndValues all; import from OneM2M_TypesAndValues all;
//import from OneM2M_AdditionalTypes all; //import from OneM2M_AdditionalTypes all;
import from OneM2M_Pixits all; import from OneM2M_Pixits all;
import from OneM2M_Functions all; //import from OneM2M_Functions all;
/** /**
...@@ -36,27 +36,34 @@ module OneM2M_Templates { ...@@ -36,27 +36,34 @@ module OneM2M_Templates {
/* Templates */ /* Templates */
/**
* @desc Base template for request sending operations group primitives {
* @param p_requestPrimitive /**
*/ * @desc Base template for request sending operations
template (value) M2MRequestPrimitive m_request(in template (value) RequestPrimitive p_requestPrimitive, in template (omit) AttributeList_1 p_nullFields := omit ) := { * @param p_requestPrimitive
requestPrimitive_ := p_requestPrimitive, */
host := PX_HOST_ADDRESS, template (value) MsgOut m_request(in template (value) RequestPrimitive p_requestPrimitive, in template (omit) AttributeList_1 p_nullFields := omit ) := {
xmlNamespace := PX_XML_NAMESPACE, primitive := { requestPrimitive := p_requestPrimitive},
protocolBinding := PX_PROTOCOL_BINDING, host := PX_HOST_ADDRESS,
serialization := PX_SERIALIZATION, xmlNamespace := PX_XML_NAMESPACE,
nullFields := p_nullFields protocolBinding := PX_PROTOCOL_BINDING,
}; serialization := PX_SERIALIZATION,
//Added by @Naum nullFields := p_nullFields
template M2MRequestPrimitive mw_request(in template RequestPrimitive p_requestPrimitive, in template (omit) AttributeList_1 p_nullFields := omit ) := { };
requestPrimitive_ := p_requestPrimitive, //Added by @Naum
host := omit, template MsgIn mw_request(in template (present) RequestPrimitive p_requestPrimitive) := {
xmlNamespace := omit, primitive := { requestPrimitive := p_requestPrimitive}
protocolBinding := omit, };
serialization := omit,
nullFields := omit /**
}; * @desc Base template for response receiving operations
* @param p_responsePrimitive
*/
template MsgIn mw_response(in template (present) ResponsePrimitive p_responsePrimitive) := {
primitive := { responsePrimitive := p_responsePrimitive}
};
}
group RequestPrimitives { group RequestPrimitives {
...@@ -2123,57 +2130,48 @@ module OneM2M_Templates { ...@@ -2123,57 +2130,48 @@ module OneM2M_Templates {
}//end group SpecialContents }//end group SpecialContents
group ResponsePrimitives { group ResponsePrimitives {
template M2MResponsePrimitive mw_response(ResponseStatusCode p_statusCode) := { template ResponsePrimitive mw_responsePrimitive(ResponseStatusCode p_statusCode) := {
responsePrimitive_ := { responseStatusCode := p_statusCode,
responseStatusCode := p_statusCode, requestIdentifier := ?,
requestIdentifier := ?, primitiveContent := *,
primitiveContent := *, to_ := *,
to_ := *, from_ := *,
from_ := *, originatingTimestamp := *,
originatingTimestamp := *, resultExpirationTimestamp := *,
resultExpirationTimestamp := *, eventCategory := *
eventCategory := *
}
}; };
template M2MResponsePrimitive mw_responseInverse(ResponseStatusCode p_statusCode) := { template ResponsePrimitive mw_responsePrimitiveInverse(ResponseStatusCode p_statusCode) := {
responsePrimitive_ := { responseStatusCode := complement(p_statusCode),
responseStatusCode := complement(p_statusCode), requestIdentifier := ?,
requestIdentifier := ?, primitiveContent := *,
primitiveContent := *, to_ := *,
to_ := *, from_ := *,
from_ := *, originatingTimestamp := *,
originatingTimestamp := *, resultExpirationTimestamp := *,
resultExpirationTimestamp := *, eventCategory := *
eventCategory := *
}
}; };
template M2MResponsePrimitive mw_responseOK(in template PrimitiveContent p_content := *) := { template ResponsePrimitive mw_responsePrimitiveOK(in template PrimitiveContent p_content := *) := {
responsePrimitive_ := { responseStatusCode := (int2000, int2001, int2002, int2004),
responseStatusCode := (int2000, int2001, int2002, int2004), requestIdentifier := ?,
requestIdentifier := ?, primitiveContent := p_content,
primitiveContent := p_content, to_ := *,
to_ := *, from_ := *,
from_ := *, originatingTimestamp := *,
originatingTimestamp := *, resultExpirationTimestamp := *,
resultExpirationTimestamp := *, eventCategory := *
eventCategory := *
}
}; };
template M2MResponsePrimitive mw_responseKO := { template ResponsePrimitive mw_responsePrimitiveKO := {
responsePrimitive_ := { responseStatusCode := complement(int2000, int2001, int2002, int2004),
responseStatusCode := complement(int2000, int2001, int2002, int2004), requestIdentifier := ?,
requestIdentifier := ?, primitiveContent := *,
primitiveContent := *, to_ := *,
to_ := *, from_ := *,
from_ := *, originatingTimestamp := *,
originatingTimestamp := *, resultExpirationTimestamp := *,
resultExpirationTimestamp := *, eventCategory := *
eventCategory := *
}
}; };
}//end group ResponsePrimitives }//end group ResponsePrimitives
......
LibOneM2M/OneM2M_TestSystem.ttcn
+ 44
− 27
View file @ bdeedd60
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* @author ETSI * @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_TestSystem.ttcn $ * @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_TestSystem.ttcn $
* $Id: OneM2M_TestSystem.ttcn 103 2016-08-30 09:39:32Z reinaortega $ * $Id: OneM2M_TestSystem.ttcn 105 2016-08-31 13:01:46Z reinaortega $
* @desc Test System module for oneM2M * @desc Test System module for oneM2M
* *
*/ */
...@@ -24,9 +24,9 @@ module OneM2M_TestSystem { ...@@ -24,9 +24,9 @@ module OneM2M_TestSystem {
*/ */
type port OneM2MPort message { type port OneM2MPort message {
in in
M2MRequestPrimitive, M2MResponsePrimitive; MsgIn;
out out
M2MRequestPrimitive, M2MResponsePrimitive; MsgOut;
} }
/** /**
...@@ -39,61 +39,78 @@ module OneM2M_TestSystem { ...@@ -39,61 +39,78 @@ module OneM2M_TestSystem {
AcRequestPrimitive; AcRequestPrimitive;
} }
/* Components */ /* Components */
type component M2M { type component Tester {
port OneM2MPort mcaPort;
port OneM2MPort mccPort;
port AdapterControlPort acPort; port AdapterControlPort acPort;
//timers //timers
timer tc_ac := PX_TAC; timer tc_ac := PX_TAC;
timer tc_wait; timer tc_wait;
//global variables
var MyResourcesList vc_resourcesList;
var IntegerList vc_resourcesIndexToBeDeleted;
}
type component CseTester extends Tester {
port OneM2MPort mcaPort;
port OneM2MPort mccPort;
//global variables //global variables
var AE_optional vc_aeAux;//TODO To be removed var AE_optional vc_aeAux;//TODO To be removed
var AccessControlPolicy_optional vc_acpAux; var AccessControlPolicy_optional vc_acpAux;
var integer vc_acpAuxIndex := -1; var integer vc_acpAuxIndex := -1;
var MyResourcesList vc_resourcesList;
var IntegerList vc_resourcesIndexToBeDeleted; }
type component AeTester extends Tester {
port OneM2MPort mcaPort;
//global variables
} }
type component M2MSystem { type component CseSystem {
port OneM2MPort mcaPort; port OneM2MPort mcaPort;
port OneM2MPort mccPort; port OneM2MPort mccPort;
port AdapterControlPort acPort; port AdapterControlPort acPort;
} }
type component AeSystem {
port OneM2MPort mcaPort;
port AdapterControlPort acPort;
}
/* Primitives */ /* Primitives */
/** /**
* @desc Type for the oneM2M primitives exchange * @desc Type for the oneM2M primitives exchange
* @member requestPrimitive_ oneM2M primitive * @member primitive oneM2M primitive
* @member host IP Address of the destination * @member host IP Address of the destination
* @member xmlNamespace XML Namespace to be used * @member xmlNamespace XML Namespace to be used
* @member protocolBinding Protocol binding to be used * @member protocolBinding Protocol binding to be used
* @member serialization Serialization to be used * @member serialization Serialization to be used
* @member nullFields Fields that are to be included in the oneM2M primitive but empty, i.e. <labels></labels> * @member nullFields Fields that are to be included in the oneM2M primitive but empty, i.e. <labels></labels>
*/ */
type record M2MRequestPrimitive { type record MsgOut {
RequestPrimitive requestPrimitive_, union {
RequestPrimitive requestPrimitive,
ResponsePrimitive responsePrimitive
} primitive,
charstring host optional, charstring host optional,
charstring xmlNamespace optional, charstring xmlNamespace optional,
charstring protocolBinding optional, charstring protocolBinding optional,
charstring serialization optional, charstring serialization optional,
AttributeList_1 nullFields optional AttributeList_1 nullFields optional
} }
type record M2MResponsePrimitive {
ResponsePrimitive responsePrimitive_
}
type record M2MPrimitive { /**
* @desc Type for the oneM2M primitives exchange
* @member primitive oneM2M primitive
*/
type record MsgIn {
union { union {
RequestPrimitive requestPrimitive_, RequestPrimitive requestPrimitive,
ResponsePrimitive responsePrimitive_ ResponsePrimitive responsePrimitive
} primitive, } primitive
charstring host optional,
charstring xmlNamespace optional,
charstring protocolBinding optional,
charstring serialization optional,
AttributeList_1 nullFields optional
} }
type record AcRequestPrimitive { type record AcRequestPrimitive {
......
OneM2M_Testcases.ttcn
+ 734
− 596
View file @ bdeedd60
This diff is collapsed.
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