Commit 37eebb89 authored by Michele Carignani's avatar Michele Carignani
Browse files

update PICS and Config according to latest contributions

parent 7815e943
Loading
Loading
Loading
Loading
+65 −61
Original line number Diff line number Diff line
@@ -2,19 +2,22 @@ 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_MANAGEMENT      // MEC025, table 7.3.2-1
      - PIC_APP_PACKAGE_NOTIFICATIONS      // MEC025, table 7.3.2-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 
      - PIC_APP_LCM_MANAGEMENT           // MEC032, table xxxxy
      - PIC_APP_LCM_NOTIFICATIONS        // MEC032, table xxxxz

      // Some PICS in this list are referenced to 
      // PICS item in MEC 032 part 1, Clause A.4

      - PIC_MEC_PLAT
      - PIC_MEC_SYSTEM
      - PIC_SERVICES
      - PIC_NOTIFICATIONS
      - PIC_APP_PACKAGE_MANAGEMENT
      - PIC_APP_PACKAGE_NOTIFICATIONS
      - PIC_RNIS_QUERY
      - PIC_RNIS_ALL_SUBSCRIPTIONS
      - PIC_RNIS_SPECIFIC_SUBSCRIPTION
      - PIC_RNIS_NOTIFICATIONS
      - PIC_APP_LCM_MANAGEMENT
      - PIC_APP_LCM_NOTIFICATIONS
      - PIC_AMS
      - PIC_AMS_NOTIFICATIONS
      - PIC_GRANTS_MANAGEMENT
@@ -22,33 +25,36 @@ Package MEC_Common {
      entities:
      - MEC_OSS
      - MEO
      - MEC_APP  // MEC Application using the MEC Platform Application Enablement API
      - IUT      // MEC Platform
      - MEPM
      - MEC_APP
      - IUT
      - DEV_APP
      - MEC_PROVIDER
      - MEC_CONSUMER
      // Specialization of base components
      - MEC_APP_Registrant
      - MEC_APP_Subscriber
      - UE_APP
      - MEC_SUB
      - RNIS_CLIENT
      - RNIS_SERVER
      - MEC_SUB
      - RNIS_CLIENT
      - RNIS_SERVER
      - MEPM
      - AMS_CLIENT
      - AMS_SERVER
      - MEC_PROVIDER
      - MEC_CONSUMER
      ;
      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
      - started               // component is up and running
      - authorised            // component is authenticated and authorised to use services
      - consume_services      // component is can use services
      - receives              // component receives an HTTP request
      - sends                 // component sends an HTTP response
      - being_in
      - having
      - idle_state // Idle state: The MEC platform has services running and MEC Application is authorized to consume services
      // Idle state: The MEC platform has services running and MEC Application 
      // is authorized to consume services
      - idle_state 
      - subscribed_to
      - App_Package_subscription
      - App_Package
@@ -85,7 +91,8 @@ Package MEC_Common {
      type string with s of type STRING;
      
      type HttpHeaders with
         content_type of type STRING,    // content_type is optional, since not present in GET and DELETE. How to express this concept?
         // content_type is optional, since not present in GET and DELETE
         content_type of type STRING,    
         authorization of type STRING,
         accept of type STRING
        ;
@@ -98,18 +105,15 @@ Package MEC_Common {
         uri of type  STRING,
         headers of type HttpHeaders,
         status_code of type STRING,
         body of type JSON   // body is optional, since not present in GET and DELETE. How to express this concept?
         // body is optional, since not present in GET and DELETE 
         body of type JSON   
      ;

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

      STRING "application/json";
      
      STRING "application/octet-stream";

      HttpHeaders vHeadersInvalidToken containing
@@ -160,17 +164,17 @@ Package MEC_Common {

   Configuration {

      Interface Type myPort accepts string;
      Interface Type apiPort accepts string;

      Component Type MecAppComponent with gate p of type myPort; 
      Component Type MecPlatformComponent with gate p of type myPort;
      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;
      Component Type MecGenericProvider with gate p of type myPort;
      Component Type MecGenericConsumer with gate p of type myPort;
      Component Type MecAppComponent with gate p of type apiPort; 
      Component Type MecPlatformComponent with gate p of type apiPort;
      Component Type MecOss with gate p of type apiPort;
      Component Type MecOrchestrator with gate p of type apiPort;
      Component Type MecPlatformManagerComponent with gate p of type apiPort;
      Component Type DevAppComponent with gate p of type apiPort; 
      Component Type MecSystemComponent with gate p of type apiPort;
      Component Type MecGenericProvider with gate p of type apiPort;
      Component Type MecGenericConsumer with gate p of type apiPort;

      Test Configuration Config_MEC_1 containing
         Tester component MEC_App of type MecAppComponent
@@ -185,20 +189,20 @@ Package MEC_Common {
      ;

      Test Configuration Config_MEC_3 containing
         Tester component MEC_Platform_Manager of type MecPlatformManager
         Tester component MEC_Platform_Manager of type MecPlatformManagerComponent
         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
         Tester component Dev_App of type DevAppComponent
         SUT component IUT of type MecSystemComponent
         connection between UE_App.p and IUT.p
         connection between Dev_App.p and IUT.p
      ;

      Test Configuration Config_MEC_5 containing
         Tester component MecOrchestrator of type MecOrchestrator
         SUT component IUT of type MEC_Platform_Manager
         SUT component IUT of type MecPlatformManagerComponent
         connection between MEO.p and IUT.p
      ;