Commit b6cfa521 authored by Abbas AHMAD's avatar Abbas AHMAD

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

# Conflicts:
#	LibOneM2M/OneM2M_Templates.ttcn
parents f167484d 101520e9
/.project
/.classpath
/ttcn3build/
/com.testingtech.ttworkbench.core.prefs
This diff is collapsed.
This diff is collapsed.
......@@ -28,83 +28,86 @@ module OneM2M_Pics {
modulepar boolean PICS_PRIMITIVE_SCOPE_SP_RELATIVE := true;
modulepar boolean PICS_PRIMITIVE_SCOPE_ABSOLUTE := true;
//AccessControlPolicy optional attributes
modulepar boolean PICS_ACP_LBL := true;
modulepar boolean PICS_ACP_AT := true;
//AE optional attributes
modulepar boolean PICS_AE_LBL := true;
modulepar boolean PICS_AE_APN := true;
modulepar boolean PICS_AE_POA := true;
modulepar boolean PICS_AE_NL := true;
modulepar boolean PICS_AE_CSZ := true;
modulepar boolean PICS_AE_OR := true;
modulepar boolean PICS_AE_ACPI := true;
//Container optional attributes
modulepar boolean PICS_CNT_ACPI := true;
modulepar boolean PICS_CNT_MNI := true;
modulepar boolean PICS_CNT_MBS := true;
modulepar boolean PICS_CNT_MIA := true;
modulepar boolean PICS_CNT_OR := true;
modulepar boolean PICS_CNT_LI := true;
modulepar boolean PICS_CNT_RN := true;
modulepar boolean PICS_CNT_ET := true;
modulepar boolean PICS_CNT_LBL := true;
modulepar boolean PICS_CNT_CR := true;
//ContentInstance optional attributes
modulepar boolean PICS_CIN_CNF := true;
modulepar boolean PICS_CIN_RN := true;
modulepar boolean PICS_CIN_ET := true;
modulepar boolean PICS_CIN_LBL := true;
modulepar boolean PICS_CIN_CR := true;
modulepar boolean PICS_CIN_OR := true;
//CSEBase optional attributes
modulepar boolean PICS_CB_CST := true;
modulepar boolean PICS_CB_NL := true;
//Group optional attributes
modulepar boolean PICS_GRP_LBL := true;
modulepar boolean PICS_GRP_GN := true;
modulepar boolean PICS_GRP_ACPI := true;
modulepar boolean PICS_GRP_MACP := true;
//RemoteCSE optional attributes
modulepar boolean PICS_CSR_LBL := true;
modulepar boolean PICS_CSR_CST := true;
modulepar boolean PICS_CSR_POA := true;
modulepar boolean PICS_CSR_NL := true;
modulepar boolean PICS_CSR_RN := true;
modulepar boolean PICS_CSR_ET := true;
modulepar boolean PICS_CSR_RR := true;
//Subscription optional attributes
modulepar boolean PICS_SUB_ACPI := true;
modulepar boolean PICS_SUB_ENC := true;
modulepar boolean PICS_SUB_EXC := true;
modulepar boolean PICS_SUB_NFU := true;
modulepar boolean PICS_SUB_NCT := true;
modulepar boolean PICS_SUB_NEC := true;
modulepar boolean PICS_SUB_SU := true;
modulepar boolean PICS_SUB_LBL := true;
modulepar boolean PICS_SUB_GPI := true;
modulepar boolean PICS_SUB_BN := true;
modulepar boolean PICS_SUB_RL := true;
modulepar boolean PICS_SUB_PN := true;
modulepar boolean PICS_SUB_NSP := true;
modulepar boolean PICS_SUB_LN := true;
modulepar boolean PICS_SUB_PSN := true;
modulepar boolean PICS_SUB_CR := true;
group ResourceOptionalAttributes {
//AccessControlPolicy optional attributes
group AccessControlPolicyOptionalAttributes {
modulepar boolean PICS_ACP_LBL := true;
modulepar boolean PICS_ACP_AT := true;
}
//AE optional attributes
group AeOptionalAttributes {
modulepar boolean PICS_AE_LBL := true;
modulepar boolean PICS_AE_APN := true;
modulepar boolean PICS_AE_POA := true;
modulepar boolean PICS_AE_NL := true;
modulepar boolean PICS_AE_CSZ := true;
modulepar boolean PICS_AE_OR := true;
modulepar boolean PICS_AE_ACPI := true;
}
//Container optional attributes
group ContainerOptionalAttributes {
modulepar boolean PICS_CNT_ACPI := true;
modulepar boolean PICS_CNT_MNI := true;
modulepar boolean PICS_CNT_MBS := true;
modulepar boolean PICS_CNT_MIA := true;
modulepar boolean PICS_CNT_OR := true;
modulepar boolean PICS_CNT_LI := true;
modulepar boolean PICS_CNT_RN := true;
modulepar boolean PICS_CNT_ET := true;
modulepar boolean PICS_CNT_LBL := true;
modulepar boolean PICS_CNT_CR := true;
}
//ContentInstance optional attributes
group ContentInstanceOptionalAttributes {
modulepar boolean PICS_CIN_CNF := true;
modulepar boolean PICS_CIN_RN := true;
modulepar boolean PICS_CIN_ET := true;
modulepar boolean PICS_CIN_LBL := true;
modulepar boolean PICS_CIN_CR := true;
modulepar boolean PICS_CIN_OR := true;
}
//CSEBase optional attributes
group CSEBaseOptionalAttributes {
modulepar boolean PICS_CB_CST := true;
modulepar boolean PICS_CB_NL := true;
}
//Group optional attributes
group GroupOptionalAttributes {
modulepar boolean PICS_GRP_LBL := true;
modulepar boolean PICS_GRP_GN := true;
modulepar boolean PICS_GRP_ACPI := true;
modulepar boolean PICS_GRP_MACP := true;
}
//RemoteCSE optional attributes
group RemoteCSEOptionalAttributes {
modulepar boolean PICS_CSR_LBL := true;
modulepar boolean PICS_CSR_CST := true;
modulepar boolean PICS_CSR_POA := true;
modulepar boolean PICS_CSR_NL := true;
modulepar boolean PICS_CSR_RN := true;
modulepar boolean PICS_CSR_ET := true;
modulepar boolean PICS_CSR_RR := true;
}
//Subscription optional attributes
group SubscriptionOptionalAttributes {
modulepar boolean PICS_SUB_ACPI := true;
modulepar boolean PICS_SUB_ENC := true;
modulepar boolean PICS_SUB_EXC := true;
modulepar boolean PICS_SUB_NFU := true;
modulepar boolean PICS_SUB_NCT := true;
modulepar boolean PICS_SUB_NEC := true;
modulepar boolean PICS_SUB_SU := true;
modulepar boolean PICS_SUB_LBL := true;
modulepar boolean PICS_SUB_GPI := true;
modulepar boolean PICS_SUB_BN := true;
modulepar boolean PICS_SUB_RL := true;
modulepar boolean PICS_SUB_PN := true;
modulepar boolean PICS_SUB_NSP := true;
modulepar boolean PICS_SUB_LN := true;
modulepar boolean PICS_SUB_PSN := true;
modulepar boolean PICS_SUB_CR := true;
}
}
} // end of module
......@@ -21,9 +21,11 @@ module OneM2M_Pixits {
group IutParameters {
modulepar boolean PX_MN_CSE := true;
modulepar boolean PX_IN_CSE := true;
modulepar boolean PX_IN_CSE := false;
modulepar boolean PX_MN_CSE := false;
modulepar boolean PX_ASN_CSE:= false;
modulepar charstring PX_SUT_ADDRESS := "127.0.0.1:8080";
......@@ -67,6 +69,8 @@ module OneM2M_Pixits {
modulepar XSD.IDREFS PX_NOT_ALLOWED_S_AE_IDS := {"S-NotAllowedAeId"};
modulepar XSD.ID PX_NOT_ALLOWED_APP_ID := "NotAllowedAppId";
modulepar AddressingMethod PX_ADDRESSING_METHOD := e_hierarchical;
modulepar PrimitiveScope PX_PRIMITIVE_SCOPE := e_cseRelative;
......@@ -78,6 +82,8 @@ module OneM2M_Pixits {
modulepar charstring PX_XML_NAMESPACE := "m2m=""http://www.onem2m.org/xml/protocols""";
modulepar ListOfURIs PX_ACOR := {"all"};
modulepar float PX_TCONFIG_IUT := 10.0;
}
......@@ -138,13 +144,6 @@ module OneM2M_Pixits {
modulepar boolean PX_RUN_POSTAMBLE := true;
}
//for checking whether the locationPolicy creation request is originated from a ASN-AE
//NOTE: Apply to Device-based location request, and this requires Test System (TS) to activate ASN-AE mode to test IUT
modulepar boolean PX_IUT_IS_ASN_CSE := false; //default //set it to true when running Device-based location testcases
modulepar boolean PX_IUT_IS_MN_CSE := false; //default //set it to true when running Share-based location testcases
modulepar boolean PX_IUT_IS_IN_CSE := false; //default //set it to true when running Share-based location testcases
//constant parameters for LOC
modulepar LocationTargetID PX_LOCATION_TARGET_ID := {alt_ := "{LOCATION-TARGET-ID}"}; //SUPPOSE TO BE RECEIVED FROM LOCATION SERVER
......
......@@ -76,16 +76,18 @@ module OneM2M_Templates {
forcedFields := p_forcedFields
};
template MsgIn mw_request(in template (present) RequestPrimitive p_requestPrimitive) := {
primitive := { requestPrimitive := p_requestPrimitive}
template MsgIn mw_request(in template (present) RequestPrimitive p_requestPrimitive, template AttributeList_1 p_nullFields := *) := {
primitive := { requestPrimitive := p_requestPrimitive},
nullFields := p_nullFields
};
/**
* @desc Base template for response receiving operations
* @param p_responsePrimitive
*/
template MsgIn mw_response(in template (present) ResponsePrimitive p_responsePrimitive := ?) := {
primitive := { responsePrimitive := p_responsePrimitive}
template MsgIn mw_response(in template (present) ResponsePrimitive p_responsePrimitive := ?, template AttributeList_1 p_nullFields := *) := {
primitive := { responsePrimitive := p_responsePrimitive},
nullFields := p_nullFields
};
}//end of group primitives
......@@ -129,7 +131,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_ := ?,
......@@ -333,10 +335,10 @@ module OneM2M_Templates {
};
/**
* @desc RETRIEVE request primtive containing the Discovery Type in the discoveryResultType field and Filter Criteria in the filterCriteria field
* @param p_targetResourceAddress Target resource address
* @param p_filterCriteria FilterCriteria
* @param p_originator Originator (from)
* @desc RETRIEVE request primtive containing the Discovery Type in the discoveryResultType field and Filter Criteria in the filterCriteria field
* @param p_targetResourceAddress Target resource address
* @param p_filterCriteria FilterCriteria
* @param p_originator Originator (from)
*/
template (value) RequestPrimitive m_retrieveInvalidFormatOption(XSD.ID p_targetResourceAddress, in XSD.ID p_originator) modifies m_retrieve := {
requestIdentifier := "m_retrieveResourceFilterUsageOption" & f_rnd(1, 1000000),
......@@ -649,9 +651,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 := {
resourceType := int10002,
primitiveContent := {aEAnnc := mw_contentCreateAEAnnc({"Credential-ID:None"}, p_accessControlPolicyIds)}
template RequestPrimitive mw_createAEAnnc(template XSD.ID p_from := ?, template XSD.ID p_to := ?, template AcpType p_accessControlPolicyIds := ?, template XSD.AnyURI p_link := ?) modifies mw_create := { primitiveContent := {aEAnnc := mw_contentCreateAEAnnc({"Credential-ID:None"}, p_accessControlPolicyIds)}
};
template (value) RequestPrimitive m_createAe(XSD.ID p_appId, template (omit) AcpType p_accessControlPolicyIds := omit,template (omit) XSD.ID p_from := omit, template (omit) ResourceName p_resourceName := c_aeAuxName, in template (omit) PoaList p_poaList := omit) modifies m_create := {
......@@ -995,9 +995,9 @@ module OneM2M_Templates {
*/
template (value) RequestPrimitive m_createScheduleBase modifies m_create := {
requestIdentifier := testcasename() & "-m_createSchedule",
resourceType := int18,
primitiveContent := {schedule := m_contentCreateSchedule ({{"0 0 0,1,2 1 1 * *"}})}
};
resourceType := int18,
primitiveContent := {schedule := m_contentCreateSchedule ({{"0 0 0,1,2 1 1 *"}})}
};
template (value) RequestPrimitive m_createSchedule(XSD.ID p_parentResourceAddress, in template (omit) XSD.String p_name, in template (value) ScheduleEntries p_scheduleElement ) modifies m_create := {
to_ := p_parentResourceAddress,
......@@ -1469,7 +1469,7 @@ module OneM2M_Templates {
accessControlRule_list := {valueof(m_createAcr(p_acor, p_allowedOperations))}
},//M
selfPrivileges := {
accessControlRule_list := {valueof(m_createAcr(p_acor, int63))}
accessControlRule_list := {valueof(m_createAcr({"all"}, int63))}
},//M
choice := omit //NP
};
......@@ -3079,7 +3079,7 @@ module OneM2M_Templates {
resourceType := int16,//M
resourceID := PX_CSE1_RESOURCE_ID,//M
pointOfAccess := {PX_CSE1_ADDRESS},//O
cSEBase := PX_CSE1_NAME,//M
cSEBase := PX_CSE1_ID & "/" & PX_CSE1_NAME,//M
cSE_ID := PX_CSE1_ID,//M
requestReachability := true//M
};
......@@ -3651,7 +3651,7 @@ module OneM2M_Templates {
resourceName := ?,//M
resourceType := ?,//M
resourceID := ?,//M
parentID := ?,//M
parentID := omit,//M
creationTime := ?,//M
lastModifiedTime := ?,//M
labels := *,//O
......
......@@ -1231,7 +1231,11 @@ with {
};
type XSD.Token DeviceID (pattern "urn:meid:[\dABCDEFabcdef]#(14)")
type XSD.Token DeviceID (pattern "(urn:dev:ops:[\dABCDEFabcdef]#6-[\w_%]#(1,)-[\w_%]#(1,))" & "|" &
"(urn:dev:os:[\dABCDEFabcdef]#6-[\w_%]#(1,))" & "|" &
"(urn:imei:\d#15)" & "|" &
"(urn:esn:[\dABCDEFabcdef]#8)" & "|" &
"(urn:meid:[\dABCDEFabcdef]#14)")
with {
variant "name as uncapitalized";
};
......@@ -1317,13 +1321,25 @@ with {
type XSD.Token Ipv4 (pattern "[0-9A-Fa-f]#(8)(/([0-9]|[1-2][0-9]|3[0-2]))#(0,1)")
type XSD.Token Ipv4 (pattern "([0-9A-Fa-f]#(8)(/([0-9]|[1-2][0-9]|3[0-2]))#(0,1))" & "|" &
"((25[0-5]|2[0-4][0-9]|[0-1]#(0,1)[0-9]#(0,1)[0-9])\.(25[0-5]|2[0-4][0-9]|[0-1]#(0,1)[0-9]#(0,1)[0-9])\.(25[0-5]|2[0-4][0-9]|[0-1]#(0,1)[0-9]#(0,1)[0-9])\.(25[0-5]|2[0-4][0-9]|[0-1]#(0,1)[0-9]#(0,1)[0-9])(/([0-9]|[1-2][0-9]|3[0-2]))#(0,1))")
with {
variant "name as uncapitalized";
};
type XSD.Token Ipv6 (pattern "::(/0)#(0,1)")
type XSD.Token Ipv6 (pattern "([0-9A-Fa-f]#(1,4)(:[0-9A-Fa-f]#(1,4))#7(/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))#(0,1))" & "|" &
"(:(:[0-9A-Fa-f]#(1,4))#(1,7))" & "|" & //Double colon start
"(([0-9A-Fa-f]#(1,4):)#(1,6)(:[0-9A-Fa-f]#(1,4))#1(/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))#(0,1))" & "|" & //Double colon middle
"(([0-9A-Fa-f]#(1,4):)#(1,5)(:[0-9A-Fa-f]#(1,4))#(1,2)(/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))#(0,1))" & "|" &
"(([0-9A-Fa-f]#(1,4):)#(1,4)(:[0-9A-Fa-f]#(1,4))#(1,3)(/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))#(0,1))" & "|" &
"(([0-9A-Fa-f]#(1,4):)#(1,3)(:[0-9A-Fa-f]#(1,4))#(1,4)(/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))#(0,1))" & "|" &
"(([0-9A-Fa-f]#(1,4):)#(1,2)(:[0-9A-Fa-f]#(1,4))#(1,5)(/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))#(0,1))" & "|" &
"(([0-9A-Fa-f]#(1,4):)#1(:[0-9A-Fa-f]#(1,4))#(1,6)(/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))#(0,1))" & "|" &
"(([0-9A-Fa-f]#(1,4):)#(1,7):(/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))#(0,1))" & "|" & //Double colon end
"(((:(:0#(1,4))#(0,3)(:(0#(1,4)|[fF]#4))#(0,1))|(0#(1,4):(:0#(1,4))#(0,2)(:(0#(1,4)|[fF]#4))#(0,1))|((0#(1,4):)#2(:0#(1,4))#(0,1)(:(0#(1,4)|[fF]#4))#(0,1))|((0#(1,4):)#3(:(0#(1,4)|[fF]#4))#(0,1))|((0#(1,4):)#4(0#(1,4)|[fF]#4)#(0,1))):(25[0-5]|2[0-4][0-9]|[0-1]#(0,1)[0-9]#(0,1)[0-9])\.(25[0-5]|2[0-4][0-9]|[0-1]#(0,1)[0-9]#(0,1)[0-9])\.(25[0-5]|2[0-4][0-9]|[0-1]#(0,1)[0-9]#(0,1)[0-9])\.(25[0-5]|2[0-4][0-9]|[0-1]#(0,1)[0-9]#(0,1)[0-9]))" & "|" & //Embedded IPv4 addresses without CIDR suffix. Should IPv4 CIDR suffix be added
"(::(/0)#(0,1))") //The unspecified address
with {
variant "name as uncapitalized";
};
......@@ -1419,7 +1435,9 @@ with {
};
type XSD.String ContentInfo //FIXME To be fixed (pattern "[\w/!#$\^_.+\q{0, 0, 0, 38}&\-]+((:[0-2])#(0,1))+((:[0-5])#(0,1))")
type XSD.String ContentInfo //TODO To be fixed (pattern "([\w/!#$^_.#(1,)&\-]#(1,)(:[0-2])#(0,1))" & "|" &
// "([\w/!#$^_.#(1,)&\-]#(1,)((:[0-2])#(0,1))#(1,)((:[0-5])#(0,1)))")
with {
variant "name as uncapitalized";
};
......@@ -5448,9 +5466,10 @@ with {
};
type ListOfURIs URIList
type record length(0 .. infinity) of XSD.AnyURI URIList //TODO Allow URIList to be empty as defined in PRO
with {
variant "element";//Change from previous version "list"
variant "name as uncapitalized";
variant "list";
};
......@@ -6518,7 +6537,8 @@ with {
union {
RequestPrimitive requestPrimitive,
ResponsePrimitive responsePrimitive
} primitive
} primitive,
AttributeList_1 nullFields optional
}
with {
encode ""
......@@ -8319,7 +8339,11 @@ group OtherTypes {
variant "untagged";
}
type record of ResourceType ResourceTypeList_1;
type record of ResourceType ResourceTypeList_1
with {
variant "name as uncapitalized";
variant "list";
};
}
}
with {
......
This diff is collapsed.
......@@ -128,7 +128,6 @@ module OneM2M_TestControl_IN_profile {
if(PICS_CNT_MNI and PICS_CNT_LBL) {execute (TC_CSE_DMR_UPD_004_CNT_ET_MNI_LBL());}
if(true) {execute (TC_CSE_DMR_UPD_005());}
if(true) {execute (TC_CSE_DMR_UPD_007_CNT_CT());}
if(true) {execute (TC_CSE_DMR_UPD_008_CNT_ET());}
if(true) {execute (TC_CSE_DMR_UPD_009_CNT_EXC());}
if(true) {execute (TC_CSE_DMR_UPD_010 ());}
if(true) {execute (TC_CSE_DMR_UPD_016_CNT_ET());}
......@@ -186,7 +185,7 @@ module OneM2M_TestControl_IN_profile {
if(PICS_SUB_LBL) {execute (TC_CSE_DMR_UPD_003_SUB_LBL());}
if(PICS_SUB_LBL and PICS_SUB_EXC) {execute (TC_CSE_DMR_UPD_004_SUB_ET_LBL_EXC());}
if(true) {execute (TC_CSE_DMR_UPD_007_SUB_CT());}
if(true) {execute (TC_CSE_DMR_UPD_008_SUB_ET());}
if(true) {execute (TC_CSE_DMR_UPD_008_SUB_NU());}
if(true) {execute (TC_CSE_DMR_UPD_009_SUB_MNI());}
if(true) {execute (TC_CSE_DMR_UPD_016_SUB_ET());}
if(true) {execute (TC_CSE_DMR_UPD_016_SUB_NU());}
......@@ -216,9 +215,9 @@ module OneM2M_TestControl_IN_profile {
if(true) {execute (TC_CSE_DMR_UPD_001_ACP_LBL());}
if(PICS_ACP_LBL) {execute (TC_CSE_DMR_UPD_002_ACP_LBL());}
if(PICS_ACP_LBL) {execute (TC_CSE_DMR_UPD_003_ACP_LBL());}
if(PICS_ACP_AT and PICS_ACP_LBL) {execute (TC_CSE_DMR_UPD_004_ACP_PV_AT_LBL());}
if(PICS_ACP_LBL) {execute (TC_CSE_DMR_UPD_004_ACP_PVS_PV_LBL());}
if(true) {execute (TC_CSE_DMR_UPD_007_ACP_CT());}
if(true) {execute (TC_CSE_DMR_UPD_008_ACP_ET());}
if(true) {execute (TC_CSE_DMR_UPD_008_ACP_PVS());}
if(true) {execute (TC_CSE_DMR_UPD_009_ACP_EXC());}
if(true) {execute (TC_CSE_DMR_UPD_016_ACP_ET());}
if(true) {execute (TC_CSE_DMR_UPD_016_ACP_PV());}
......@@ -336,7 +335,7 @@ module OneM2M_TestControl_IN_profile {
if(PICS_GRP_GN and PICS_GRP_LBL) {execute (TC_CSE_DMR_UPD_004_GRP_ET_GN_LBL());}
if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_UPD_006_GRP_LBL());}
if(true) {execute (TC_CSE_DMR_UPD_007_GRP_CT());}
if(true) {execute (TC_CSE_DMR_UPD_008_GRP_ET());}
if(true) {execute (TC_CSE_DMR_UPD_008_GRP_MNM());}
if(true) {execute (TC_CSE_DMR_UPD_009_GRP_EXC());}
if(true) {execute (TC_CSE_DMR_UPD_016_GRP_ET());}
if(true) {execute (TC_CSE_DMR_UPD_016_GRP_MNM());}
......
......@@ -151,7 +151,6 @@ module OneM2M_TestControl_MN_profile {
if(PICS_CNT_MNI and PICS_CNT_LBL) {execute (TC_CSE_DMR_UPD_004_CNT_ET_MNI_LBL());}
if(true) {execute (TC_CSE_DMR_UPD_005());}
if(true) {execute (TC_CSE_DMR_UPD_007_CNT_CT());}
if(true) {execute (TC_CSE_DMR_UPD_008_CNT_ET());}
if(true) {execute (TC_CSE_DMR_UPD_009_CNT_EXC());}
if(true) {execute (TC_CSE_DMR_UPD_010());}
if(true) {execute (TC_CSE_DMR_UPD_016_CNT_ET());}
......@@ -209,7 +208,7 @@ module OneM2M_TestControl_MN_profile {
if(PICS_SUB_LBL) {execute (TC_CSE_DMR_UPD_003_SUB_LBL());}
if(true) {execute (TC_CSE_DMR_UPD_004_SUB_ET_LBL_EXC());}
if(true) {execute (TC_CSE_DMR_UPD_007_SUB_CT());}
if(true) {execute (TC_CSE_DMR_UPD_008_SUB_ET());}
if(true) {execute (TC_CSE_DMR_UPD_008_SUB_NU());}
if(true) {execute (TC_CSE_DMR_UPD_009_SUB_MNI());}
if(true) {execute (TC_CSE_DMR_UPD_016_SUB_ET());}
if(true) {execute (TC_CSE_DMR_UPD_016_SUB_NU());}
......@@ -239,9 +238,9 @@ module OneM2M_TestControl_MN_profile {
if(true) {execute (TC_CSE_DMR_UPD_001_ACP_LBL());}
if(PICS_ACP_LBL) {execute (TC_CSE_DMR_UPD_002_ACP_LBL());}
if(PICS_ACP_LBL) {execute (TC_CSE_DMR_UPD_003_ACP_LBL());}
if(true) {execute (TC_CSE_DMR_UPD_004_ACP_PV_AT_LBL());}
if(PICS_ACP_LBL) {execute (TC_CSE_DMR_UPD_004_ACP_PVS_PV_LBL());}
if(true) {execute (TC_CSE_DMR_UPD_007_ACP_CT());}
if(true) {execute (TC_CSE_DMR_UPD_008_ACP_ET());}
if(true) {execute (TC_CSE_DMR_UPD_008_ACP_PVS());}
if(true) {execute (TC_CSE_DMR_UPD_009_ACP_EXC());}
if(true) {execute (TC_CSE_DMR_UPD_016_ACP_ET());}
if(true) {execute (TC_CSE_DMR_UPD_016_ACP_PV());}
......@@ -358,7 +357,7 @@ module OneM2M_TestControl_MN_profile {
if(true) {execute (TC_CSE_DMR_UPD_004_GRP_ET_GN_LBL());}
if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_UPD_006_GRP_LBL());}
if(true) {execute (TC_CSE_DMR_UPD_007_GRP_CT());}
if(true) {execute (TC_CSE_DMR_UPD_008_GRP_ET());}
if(true) {execute (TC_CSE_DMR_UPD_008_GRP_MNM());}
if(true) {execute (TC_CSE_DMR_UPD_009_GRP_EXC());}
if(true) {execute (TC_CSE_DMR_UPD_016_GRP_ET());}
if(true) {execute (TC_CSE_DMR_UPD_016_GRP_MNM());}
......
This diff is collapsed.
......@@ -3380,44 +3380,6 @@ module OneM2M_Testcases_CSE_Release_2 {
} // end g_CSE_DMR_UPD_004
group g_CSE_DMR_UPD_005{
/**
* @desc Check that the IUT responds with an error when the AE tries to update an attribute of a TARGET_RESOURCE_ADDRESS resource which does not exist
*
*/
testcase TC_CSE_DMR_UPD_005_SCH_EXC() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.PositiveInteger v_expirationCounter := 1;
var template RequestPrimitive v_createRequest := m_createScheduleBase;
var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
v_updateRequest.primitiveContent := {schedule_update_invalid := m_contentUpdateSchedule_invalid};
v_updateRequest.primitiveContent.schedule_update_invalid.expirationCounter := v_expirationCounter;
v_ae1.start(f_CSE_DMR_UPD_005(int18, v_createRequest, v_updateRequest));//Schedule
v_ae1.done;
}
testcase TC_CSE_DMR_UPD_005_PCH_EXC() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.PositiveInteger v_expirationCounter := 1;
var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
v_updateRequest.primitiveContent := {pollingChannel_update_invalid := m_contentUpdatePollingChannel_invalid};
v_updateRequest.primitiveContent.pollingChannel_update_invalid.expirationCounter := v_expirationCounter;
v_ae1.start(f_CSE_DMR_UPD_005(int15, v_createRequest, v_updateRequest));//PollingChannel
v_ae1.done;
}
} // end g_CSE_DMR_UPD_005
group g_CSE_DMR_UPD_006{
/**
......@@ -3588,7 +3550,45 @@ module OneM2M_Testcases_CSE_Release_2 {
}
}
} // end g_CSE_DMR_UPD_008
} // end g_CSE_DMR_UPD_008
group g_CSE_DMR_UPD_009{
/**
* @desc Check that the IUT responds with an error when the AE tries to update an attribute of a TARGET_RESOURCE_ADDRESS resource which does not exist
*
*/
testcase TC_CSE_DMR_UPD_009_SCH_EXC() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.PositiveInteger v_expirationCounter := 1;
var template RequestPrimitive v_createRequest := m_createScheduleBase;
var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
v_updateRequest.primitiveContent := {schedule_update_invalid := m_contentUpdateSchedule_invalid};
v_updateRequest.primitiveContent.schedule_update_invalid.expirationCounter := v_expirationCounter;
v_ae1.start(f_CSE_DMR_UPD_009(int18, v_createRequest, v_updateRequest));//Schedule
v_ae1.done;
}
testcase TC_CSE_DMR_UPD_009_PCH_EXC() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.PositiveInteger v_expirationCounter := 1;
var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
v_updateRequest.primitiveContent := {pollingChannel_update_invalid := m_contentUpdatePollingChannel_invalid};
v_updateRequest.primitiveContent.pollingChannel_update_invalid.expirationCounter := v_expirationCounter;
v_ae1.start(f_CSE_DMR_UPD_009(int15, v_createRequest, v_updateRequest));//PollingChannel
v_ae1.done;
}
} // end g_CSE_DMR_UPD_009
group g_CSE_DMR_UPD_014 {
......@@ -5351,7 +5351,7 @@ module OneM2M_Testcases_CSE_Release_2 {
f_cf01Up();
if(PX_IUT_IS_ASN_CSE){
if(PX_ASN_CSE){
//Preamble
v_aeAuxIndex := f_cse_preamble_registerAe();
......@@ -5416,7 +5416,7 @@ module OneM2M_Testcases_CSE_Release_2 {
f_cf01Up();
if(PX_IUT_IS_MN_CSE){
if(PX_MN_CSE){
//Preamble
v_aeAuxIndex := f_cse_preamble_registerAe();
......@@ -5850,7 +5850,7 @@ module OneM2M_Testcases_CSE_Release_2 {
}
}
f_checkComponentDoneAndGetVerdict(vc_ae2);
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
......@@ -5915,7 +5915,7 @@ module OneM2M_Testcases_CSE_Release_2 {
}
}
f_checkComponentDoneAndGetVerdict(vc_ae2);
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
......@@ -5994,7 +5994,7 @@ module OneM2M_Testcases_CSE_Release_2 {
setverdict(fail, __SCOPE__ & ": Notifications sent before bathNotify/duration expired");
}
f_checkComponentDoneAndGetVerdict(vc_ae2);
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
//Postamble
f_cse_postamble_deleteResources();
......@@ -6075,7 +6075,7 @@ module OneM2M_Testcases_CSE_Release_2 {
}
}
f_checkComponentDoneAndGetVerdict(vc_ae2);
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
//Postamble
f_cse_postamble_deleteResources();
......@@ -6121,7 +6121,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription
f_checkComponentDoneAndGetVerdict(vc_ae2);
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
// Test Body
vc_ae2.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
......@@ -6148,7 +6148,7 @@ module OneM2M_Testcases_CSE_Release_2 {
}
}
f_checkComponentDoneAndGetVerdict(vc_ae2);
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
//Postamble
f_cse_postamble_deleteResources();
......@@ -6205,7 +6205,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // AE update request
f_cse_updateResource(v_request); // AE update
f_checkComponentDoneAndGetVerdict(vc_ae2);
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
......@@ -6233,7 +6233,7 @@ module OneM2M_Testcases_CSE_Release_2 {
}
}
f_checkComponentDoneAndGetVerdict(vc_ae2);
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
//Postamble
f_cse_postamble_deleteResources();
......@@ -6287,7 +6287,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // AE update request
f_cse_updateResource(v_request); // AE update
f_checkComponentDoneAndGetVerdict(vc_ae2);
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
......@@ -6310,7 +6310,7 @@ module OneM2M_Testcases_CSE_Release_2 {
}
}
f_checkComponentDoneAndGetVerdict(vc_ae2);
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
//Postamble
f_cse_postamble_deleteResources();
......@@ -6383,7 +6383,7 @@ module OneM2M_Testcases_CSE_Release_2 {
}
}
f_checkComponentDoneAndGetVerdict(vc_ae2);
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
//Postamble
f_cse_postamble_deleteResources();
......@@ -6448,7 +6448,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // Update request 3
f_cse_updateResource(v_request);
f_checkComponentDoneAndGetVerdict(vc_ae2);
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
//Postamble
f_cse_postamble_deleteResources();
......@@ -6517,7 +6517,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // Update request 3
f_cse_updateResource(v_request);
f_checkComponentDoneAndGetVerdict(vc_ae2);
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
//Postamble
f_cse_postamble_deleteResources();
......@@ -6592,7 +6592,7 @@ module OneM2M_Testcases_CSE_Release_2 {
}
}
f_checkComponentDoneAndGetVerdict(vc_ae2);
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
//Postamble
f_cse_postamble_deleteResources();
......@@ -6671,7 +6671,7 @@ module OneM2M_Testcases_CSE_Release_2 {
}
}
f_checkComponentDoneAndGetVerdict(vc_ae2);
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
//Postamble
f_cse_postamble_deleteResources();
......@@ -6743,7 +6743,7 @@ module OneM2M_Testcases_CSE_Release_2 {
}
}
f_checkComponentDoneAndGetVerdict(vc_ae2);
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
//Postamble
f_cse_postamble_deleteResources();
......
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