Commit d97f8772 authored by Antonio Castillo Verdugo's avatar Antonio Castillo Verdugo

Merge branch 'Release1' of https://git.onem2m.org/TST/ATS into Release1

parents 6a390016 1c955609
This diff is collapsed.
......@@ -15,15 +15,15 @@ module OneM2M_Ports {
import from OneM2M_Types all;
/* ***************************************
* oneM2M Ports
* ***************************************
* oneM2M Ports
* ***************************************
*/
/**
* @desc Port to transport oneM2M primitives
* @desc Output MsgOut
* @desc Input MsgIn
* @desc this port is allowed to extend for futher usage
* @desc e.g. extend OneM2MPort to dual-faced port
* @desc e.g. extend OneM2MPort to dual-faced port
*/
type port OneM2MPort message {
in
......
......@@ -125,7 +125,7 @@ module OneM2M_Templates {
* @desc Base Receive RETRIEVE request primitive
* @param p_targetResourceAddress Target resource address
*/
template RequestPrimitive mw_retrieve(XSD.ID p_targetResourceAddress) := {
template RequestPrimitive mw_retrieve(template XSD.ID p_targetResourceAddress) := {
operation := int2,
to_ := p_targetResourceAddress,
from_ := ?,
......@@ -383,7 +383,7 @@ module OneM2M_Templates {
to_ := p_to,
from_ := p_from,
requestIdentifier := ?,
resourceType := ?,
resourceType := omit,
primitiveContent:= ?,
role := *,
originatingTimestamp := *,
......@@ -585,7 +585,7 @@ module OneM2M_Templates {
/**
* @desc Reception template for CREATE AEAnnc
*/
template RequestPrimitive mw_createAEAnnc(template (omit) XSD.ID p_from := omit, template (omit) XSD.ID p_to := omit, template (omit) AcpType p_accessControlPolicyIds := omit, template XSD.AnyURI p_link := ?) modifies mw_create := {
template RequestPrimitive mw_createAEAnnc(template (omit) XSD.ID p_from := omit, template (omit) XSD.ID p_to := omit, template AcpType p_accessControlPolicyIds := ?, template XSD.AnyURI p_link := ?) modifies mw_create := {
resourceType := int10002,
primitiveContent := {aEAnnc := mw_contentCreateAEAnnc({"Credential-ID:None"}, p_accessControlPolicyIds)}
};
......@@ -1280,15 +1280,15 @@ module OneM2M_Templates {
accessControlPolicyIDs := p_accessControlPolicyIds,//MA
expirationTime := ?,//MA M
link := p_link,//M
appName := omit,//OA
app_ID := omit,//OA
aE_ID := omit,//OA
pointOfAccess := omit, //OA {"http://127.0.0.1:1400/monitor"},//O //{"http://192.168.1.92:18080/notifications/AE"}, // TODO: Check this => AE PoA
ontologyRef := omit,//OA
nodeLink := omit,//OA
requestReachability := omit,//OA
contentSerialization := omit,//OA
choice := omit//NA
appName := *,//OA
app_ID := *,//OA
aE_ID := *,//OA
pointOfAccess := *, //OA {"http://127.0.0.1:1400/monitor"},//O //{"http://192.168.1.92:18080/notifications/AE"}, // TODO: Check this => AE PoA
ontologyRef := *,//OA
nodeLink := *,//OA
requestReachability := *,//OA
contentSerialization := *,//OA
choice := *//NA
};
/**
......
......@@ -62,9 +62,9 @@ module OneM2M_TestSystem {
//global variables
var MyResourcesList vc_localResourcesList := {};
var AeSimu vc_ae1;//For CF02 when CseSimu is master
var integer vc_remoteCseIndex;
var integer vc_localRemoteCseIndex;
var integer vc_cSEBaseIndex; //Index of the CSEBase resource of the Tester inside vc_localResourcesList
var integer vc_remoteCseIndex := -1;
var integer vc_localRemoteCseIndex := -1;
var integer vc_cSEBaseIndex := -1; //Index of the CSEBase resource of the Tester inside vc_localResourcesList
};
type component InCseSimu extends CseSimu {}
......@@ -77,6 +77,7 @@ module OneM2M_TestSystem {
port OneM2MPort mccPort;
port OneM2MPort mccPortIn;
port AdapterControlPort acPort;
port UpperTesterPort utPort;
}
type component AeSystem {
......
......@@ -5,85 +5,84 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
* @author ETSI
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/LibOneM2M/UsefulTtcn3Types.ttcn $
* $Id: UsefulTtcn3Types.ttcn 173 2016-11-22 08:10:48Z reinaortega $
* @desc Test System module for oneM2M
* @author oneM2M
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/UsefulTtcn3Types.ttcn $
* $Id: UsefulTtcn3Types.ttcn 234 2017-03-20 16:37:29Z reinaortega $
* @desc Useful types
*
*/
module UsefulTtcn3Types {
type integer byte (-128 .. 127) with { variant "/* 8 bit */" };
type integer byte (-128 .. 127) with { variant "/* 8 bit */" };
type integer unsignedbyte (0 .. 255) with { variant "/*unsigned 8 bit*/" };
type integer unsignedbyte (0 .. 255) with { variant "/*unsigned 8 bit*/" };
type integer short (-32768 .. 32767) with { variant "/*16 bit*/" };
type integer short (-32768 .. 32767) with { variant "/*16 bit*/" };
type integer unsignedshort (0 .. 65535) with { variant "/*unsigned 16 bit*/" };
type integer unsignedshort (0 .. 65535) with { variant "/*unsigned 16 bit*/" };
type integer long (-2147483648 .. 2147483647) with { variant "/*32 bit*/" };
type integer long (-2147483648 .. 2147483647) with { variant "/*32 bit*/" };
type integer unsignedlong (0 .. 4294967295) with { variant "/*unsigned 32 bit*/" };
type integer unsignedlong (0 .. 4294967295) with { variant "/*unsigned 32 bit*/" };
type integer longlong /* ( -9223372036854775808 .. 9223372036854775807 ) */ with { variant "/*64 bit*/" };
type integer longlong /* ( -9223372036854775808 .. 9223372036854775807 ) */ with { variant "/*64 bit*/" };
type integer unsignedlonglong /* ( 0 .. 18446744073709551615 ) */ with { variant "/*unsigned 64 bit*/" };
type integer unsignedlonglong /* ( 0 .. 18446744073709551615 ) */ with { variant "/*unsigned 64 bit*/" };
type float IEEE754float with { variant "/*IEEE754 float*/" };
type float IEEE754float with { variant "/*IEEE754 float*/" };
type float IEEE754double with { variant "/*IEEE754 double*/" };
type float IEEE754double with { variant "/*IEEE754 double*/" };
type float IEEE754extfloat with { variant "/*IEEE754 extended float*/" };
type float IEEE754extfloat with { variant "/*IEEE754 extended float*/" };
type float IEEE754extdouble with { variant "/*IEEE754 extended double*/" };
type float IEEE754extdouble with { variant "/*IEEE754 extended double*/" };
type universal charstring utf8string with { variant "/*UTF-8*/" };
type universal charstring utf8string with { variant "/*UTF-8*/" };
type universal charstring bmpstring ( char ( 0,0,0,0 ) .. char ( 0,0,255,255) ) with { variant "/*UCS-2*/" };
type universal charstring bmpstring ( char ( 0,0,0,0 ) .. char ( 0,0,255,255) ) with { variant "/*UCS-2*/" };
type universal charstring utf16string ( char ( 0,0,0,0 ) .. char ( 0,16,255,255) ) with { variant "/*UTF-16*/" };
type universal charstring utf16string ( char ( 0,0,0,0 ) .. char ( 0,16,255,255) ) with { variant "/*UTF-16*/" };
type universal charstring iso8859string ( char ( 0,0,0,0 ) .. char ( 0,0,0,255) ) with { variant "/*8 bit*/" };
type universal charstring iso8859string ( char ( 0,0,0,0 ) .. char ( 0,0,0,255) ) with { variant "/*8 bit*/" };
type record IDLfixed
{
unsignedshort digits,
short scale,
charstring value_
}
with {
variant "/*IDL:fixed FORMAL/01-12-01 v.2.6*/";
};
type record IDLfixed
{
unsignedshort digits,
short scale,
charstring value_
}
with {
variant "/*IDL:fixed FORMAL/01-12-01 v.2.6*/";
};
/*
type charstring char length (1);
/*
type charstring char length (1);
NOTE 1: The name of this useful type is the same as the TTCN-3 keyword used to denote universal
charstring values in the quadraple form. In general it is disallowed to use TTCN-3 keywords as
identifiers. The "char" useful type is a solitary exception and allowed only for backward compatibility
with previous versions of the TTCN-3 standard. (except Titan doesn't)
NOTE 1: The name of this useful type is the same as the TTCN-3 keyword used to denote universal
charstring values in the quadraple form. In general it is disallowed to use TTCN-3 keywords as
identifiers. The "char" useful type is a solitary exception and allowed only for backward compatibility
with previous versions of the TTCN-3 standard. (except Titan doesn't)
NOTE 2: The special string "8 bit" defined in clause 28.2.3 may be used with this type to specify a given encoding
for its values. Also, other properties of the base type can be changed by using attribute mechanisms.
*/
NOTE 2: The special string "8 bit" defined in clause 28.2.3 may be used with this type to specify a given encoding
for its values. Also, other properties of the base type can be changed by using attribute mechanisms.
*/
type universal charstring uchar length (1);
type universal charstring uchar length (1);
/*
NOTE: Special strings defined in clause 28.2.3 except "8 bit" may be used with this type to specify a given
encoding for its values. Also, other properties of the base type can be changed by using attribute
mechanisms.
*/
/*
NOTE: Special strings defined in clause 28.2.3 except "8 bit" may be used with this type to specify a given
encoding for its values. Also, other properties of the base type can be changed by using attribute
mechanisms.
*/
type bitstring bit length (1);
type bitstring bit length (1);
type hexstring hex length (1);
type hexstring hex length (1);
type octetstring octet length (1);
type octetstring octet length (1);
}
with {
encode "XML";
}
......@@ -5,10 +5,10 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
* @author ETSI
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/LibOneM2M/XSD.ttcn $
* $Id: XSD.ttcn 347 2017-08-11 08:48:20Z reinaortega $
* @desc Test System module for oneM2M
* @author oneM2M
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/XSD.ttcn $
* $Id: XSD.ttcn 234 2017-03-20 16:37:29Z reinaortega $
* @desc XSD Aux
*
*/
module XSD {
......@@ -31,10 +31,10 @@ const charstring
nums := "[0-9]#(1,)",
ZorTimeZoneExt := "(Z|[+-]((0[0-9]|1[0-3]):[0-5][0-9]|14:00))#(,1)",
durTime := "(T[0-9]#(1,)"&
"(H([0-9]#(1,)(M([0-9]#(1,)(S|.[0-9]#(1,)S))#(,1)|.[0-9]#(1,)S|S))#(,1)|"&
"M([0-9]#(1,)(S|.[0-9]#(1,)S)|.[0-9]#(1,)M)#(,1)|"&
"S|"&
".[0-9]#(1,)S))";
"(H([0-9]#(1,)(M([0-9]#(1,)(S|.[0-9]#(1,)S))#(,1)|.[0-9]#(1,)S|S))#(,1)|"&
"M([0-9]#(1,)(S|.[0-9]#(1,)S)|.[0-9]#(1,)M)#(,1)|"&
"S|"&
".[0-9]#(1,)S))";
//anySimpleType
......@@ -53,9 +53,9 @@ type record AnyType
}
with {
variant "XSD:anyType";
variant "embedValues";
variant (attr) "anyAttributes";
variant (elem_list) "anyElement";
//variant "embedValues";
//variant (attr) "anyAttributes";
//variant (elem_list) "anyElement";
};
// String types
......@@ -209,9 +209,9 @@ variant "XSD:double";
// Time types
type charstring Duration //(pattern TODO Check the pattern "PT5S" not matching
//"{dash}#(,1)P({nums}(Y({nums}(M({nums}D{durTime}#(,1)|{durTime}#(,1))|D{durTime}#(,1))|" &
//"{durTime}#(,1))|M({nums}D{durTime}#(,1)|{durTime}#(,1))|D{durTime}#(,1))|{durTime})")
type charstring Duration (pattern
"{dash}#(,1)P({nums}(Y({nums}(M({nums}D{durTime}#(,1)|{durTime}#(,1))|D{durTime}#(,1))|" &
"{durTime}#(,1))|M({nums}D{durTime}#(,1)|{durTime}#(,1))|D{durTime}#(,1))|{durTime})")
with {
variant "XSD:duration";
};
......@@ -305,23 +305,23 @@ type utf8string XMLCompatibleString
char(0,0,0,9)..char(0,0,0,9),
char(0,0,0,10)..char(0,0,0,10),
char(0,0,0,13)..char(0,0,0,13),
char(0,0,0,32)..char(0,0,215,255),
char(0,0,224,0)..char(0,0,255,253),
char(0,1,0,0)..char(0,16,255,253)
char(0,0,0,32)..char(0,0,215,255),
char(0,0,224,0)..char(0,0,255,253),
char(0,1,0,0)..char(0,16,255,253)
);
type utf8string XMLStringWithNoWhitespace
(
char(0,0,0,33)..char(0,0,215,255),
char(0,0,224,0)..char(0,0,255,253),
char(0,1,0,0)..char(0,16,255,253)
char(0,0,224,0)..char(0,0,255,253),
char(0,1,0,0)..char(0,16,255,253)
);
type utf8string XMLStringWithNoCRLFHT
(
char(0,0,0,32)..char(0,0,215,255),
char(0,0,224,0)..char(0,0,255,253),
char(0,1,0,0)..char(0,16,255,253)
char(0,0,224,0)..char(0,0,255,253),
char(0,1,0,0)..char(0,16,255,253)
);
}
......
......@@ -6320,6 +6320,77 @@ module OneM2M_PermutationFunctions {
}//end group AccessControlPolicy
}//end group Security
group Annoucement {
group Basic {
function f_CSE_ANNC_001(ResourceType p_resourceType, template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit, in template RequestPrimitive p_requestUpdatePrimitive := omit) runs on AeSimu {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
var integer v_parentIndex := -1;
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_CSE_ID};
// Test control
// Test component configuration
f_cf02Up();
// Test adapter configuration
//Register the CSE
vc_cse1.start(f_cse_registrationRemoteCse(mw_createRemoteCSE));
vc_cse1.done;
//Preamble
vc_cse1.start(f_cse_resourceAnnouncementHandler(mw_createAEAnnc(-, -, -)));
v_aeIndex := f_cse_createResource(int2,v_create);
vc_cse1.done;
// Test Body
if (ispresent (p_requestUpdatePrimitive)) {
v_resourceIndex := f_cse_createResource(p_resourceType,p_requestCreatePrimitive);
v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_requestUpdatePrimitive);
v_responsePrimitive.responseStatusCode := int2004;
} else {
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestCreatePrimitive, v_parentIndex);
v_responsePrimitive.responseStatusCode := int2001;
}
vc_cse1.start(f_cse_resourceAnnouncementHandler(p_createRequestAnnc));
mcaPort.send(m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(v_responsePrimitive.responseStatusCode))) -> value v_response {
tc_ac.stop;
setverdict(pass, __SCOPE__, ": Operation for resource " & int2str(enum2int(p_resourceType)) & " performed successfully");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
tc_ac.stop;
setverdict(fail, __SCOPE__, ": Wrong response status code");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__, ": No answer while updating resource type " & int2str(enum2int(p_resourceType)));
}
}
// Postamble
f_cse_postamble_deleteResources();
// Tear down
f_cf02Down();
}//end f_CSE_ANNC_001
}//end group Basic
}// end group Announcement
}//end group CSE
......
......@@ -70,7 +70,7 @@ module OneM2M_Testcases_AE_Release_1 {
}
}//end group g_AE_GEN_CRE_002
group g_AE_GEN_CRE_002 {
/**
......@@ -429,7 +429,7 @@ module OneM2M_Testcases_AE_Release_1 {
testcase TC_AE_REG_CRE_002_RN() runs on CseSimu system AeSystem {
//primitives for utPort
var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
var template RequestPrimitive v_createAe := mw_createAe;
var template RequestPrimitive v_createAe := mw_createAe;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute ResourceName";
v_utRequest.primitiveContent.aE.resourceName := "UNINITIALIZED";
v_createAe.primitiveContent.aE.resourceName := ?;
......@@ -527,7 +527,7 @@ module OneM2M_Testcases_AE_Release_1 {
}
}//End of subgroup AE_REG_CRE_002
} // End of subgroup Create
group Delete {
......@@ -735,7 +735,7 @@ module OneM2M_Testcases_AE_Release_1 {
group g_AE_DMR_CRE_004 {
testcase TC_AE_DMR_CRE_004_ACPI() runs on CseSimu system AeSystem {
testcase TC_AE_DMR_CRE_004_ACPI() runs on CseSimu system AeSystem {
var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
var template RequestPrimitive v_request := mw_createContainer;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute AccessControlPolicyIDs";
......@@ -753,7 +753,7 @@ module OneM2M_Testcases_AE_Release_1 {
f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
}
testcase TC_AE_DMR_CRE_004_MBS() runs on CseSimu system AeSystem {
testcase TC_AE_DMR_CRE_004_MBS() runs on CseSimu system AeSystem {
var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
var template RequestPrimitive v_request := mw_createContainer;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute MaxByteSize";
......@@ -771,7 +771,7 @@ module OneM2M_Testcases_AE_Release_1 {
f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
}
testcase TC_AE_DMR_CRE_004_OR() runs on CseSimu system AeSystem {
testcase TC_AE_DMR_CRE_004_OR() runs on CseSimu system AeSystem {
var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
var template RequestPrimitive v_request := mw_createContainer;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute OntologyRef";
......@@ -866,7 +866,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
v_expectedUpdateRequestAe.primitiveContent.aE.appName := ?;
f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe);
}
......@@ -880,7 +880,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
v_expectedUpdateRequestAe.primitiveContent.aE.pointOfAccess := ?;
f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe);
}
......@@ -894,7 +894,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
v_expectedUpdateRequestAe.primitiveContent.aE.ontologyRef := ?;
f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe);
}
......@@ -908,7 +908,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
v_expectedUpdateRequestAe.primitiveContent.aE.nodeLink := ?;
f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe);
}
......@@ -921,7 +921,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
v_expectedUpdateRequestAe.primitiveContent.aE.requestReachability := ?;
f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe);
}
......@@ -934,7 +934,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
v_expectedUpdateRequestAe.primitiveContent.aE.contentSerialization := ?;
f_AE_DMR_UPD_001(v_utRequestTestBody,v_action, v_expectedUpdateRequestAe);
}
......@@ -1006,7 +1006,7 @@ module OneM2M_Testcases_AE_Release_1 {
f_AE_DMR_UPD_002(v_utRequest,v_request,v_action);
}
}//End of subgroup AE_DMR_UPD_002
}//End of subgroup AE_DMR_UPD_002
}//End of subgroup Update
......@@ -1018,11 +1018,11 @@ module OneM2M_Testcases_AE_Release_1 {
* @desc Check that the IUT sends a RETRIEVE Request on the TARGET_RESOURCE_ADDRESS to CSE
*/
testcase TC_AE_DMR_RET_001_CB() runs on CseSimu system AeSystem {
testcase TC_AE_DMR_RET_001_CB() runs on CseSimu system AeSystem {
var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentCSEBase(m_contentCreateCSEBase)), int5);
var universal charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for CSEBase";
f_AE_DMR_RET_001(int5, f_getLocalResourceAddress(v_auxInteger),v_action);
}
}
testcase TC_AE_DMR_RET_001_AE() runs on CseSimu system AeSystem {
var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
......@@ -1446,43 +1446,43 @@ module OneM2M_Testcases_AE_Release_1 {
testcase TC_AE_SUB_CRE_001() runs on CseSimu system AeSystem {
//variables
var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
var MsgIn v_request;
var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid subscription creation request";
var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
f_cf03Up();
f_cf03Up();
//send triggering primitive to SUT
f_sendUtPrimitive(v_utRequest,v_action);
f_sendUtPrimitive(v_utRequest,v_action);
//Test behavior
tc_ac.start;
alt{
//Test behavior
tc_ac.start;
alt{
[] mcaPortIn.receive(mw_request(mw_createSubscription)) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : Subscription creation request is accepted!");
setverdict(pass, __SCOPE__, " : Subscription creation request is accepted!");
//set responseStatusCode back to SUT
//set responseStatusCode back to SUT
v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
//send back responsePrimitive
//send back responsePrimitive
mcaPortIn.send(m_response(v_responsePrimitive));
}
}
[] mcaPortIn.receive {
tc_ac.stop;
setverdict(fail, __SCOPE__, " : Subscription creation request is rejected due to not including mandatory attributes!!");
}
[] tc_ac.timeout{
setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
}
}
// Postamble
f_cf03Down();
tc_ac.stop;
setverdict(fail, __SCOPE__, " : Subscription creation request is rejected due to not including mandatory attributes!!");
}
[] tc_ac.timeout{
setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
}
}
// Postamble
f_cf03Down();
}
group g_AE_SUB_CRE_002 {
......@@ -1510,7 +1510,7 @@ module OneM2M_Testcases_AE_Release_1 {
testcase TC_AE_SUB_CRE_002_ENC() runs on CseSimu system AeSystem {
var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
var template RequestPrimitive v_requestT := mw_createSubscription;
var template RequestPrimitive v_requestT := mw_createSubscription;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute createdBefore";
var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
......
......@@ -872,7 +872,7 @@ module OneM2M_Testcases_CSE_Release_1 {
//Test Body
f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, f_getResourceId(vc_resourcesList[v_aeIndex].resource)));
vc_cse1.start(f_cse_resourceAnnouncementHandler(PX_CSE_ID, f_getResourceAddress(v_aeIndex, e_nonHierarchical, e_spRelative)));
vc_cse1.start(f_cse_resourceAnnouncementHandler(mw_createAEAnnc(PX_CSE_ID, -, -, -)));
vc_cse1.done;
tc_ac.start;
......
......@@ -6776,6 +6776,101 @@ module OneM2M_Testcases_CSE_Release_2 {
}//end group AccessControlPolicy
}//end group Security
group Announcement {
group Basic {
group g_CSE_ANNC_001 {
testcase TC_CSE_ANNC_001_ACP_UPD() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_updateRequest := m_updateAcpBase;
var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {f_getAnnouncementTargetPoA()};
v_ae1.start(f_CSE_ANNC_001(int1, v_createRequestAnnc, omit, v_updateRequest));//AccessControlPolicy
v_ae1.done;
}
testcase TC_CSE_ANNC_001_ACP_CRE() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createAcpBase;
var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
v_createRequest.primitiveContent.accessControlPolicy.announceTo := {f_getAnnouncementTargetPoA()};
v_ae1.start(f_CSE_ANNC_001(int1, v_createRequestAnnc, v_createRequest, omit));//AccessControlPolicy
v_ae1.done;
}
testcase TC_CSE_ANNC_001_CNT_UPD() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
v_updateRequest.primitiveContent.container.announceTo := {f_getAnnouncementTargetPoA()};
v_ae1.start(f_CSE_ANNC_001(int3, v_createRequestAnnc, omit, v_updateRequest));//Container
v_ae1.done;
}
testcase TC_CSE_ANNC_001_CNT_CRE() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createContainerBase;
var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
v_createRequest.primitiveContent.container.announceTo := {f_getAnnouncementTargetPoA()};
v_ae1.start(f_CSE_ANNC_001(int3, v_createRequestAnnc, v_createRequest, omit));//Container
v_ae1.done;
}
testcase TC_CSE_ANNC_001_GRP_UPD() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_updateRequest := m_updateGroupBase;
var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
v_updateRequest.primitiveContent.group_.announceTo := {f_getAnnouncementTargetPoA()};
v_ae1.start(f_CSE_ANNC_001(int9, v_createRequestAnnc, omit, v_updateRequest));//Group
v_ae1.done;
}
testcase TC_CSE_ANNC_001_GRP_CRE() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createGroupBase;
var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
v_createRequest.primitiveContent.group_.announceTo := {f_getAnnouncementTargetPoA()};
v_ae1.start(f_CSE_ANNC_001(int9, v_createRequestAnnc, v_createRequest, omit));//Group
v_ae1.done;
}
testcase TC_CSE_ANNC_001_CIN_CRE() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnncBase;
v_createRequest.primitiveContent.contentInstance.announceTo := {f_getAnnouncementTargetPoA()};
v_ae1.start(f_CSE_ANNC_001(int4, v_createRequestAnnc, v_createRequest, omit));//ContentInstance
v_ae1.done;
}
}// end group g_CSE_ANNC_001
}//end group Basic
}//end group Announcement
}//end group CSE
......
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