- New templates related to TimeSeries and TimeSeriesInstance

- Fixed c_defaultTimeSeriesInstanceResourceName value
- Some test cases have acquired permutations structure because of the insertion of TimeSeries (CSE_DMR_CRE_007, CSE_DMR_CRE_008, CSE_DMR_CRE_013, CSE_DMR_CRE_014, CSE_DMR_UPD_010, CSE_DMR_UPD_011, CSE_DMR_DEL_005, CSE_DMR_DEL_006, CSE_SUB_CRE_001)
- New permutation: TC_CSE_DMR_UPD_009_TS_EXC,
Signed-off-by: Antonio Castillo Verdugo's avataracverdugo <acverdugo@at4wireless.com>
parent a9407e0f
......@@ -623,6 +623,14 @@ module OneM2M_Templates {
template (value) RequestPrimitive m_updateTimeSeriesBase modifies m_update := {
requestIdentifier := "m_updateTimeSeries",
primitiveContent:= {timeSeries := m_contentUpdateTimeSeries}
};
/**
* @desc Base UPDATE request primitive for TimeSeriesInstance resource
*/
template (value) RequestPrimitive m_updateTimeSeriesInstanceBase modifies m_update:= {
requestIdentifier := "m_updateTimeSeriesInstance",
primitiveContent:= {timeSeriesInstance := m_contentUpdateTimeSeriesInstance}
};
/**
......@@ -2609,19 +2617,19 @@ module OneM2M_Templates {
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
dynamicAuthorizationConsultationIDs := *, //OA
stateTag := *,//OA
maxNrOfInstances := *,//O OA
maxByteSize := *,//O OA
maxInstanceAge := *,//O OA
currentNrOfInstances := *,//M OA
currentByteSize := *,//M OA
periodicInterval := *,//O OA
missingDataDetect := omit,//O NA
missingDataList := omit,//O OA
missingDataCurrentNr := omit,//O OA
missingDataDetectTimer := omit,//O OA
ontologyRef := omit,//O OA
missingDataList := *,//O OA
missingDataCurrentNr := *,//O OA
missingDataDetectTimer := *,//O OA
ontologyRef := *,//O OA
choice := omit //O
};
......@@ -2637,12 +2645,12 @@ module OneM2M_Templates {
creationTime := omit,//NA M
lastModifiedTime := omit,//NA M
labels := ?,//MA
expirationTime := ?,//MA M
expirationTime := omit,//NA M
link := omit, //O NA
dataGenerationTime := ?,//M OA
content := ?,//M OA
sequenceNr := omit,//O OA
contentSize := ?//M OA
dataGenerationTime := *,//M OA
content := *,//M OA
sequenceNr := *,//O OA
contentSize := *//M OA
}
/**
......@@ -2711,7 +2719,7 @@ module OneM2M_Templates {
announceTo := omit,//O
announcedAttribute := omit,//O
dataGenerationTime := {alt_ := fx_generateTimestamp()},//M
content := "Value",//M
content := "AnyValue",//M
sequenceNr := omit,//O
contentSize := omit//NP
};
......@@ -3124,6 +3132,26 @@ module OneM2M_Templates {
choice := omit//NP
};
/**
* @desc Base primitiveContent for UPDATE operation for TimeSeriesInstance resource
*/
template (value) TimeSeriesInstance_optional m_contentUpdateTimeSeriesInstance := {
resourceName := omit,
resourceType := omit,
resourceID := omit,
parentID := omit,
creationTime := omit,
lastModifiedTime := omit,
labels := omit,
expirationTime := omit,
announceTo := omit,
announcedAttribute := omit,
dataGenerationTime := omit,
content := omit,
sequenceNr := omit,
contentSize := omit
};
}//end group ContentUpdate
......
......@@ -38,7 +38,7 @@ module OneM2M_TypesAndValues {
const XSD.String c_defaultm2mServiceSubscriptionProfileResourceName := "Mym2mServiceSubscriptionProfileResource";
const XSD.String c_defaultServiceSubscribedAppRuleResourceName := "MyServiceSubscribedAppRuleResource";
const XSD.String c_defaultTimeSeriesResourceName := "MyTimeSeriesResource";
const XSD.String c_defaultTimeSeriesInstanceResourceName := "MyTimeSeriesResource";
const XSD.String c_defaultTimeSeriesInstanceResourceName := "MyTimeSeriesInstanceResource";
const XSD.ID c_aeAuxName := "MyAe";
const XSD.String c_defaultAE2Name := "MyAe2";
const XSD.String c_acpAuxName := "MyAcp";
......
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment