Clean up of duplicated PXs

Signed-off-by: Miguel Angel Reina Ortega's avatarreinaortega <miguelangel.reinaortega@etsi.org>
parent 5da1eef0
...@@ -21,9 +21,11 @@ module OneM2M_Pixits { ...@@ -21,9 +21,11 @@ module OneM2M_Pixits {
group IutParameters { 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"; modulepar charstring PX_SUT_ADDRESS := "127.0.0.1:8080";
...@@ -142,13 +144,6 @@ module OneM2M_Pixits { ...@@ -142,13 +144,6 @@ module OneM2M_Pixits {
modulepar boolean PX_RUN_POSTAMBLE := true; 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 //constant parameters for LOC
modulepar XSD.Token PX_LOCATION_TARGET_ID := "{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
......
...@@ -2674,9 +2674,9 @@ module OneM2M_PermutationFunctions { ...@@ -2674,9 +2674,9 @@ module OneM2M_PermutationFunctions {
// Preamble // Preamble
if (PX_IUT_IS_MN_CSE == true) { if (PX_MN_CSE) {
vc_cse1.start(f_cse_registrationRemoteCse(m_createRemoteCSEBase)); 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.start(f_cse_registerRemoteCse(m_createRemoteCSEBase));
} }
vc_cse1.done; vc_cse1.done;
......
...@@ -5351,7 +5351,7 @@ module OneM2M_Testcases_CSE_Release_2 { ...@@ -5351,7 +5351,7 @@ module OneM2M_Testcases_CSE_Release_2 {
f_cf01Up(); f_cf01Up();
if(PX_IUT_IS_ASN_CSE){ if(PX_ASN_CSE){
//Preamble //Preamble
v_aeAuxIndex := f_cse_preamble_registerAe(); v_aeAuxIndex := f_cse_preamble_registerAe();
...@@ -5416,7 +5416,7 @@ module OneM2M_Testcases_CSE_Release_2 { ...@@ -5416,7 +5416,7 @@ module OneM2M_Testcases_CSE_Release_2 {
f_cf01Up(); f_cf01Up();
if(PX_IUT_IS_MN_CSE){ if(PX_MN_CSE){
//Preamble //Preamble
v_aeAuxIndex := f_cse_preamble_registerAe(); v_aeAuxIndex := f_cse_preamble_registerAe();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment