From f0b577eb28aa14e7c0e97dec4ba0d8127880941c Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Thu, 16 Jul 2020 17:55:13 +0200
Subject: [PATCH] Removing unused templates and renaming templates to follow
naming convention
Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
---
LibOneM2M/OneM2M_Templates.ttcn | 101 +++++------------------------
OneM2M_Testcases_AE_Release_1.ttcn | 16 ++---
2 files changed, 23 insertions(+), 94 deletions(-)
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 0c60b92..c34ab12 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -15,8 +15,7 @@ module OneM2M_Templates {
import from OneM2M_Types all;
import from OneM2M_TypesAndValues all;
import from OneM2M_Pixits all;
- import from OneM2M_Functions all;
-
+ import from OneM2M_Functions all;
/**
* @desc Get a converted to string random number
@@ -3313,6 +3312,20 @@ module OneM2M_Templates {
choice := omit//NP
};
+ /**
+ * @desc Base reception primitiveContent for UPDATE operation for AE resource
+ */
+ template AE_optional mw_contentUpdateAe modifies mw_contentAe_any := {
+ resourceName := omit,//NP
+ resourceType := omit,//NP
+ resourceID := omit,//NP
+ parentID := omit,//NP
+ creationTime := omit,//NP
+ lastModifiedTime := omit,//NP
+ app_ID := omit,//NP
+ aE_ID := omit//NP
+ };
+
/**
* @desc Base primitiveContent for UPDATE operation for AccessControlPolicy resource
*/
@@ -3799,38 +3812,6 @@ module OneM2M_Templates {
} //end group ContentDelete
- group RequestContent {
-
- group CreateRequest {
-
- }
-
- group UpdateRequest {
-
- template AE_optional mw_contentAeUpdateRequest modifies mw_contentAe_any := {
- resourceName := omit,//NP
- resourceType := omit,//NP
- resourceID := omit,//NP
- parentID := omit,//NP
- creationTime := omit,//NP
- lastModifiedTime := omit,//NP
- app_ID := omit,//NP
- aE_ID := omit//NP
- };
-
- template Container_optional mw_contentContainerUpdateRequest modifies mw_contentContainer_any := {
- resourceName := omit,//NP
- resourceType := omit,//NP
- resourceID := omit,//NP
- parentID := omit,//NP
- creationTime := omit,//NP
- lastModifiedTime := omit//NP
- };
-
- }//End of group UpdateRequest
-
- }//end of group RequestContent
-
group ResponseContent {
template AE_optional mw_contentAeBase := {
@@ -5087,58 +5068,6 @@ module OneM2M_Templates {
group SpecialContents {
- template (value) AE_optional m_contentCreateAe_Invalid := {
- 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
- appName := omit,//O
- app_ID := omit,//M
- aE_ID := omit,//NP
- pointOfAccess := omit, //O
- ontologyRef := omit,//O
- nodeLink := omit,//NP
- requestReachability := omit,//M
- contentSerialization := omit,//O
- e2eSecInfo:= omit, //O
- supportedReleaseVersions := {"1", "2", "2a"},//M
- choice := omit//O
- };
-
- template AE_optional mw_contentCreateAe_invalid := {
- resourceName := *,//O
- resourceType := *,//NP
- resourceID := *,//NP
- parentID := *,//NP
- creationTime := *,//NP
- lastModifiedTime := *,//NP
- labels := *,//O
- accessControlPolicyIDs := *,//O
- expirationTime := *,//O
- dynamicAuthorizationConsultationIDs := *, //O
- announceTo := *,//O
- announcedAttribute := *,//O
- appName := *,//O
- app_ID := omit,//M
- aE_ID := *,//NP
- pointOfAccess := *, //O
- ontologyRef := *,//O
- nodeLink := *,//NP
- requestReachability := omit,//M
- contentSerialization := *,//O
- e2eSecInfo:= *, //O
- supportedReleaseVersions := ?,//M
- choice := *//O
- };
-
/**
* @desc Base primitiveContent for CREATE operation for GenericInterworkingService resource
* @param p_accessControlPolicyIds ACP IDs for the PollingChannel
diff --git a/OneM2M_Testcases_AE_Release_1.ttcn b/OneM2M_Testcases_AE_Release_1.ttcn
index 59a815e..7826dde 100644
--- a/OneM2M_Testcases_AE_Release_1.ttcn
+++ b/OneM2M_Testcases_AE_Release_1.ttcn
@@ -1049,7 +1049,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_utRequest.requestPrimitive.primitiveContent.aE.expirationTime := "20301231T012345";
- v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
+ v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentUpdateAe;
v_expectedUpdateRequestAe.primitiveContent.aE.expirationTime := ?;
v_cse1.start(f_AE_DMR_UPD_001(v_utRequest, v_action, v_expectedUpdateRequestAe));
@@ -1065,7 +1065,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_utRequest.requestPrimitive.primitiveContent.aE.labels := {"UNINITIALIZED"};
- v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
+ v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentUpdateAe;
v_expectedUpdateRequestAe.primitiveContent.aE.labels := complement({*,"UNINITIALIZED",*});
@@ -1083,7 +1083,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_utRequest.requestPrimitive.primitiveContent.aE.appName := "UNINITIALIZED";
- v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
+ v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentUpdateAe;
v_expectedUpdateRequestAe.primitiveContent.aE.appName := complement("UNINITIALIZED");
v_cse1.start(f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe));
@@ -1100,7 +1100,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_utRequest.requestPrimitive.primitiveContent.aE.pointOfAccess := {"UNINITIALIZED"};
- v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
+ v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentUpdateAe;
v_expectedUpdateRequestAe.primitiveContent.aE.pointOfAccess := complement({*,"UNINITIALIZED", *});
v_cse1.start(f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe));
@@ -1116,7 +1116,7 @@ module OneM2M_Testcases_AE_Release_1 {
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute ontologyRef to ";
v_utRequest.requestPrimitive.primitiveContent.aE.ontologyRef := "UNINITIALIZED";
- v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
+ v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentUpdateAe;
v_expectedUpdateRequestAe.primitiveContent.aE.ontologyRef := complement("UNINITIALIZED");
v_cse1.start(f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe));
@@ -1132,7 +1132,7 @@ module OneM2M_Testcases_AE_Release_1 {
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute nodeLink to ";
v_utRequest.requestPrimitive.primitiveContent.aE.nodeLink := "UNINITIALIZED";
- v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
+ v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentUpdateAe;
v_expectedUpdateRequestAe.primitiveContent.aE.nodeLink := complement("UNINITIALIZED");
v_cse1.start(f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe));
@@ -1148,7 +1148,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_utRequest.requestPrimitive.primitiveContent.aE.requestReachability := true;
v_utRequest.forcedFields := {{name := "requestReachability", value_ := "UNINITIALIZED"}};
- v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
+ v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentUpdateAe;
v_expectedUpdateRequestAe.primitiveContent.aE.requestReachability := ?;//Check value other than "UNINITIALIZED", done by typing
v_cse1.start(f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe));
@@ -1164,7 +1164,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_utRequest.requestPrimitive.primitiveContent.aE.contentSerialization := {applicationxml};
v_utRequest.forcedFields := {{name := "contentSerialization", value_ := "UNINITIALIZED"}};
- v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
+ v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentUpdateAe;
v_expectedUpdateRequestAe.primitiveContent.aE.contentSerialization := ?;//Check value other than "UNINITIALIZED", done by typing
v_cse1.start(f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe));
--
GitLab