Commit f582f187 authored by Yann Garcia's avatar Yann Garcia
Browse files

review MEC 012

parent f73c2c51
Loading
Loading
Loading
Loading
+58 −25
Original line number Diff line number Diff line
@@ -65,8 +65,7 @@ module AtsMec_RnisAPI_TestCases {
  group rnis_notifications {
    
    /**
     * @desc Check that the RNIS service sends an RNIS notification about cell change if the RNIS service has an associated subscription and the event is generated.
     * @see https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/master/Test%20Purposes/SRV/RNIS/RnisNotifications.tplan2
     * @desc Check that the RNIS service sends an RNIS notification about cell change if the RNIS service has an associated subscription and the event is generated
     */
    testcase TC_MEC_MEC012_SRV_RNIS_001_OK() runs on HttpComponent system HttpTestAdapter {
        // Local variables
@@ -166,7 +165,6 @@ module AtsMec_RnisAPI_TestCases {
    
    /**
     * @desc Check that the RNIS service sends an RNIS notification about RAB establishment if the RNIS service has an associated subscription and the event is generated.
     * @see https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/master/Test%20Purposes/SRV/RNIS/RnisNotifications.tplan2
     */
    testcase TC_MEC_MEC012_SRV_RNIS_002_OK() runs on HttpComponent system HttpTestAdapter {
        // Local variables
@@ -227,7 +225,6 @@ module AtsMec_RnisAPI_TestCases {
    
    /**
     * @desc Check that the RNIS service sends an RNIS notification about RAB modification if the RNIS service has an associated subscription and the event is generated.
     * @see https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/master/Test%20Purposes/SRV/RNIS/RnisNotifications.tplan2
     */
    testcase TC_MEC_MEC012_SRV_RNIS_003_OK() runs on HttpComponent system HttpTestAdapter {
        // Local variables
@@ -289,7 +286,6 @@ module AtsMec_RnisAPI_TestCases {
    
    /**
     * @desc Check that the RNIS service sends an RNIS notification about RAB release if the RNIS service has an associated subscription and the event is generated.
     * @see https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/master/Test%20Purposes/SRV/RNIS/RnisNotifications.tplan2
     */
    testcase TC_MEC_MEC012_SRV_RNIS_004_OK() runs on HttpComponent system HttpTestAdapter {
        // Local variables
@@ -351,7 +347,6 @@ module AtsMec_RnisAPI_TestCases {
    
    /**
     * @desc Check that the RNIS service sends an RNIS notification about UE measurement report if the RNIS service has an associated subscription and the event is generated.
     * @see https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/master/Test%20Purposes/SRV/RNIS/RnisNotifications.tplan2
     */
    testcase TC_MEC_MEC012_SRV_RNIS_005_OK() runs on HttpComponent system HttpTestAdapter {
        // Local variables
@@ -411,7 +406,6 @@ module AtsMec_RnisAPI_TestCases {
    
    /**
     * @desc Check that the RNIS service sends an RNIS notification about UE timing advance if the RNIS service has an associated subscription and the event is generated.
     * @see https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/master/Test%20Purposes/SRV/RNIS/RnisNotifications.tplan2
     */
    testcase TC_MEC_MEC012_SRV_RNIS_006_OK() runs on HttpComponent system HttpTestAdapter {
        // Local variables
@@ -471,7 +465,6 @@ module AtsMec_RnisAPI_TestCases {
    
    /**
     * @desc Check that the RNIS service sends an RNIS notification about UE carrier aggregation reconfiguration if the RNIS service has an associated subscription and the event is generated.
     * @see https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/master/Test%20Purposes/SRV/RNIS/RnisNotifications.tplan2
     */
    testcase TC_MEC_MEC012_SRV_RNIS_007_OK() runs on HttpComponent system HttpTestAdapter {
        // Local variables
@@ -531,7 +524,6 @@ module AtsMec_RnisAPI_TestCases {
    
    /**
     * @desc Check that the RNIS service sends an RNIS notification about S1-U bearer if the RNIS service has an associated subscription and the event is generated.
     * @see https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/master/Test%20Purposes/SRV/RNIS/RnisNotifications.tplan2
     */
    testcase TC_MEC_MEC012_SRV_RNIS_008_OK() runs on HttpComponent system HttpTestAdapter {
        // Local variables
@@ -589,7 +581,6 @@ module AtsMec_RnisAPI_TestCases {
    
    /**
     * @desc Check that the RNIS service sends an RNIS notification about 5G NR UE measurement report if the RNIS service has an associated subscription and the event is generated.
     * @see https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/master/Test%20Purposes/SRV/RNIS/RnisNotifications.tplan2
     */
    testcase TC_MEC_MEC012_SRV_RNIS_009_OK() runs on HttpComponent system HttpTestAdapter {
        // Local variables
@@ -645,6 +636,59 @@ module AtsMec_RnisAPI_TestCases {
        f_cf_01_http_notif_down();
    } // End of testcase TC_MEC_MEC012_SRV_RNIS_009_OK
    
    /**
     * @desc Check that the RNIS service sends an RNIS notification on subscription expiration if the RNIS service has an associated subscription and the event is generated
     */
    testcase TC_MEC_MEC012_SRV_RNIS_010_OK() runs on HttpComponent system HttpTestAdapter {
        // Local variables
        var Headers v_headers;
        
        // Test control
        if (not(PICS_RNIS) or not(PICS_RNIS_NOTIFICATIONS)) {
            log("*** " & testcasename() & ": PICS_RNIS and PICS_RNIS_NOTIFICATIONS required for executing the TC ***");
            setverdict(inconc);
            stop;
        }
        
        // Test component configuration
        f_cf_01_http_notif_up();
        
        // Test adapter configuration
        
        // Preamble
        f_init_default_headers_list(-, -, v_headers);
        action("Wait for subscription expiration");
        f_selfOrClientSyncAndVerdict(c_prDone, e_success);
        
        // Test Body
        tc_wait.start;
        alt {
          [] httpPort_notif.receive(
                                    mw_http_request(
                                                    mw_http_request_post(
                                                                         PX_CALLBACK_URI,
                                                                         -,
                                                                         mw_http_message_body_json(
                                                                                                   mw_body_json_expiry_notification_rnis
                                    )))) {
            tc_wait.stop;
            
            // Send 204 No Content
            httpPort_notif.send(m_http_response(m_http_response_204_no_content(v_headers)));
            
            log("*** " & testcasename() & ": PASS: IUT successfully sends RAB release notification ***");
            f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
          }
          [] tc_wait.timeout {
            log("*** " & testcasename() & ": INCONC: Expected message not received ***");
            f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);
          }
        } // End of 'alt' statement
        
        // Postamble
        f_cf_01_http_notif_down();
    } // End of testcase TC_MEC_MEC012_SRV_RNIS_010_OK
    
  } // End of group rnis_notifications 
  
  group all_subscriptions {
@@ -660,8 +704,7 @@ module AtsMec_RnisAPI_TestCases {
     *       - MeasTaSubscription
     *       - CaReconfSubscription
     *       - S1BearerSubscription
     *       - NrMeasRepUeSubscription"
     * @see https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/master/Test%20Purposes/SRV/RNIS/RnisSpecificSubscription_BV.tplan2
     *       - NrMeasRepUeSubscription
     */
    testcase TC_MEC_MEC012_SRV_RNIS_011_OK() runs on HttpComponent system HttpTestAdapter {
        // Local variables
@@ -729,8 +772,7 @@ module AtsMec_RnisAPI_TestCases {
     *       - MeasTaSubscription
     *       - CaReconfSubscription
     *       - S1BearerSubscription
     *       - NrMeasRepUeSubscription"
     * @see https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/master/Test%20Purposes/SRV/RNIS/RnisSpecificSubscription_BV.tplan2
     *       - NrMeasRepUeSubscription
     */
    testcase TC_MEC_MEC012_SRV_RNIS_012_OK() runs on HttpComponent system HttpTestAdapter {
        // Local variables
@@ -812,7 +854,6 @@ module AtsMec_RnisAPI_TestCases {
    
    /**
     * @desc Check that the RNIS service responds with an error when it receives a request to get all RNIS subscriptions with a wrong subscription type
     * @see https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/master/Test%20Purposes/SRV/RNIS/RnisSpecificSubscription_BO_BI.tplan2
     */
    testcase TC_MEC_MEC012_SRV_RNIS_011_BR() runs on HttpComponent system HttpTestAdapter {
        // Local variables
@@ -870,7 +911,6 @@ module AtsMec_RnisAPI_TestCases {
    
    /**
     * @desc Check that the RNIS service responds with an error when it receives a request to create a new RNIS subscription with a wrong format
     * @see https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/master/Test%20Purposes/SRV/RNIS/RnisSpecificSubscription_BV.tplan2
     */
    testcase TC_MEC_MEC012_SRV_RNIS_012_BR() runs on HttpComponent system HttpTestAdapter {
        // Local variables
@@ -952,8 +992,7 @@ module AtsMec_RnisAPI_TestCases {
     *       - MeasTaSubscription
     *       - CaReconfSubscription
     *       - S1BearerSubscription
     *       - NrMeasRepUeSubscription"
     * @see https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/master/Test%20Purposes/SRV/RNIS/RnisSpecificSubscription_BV.tplan2
     *       - NrMeasRepUeSubscription
     */
    testcase TC_MEC_MEC012_SRV_RNIS_013_OK() runs on HttpComponent system HttpTestAdapter {
        // Local variables
@@ -1076,8 +1115,7 @@ module AtsMec_RnisAPI_TestCases {
     *       - MeasTaSubscription
     *       - CaReconfSubscription
     *       - S1BearerSubscription
     *       - NrMeasRepUeSubscription"
     * @see https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/master/Test%20Purposes/SRV/RNIS/RnisSpecificSubscription_BV.tplan2
     *       - NrMeasRepUeSubscription
     */
    testcase TC_MEC_MEC012_SRV_RNIS_014_OK() runs on HttpComponent system HttpTestAdapter {
        // Local variables
@@ -1210,7 +1248,6 @@ module AtsMec_RnisAPI_TestCases {
    
    /**
     * @desc Check that the RNIS service deletes a RNIS subscription when requested
     * @see https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/master/Test%20Purposes/SRV/RNIS/RnisSpecificSubscription_BV.tplan2
     */
    testcase TC_MEC_MEC012_SRV_RNIS_015_OK() runs on HttpComponent system HttpTestAdapter {
        // Local variables
@@ -1307,7 +1344,6 @@ module AtsMec_RnisAPI_TestCases {

    /**
     * @desc Check that the RNIS service responds with error when a not existing RNIS subscription is requested
     * @see https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/master/Test%20Purposes/SRV/RNIS/RnisSpecificSubscription_BO_BI.tplan2
     */
    testcase TC_MEC_MEC012_SRV_RNIS_013_NF() runs on HttpComponent system HttpTestAdapter {
        // Local variables
@@ -1361,7 +1397,6 @@ module AtsMec_RnisAPI_TestCases {
    
    /**
     * @desc Check that the RNIS service responds with error when a modification for a not existing RNIS subscription is requested
     * @see https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/master/Test%20Purposes/SRV/RNIS/RnisSpecificSubscription_BO_BI.tplan2
     */
    testcase TC_MEC_MEC012_SRV_RNIS_014_BR() runs on HttpComponent system HttpTestAdapter {
        // Local variables
@@ -1477,7 +1512,6 @@ module AtsMec_RnisAPI_TestCases {
    
    /**
     * @desc Check that the RNIS service responds with error when a modification for a not existing RNIS subscription is requested
     * @see https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/master/Test%20Purposes/SRV/RNIS/RnisSpecificSubscription_BO_BI.tplan2
     */
    testcase TC_MEC_MEC012_SRV_RNIS_014_NF() runs on HttpComponent system HttpTestAdapter {
        // Local variables
@@ -1548,7 +1582,6 @@ module AtsMec_RnisAPI_TestCases {
    
    /**
     * @desc Check that the RNIS service responds with error when the deletion of a not existing RNIS subscription is requested
     * @see https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/master/Test%20Purposes/SRV/RNIS/RnisSpecificSubscription_BO_BI.tplan2
     */
    testcase TC_MEC_MEC012_SRV_RNIS_015_NF() runs on HttpComponent system HttpTestAdapter {
        // Local variables
+18 −0
Original line number Diff line number Diff line
@@ -17,13 +17,31 @@ module AtsMec_RnisAPI_TestControl {
        execute(TC_MEC_MEC012_SRV_RNIS_002_OK());
        execute(TC_MEC_MEC012_SRV_RNIS_003_OK());
        execute(TC_MEC_MEC012_SRV_RNIS_004_OK());
        execute(TC_MEC_MEC012_SRV_RNIS_005_OK());
        execute(TC_MEC_MEC012_SRV_RNIS_006_OK());
        execute(TC_MEC_MEC012_SRV_RNIS_006_OK());
        execute(TC_MEC_MEC012_SRV_RNIS_007_OK());
        execute(TC_MEC_MEC012_SRV_RNIS_007_OK());
        execute(TC_MEC_MEC012_SRV_RNIS_010_OK());
      }

      if (PICS_RNIS_ALL_SUBSCRIPTIONS) {
        execute(TC_MEC_MEC012_SRV_RNIS_011_OK());
        execute(TC_MEC_MEC012_SRV_RNIS_012_OK());
        execute(TC_MEC_MEC012_SRV_RNIS_011_BR());
        execute(TC_MEC_MEC012_SRV_RNIS_012_BR());
      }

      if (PICS_RNIS_SPECIFIC_SUBSCRIPTION) {
        execute(TC_MEC_MEC012_SRV_RNIS_013_OK());
        execute(TC_MEC_MEC012_SRV_RNIS_013_NF());
        execute(TC_MEC_MEC012_SRV_RNIS_014_OK());
        execute(TC_MEC_MEC012_SRV_RNIS_014_BR());
        execute(TC_MEC_MEC012_SRV_RNIS_014_NF());
        execute(TC_MEC_MEC012_SRV_RNIS_015_OK());
        execute(TC_MEC_MEC012_SRV_RNIS_015_NF());
      }

      if (PICS_RNIS_QUERY) {
        execute(TC_MEC_MEC012_SRV_RNIS_016_OK());
        execute(TC_MEC_MEC012_SRV_RNIS_016_BR());
+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ module LibHttp_JsonMessageBodyTypes {
    MeasTaSubscription                                     measTaSubscription,
    CaReConfSubscription                                   caReConfSubscription,
    S1BearerSubscription                                   s1BearerSubscription,
    RnisAPI_TypesAndValues.ExpiryNotification              expiryNotification_rnis,
    L2Meas                                                 l2Meas,
    BwInfoList                                             bwInfoList,
    BwInfo                                                 bwInfo,
+12 −0
Original line number Diff line number Diff line
@@ -718,6 +718,18 @@ module LibHttp_JsonTemplates {
      l2Meas := p_l2Meas
    } // End of template mw_body_json_l2_meas_subscription

    template (value) JsonBody m_body_json_expiry_notification_rnis(
                                                                   in template (value) RnisAPI_TypesAndValues.ExpiryNotification p_expiryNotification
                                                                   ) := {
      expiryNotification_rnis := p_expiryNotification
    } // End of template m_body_json_expiry_notification_rnis

    template (present) JsonBody mw_body_json_expiry_notification_rnis(
                                                                      template (present) RnisAPI_TypesAndValues.ExpiryNotification p_expiryNotification := ?
                                                                      ) := {
      expiryNotification_rnis := p_expiryNotification
    } // End of template mw_body_json_expiry_notification_rnis

  } // End of group rnis_subscriptions 

  group rnis_notifications {