review update

proto3/models/rab_info_erab_info.proto

@@ -12,13 +12,13 @@ syntax = "proto3";
 
 package mec012;
 
-import public "models/rab_info_erab_qos_parameters.proto";
+import public "models/rab_est_notification_erab_qos_parameters.proto";
 
 message RabInfoErabInfo {
 
   // The attribute that uniquely identifies a Radio Access bearer for specific UE as defined in ETSI TS 136 413 [i.3].
   int32 erabId = 1;
 
-  RabInfoErabQosParameters erabQosParameters = 2;
+  RabEstNotificationErabQosParameters erabQosParameters = 2;
 
 }

proto3/models/rab_info_erab_qos_parameters_qos_information.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
-  
-  Generated by OpenAPI Generator: https://openapi-generator.tech
-*/
-
-syntax = "proto3";
-
-package mec012;
-
-
-message RabInfoErabQosParametersQosInformation {
-
-  // This attribute indicates the guaranteed downlink E-RAB Bit Rate as defined in ETSI TS 123 401 [i.4] for this bearer.
-  int32 erabGbrDl = 1;
-
-  // This attribute indicates the guaranteed uplink E-RAB Bit Rate as defined in ETSI TS 123 401 [i.4] for this bearer.
-  int32 erabGbrUl = 2;
-
-  // This attribute indicates the maximum downlink E-RAB Bit Rate as defined in ETSI TS 123 401 [i.4] for this bearer.
-  int32 erabMbrDl = 3;
-
-  // This attribute indicates the maximum uplink E-RAB Bit Rate as defined in ETSI TS 123 401 [i.4] for this bearer.
-  int32 erabMbrUl = 4;
-
-}

proto3/models/rab_mod_notification.proto

@@ -22,7 +22,6 @@ message RabModNotification {
   // 0 to N identifiers to bind the event for a specific UE or flow. 
   repeated AssociateId associateId = 1;
 
-  // E-UTRAN Cell Global Identifier.
   Ecgi ecgi = 2;
 
   // The attribute that uniquely identifies a Radio Access bearer for specific UE as defined in ETSI TS 136 413 [i.3].
@@ -33,7 +32,6 @@ message RabModNotification {
   // Shall be set to \"RabModNotification\".
   string notificationType = 5;
 
-  // Time stamp.
   TimeStamp timeStamp = 6;
 
 }

proto3/models/rab_mod_subscription.proto

@@ -23,7 +23,6 @@ message RabModSubscription {
   // 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.
   string callbackReference = 2;
 
-  // Time stamp.
   TimeStamp expiryDeadline = 3;
 
   RabModSubscriptionFilterCriteriaQci filterCriteriaQci = 4;

proto3/models/rab_rel_notification.proto

@@ -22,7 +22,6 @@ message RabRelNotification {
   // 0 to N identifiers to bind the event for a specific UE or flow as defined below.
   repeated AssociateId associateId = 1;
 
-  // E-UTRAN Cell Global Identifier.
   Ecgi ecgi = 2;
 
   RabRelNotificationErabReleaseInfo erabReleaseInfo = 3;
@@ -30,7 +29,6 @@ message RabRelNotification {
   // Shall be set to \"RabRelNotification\".
   string notificationType = 4;
 
-  // Time stamp.
   TimeStamp timeStamp = 5;
 
 }

proto3/models/rab_rel_subscription.proto

@@ -23,7 +23,6 @@ message RabRelSubscription {
   // 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.
   string callbackReference = 2;
 
-  // Time stamp.
   TimeStamp expiryDeadline = 3;
 
   RabModSubscriptionFilterCriteriaQci filterCriteriaQci = 4;

proto3/models/results_per_csi_rs_index_list.proto

@@ -12,10 +12,10 @@ syntax = "proto3";
 
 package mec012;
 
-import public "models/results_per_csi_rs_index.proto";
+import public "models/results_per_csi_rs_index_list_results_per_csi_rs_index.proto";
 
 message ResultsPerCsiRsIndexList {
 
-  repeated ResultsPerCsiRsIndex resultsPerCsiRsIndex = 1;
+  repeated ResultsPerCsiRsIndexListResultsPerCsiRsIndex resultsPerCsiRsIndex = 1;
 
 }

proto3/models/nr_meas_rep_ue_subscription_links.proto → proto3/models/results_per_csi_rs_index_list_results_per_csi_rs_index.proto

@@ -12,11 +12,12 @@ syntax = "proto3";
 
 package mec012;
 
-import public "models/link_type.proto";
+import public "models/meas_quantity_results_nr.proto";
 
-message NrMeasRepUeSubscriptionLinks {
+message ResultsPerCsiRsIndexListResultsPerCsiRsIndex {
 
-  // Self-referring URI. The URI shall be unique within the RNI API as it acts as an ID for the subscription.
-  LinkType self = 1;
+  int32 csiRsIndex = 1;
+
+  MeasQuantityResultsNr csiRsResults = 2;
 
 }

proto3/models/results_per_ssb_index_list.proto

@@ -12,10 +12,10 @@ syntax = "proto3";
 
 package mec012;
 
-import public "models/results_per_ssb_index.proto";
+import public "models/results_per_ssb_index_list_results_per_ssb_index.proto";
 
 message ResultsPerSsbIndexList {
 
-  repeated ResultsPerSsbIndex resultsPerSsbIndex = 1;
+  repeated ResultsPerSsbIndexListResultsPerSsbIndex resultsPerSsbIndex = 1;
 
 }

proto3/models/rab_info_erab_qos_parameters.proto → proto3/models/results_per_ssb_index_list_results_per_ssb_index.proto

@@ -12,13 +12,12 @@ syntax = "proto3";
 
 package mec012;
 
-import public "models/rab_info_erab_qos_parameters_qos_information.proto";
+import public "models/meas_quantity_results_nr.proto";
 
-message RabInfoErabQosParameters {
+message ResultsPerSsbIndexListResultsPerSsbIndex {
 
-  // QoS Class Identifier as defined in ETSI TS 123 401 [i.4].
-  int32 qci = 1;
+  int32 ssbIndex = 1;
 
-  RabInfoErabQosParametersQosInformation qosInformation = 2;
+  MeasQuantityResultsNr ssbResults = 2;
 
 }

proto3/models/rs_index_results.proto

@@ -17,10 +17,8 @@ import public "models/results_per_ssb_index_list.proto";
 
 message RsIndexResults {
 
-  // Beam level measurement results based on CSI-RS related measurements.
   ResultsPerCsiRsIndexList resultsCsiRsIndexes = 1;
 
-  // Beam level measurement results based on SS/PBCH related measurements.
   ResultsPerSsbIndexList resultsSsbIndexes = 2;
 
 }

proto3/models/s1_bearer_info.proto

@@ -20,7 +20,6 @@ message S1BearerInfo {
   // Information on a specific UE as defined below.
   repeated S1BearerInfoS1UeInfo s1UeInfo = 1;
 
-  // Time stamp. 
   TimeStamp timeStamp = 2;
 
 }

proto3/models/s1_bearer_notification.proto

@@ -21,16 +21,11 @@ message S1BearerNotification {
   string notificationType = 1;
 
   // The subscribed event that triggered this notification in S1BearerSubscription.
-  enum S1EventEnum {
-    SEE_DESCRIPTION = 0;
-  }
-
-  S1EventEnum s1Event = 2;
+  int32 s1Event = 2;
 
   // Information on specific UE that matches the criteria in S1BearerSubscription as defined below.
   repeated S1BearerNotificationS1UeInfo s1UeInfo = 3;
 
-  // Time stamp.
   TimeStamp timeStamp = 4;
 
 }

proto3/models/s1_bearer_notification_s1_bearer_info.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
-  
-  Generated by OpenAPI Generator: https://openapi-generator.tech
-*/
-
-syntax = "proto3";
-
-package mec012;
-
-import public "models/s1_bearer_info_enb_info.proto";
-import public "models/s1_bearer_info_s_gw_info.proto";
-
-message S1BearerNotificationS1BearerInfo {
-
-  S1BearerInfoEnbInfo enbInfo = 1;
-
-  // The attribute that uniquely identifies a S1 bearer for a specific UE, as defined in ETSI TS 136 413 [i.3].
-  int32 erabId = 2;
-
-  S1BearerInfoSGwInfo sGwInfo = 3;
-
-}

proto3/models/s1_bearer_notification_s1_ue_info.proto

@@ -15,7 +15,7 @@ package mec012;
 import public "models/associate_id.proto";
 import public "models/cell_change_notification_temp_ue_id.proto";
 import public "models/ecgi.proto";
-import public "models/s1_bearer_notification_s1_bearer_info.proto";
+import public "models/s1_bearer_info_s1_bearer_info_detailed.proto";
 
 message S1BearerNotificationS1UeInfo {
 
@@ -26,7 +26,7 @@ message S1BearerNotificationS1UeInfo {
   repeated Ecgi ecgi = 2;
 
   // S1 bearer information as defined below.
-  repeated S1BearerNotificationS1BearerInfo s1BearerInfo = 3;
+  repeated S1BearerInfoS1BearerInfoDetailed s1BearerInfo = 3;
 
   CellChangeNotificationTempUeId tempUeId = 4;
 

proto3/models/s1_bearer_subscription.proto

@@ -25,10 +25,9 @@ message S1BearerSubscription {
   // URI selected by the service consumer, to receive notifications on the subscribed RNIS information. This shall be included in the request and response.
   string callbackReference = 3;
 
-  // Description of the subscribed event. The event is included both in the request and in the response. \\nFor the eventType, the following values are currently defined: 0 = RESERVED. 1 = S1_BEARER_ESTABLISH. 2 = S1_BEARER_MODIFY. 3 = S1_BEARER_RELEASE.
+  // Description of the subscribed event. The event is included both in the request and in the response. \\nFor the eventType, the following values are currently defined: <p>0 = RESERVED. <p>1 = S1_BEARER_ESTABLISH. <p>2 = S1_BEARER_MODIFY. <p>3 = S1_BEARER_RELEASE.
   repeated int32 eventType = 4;
 
-  // Time stamp.
   TimeStamp expiryDeadline = 5;
 
   // Shall be set to \"S1BearerSubscription\".

proto3/services/_service.proto → proto3/services/rni_service.proto

@@ -26,7 +26,7 @@ import public "models/inline_response201.proto";
 import public "models/inline_response400.proto";
 import public "models/inline_response403.proto";
 
-service DefaultService {
+service RniService {
   rpc Layer2MeasInfoGET (Layer2MeasInfoGETRequest) returns (InlineResponse2003);
 
   rpc PlmnInfoGET (PlmnInfoGETRequest) returns (InlineResponse2001);
@@ -182,7 +182,7 @@ message S1BearerInfoGETRequest {
 }
 
 message SubscriptionLinkListSubscriptionsGETRequest {
-  // Subscription type filter
+  // Filter on a specific subscription type. Permitted values: cell_change, rab_est, rab_mod, rab_rel, meas_rep_ue, nr_meas_rep_ue, timing_advance_ue, ca_reconf, s1_bearer.
   string subscriptionType = 1;
 
 }