diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn index 98a318abf5bb51e7d326839f54637a36eb5f7de5..1be590a107d5bb7a1440474aab1f28bd1ee4cdb5 100644 --- a/LibOneM2M/OneM2M_Templates.ttcn +++ b/LibOneM2M/OneM2M_Templates.ttcn @@ -615,7 +615,23 @@ module OneM2M_Templates { template RequestPrimitive mw_updateAccessControlPolicyAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_update := { resourceType := int10001, primitiveContent := {accessControlPolicyAnnc := ?} - }; + }; + + /** + * @desc Base UPDATE request primitive for TimeSeries resource + */ + template (value) RequestPrimitive m_updateTimeSeriesBase modifies m_update := { + requestIdentifier := "m_updateTimeSeries", + primitiveContent:= {timeSeries := m_contentUpdateTimeSeries} + }; + + /** + * @desc Base Reception template for update TimeSeriesAnnc + */ + template RequestPrimitive mw_updateTimeSeriesAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_update := { + resourceType := int10029, + primitiveContent := {timeSeriesAnnc := ?} + }; }//end group Update @@ -1303,6 +1319,22 @@ module OneM2M_Templates { primitiveContent := {timeSeriesInstance := ?} }; + /** + * @desc Base Reception template for CREATE TimeSeriesAnnc + */ + template RequestPrimitive mw_createTimeSeriesAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := { + resourceType := int10029, + primitiveContent := {timeSeriesAnnc := mw_contentCreateTimeSeriesAnncBase} + }; + + /** + * @desc Base Reception template for CREATE TimeSeriesInstanceAnnc + */ + template RequestPrimitive mw_createTimeSeriesInstanceAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := { + resourceType := int10030, + primitiveContent := {timeSeriesInstanceAnnc := mw_contentCreateTimeSeriesInstanceAnncBase} + }; + }//end group Create group Delete { @@ -2562,6 +2594,57 @@ module OneM2M_Templates { choice := omit//NP }; + /** + * @desc Base primitiveContent for CREATE operation for TimeSeriesAnnc resource + * @param p_primitiveContent Content for the TimeSeriesAnnc + */ + template TimeSeriesAnnc_optional mw_contentCreateTimeSeriesAnncBase := { + resourceName := omit,//NA M + resourceType := omit,//NA M + resourceID := omit,//NA M + parentID := omit,//NA M + creationTime := omit,//NA M + lastModifiedTime := omit,//NA M + labels := ?,//MA + accessControlPolicyIDs := ?,//MA + expirationTime := ?,//MA M + link := omit, //O NA + dynamicAuthorizationConsultationIDs := omit, //OA + stateTag := ?,//MA + maxNrOfInstances := omit,//O OA + maxByteSize := omit,//O OA + maxInstanceAge := omit,//O OA + currentNrOfInstances := ?,//M OA + currentByteSize := ?,//M OA + periodicInterval := omit,//O OA + missingDataDetect := omit,//O NA + missingDataList := omit,//O OA + missingDataCurrentNr := omit,//O OA + missingDataDetectTimer := omit,//O OA + ontologyRef := omit,//O OA + choice := omit //O + }; + + /** + * @desc Base primitiveContent for CREATE operation for TimeSeriesInstanceAnnc resource + * @param p_primitiveContent Content for the TimeSeriesInstanceAnnc + */ + template TimeSeriesInstanceAnnc_optional mw_contentCreateTimeSeriesInstanceAnncBase := { + resourceName := omit,//NA M + resourceType := omit,//NA M + resourceID := omit,//NA M + parentID := omit,//NA M + creationTime := omit,//NA M + lastModifiedTime := omit,//NA M + labels := ?,//MA + expirationTime := ?,//MA M + link := omit, //O NA + dataGenerationTime := ?,//M OA + content := ?,//M OA + sequenceNr := omit,//O OA + contentSize := ?//M OA + } + /** * @desc Base primitiveContent for CREATE operation for timeSeries resource * @param p_name Resource name @@ -3008,6 +3091,39 @@ module OneM2M_Templates { choice := omit }; + /** + * @desc Base primitiveContent for UPDATE operation for TimeSeries resource + */ + template (value) TimeSeries_optional m_contentUpdateTimeSeries := { + resourceName := omit,//O + resourceType := omit,//NP + resourceID := omit,//NP + parentID := omit,//NP + creationTime := omit,//NP + lastModifiedTime := omit,//NP + labels := omit,//O + accessControlPolicyIDs := omit,//O + expirationTime := omit,//O + dynamicAuthorizationConsultationIDs := omit, //O + announceTo := omit,//O + announcedAttribute := omit,//O + stateTag := omit,//NP + creator := omit,//O + maxNrOfInstances := omit,//O + maxByteSize := omit,//O + maxInstanceAge := omit,//O + currentNrOfInstances := omit,//NP + currentByteSize := omit,//NP + periodicInterval := omit,//O + missingDataDetect := omit,//O + missingDataMaxNr := omit,//O + missingDataList := omit,//NP + missingDataCurrentNr := omit,//NP + missingDataDetectTimer := omit,//O + ontologyRef := omit,//O + choice := omit//NP + }; + }//end group ContentUpdate @@ -4143,6 +4259,36 @@ module OneM2M_Templates { choice := omit //O } + template TimeSeries_optional m_contentTimeSeries_allOmit := { + resourceName := omit,//M + resourceType := omit,//M + resourceID := omit,//M + parentID := omit,//M + creationTime := omit,//M + lastModifiedTime := omit,//M + labels := omit,//O + accessControlPolicyIDs := omit,//O + expirationTime := omit,//M + dynamicAuthorizationConsultationIDs := omit,//O + announceTo := omit,//O + announcedAttribute := omit,//O + stateTag := omit,//M + creator := omit,//M + maxNrOfInstances := omit,//O + maxByteSize := omit,//O + maxInstanceAge := omit,//O + currentNrOfInstances := omit,//M + currentByteSize := omit,//M + periodicInterval := omit,//O + missingDataDetect := omit,//O + missingDataMaxNr := omit,//O + missingDataList := omit,//O + missingDataCurrentNr := omit,//O + missingDataDetectTimer := omit,//O + ontologyRef := omit,//O + choice := omit//O + } + template TimeSeries_optional mw_contentTimeSeriesBase := { resourceName := ?,//M resourceType := ?,//M @@ -4181,6 +4327,55 @@ module OneM2M_Templates { template TimeSeries_optional mw_contentTimeSeries_rc1 modifies mw_contentTimeSeriesBase := { choice := omit //O } + + template XSD.AnyURI mw_contentTimeSeries_rc2 := ?; + + template Resource mw_contentTimeSeries_rc3 := { + choice := {timeSeries := ?}, + uRI := ? + } + + template TimeSeries_optional mw_contentTimeSeries_rc4 modifies mw_contentTimeSeriesBase := { + choice := { choice_list := {{subscription := ?}}} //O + } + + template TimeSeries_optional mw_contentTimeSeries_rc5 modifies mw_contentTimeSeriesBase := { + choice := {childResource_list := ?} //O + } + + template TimeSeries_optional mw_contentTimeSeries_rc6 modifies mw_contentTimeSeriesBase := { + resourceName := omit,//M + resourceType := omit,//M + resourceID := omit,//M + parentID := omit,//M + creationTime := omit,//M + lastModifiedTime := omit,//M + labels := omit,//O + accessControlPolicyIDs := omit,//O + expirationTime := omit,//M + dynamicAuthorizationConsultationIDs := omit,//O + announceTo := omit,//O + announcedAttribute := omit,//O + stateTag := omit,//M + creator := omit,//M + maxNrOfInstances := omit,//O + maxByteSize := omit,//O + maxInstanceAge := omit,//O + currentNrOfInstances := omit,//M + currentByteSize := omit,//M + periodicInterval := omit,//O + missingDataDetect := omit,//O + missingDataMaxNr := omit,//O + missingDataList := omit,//O + missingDataCurrentNr := omit,//O + missingDataDetectTimer := omit,//O + ontologyRef := omit,//O + choice := {childResource_list := ?}//O + } + + template TimeSeries_optional mw_contentTimeSeries_rc8 modifies m_contentTimeSeries_allOmit := { + choice := {childResource_list := ?} //O + } }//end group responseContent @@ -4392,7 +4587,38 @@ module OneM2M_Templates { ontologyRef := omit,//O disableRetrieval := omit, //O choice := omit//O - }; + }; + + template (value) TimeSeries_update_invalid m_contentUpdateTimeSeries_invalid := { + resourceName := omit,//O + resourceType := omit,//NP + resourceID := omit,//NP + parentID := omit,//NP + creationTime := omit,//NP + lastModifiedTime := omit,//NP + expirationCounter := omit,//Field not existing in container resource + labels := omit,//O + accessControlPolicyIDs := omit,//O + expirationTime := omit,//O + dynamicAuthorizationConsultationIDs := omit, //O + announceTo := omit,//O + announcedAttribute := omit,//O + stateTag := omit,//NP + creator := omit,//O + maxNrOfInstances := omit,//O + maxByteSize := omit,//O + maxInstanceAge := omit,//O + currentNrOfInstances := omit,//NP + currentByteSize := omit,//NP + periodicInterval := omit,//O + missingDataDetect := omit,//O + missingDataMaxNr := omit,//O + missingDataList := omit,//NP + missingDataCurrentNr := omit,//NP + missingDataDetectTimer := omit,//O + ontologyRef := omit,//O + choice := omit//NP + }; }//end group SpecialContents diff --git a/LibOneM2M/OneM2M_Types.ttcn b/LibOneM2M/OneM2M_Types.ttcn index 9baf894e36db594cf988f4ad0a9685d8ca7702b2..330f82eb9b4e9200528e431ba571f2d769060166 100644 --- a/LibOneM2M/OneM2M_Types.ttcn +++ b/LibOneM2M/OneM2M_Types.ttcn @@ -1718,6 +1718,8 @@ type union PrimitiveContent { SemanticDescriptor_optional semanticDescriptor, TimeSeries_optional timeSeries, TimeSeriesInstance_optional timeSeriesInstance, + TimeSeriesAnnc_optional timeSeriesAnnc, + TimeSeriesInstanceAnnc_optional timeSeriesInstanceAnnc, GenericInterworkingOperationInstance_optional genericInterworkingOperationInstance, //SecurityInfo SecurityInfo securityInfo, @@ -1742,7 +1744,8 @@ type union PrimitiveContent { PollingChannel_update_invalid pollingChannel_update_invalid, Schedule_update_invalid schedule_update_invalid, Subscription_update_invalid subscription_update_invalid, - LocationPolicy_update_invalid locationPolicy_update_invalid + LocationPolicy_update_invalid locationPolicy_update_invalid, + TimeSeries_update_invalid timeSeries_update_invalid } @@ -8495,7 +8498,7 @@ group InvalidTypes { NhURI parentID optional, Timestamp creationTime optional, Timestamp lastModifiedTime optional, - XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for Container + XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for TimeSeries Labels labels optional, AcpType accessControlPolicyIDs optional, Timestamp expirationTime optional, @@ -8541,14 +8544,14 @@ group InvalidTypes { - type record LocationPolicy_update_invalid { + type record LocationPolicy_update_invalid { ResourceName resourceName optional, ResourceType resourceType optional, XSD.ID resourceID optional, NhURI parentID optional, Timestamp creationTime optional, Timestamp lastModifiedTime optional, - XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for Schedule + XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for LocationPolicy Labels labels optional, AcpType accessControlPolicyIDs optional, Timestamp expirationTime optional, diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn index 6288962ffc132ec04aee236b089558da4412a04c..e055fc37516f2914c217e4f1d2dcb18f67483d72 100644 --- a/OneM2M_Testcases_CSE_Release_2.ttcn +++ b/OneM2M_Testcases_CSE_Release_2.ttcn @@ -631,6 +631,78 @@ module OneM2M_Testcases_CSE_Release_2 { } + testcase TC_CSE_DMR_CRE_001_TS_CB() runs on Tester system CseSystem { + // Local variables + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + var ResponsePrimitive v_responsePrimitive; + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + + v_createRequest.primitiveContent.timeSeries.resourceName := omit; + v_ae1.start(f_CSE_DMR_CRE_001(int29, v_createRequest, -));//TimeSeries + v_ae1.done; + + if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1); + if(not ispresent(v_responsePrimitive.primitiveContent.timeSeries.resourceName)){ + setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided"); + } + } + + } + + testcase TC_CSE_DMR_CRE_001_TS_AE() runs on Tester system CseSystem { + // Local variables + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + var ResponsePrimitive v_responsePrimitive; + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + + v_createRequest.primitiveContent.timeSeries.resourceName := omit; + + v_ae1.start(f_CSE_DMR_CRE_001(int29, v_createRequest, m_createAeAux(omit,omit)));//TimeSeries + v_ae1.done; + + if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1); + if(not ispresent(v_responsePrimitive.primitiveContent.timeSeries.resourceName)){ + setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided"); + } + } + + } + + testcase TC_CSE_DMR_CRE_001_TS_CSR() runs on Tester system CseSystem { + // Local variables + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + var ResponsePrimitive v_responsePrimitive; + var CseSimu v_cse1 := CseSimu.create("CSE1") alive; + + v_createRequest.primitiveContent.timeSeries.resourceName := omit; + v_cse1.start(f_CSE_DMR_CRE_001_cseSimu(int29, v_createRequest));//TimeSeries + v_cse1.done; + + if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_cse1); + if(not ispresent(v_responsePrimitive.primitiveContent.timeSeries.resourceName)){ + setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided"); + } + } + } + + testcase TC_CSE_DMR_CRE_001_TSI_TS() runs on Tester system CseSystem { + // Local variables + var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase; + var ResponsePrimitive v_responsePrimitive; + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + + v_createRequest.primitiveContent.timeSeriesInstance.resourceName := omit; + v_ae1.start(f_CSE_DMR_CRE_001(int30, v_createRequest, m_createTimeSeriesBase));//TimeSeriesInstance + v_ae1.done; + + if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1); + if(not ispresent(v_responsePrimitive.primitiveContent.timeSeriesInstance.resourceName)){ + setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided"); + } + } + + } + } // end g_CSE_DMR_CRE_001 group g_CSE_DMR_CRE_002 { @@ -659,6 +731,7 @@ module OneM2M_Testcases_CSE_Release_2 { } } } + testcase TC_CSE_DMR_CRE_002_PCH() runs on Tester system CseSystem { // Local variables var ResponsePrimitive v_responsePrimitive; @@ -680,6 +753,25 @@ module OneM2M_Testcases_CSE_Release_2 { } } + testcase TC_CSE_DMR_CRE_002_TS() runs on Tester system CseSystem { + // Local variables + var ResponsePrimitive v_responsePrimitive; + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + + v_ae1.start(f_CSE_DMR_CRE_002(int29, m_createTimeSeriesBase));//TimeSeries + v_ae1.done; + + if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1); + if(not ispresent(v_responsePrimitive.primitiveContent.timeSeries.resourceName)){ + setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided"); + } else { + if(v_responsePrimitive.primitiveContent.timeSeries.resourceName != c_defaultTimeSeriesResourceName){ + setverdict(fail, __SCOPE__, ": Error, resourceName attribute not correct"); + } + } + } + } + }// end group g_CSE_DMR_CRE_002 group g_CSE_DMR_CRE_003 { @@ -695,15 +787,23 @@ module OneM2M_Testcases_CSE_Release_2 { v_ae1.start(f_CSE_DMR_CRE_003(int18, m_createScheduleBase));//Schedule v_ae1.done; } + testcase TC_CSE_DMR_CRE_003_PCH() runs on Tester system CseSystem { - // Local variables - + // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; v_ae1.start(f_CSE_DMR_CRE_003(int15, m_createPollingChannelBase));//Pollingchannel v_ae1.done; } + testcase TC_CSE_DMR_CRE_003_TS() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + + v_ae1.start(f_CSE_DMR_CRE_003(int29, m_createTimeSeriesBase));//TimeSeries + v_ae1.done; + } + }// end group g_CSE_DMR_CRE_003 group g_CSE_DMR_CRE_004 { @@ -720,6 +820,7 @@ module OneM2M_Testcases_CSE_Release_2 { v_ae1.start(f_CSE_DMR_CRE_004(int18, m_createScheduleBase));//Schedule v_ae1.done; } + testcase TC_CSE_DMR_CRE_004_PCH() runs on Tester system CseSystem { // Local variables @@ -729,8 +830,123 @@ module OneM2M_Testcases_CSE_Release_2 { v_ae1.done; } + testcase TC_CSE_DMR_CRE_004_TS() runs on Tester system CseSystem { + // Local variables + + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + + v_ae1.start(f_CSE_DMR_CRE_004(int29, m_createTimeSeriesBase));//TimeSeries + v_ae1.done; + } + }// end group g_CSE_DMR_CRE_004 + group g_CSE_DMR_CRE_006 { + + /** + * @desc Check that the IUT returns a default value to RW ATTRIBUTE in the response of a RESOURCE_TYPE resource CREATE Request where no a RW ATTRIBUTE is provided by AE + * + */ + testcase TC_CSE_DMR_CRE_006_CNT_MNI() runs on Tester system CseSystem { + // Local variables + var template RequestPrimitive v_createRequest := m_createContainerBase; + var ResponsePrimitive v_responsePrimitive; + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + + v_ae1.start(f_CSE_DMR_CRE_006(int3, v_createRequest)); + v_ae1.done; + + if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1); + if(not ispresent(v_responsePrimitive.primitiveContent.container.maxNrOfInstances)){ + setverdict(fail, __SCOPE__, ": Error, maxNrOfInstances attribute not provided"); + } + } + } + + testcase TC_CSE_DMR_CRE_006_CNT_MBS() runs on Tester system CseSystem { + // Local variables + var template RequestPrimitive v_createRequest := m_createContainerBase; + var ResponsePrimitive v_responsePrimitive; + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + + v_ae1.start(f_CSE_DMR_CRE_006(int3, v_createRequest)); + v_ae1.done; + + if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1); + if(not ispresent(v_responsePrimitive.primitiveContent.container.maxByteSize)){ + setverdict(fail, __SCOPE__, ": Error, maxByteSize attribute not provided"); + } + } + + } + + testcase TC_CSE_DMR_CRE_006_CNT_MIA() runs on Tester system CseSystem { + // Local variables + var template RequestPrimitive v_createRequest := m_createContainerBase; + var ResponsePrimitive v_responsePrimitive; + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + + v_ae1.start(f_CSE_DMR_CRE_006(int3, v_createRequest)); + v_ae1.done; + + if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1); + if(not ispresent(v_responsePrimitive.primitiveContent.container.maxInstanceAge)){ + setverdict(fail, __SCOPE__, ": Error, maxInstanceAge attribute not provided"); + } + } + } + + testcase TC_CSE_DMR_CRE_006_TS_MNI() runs on Tester system CseSystem { + // Local variables + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + var ResponsePrimitive v_responsePrimitive; + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + + v_ae1.start(f_CSE_DMR_CRE_006(int29, v_createRequest)); + v_ae1.done; + + if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1); + if(not ispresent(v_responsePrimitive.primitiveContent.timeSeries.maxNrOfInstances)){ + setverdict(fail, __SCOPE__, ": Error, maxNrOfInstances attribute not provided"); + } + } + } + + testcase TC_CSE_DMR_CRE_006_TS_MBS() runs on Tester system CseSystem { + // Local variables + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + var ResponsePrimitive v_responsePrimitive; + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + + v_ae1.start(f_CSE_DMR_CRE_006(int29, v_createRequest)); + v_ae1.done; + + if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1); + if(not ispresent(v_responsePrimitive.primitiveContent.timeSeries.maxByteSize)){ + setverdict(fail, __SCOPE__, ": Error, maxByteSize attribute not provided"); + } + } + + } + + testcase TC_CSE_DMR_CRE_006_TS_MIA() runs on Tester system CseSystem { + // Local variables + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + var ResponsePrimitive v_responsePrimitive; + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + + v_ae1.start(f_CSE_DMR_CRE_006(int29, v_createRequest)); + v_ae1.done; + + if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1); + if(not ispresent(v_responsePrimitive.primitiveContent.timeSeries.maxInstanceAge)){ + setverdict(fail, __SCOPE__, ": Error, maxInstanceAge attribute not provided"); + } + } + } + + }// end group g_CSE_DMR_CRE_006 + group g_CSE_DMR_CRE_012 { /** @@ -967,129 +1183,323 @@ module OneM2M_Testcases_CSE_Release_2 { v_ae1.done; } - - }// end group g_CSE_DMR_CRE_012 - - group g_CSE_DMR_CRE_015 { - /** - * @desc Check that the IUT returns successfully after a CREATE request an empty content of created resource when the ResultContent set to 0 (Nothing) - * - */ - testcase TC_CSE_DMR_CRE_015_CNT() runs on Tester system CseSystem { - // Local variables - var AeSimu v_ae1 := AeSimu.create("AE1") alive; - - v_ae1.start(f_CSE_DMR_CRE_015(int3, m_createContainerBase));//Container - v_ae1.done; - } - - testcase TC_CSE_DMR_CRE_015_GRP() runs on Tester system CseSystem { + testcase TC_CSE_DMR_CRE_012_TS_ACPI() runs on Tester system CseSystem { // Local variables - var AeSimu v_ae1 := AeSimu.create("AE1") alive; - - v_ae1.start(f_CSE_DMR_CRE_015(int9, m_createGroupBase));//Group + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + const AttributeList c_optionalAttribute := {"accessControlPolicyIDs"}; + + v_createRequest.primitiveContent.timeSeries.accessControlPolicyIDs := {"NotInitialized"}; + + v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute)); v_ae1.done; } - testcase TC_CSE_DMR_CRE_015_ACP() runs on Tester system CseSystem { + testcase TC_CSE_DMR_CRE_012_TS_ET() runs on Tester system CseSystem { // Local variables - var AeSimu v_ae1 := AeSimu.create("AE1") alive; - - v_ae1.start(f_CSE_DMR_CRE_015(int1, m_createAcpBase));//AccessControlPolicy + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + const AttributeList c_optionalAttribute := {"expirationTime"}; + + v_createRequest.primitiveContent.timeSeries.expirationTime := "20301231T012345"; + + v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute)); v_ae1.done; + } - - testcase TC_CSE_DMR_CRE_015_SCH() runs on Tester system CseSystem { + + testcase TC_CSE_DMR_CRE_012_TS_LBL() runs on Tester system CseSystem { // Local variables - var AeSimu v_ae1 := AeSimu.create("AE1") alive; - - v_ae1.start(f_CSE_DMR_CRE_015(int18, m_createScheduleBase));//Schedule + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + const AttributeList c_optionalAttribute := {"labels"}; + + v_createRequest.primitiveContent.timeSeries.labels := {"MyLabel"}; + + v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute)); v_ae1.done; + } - testcase TC_CSE_DMR_CRE_015_PCH() runs on Tester system CseSystem { + testcase TC_CSE_DMR_CRE_012_TS_CR() runs on Tester system CseSystem { // Local variables - var AeSimu v_ae1 := AeSimu.create("AE1") alive; - - v_ae1.start(f_CSE_DMR_CRE_015(int15, m_createPollingChannelBase));//PollingChannel + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + var AttributeList v_optionalAttribute := {"creator"}; + + v_createRequest.primitiveContent.timeSeries.creator := "NullValue"; + + v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, v_optionalAttribute)); v_ae1.done; - } + + } - testcase TC_CSE_DMR_CRE_015_SUB() runs on Tester system CseSystem { + testcase TC_CSE_DMR_CRE_012_TS_MNI() runs on Tester system CseSystem { // Local variables - var AeSimu v_ae1 := AeSimu.create("AE1") alive; - - v_ae1.start(f_CSE_DMR_CRE_015(int23, m_createSubscriptionBase));//Subscription + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + const AttributeList c_optionalAttribute := {"maxNrOfInstances"}; + + v_createRequest.primitiveContent.timeSeries.maxNrOfInstances := 0; + + v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute)); v_ae1.done; + } - - } // end g_CSE_DMR_CRE_015 - group g_CSE_DMR_CRE_016 { - - /** - * @desc Check that the IUT returns successfully after a CREATE request only hierarchichal address of the created resource when the Result Content is set to 2 (hierarchical address) - * - */ - testcase TC_CSE_DMR_CRE_016_CNT() runs on Tester system CseSystem { + testcase TC_CSE_DMR_CRE_012_TS_MBS() runs on Tester system CseSystem { // Local variables - var template PrimitiveContent v_contentResponse; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - - v_contentResponse.uRI := mw_contentContainer_rc2; - - v_ae1.start(f_CSE_DMR_CRE_016(int3, m_createContainerBase, v_contentResponse));//Container + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + const AttributeList c_optionalAttribute := {"maxByteSize"}; + + v_createRequest.primitiveContent.timeSeries.maxByteSize := 0; + + v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute)); v_ae1.done; + } - testcase TC_CSE_DMR_CRE_016_GRP() runs on Tester system CseSystem { + testcase TC_CSE_DMR_CRE_012_TS_MIA() runs on Tester system CseSystem { // Local variables - var template PrimitiveContent v_contentResponse; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - - v_contentResponse.uRI := mw_contentGroup_rc2; - - v_ae1.start(f_CSE_DMR_CRE_016(int9, m_createGroupBase, v_contentResponse));//Group + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + const AttributeList c_optionalAttribute := {"maxInstanceAge"}; + + v_createRequest.primitiveContent.timeSeries.maxInstanceAge := 0; + + v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute)); v_ae1.done; - } + + } - testcase TC_CSE_DMR_CRE_016_ACP() runs on Tester system CseSystem { + testcase TC_CSE_DMR_CRE_012_TS_PEI() runs on Tester system CseSystem { // Local variables - var template PrimitiveContent v_contentResponse; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - - v_contentResponse.uRI := mw_contentAcp_rc2; - - v_ae1.start(f_CSE_DMR_CRE_016(int1, m_createAcpBase,v_contentResponse));//AccessControlPolicy + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + const AttributeList c_optionalAttribute := {"periodicInterval"}; + + v_createRequest.primitiveContent.timeSeries.periodicInterval := 0; + + v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute)); v_ae1.done; - } - - testcase TC_CSE_DMR_CRE_016_SCH() runs on Tester system CseSystem { + + } + + testcase TC_CSE_DMR_CRE_012_TS_MDD() runs on Tester system CseSystem { // Local variables - var template PrimitiveContent v_contentResponse; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - - v_contentResponse.uRI := mw_contentSchedule_rc2; - - v_ae1.start(f_CSE_DMR_CRE_016(int18, m_createScheduleBase, v_contentResponse));//Schedule + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + const AttributeList c_optionalAttribute := {"missingDataDetect"}; + + v_createRequest.primitiveContent.timeSeries.missingDataDetect := true; + + v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute)); v_ae1.done; - } + + } - testcase TC_CSE_DMR_CRE_016_PCH() runs on Tester system CseSystem { + testcase TC_CSE_DMR_CRE_012_TS_MDN() runs on Tester system CseSystem { // Local variables - var template PrimitiveContent v_contentResponse; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - - v_contentResponse.uRI := mw_contentPollingChannel_rc2; - - v_ae1.start(f_CSE_DMR_CRE_016(int15, m_createPollingChannelBase, v_contentResponse));//PollingChannel - v_ae1.done; + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + const AttributeList c_optionalAttribute := {"missingDataMaxNr"}; + + v_createRequest.primitiveContent.timeSeries.missingDataMaxNr := 0; + + v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute)); + v_ae1.done; + + } + + testcase TC_CSE_DMR_CRE_012_TS_MDT() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + const AttributeList c_optionalAttribute := {"missingDataDetectTimer"}; + + v_createRequest.primitiveContent.timeSeries.missingDataDetectTimer := 0; + + v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute)); + v_ae1.done; + + } + + testcase TC_CSE_DMR_CRE_012_TS_OR() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + const AttributeList c_optionalAttribute := {"ontologyRef"}; + + v_createRequest.primitiveContent.timeSeries.ontologyRef := "MyOntologyRef"; + + v_ae1.start(f_CSE_DMR_CRE_012(int29, v_createRequest, c_optionalAttribute)); + v_ae1.done; + + } + + testcase TC_CSE_DMR_CRE_012_TSI_ET() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase; + const AttributeList c_optionalAttribute := {"expirationTime"}; + + v_createRequest.primitiveContent.timeSeriesInstance.expirationTime := "20301231T012345"; + + v_ae1.start(f_CSE_DMR_CRE_012(int30, v_createRequest, c_optionalAttribute)); + v_ae1.done; + + } + + testcase TC_CSE_DMR_CRE_012_TSI_LBL() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase; + const AttributeList c_optionalAttribute := {"labels"}; + + v_createRequest.primitiveContent.timeSeriesInstance.labels := {"MyLabel"}; + + v_ae1.start(f_CSE_DMR_CRE_012(int30, v_createRequest, c_optionalAttribute)); + v_ae1.done; + + } + + testcase TC_CSE_DMR_CRE_012_TSI_SNR() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase; + const AttributeList c_optionalAttribute := {"labels"}; + + v_createRequest.primitiveContent.timeSeriesInstance.sequenceNr := 0; + + v_ae1.start(f_CSE_DMR_CRE_012(int30, v_createRequest, c_optionalAttribute)); + v_ae1.done; + + } + + }// end group g_CSE_DMR_CRE_012 + + group g_CSE_DMR_CRE_015 { + + /** + * @desc Check that the IUT returns successfully after a CREATE request an empty content of created resource when the ResultContent set to 0 (Nothing) + * + */ + testcase TC_CSE_DMR_CRE_015_CNT() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + + v_ae1.start(f_CSE_DMR_CRE_015(int3, m_createContainerBase));//Container + v_ae1.done; + } + + testcase TC_CSE_DMR_CRE_015_GRP() runs on Tester system CseSystem { + // Local variables + + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + + v_ae1.start(f_CSE_DMR_CRE_015(int9, m_createGroupBase));//Group + v_ae1.done; + } + + testcase TC_CSE_DMR_CRE_015_ACP() runs on Tester system CseSystem { + // Local variables + + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + + v_ae1.start(f_CSE_DMR_CRE_015(int1, m_createAcpBase));//AccessControlPolicy + v_ae1.done; + } + + testcase TC_CSE_DMR_CRE_015_SCH() runs on Tester system CseSystem { + // Local variables + + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + + v_ae1.start(f_CSE_DMR_CRE_015(int18, m_createScheduleBase));//Schedule + v_ae1.done; + } + + testcase TC_CSE_DMR_CRE_015_PCH() runs on Tester system CseSystem { + // Local variables + + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + + v_ae1.start(f_CSE_DMR_CRE_015(int15, m_createPollingChannelBase));//PollingChannel + v_ae1.done; + } + + testcase TC_CSE_DMR_CRE_015_SUB() runs on Tester system CseSystem { + // Local variables + + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + + v_ae1.start(f_CSE_DMR_CRE_015(int23, m_createSubscriptionBase));//Subscription + v_ae1.done; + } + + } // end g_CSE_DMR_CRE_015 + + group g_CSE_DMR_CRE_016 { + + /** + * @desc Check that the IUT returns successfully after a CREATE request only hierarchichal address of the created resource when the Result Content is set to 2 (hierarchical address) + * + */ + testcase TC_CSE_DMR_CRE_016_CNT() runs on Tester system CseSystem { + // Local variables + var template PrimitiveContent v_contentResponse; + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + + v_contentResponse.uRI := mw_contentContainer_rc2; + + v_ae1.start(f_CSE_DMR_CRE_016(int3, m_createContainerBase, v_contentResponse));//Container + v_ae1.done; + } + + testcase TC_CSE_DMR_CRE_016_GRP() runs on Tester system CseSystem { + // Local variables + var template PrimitiveContent v_contentResponse; + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + + v_contentResponse.uRI := mw_contentGroup_rc2; + + v_ae1.start(f_CSE_DMR_CRE_016(int9, m_createGroupBase, v_contentResponse));//Group + v_ae1.done; + } + + testcase TC_CSE_DMR_CRE_016_ACP() runs on Tester system CseSystem { + // Local variables + var template PrimitiveContent v_contentResponse; + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + + v_contentResponse.uRI := mw_contentAcp_rc2; + + v_ae1.start(f_CSE_DMR_CRE_016(int1, m_createAcpBase,v_contentResponse));//AccessControlPolicy + v_ae1.done; + } + + testcase TC_CSE_DMR_CRE_016_SCH() runs on Tester system CseSystem { + // Local variables + var template PrimitiveContent v_contentResponse; + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + + v_contentResponse.uRI := mw_contentSchedule_rc2; + + v_ae1.start(f_CSE_DMR_CRE_016(int18, m_createScheduleBase, v_contentResponse));//Schedule + v_ae1.done; + } + + testcase TC_CSE_DMR_CRE_016_PCH() runs on Tester system CseSystem { + // Local variables + var template PrimitiveContent v_contentResponse; + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + + v_contentResponse.uRI := mw_contentPollingChannel_rc2; + + v_ae1.start(f_CSE_DMR_CRE_016(int15, m_createPollingChannelBase, v_contentResponse));//PollingChannel + v_ae1.done; } testcase TC_CSE_DMR_CRE_016_SUB() runs on Tester system CseSystem { @@ -1102,6 +1512,17 @@ module OneM2M_Testcases_CSE_Release_2 { v_ae1.start(f_CSE_DMR_CRE_016(int23, m_createSubscriptionBase, v_contentResponse));//Subscription v_ae1.done; } + + testcase TC_CSE_DMR_CRE_016_TS() runs on Tester system CseSystem { + // Local variables + var template PrimitiveContent v_contentResponse; + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + + v_contentResponse.uRI := mw_contentTimeSeries_rc2; + + v_ae1.start(f_CSE_DMR_CRE_016(int29, m_createTimeSeriesBase, v_contentResponse));//TimeSeries + v_ae1.done; + } } // end g_CSE_DMR_CRE_016 @@ -1176,6 +1597,17 @@ module OneM2M_Testcases_CSE_Release_2 { v_ae1.start(f_CSE_DMR_CRE_017(int23, m_createSubscriptionBase, v_contentResponse));//Subscription v_ae1.done; } + + testcase TC_CSE_DMR_CRE_017_TS() runs on Tester system CseSystem { + // Local variables + var template PrimitiveContent v_contentResponse; + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + + v_contentResponse.resource := mw_contentTimeSeries_rc3; + + v_ae1.start(f_CSE_DMR_CRE_017(int29, m_createTimeSeriesBase, v_contentResponse));//TimeSeries + v_ae1.done; + } } // end g_CSE_DMR_CRE_017 @@ -1273,6 +1705,28 @@ module OneM2M_Testcases_CSE_Release_2 { v_ae1.start(f_CSE_DMR_CRE_020(int18, v_createRequest, mw_createScheduleAnncBase));//Schedule v_ae1.done; } + + testcase TC_CSE_DMR_CRE_020_TS() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + + v_createRequest.primitiveContent.timeSeries.announceTo := {f_getAnnouncementTargetPoA()}; + + v_ae1.start(f_CSE_DMR_CRE_020(int29, v_createRequest, mw_createTimeSeriesAnncBase));//TimeSeries + v_ae1.done; + } + + testcase TC_CSE_DMR_CRE_020_TSI() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase; + + v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {f_getAnnouncementTargetPoA()}; + + v_ae1.start(f_CSE_DMR_CRE_020(int30, v_createRequest, mw_createTimeSeriesInstanceAnncBase));//TimeSeriesInstance + v_ae1.done; + } } // end g_CSE_DMR_CRE_020 @@ -1471,6 +1925,66 @@ module OneM2M_Testcases_CSE_Release_2 { } } } + + testcase TC_CSE_DMR_CRE_021_TS() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + var RequestPrimitive v_requestPrimitive; + var XSD.NonNegativeInteger v_maxByteSize := 512; //Correct value? Shall be indicated in TP? + + //v_createRequest.primitiveContent.container.announceTo := {f_getAnnouncementTargetPoA()}; + v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID}; + v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize; + v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"maxByteSize"}; //Correct value? Shall be indicated in TP? + + v_ae1.start(f_CSE_DMR_CRE_021(int29, v_createRequest, mw_createTimeSeriesAnncBase()));//TimeSeries + v_ae1.done; + + if(getverdict == pass){ + //Check if maxByteSize attribute has been announced + v_requestPrimitive := f_getRequestPrimitive(v_ae1); + if (ispresent(v_requestPrimitive.primitiveContent.timeSeriesAnnc.maxByteSize)){ + if(v_requestPrimitive.primitiveContent.timeSeriesAnnc.maxByteSize != v_maxByteSize){ + setverdict(fail, __SCOPE__ & ": Error: Value of maxByteSize has not been announced successfully"); + }else{ + setverdict(pass, __SCOPE__ & ": Value of maxByteSize has been announced successfully"); + } + }else{ + setverdict(fail, __SCOPE__ & ": Error: maxByteSize has not been announced"); + } + } + } + + testcase TC_CSE_DMR_CRE_021_TSI() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase; + var RequestPrimitive v_requestPrimitive; + var XSD.NonNegativeInteger v_sequenceNr := 8; //Correct value? Shall be indicated in TP? + + //v_createRequest.primitiveContent.container.announceTo := {f_getAnnouncementTargetPoA()}; + v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {PX_CSE1_ID}; + v_createRequest.primitiveContent.timeSeriesInstance.sequenceNr := v_sequenceNr; + v_createRequest.primitiveContent.timeSeriesInstance.announcedAttribute := {"sequenceNr"}; //Correct value? Shall be indicated in TP? + + v_ae1.start(f_CSE_DMR_CRE_021(int30, v_createRequest, mw_createTimeSeriesInstanceAnncBase()));//TimeSeriesInstance + v_ae1.done; + + if(getverdict == pass){ + //Check if maxByteSize attribute has been announced + v_requestPrimitive := f_getRequestPrimitive(v_ae1); + if (ispresent(v_requestPrimitive.primitiveContent.timeSeriesInstanceAnnc.sequenceNr)){ + if(v_requestPrimitive.primitiveContent.timeSeriesInstanceAnnc.sequenceNr != v_sequenceNr){ + setverdict(fail, __SCOPE__ & ": Error: Value of sequenceNr has not been announced successfully"); + }else{ + setverdict(pass, __SCOPE__ & ": Value of sequenceNr has been announced successfully"); + } + }else{ + setverdict(fail, __SCOPE__ & ": Error: sequenceNr has not been announced"); + } + } + } } // end g_CSE_DMR_CRE_021 @@ -1510,6 +2024,19 @@ module OneM2M_Testcases_CSE_Release_2 { } + testcase TC_CSE_DMR_RET_001_TS() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var ResponsePrimitive v_responsePrimitive; + var template PrimitiveContent v_contentResponse; + + v_contentResponse.timeSeries := mw_contentTimeSeries_rc1; + + v_ae1.start(f_CSE_DMR_RET_001(int29, m_createTimeSeriesBase, v_contentResponse));//TimeSeries + v_ae1.done; + + } + } // end g_CSE_DMR_RET_001 group g_CSE_DMR_RET_002 { @@ -1610,6 +2137,14 @@ module OneM2M_Testcases_CSE_Release_2 { v_ae1.done; } + testcase TC_CSE_DMR_RET_003_TS() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + + v_ae1.start(f_CSE_DMR_RET_003(int29, m_createTimeSeriesBase));//TimeSeries + v_ae1.done; + } + } // end g_CSE_DMR_RET_003 group g_CSE_DMR_RET_004 { @@ -1689,7 +2224,19 @@ module OneM2M_Testcases_CSE_Release_2 { v_ae1.start(f_CSE_DMR_RET_004(int23, m_createSubscriptionBase, v_contentResponse));//Subscription v_ae1.done; } - + + testcase TC_CSE_DMR_RET_004_TS() runs on Tester system CseSystem { + // Local variables + var template PrimitiveContent v_contentResponse; + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + + v_contentResponse.timeSeries := m_contentTimeSeries_allOmit; + v_contentResponse.timeSeries.parentID := ?; + + v_ae1.start(f_CSE_DMR_RET_004(int29, m_createTimeSeriesBase, v_contentResponse));//TimeSeries + v_ae1.done; + } + } // end g_CSE_DMR_RET_004 group g_CSE_DMR_RET_005 { @@ -1769,6 +2316,18 @@ module OneM2M_Testcases_CSE_Release_2 { v_ae1.start(f_CSE_DMR_RET_005(int23, m_createSubscriptionBase, v_contentResponse));//Subscription v_ae1.done; } + + testcase TC_CSE_DMR_RET_005_TS() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var template PrimitiveContent v_contentResponse; + + v_contentResponse.timeSeries := m_contentTimeSeries_allOmit; + v_contentResponse.timeSeries.parentID := ?; + + v_ae1.start(f_CSE_DMR_RET_005(int29, m_createTimeSeriesBase, v_contentResponse));//TimeSeries + v_ae1.done; + } } // end g_CSE_DMR_RET_005 @@ -1856,6 +2415,19 @@ module OneM2M_Testcases_CSE_Release_2 { v_ae1.start(f_CSE_DMR_RET_006(int23, m_createSubscriptionBase, v_contentResponse));//Subscription v_ae1.done; } + + testcase TC_CSE_DMR_RET_006_TS() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var template PrimitiveContent v_contentResponse; + + v_contentResponse.timeSeries := m_contentTimeSeries_allOmit; + v_contentResponse.timeSeries.parentID := ?; + v_contentResponse.timeSeries.creationTime := ?; + + v_ae1.start(f_CSE_DMR_RET_006(int29, m_createTimeSeriesBase, v_contentResponse));//TimeSeries + v_ae1.done; + } } // end g_CSE_DMR_RET_006 @@ -1907,12 +2479,20 @@ module OneM2M_Testcases_CSE_Release_2 { } testcase TC_CSE_DMR_RET_007_SUB_LBL() runs on AeSimu system CseSystem { - // Local variables + // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; v_ae1.start(f_CSE_DMR_RET_007(int23, m_createSubscriptionBase));//Subscription v_ae1.done; } + + testcase TC_CSE_DMR_RET_007_TS_LBL() runs on AeSimu system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + + v_ae1.start(f_CSE_DMR_RET_007(int29, m_createSubscriptionBase));//TimeSeries + v_ae1.done; + } } // end g_CSE_DMR_RET_007 @@ -1963,12 +2543,20 @@ module OneM2M_Testcases_CSE_Release_2 { } testcase TC_CSE_DMR_RET_008_SUB_AT() runs on Tester system CseSystem { - // Local variables + // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; v_ae1.start(f_CSE_DMR_RET_008(int23, m_createSubscriptionBase));//Subscription v_ae1.done; } + + testcase TC_CSE_DMR_RET_008_TS_AT() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + + v_ae1.start(f_CSE_DMR_RET_008(int29, m_createTimeSeriesBase));//TimeSeries + v_ae1.done; + } } // end f_CSE_DMR_RET_008 @@ -2120,6 +2708,18 @@ module OneM2M_Testcases_CSE_Release_2 { } + testcase TC_CSE_DMR_RET_013_TS() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var template PrimitiveContent v_contentResponse; + + v_contentResponse.timeSeries := mw_contentTimeSeries_rc1; + + v_ae1.start(f_CSE_DMR_RET_013(int29, m_createTimeSeriesBase, v_contentResponse));//TimeSeries + v_ae1.done; + + } + } // end g_CSE_DMR_RET_013 group g_CSE_DMR_RET_014 { @@ -2135,6 +2735,14 @@ module OneM2M_Testcases_CSE_Release_2 { v_ae1.start(f_CSE_DMR_RET_014(int18, m_createScheduleBase));//Schedule v_ae1.done; } + + testcase TC_CSE_DMR_RET_014_TS() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + + v_ae1.start(f_CSE_DMR_RET_014(int29, m_createTimeSeriesBase));//TimeSeries + v_ae1.done; + } } // end g_CSE_DMR_RET_014 @@ -2227,6 +2835,18 @@ module OneM2M_Testcases_CSE_Release_2 { v_ae1.start(f_CSE_DMR_RET_015(int23, m_createSubscriptionBase, v_contentResponse));//Subscription v_ae1.done; } + + testcase TC_CSE_DMR_RET_015_TS() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var template PrimitiveContent v_contentResponse; + + v_contentResponse.timeSeries := m_contentTimeSeries_allOmit; + v_contentResponse.timeSeries.parentID := ?; + + v_ae1.start(f_CSE_DMR_RET_015(int29, m_createTimeSeriesBase, v_contentResponse));//TimeSeries + v_ae1.done; + } } // end g_CSE_DMR_RET_015 @@ -2319,6 +2939,18 @@ module OneM2M_Testcases_CSE_Release_2 { v_ae1.start(f_CSE_DMR_RET_016(int23, m_createSubscriptionBase, v_contentResponse));//Subscription v_ae1.done; } + + testcase TC_CSE_DMR_RET_016_TS() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var template PrimitiveContent v_contentResponse; + + v_contentResponse.timeSeries := m_contentTimeSeries_allOmit; + v_contentResponse.timeSeries.parentID := ?; + + v_ae1.start(f_CSE_DMR_RET_016(int29, m_createTimeSeriesBase, v_contentResponse));//TimeSeries + v_ae1.done; + } } // end g_CSE_DMR_RET_016 @@ -2496,6 +3128,19 @@ module OneM2M_Testcases_CSE_Release_2 { v_ae1.start(f_CSE_DMR_RET_017(int23, m_createSubscriptionBase, v_contentResponse));//Subscription v_ae1.done; } + + testcase TC_CSE_DMR_RET_017_TS() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var template PrimitiveContent v_contentResponse; + + v_contentResponse.timeSeries := m_contentTimeSeries_allOmit; + v_contentResponse.timeSeries.parentID := ?; + v_contentResponse.timeSeries.creationTime := ?; + + v_ae1.start(f_CSE_DMR_RET_017(int23, m_createTimeSeriesBase, v_contentResponse));//TimeSeries + v_ae1.done; + } } // end g_CSE_DMR_RET_017 @@ -2554,12 +3199,20 @@ module OneM2M_Testcases_CSE_Release_2 { } testcase TC_CSE_DMR_RET_018_SUB_LBL() runs on AeSimu system CseSystem { - // Local variables + // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; v_ae1.start(f_CSE_DMR_RET_018(int23, m_createSubscriptionBase));//Subscription v_ae1.done; } + + testcase TC_CSE_DMR_RET_018_TS_LBL() runs on AeSimu system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + + v_ae1.start(f_CSE_DMR_RET_018(int29, m_createTimeSeriesBase));//TimeSeries + v_ae1.done; + } } // end g_CSE_DMR_RET_018 @@ -2618,12 +3271,20 @@ module OneM2M_Testcases_CSE_Release_2 { } testcase TC_CSE_DMR_RET_019_SUB_LBL_AT() runs on Tester system CseSystem { - // Local variables + // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; v_ae1.start(f_CSE_DMR_RET_019(int23, m_createSubscriptionBase));//Subscription v_ae1.done; } + + testcase TC_CSE_DMR_RET_019_TS_LBL_AT() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + + v_ae1.start(f_CSE_DMR_RET_019(int29, m_createTimeSeriesBase));//TimeSeries + v_ae1.done; + } } // end f_CSE_DMR_RET_019 @@ -2727,6 +3388,17 @@ module OneM2M_Testcases_CSE_Release_2 { v_ae1.start(f_CSE_DMR_RET_021(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription v_ae1.done; } + + testcase TC_CSE_DMR_RET_021_TS() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var template PrimitiveContent v_contentResponse; + + v_contentResponse.timeSeries := mw_contentTimeSeries_rc1; + + v_ae1.start(f_CSE_DMR_RET_021(int29, m_createTimeSeriesBase, v_contentResponse, int23, m_createSubscriptionBase));//TimeSeries + v_ae1.done; + } } // end g_CSE_DMR_RET_021 @@ -2801,6 +3473,17 @@ module OneM2M_Testcases_CSE_Release_2 { v_ae1.start(f_CSE_DMR_RET_022(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription v_ae1.done; } + + testcase TC_CSE_DMR_RET_022_TS() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var template PrimitiveContent v_contentResponse; + + v_contentResponse.timeSeries := mw_contentTimeSeries_rc4; + + v_ae1.start(f_CSE_DMR_RET_022(int29, m_createTimeSeriesBase, v_contentResponse, int23, m_createSubscriptionBase));//TimeSeries + v_ae1.done; + } } // end g_CSE_DMR_RET_022 @@ -2875,6 +3558,17 @@ module OneM2M_Testcases_CSE_Release_2 { v_ae1.start(f_CSE_DMR_RET_023(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription v_ae1.done; } + + testcase TC_CSE_DMR_RET_023_TS() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var template PrimitiveContent v_contentResponse; + + v_contentResponse.timeSeries := mw_contentTimeSeries_rc5; + + v_ae1.start(f_CSE_DMR_RET_023(int29, m_createTimeSeriesBase, v_contentResponse, int23, m_createSubscriptionBase));//TimeSeries + v_ae1.done; + } } // end g_CSE_DMR_RET_023 @@ -2949,6 +3643,17 @@ module OneM2M_Testcases_CSE_Release_2 { v_ae1.start(f_CSE_DMR_RET_024(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription v_ae1.done; } + + testcase TC_CSE_DMR_RET_024_TS() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var template PrimitiveContent v_contentResponse; + + v_contentResponse.timeSeries := mw_contentTimeSeries_rc6; + + v_ae1.start(f_CSE_DMR_RET_024(int29, m_createTimeSeriesBase, v_contentResponse, int23, m_createSubscriptionBase));//TimeSeries + v_ae1.done; + } } // end g_CSE_DMR_RET_024 @@ -3023,6 +3728,17 @@ module OneM2M_Testcases_CSE_Release_2 { v_ae1.start(f_CSE_DMR_RET_025(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription v_ae1.done; } + + testcase TC_CSE_DMR_RET_025_TS() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var template PrimitiveContent v_contentResponse; + + v_contentResponse.timeSeries := mw_contentTimeSeries_rc8; + + v_ae1.start(f_CSE_DMR_RET_025(int29, m_createTimeSeriesBase, v_contentResponse, int23, m_createSubscriptionBase));//TimeSeries + v_ae1.done; + } } // end g_CSE_DMR_RET_025 @@ -3114,6 +3830,45 @@ module OneM2M_Testcases_CSE_Release_2 { } } + testcase TC_CSE_DMR_UPD_001_TS_LBL() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var Labels v_labels_1 := {"VALUE_1"}; + var Labels v_labels_2 := {"VALUE_2"}; + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase; + var ResponsePrimitive v_responsePrimitive; + var PrimitiveContent v_primitiveContentRetrieveResource; + + v_createRequest.primitiveContent.timeSeries.labels := v_labels_1; + v_updateRequest.primitiveContent.timeSeries.labels := v_labels_2; + + v_ae1.start(f_CSE_DMR_UPD_001(int29, v_createRequest, v_updateRequest));//TimeSeries + v_ae1.done; + + + + if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1); + //Check attribute 1 + if(ispresent(v_responsePrimitive.primitiveContent)) { + if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) { + if(v_responsePrimitive.primitiveContent.timeSeries.labels != v_labels_2){ + setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly") + } + } + } + + v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1); + + //Check that the resource has been udpated correctly + if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) { + if(v_primitiveContentRetrieveResource.timeSeries.labels != v_labels_2){ + setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly") + } + } + } + } + } // end g_CSE_DMR_UPD_001 group g_CSE_DMR_UPD_002 { @@ -3194,6 +3949,42 @@ module OneM2M_Testcases_CSE_Release_2 { } } + testcase TC_CSE_DMR_UPD_002_TS_LBL() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var Labels v_labels_1 := {"VALUE_1"}; + var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase; + var ResponsePrimitive v_responsePrimitive; + var PrimitiveContent v_primitiveContentRetrieveResource; + + v_updateRequest.primitiveContent.timeSeries.labels := v_labels_1; + + v_ae1.start(f_CSE_DMR_UPD_002(int29, m_createTimeSeriesBase,v_updateRequest));//TimeSeries + v_ae1.done; + + + + if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1); + //Check attribute 1 + if(ispresent(v_responsePrimitive.primitiveContent)) { + if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) { + if(v_responsePrimitive.primitiveContent.timeSeries.labels != v_labels_1){ + setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly") + } + } + } + + v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1); + + //Check that the resource has been udpated correctly + if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) { + if(v_primitiveContentRetrieveResource.timeSeries.labels != v_labels_1){ + setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly") + } + } + } + } + } // end g_CSE_DMR_UPD_002 group g_CSE_DMR_UPD_003 { @@ -3240,8 +4031,8 @@ module OneM2M_Testcases_CSE_Release_2 { if(ispresent(v_primitiveContentRetrieveResource.schedule.labels)) { if(not(match(v_primitiveContentRetrieveResource.schedule.labels,{""}))){ setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly") - } - } + } + } } } } @@ -3290,6 +4081,50 @@ module OneM2M_Testcases_CSE_Release_2 { } } + testcase TC_CSE_DMR_UPD_003_TS_LBL() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var Labels v_labels_1 := {"VALUE_1"}; + var Labels v_labels_2 := {"To be deleted"}; + var AttributeAux_list v_nullFields; + var ResponsePrimitive v_responsePrimitive; + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase; + var PrimitiveContent v_primitiveContentRetrieveResource; + + v_createRequest.primitiveContent.timeSeries.labels := v_labels_1; + v_updateRequest.primitiveContent.timeSeries.labels := v_labels_2; + + v_nullFields := {{"labels", omit}}; + + v_ae1.start(f_CSE_DMR_UPD_003(int29, v_createRequest, v_updateRequest, v_nullFields));//TimeSeries + v_ae1.done; + + + + if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1); + //Check attribute 1 + if(ispresent(v_responsePrimitive.primitiveContent)) { + if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) { + if(ispresent(v_responsePrimitive.primitiveContent.timeSeries.labels)){ + setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly") + } + } + } + + v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1); + + //Check that the resource has been udpated correctly + if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) { + if(ispresent(v_primitiveContentRetrieveResource.timeSeries.labels)) { + if(not(match(v_primitiveContentRetrieveResource.timeSeries.labels,{""}))){ + setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly") + } + } + } + } + } + } // end g_CSE_DMR_UPD_003 group g_CSE_DMR_UPD_004 { @@ -3403,36 +4238,95 @@ module OneM2M_Testcases_CSE_Release_2 { if(ischosen(v_primitiveContentRetrieveResource.pollingChannel)) { if(ispresent (v_primitiveContentRetrieveResource.pollingChannel.labels)){ setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly") + } + } } } - } - } - - } // end g_CSE_DMR_UPD_004 - - group g_CSE_DMR_UPD_006{ - /** - * @desc Check that the IUT responds with an error when the AE tries to update the attribute ATTRIBUTE_NAME of a TARGET_RESOURCE_ADDRESS resource without having privileges for the UPDATE operation - * - */ - testcase TC_CSE_DMR_UPD_006_SCH_LBL() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_004_TS_ET_MNI_LBL() runs on Tester system CseSystem { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; var Labels v_labels_1 := {"VALUE_1"}; - var template RequestPrimitive v_updateRequest := m_updateScheduleBase; + var Labels v_labels_2 := {"To be deleted"}; + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase; + var ResponsePrimitive v_responsePrimitive; + var AttributeAux_list v_nullFields; var PrimitiveContent v_primitiveContentRetrieveResource; - v_updateRequest.primitiveContent.schedule.labels := v_labels_1; - - v_ae1.start(f_CSE_DMR_UPD_006(int18, m_createScheduleBase, v_updateRequest));//Schedule - v_ae1.done; + v_createRequest.primitiveContent.timeSeries.labels := v_labels_1;//Attribute 3 + v_updateRequest.primitiveContent.timeSeries.expirationTime := "20301231T012345";//Attribute 1 + v_updateRequest.primitiveContent.timeSeries.maxNrOfInstances := 5;//Attribute 2 + v_updateRequest.primitiveContent.timeSeries.labels := v_labels_2;//Attribute 3 - if(getverdict == pass){ - v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1); - //Check that the resource has NOT been udpated - if(ischosen(v_primitiveContentRetrieveResource.schedule)) { - if(v_primitiveContentRetrieveResource.schedule.labels == v_labels_1){ + v_nullFields := {{"labels", omit}}; + + v_ae1.start(f_CSE_DMR_UPD_004(int29, v_createRequest, v_updateRequest, v_nullFields));//TimeSeries + v_ae1.done; + + if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1); + if(ispresent(v_responsePrimitive.primitiveContent)) { + if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) { + //Check attribute 1 + if(v_responsePrimitive.primitiveContent.timeSeries.expirationTime != valueof(v_updateRequest.primitiveContent.timeSeries.expirationTime)){ + setverdict(fail, __SCOPE__ & ": Error: Expiration Time attribute not updated correctly") + } + //Check attribute 2 + if(v_responsePrimitive.primitiveContent.timeSeries.maxNrOfInstances != valueof(v_updateRequest.primitiveContent.timeSeries.maxNrOfInstances)){ + setverdict(fail, __SCOPE__ & ": Error: MaxNrOfInstances attribute not updated correctly") + } + //Check attribute 3 + if(ispresent(v_responsePrimitive.primitiveContent.timeSeries.labels)){ + setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly") + } + } + } + + v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1); + + //Check that the resource has been udpated correctly + if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) { + //Check attribute 1 + if(v_primitiveContentRetrieveResource.timeSeries.expirationTime != valueof(v_updateRequest.primitiveContent.timeSeries.expirationTime)){ + setverdict(fail, __SCOPE__ & ": Error: Expiration Time attribute not updated correctly") + } + //Check attribute 2 + if(v_primitiveContentRetrieveResource.timeSeries.maxNrOfInstances != valueof(v_updateRequest.primitiveContent.timeSeries.maxNrOfInstances)){ + setverdict(fail, __SCOPE__ & ": Error: MaxNrOfInstances attribute not updated correctly") + } + //Check attribute 3 + if(ispresent(v_primitiveContentRetrieveResource.timeSeries.labels)){ + setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly") + } + } + } + } + + } // end g_CSE_DMR_UPD_004 + + group g_CSE_DMR_UPD_006{ + + /** + * @desc Check that the IUT responds with an error when the AE tries to update the attribute ATTRIBUTE_NAME of a TARGET_RESOURCE_ADDRESS resource without having privileges for the UPDATE operation + * + */ + testcase TC_CSE_DMR_UPD_006_SCH_LBL() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var Labels v_labels_1 := {"VALUE_1"}; + var template RequestPrimitive v_updateRequest := m_updateScheduleBase; + var PrimitiveContent v_primitiveContentRetrieveResource; + + v_updateRequest.primitiveContent.schedule.labels := v_labels_1; + + v_ae1.start(f_CSE_DMR_UPD_006(int18, m_createScheduleBase, v_updateRequest));//Schedule + v_ae1.done; + + if(getverdict == pass){ + v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1); + //Check that the resource has NOT been udpated + if(ischosen(v_primitiveContentRetrieveResource.schedule)) { + if(v_primitiveContentRetrieveResource.schedule.labels == v_labels_1){ setverdict(fail, __SCOPE__ & ": Error: Labels attribute updated") } } @@ -3463,6 +4357,30 @@ module OneM2M_Testcases_CSE_Release_2 { } } + testcase TC_CSE_DMR_UPD_006_TS_LBL() runs on Tester system CseSystem { + // Local variable + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var Labels v_labels_1 := {"VALUE_1"}; + var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase; + var PrimitiveContent v_primitiveContentRetrieveResource; + + v_updateRequest.primitiveContent.timeSeries.labels := v_labels_1; + + v_ae1.start(f_CSE_DMR_UPD_006(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries + v_ae1.done; + + if(getverdict == pass){ + v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1); + + //Check that the resource has NOT been udpated + if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) { + if(v_primitiveContentRetrieveResource.timeSeries.labels == v_labels_1){ + setverdict(fail, __SCOPE__ & ": Error: Labels attribute updated") + } + } + } + } + } // end g_CSE_DMR_UPD_006 @@ -3520,6 +4438,30 @@ module OneM2M_Testcases_CSE_Release_2 { } } + testcase TC_CSE_DMR_UPD_007_TS_CT() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var Timestamp v_creationTime := "21001231T012345"; + var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase; + var PrimitiveContent v_primitiveContentRetrieveResource; + + v_updateRequest.primitiveContent := {timeSeries_update_invalid := m_contentUpdateTimeSeries_invalid}; + v_updateRequest.primitiveContent.timeSeries_update_invalid.creationTime := v_creationTime; + + v_ae1.start(f_CSE_DMR_UPD_007(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries + v_ae1.done; + + if(getverdict == pass){ + v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1); + //Check that the resource has NOT been udpated + if(ischosen(v_primitiveContentRetrieveResource.timeSeries_update_invalid)) { + if(v_primitiveContentRetrieveResource.timeSeries_update_invalid.creationTime == v_creationTime){ + setverdict(fail, __SCOPE__ & ": Error: Creation Time attribute updated") + } + } + } + } + } // end g_CSE_DMR_UPD_007 group g_CSE_DMR_UPD_008{ @@ -4105,6 +5047,286 @@ module OneM2M_Testcases_CSE_Release_2 { } } + + testcase TC_CSE_DMR_UPD_014_TS_ACPI() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var AcpType v_accessControlPolicyIDs_1 := {"NotInitialized_1"}; + var AcpType v_accessControlPolicyIDs_2 := {"NotInitialized_2"}; + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase; + var ResponsePrimitive v_responsePrimitive; + + v_createRequest.primitiveContent.timeSeries.accessControlPolicyIDs := v_accessControlPolicyIDs_1; + v_updateRequest.primitiveContent.timeSeries.accessControlPolicyIDs := v_accessControlPolicyIDs_2; + + v_ae1.start(f_CSE_DMR_UPD_014(int29, v_createRequest, v_updateRequest));//TimeSeries + v_ae1.done; + + if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1); + //Check attribute 1 + if(ispresent(v_responsePrimitive.primitiveContent)) { + if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) { + if(v_responsePrimitive.primitiveContent.timeSeries.accessControlPolicyIDs != v_accessControlPolicyIDs_2){ + setverdict(fail, __SCOPE__ & ": Error: AccessControlPolicyIDs attribute not updated correctly") + } + } + } + } + + } + + testcase TC_CSE_DMR_UPD_014_TS_LBL() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var Labels v_labels_1 := {"VALUE_1"}; + var Labels v_labels_2 := {"VALUE_2"}; + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase; + var ResponsePrimitive v_responsePrimitive; + + v_createRequest.primitiveContent.timeSeries.labels := v_labels_1; + v_updateRequest.primitiveContent.timeSeries.labels := v_labels_2; + + v_ae1.start(f_CSE_DMR_UPD_014(int29, v_createRequest, v_updateRequest));//TimeSeries + v_ae1.done; + + if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1); + //Check attribute 1 + if(ispresent(v_responsePrimitive.primitiveContent)) { + if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) { + if(v_responsePrimitive.primitiveContent.timeSeries.labels != v_labels_2){ + setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly") + } + } + } + } + + } + + testcase TC_CSE_DMR_UPD_014_TS_MBS() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var XSD.NonNegativeInteger v_maxByteSize_1 := 256; + var XSD.NonNegativeInteger v_maxByteSize_2 := 512; + var ResponsePrimitive v_responsePrimitive; + + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase; + + v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize_1; + v_updateRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize_2; + + v_ae1.start(f_CSE_DMR_UPD_014(int29, v_createRequest, v_updateRequest));//TimeSeries + v_ae1.done; + + if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1); + //Check attribute 1 + if(ispresent(v_responsePrimitive.primitiveContent)) { + if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) { + if(v_responsePrimitive.primitiveContent.timeSeries.maxByteSize != v_maxByteSize_2){ + setverdict(fail, __SCOPE__ & ": Error: MaxByteSize attribute not updated correctly") + } + } + } + } + } + + testcase TC_CSE_DMR_UPD_014_TS_MIA() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var XSD.NonNegativeInteger v_maxInstanceAge_1 := 60; + var XSD.NonNegativeInteger v_maxInstanceAge_2 := 120; + var ResponsePrimitive v_responsePrimitive; + + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase; + + v_createRequest.primitiveContent.timeSeries.maxInstanceAge := v_maxInstanceAge_1; + v_updateRequest.primitiveContent.timeSeries.maxInstanceAge := v_maxInstanceAge_2; + + v_ae1.start(f_CSE_DMR_UPD_014(int29, v_createRequest, v_updateRequest));//TimeSeries + v_ae1.done; + + if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1); + //Check attribute 1 + if(ispresent(v_responsePrimitive.primitiveContent)) { + if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) { + if(v_responsePrimitive.primitiveContent.timeSeries.maxInstanceAge != v_maxInstanceAge_2){ + setverdict(fail, __SCOPE__ & ": Error: MaxInstanceAge attribute not updated correctly") + } + } + } + } + } + + testcase TC_CSE_DMR_UPD_014_TS_MNI() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var XSD.NonNegativeInteger v_maxNrOfInstances_1 := 1; + var XSD.NonNegativeInteger v_maxNrOfInstances_2 := 2; + var ResponsePrimitive v_responsePrimitive; + + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase; + + v_createRequest.primitiveContent.timeSeries.maxNrOfInstances := v_maxNrOfInstances_1; + v_updateRequest.primitiveContent.timeSeries.maxNrOfInstances := v_maxNrOfInstances_2; + + v_ae1.start(f_CSE_DMR_UPD_014(int29, v_createRequest, v_updateRequest));//TimeSeries + v_ae1.done; + + if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1); + //Check attribute 1 + if(ispresent(v_responsePrimitive.primitiveContent)) { + if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) { + if(v_responsePrimitive.primitiveContent.timeSeries.maxNrOfInstances != v_maxNrOfInstances_2){ + setverdict(fail, __SCOPE__ & ": Error: MaxNrOfInstances attribute not updated correctly") + } + } + } + } + } + + testcase TC_CSE_DMR_UPD_014_TS_PEI() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var XSD.NonNegativeInteger v_periodicInterval_1 := 1; + var XSD.NonNegativeInteger v_periodicInterval_2 := 2; + var ResponsePrimitive v_responsePrimitive; + + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase; + + v_createRequest.primitiveContent.timeSeries.periodicInterval := v_periodicInterval_1; + v_updateRequest.primitiveContent.timeSeries.periodicInterval := v_periodicInterval_2; + + v_ae1.start(f_CSE_DMR_UPD_014(int29, v_createRequest, v_updateRequest));//TimeSeries + v_ae1.done; + + if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1); + //Check attribute 1 + if(ispresent(v_responsePrimitive.primitiveContent)) { + if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) { + if(v_responsePrimitive.primitiveContent.timeSeries.periodicInterval != v_periodicInterval_2){ + setverdict(fail, __SCOPE__ & ": Error: PeriodicInterval attribute not updated correctly") + } + } + } + } + } + + testcase TC_CSE_DMR_UPD_014_TS_MDD() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var XSD.Boolean v_missingDataDetect_1 := true; + var XSD.Boolean v_missingDataDetect_2 := false; + var ResponsePrimitive v_responsePrimitive; + + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase; + + v_createRequest.primitiveContent.timeSeries.missingDataDetect := v_missingDataDetect_1; + v_updateRequest.primitiveContent.timeSeries.missingDataDetect := v_missingDataDetect_2; + + v_ae1.start(f_CSE_DMR_UPD_014(int29, v_createRequest, v_updateRequest));//TimeSeries + v_ae1.done; + + if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1); + //Check attribute 1 + if(ispresent(v_responsePrimitive.primitiveContent)) { + if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) { + if(v_responsePrimitive.primitiveContent.timeSeries.missingDataDetect != v_missingDataDetect_2){ + setverdict(fail, __SCOPE__ & ": Error: MissingDataDetect attribute not updated correctly") + } + } + } + } + } + + testcase TC_CSE_DMR_UPD_014_TS_MDN() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var XSD.NonNegativeInteger v_missingDataMaxNr_1 := 1; + var XSD.NonNegativeInteger v_missingDataMaxNr_2 := 2; + var ResponsePrimitive v_responsePrimitive; + + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase; + + v_createRequest.primitiveContent.timeSeries.missingDataMaxNr := v_missingDataMaxNr_1; + v_updateRequest.primitiveContent.timeSeries.missingDataMaxNr := v_missingDataMaxNr_2; + + v_ae1.start(f_CSE_DMR_UPD_014(int29, v_createRequest, v_updateRequest));//TimeSeries + v_ae1.done; + + if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1); + //Check attribute 1 + if(ispresent(v_responsePrimitive.primitiveContent)) { + if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) { + if(v_responsePrimitive.primitiveContent.timeSeries.missingDataMaxNr != v_missingDataMaxNr_2){ + setverdict(fail, __SCOPE__ & ": Error: MissingDataMaxNr attribute not updated correctly") + } + } + } + } + } + + testcase TC_CSE_DMR_UPD_014_TS_MDT() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var XSD.NonNegativeInteger v_missingDataDetectTimer_1 := 1; + var XSD.NonNegativeInteger v_missingDataDetectTimer_2 := 2; + var ResponsePrimitive v_responsePrimitive; + + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase; + + v_createRequest.primitiveContent.timeSeries.missingDataDetectTimer := v_missingDataDetectTimer_1; + v_updateRequest.primitiveContent.timeSeries.missingDataDetectTimer := v_missingDataDetectTimer_2; + + v_ae1.start(f_CSE_DMR_UPD_014(int29, v_createRequest, v_updateRequest));//TimeSeries + v_ae1.done; + + if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1); + //Check attribute 1 + if(ispresent(v_responsePrimitive.primitiveContent)) { + if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) { + if(v_responsePrimitive.primitiveContent.timeSeries.missingDataDetectTimer != v_missingDataDetectTimer_2){ + setverdict(fail, __SCOPE__ & ": Error: MissingDataDetectTimer attribute not updated correctly") + } + } + } + } + } + + testcase TC_CSE_DMR_UPD_014_TS_OR() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var XSD.AnyURI v_ontologyRef_1 := "MyOntologyRef_1"; + var XSD.AnyURI v_ontologyRef_2 := "MyOntologyRef_2"; + var ResponsePrimitive v_responsePrimitive; + + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase; + + v_createRequest.primitiveContent.timeSeries.ontologyRef := v_ontologyRef_1; + v_updateRequest.primitiveContent.timeSeries.ontologyRef := v_ontologyRef_2; + + v_ae1.start(f_CSE_DMR_UPD_014(int29, v_createRequest, v_updateRequest));//TimeSeries + v_ae1.done; + + if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1); + //Check attribute 1 + if(ispresent(v_responsePrimitive.primitiveContent)) { + if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) { + if(v_responsePrimitive.primitiveContent.timeSeries.ontologyRef != v_ontologyRef_2){ + setverdict(fail, __SCOPE__ & ": Error: OntologyRef attribute not updated correctly") + } + } + } + } + } } // end g_CSE_DMR_UPD_014 @@ -4420,206 +5642,524 @@ module OneM2M_Testcases_CSE_Release_2 { } } } - - testcase TC_CSE_DMR_UPD_015_SUB_BN() runs on Tester system CseSystem { + + testcase TC_CSE_DMR_UPD_015_SUB_BN() runs on Tester system CseSystem { + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var BatchNotify v_batchNotify:= {1, "PT1S"}; + var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; + var ResponsePrimitive v_responsePrimitive; + var PrimitiveContent v_primitiveContentRetrieveResource; + + v_updateRequest.primitiveContent.subscription.batchNotify:=v_batchNotify; + v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription + v_ae1.done; + + + + if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1); + //Check attribute 1 + if(ispresent(v_responsePrimitive.primitiveContent)) { + if(ischosen(v_responsePrimitive.primitiveContent.subscription)) { + if(v_responsePrimitive.primitiveContent.subscription.batchNotify != v_batchNotify){ + setverdict(fail, __SCOPE__, ": Error: Batch Notify attribute not updated correctly") + } + } + } + v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1); + + //Check that the resource has been udpated correctly + if(ischosen(v_primitiveContentRetrieveResource.subscription)) { + if(v_primitiveContentRetrieveResource.subscription.batchNotify != v_batchNotify){ + setverdict(fail, __SCOPE__ & ": Error: Batch Notify attribute not updated correctly") + } + } + } + } + + testcase TC_CSE_DMR_UPD_015_SUB_RL() runs on Tester system CseSystem { + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var RateLimit v_rateLimit:= {2, "PT1S"}; + var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; + var ResponsePrimitive v_responsePrimitive; + var PrimitiveContent v_primitiveContentRetrieveResource; + + v_updateRequest.primitiveContent.subscription.rateLimit:=v_rateLimit; + v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription + v_ae1.done; + + + + if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1); + //Check attribute 1 + if(ispresent(v_responsePrimitive.primitiveContent)) { + if(ischosen(v_responsePrimitive.primitiveContent.subscription)) { + if(v_responsePrimitive.primitiveContent.subscription.rateLimit != v_rateLimit){ + setverdict(fail, __SCOPE__, ": Error: Rate Limit attribute not updated correctly") + } + } + } + v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1); + + //Check that the resource has been udpated correctly + if(ischosen(v_primitiveContentRetrieveResource.subscription)) { + if(v_primitiveContentRetrieveResource.subscription.rateLimit != v_rateLimit){ + setverdict(fail, __SCOPE__ & ": Error: Rate Limit attribute not updated correctly") + } + } + } + } + + testcase TC_CSE_DMR_UPD_015_SUB_PN() runs on Tester system CseSystem { + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var PendingNotification v_pendingNotification:=int2; + var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; + var ResponsePrimitive v_responsePrimitive; + var PrimitiveContent v_primitiveContentRetrieveResource; + + v_updateRequest.primitiveContent.subscription.pendingNotification:=v_pendingNotification; + v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription + v_ae1.done; + + + + if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1); + //Check attribute 1 + if(ispresent(v_responsePrimitive.primitiveContent)) { + if(ischosen(v_responsePrimitive.primitiveContent.subscription)) { + if(v_responsePrimitive.primitiveContent.subscription.pendingNotification != v_pendingNotification){ + setverdict(fail, __SCOPE__, ": Error: Pending Notification attribute not updated correctly") + } + } + } + v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1); + + //Check that the resource has been udpated correctly + if(ischosen(v_primitiveContentRetrieveResource.subscription)) { + if(v_primitiveContentRetrieveResource.subscription.pendingNotification != v_pendingNotification){ + setverdict(fail, __SCOPE__ & ": Error: Pending Notification attribute not updated correctly") + } + } + } + } + + testcase TC_CSE_DMR_UPD_015_SUB_NSP() runs on Tester system CseSystem { + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var XSD.PositiveInteger v_notificationStoragePriority:=10; + var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; + var ResponsePrimitive v_responsePrimitive; + var PrimitiveContent v_primitiveContentRetrieveResource; + + v_updateRequest.primitiveContent.subscription.notificationStoragePriority:=v_notificationStoragePriority; + v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription + v_ae1.done; + + + + if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1); + //Check attribute 1 + if(ispresent(v_responsePrimitive.primitiveContent)) { + if(ischosen(v_responsePrimitive.primitiveContent.subscription)) { + if(v_responsePrimitive.primitiveContent.subscription.notificationStoragePriority != v_notificationStoragePriority){ + setverdict(fail, __SCOPE__, ": Error: Notification Storage priority attribute not updated correctly") + } + } + } + v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1); + + //Check that the resource has been udpated correctly + if(ischosen(v_primitiveContentRetrieveResource.subscription)) { + if(v_primitiveContentRetrieveResource.subscription.notificationStoragePriority != v_notificationStoragePriority){ + setverdict(fail, __SCOPE__ & ": Error: Notification Storage priority attribute not updated correctly") + } + } + } + } + + testcase TC_CSE_DMR_UPD_015_SUB_LN() runs on Tester system CseSystem { + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var XSD.Boolean v_latestNotify:=true; + var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; + var ResponsePrimitive v_responsePrimitive; + var PrimitiveContent v_primitiveContentRetrieveResource; + + v_updateRequest.primitiveContent.subscription.latestNotify:=v_latestNotify; + v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription + v_ae1.done; + + + + if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1); + //Check attribute 1 + if(ispresent(v_responsePrimitive.primitiveContent)) { + if(ischosen(v_responsePrimitive.primitiveContent.subscription)) { + if(v_responsePrimitive.primitiveContent.subscription.latestNotify != v_latestNotify){ + setverdict(fail, __SCOPE__, ": Error: Latest Notify priority attribute not updated correctly") + } + } + } + v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1); + + //Check that the resource has been udpated correctly + if(ischosen(v_primitiveContentRetrieveResource.subscription)) { + if(v_primitiveContentRetrieveResource.subscription.latestNotify != v_latestNotify){ + setverdict(fail, __SCOPE__ & ": Error: Latest Notify attribute not updated correctly") + } + } + } + } + + testcase TC_CSE_DMR_UPD_015_SUB_NEC() runs on Tester system CseSystem { + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var EventCat v_eventCat:= {alt_1:= 300}; + var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; + var ResponsePrimitive v_responsePrimitive; + var PrimitiveContent v_primitiveContentRetrieveResource; + + v_updateRequest.primitiveContent.subscription.notificationEventCat:=v_eventCat; + v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription + v_ae1.done; + + if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1); + //Check attribute 1 + if(ispresent(v_responsePrimitive.primitiveContent)) { + if(ischosen(v_responsePrimitive.primitiveContent.subscription)) { + if(v_responsePrimitive.primitiveContent.subscription.notificationEventCat != v_eventCat){ + setverdict(fail, __SCOPE__, ": Error: Notification Event Cat attribute not updated correctly") + } + } + } + v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1); + + //Check that the resource has been udpated correctly + if(ischosen(v_primitiveContentRetrieveResource.subscription)) { + if(v_primitiveContentRetrieveResource.subscription.notificationEventCat != v_eventCat){ + setverdict(fail, __SCOPE__ & ": Error: Notification Event Cat attribute not updated correctly") + } + } + } + } + + testcase TC_CSE_DMR_UPD_015_TS_ACPI() runs on Tester system CseSystem { + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase; + var RequestPrimitive v_updateRequestPrimitive; + var ResponsePrimitive v_responsePrimitive; + var PrimitiveContent v_primitiveContentRetrieveResource; + + v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest, true));//TimeSeries + v_ae1.done; + + if(getverdict == pass){ + v_responsePrimitive := f_getResponsePrimitive(v_ae1); + v_updateRequestPrimitive := f_getRequestPrimitive(v_ae1); + //Check attribute 1 + if(ispresent(v_responsePrimitive.primitiveContent)) { + if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) { + if(v_responsePrimitive.primitiveContent.timeSeries.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.timeSeries.accessControlPolicyIDs)){ + setverdict(fail, __SCOPE__, ": Error: Access Control Policy IDs attribute not updated correctly") + } + } + } + v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1); + + //Check that the resource has been udpated correctly + if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) { + if(v_primitiveContentRetrieveResource.timeSeries.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.timeSeries.accessControlPolicyIDs)){ + setverdict(fail, __SCOPE__ & ": Error: Access Control Policy IDs attribute not updated correctly") + } + } + } + } + + testcase TC_CSE_DMR_UPD_015_TS_LBL() runs on Tester system CseSystem { + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var Labels v_labels := {"MyLabel"}; + var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase; + var ResponsePrimitive v_responsePrimitive; + var PrimitiveContent v_primitiveContentRetrieveResource; + + v_updateRequest.primitiveContent.timeSeries.labels := v_labels; + + v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries + v_ae1.done; + + if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1); + //Check attribute 1 + if(ispresent(v_responsePrimitive.primitiveContent)) { + if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) { + if(v_responsePrimitive.primitiveContent.timeSeries.labels != v_labels){ + setverdict(fail, __SCOPE__, ": Error: Labels attribute not updated correctly") + } + } + } + v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1); + + //Check that the resource has been udpated correctly + if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) { + if(v_primitiveContentRetrieveResource.timeSeries.labels != v_labels){ + setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly") + } + } + } + } + + testcase TC_CSE_DMR_UPD_015_TS_MNI() runs on Tester system CseSystem { + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var XSD.NonNegativeInteger v_maxNrOfInstances := 5; + var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase; + var ResponsePrimitive v_responsePrimitive; + var PrimitiveContent v_primitiveContentRetrieveResource; + + v_updateRequest.primitiveContent.timeSeries.maxNrOfInstances := v_maxNrOfInstances; + + v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries + v_ae1.done; + + if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1); + //Check attribute 1 + if(ispresent(v_responsePrimitive.primitiveContent)) { + if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) { + if(v_responsePrimitive.primitiveContent.timeSeries.maxNrOfInstances != v_maxNrOfInstances){ + setverdict(fail, __SCOPE__, ": Error: Maximum number of instances attribute not updated correctly") + } + } + } + v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1); + + //Check that the resource has been udpated correctly + if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) { + if(v_primitiveContentRetrieveResource.timeSeries.maxNrOfInstances != v_maxNrOfInstances){ + setverdict(fail, __SCOPE__ & ": Error: Maximum number of instances attribute not updated correctly") + } + } + } + } + + testcase TC_CSE_DMR_UPD_015_TS_MBS() runs on Tester system CseSystem { + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var XSD.NonNegativeInteger v_maxByteSize := 512; + var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase; + var ResponsePrimitive v_responsePrimitive; + var PrimitiveContent v_primitiveContentRetrieveResource; + + v_updateRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize; + + v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries + v_ae1.done; + + if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1); + //Check attribute 1 + if(ispresent(v_responsePrimitive.primitiveContent)) { + if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) { + if(v_responsePrimitive.primitiveContent.timeSeries.maxByteSize != v_maxByteSize){ + setverdict(fail, __SCOPE__, ": Error: Maximum Byte size attribute not updated correctly") + } + } + } + v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1); + + //Check that the resource has been udpated correctly + if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) { + if(v_primitiveContentRetrieveResource.timeSeries.maxByteSize != v_maxByteSize){ + setverdict(fail, __SCOPE__ & ": Error: Maximum Byte Size attribute not updated correctly") + } + } + } + } + + testcase TC_CSE_DMR_UPD_015_TS_MIA() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; - var BatchNotify v_batchNotify:= {1, "PT1S"}; - var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; + var XSD.NonNegativeInteger v_maxInstanceAge := 1; + var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - - v_updateRequest.primitiveContent.subscription.batchNotify:=v_batchNotify; - v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription - v_ae1.done; - - + + v_updateRequest.primitiveContent.timeSeries.maxInstanceAge := v_maxInstanceAge; + + v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries + v_ae1.done; if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1); //Check attribute 1 if(ispresent(v_responsePrimitive.primitiveContent)) { - if(ischosen(v_responsePrimitive.primitiveContent.subscription)) { - if(v_responsePrimitive.primitiveContent.subscription.batchNotify != v_batchNotify){ - setverdict(fail, __SCOPE__, ": Error: Batch Notify attribute not updated correctly") + if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) { + if(v_responsePrimitive.primitiveContent.timeSeries.maxInstanceAge != v_maxInstanceAge){ + setverdict(fail, __SCOPE__, ": Error: Maximum Instance Age attribute not updated correctly") } } } v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1); - //Check that the resource has been udpated correctly - if(ischosen(v_primitiveContentRetrieveResource.subscription)) { - if(v_primitiveContentRetrieveResource.subscription.batchNotify != v_batchNotify){ - setverdict(fail, __SCOPE__ & ": Error: Batch Notify attribute not updated correctly") + //Check that the resource has been udpated correctly + if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) { + if(v_primitiveContentRetrieveResource.timeSeries.maxInstanceAge != v_maxInstanceAge){ + setverdict(fail, __SCOPE__ & ": Error: Maximum Instance Age attribute not updated correctly") } } } } - testcase TC_CSE_DMR_UPD_015_SUB_RL() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_015_TS_PEI() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; - var RateLimit v_rateLimit:= {2, "PT1S"}; - var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; + var XSD.NonNegativeInteger v_periodicInterval := 1; + var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - - v_updateRequest.primitiveContent.subscription.rateLimit:=v_rateLimit; - v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription - v_ae1.done; - - + + v_updateRequest.primitiveContent.timeSeries.periodicInterval := v_periodicInterval; + + v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries + v_ae1.done; if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1); //Check attribute 1 if(ispresent(v_responsePrimitive.primitiveContent)) { - if(ischosen(v_responsePrimitive.primitiveContent.subscription)) { - if(v_responsePrimitive.primitiveContent.subscription.rateLimit != v_rateLimit){ - setverdict(fail, __SCOPE__, ": Error: Rate Limit attribute not updated correctly") + if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) { + if(v_responsePrimitive.primitiveContent.timeSeries.periodicInterval != v_periodicInterval){ + setverdict(fail, __SCOPE__, ": Error: Periodic Interval attribute not updated correctly") } } } v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1); - - //Check that the resource has been udpated correctly - if(ischosen(v_primitiveContentRetrieveResource.subscription)) { - if(v_primitiveContentRetrieveResource.subscription.rateLimit != v_rateLimit){ - setverdict(fail, __SCOPE__ & ": Error: Rate Limit attribute not updated correctly") + + //Check that the resource has been udpated correctly + if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) { + if(v_primitiveContentRetrieveResource.timeSeries.periodicInterval != v_periodicInterval){ + setverdict(fail, __SCOPE__ & ": Error: Periodic Interval attribute not updated correctly") } } } } - testcase TC_CSE_DMR_UPD_015_SUB_PN() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_015_TS_MDD() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; - var PendingNotification v_pendingNotification:=int2; - var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; + var XSD.Boolean v_missingDataDetect := true; + var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - - v_updateRequest.primitiveContent.subscription.pendingNotification:=v_pendingNotification; - v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription - v_ae1.done; - - + + v_updateRequest.primitiveContent.timeSeries.missingDataDetect := v_missingDataDetect; + + v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries + v_ae1.done; if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1); //Check attribute 1 if(ispresent(v_responsePrimitive.primitiveContent)) { - if(ischosen(v_responsePrimitive.primitiveContent.subscription)) { - if(v_responsePrimitive.primitiveContent.subscription.pendingNotification != v_pendingNotification){ - setverdict(fail, __SCOPE__, ": Error: Pending Notification attribute not updated correctly") + if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) { + if(v_responsePrimitive.primitiveContent.timeSeries.missingDataDetect != v_missingDataDetect){ + setverdict(fail, __SCOPE__, ": Error: MissingDataDetect attribute not updated correctly") } } } v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1); - //Check that the resource has been udpated correctly - if(ischosen(v_primitiveContentRetrieveResource.subscription)) { - if(v_primitiveContentRetrieveResource.subscription.pendingNotification != v_pendingNotification){ - setverdict(fail, __SCOPE__ & ": Error: Pending Notification attribute not updated correctly") + //Check that the resource has been udpated correctly + if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) { + if(v_primitiveContentRetrieveResource.timeSeries.missingDataDetect != v_missingDataDetect){ + setverdict(fail, __SCOPE__ & ": Error: MissingDataDetect attribute not updated correctly") } } } } - testcase TC_CSE_DMR_UPD_015_SUB_NSP() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_015_TS_MDN() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; - var XSD.PositiveInteger v_notificationStoragePriority:=10; - var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; + var XSD.NonNegativeInteger v_missingDataMaxNr := 1; + var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - - v_updateRequest.primitiveContent.subscription.notificationStoragePriority:=v_notificationStoragePriority; - v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription - v_ae1.done; - - + + v_updateRequest.primitiveContent.timeSeries.missingDataMaxNr := v_missingDataMaxNr; + + v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries + v_ae1.done; if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1); //Check attribute 1 if(ispresent(v_responsePrimitive.primitiveContent)) { - if(ischosen(v_responsePrimitive.primitiveContent.subscription)) { - if(v_responsePrimitive.primitiveContent.subscription.notificationStoragePriority != v_notificationStoragePriority){ - setverdict(fail, __SCOPE__, ": Error: Notification Storage priority attribute not updated correctly") + if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) { + if(v_responsePrimitive.primitiveContent.timeSeries.missingDataMaxNr != v_missingDataMaxNr){ + setverdict(fail, __SCOPE__, ": Error: MissingDataMaxNr attribute not updated correctly") } } } v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1); - - //Check that the resource has been udpated correctly - if(ischosen(v_primitiveContentRetrieveResource.subscription)) { - if(v_primitiveContentRetrieveResource.subscription.notificationStoragePriority != v_notificationStoragePriority){ - setverdict(fail, __SCOPE__ & ": Error: Notification Storage priority attribute not updated correctly") + + //Check that the resource has been udpated correctly + if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) { + if(v_primitiveContentRetrieveResource.timeSeries.missingDataMaxNr != v_missingDataMaxNr){ + setverdict(fail, __SCOPE__ & ": Error: MissingDataMaxNr attribute not updated correctly") } } } } - testcase TC_CSE_DMR_UPD_015_SUB_LN() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_015_TS_MDT() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; - var XSD.Boolean v_latestNotify:=true; - var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; + var XSD.NonNegativeInteger v_missingDataDetectTimer := 1; + var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - - v_updateRequest.primitiveContent.subscription.latestNotify:=v_latestNotify; - v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription - v_ae1.done; - - + + v_updateRequest.primitiveContent.timeSeries.missingDataDetectTimer := v_missingDataDetectTimer; + + v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries + v_ae1.done; if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1); //Check attribute 1 if(ispresent(v_responsePrimitive.primitiveContent)) { - if(ischosen(v_responsePrimitive.primitiveContent.subscription)) { - if(v_responsePrimitive.primitiveContent.subscription.latestNotify != v_latestNotify){ - setverdict(fail, __SCOPE__, ": Error: Latest Notify priority attribute not updated correctly") + if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) { + if(v_responsePrimitive.primitiveContent.timeSeries.missingDataDetectTimer != v_missingDataDetectTimer){ + setverdict(fail, __SCOPE__, ": Error: MissingDataDetectTimer attribute not updated correctly") } } } v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1); - - //Check that the resource has been udpated correctly - if(ischosen(v_primitiveContentRetrieveResource.subscription)) { - if(v_primitiveContentRetrieveResource.subscription.latestNotify != v_latestNotify){ - setverdict(fail, __SCOPE__ & ": Error: Latest Notify attribute not updated correctly") + + //Check that the resource has been udpated correctly + if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) { + if(v_primitiveContentRetrieveResource.timeSeries.missingDataDetectTimer != v_missingDataDetectTimer){ + setverdict(fail, __SCOPE__ & ": Error: MissingDataDetectTimer attribute not updated correctly") } } } } - testcase TC_CSE_DMR_UPD_015_SUB_NEC() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_015_TS_OR() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; - var EventCat v_eventCat:= {alt_1:= 300}; - var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; + var XSD.AnyURI v_ontoLogyRef := "MyOntologyRef"; + var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - - v_updateRequest.primitiveContent.subscription.notificationEventCat:=v_eventCat; - v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription - v_ae1.done; - - + + v_updateRequest.primitiveContent.timeSeries.ontologyRef := v_ontoLogyRef; + + v_ae1.start(f_CSE_DMR_UPD_015(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries + v_ae1.done; if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1); //Check attribute 1 if(ispresent(v_responsePrimitive.primitiveContent)) { - if(ischosen(v_responsePrimitive.primitiveContent.subscription)) { - if(v_responsePrimitive.primitiveContent.subscription.notificationEventCat != v_eventCat){ - setverdict(fail, __SCOPE__, ": Error: Notification Event Cat attribute not updated correctly") + if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) { + if(v_responsePrimitive.primitiveContent.timeSeries.ontologyRef != v_ontoLogyRef){ + setverdict(fail, __SCOPE__, ": Error: Ontology Ref attribute not updated correctly") } } } v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1); - - //Check that the resource has been udpated correctly - if(ischosen(v_primitiveContentRetrieveResource.subscription)) { - if(v_primitiveContentRetrieveResource.subscription.notificationEventCat != v_eventCat){ - setverdict(fail, __SCOPE__ & ": Error: Notification Event Cat attribute not updated correctly") + + //Check that the resource has been udpated correctly + if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) { + if(v_primitiveContentRetrieveResource.timeSeries.ontologyRef != v_ontoLogyRef){ + setverdict(fail, __SCOPE__ & ": Error: Ontology Ref attribute not updated correctly") } } } } - } // end group g_CSE_DMR_UPD_017 + } // end group g_CSE_DMR_UPD_015 group g_CSE_DMR_UPD_016 { @@ -4694,6 +6234,38 @@ module OneM2M_Testcases_CSE_Release_2 { } } + testcase TC_CSE_DMR_UPD_016_TS_ET() runs on Tester system CseSystem { + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var Timestamp v_expirationTime := "21001231T012345"; + var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase; + var ResponsePrimitive v_responsePrimitive; + var PrimitiveContent v_primitiveContentRetrieveResource; + + v_updateRequest.primitiveContent.timeSeries.expirationTime := v_expirationTime; + + v_ae1.start(f_CSE_DMR_UPD_016(int29, m_createTimeSeriesBase, v_updateRequest));//TimeSeries + v_ae1.done; + + if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1); + //Check attribute 1 + if(ispresent(v_responsePrimitive.primitiveContent)) { + if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) { + if(v_responsePrimitive.primitiveContent.timeSeries.expirationTime != v_expirationTime){ + setverdict(fail, __SCOPE__, ": Error: Expiration time attribute not updated correctly") + } + } + } + v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1); + + //Check that the resource has been udpated correctly + if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) { + if(v_primitiveContentRetrieveResource.timeSeries.expirationTime != v_expirationTime){ + setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute not updated correctly") + } + } + } + } + } // end group g_CSE_DMR_UPD_016 }//end group Update @@ -4721,6 +6293,22 @@ module OneM2M_Testcases_CSE_Release_2 { v_ae1.start(f_CSE_DMR_DEL_001(int15, m_createPollingChannelBase));//PollingChannel v_ae1.done; }; + + testcase TC_CSE_DMR_DEL_001_TS() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + + v_ae1.start(f_CSE_DMR_DEL_001(int29, m_createTimeSeriesBase));//TimeSeries + v_ae1.done; + }; + + testcase TC_CSE_DMR_DEL_001_TSI() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + + v_ae1.start(f_CSE_DMR_DEL_001(int30, m_createTimeSeriesInstanceBase));//TimeSeriesInstance + v_ae1.done; + }; };//end of group g_CSE_DMR_DEL_001 @@ -4745,6 +6333,14 @@ module OneM2M_Testcases_CSE_Release_2 { v_ae1.start(f_CSE_DMR_DEL_002(int15, m_createPollingChannelBase));//PollingChannel v_ae1.done; }; + + testcase TC_CSE_DMR_DEL_002_TS() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + + v_ae1.start(f_CSE_DMR_DEL_002(int29, m_createTimeSeriesBase));//TimeSeries + v_ae1.done; + }; };//end of group g_CSE_DMR_DEL_002 @@ -4870,6 +6466,14 @@ module OneM2M_Testcases_CSE_Release_2 { v_ae1.start(f_CSE_DMR_DEL_004(int23, m_createSubscriptionBase, int18, m_createScheduleBase));//Subscription v_ae1.done; }; + + testcase TC_CSE_DMR_DEL_004_TS() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + + v_ae1.start(f_CSE_DMR_DEL_004(int29, m_createTimeSeriesBase, int23, m_createSubscriptionBase));//TimeSeries + v_ae1.done; + }; };//end of group g_CSE_DMR_DEL_004 @@ -7181,6 +8785,42 @@ module OneM2M_Testcases_CSE_Release_2 { v_ae1.start(f_CSE_ANNC_001(int4, v_createRequestAnnc, v_createRequest, omit));//ContentInstance v_ae1.done; } + + testcase TC_CSE_ANNC_001_TS_UPD() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase; + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase; + + v_updateRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID}; + + v_ae1.start(f_CSE_ANNC_001(int29, v_createRequestAnnc, omit, v_updateRequest));//TimeSeries + v_ae1.done; + } + + testcase TC_CSE_ANNC_001_TS_CRE() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase; + + v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID}; + + v_ae1.start(f_CSE_ANNC_001(int29, v_createRequestAnnc, v_createRequest, omit));//TimeSeries + v_ae1.done; + } + + testcase TC_CSE_ANNC_001_TSI_CRE() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase; + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase; + + v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {PX_CSE1_ID}; + + v_ae1.start(f_CSE_ANNC_001(int30, v_createRequestAnnc, v_createRequest, omit));//TimeSeriesInstance + v_ae1.done; + } }// end group g_CSE_ANNC_001 @@ -7241,6 +8881,18 @@ module OneM2M_Testcases_CSE_Release_2 { v_cse1.start(f_CSE_ANNC_CRE_002(int9, v_createRequestAnnc, v_updateRequest));//Group v_cse1.done; } + + testcase TC_CSE_ANNC_CRE_002_TS() runs on Tester system CseSystem { + // Local variables + var CseSimu v_cse1 := CseSimu.create("CSE1") alive; + var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase; + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase; + + v_updateRequest.primitiveContent.timeSeries.announceTo := {f_getAnnouncementTargetPoA()}; + + v_cse1.start(f_CSE_ANNC_CRE_002(int29, v_createRequestAnnc, v_updateRequest));//TimeSeries + v_cse1.done; + } } //end group g_CSE_ANNC_CRE_002 group g_CSE_ANNC_CRE_003 { @@ -7310,6 +8962,18 @@ module OneM2M_Testcases_CSE_Release_2 { v_cse1.done; } + testcase TC_CSE_ANNC_CRE_004_TS() runs on Tester system CseSystem { + // Local variables + var CseSimu v_cse1 := CseSimu.create("CSE1") alive; + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase; + + v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID}; + + v_cse1.start(f_CSE_ANNC_CRE_004_CseSimu(int29, v_createRequestAnnc, v_createRequest));//TimeSeries + v_cse1.done; + } + }// end group g_CSE_ANNC_CRE_004 group g_CSE_ANNC_CRE_005 { @@ -7363,6 +9027,30 @@ module OneM2M_Testcases_CSE_Release_2 { v_cse1.done; } + testcase TC_CSE_ANNC_CRE_005_TS() runs on Tester system CseSystem { + //Local variables + var CseSimu v_cse1 := CseSimu.create("CSE1") alive; + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase; + + v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID}; + + v_cse1.start(f_CSE_ANNC_CRE_005_CseSimu(int29, v_createRequestAnnc, v_createRequest));//TimeSeries + v_cse1.done; + } + + testcase TC_CSE_ANNC_CRE_005_TSI() runs on Tester system CseSystem { + //Local variables + var CseSimu v_cse1 := CseSimu.create("CSE1") alive; + var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase; + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase; + + v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {PX_CSE1_ID}; + + v_cse1.start(f_CSE_ANNC_CRE_005_CseSimu(int30, v_createRequestAnnc, v_createRequest));//TimeSeriesInstance + v_cse1.done; + } + } //end group g_CSE_ANNC_CRE_005 group g_CSE_ANNC_CRE_006 { @@ -7415,6 +9103,30 @@ module OneM2M_Testcases_CSE_Release_2 { v_cse1.start(f_CSE_ANNC_CRE_006_CseSimu(int9, v_createRequestAnnc, v_createRequest));//Group v_cse1.done; } + + testcase TC_CSE_ANNC_CRE_006_TS() runs on Tester system CseSystem { + //Local variables + var CseSimu v_cse1 := CseSimu.create("CSE1") alive; + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase; + + v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID}; + + v_cse1.start(f_CSE_ANNC_CRE_006_CseSimu(int29, v_createRequestAnnc, v_createRequest));//TimeSeries + v_cse1.done; + } + + testcase TC_CSE_ANNC_CRE_006_TSI() runs on Tester system CseSystem { + //Local variables + var CseSimu v_cse1 := CseSimu.create("CSE1") alive; + var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase; + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase; + + v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {PX_CSE1_ID}; + + v_cse1.start(f_CSE_ANNC_CRE_006_CseSimu(int30, v_createRequestAnnc, v_createRequest));//TimeSeriesInstance + v_cse1.done; + } } //end group g_CSE_ANNC_CRE_006 @@ -7456,16 +9168,40 @@ module OneM2M_Testcases_CSE_Release_2 { v_cse1.done; } - - testcase TC_CSE_ANNC_CRE_007_GRP() runs on Tester system CseSystem { + + testcase TC_CSE_ANNC_CRE_007_GRP() runs on Tester system CseSystem { + //Local variables + var CseSimu v_cse1 := CseSimu.create("CSE1") alive; + var template RequestPrimitive v_createRequest := m_createGroupBase; + var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase; + + v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID}; + + v_cse1.start(f_CSE_ANNC_CRE_007_CseSimu(int9, v_createRequestAnnc, v_createRequest));//Group + v_cse1.done; + } + + testcase TC_CSE_ANNC_CRE_007_TS() runs on Tester system CseSystem { + //Local variables + var CseSimu v_cse1 := CseSimu.create("CSE1") alive; + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase; + + v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID}; + + v_cse1.start(f_CSE_ANNC_CRE_007_CseSimu(int29, v_createRequestAnnc, v_createRequest));//TimeSeries + v_cse1.done; + } + + testcase TC_CSE_ANNC_CRE_007_TSI() runs on Tester system CseSystem { //Local variables var CseSimu v_cse1 := CseSimu.create("CSE1") alive; - var template RequestPrimitive v_createRequest := m_createGroupBase; - var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase; - - v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID}; - - v_cse1.start(f_CSE_ANNC_CRE_007_CseSimu(int9, v_createRequestAnnc, v_createRequest));//Group + var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase; + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase; + + v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {PX_CSE1_ID}; + + v_cse1.start(f_CSE_ANNC_CRE_007_CseSimu(int30, v_createRequestAnnc, v_createRequest));//TimeSeriesInstance v_cse1.done; } @@ -7525,6 +9261,32 @@ module OneM2M_Testcases_CSE_Release_2 { v_cse1.start(f_CSE_ANNC_CRE_008_CseSimu(int9, v_createRequestAnnc, v_createRequest));//Group v_cse1.done; } + + testcase TC_CSE_ANNC_CRE_008_TS_MBS() runs on Tester system CseSystem { + //Local variables + var CseSimu v_cse1 := CseSimu.create("CSE1") alive; + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase; + + v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID}; + v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"maxByteSize"}; + + v_cse1.start(f_CSE_ANNC_CRE_008_CseSimu(int29, v_createRequestAnnc, v_createRequest));//TimeSeries + v_cse1.done; + } + + testcase TC_CSE_ANNC_CRE_008_TSI_CS() runs on Tester system CseSystem { + //Local variables + var CseSimu v_cse1 := CseSimu.create("CSE1") alive; + var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase; + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase; + + v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {PX_CSE1_ID}; + v_createRequest.primitiveContent.timeSeriesInstance.announcedAttribute := {"contentSize"}; + + v_cse1.start(f_CSE_ANNC_CRE_008_CseSimu(int30, v_createRequestAnnc, v_createRequest));//TimeSeriesInstance + v_cse1.done; + } } //end group g_CSE_ANNC_CRE_008 @@ -7589,6 +9351,26 @@ module OneM2M_Testcases_CSE_Release_2 { v_ae1.done; } + testcase TC_CSE_ANNC_RET_001_TS() runs on Tester system CseSystem { + //Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase; + + v_ae1.start(f_CSE_ANNC_RET_001(int29, v_createRequestAnnc, v_createRequest));//TimeSeries + v_ae1.done; + } + + testcase TC_CSE_ANNC_RET_001_TSI() runs on Tester system CseSystem { + //Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase; + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase; + + v_ae1.start(f_CSE_ANNC_RET_001(int30, v_createRequestAnnc, v_createRequest));//TimeSeriesInstance + v_ae1.done; + } + } //end group g_CSE_ANNC_RET_001 group g_CSE_ANNC_RET_002 { @@ -7633,6 +9415,26 @@ module OneM2M_Testcases_CSE_Release_2 { v_ae1.done; } + testcase TC_CSE_ANNC_RET_002_TS() runs on Tester system CseSystem { + //Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase; + + v_ae1.start(f_CSE_ANNC_RET_002(int29, v_createRequestAnnc, v_createRequest));//TimeSeries + v_ae1.done; + } + + testcase TC_CSE_ANNC_RET_002_TSI() runs on Tester system CseSystem { + //Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase; + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase; + + v_ae1.start(f_CSE_ANNC_RET_002(int30, v_createRequestAnnc, v_createRequest));//TimeSeriesInstance + v_ae1.done; + } + } //end group g_CSE_ANNC_RET_002 } //end group Retrieve @@ -7679,6 +9481,19 @@ module OneM2M_Testcases_CSE_Release_2 { v_cse1.start(f_CSE_ANNC_UPD_001(int9, v_createRequest, v_createRequestAnnc, v_updateRequest));//Group v_cse1.done; } + + testcase TC_CSE_ANNC_UPD_001_TS() runs on Tester system CseSystem { + // Local variables + var CseSimu v_cse1 := CseSimu.create("CSE1") alive; + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase; + var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase; + + v_updateRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID}; + + v_cse1.start(f_CSE_ANNC_UPD_001(int29, v_createRequest, v_createRequestAnnc, v_updateRequest));//TimeSeries + v_cse1.done; + } }// end group g_CSE_ANNC_UPD_001 @@ -7737,6 +9552,24 @@ module OneM2M_Testcases_CSE_Release_2 { v_cse1.start(f_CSE_ANNC_UPD_002(int9, v_createRequest, v_createRequestAnnc, v_updateRequest, v_nullFields));//Group v_cse1.done; } + + testcase TC_CSE_ANNC_UPD_002_TS() runs on Tester system CseSystem { + // Local variables + var CseSimu v_cse1 := CseSimu.create("CSE1") alive; + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase; + var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase; + var AttributeAux_list v_nullFields; + var ListOfURIs v_announceTo := {"To be deleted"}; + + v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID}; + + v_updateRequest.primitiveContent.timeSeries.announceTo := v_announceTo; + v_nullFields := {{"announceTo", omit}}; + + v_cse1.start(f_CSE_ANNC_UPD_002(int29, v_createRequest, v_createRequestAnnc, v_updateRequest, v_nullFields));//TimeSeries + v_cse1.done; + } }// end group g_CSE_ANNC_UPD_002 @@ -7863,6 +9696,46 @@ module OneM2M_Testcases_CSE_Release_2 { } } } + + testcase TC_CSE_ANNC_UPD_003_TS() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase; + var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase; + var ResponsePrimitive v_responsePrimitive; + var AttributeAux_list v_nullFields; + var ListOfURIs v_announceTo := {"To be deleted"}; + var PrimitiveContent v_primitiveContentRetrieveResource; + + v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID}; + + v_updateRequest.primitiveContent.timeSeries.announceTo := v_announceTo; + v_nullFields := {{"announceTo", omit}}; + + v_ae1.start(f_CSE_ANNC_UPD_003(int29, v_createRequestAnnc, v_createRequest, v_updateRequest, v_nullFields));//TimeSeries + v_ae1.done; + + if(getverdict == pass){ + v_responsePrimitive := f_getResponsePrimitive(v_ae1); + if(ispresent(v_responsePrimitive.primitiveContent)) { + if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) { + if(ispresent(v_responsePrimitive.primitiveContent.timeSeries.announceTo)){ + setverdict(fail, __SCOPE__ & ": Error: announceTo attribute is not set to NULL"); + } + } + } + + v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1); + + //Check that the resource has been udpated correctly + if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) { + if(ispresent(v_primitiveContentRetrieveResource.timeSeries.announceTo)){ + setverdict(fail, __SCOPE__ & ": Error: announceTo attribute not updated correctly"); + } + } + } + } }// end group g_CSE_ANNC_UPD_003 @@ -7912,6 +9785,21 @@ module OneM2M_Testcases_CSE_Release_2 { v_cse1.start(f_CSE_ANNC_UPD_004(int9, v_createRequest, v_createRequestAnnc, v_updateRequest));//Group v_cse1.done; } + + testcase TC_CSE_ANNC_UPD_004_TS() runs on Tester system CseSystem { + // Local variables + var CseSimu v_cse1 := CseSimu.create("CSE1") alive; + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase; + var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase; + + v_updateRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID}; + v_updateRequest.primitiveContent.timeSeries.announcedAttribute := {"ToBeDeleted"}; + v_updateRequest.primitiveContent.timeSeries.parentID := PX_CSE1_ID; + + v_cse1.start(f_CSE_ANNC_UPD_004(int29, v_createRequest, v_createRequestAnnc, v_updateRequest));//TimeSeries + v_cse1.done; + } } // end group g_CSE_ANNC_UPD_004 group g_CSE_ANNC_UPD_005 { @@ -7992,6 +9880,19 @@ module OneM2M_Testcases_CSE_Release_2 { v_cse1.start(f_CSE_ANNC_UPD_006(int9, v_createRequest, v_createRequestAnnc, v_updateRequest));//Group v_cse1.done; } + + testcase TC_CSE_ANNC_UPD_006_TS() runs on Tester system CseSystem { + //Local variables + var CseSimu v_cse1 := CseSimu.create("CSE1") alive; + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase; + var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase; + + v_updateRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID}; + + v_cse1.start(f_CSE_ANNC_UPD_006(int29, v_createRequest, v_createRequestAnnc, v_updateRequest));//TimeSeries + v_cse1.done; + } }// end group g_CSE_ANNC_UPD_006 group g_CSE_ANNC_UPD_007 { @@ -8034,6 +9935,19 @@ module OneM2M_Testcases_CSE_Release_2 { v_cse1.start(f_CSE_ANNC_UPD_007(int9, v_createRequest, v_createRequestAnnc, v_updateRequest));//Group v_cse1.done; } + + testcase TC_CSE_ANNC_UPD_007_TS() runs on Tester system CseSystem { + //Local variables + var CseSimu v_cse1 := CseSimu.create("CSE1") alive; + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase; + var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase; + + v_updateRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID}; + + v_cse1.start(f_CSE_ANNC_UPD_007(int29, v_createRequest, v_createRequestAnnc, v_updateRequest));//TimeSeries + v_cse1.done; + } } //end group g_CSE_ANNC_UPD_007 group g_CSE_ANNC_UPD_008 { @@ -8129,6 +10043,52 @@ module OneM2M_Testcases_CSE_Release_2 { } } } + + testcase TC_CSE_ANNC_UPD_008_TS_MBS() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase; + var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase; + var ResponsePrimitive v_responsePrimitive; + var AttributeAux_list v_nullFields; + var ListOfNCNames v_announcedAttribute := {"ToBeDeleted"}; + var PrimitiveContent v_primitiveContentRetrieveResource; + var XSD.NonNegativeInteger v_maxByteSize := 512; + + v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID}; + v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize; + v_createRequest.primitiveContent.timeSeries.announcedAttribute := v_announcedAttribute; + + v_updateRequest.primitiveContent.timeSeries.announcedAttribute := {"maxByteSize"}; + + v_ae1.start(f_CSE_ANNC_UPD_008(int29, v_createRequestAnnc, v_createRequest, v_updateRequest));//TimeSeries + v_ae1.done; + + if(getverdict == pass){ + v_responsePrimitive := f_getResponsePrimitive(v_ae1); + if(ispresent(v_responsePrimitive.primitiveContent)) { + if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) { + if(ispresent(v_responsePrimitive.primitiveContent.timeSeries.announcedAttribute)){ + setverdict(pass, __SCOPE__ & ": announcedAttribute attribute is present"); + } else { + setverdict(fail, __SCOPE__ & ": announcedAttribute attribute is not present"); + } + } + } + + v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1); + + //Check that the resource has been udpated correctly + if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) { + if(ispresent(v_primitiveContentRetrieveResource.timeSeries.announcedAttribute)){ + setverdict(pass, __SCOPE__ & "announcedAttribute attribute updated correctly"); + } else { + setverdict(fail, __SCOPE__ & "announcedAttribute attribute not updated correctly"); + } + } + } + } } //end group g_CSE_ANNC_UPD_008 group g_CSE_ANNC_UPD_009{ @@ -8176,6 +10136,28 @@ module OneM2M_Testcases_CSE_Release_2 { v_cse1.start(f_CSE_ANNC_UPD_009(int9, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc));//Group v_cse1.done; } + + testcase TC_CSE_ANNC_UPD_009_TS_MBS() runs on Tester system CseSystem { + // Local variables + var CseSimu v_cse1 := CseSimu.create("CSE1") alive; + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase; + var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase; + var template RequestPrimitive v_updateRequestAnnc := mw_updateTimeSeriesAnnc; + var XSD.NonNegativeInteger v_maxByteSize := 512; + + v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID}; + v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize; + + v_createRequestAnnc.primitiveContent.timeSeriesAnnc.maxByteSize := v_maxByteSize; + + v_updateRequest.primitiveContent.timeSeries.announcedAttribute := {"maxByteSize"}; + + v_updateRequestAnnc.primitiveContent.timeSeriesAnnc.maxByteSize := v_maxByteSize; + + v_cse1.start(f_CSE_ANNC_UPD_009(int29, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc));//TimeSeries + v_cse1.done; + } }// end group g_CSE_ANNC_UPD_009 @@ -8249,6 +10231,29 @@ module OneM2M_Testcases_CSE_Release_2 { v_cse1.start(f_CSE_ANNC_UPD_010(int9, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc));//Group v_cse1.done; } + + testcase TC_CSE_ANNC_UPD_010_TS() runs on Tester system CseSystem { + // Local variables + var CseSimu v_cse1 := CseSimu.create("CSE1") alive; + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase; + var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase; + var template RequestPrimitive v_updateRequestAnnc := mw_updateTimeSeriesAnnc; + var Timestamp v_expirationTime_1 := "21001231T012345"; + var Timestamp v_expirationTime_2 := "21101231T012345"; + + v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID}; + v_createRequest.primitiveContent.timeSeries.expirationTime := v_expirationTime_1; + + v_createRequestAnnc.primitiveContent.timeSeriesAnnc.expirationTime := v_expirationTime_1; + + v_updateRequest.primitiveContent.timeSeries.expirationTime := v_expirationTime_2; + + v_updateRequestAnnc.primitiveContent.timeSeriesAnnc.expirationTime := v_expirationTime_2; + + v_cse1.start(f_CSE_ANNC_UPD_010(int29, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc));//TimeSeries + v_cse1.done; + } }// end group g_CSE_ANNC_UPD_010 @@ -8301,6 +10306,30 @@ module OneM2M_Testcases_CSE_Release_2 { v_cse1.start(f_CSE_ANNC_UPD_011(int9, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc));//Group v_cse1.done; } + + testcase TC_CSE_ANNC_UPD_011_TS_MBS() runs on Tester system CseSystem { + // Local variables + var CseSimu v_cse1 := CseSimu.create("CSE1") alive; + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase; + var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase; + var template RequestPrimitive v_updateRequestAnnc := mw_updateTimeSeriesAnnc; + var XSD.NonNegativeInteger v_maxByteSize_1 := 512; + var XSD.NonNegativeInteger v_maxByteSize_2 := 1024; + + v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID}; + v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize_1; + v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"maxByteSize"}; + + v_createRequestAnnc.primitiveContent.timeSeriesAnnc.maxByteSize := v_maxByteSize_1; + + v_updateRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize_2; + + v_updateRequestAnnc.primitiveContent.timeSeriesAnnc.maxByteSize := v_maxByteSize_2; + + v_cse1.start(f_CSE_ANNC_UPD_011(int29, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc));//TimeSeries + v_cse1.done; + } }// end group g_CSE_ANNC_UPD_011 @@ -8380,6 +10409,44 @@ module OneM2M_Testcases_CSE_Release_2 { } } + + testcase TC_CSE_ANNC_UPD_012_TS_MBS() runs on Tester system CseSystem { + // Local variables + var CseSimu v_cse1 := CseSimu.create("CSE1") alive; + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase; + var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase; + var template RequestPrimitive v_updateRequestAnnc := mw_updateTimeSeriesAnnc; + var RequestPrimitive v_requestPrimitive; + var XSD.NonNegativeInteger v_maxByteSize := 512; + var AttributeAux_list v_nullFields; + var ListOfNCNames v_announcedAttribute := {"ToBeDeleted"}; + + v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID}; + v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize; + v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"maxByteSize"}; + + v_createRequestAnnc.primitiveContent.timeSeriesAnnc.maxByteSize := v_maxByteSize; + + v_updateRequest.primitiveContent.timeSeries.announcedAttribute := v_announcedAttribute; + v_nullFields := {{"announcedAttribute", omit}}; + + v_cse1.start(f_CSE_ANNC_UPD_012(int29, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc, v_nullFields));//TimeSeries + v_cse1.done; + + if(getverdict == pass){ + v_requestPrimitive := f_getRequestPrimitive(v_cse1); + if(ispresent(v_requestPrimitive.primitiveContent)) { + if(ischosen(v_requestPrimitive.primitiveContent.timeSeriesAnnc)) { + if(ispresent(v_requestPrimitive.primitiveContent.timeSeriesAnnc.maxByteSize)){ + setverdict(fail, __SCOPE__ & ": Error: maxByteSize attribute is not set to NULL"); + } + } + } + + } + + } }// end group g_CSE_ANNC_UPD_012 @@ -8471,6 +10538,50 @@ module OneM2M_Testcases_CSE_Release_2 { } } } + + testcase TC_CSE_ANNC_UPD_013_TS_MBS() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase; + var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase; + var ResponsePrimitive v_responsePrimitive; + var AttributeAux_list v_nullFields; + var ListOfNCNames v_announcedAttribute := {"ToBeDeleted"}; + var PrimitiveContent v_primitiveContentRetrieveResource; + var XSD.NonNegativeInteger v_maxByteSize := 512; + + v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID}; + v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize; + v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"maxByteSize"}; + + v_updateRequest.primitiveContent.container.announcedAttribute := v_announcedAttribute; + v_nullFields := {{"announcedAttribute", omit}}; + + v_ae1.start(f_CSE_ANNC_UPD_013(int29, v_createRequestAnnc, v_createRequest, v_updateRequest, v_nullFields));//TimeSeries + v_ae1.done; + + if(getverdict == pass){ + v_responsePrimitive := f_getResponsePrimitive(v_ae1); + if(ispresent(v_responsePrimitive.primitiveContent)) { + if(ischosen(v_responsePrimitive.primitiveContent.timeSeries)) { + if(ispresent(v_responsePrimitive.primitiveContent.timeSeries.announcedAttribute)){ + setverdict(fail, __SCOPE__ & ": Error: announcedAttribute attribute is not set to NULL"); + } + } + } + + v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1); + + //Check that the resource has been udpated correctly + if(ischosen(v_primitiveContentRetrieveResource.timeSeries)) { + if(ispresent(v_primitiveContentRetrieveResource.timeSeries.announcedAttribute)){ + setverdict(fail, __SCOPE__ & ": Error: announcedAttribute attribute not updated correctly"); + } + } + } + + } }// end group g_CSE_ANNC_UPD_013 @@ -8542,6 +10653,18 @@ module OneM2M_Testcases_CSE_Release_2 { v_ae1.start(f_CSE_ANNC_DEL_001(int9, v_createRequestAnnc, v_createRequest));//Group v_ae1.done; } + + testcase TC_CSE_ANNC_DEL_001_TS() runs on Tester system CseSystem { + // Local variables + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase; + + v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID}; + + v_ae1.start(f_CSE_ANNC_DEL_001(int29, v_createRequestAnnc, v_createRequest));//TimeSeries + v_ae1.done; + } }// end group g_CSE_ANNC_DEL_001 @@ -8582,6 +10705,18 @@ module OneM2M_Testcases_CSE_Release_2 { v_cse1.start(f_CSE_ANNC_DEL_002(int9, v_createRequestAnnc, v_createRequest));//Group v_cse1.done; } + + testcase TC_CSE_ANNC_DEL_002_TS() runs on Tester system CseSystem { + // Local variables + var CseSimu v_cse1 := CseSimu.create("CSE1") alive; + var template RequestPrimitive v_createRequest := m_createTimeSeriesBase; + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase; + + v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID}; + + v_cse1.start(f_CSE_ANNC_DEL_002(int29, v_createRequestAnnc, v_createRequest));//TimeSeries + v_cse1.done; + } }// end group g_CSE_ANNC_DEL_002 }//end group Delete