From 68709d97c7e69d5946ceb54ab5f51ca404efcb95 Mon Sep 17 00:00:00 2001
From: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
Date: Fri, 18 Nov 2016 10:39:26 +0100
Subject: [PATCH] roleIDs and localTokenIDs are optional attributes. Default
value in templates is set to omit
Signed-off-by: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
---
LibOneM2M/OneM2M_Templates.ttcn | 46 ++++++++++++++++-----------------
LibOneM2M/OneM2M_Types.ttcn | 8 +++---
2 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index a7e4635..1c2f07d 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -7,7 +7,7 @@
*
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Templates.ttcn $
- * $Id: OneM2M_Templates.ttcn 164 2016-11-17 13:54:53Z carres $
+ * $Id: OneM2M_Templates.ttcn 165 2016-11-17 14:52:31Z reinaortega $
* @desc Module containing templates for oneM2M
*
*/
@@ -92,7 +92,7 @@ module OneM2M_Templates {
requestIdentifier := "m_retrieveCseBase" & f_rnd(1, 1000000),
resourceType := omit,
primitiveContent := omit,
- roleIDs := {"1234abcd@role-issuer.com"}, // TODO Find a correct value
+ roleIDs := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
@@ -107,7 +107,7 @@ module OneM2M_Templates {
discoveryResultType := omit,
tokens := omit,
tokenIDs := omit,
- localTokenIDs := {"Fixme"},//TODO Find a correct value
+ localTokenIDs := omit,
tokenReqIndicator := omit
};
@@ -123,7 +123,7 @@ module OneM2M_Templates {
requestIdentifier := "m_retrieveResource" & f_rnd(1, 1000000),
resourceType := omit,
primitiveContent := omit,
- roleIDs := {"1234abcd@role-issuer.com"},//TODO Find a correct value
+ roleIDs := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
@@ -138,7 +138,7 @@ module OneM2M_Templates {
discoveryResultType := omit,
tokens := omit,
tokenIDs := omit,
- localTokenIDs := {"Fixme"},//TODO Find a correct value,
+ localTokenIDs := omit,
tokenReqIndicator := omit
};
@@ -154,7 +154,7 @@ module OneM2M_Templates {
requestIdentifier := "m_retrieveResourceAttributeOptionTo" & f_rnd(1, 1000000),
resourceType := omit,
primitiveContent := omit,
- roleIDs := {"1234abcd@role-issuer.com"},//TODO Find a correct value
+ roleIDs := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
@@ -169,7 +169,7 @@ module OneM2M_Templates {
discoveryResultType := omit,
tokens := omit,
tokenIDs := omit,
- localTokenIDs := {"Fixme"},//TODO Find a correct value,
+ localTokenIDs := omit,
tokenReqIndicator := omit
};
@@ -188,7 +188,7 @@ module OneM2M_Templates {
primitiveContent := {
any_1 := {{AttributeList := p_attributeList}}
},
- roleIDs := {"1234abcd@role-issuer.com"},//TODO Find a correct value
+ roleIDs := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
@@ -203,7 +203,7 @@ module OneM2M_Templates {
discoveryResultType := omit,
tokens := omit,
tokenIDs := omit,
- localTokenIDs := {"Fixme"},//TODO Find a correct value,
+ localTokenIDs := omit,
tokenReqIndicator := omit
};
}//end group Retrieve
@@ -217,7 +217,7 @@ module OneM2M_Templates {
requestIdentifier := "m_update" & f_rnd(1, 1000000),
resourceType := omit,
primitiveContent:= omit,
- roleIDs := {"1234abcd@role-issuer.com"},//TODO Find a correct value
+ roleIDs := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
@@ -232,7 +232,7 @@ module OneM2M_Templates {
discoveryResultType := omit,
tokens := omit,
tokenIDs := omit,
- localTokenIDs := {"Fixme"},//TODO Find a correct value,
+ localTokenIDs := omit,
tokenReqIndicator := omit
};
@@ -342,7 +342,7 @@ module OneM2M_Templates {
requestIdentifier := "m_create" & f_rnd(1, 1000000),
resourceType := omit,
primitiveContent := omit,
- roleIDs := {"1234abcd@role-issuer.com"},//TODO Find a correct value
+ roleIDs := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
@@ -357,7 +357,7 @@ module OneM2M_Templates {
discoveryResultType := omit,
tokens := omit,
tokenIDs := omit,
- localTokenIDs := {"Fixme"},//TODO Find a correct value,
+ localTokenIDs := omit,
tokenReqIndicator := omit
};
@@ -375,7 +375,7 @@ module OneM2M_Templates {
primitiveContent := {
any_1 := {{AEAnnc_optional := mw_contentCreateAEannc(c_aeAuxName, p_accessControlPolicyIDs, p_appId)}}
},
- roleIDs := {"1234abcd@role-issuer.com"},//TODO Find a correct value
+ roleIDs := *,
originatingTimestamp := *,
requestExpirationTimestamp := *,
resultExpirationTimestamp := *,
@@ -390,7 +390,7 @@ module OneM2M_Templates {
discoveryResultType := *,
tokens := *,
tokenIDs := *,
- localTokenIDs := ?,
+ localTokenIDs := *,
tokenReqIndicator := *
};
@@ -632,7 +632,7 @@ module OneM2M_Templates {
requestIdentifier := "m_deleteResource" & f_rnd(1, 1000000),
resourceType := omit,
primitiveContent := omit,
- roleIDs := {"1234abcd@role-issuer.com"},//TODO Find a correct value
+ roleIDs := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
@@ -647,7 +647,7 @@ module OneM2M_Templates {
discoveryResultType := omit,
tokens := omit,
tokenIDs := omit,
- localTokenIDs := {"Fixme"},//TODO Find a correct value,
+ localTokenIDs := omit,
tokenReqIndicator := omit
};
@@ -659,7 +659,7 @@ module OneM2M_Templates {
requestIdentifier := "m_deleteAe" & f_rnd(1, 1000000),
resourceType := omit,
primitiveContent := omit,
- roleIDs := {"1234abcd@role-issuer.com"},//TODO Find a correct value
+ roleIDs := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
@@ -674,7 +674,7 @@ module OneM2M_Templates {
discoveryResultType := omit,
tokens := omit,
tokenIDs := omit,
- localTokenIDs := {"Fixme"},//TODO Find a correct value,
+ localTokenIDs := omit,
tokenReqIndicator := omit
};
@@ -693,7 +693,7 @@ module OneM2M_Templates {
requestIdentifier := ?,
resourceType := *,
primitiveContent := { any_1 := {{ Notification := mw_contentNotificationBase}} },
- roleIDs := ?,
+ roleIDs := *,
originatingTimestamp := *,
requestExpirationTimestamp := *,
resultExpirationTimestamp := *,
@@ -708,7 +708,7 @@ module OneM2M_Templates {
discoveryResultType := *,
tokens := *,
tokenIDs := *,
- localTokenIDs := ?,
+ localTokenIDs := *,
tokenReqIndicator := *
};
@@ -722,7 +722,7 @@ module OneM2M_Templates {
requestIdentifier := ?,
resourceType := *,
primitiveContent := { any_1 := {{ AggregatedNotification := ?}} },
- roleIDs :=?,
+ roleIDs := *,
originatingTimestamp := *,
requestExpirationTimestamp := *,
resultExpirationTimestamp := *,
@@ -737,7 +737,7 @@ module OneM2M_Templates {
discoveryResultType := *,
tokens := *,
tokenIDs := *,
- localTokenIDs := ?,
+ localTokenIDs := *,
tokenReqIndicator := *
};
diff --git a/LibOneM2M/OneM2M_Types.ttcn b/LibOneM2M/OneM2M_Types.ttcn
index fac68dd..cfafdbd 100644
--- a/LibOneM2M/OneM2M_Types.ttcn
+++ b/LibOneM2M/OneM2M_Types.ttcn
@@ -7,7 +7,7 @@
*
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Types.ttcn $
- * $Id: OneM2M_Types.ttcn 135 2016-10-12 08:02:32Z reinaortega $
+ * $Id: OneM2M_Types.ttcn 165 2016-11-17 14:52:31Z reinaortega $
* @desc Test System module for oneM2M
*
*/
@@ -4955,7 +4955,7 @@ type record DynAuthDasResponse
SetOfAcrs grantedPrivileges optional,
AbsRelTimestamp privilegesLifetime optional
} dynamicACPInfo optional,
- record length(1 .. infinity) of DynAuthJWT tokens
+ record length(1 .. infinity) of DynAuthJWT tokens optional//it must be optional
}
with {
variant "name as uncapitalized";
@@ -5229,7 +5229,7 @@ type record RequestPrimitive
RequestID requestIdentifier,
ResourceType resourceType optional,
PrimitiveContent primitiveContent optional,
- record length(1 .. infinity) of RoleID roleIDs,
+ record length(1 .. infinity) of RoleID roleIDs optional,//TODO it must be optional
Timestamp originatingTimestamp optional,
AbsRelTimestamp requestExpirationTimestamp optional,
AbsRelTimestamp resultExpirationTimestamp optional,
@@ -5244,7 +5244,7 @@ type record RequestPrimitive
DiscResType discoveryResultType optional,
DynAuthJWT tokens optional,
TokenID tokenIDs optional,
- record length(1 .. infinity) of XSD.NCName localTokenIDs,
+ record length(1 .. infinity) of XSD.NCName localTokenIDs optional, //TODO it must be optional
XSD.Boolean tokenReqIndicator optional
}
with {
--
GitLab