From f31bcc69c69e256c03a2630eaa0b49642840a6a4 Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Fri, 23 Feb 2018 11:54:31 +0100
Subject: [PATCH] Clean up of duplicated PXs
Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
---
LibOneM2M/OneM2M_Pixits.ttcn | 13 ++++---------
OneM2M_PermutationFunctions.ttcn | 4 ++--
OneM2M_Testcases_CSE_Release_2.ttcn | 4 ++--
3 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/LibOneM2M/OneM2M_Pixits.ttcn b/LibOneM2M/OneM2M_Pixits.ttcn
index b7eae50..fdea99d 100644
--- a/LibOneM2M/OneM2M_Pixits.ttcn
+++ b/LibOneM2M/OneM2M_Pixits.ttcn
@@ -21,9 +21,11 @@ module OneM2M_Pixits {
group IutParameters {
- modulepar boolean PX_MN_CSE := true;
+ modulepar boolean PX_IN_CSE := true;
- modulepar boolean PX_IN_CSE := false;
+ modulepar boolean PX_MN_CSE := false;
+
+ modulepar boolean PX_ASN_CSE:= false;
modulepar charstring PX_SUT_ADDRESS := "127.0.0.1:8080";
@@ -142,13 +144,6 @@ module OneM2M_Pixits {
modulepar boolean PX_RUN_POSTAMBLE := true;
}
-
-
- //for checking whether the locationPolicy creation request is originated from a ASN-AE
- //NOTE: Apply to Device-based location request, and this requires Test System (TS) to activate ASN-AE mode to test IUT
- modulepar boolean PX_IUT_IS_ASN_CSE := false; //default //set it to true when running Device-based location testcases
- modulepar boolean PX_IUT_IS_MN_CSE := false; //default //set it to true when running Share-based location testcases
- modulepar boolean PX_IUT_IS_IN_CSE := false; //default //set it to true when running Share-based location testcases
//constant parameters for LOC
modulepar XSD.Token PX_LOCATION_TARGET_ID := "{LOCATION-TARGET-ID}"; //SUPPOSE TO BE RECEIVED FROM LOCATION SERVER
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 4ce39ac..715c013 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -2674,9 +2674,9 @@ module OneM2M_PermutationFunctions {
// Preamble
- if (PX_IUT_IS_MN_CSE == true) {
+ if (PX_MN_CSE) {
vc_cse1.start(f_cse_registrationRemoteCse(m_createRemoteCSEBase));
- }else if (PX_IUT_IS_IN_CSE == true) {
+ }else if (PX_IN_CSE) {
vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSEBase));
}
vc_cse1.done;
diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index 389eaf3..caf7d65 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -5351,7 +5351,7 @@ module OneM2M_Testcases_CSE_Release_2 {
f_cf01Up();
- if(PX_IUT_IS_ASN_CSE){
+ if(PX_ASN_CSE){
//Preamble
v_aeAuxIndex := f_cse_preamble_registerAe();
@@ -5416,7 +5416,7 @@ module OneM2M_Testcases_CSE_Release_2 {
f_cf01Up();
- if(PX_IUT_IS_MN_CSE){
+ if(PX_MN_CSE){
//Preamble
v_aeAuxIndex := f_cse_preamble_registerAe();
--
GitLab