add first draft of v2.2.1

proto3/models/l2_meas_cell_ue_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
 */
@@ -20,53 +20,53 @@ message L2MeasCellUEInfo {
   AssociateId associateId = 1;
 
   // It indicates the data volume of the downlink GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11].
-  int32 dlUnderscoregbrUnderscoredataUnderscorevolumeUnderscoreue = 2;
+  int32 dl_gbr_data_volume_ue = 2;
 
   // It indicates the packet delay of the downlink GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11].
-  int32 dlUnderscoregbrUnderscoredelayUnderscoreue = 3;
+  int32 dl_gbr_delay_ue = 3;
 
   // It indicates the packet discard rate in percentage of the downlink GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11].
-  int32 dlUnderscoregbrUnderscorepdrUnderscoreue = 4;
+  int32 dl_gbr_pdr_ue = 4;
 
   // It indicates the scheduled throughput of the downlink GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11].
-  int32 dlUnderscoregbrUnderscorethroughputUnderscoreue = 5;
+  int32 dl_gbr_throughput_ue = 5;
 
   // It indicates the data volume of the downlink non-GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11].
-  int32 dlUnderscorenongbrUnderscoredataUnderscorevolumeUnderscoreue = 6;
+  int32 dl_nongbr_data_volume_ue = 6;
 
   // It indicates the packet delay of the downlink non-GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11].
-  int32 dlUnderscorenongbrUnderscoredelayUnderscoreue = 7;
+  int32 dl_nongbr_delay_ue = 7;
 
   // It indicates the packet discard rate in percentage of the downlink nonGBR traffic of a UE, as defined in ETSI TS 136 314 [i.11].
-  int32 dlUnderscorenongbrUnderscorepdrUnderscoreue = 8;
+  int32 dl_nongbr_pdr_ue = 8;
 
   // It indicates the scheduled throughput of the downlink nonGBR traffic of a UE, as defined in ETSI TS 136 314 [i.11].
-  int32 dlUnderscorenongbrUnderscorethroughputUnderscoreue = 9;
+  int32 dl_nongbr_throughput_ue = 9;
 
   Ecgi ecgi = 10;
 
   // It indicates the data volume of the uplink GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11].
-  int32 ulUnderscoregbrUnderscoredataUnderscorevolumeUnderscoreue = 11;
+  int32 ul_gbr_data_volume_ue = 11;
 
   // It indicates the packet delay of the uplink GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11].
-  int32 ulUnderscoregbrUnderscoredelayUnderscoreue = 12;
+  int32 ul_gbr_delay_ue = 12;
 
   // It indicates the packet discard rate in percentage of the uplink GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11].
-  int32 ulUnderscoregbrUnderscorepdrUnderscoreue = 13;
+  int32 ul_gbr_pdr_ue = 13;
 
   // It indicates the scheduled throughput of the uplink GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11].
-  int32 ulUnderscoregbrUnderscorethroughputUnderscoreue = 14;
+  int32 ul_gbr_throughput_ue = 14;
 
   // It indicates the data volume of the uplink non-GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11].
-  int32 ulUnderscorenongbrUnderscoredataUnderscorevolumeUnderscoreue = 15;
+  int32 ul_nongbr_data_volume_ue = 15;
 
   // It indicates the packet delay of the uplink non-GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11].
-  int32 ulUnderscorenongbrUnderscoredelayUnderscoreue = 16;
+  int32 ul_nongbr_delay_ue = 16;
 
   // It indicates the packet discard rate in percentage of the uplink nonGBR traffic of a UE, as defined in ETSI TS 136 314 [i.11].
-  int32 ulUnderscorenongbrUnderscorepdrUnderscoreue = 17;
+  int32 ul_nongbr_pdr_ue = 17;
 
   // It indicates the scheduled throughput of the uplink non-GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11].
-  int32 ulUnderscorenongbrUnderscorethroughputUnderscoreue = 18;
+  int32 ul_nongbr_throughput_ue = 18;
 
 }

proto3/models/link_type.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
 */
 

proto3/models/links.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.2.1
+
+  Generated by OpenAPI Generator: https://openapi-generator.tech
+*/
+
+syntax = "proto3";
+
+package mec012;
+
+import public "models/link_type.proto";
+
+message Links {
+
+  LinkType self = 1;
+
+}

proto3/models/links2.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.2.1
+
+  Generated by OpenAPI Generator: https://openapi-generator.tech
+*/
+
+syntax = "proto3";
+
+package mec012;
+
+import public "models/link_type.proto";
+
+message Links2 {
+
+  LinkType subscription = 1;
+
+}

proto3/models/meas_quantity_results_nr.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/meas_rep_ue_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
 */
@@ -20,6 +20,7 @@ import public "models/meas_rep_ue_notification_new_radio_meas_info.proto";
 import public "models/meas_rep_ue_notification_new_radio_meas_nei_info.proto";
 import public "models/time_stamp.proto";
 import public "models/trigger.proto";
+import public "models/links2.proto";
 
 message MeasRepUeNotification {
 
@@ -65,4 +66,6 @@ message MeasRepUeNotification {
 
   Trigger trigger = 15;
 
+  Links2 _links = 16;
+
 }

proto3/models/meas_rep_ue_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/meas_rep_ue_notification_eutran_neighbour_cell_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/meas_rep_ue_notification_new_radio_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/meas_rep_ue_notification_new_radio_meas_nei_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/meas_rep_ue_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
 */
@@ -13,21 +13,27 @@ syntax = "proto3";
 package mec012;
 
 import public "models/ca_reconf_subscription_links.proto";
-import public "models/meas_rep_ue_subscription_filter_criteria_assoc_tri.proto";
+import public "models/links.proto";
 import public "models/time_stamp.proto";
+import public "models/websock_notif_config.proto";
 
 message MeasRepUeSubscription {
 
-  CaReconfSubscriptionLinks Underscorelinks = 1;
+  Links _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 selected by the service consumer to receive notifications on the subscribed RNIS information. This shall be included both in the request and in response. If not present, the service consumer is requesting the use of a Websocket for notifications. See note.
   string callbackReference = 2;
 
-  TimeStamp expiryDeadline = 3;
+  WebsockNotifConfig websockNotifConfig = 3;
 
-  MeasRepUeSubscriptionFilterCriteriaAssocTri filterCriteriaAssocTri = 4;
+  // Set to TRUE by the service consumer to request a test notification on the callbackReference URI to determine if it is reachable by RNIS for notifications.
+  bool requestTestNotification = 4;
+
+  TimeStamp expiryDeadline = 5;
+
+  MeasRepUeSubscriptionFilterCriteriaAssocTri filterCriteriaAssocTri = 6;
 
   // Shall be set to \"MeasRepUeSubscription\".
-  string subscriptionType = 5;
+  string subscriptionType = 7;
 
 }

proto3/models/meas_ta_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
 */
@@ -15,6 +15,7 @@ package mec012;
 import public "models/associate_id.proto";
 import public "models/ecgi.proto";
 import public "models/time_stamp.proto";
+import public "models/links2.proto";
 
 message MeasTaNotification {
 
@@ -31,4 +32,6 @@ message MeasTaNotification {
   // The timing advance as defined in ETSI TS 136 214 [i.5].
   int32 timingAdvance = 5;
 
+  Links2 _links = 6;
+
 }

proto3/models/meas_ta_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
 */
@@ -13,21 +13,27 @@ syntax = "proto3";
 package mec012;
 
 import public "models/ca_reconf_subscription_filter_criteria_assoc.proto";
-import public "models/ca_reconf_subscription_links.proto";
+import public "models/links.proto";
 import public "models/time_stamp.proto";
+import public "models/websock_notif_config.proto";
 
 message MeasTaSubscription {
 
-  CaReconfSubscriptionLinks Underscorelinks = 1;
+  Links _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;
+  WebsockNotifConfig websockNotifConfig = 3;
 
-  CaReconfSubscriptionFilterCriteriaAssoc filterCriteriaAssoc = 4;
+  // 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 = 4;
 
+  TimeStamp expiryDeadline = 5;
+  
+  CaReconfSubscriptionFilterCriteriaAssoc filterCriteriaAssoc = 6;
+  
   // Shall be set to \"MeasTaSubscription\".
-  string subscriptionType = 5;
+  string subscriptionType = 7;
 
 }

proto3/models/nr_meas_rep_ue_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/nr_meas_rep_ue_notification_eutra_neigh_cell_meas_info.pro
 import public "models/nr_meas_rep_ue_notification_nr_neigh_cell_meas_info.proto";
 import public "models/nr_meas_rep_ue_notification_serv_cell_meas_info.proto";
 import public "models/time_stamp.proto";
+import public "models/links2.proto";
 import public "models/trigger_nr.proto";
 
 message NrMeasRepUeNotification {
@@ -40,4 +41,6 @@ message NrMeasRepUeNotification {
 
   TriggerNr triggerNr = 7;
 
+  Links2 _links = 8;
+
 }

proto3/models/nr_meas_rep_ue_notification_eutra_neigh_cell_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
 */
@@ -16,6 +16,7 @@ import public "models/ecgi.proto";
 
 message NrMeasRepUeNotificationEutraNeighCellMeasInfo {
 
+  // E-UTRAN Cell Global Identifier.
   Ecgi ecgi = 1;
 
   // Reference Signal Received Power as defined in ETSI TS 138 331 [i.13].

proto3/models/nr_meas_rep_ue_notification_nr_neigh_cell_meas_info.proto

@@ -14,6 +14,7 @@ package mec012;
 
 import public "models/meas_quantity_results_nr.proto";
 import public "models/rs_index_results.proto";
+import public "models/nrcgi.proto";
 
 message NrMeasRepUeNotificationNrNeighCellMeasInfo {
 
@@ -21,8 +22,8 @@ message NrMeasRepUeNotificationNrNeighCellMeasInfo {
 
   MeasQuantityResultsNr measQuantityResultsSsbCell = 2;
 
-  // String representing the NR Cell Identity. Encoded as a bit string (size (36)) as defined in ETSI TS 138 423 [i.17].
-  string nrcgi = 3;
+  // NR Cell Global Identifier.
+  Nrcgi nrcgi = 3;
 
   RsIndexResults rsIndexResults = 4;
 

proto3/models/nr_meas_rep_ue_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
 */
@@ -12,22 +12,28 @@ syntax = "proto3";
 
 package mec012;
 
-import public "models/ca_reconf_subscription_links.proto";
+import public "models/links.proto";
 import public "models/nr_meas_rep_ue_subscription_filter_criteria_nr_mrs.proto";
 import public "models/time_stamp.proto";
+import public "models/websock_notif_config.proto";
 
 message NrMeasRepUeSubscription {
 
-  CaReconfSubscriptionLinks Underscorelinks = 1;
+  Links _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;
+  WebsockNotifConfig websockNotifConfig = 3;
 
-  NrMeasRepUeSubscriptionFilterCriteriaNrMrs filterCriteriaNrMrs = 4;
+  // 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 = 4;
+
+  TimeStamp expiryDeadline = 5;
+
+  NrMeasRepUeSubscriptionFilterCriteriaNrMrs filterCriteriaNrMrs = 6;
 
   // Shall be set to \"NrMeasRepUeSubscription\".
-  string subscriptionType = 5;
+  string subscriptionType = 7;
 
 }

proto3/models/nrcgi.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.2.1
+
+  Generated by OpenAPI Generator: https://openapi-generator.tech
+*/
+
+syntax = "proto3";
+
+package mec012;
+
+import public "models/plmn.proto";
+
+message Nrcgi {
+
+  // String representing the NR Cell Identity. Encoded as a bit string (size (36)) as defined in ETSI TS 138 423 [i.17].
+  string nrCellId = 1;
+
+  Plmn plmn = 2;
+
+}

proto3/models/plmn.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/plmn_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
 */