add first draft of v2.2.1

proto3/.openapi-generator/VERSION

-5.0.0-beta2
+5.3.0
\ No newline at end of file

proto3/README.md

@@ -3,9 +3,9 @@
 The ETSI MEC ISG MEC012 Radio Network Information API described using OpenAPI.
 
 ## Overview
-These files were generated by the [OpenAPI Generator](https://openapi-generator.tech) project. 
+These files were generated by the [OpenAPI Generator](https://openapi-generator.tech) project.
 
-- API version: 2.1.1
+- API version: 2.2.1
 - Package version: 
 - Build package: org.openapitools.codegen.languages.ProtobufSchemaCodegen
 For more information, please visit [https://forge.etsi.org/rep/mec/gs012-rnis-api](https://forge.etsi.org/rep/mec/gs012-rnis-api)

proto3/models/associate_id.proto

@@ -3,7 +3,7 @@
  
   The ETSI MEC ISG MEC012 Radio Network Information API described using OpenAPI.
  
-  The version of the OpenAPI document: 2.1.1
+  The version of the OpenAPI document: 2.2.1
   
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */

proto3/models/ca_reconf_notification.proto

@@ -3,7 +3,7 @@
  
   The ETSI MEC ISG MEC012 Radio Network Information API described using OpenAPI.
  
-  The version of the OpenAPI document: 2.1.1
+  The version of the OpenAPI document: 2.2.1
   
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
@@ -17,6 +17,7 @@ import public "models/ca_reconf_notification_carrier_aggregation_meas_info.proto
 import public "models/ca_reconf_notification_secondary_cell_add.proto";
 import public "models/ecgi.proto";
 import public "models/time_stamp.proto";
+import public "models/links2.proto";
 
 message CaReconfNotification {
 
@@ -37,4 +38,7 @@ message CaReconfNotification {
 
   TimeStamp timeStamp = 7;
 
+  // Links to resources related to this notification.
+  Links2 _links = 8;
+
 }

proto3/models/ca_reconf_notification_carrier_aggregation_meas_info.proto

@@ -3,7 +3,7 @@
  
   The ETSI MEC ISG MEC012 Radio Network Information API described using OpenAPI.
  
-  The version of the OpenAPI document: 2.1.1
+  The version of the OpenAPI document: 2.2.1
   
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */

proto3/models/ca_reconf_notification_secondary_cell_add.proto

@@ -3,7 +3,7 @@
  
   The ETSI MEC ISG MEC012 Radio Network Information API described using OpenAPI.
  
-  The version of the OpenAPI document: 2.1.1
+  The version of the OpenAPI document: 2.2.1
   
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */

proto3/models/ca_reconf_subscription.proto

@@ -3,7 +3,7 @@
  
   The ETSI MEC ISG MEC012 Radio Network Information API described using OpenAPI.
  
-  The version of the OpenAPI document: 2.1.1
+  The version of the OpenAPI document: 2.2.1
   
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
@@ -15,19 +15,25 @@ package mec012;
 import public "models/ca_reconf_subscription_filter_criteria_assoc.proto";
 import public "models/ca_reconf_subscription_links.proto";
 import public "models/time_stamp.proto";
+import public "models/websock_notif_config.proto";
 
 message CaReconfSubscription {
 
-  CaReconfSubscriptionLinks Underscorelinks = 1;
+  CaReconfSubscriptionLinks _links = 1;
 
-  // URI selected by the service consumer to receive notifications on the subscribed RNIS information. This shall be included both in the request and in response.
+  // URI exposed by the client on which to receive notifications via HTTP. See note.
   string callbackReference = 2;
 
   TimeStamp expiryDeadline = 3;
 
   CaReconfSubscriptionFilterCriteriaAssoc filterCriteriaAssoc = 4;
+  
+  WebsockNotifConfig websockNotifConfig = 5;
+
+  // Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009 [6], as described in clause 6.12a.
+  bool requestTestNotification = 6;
 
   // Shall be set to \"CaReconfSubscription\".
-  string subscriptionType = 5;
+  string subscriptionType = 7;
 
 }

proto3/models/ca_reconf_subscription_filter_criteria_assoc.proto

@@ -3,7 +3,7 @@
  
   The ETSI MEC ISG MEC012 Radio Network Information API described using OpenAPI.
  
-  The version of the OpenAPI document: 2.1.1
+  The version of the OpenAPI document: 2.2.1
   
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */

proto3/models/ca_reconf_subscription_links.proto

@@ -3,7 +3,7 @@
  
   The ETSI MEC ISG MEC012 Radio Network Information API described using OpenAPI.
  
-  The version of the OpenAPI document: 2.1.1
+  The version of the OpenAPI document: 2.2.1
   
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */

proto3/models/cell_change_notification.proto

@@ -3,7 +3,7 @@
  
   The ETSI MEC ISG MEC012 Radio Network Information API described using OpenAPI.
  
-  The version of the OpenAPI document: 2.1.1
+  The version of the OpenAPI document: 2.2.1
   
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
@@ -16,6 +16,7 @@ import public "models/associate_id.proto";
 import public "models/cell_change_notification_temp_ue_id.proto";
 import public "models/ecgi.proto";
 import public "models/time_stamp.proto";
+import public "models/links2.proto";
 
 message CellChangeNotification {
 
@@ -42,7 +43,10 @@ message CellChangeNotification {
 
   TimeStamp timeStamp = 6;
 
-  // E-UTRAN Cell Global Identifier of the target cell. NOTE: Cardinality N is valid only in case of statuses IN_PREPARATION, REJECTED and CANCELLED.
+  // E-UTRAN Cell Global Identifier of the target cell.
   repeated Ecgi trgEcgi = 7;
 
+  // Links to resources related to this notification.
+  Links2 _links = 8;
+
 }

proto3/models/cell_change_notification_temp_ue_id.proto

@@ -3,7 +3,7 @@
  
   The ETSI MEC ISG MEC012 Radio Network Information API described using OpenAPI.
  
-  The version of the OpenAPI document: 2.1.1
+  The version of the OpenAPI document: 2.2.1
   
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */

proto3/models/cell_change_subscription.proto

@@ -3,7 +3,7 @@
  
   The ETSI MEC ISG MEC012 Radio Network Information API described using OpenAPI.
  
-  The version of the OpenAPI document: 2.1.1
+  The version of the OpenAPI document: 2.2.1
   
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
@@ -15,12 +15,13 @@ package mec012;
 import public "models/ca_reconf_subscription_links.proto";
 import public "models/cell_change_subscription_filter_criteria_assoc_ho.proto";
 import public "models/time_stamp.proto";
+import public "models/websock_notif_config.proto";
 
 message CellChangeSubscription {
 
-  CaReconfSubscriptionLinks Underscorelinks = 1;
+  CaReconfSubscriptionLinks _links = 1;
 
-  // URI selected by the service consumerto receive notifications on the subscribed RNIS information. This shall be included both in the request and in response.
+  // URI exposed by the client on which to receive notifications via HTTP. See note.
   string callbackReference = 2;
 
   TimeStamp expiryDeadline = 3;
@@ -30,4 +31,9 @@ message CellChangeSubscription {
   // Shall be set to \"CellChangeSubscription\".
   string subscriptionType = 5;
 
+  WebsockNotifConfig websockNotifConfig = 6;
+
+  // Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009 [6], as described in clause 6.12a.
+  bool requestTestNotification = 7;
+
 }

proto3/models/cell_change_subscription_filter_criteria_assoc_ho.proto

@@ -3,7 +3,7 @@
  
   The ETSI MEC ISG MEC012 Radio Network Information API described using OpenAPI.
  
-  The version of the OpenAPI document: 2.1.1
+  The version of the OpenAPI document: 2.2.1
   
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */

proto3/models/ecgi.proto

@@ -3,7 +3,7 @@
  
   The ETSI MEC ISG MEC012 Radio Network Information API described using OpenAPI.
  
-  The version of the OpenAPI document: 2.1.1
+  The version of the OpenAPI document: 2.2.1
   
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */

proto3/models/expiry_notification.proto

 /*
   ETSI GS MEC 012 - Radio Network Information API
- 
+
   The ETSI MEC ISG MEC012 Radio Network Information API described using OpenAPI.
- 
-  The version of the OpenAPI document: 2.1.1
-  
+
+  The version of the OpenAPI document: 2.2.1
+
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -12,15 +12,17 @@ syntax = "proto3";
 
 package mec012;
 
-import public "models/expiry_notification_links.proto";
+import public "models/links2.proto";
 import public "models/time_stamp.proto";
 
 message ExpiryNotification {
 
-  ExpiryNotificationLinks Underscorelinks = 1;
+  string notificationType = 1;
+
+  Links2 _links = 2;
 
-  TimeStamp expiryDeadline = 2;
+  TimeStamp expiryDeadline = 3;
 
-  TimeStamp timeStamp = 3;
+  TimeStamp timeStamp = 4;
 
 }

proto3/models/expiry_notification_links.proto

@@ -3,7 +3,7 @@
  
   The ETSI MEC ISG MEC012 Radio Network Information API described using OpenAPI.
  
-  The version of the OpenAPI document: 2.1.1
+  The version of the OpenAPI document: 2.2.1
   
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */

proto3/models/inline_notification.proto

@@ -3,7 +3,7 @@
 
   The ETSI MEC ISG MEC012 Radio Network Information API described using OpenAPI.
 
-  The version of the OpenAPI document: 2.1.1
+  The version of the OpenAPI document: 2.2.1
 
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
@@ -21,6 +21,8 @@ import public "models/nr_meas_rep_ue_notification.proto";
 import public "models/meas_ta_notification.proto";
 import public "models/ca_reconf_notification.proto";
 import public "models/s1_bearer_notification.proto";
+import public "models/expiry_notification.proto";
+import public "models/test_notification.proto";
 
 message InlineNotification {
   oneof notification {
@@ -33,5 +35,7 @@ message InlineNotification {
     MeasTaNotification MeasTaNotification = 7;
     CaReconfNotification CaReconfNotification = 8;
     S1BearerNotification S1BearerNotification = 9;
+    ExpiryNotification ExpiryNotification = 10;
+    TestNotification TestNotification = 11;
   }
 }

proto3/models/inline_subscription.proto

@@ -3,7 +3,7 @@
 
   The ETSI MEC ISG MEC012 Radio Network Information API described using OpenAPI.
 
-  The version of the OpenAPI document: 2.1.1
+  The version of the OpenAPI document: 2.2.1
 
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */

proto3/models/l2_meas.proto

@@ -3,7 +3,7 @@
  
   The ETSI MEC ISG MEC012 Radio Network Information API described using OpenAPI.
  
-  The version of the OpenAPI document: 2.1.1
+  The version of the OpenAPI document: 2.2.1
   
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */

proto3/models/l2_meas_cell_info.proto

@@ -3,7 +3,7 @@
  
   The ETSI MEC ISG MEC012 Radio Network Information API described using OpenAPI.
  
-  The version of the OpenAPI document: 2.1.1
+  The version of the OpenAPI document: 2.2.1
   
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
@@ -17,56 +17,56 @@ import public "models/ecgi.proto";
 message L2MeasCellInfo {
 
   // It indicates the packet discard rate in percentage of the downlink GBR traffic in a cell, as defined in ETSI TS 136 314 [i.11].
-  int32 dlUnderscoregbrUnderscorepdrUnderscorecell = 1;
+  int32 dl_gbr_pdr_cell = 1;
 
   // It indicates the PRB usage for downlink GBR traffic, as defined in ETSI TS 136 314 [i.11] and ETSI TS 136 423 [i.12].
-  int32 dlUnderscoregbrUnderscoreprbUnderscoreusageUnderscorecell = 2;
+  int32 dl_gbr_prb_usage_cell = 2;
 
   // It indicates the packet discard rate in percentage of the downlink non-GBR traffic in a cell, as defined in ETSI TS 136 314 [i.11].
-  int32 dlUnderscorenongbrUnderscorepdrUnderscorecell = 3;
+  int32 dl_nongbr_pdr_cell = 3;
 
   // It indicates (in percentage) the PRB usage for downlink non-GBR traffic, as defined in ETSI TS 136 314 [i.11] and ETSI TS 136 423 [i.12].
-  int32 dlUnderscorenongbrUnderscoreprbUnderscoreusageUnderscorecell = 4;
+  int32 dl_nongbr_prb_usage_cell = 4;
 
   // It indicates (in percentage) the PRB usage for total downlink traffic, as defined in ETSI TS 136 314 [i.11] and ETSI TS 136 423 [i.12].
-  int32 dlUnderscoretotalUnderscoreprbUnderscoreusageUnderscorecell = 5;
+  int32 dl_total_prb_usage_cell = 5;
 
   Ecgi ecgi = 6;
 
   // It indicates the number of active UEs with downlink GBR traffic, as defined in ETSI TS 136 314 [i.11].
-  int32 numberUnderscoreofUnderscoreactiveUnderscoreueUnderscoredlUnderscoregbrUnderscorecell = 7;
+  int32 number_of_active_ue_dl_gbr_cell = 7;
 
   // It indicates the number of active UEs with downlink non-GBR traffic, as defined in ETSI TS 136 314 [i.11].
-  int32 numberUnderscoreofUnderscoreactiveUnderscoreueUnderscoredlUnderscorenongbrUnderscorecell = 8;
+  int32 number_of_active_ue_dl_nongbr_cell = 8;
 
   // It indicates the number of active UEs with uplink GBR traffic, as defined in ETSI TS 136 314 [i.11].
-  int32 numberUnderscoreofUnderscoreactiveUnderscoreueUnderscoreulUnderscoregbrUnderscorecell = 9;
+  int32 number_of_active_ue_ul_gbr_cell = 9;
 
   // It indicates the number of active UEs with uplink non-GBR traffic, as defined in ETSI TS 136 314 [i.11].
-  int32 numberUnderscoreofUnderscoreactiveUnderscoreueUnderscoreulUnderscorenongbrUnderscorecell = 10;
+  int32 number_of_active_ue_ul_nongbr_cell = 10;
 
-  // It indicates (in percentage) the received dedicated preamples, as defined in ETSI TS 136 314 [i.11].
-  int32 receivedUnderscorededicatedUnderscorepreamblesUnderscorecell = 11;
+  // It indicates (in percentage) the received dedicated preambles, as defined in ETSI TS 136 314 [i.11].
+  int32 received_dedicated_preambles_cell = 11;
 
   // It indicates (in percentage) the received randomly selected preambles in the high range, as defined in ETSI TS 136 314 [i.11].
-  int32 receivedUnderscorerandomlyUnderscoreselectedUnderscorepreamblesUnderscorehighUnderscorerangeUnderscorecell = 12;
+  int32 received_randomly_selected_preambles_high_range_cell = 12;
 
   // It indicates (in percentage) the received randomly selected preambles in the low range, as defined in ETSI TS 136 314 [i.11].
-  int32 receivedUnderscorerandomlyUnderscoreselectedUnderscorepreamblesUnderscorelowUnderscorerangeUnderscorecell = 13;
+  int32 received_randomly_selected_preambles_low_range_cell = 13;
 
   // It indicates the packet discard rate in percentage of the uplink GBR traffic in a cell, as defined in ETSI TS 136 314 [i.11].
-  int32 ulUnderscoregbrUnderscorepdrUnderscorecell = 14;
+  int32 ul_gbr_pdr_cell = 14;
 
   // It indicates (in percentage) the PRB usage for uplink GBR traffic, as defined in ETSI TS 136 314 [i.11] and ETSI TS 136 423 [i.12].
-  int32 ulUnderscoregbrUnderscoreprbUnderscoreusageUnderscorecell = 15;
+  int32 ul_gbr_prb_usage_cell = 15;
 
   // It indicates the packet discard rate in percentage of the uplink non-GBR traffic in a cell, as defined in ETSI TS 136 314 [i.11].
-  int32 ulUnderscorenongbrUnderscorepdrUnderscorecell = 16;
+  int32 ul_nongbr_pdr_cell = 16;
 
   // It indicates (in percentage) the PRB usage for uplink non-GBR traffic, as defined in ETSI TS 136 314 [i.11] and ETSI TS 136 423 [i.12].
-  int32 ulUnderscorenongbrUnderscoreprbUnderscoreusageUnderscorecell = 17;
+  int32 ul_nongbr_prb_usage_cell = 17;
 
   // It indicates (in percentage) the PRB usage for total uplink traffic, as defined in ETSI TS 136 314 [i.11] and ETSI TS 136 423 [i.12].
-  int32 ulUnderscoretotalUnderscoreprbUnderscoreusageUnderscorecell = 18;
+  int32 ul_total_prb_usage_cell = 18;
 
 }