Commit daf76122 authored by Elian Kraja's avatar Elian Kraja
Browse files

Resolving conflicts on mec-common between M1 and ubi branches

parent 2b7a1fb6
Loading
Loading
Loading
Loading
+44 −2
Original line number Diff line number Diff line
@@ -7,6 +7,17 @@ Package MEC_Common {
      - PIC_MEC_SYSTEM     // FUT is a MEC System (MEC025, Table 7.9.1-1)
      - PIC_SERVICES // Implements services
      - PIC_NOTIFICATIONS // Implements notifications
<<<<<<< HEAD
=======
      - 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 
>>>>>>> Resolving conflicts on mec-common between M1 and ubi branches
      ;
      entities:
      - MEC_OSS
@@ -16,6 +27,12 @@ Package MEC_Common {
      - MEC_APP_Registrant
      - MEC_APP_Subscriber
      - UE_APP
<<<<<<< HEAD
=======
      - MEC_SUB
      - RNIS_CLIENT
      - RNIS_SERVER
>>>>>>> Resolving conflicts on mec-common between M1 and ubi branches
      ;
      events:
      - services_running      // services available in the IUT
@@ -28,6 +45,29 @@ Package MEC_Common {
      - having
      - idle_state // Idle state: The MEC platform has services running and MEC Application is authorized to consume services
      - subscribed_to
<<<<<<< HEAD
=======
      - 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
>>>>>>> Resolving conflicts on mec-common between M1 and ubi branches
      ;
   }
   
@@ -168,6 +208,10 @@ Package MEC_Common {
         connection between MEC_Platform_Manager.p and IUT.p
      ;

<<<<<<< HEAD
=======

>>>>>>> Resolving conflicts on mec-common between M1 and ubi branches
      Test Configuration Config_MEC_4 containing
         Tester component UE_App of type UeAppComponent
         SUT component IUT of type MecSystemComponent
@@ -175,6 +219,4 @@ Package MEC_Common {
      ;

   }
   
   
}