Commit a9407e0f authored by Antonio Castillo Verdugo's avatar Antonio Castillo Verdugo
Browse files

Added TimeSeriesAnnc_optional, TimeSeriesInstanceAnnc_optional and...


Added TimeSeriesAnnc_optional, TimeSeriesInstanceAnnc_optional and TimeSeries_update_invalid in PrimitiveContent
New templates related to TimeSeries, TimeSeriesInstance, TimeSeriesAnnc and TimeSeriesInstanceAnnc
Plenty of TimeSeries and TimeSeriesInstance permutations
Signed-off-by: Antonio Castillo Verdugo's avataracverdugo <acverdugo@at4wireless.com>
parent e325bbb3
......@@ -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
......
......@@ -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,
......
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