Commit da939b20 authored by YannGarcia's avatar YannGarcia
Browse files

Finalyze reviewing MEC 011

parent 7d309098
Loading
Loading
Loading
Loading
+107 −100
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@
module AtsMec_AppEnablementAPI_TestCases {

  // Libcommon
  import from LibCommon_BasicTypesAndValues all;
  import from LibCommon_Sync all;

  // LibHttp
@@ -951,7 +952,7 @@ module AtsMec_AppEnablementAPI_TestCases {
                                                       v_headers,
                                                       m_http_message_body_json(
                                                                                m_body_json_app_termination_notif_subscription(
                                                                                                                               m_app_termination_notif_subscription(
                                                                                                                               m_app_termination_notif_subscription_invalid(
                                                                                                                                                                            PX_APP_TERM_NOTIF_CALLBACK_URI,
                                                                                                                                                                            m_self(
                                                                                                                                                                                   { href := PX_HREF }
@@ -1972,7 +1973,7 @@ module AtsMec_AppEnablementAPI_TestCases {
      alt {
        [] httpPort.receive(
                            mw_http_response(
                                             mw_http_response_404_not_found()
                                             mw_http_response_404_not_found
                                             )) {
          tc_ac.stop;

@@ -1996,6 +1997,7 @@ module AtsMec_AppEnablementAPI_TestCases {
    testcase TP_MEC_SRV_SRVSUB_002_OK() runs on HttpComponent system HttpTestAdapter {
      // Local variables
      var HeaderLines v_headers;
      var HttpMessage v_response;

      // Test control
      if (not(PICS_MEC_PLAT) or not (PICS_SERVICES) or not(PICS_APP_ENABLEMENT_API_SUPPORTED)) {
@@ -2019,8 +2021,7 @@ module AtsMec_AppEnablementAPI_TestCases {
                                                       m_http_message_body_json(
                                                                                m_body_json_srv_avail_notif_subscription(
                                                                                                                         m_srv_avail_notif_subscription(
                                                                                                                                PX_SRV_AVAIL_NOTIF_SUBSCRIPTION,
                                                                                                                                PX_SRV_AVAIL_NOTIF_CALLBACK_URIce
                                                                                                                                                        PX_SRV_AVAIL_NOTIF_CALLBACK_URI
                                                                                                                                                        )
                                                                                                                         )
                                                                                )
@@ -2038,17 +2039,17 @@ module AtsMec_AppEnablementAPI_TestCases {
                                                                          mw_http_message_body_json(
                                                                                                    mw_body_json_srv_avail_notif_subscription(
                                                                                                                                              mw_srv_avail_notif_subscription(
                                                                                                                                PX_SRV_AVAIL_NOTIF_SUBSCRIPTION, //subscriptionType
                                                                                                                                PX_SRV_AVAIL_NOTIF_CALLBACK_URI // callbackReference
                                                                                                                               )
                                                                                                                 )
                                                                                                                                                     )))) {
          // TODO Need to check Location header

                                                                                                                                                                              PX_SRV_AVAIL_NOTIF_CALLBACK_URI
                                                                                                                                                                              )))))) -> value v_response {
          tc_ac.stop;
          
          if (f_check_headers(valueof(v_response.response.header)) == true) {
            log("*** " & testcasename() & ": PASS: IUT successfully responds with a SerAvailabilityNotificationSubscription ***");
            f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
          } else {
            log("*** " & testcasename() & ": FAIL: Header 'Location' was not present in the response headers ***");
            f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
          }
        }
        [] tc_ac.timeout {
          log("*** " & testcasename() & ": INCONC: Expected message not received ***");
@@ -2090,9 +2091,8 @@ module AtsMec_AppEnablementAPI_TestCases {
                                                       v_headers,
                                                       m_http_message_body_json(
                                                                                m_body_json_srv_avail_notif_subscription(
                                                                                                                 m_srv_avail_notif_subscription(
                                                                                                                                PX_INVALID_SUBSCRIPTION, //subscriptionType
                                                                                                                                PX_SRV_AVAIL_NOTIF_CALLBACK_URI // callbackReference
                                                                                                                         m_srv_avail_notif_subscription_invalid(
                                                                                                                                                                PX_SRV_AVAIL_NOTIF_CALLBACK_URI
                                                                                                                                                                )
                                                                                                                         )
                                                                                )
@@ -2106,7 +2106,7 @@ module AtsMec_AppEnablementAPI_TestCases {
      alt {
        [] httpPort.receive(
                            mw_http_response(
                                             mw_http_response_400_bad_request()
                                             mw_http_response_400_bad_request
                                             )) {
          tc_ac.stop;

@@ -2164,10 +2164,8 @@ module AtsMec_AppEnablementAPI_TestCases {
                                                                 mw_http_message_body_json(
                                                                                           m_body_json_srv_avail_notif_subscription(
                                                                                                                                    m_srv_avail_notif_subscription(
                                                                                                                                PX_SRV_AVAIL_NOTIF_SUBSCRIPTION //subscriptionType
                                                                                                                               )
                                                                                                                 )
                                                                                                                  )))) {
                                                                                                                                                                   PX_SRV_AVAIL_NOTIF_CALLBACK_URI
                                                                                                                                                                   )))))) {
          tc_ac.stop;

          log("*** " & testcasename() & ": PASS: IUT successfully responds with a SerAvailabilityNotificationSubscription ***");
@@ -2220,7 +2218,7 @@ module AtsMec_AppEnablementAPI_TestCases {
      alt {
        [] httpPort.receive(
                            mw_http_response(
                                             mw_http_response_404_not_found()
                                             mw_http_response_404_not_found
                                             )) {
          tc_ac.stop;

@@ -2274,7 +2272,7 @@ module AtsMec_AppEnablementAPI_TestCases {
      alt {
        [] httpPort.receive(
                            mw_http_response(
                                             mw_http_response_204_no_content()
                                             mw_http_response_204_no_content
                                             )) {
          tc_ac.stop;

@@ -2329,7 +2327,7 @@ module AtsMec_AppEnablementAPI_TestCases {
      alt {
        [] httpPort.receive(
                            mw_http_response(
                                             mw_http_response_404_not_found()
                                             mw_http_response_404_not_found
                                             )) {
          tc_ac.stop;

@@ -2391,9 +2389,10 @@ module AtsMec_AppEnablementAPI_TestCases {
        [] httpPort.receive(
                            mw_http_response(
                                             mw_http_response_ok(
                                                                 mw_http_message_body_json(
                                                                                           mw_body_json_timing_caps(
                                                                                                mw_timing_caps(*) // TODO don't care about the content
                                                                                                                  )))) {
                                                                                                                    mw_timing_caps
                                                                                                                    ))))) {
          tc_ac.stop;

          log("*** " & testcasename() & ": PASS: IUT successfully responds with a TimingCaps ***");
@@ -2416,6 +2415,7 @@ module AtsMec_AppEnablementAPI_TestCases {
    testcase TP_MEC_SRV_TIME_002_OK() runs on HttpComponent system HttpTestAdapter {
      // Local variables
      var HeaderLines v_headers;
      var UInt64 v_current_time;

      // Test control
      if (not(PICS_MEC_PLAT) or not (PICS_SERVICES) or not(PICS_APP_ENABLEMENT_API_SUPPORTED)) {
@@ -2439,6 +2439,7 @@ module AtsMec_AppEnablementAPI_TestCases {
                                                      )
                                   )
                    );
      v_current_time := f_get_current_time_utc();
      f_selfOrClientSyncAndVerdict(c_prDone, e_success);

      // Test Body
@@ -2447,10 +2448,12 @@ module AtsMec_AppEnablementAPI_TestCases {
        [] httpPort.receive(
                            mw_http_response(
                                             mw_http_response_ok(
                                                                 mw_http_message_body_json(
                                                                                           mw_body_json_current_time(
                                                                                                mw_current_time(*) // TODO don't care about the content
                                                                                                                  )))) {

                                                                                                                     mw_current_time(
                                                                                                                                     (v_current_time - 60 .. v_current_time + 60),
                                                                                                                                     (v_current_time / 1000 - 60 .. v_current_time / 1000 + 60)
                                                                                                                                     )))))) {
          tc_ac.stop;

          log("*** " & testcasename() & ": PASS: IUT successfully responds with a CurrentTime ***");
@@ -2511,8 +2514,8 @@ module AtsMec_AppEnablementAPI_TestCases {
        [] httpPort.receive(
                            mw_http_response(
                                             mw_http_response_ok(
                                                                 mw_body_json_traffic_rule_list(
                                                                                                mw_traffic_rule_list(*) // TODO don't care about the content
                                                                 mw_http_message_body_json(
                                                                                           mw_body_json_traffic_rule_list
                                                                                           )))) {
          tc_ac.stop;

@@ -2566,7 +2569,7 @@ module AtsMec_AppEnablementAPI_TestCases {
      alt {
        [] httpPort.receive(
                            mw_http_response(
                                             mw_http_response_404_not_found()
                                             mw_http_response_404_not_found
                                             )) {
          tc_ac.stop;

@@ -2741,9 +2744,9 @@ module AtsMec_AppEnablementAPI_TestCases {
                                                      "/" & PICS_ROOT_API & PX_ME_APP_SUPPORT_URI & oct2char(unichar2oct(PX_APP_INSTANCE_ID, "UTF-8")) & "/traffic_rules/" & oct2char(unichar2oct(PX_TRAFFIC_RULE_ID, "UTF-8")),
                                                       v_headers,
                                                       m_http_message_body_json(
                                                                                m_body_traffic_rule(
                                                                                m_body_json_traffic_rule(
                                                                                                         m_traffic_rule(
                                                                                                                                PX_TRF_RULE_INVALID // action
                                                                                                                        PX_NON_EXISTENT_TRAFFIC_RULE_ID
                                                                                                                        )
                                                                                                    )
                                                                                )
@@ -2757,7 +2760,7 @@ module AtsMec_AppEnablementAPI_TestCases {
      alt {
        [] httpPort.receive(
                            mw_http_response(
                                             mw_http_response_400_bad_request()
                                             mw_http_response_400_bad_request
                                             )) {
          tc_ac.stop;

@@ -2803,9 +2806,11 @@ module AtsMec_AppEnablementAPI_TestCases {
                                                      "/" & PICS_ROOT_API & PX_ME_APP_SUPPORT_URI & oct2char(unichar2oct(PX_APP_INSTANCE_ID, "UTF-8")) & "/traffic_rules/" & oct2char(unichar2oct(PX_NON_EXISTENT_TRAFFIC_RULE_ID, "UTF-8")),
                                                      v_headers,
                                                      m_http_message_body_json(
                                                                                m_body_traffic_rule(
                                                                               m_body_json_traffic_rule(
                                                                                                        m_traffic_rule(
                                                                                                                                PX_TRF_RULE_DROP // action
                                                                                                                       PX_TRAFFIC_RULE_ID,
                                                                                                                       -, -, -,
                                                                                                                       DROP
                                                                                                                       )
                                                                                                        )
                                                                               )
@@ -2819,7 +2824,7 @@ module AtsMec_AppEnablementAPI_TestCases {
      alt {
        [] httpPort.receive(
                            mw_http_response(
                                             mw_http_response_404_not_found()
                                             mw_http_response_404_not_found
                                             )) {
          tc_ac.stop;

@@ -2865,9 +2870,11 @@ module AtsMec_AppEnablementAPI_TestCases {
                                                      "/" & PICS_ROOT_API & PX_ME_APP_SUPPORT_URI & oct2char(unichar2oct(PX_APP_INSTANCE_ID, "UTF-8")) & "/traffic_rules/" & oct2char(unichar2oct(PX_NON_EXISTENT_TRAFFIC_RULE_ID, "UTF-8")),
                                                      v_headers,
                                                      m_http_message_body_json(
                                                                                m_body_traffic_rule(
                                                                               m_body_json_traffic_rule(
                                                                                                        m_traffic_rule(
                                                                                                                                PX_TRF_RULE_DROP // action
                                                                                                                       PX_TRAFFIC_RULE_ID,
                                                                                                                       -, -, -,
                                                                                                                       DROP
                                                                                                                       )
                                                                                                        )
                                                                                )
@@ -2881,7 +2888,7 @@ module AtsMec_AppEnablementAPI_TestCases {
      alt {
        [] httpPort.receive(
                            mw_http_response(
                                             mw_http_response_412_precondition_failed()
                                             mw_http_response_412_precondition_failed
                                             )) {
          tc_ac.stop;

+4 −2
Original line number Diff line number Diff line
@@ -2,4 +2,6 @@ module AppEnablementAPI_Pics {

  modulepar boolean PICS_APP_ENABLEMENT_API_SUPPORTED := true;

   modulepar boolean PICS_ME_APP_SUPPORT_TIMING_CAPS_URI := true;

} // End of module AppEnablementAPI_Pics
+4 −0
Original line number Diff line number Diff line
@@ -49,6 +49,10 @@ module AppEnablementAPI_Pixits {
  
  modulepar DnsRule_State PX_DNS_INVALID_STATE := UNKNOWN_VALUE;
  
  modulepar SerAvailabilityNotificationSubscription_CallbackReference PX_SRV_AVAIL_NOTIF_CALLBACK_URI := "";
  
  modulepar TrafficRule_Id PX_TRAFFIC_RULE_ID := "trafficRuleId01";

  modulepar TrafficRule_Id PX_NON_EXISTENT_TRAFFIC_RULE_ID := "trafficRuleId99";
  
} // End of module AppEnablementAPI_Pixits 
+80 −2

File changed.

Preview size limit exceeded, changes collapsed.

+5 −5
Original line number Diff line number Diff line
@@ -393,8 +393,8 @@ module AppEnablementAPI_TypesAndValues {
  type record SerAvailabilityNotificationSubscription {
    SerAvailabilityNotificationSubscription_SubscriptionType subscriptionType,
    SerAvailabilityNotificationSubscription_CallbackReference callbackReference,
    Self links,
    ServiceInfo filteringCriteria
    Self links optional,
    ServiceInfo filteringCriteria optional
  }

  /**
@@ -581,9 +581,9 @@ module AppEnablementAPI_TypesAndValues {
   * @desc This type represents the information provided by the mobile edge platform in response to the Timing capabilities Query message.
   */
  type record TimingCaps {
    TimeStamp timeStamp,
    NtpServersList ntpServers,
    TimingCaps_PtpMastersList ptpMasters
    TimeStamp timeStamp optional,
    NtpServersList ntpServers optional,
    TimingCaps_PtpMastersList ptpMasters optional
  }

  /**
Loading