From 1be03976e5dd3bc1579c0119886469b73ffa6869 Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Tue, 14 May 2019 15:54:16 +0200
Subject: [PATCH] UpperTester primitives improvements

Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
---
 LibOneM2M/OneM2M_Functions.ttcn | 10 +++++++---
 LibOneM2M/OneM2M_Templates.ttcn |  4 ++--
 LibOneM2M/OneM2M_Types.ttcn     | 27 ++++++++++++++++++++++++++-
 3 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index a955ef7..f845718 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -5385,7 +5385,7 @@ module OneM2M_Functions {
 			 * @param p_action Description of the given action to be performed by the IUT
 			 * @verdict 
 			 */
-			function f_sendUtPrimitive(template UtTriggerPrimitive p_utRequest, in universal charstring p_action) runs on Tester {
+			function f_sendUtPrimitive(template UtTriggerPrimitive p_utRequest, in universal charstring p_action) runs on CseSimu {
 				
 				if (PX_UT_IMPLEMENTED){
 					
@@ -5409,8 +5409,11 @@ module OneM2M_Functions {
 						}
 					}
 					
+					f_checkCseSimuStatus();
+					
 					activate(a_default());
-					if(vc_config == e_cf01) {
+					//In case UtPrimitive is used from AeSimu
+					/*if(vc_config == e_cf01) {
 						vc_aeSimu := activate(a_cse_cf01());
 					} else if ((vc_config == e_cf02) or (vc_config == e_cf02CseSimuMaster)) {
 						if(vc_testSystemRole == e_ae) {
@@ -5418,7 +5421,8 @@ module OneM2M_Functions {
 						} else if (vc_testSystemRole == e_cse) {
 							vc_cseSimu := activate(a_cse_cf02_cse1());
 						}
-					} else if (vc_config == e_cf03) {
+					} else */
+					if (vc_config == e_cf03) {
 						vc_cseSimu := activate(a_ae_cf03());
 					} else if (vc_config == e_cf04) {
 						vc_cseSimu := activate(a_cse_cf04());
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 0e2046d..3fad3c3 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -5709,7 +5709,7 @@ module OneM2M_Templates {
 			contentOffset := *,
 			assignedTokenIdentifiers := *,
 			tokenRequestInformation := *,
-			releaseVersionIndicator := ?,//FIXME
+			releaseVersionIndicator := *,
 			vendorInformation := *
 
 		}
@@ -5727,7 +5727,7 @@ module OneM2M_Templates {
 			contentOffset := *,
 			assignedTokenIdentifiers := *,
 			tokenRequestInformation := *,
-			releaseVersionIndicator := ?,//FIXME
+			releaseVersionIndicator := *,
 			vendorInformation := *
 
 		}
diff --git a/LibOneM2M/OneM2M_Types.ttcn b/LibOneM2M/OneM2M_Types.ttcn
index 275bd1a..dd44ed7 100644
--- a/LibOneM2M/OneM2M_Types.ttcn
+++ b/LibOneM2M/OneM2M_Types.ttcn
@@ -6672,11 +6672,36 @@ with {
 		encode "UpperTester"
 	}
 		
-	type ResponsePrimitive UtTriggerAckPrimitive
+	type UtResponsePrimitive UtTriggerAckPrimitive
 	with {			
 		encode "UpperTester"
 	}
 	
+	type record UtResponsePrimitive
+	{
+		ResponseStatusCode responseStatusCode,
+		RequestID requestIdentifier,
+		PrimitiveContent primitiveContent optional,
+		XSD.ID to_ optional,
+		XSD.ID from_ optional,
+		Timestamp originatingTimestamp optional,
+		AbsRelTimestamp resultExpirationTimestamp optional,
+		EventCat eventCategory optional,
+		ContentStatus contentStatus optional,
+		XSD.PositiveInteger contentOffset optional,
+		DynAuthLocalTokenIdAssignments assignedTokenIdentifiers optional,
+		DynAuthTokenReqInfo tokenRequestInformation optional,
+		ReleaseVersion releaseVersionIndicator optional,
+		XSD.String vendorInformation optional
+	}
+	with {
+	  variant "name as uncapitalized";
+	  variant "element";
+	  variant (to_) "name as 'to'";
+	  variant (from_) "name as 'from'";
+	};
+	
+	
 	type record AttributeAux {
 		XSD.NCName name,
 		charstring value_ optional
-- 
GitLab