New test cases implemented:

TC_CSE_SEC_ACP_005_CRE
TC_CSE_SEC_ACP_005_UPD
TC_CSE_SEC_ACP_005_RET
TC_CSE_SEC_ACP_005_DEL
TC_CSE_SEC_ACP_006_CRE
TC_CSE_SEC_ACP_006_UPD
TC_CSE_SEC_ACP_006_RET
TC_CSE_SEC_ACP_006_DEL
TC_CSE_SEC_ACP_007_CRE
TC_CSE_SEC_ACP_007_UPD
TC_CSE_SEC_ACP_007_RET
TC_CSE_SEC_ACP_007_DEL
TC_CSE_SEC_ACP_008_CRE
TC_CSE_SEC_ACP_008_UPD
TC_CSE_SEC_ACP_008_RET
TC_CSE_SEC_ACP_008_DEL
TC_CSE_SEC_ACP_009_CRE
TC_CSE_SEC_ACP_009_UPD
TC_CSE_SEC_ACP_009_RET
TC_CSE_SEC_ACP_009_DEL
TC_CSE_SEC_ACP_010_CRE
TC_CSE_SEC_ACP_010_UPD
TC_CSE_SEC_ACP_010_RET
TC_CSE_SEC_ACP_010_DEL
TC_CSE_DMR_CRE_012_SUB_SU small correction
Signed-off-by: Miguel Angel Reina Ortega's avatarMiguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
parent 5f540a60
...@@ -2196,6 +2196,12 @@ module OneM2M_Functions { ...@@ -2196,6 +2196,12 @@ module OneM2M_Functions {
if(match(valueof(p_request.primitiveContent.subscription.notificationURI), v_defaultListOfURIs )){ if(match(valueof(p_request.primitiveContent.subscription.notificationURI), v_defaultListOfURIs )){
p_request.primitiveContent.subscription.notificationURI := {f_getResourceAddress(p_parentIndex)}; p_request.primitiveContent.subscription.notificationURI := {f_getResourceAddress(p_parentIndex)};
} }
//subscriberURI
if(ispresent(p_request.primitiveContent.subscription.subscriberURI)) {
if(match(valueof(p_request.primitiveContent.subscription.subscriberURI), "NotInitialized" )){
p_request.primitiveContent.subscription.subscriberURI := f_getResourceAddress(vc_aeAuxIndex);
}
}
//creator attribute //creator attribute
if(ispresent(p_request.primitiveContent.subscription.creator)) { if(ispresent(p_request.primitiveContent.subscription.creator)) {
p_request.primitiveContent.subscription.creator := f_getCreator(p_parentIndex); p_request.primitiveContent.subscription.creator := f_getCreator(p_parentIndex);
...@@ -2499,7 +2505,7 @@ module OneM2M_Functions { ...@@ -2499,7 +2505,7 @@ module OneM2M_Functions {
* @param p_announcementTargetResource Announcement Target Resource * @param p_announcementTargetResource Announcement Target Resource
* @return p_annoucementTargetPoA Announcemenet Target PoA * @return p_annoucementTargetPoA Announcemenet Target PoA
*/ */
function f_getAnnouncementTargetPoA(in charstring p_protocolBinding := PX_PROTOCOL_BINDING, in charstring p_announcementTargetAddress := PX_CSE1_ADDRESS, charstring p_announcementTargetResource := "CseBaseTester" ) return charstring { function f_getAnnouncementTargetPoA(in charstring p_protocolBinding := PX_PROTOCOL_BINDING, in charstring p_announcementTargetAddress := PX_CSE1_ADDRESS, charstring p_announcementTargetResource := "" ) return charstring {
if(p_protocolBinding == "HTTP") { if(p_protocolBinding == "HTTP") {
return "http://" & p_announcementTargetAddress & "/" & p_announcementTargetResource; return "http://" & p_announcementTargetAddress & "/" & p_announcementTargetResource;
...@@ -3380,6 +3386,41 @@ module OneM2M_Functions { ...@@ -3380,6 +3386,41 @@ module OneM2M_Functions {
} }
/**
* @desc Retrieve Year from a given timestamp
* @param p_timestamp Given timestamp
* @return Year
*/
function f_getYear(charstring p_timestamp) runs on Tester return charstring {
var charstring v_year;
var integer i;
for(i := 0; i < 3; i := i+1){
v_year := v_year & p_timestamp[i];
}
return v_year;
} // end f_getYear
/**
* @desc Retrieve IP address from a given address which includes port information separated by :
* @param p_addressPort Given address
* @return IPv4 Address
*/
function f_getIpv4Address(charstring p_addressPort) runs on Tester return charstring {
var charstring v_ipv4Address;
var integer i:= 0;
while ((i < lengthof(p_addressPort)-1) and (p_addressPort[i] != ":")){
v_ipv4Address := v_ipv4Address & p_addressPort[i];
i := i + 1;
}
return v_ipv4Address;
} // end f_getIpv4Address
}//end of commonFunctions }//end of commonFunctions
group externalFunctions { group externalFunctions {
......
...@@ -95,13 +95,13 @@ module OneM2M_Types { ...@@ -95,13 +95,13 @@ module OneM2M_Types {
ListOfURIs accessControlOriginators, ListOfURIs accessControlOriginators,
AccessControlOperations accessControlOperations, AccessControlOperations accessControlOperations,
record of record { record of record {
record of ScheduleEntry accessControlWindow_list, record of ScheduleEntry accessControlWindow_list optional,//TODO It must be optional
record { record {
record length(1 .. infinity) of Ipv4 ipv4Addresses optional,//TODO It must be optional, record length(1 .. infinity) of Ipv4 ipv4Addresses optional,//TODO It must be optional,
record length(1 .. infinity) of Ipv6 ipv6Addresses optional//TODO It must be optional record length(1 .. infinity) of Ipv6 ipv6Addresses optional//TODO It must be optional
} accessControlIpAddresses optional, } accessControlIpAddresses optional,
LocationRegion accessControlLocationRegion optional LocationRegion accessControlLocationRegion optional
} accessControlContexts_list } accessControlContexts_list optional //TODO It must be optional
} }
with { with {
variant "name as uncapitalized"; variant "name as uncapitalized";
......
This diff is collapsed.
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