Add RnisAPI tests

scripts/merge_mec_project.bash

@@ -158,7 +158,7 @@ done
 echo 'Update TTCN-3 files'
 TTCN_3_ORG_PATH=${SRC_MEC_PATH}/ttcn
 TTCN_3_DST_PATH=${PATH_DEV_MEC}/src
-TTCN_3_ATS_LIST='AtsNg112 LibMec LibMec/LocationAPI LibMec/UEidentityAPI LibHttp LibCommon'
+TTCN_3_ATS_LIST='AtsNg112 LibMec LibMec/LocationAPI LibMec/UEidentityAPI LibMec/RnisAPI LibHttp LibCommon'
 for i in ${TTCN_3_ATS_LIST}
 do
     # TTCN-3 files

scripts/update_mec_project.bash

@@ -125,7 +125,7 @@ do
 done
 
 # Update libraries & CC files
-TTCN_3_LIB_LIST='LibMec LibMec/LocationAPI LibMec/UEidentityAPI LibHttp LibCommon'
+TTCN_3_LIB_LIST='LibMec LibMec/LocationAPI LibMec/UEidentityAPI LibMec/RnisAPI LibHttp LibCommon'
 for i in ${TTCN_3_LIB_LIST}
 do
     if [ ! -d ${TTCN_3_DST_PATH}/$i ]
@@ -143,6 +143,10 @@ do
         cp ${TTCN_3_ORG_PATH}/$i/ttcn/*.ttcn ${TTCN_3_DST_PATH}/$i/ttcn
         cp ${TTCN_3_ORG_PATH}/$i/json/*.json ${TTCN_3_DST_PATH}/$i/json
     elif [ "$i" == "LibMec/UEidentityAPI" ]
+    then
+        cp ${TTCN_3_ORG_PATH}/$i/ttcn/*.ttcn ${TTCN_3_DST_PATH}/$i/ttcn
+        cp ${TTCN_3_ORG_PATH}/$i/json/*.json ${TTCN_3_DST_PATH}/$i/json
+    elif [ "$i" == "LibMec/RnsiAPI" ]
     then
         cp ${TTCN_3_ORG_PATH}/$i/ttcn/*.ttcn ${TTCN_3_DST_PATH}/$i/ttcn
         cp ${TTCN_3_ORG_PATH}/$i/json/*.json ${TTCN_3_DST_PATH}/$i/json

ttcn/AtsMec/AtsMec_LocationAPI_TestCases.ttcn

@@ -46,8 +46,8 @@ module AtsMec_LocationAPI_TestCases {
         var HttpMessage v_response;
         
         // Test control
-        if (not(PICS_ME_APP_IUT) or not(PICS_LOCATION_API_SUPPORTED)) {
-            log("*** " & testcasename() & ": PICS_ME_APP_IUT and PICS_LOCATION_API_SUPPORTED required for executing the TC ***");
+        if (not(PICS_PLAT_IUT) or not(PICS_LOCATION_API_SUPPORTED)) {
+            log("*** " & testcasename() & ": PICS_PLAT_IUT and PICS_LOCATION_API_SUPPORTED required for executing the TC ***");
             setverdict(inconc);
             stop;
         }

ttcn/AtsMec/AtsMec_RnisAPI_TestCases.ttcn

@@ -62,7 +62,7 @@ module AtsMec_RnisAPI_TestCases {
         httpPort.send(
                       m_http_request(
                                      m_http_request_get(
-                                                        PICS_RNIS_SUBSCRITIONS_URI & oct2char(unichar2oct(PX_ZONE_ID, "UTF-8")),
+                                                        PICS_RNIS_SUBSCRITIONS_URI & oct2char(unichar2oct(PX_SUBSCRIPTION_ID, "UTF-8")),
                                                         v_headers
                                                         )
                                      )
@@ -76,9 +76,9 @@ module AtsMec_RnisAPI_TestCases {
                               mw_http_response(
                                                mw_http_response_ok(
                                                                    mw_http_message_body_json(
-                                                                                             mw_body_json_(
-                                                                                                           mw_cell_change_subscription
-                                                                                                           ))))) -> value v_response {
+                                                                                             mw_body_json_cell_change_subscription(
+                                                                                                                                   mw_cell_change_subscription
+                                                                                                                                   ))))) -> value v_response {
             log("*** " & testcasename() & ": PASS: IUT successfully responds with a cell subscription ***");
             f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
           }

ttcn/AtsMec/AtsMec_TestControl.ttcn

@@ -18,7 +18,7 @@ module AtsMec_TestControl {
   
   control {
     
-    if (PICS_ME_PLAT_IUT) {
+    if (PICS_PLAT_IUT) {
       if (PICS_LOCATION_API_SUPPORTED) {
         execute(TC_MEC_PLAT_MP1_LOC_BV_001());
       }

ttcn/AtsMec/AtsMec_UEidentityAPI_TestCases.ttcn

@@ -46,8 +46,8 @@ module AtsMec_UEidentityAPI_TestCases {
       var HttpMessage v_response;
         
       // Test control
-      if (not(PICS_ME_APP_IUT) or not(PICS_UE_IDENTITY_API_SUPPORTED)) {
-        log("*** " & testcasename() & ": PICS_ME_APP_IUT and PICS_LOCATION_API_SUPPORTED required for executing the TC ***");
+      if (not(PICS_PLAT_IUT) or not(PICS_UE_IDENTITY_API_SUPPORTED)) {
+        log("*** " & testcasename() & ": PICS_PLAT_IUT and PICS_LOCATION_API_SUPPORTED required for executing the TC ***");
         setverdict(inconc);
         stop;
       }
@@ -104,8 +104,8 @@ module AtsMec_UEidentityAPI_TestCases {
       var HttpMessage v_response;
       
       // Test control
-      if (not(PICS_ME_APP_IUT) or not(PICS_UE_IDENTITY_API_SUPPORTED)) {
-        log("*** " & testcasename() & ": PICS_ME_APP_IUT and PICS_LOCATION_API_SUPPORTED required for executing the TC ***");
+      if (not(PICS_PLAT_IUT) or not(PICS_UE_IDENTITY_API_SUPPORTED)) {
+        log("*** " & testcasename() & ": PICS_PLAT_IUT and PICS_LOCATION_API_SUPPORTED required for executing the TC ***");
         setverdict(inconc);
         stop;
       }
@@ -173,8 +173,8 @@ module AtsMec_UEidentityAPI_TestCases {
       var HttpMessage v_response;
       
       // Test control
-      if (not(PICS_ME_APP_IUT) or not(PICS_UE_IDENTITY_API_SUPPORTED)) {
-        log("*** " & testcasename() & ": PICS_ME_APP_IUT and PICS_LOCATION_API_SUPPORTED required for executing the TC ***");
+      if (not(PICS_PLAT_IUT) or not(PICS_UE_IDENTITY_API_SUPPORTED)) {
+        log("*** " & testcasename() & ": PICS_PLAT_IUT and PICS_LOCATION_API_SUPPORTED required for executing the TC ***");
         setverdict(inconc);
         stop;
       }

ttcn/AtsMec/AtsMec_UEinformation_TestCases.ttcn

@@ -46,8 +46,8 @@ module AtsMec_UEinformation_TestCases {
         var HttpMessage v_response;
         
         // Test control
-        if (not(PICS_ME_APP_IUT) or not(PICS_LOCATION_API_SUPPORTED)) {
-            log("*** " & testcasename() & ": PICS_ME_APP_IUT and PICS_LOCATION_API_SUPPORTED required for executing the TC ***");
+        if (not(PICS_PLAT_IUT) or not(PICS_LOCATION_API_SUPPORTED)) {
+            log("*** " & testcasename() & ": PICS_PLAT_IUT and PICS_LOCATION_API_SUPPORTED required for executing the TC ***");
             setverdict(inconc);
             stop;
         }

ttcn/LibMec/ttcn/LibMec_Pics.ttcn

@@ -4,7 +4,7 @@ module LibMec_Pics {
    * @desc Does the IUT act as Edge Mobile Application?
    * TODO Renane into PIC_MEC_PLAT
    */
-  modulepar boolean PICS_ME_PLAT_IUT := false;
+  modulepar boolean PICS_PLAT_IUT := false;
   
   /**
    * @desc Does the IUT act as Edge Mobile Application?