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

Merging mec-common

parent 22f2ddbf

Test Purposes/mec-common.tplan2

+0 −41
Original line number Diff line number Diff line
@@ -7,11 +7,6 @@ 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

<<<<<<< HEAD

=======

=======

>>>>>>> 30cc189361fb673db087a976659c646c4df37670

      - 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
@@ -20,10 +15,6 @@ Package MEC_Common { 
      - 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 

<<<<<<< HEAD

>>>>>>> Resolving conflicts on mec-common between M1 and ubi branches

=======

>>>>>>> 30cc189361fb673db087a976659c646c4df37670

      ;

      entities:

      - MEC_OSS
@@ -33,18 +24,12 @@ Package MEC_Common { 
      - MEC_APP_Registrant

      - MEC_APP_Subscriber

      - UE_APP

<<<<<<< HEAD

<<<<<<< HEAD

=======

      - MEC_SUB

      - RNIS_CLIENT

      - RNIS_SERVER

>>>>>>> Resolving conflicts on mec-common between M1 and ubi branches

=======

      - MEC_SUB

      - RNIS_CLIENT

      - RNIS_SERVER

>>>>>>> 30cc189361fb673db087a976659c646c4df37670

      ;

      events:

      - services_running      // services available in the IUT
@@ -57,11 +42,6 @@ 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

<<<<<<< HEAD

=======

=======

>>>>>>> 30cc189361fb673db087a976659c646c4df37670

      - App_Package_subscription

      - App_Package

      - generates
@@ -82,10 +62,6 @@ Package MEC_Common { 
      - carrier_aggregation_reconfiguration_event

      - S1_bearer_event

      - expiry_notification_event

<<<<<<< HEAD

>>>>>>> Resolving conflicts on mec-common between M1 and ubi branches

=======

>>>>>>> 30cc189361fb673db087a976659c646c4df37670

      ;

   }
@@ -112,10 +88,6 @@ Package MEC_Common { 
      STRING "application/json;charset=utf-8";

      string CONTENT_JSON containing s set to "application/json;charset=utf-8";

      

<<<<<<< HEAD

<<<<<<< HEAD

<<<<<<< HEAD

=======

      string HTTP_200_OK containing s set to "200 OK";

      STRING "200 OK";
@@ -140,11 +112,6 @@ Package MEC_Common { 
      STRING "406 NOT ACCEPTABLE";

      string HTTP_406_NOT_ACCEPTABLE containing s set to "406 NOT ACCEPTABLE";      



>>>>>>> Added negative tests on MEC012 and check ProblemDetails on mec010-2

=======

>>>>>>> Applied folder structure

=======

>>>>>>> 30cc189361fb673db087a976659c646c4df37670

      STRING VALID_TOKEN;

      

      STRING NOT_VALID_TOKEN;
@@ -229,14 +196,6 @@ Package MEC_Common { 
         connection between MEC_Platform_Manager.p and IUT.p

      ;



<<<<<<< HEAD

<<<<<<< HEAD

=======



>>>>>>> Resolving conflicts on mec-common between M1 and ubi branches

=======



>>>>>>> 30cc189361fb673db087a976659c646c4df37670

      Test Configuration Config_MEC_4 containing

         Tester component UE_App of type UeAppComponent

         SUT component IUT of type MecSystemComponent