Commit 30cc1893 authored by Elian Kraja's avatar Elian Kraja
Browse files

Resolving conflicts on mec-common between M1 and ubi branches

parent 298c9836

Test Purposes/mec-common.tplan2

+57 −3
Original line number Diff line number Diff line 
Package MEC_Common {

   

   Domain {

      pics:

      // Any PICS in this list shall reference a PICS item in MEC 025 clause 7

      - PIC_MEC_PLAT // FUT is a MEC Platform (MEC025, Table 7.4.2-1 item 1)

      - PIC_MEC_SYSTEM     // FUT is a MEC System (MEC025, Table 7.9.1-1)

      - PIC_SERVICES // Implements services

      - PIC_NOTIFICATIONS // Implements notifications

      - PIC_APP_PACKAGE               // MEC025, clause 7.3.2

      - PIC_APP_PACKAGE_MANAGEMENT      // MEC025, table 7.3.2-1

      - PIC_APP_PACKAGE_NOTIFICATIONS      // MEC025, table 7.3.2-2

      - PIC_RNIS                         // MEC025, clause 7.5.2

      - PIC_RNIS_QUERY                   // MEC025, table 7.5.2-1

      - PIC_RNIS_ALL_SUBSCRIPTIONS       // MEC025, table 7.5.2-2

      - PIC_RNIS_SPECIFIC_SUBSCRIPTION   // MEC025, table 7.5.2-3

      - PIC_RNIS_NOTIFICATIONS           // MEC025, table 7.5.2-4 

      ;

      entities:

      - MEC_OSS

      - MEO
@@ -8,12 +23,42 @@ Package MEC_Common { 
      - IUT      // MEC Platform

      - MEC_APP_Registrant

      - MEC_APP_Subscriber

      - UE_APP

      - MEC_SUB

      - RNIS_CLIENT

      - RNIS_SERVER

      ;

      events:

      - services_running      // services available in the IUT

      - started               // MEC_APP up and running

      - authorised            // MEC_APP authenticated and authorised to use services

      - consume_services      // MEC_APP can use services

      - receives              // IUT receives an HTTP request

      - sends                 // IUT sends an HTTP response

      - having

      - being_in

      - having

      - idle_state // Idle state: The MEC platform has services running and MEC Application is authorized to consume services

      - subscribed_to

      - App_Package_subscription

      - App_Package

      - generates

      - idle_state

      - app_package_operational_change_event

      - perform_RNIS_query_to

      - having_RNIS_subscription

      - having_RNIS_subscription_privileges

      - privileges

      - RNIS_subscription

      - perform_RNIS_subscription_query_to

      - cell_change_event

      - rab_establish_event

      - rab_modification_event

      - rab_release_event

      - measurement_repost_event

      - timing_advance_event

      - carrier_aggregation_reconfiguration_event

      - S1_bearer_event

      - expiry_notification_event

      ;

   }
@@ -33,6 +78,7 @@ Package MEC_Common { 
      type HttpMsg with

         uri of type  STRING,

         headers of type HttpHeaders,

         status_code of type STRING,      // TODO status_code is optional. How to express this concept?

         body of type JSON   // body is optional, since not present in GET and DELETE. How to express this concept?

      ;
@@ -103,6 +149,8 @@ Package MEC_Common { 
      Component Type MecOss with gate p of type myPort;

      Component Type MecOrchestrator with gate p of type myPort;

      Component Type MecPlatformManager with gate p of type myPort;

      Component Type UeAppComponent with gate p of type myPort; 

      Component Type MecSystemComponent with gate p of type myPort;

      

      Test Configuration Config_MEC_1 containing

         Tester component MEC_App of type MecAppComponent
@@ -121,7 +169,13 @@ Package MEC_Common { 
         SUT component IUT of type MecOrchestrator

         connection between MEC_Platform_Manager.p and IUT.p

      ;

   }





      Test Configuration Config_MEC_4 containing

         Tester component UE_App of type UeAppComponent

         SUT component IUT of type MecSystemComponent

         connection between UE_App.p and IUT.p

      ;



   }

}