Commit 192b8096 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Reverting back Release 2 changes for types and templates


Signed-off-by: Miguel Angel Reina Ortega's avatarreinaortega <miguelangel.reinaortega@etsi.org>
parent de0d8b84
......@@ -147,7 +147,7 @@ module OneM2M_Pixits {
modulepar boolean PX_IUT_IS_IN_CSE := false; //default //set it to true when running Share-based location testcases
//constant parameters for LOC
modulepar LocationTargetID PX_LOCATION_TARGET_ID := {alt_ := "{LOCATION-TARGET-ID}"}; //SUPPOSE TO BE RECEIVED FROM LOCATION SERVER
modulepar XSD.Token PX_LOCATION_TARGET_ID := "{LOCATION-TARGET-ID}"; //SUPPOSE TO BE RECEIVED FROM LOCATION SERVER
modulepar XSD.AnyURI PX_LOCATION_SERVER_ADDRESS := "{LOCATION-SERVER-ADDRESS}";
modulepar charstring PX_LOCATION_UPDATE_PERIOD := "PT10M10S" ;//10 Minute 10 Seconds
......
......@@ -5,9 +5,9 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
* @author oneM2M
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Templates.ttcn $
* $Id: OneM2M_Templates.ttcn 356 2017-08-21 12:25:14Z reinaortega $
* @author ETSI
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/LibOneM2M/OneM2M_Templates.ttcn $
* $Id: OneM2M_Templates.ttcn 347 2017-08-11 08:48:20Z reinaortega $
* @desc Module containing templates for oneM2M
*
*/
......@@ -106,7 +106,7 @@ module OneM2M_Templates {
requestIdentifier := "m_retrieve" & f_rnd(1, 1000000),
resourceType := omit,
primitiveContent := omit,
roleIDs := omit,
role := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
......@@ -118,11 +118,7 @@ module OneM2M_Templates {
deliveryAggregation := omit,
groupRequestIdentifier := omit,
filterCriteria := omit,
discoveryResultType := omit,
tokens := omit,
tokenIDs := omit,
localTokenIDs := omit,
tokenRequestIndicator := omit
discoveryResultType := omit
};
/**
......@@ -136,7 +132,7 @@ module OneM2M_Templates {
requestIdentifier := ?,
resourceType := omit,
primitiveContent := *,
roleIDs := *,
role := *,
originatingTimestamp := *,
requestExpirationTimestamp := *,
resultExpirationTimestamp := *,
......@@ -148,11 +144,7 @@ module OneM2M_Templates {
deliveryAggregation := *,
groupRequestIdentifier := *,
filterCriteria := *,
discoveryResultType := *,
tokens := *,
tokenIDs := *,
localTokenIDs := *,
tokenRequestIndicator := *
discoveryResultType := *
};
/**
......@@ -167,7 +159,7 @@ module OneM2M_Templates {
requestIdentifier := "m_retrieveResourceAttributeOptionTo" & f_rnd(1, 1000000),
resourceType := omit,
primitiveContent := omit,
roleIDs := omit,
role := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
......@@ -179,11 +171,7 @@ module OneM2M_Templates {
deliveryAggregation := omit,
groupRequestIdentifier := omit,
filterCriteria := omit,
discoveryResultType := omit,
tokens := omit,
tokenIDs := omit,
localTokenIDs := omit,
tokenRequestIndicator := omit
discoveryResultType := omit
};
/**
......@@ -199,7 +187,7 @@ module OneM2M_Templates {
requestIdentifier := "m_retrieveResourceAttributeContentOption" & f_rnd(1, 1000000),
resourceType := omit,
primitiveContent := {attributeList := p_attributeList},
roleIDs := omit,
role := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
......@@ -211,11 +199,7 @@ module OneM2M_Templates {
deliveryAggregation := omit,
groupRequestIdentifier := omit,
filterCriteria := omit,
discoveryResultType := omit,
tokens := omit,
tokenIDs := omit,
localTokenIDs := omit,
tokenRequestIndicator := omit
discoveryResultType := omit
};
/**
......@@ -241,14 +225,8 @@ module OneM2M_Templates {
sizeBelow := omit,
contentType_list := {},
attribute_list := {},
filterUsage := p_filterUsage,
limit := omit,
semanticsFilter_list := {},
filterOperation := omit,
contentFilterSyntax := omit,
contentFilterQuery := omit,
level := omit,
offset := omit
filterUsage := p_filterUsage,
limit := omit
}
};
......@@ -288,15 +266,10 @@ module OneM2M_Templates {
contentType_list := {},
attribute_list := {},
filterUsage := p_filterUsage,
limit := omit,
semanticsFilter_list := {},
filterOperation := omit,
contentFilterSyntax := omit,
contentFilterQuery := omit,
level := omit,
offset := omit
limit := omit
}
};
/**
* @desc RETRIEVE request primtive containing the Discovery Type in the discoveryResultType field and Filter Criteria in the filterCriteria field
* @param p_targetResourceAddress Target resource address
......@@ -321,13 +294,7 @@ module OneM2M_Templates {
contentType_list := {},
attribute_list := {},
filterUsage := p_filterUsage,
limit := omit,
semanticsFilter_list := {},
filterOperation := omit,
contentFilterSyntax := omit,
contentFilterQuery := omit,
level := omit,
offset := omit
limit := omit
},
discoveryResultType := p_discResType
};
......@@ -356,13 +323,7 @@ module OneM2M_Templates {
contentType_list := {},
attribute_list := {},
filterUsage := omit,
limit := omit,
semanticsFilter_list := {},
filterOperation := omit,
contentFilterSyntax := omit,
contentFilterQuery := omit,
level := omit,
offset := omit
limit := omit
}
};
......@@ -401,7 +362,7 @@ module OneM2M_Templates {
requestIdentifier := "m_update",
resourceType := omit,
primitiveContent:= omit,
roleIDs := omit,
role := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
......@@ -413,11 +374,7 @@ module OneM2M_Templates {
deliveryAggregation := omit,
groupRequestIdentifier := omit,
filterCriteria := omit,
discoveryResultType := omit,
tokens := omit,
tokenIDs := omit,
localTokenIDs := omit,
tokenRequestIndicator := omit
discoveryResultType := omit
};
......@@ -426,9 +383,9 @@ module OneM2M_Templates {
to_ := p_to,
from_ := p_from,
requestIdentifier := ?,
resourceType := omit,
resourceType := ?,
primitiveContent:= ?,
roleIDs := *,
role := *,
originatingTimestamp := *,
requestExpirationTimestamp := *,
resultExpirationTimestamp := *,
......@@ -440,11 +397,7 @@ module OneM2M_Templates {
deliveryAggregation := *,
groupRequestIdentifier := *,
filterCriteria := *,
discoveryResultType := *,
tokens := *,
tokenIDs := *,
localTokenIDs := *,
tokenRequestIndicator := *
discoveryResultType := omit
};
/**
......@@ -454,7 +407,7 @@ module OneM2M_Templates {
requestIdentifier := "m_updateAe",
primitiveContent:= {aE := m_contentUpdateAe}
};
/**
* @desc Reception template for update Ae resource
*/
......@@ -573,7 +526,7 @@ module OneM2M_Templates {
requestIdentifier := testcasename() & "-m_create",
resourceType := omit,
primitiveContent := omit,
roleIDs := omit,
role := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
......@@ -585,12 +538,7 @@ module OneM2M_Templates {
deliveryAggregation := omit,
groupRequestIdentifier := omit,
filterCriteria := omit,
discoveryResultType := omit,
tokens := omit,
tokenIDs := omit,
localTokenIDs := omit,
tokenRequestIndicator := omit
discoveryResultType := omit
};
/**
......@@ -603,7 +551,7 @@ module OneM2M_Templates {
requestIdentifier := ?,
resourceType := ?,
primitiveContent := ?,
roleIDs := *,
role := *,
originatingTimestamp := *,
requestExpirationTimestamp := *,
resultExpirationTimestamp := *,
......@@ -614,41 +562,8 @@ module OneM2M_Templates {
eventCategory := *,
deliveryAggregation := *,
groupRequestIdentifier := *,
filterCriteria := *,
discoveryResultType := *,
tokens := *,
tokenIDs := *,
localTokenIDs := *,
tokenRequestIndicator := *
}
/**
* @desc Base Reception template for create operation for announced resources
*/
template RequestPrimitive mw_createAnnc(template XSD.ID p_from := ?, template XSD.ID p_to := ?) := {
operation := int1,
to_ := p_to,
from_ := p_from,
requestIdentifier := ?,
resourceType := ?,
primitiveContent := ?,
roleIDs := *,
originatingTimestamp := *,
requestExpirationTimestamp := *,
resultExpirationTimestamp := *,
operationExecutionTime := *,
responseType := *,
resultPersistence := *,
resultContent := *,
eventCategory := *,
deliveryAggregation := *,
groupRequestIdentifier := *,
filterCriteria := *,
discoveryResultType := *,
tokens := *,
tokenIDs := *,
localTokenIDs := *,
tokenRequestIndicator := *
filterCriteria := omit,
discoveryResultType := omit
}
......@@ -660,18 +575,17 @@ module OneM2M_Templates {
* @param p_appId
* @param p_stemId
*/
template (value) RequestPrimitive m_createAEAnnc(template (omit) AcpType p_accessControlPolicyIds := omit, template (omit) XSD.ID p_to := omit, template (omit) XSD.ID p_from := omit, XSD.ID p_appId, XSD.ID p_stemId := "") modifies m_create:= {
to_ := p_to,
template (value) RequestPrimitive m_createAEAnnc(template (omit) AcpType p_accessControlPolicyIds := omit, template (omit) XSD.ID p_from := omit, XSD.ID p_appId, XSD.ID p_link) modifies m_create:= {
from_ := p_from,//PX_AE_ID_STEM,//TODO We should use omit, "s", or "c"
requestIdentifier := testcasename() & "-m_createAEAnnc",
resourceType := int10002,
primitiveContent := {aEAnnc := m_contentCreateAEAnnc({"Credential-ID:None"}, p_accessControlPolicyIds, p_appId, valueof(p_to) & "/" & p_stemId)}
primitiveContent := {aEAnnc := m_contentCreateAEAnnc({"Credential-ID:None"}, p_accessControlPolicyIds, p_appId, p_link)}
};
/**
* @desc Reception template for CREATE AEAnnc
*/
template RequestPrimitive mw_createAEAnnc(template XSD.ID p_from := ?, template XSD.ID p_to := ?, template AcpType p_accessControlPolicyIds := ?) modifies mw_createAnnc := {
template RequestPrimitive mw_createAEAnnc(template (omit) XSD.ID p_from := omit, template (omit) XSD.ID p_to := omit, template (omit) AcpType p_accessControlPolicyIds := omit, template XSD.AnyURI p_link := ?) modifies mw_create := {
resourceType := int10002,
primitiveContent := {aEAnnc := mw_contentCreateAEAnnc({"Credential-ID:None"}, p_accessControlPolicyIds)}
};
......@@ -720,7 +634,7 @@ module OneM2M_Templates {
template RequestPrimitive mw_createAccessControlPolicyAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
to_ := p_to,
from_ := p_from,
resourceType := int10001,
resourceType := int10002,
primitiveContent := {accessControlPolicyAnnc := mw_contentCreateAcpAnnc(-)}
};
......@@ -775,14 +689,14 @@ module OneM2M_Templates {
template RequestPrimitive mw_createRemoteCSE(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
resourceType := int16,
primitiveContent := {remoteCSE := ?} //{remoteCSE := m_contentCreateRemoteCSE(p_resourceName, p_accessControlPolicyIds,p_cSEBase, p_cSE_ID)}
};
};
/**
* @desc CREATE request primitive for remoteCSE resource
* @desc Base reception template for CREATE RemoteCSE
*/
template RequestPrimitive mw_createRemoteCSEBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
resourceType := int16,
primitiveContent := ?//{remoteCSE := m_contentCreateRemoteCSE(p_resourceName, p_accessControlPolicyIds,p_cSEBase, p_cSE_ID)}
primitiveContent := {remoteCSE := mw_contentCreateRemoteCSEBase}
};
/**
......@@ -815,22 +729,6 @@ module OneM2M_Templates {
primitiveContent := {containerAnnc := mw_contentCreateContainerAnncBase}
};
/**
* @desc Reception template for CREATE FlexContainer
*/
template RequestPrimitive mw_createFlexContainer(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
resourceType := int28,
primitiveContent := {flexContainer := ?}
};
/**
* @desc Reception template for CREATE GenericInterworkingOperationInstance
*/
template RequestPrimitive mw_createGenericIwkOpInstance(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
resourceType := int28, // FIXME: not found in TS004
primitiveContent := {genericInterworkingOperationInstance := ?}
};
/**
* @desc Base CREATE request primitive for Content Instance resource
*/
......@@ -1091,7 +989,7 @@ module OneM2M_Templates {
in template (omit) BatchNotify p_batchNotify := omit,
in template (omit) XSD.Boolean p_latestNotify := omit,
in template (omit) XSD.AnyURI p_subscriberURI := omit,
in template (omit) NotificationContentType p_notificationContentType := int1,
in template (omit) NotificationContentType p_notificationContentType := int1,
in template (omit) PendingNotification p_pendingNotification) modifies m_createSubscription := {
primitiveContent := {subscription := m_contentCreateSubscriptionAdvanced (p_notificationURI, p_name, p_eventNotificationCriteria, p_expirationCounter, p_batchNotify, p_latestNotify, p_subscriberURI, p_notificationContentType, p_pendingNotification)}
};
......@@ -1105,7 +1003,7 @@ module OneM2M_Templates {
primitiveContent := {locationPolicy := m_contentCreateLocationPolicyBase}
};
template (value) RequestPrimitive m_createLocationPolicy(in template (value) LocationSource p_locationSource, in template (omit) AcpType p_accessControlPolicyIds, in template (omit) XSD.Duration p_locationUpdatePeriod, in template (omit) LocationTargetID p_locationTargetID, in template (omit) XSD.AnyURI p_locationServerAddress) modifies m_create := {
template (value) RequestPrimitive m_createLocationPolicy(in template (value) LocationSource p_locationSource, in template (omit) AcpType p_accessControlPolicyIds, in template (omit) XSD.Duration p_locationUpdatePeriod, in template (omit) NodeID p_locationTargetID, in template (omit) XSD.AnyURI p_locationServerAddress) modifies m_create := {
requestIdentifier := testcasename() & "-m_createLocationPolicy", //the requestIdentifier is supposed to be set similar as "C190XX7T/001" by prepending the AE-ID-Stem and slash(‘/’) in front of it
resourceType := int10,
......@@ -1136,14 +1034,6 @@ module OneM2M_Templates {
};
/**
* @desc Reception template for SemanticDescriptor creation
*/
template RequestPrimitive mw_createSemanticDescriptor(template XSD.ID p_from := *, template XSD.ID p_to := ?, template (present) SemanticDescriptor_optional p_semanticDescriptor := mw_contentCreateSemanticDescriptor) modifies mw_create := {
resourceType := int24,
primitiveContent := {semanticDescriptor := p_semanticDescriptor}
};
/**
* @desc Base CREATE request primitive for Stats Config resource
*/
......@@ -1182,7 +1072,7 @@ module OneM2M_Templates {
requestIdentifier := testcasename() & "-m_delete" & f_rnd(1, 1000000),
resourceType := omit,
primitiveContent := omit,
roleIDs := omit,
role := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
......@@ -1194,21 +1084,17 @@ module OneM2M_Templates {
deliveryAggregation := omit,
groupRequestIdentifier := omit,
filterCriteria := omit,
discoveryResultType := omit,
tokens := omit,
tokenIDs := omit,
localTokenIDs := omit,
tokenRequestIndicator := omit
discoveryResultType := omit
};
template RequestPrimitive mw_delete(template XSD.ID p_resourceAddress := ?, template XSD.ID p_from := *) := {
operation := int4,
to_ := p_resourceAddress,
from_ := ?,
from_ := p_from,
requestIdentifier := ?,
resourceType := omit,
primitiveContent := omit,
roleIDs := *,
role := *,
originatingTimestamp := *,
requestExpirationTimestamp := *,
resultExpirationTimestamp := *,
......@@ -1220,11 +1106,7 @@ module OneM2M_Templates {
deliveryAggregation := *,
groupRequestIdentifier := *,
filterCriteria := *,
discoveryResultType := *,
tokens := *,
tokenIDs := *,
localTokenIDs := *,
tokenRequestIndicator := *
discoveryResultType := omit
};
}//end group Delete
......@@ -1241,7 +1123,7 @@ module OneM2M_Templates {
requestIdentifier := testcasename() & "-m_notify" & f_rnd(1, 1000000),
resourceType := omit,
primitiveContent := {notification := m_contentCreateNotification_allOmit},
roleIDs := omit,
role := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
......@@ -1253,11 +1135,7 @@ module OneM2M_Templates {
deliveryAggregation := omit,
groupRequestIdentifier := omit,
filterCriteria := omit,
discoveryResultType := omit,
tokens := omit,
tokenIDs := omit,
localTokenIDs := omit,
tokenRequestIndicator := omit
discoveryResultType := omit
};
/**
......@@ -1270,7 +1148,7 @@ module OneM2M_Templates {
requestIdentifier := testcasename() & "-m_notifyAggregatedNotification" & f_rnd(1, 1000000),
resourceType := omit,
primitiveContent := {aggregatedNotification := {notification_list := {m_contentCreateNotification_allOmit,m_contentCreateNotification_allOmit}}},
roleIDs := omit,
role := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
......@@ -1282,11 +1160,7 @@ module OneM2M_Templates {
deliveryAggregation := omit,
groupRequestIdentifier := omit,
filterCriteria := omit,
discoveryResultType := omit,
tokens := omit,
tokenIDs := omit,
localTokenIDs := omit,
tokenRequestIndicator := omit
discoveryResultType := omit
};
/**
......@@ -1299,7 +1173,7 @@ module OneM2M_Templates {
requestIdentifier := ?,
resourceType := omit,
primitiveContent := {notification := mw_contentNotificationBase},
roleIDs := *,
role := *,
originatingTimestamp := *,
requestExpirationTimestamp := *,
resultExpirationTimestamp := *,
......@@ -1310,12 +1184,8 @@ module OneM2M_Templates {
eventCategory := *,
deliveryAggregation := *,
groupRequestIdentifier := *,
filterCriteria := *,
discoveryResultType := *,
tokens := *,
tokenIDs := *,
localTokenIDs := *,
tokenRequestIndicator := *
filterCriteria := omit,
discoveryResultType := omit
};
/**
......@@ -1356,7 +1226,7 @@ module OneM2M_Templates {
template PrimitiveContent m_primitiveContentCSEBase(template CSEBase_optional p_cSEBase) := {
cSEBase := p_cSEBase
}
template PrimitiveContent m_primitiveContentRemoteCSE(template RemoteCSE_optional p_remoteCSE) := {
remoteCSE := p_remoteCSE
}
......@@ -1370,7 +1240,7 @@ module OneM2M_Templates {
* @param p_appId App ID
* @param p_nodeLink Node link
*/
template AEAnnc_optional m_contentCreateAEAnnc (in template (omit) Labels p_labels, in template (omit) AcpType p_accessControlPolicyIds, XSD.ID p_appId := PX_APP_ID, in template (omit) XSD.AnyURI p_nodeLink := omit) := {
template AEAnnc_optional m_contentCreateAEAnnc (in template (omit) Labels p_labels, in template (omit) AcpType p_accessControlPolicyIds, XSD.ID p_appId := PX_APP_ID, in template (omit) XSD.AnyURI p_link := omit) := {
resourceName := omit,//O TODO
resourceType := omit,//NP
resourceID := omit,//NP
......@@ -1380,17 +1250,15 @@ module OneM2M_Templates {
labels := p_labels,//O
accessControlPolicyIDs := p_accessControlPolicyIds,//O
expirationTime := "20301231T012345",//O
link := omit,//M TODO Put the right value
dynamicAuthorizationConsultationIDs := omit, //TODO Check whether it is optional or mandatory for create operation
link := p_link,//M TODO Put the right value
appName := omit,//O
app_ID := p_appId,//M
aE_ID := omit,//NP
pointOfAccess := omit, //{"http://127.0.0.1:1400/monitor"},//O //{"http://192.168.1.92:18080/notifications/AE"}, // TODO: Check this => AE PoA
ontologyRef := omit,//O
nodeLink := p_nodeLink,//NP
nodeLink := omit,//NP
requestReachability := true,//M
contentSerialization := omit,//O
e2eSecInfo := omit, //O TODO Check whether it is optional or mandatory for create operation
choice := omit//NP
};
......@@ -1412,16 +1280,14 @@ module OneM2M_Templates {
accessControlPolicyIDs := p_accessControlPolicyIds,//MA
expirationTime := ?,//MA M
link := p_link,//M
dynamicAuthorizationConsultationIDs := omit, //OA
appName := *,//OA
app_ID := *,//OA
aE_ID := *,//OA
pointOfAccess := *, //OA {"http://127.0.0.1:1400/monitor"},//O //{"http://192.168.1.92:18080/notifications/AE"}, // TODO: Check this => AE PoA
ontologyRef := *,//OA
nodeLink := *,//OA
requestReachability := *,//OA
contentSerialization := *,//OA
e2eSecInfo := ?, //MA
appName := omit,//OA
app_ID := omit,//OA
aE_ID := omit,//OA
pointOfAccess := omit, //OA {"http://127.0.0.1:1400/monitor"},//O //{"http://192.168.1.92:18080/notifications/AE"}, // TODO: Check this => AE PoA
ontologyRef := omit,//OA
nodeLink := omit,//OA
requestReachability := omit,//OA
contentSerialization := omit,//OA
choice := omit//NA
};
......@@ -1441,7 +1307,6 @@ module OneM2M_Templates {
labels := omit,//O
accessControlPolicyIDs := p_accessControlPolicyIds,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
announceTo := omit,//O
announcedAttribute := omit,//O
appName := omit,//O
......@@ -1452,7 +1317,6 @@ module OneM2M_Templates {
nodeLink := omit,//NP
requestReachability := true,//M
contentSerialization := omit,//O
e2eSecInfo := omit, //O
choice := omit//NP
};
......@@ -1486,7 +1350,7 @@ module OneM2M_Templates {
* @desc Base reception template of primitiveContent for CREATE operation for AccessControlPolicyAnnc resource
* @param p_labels Labels
*/
template AccessControlPolicyAnnc_optional mw_contentCreateAcpAnnc (in template Labels p_labels := ?) := {
template AccessControlPolicyAnnc_optional mw_contentCreateAcpAnnc (in template (omit) Labels p_labels := omit) := {
resourceName := omit,//NA M
resourceType := omit,//NA M
resourceID := omit,//NA M
......@@ -1496,17 +1360,15 @@ module OneM2M_Templates {
labels := p_labels,//MA
expirationTime := ?,//MA M
link := ?,//M
privileges := ?,//MA
selfPrivileges := ?,//MA
privileges := *,//MA
selfPrivileges := *,//MA
choice := omit//NA
};
template (value) AccessControlRule m_createAcr (in template (value) ListOfURIs p_acor, in template (value) AccessControlOperations p_allowedOperations) := {
accessControlOriginators := p_acor,//{"*"},//{PX_AE_ID_STEM}, //{"admin:admin"},
accessControlOperations := p_allowedOperations,
accessControlContexts_list := {},
accessControlAuthenticationFlag := omit,
accessControlObjectDetails_list := {}
accessControlContexts_list := {}
}
/*template (value) CSEBase_optional m_contentCreateCSEBase (in template (value) ServiceSubscribedAppRule p_serviceSubscribedAppRule) := {
......@@ -1549,8 +1411,6 @@ module OneM2M_Templates {
supportedResourceType := omit,
pointOfAccess := omit,
nodeLink := omit,
dynamicAuthorizationConsultationIDs := omit,
e2eSecInfo := omit,
choice := omit
};