dexter has uploaded this change for review.

View Change

ES2Plus_Tests: add "es2plus" prefix to module parameter

Let's prefix the module parameters to make it easier to understand
their purpose.

Related: SYS#7339
Change-Id: Idda9f287177cb1dce66bbef410bb1b7085f55b4d
---
M smdpp/ES2Plus_Tests.cfg
M smdpp/ES2Plus_Tests.ttcn
2 files changed, 7 insertions(+), 7 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/65/41265/1

diff --git a/smdpp/ES2Plus_Tests.cfg b/smdpp/ES2Plus_Tests.cfg
index 591b75b..8be08ff 100644
--- a/smdpp/ES2Plus_Tests.cfg
+++ b/smdpp/ES2Plus_Tests.cfg
@@ -10,7 +10,7 @@
 # ES2+ specific parameters
 ES2Plus_Tests.mp_es2plus_server_host := "127.0.0.1"
 ES2Plus_Tests.mp_es2plus_server_port := 8000  # NIST tests use port 8000
-ES2Plus_Tests.mp_operator_id := "test.operator.com"
+ES2Plus_Tests.mp_es2plus_operator_id := "test.operator.com"
 
 [EXECUTE]
 ES2Plus_Tests.control
\ No newline at end of file
diff --git a/smdpp/ES2Plus_Tests.ttcn b/smdpp/ES2Plus_Tests.ttcn
index ece4cc1..63e3a64 100644
--- a/smdpp/ES2Plus_Tests.ttcn
+++ b/smdpp/ES2Plus_Tests.ttcn
@@ -59,11 +59,11 @@
     charstring mp_es2plus_client_key_path := "./test_certs/SK_MNO_ECDSA_NIST.pem";
 
     // Sets the operator ID to be used on the ES2+ interface. (this parameter has no relation to SSL/TLS)
-    charstring mp_operator_id := "test.operator.com";
+    charstring mp_es2plus_operator_id := "test.operator.com";
 
     // ES2+ normally uses SSL with client authentication, however for debug purposes it is possible to disable
     // mutual authentication.
-    boolean mp_use_mutual_tls := true;
+    boolean mp_es2plus_use_mutual_tls := true;
 }
 
 // Test component - extend smdpp_ConnHdlr to reuse RSPClient functionality
@@ -116,7 +116,7 @@
 // Helper function to build ES2+ request header
 function f_es2plus_request_header() return JSON_ESx_RequestHeader {
     return {
-        functionRequesterIdentifier := mp_operator_id,
+        functionRequesterIdentifier := mp_es2plus_operator_id,
         functionCallIdentifier := f_gen_es2plus_uuid()
     };
 }
@@ -205,7 +205,7 @@
     // Set authentication parameters once for all ES2+ operations
     var integer result := smdpp_Tests.ext_RSPClient_setAuthParams(
         g_rsp_client_handle,
-        mp_use_mutual_tls,
+        mp_es2plus_use_mutual_tls,
         mp_es2plus_client_cert_path,
         mp_es2plus_client_key_path
     );
@@ -979,7 +979,7 @@
     // Temporarily set wrong authentication parameters
     var integer result := smdpp_Tests.ext_RSPClient_setAuthParams(
         g_rsp_client_handle,
-	mp_use_mutual_tls,
+	mp_es2plus_use_mutual_tls,
         c_wrong_cert_path,  // Using wrong certificate
         c_wrong_key_path    // Using wrong key
     );
@@ -1012,7 +1012,7 @@
     // Restore correct auth params for cleanup
     smdpp_Tests.ext_RSPClient_setAuthParams(
         g_rsp_client_handle,
-        mp_use_mutual_tls,
+        mp_es2plus_use_mutual_tls,
         mp_es2plus_client_cert_path,
         mp_es2plus_client_key_path
     );

To view, visit change 41265. To unsubscribe, or for help writing mail filters, visit settings.