review update

proto3/.openapi-generator/FILES

@@ -55,7 +55,6 @@ models/nr_meas_rep_ue_notification_s_cell.proto
 models/nr_meas_rep_ue_notification_serv_cell_meas_info.proto
 models/nr_meas_rep_ue_subscription.proto
 models/nr_meas_rep_ue_subscription_filter_criteria_nr_mrs.proto
-models/nr_meas_rep_ue_subscription_links.proto
 models/plmn.proto
 models/plmn_info.proto
 models/problem_details.proto
@@ -68,8 +67,6 @@ models/rab_est_subscription_filter_criteria_qci.proto
 models/rab_info.proto
 models/rab_info_cell_user_info.proto
 models/rab_info_erab_info.proto
-models/rab_info_erab_qos_parameters.proto
-models/rab_info_erab_qos_parameters_qos_information.proto
 models/rab_info_ue_info.proto
 models/rab_mod_notification.proto
 models/rab_mod_notification_erab_qos_parameters.proto
@@ -81,8 +78,10 @@ models/rab_rel_notification_erab_release_info.proto
 models/rab_rel_subscription.proto
 models/results_per_csi_rs_index.proto
 models/results_per_csi_rs_index_list.proto
+models/results_per_csi_rs_index_list_results_per_csi_rs_index.proto
 models/results_per_ssb_index.proto
 models/results_per_ssb_index_list.proto
+models/results_per_ssb_index_list_results_per_ssb_index.proto
 models/rs_index_results.proto
 models/s1_bearer_info.proto
 models/s1_bearer_info_enb_info.proto
@@ -90,7 +89,6 @@ models/s1_bearer_info_s1_bearer_info_detailed.proto
 models/s1_bearer_info_s1_ue_info.proto
 models/s1_bearer_info_s_gw_info.proto
 models/s1_bearer_notification.proto
-models/s1_bearer_notification_s1_bearer_info.proto
 models/s1_bearer_notification_s1_ue_info.proto
 models/s1_bearer_subscription.proto
 models/s1_bearer_subscription_s1_bearer_subscription_criteria.proto
@@ -100,4 +98,4 @@ models/subscription_link_list_links_subscription.proto
 models/time_stamp.proto
 models/trigger.proto
 models/trigger_nr.proto
-services/_service.proto
+services/rni_service.proto

proto3/models/associate_id.proto

@@ -15,13 +15,13 @@ package mec012;
 
 message AssociateId {
 
-  // Numeric value (0-255) corresponding to specified type of identifier as following: 0 = reserved. 1= UE_IPv4_ADDRESS. 2 = UE_IPV6_ADDRESS. 3 = NATED_IP_ADDRESS. 4 = GTP_TEID.
+  // Numeric value (0-255) corresponding to specified type of identifier as following: <p>0 = reserved. <p>1 = UE_IPv4_ADDRESS. <p>2 = UE_IPV6_ADDRESS. <p>3 = NATED_IP_ADDRESS. <p>4 = GTP_TEID.
   enum TypeEnum {
-    _0_RESERVED = 0;
-    _1_UE_IPV4_ADDRESS = 1;
-    _2_UE_IPV6_ADDRESS = 2;
-    _3_NATED_IP_ADDRESS = 3;
-    _4_GTP_TEID = 4;
+    _0 = 0;
+    _1 = 1;
+    _2 = 2;
+    _3 = 3;
+    _4 = 4;
   }
 
   TypeEnum type = 1;

proto3/models/ca_reconf_notification.proto

@@ -26,7 +26,6 @@ message CaReconfNotification {
   // This parameter can be repeated to contain information of all the carriers assign for Carrier Aggregation up to M.
   repeated CaReconfNotificationCarrierAggregationMeasInfo carrierAggregationMeasInfo = 2;
 
-  // E-UTRAN Cell Global Identifier.
   Ecgi ecgi = 3;
 
   // Shall be set to \"CaReConfNotification\".
@@ -36,7 +35,6 @@ message CaReconfNotification {
 
   repeated CaReconfNotificationSecondaryCellAdd secondaryCellRemove = 6;
 
-  // Time stamp.
   TimeStamp timeStamp = 7;
 
 }

proto3/models/ca_reconf_notification_carrier_aggregation_meas_info.proto

@@ -15,10 +15,10 @@ package mec012;
 
 message CaReconfNotificationCarrierAggregationMeasInfo {
 
-  // E-UTRAN Cell Identity of the best neighbouring cell associated with the Carrier Aggregation serving cell.
+  // String representing the E-UTRAN Cell Identity. Encoded as a bit string (size (28)) as defined in ETSI TS 136 413 [i.3].
   string cellIdNei = 1;
 
-  // E-UTRAN Cell Identity of a Carrier Aggregation serving cell.
+  // String representing the E-UTRAN Cell Identity. Encoded as a bit string (size (28)) as defined in ETSI TS 136 413 [i.3].
   string cellIdSrv = 2;
 
   // Reference Signal Received Power as defined in ETSI TS 136 214 [i.5].

proto3/models/ca_reconf_notification_secondary_cell_add.proto

@@ -16,7 +16,6 @@ import public "models/ecgi.proto";
 
 message CaReconfNotificationSecondaryCellAdd {
 
-  // E-UTRAN Cell Global Identifier.
   Ecgi ecgi = 1;
 
 }

proto3/models/ca_reconf_subscription.proto

@@ -23,7 +23,6 @@ message CaReconfSubscription {
   // 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;
 
   CaReconfSubscriptionFilterCriteriaAssoc filterCriteriaAssoc = 4;

proto3/models/ca_reconf_subscription_links.proto

@@ -16,7 +16,6 @@ import public "models/link_type.proto";
 
 message CaReconfSubscriptionLinks {
 
-  // Self referring URI. The URI shall be unique within the RNI API as it acts as an ID for the subscription.
   LinkType self = 1;
 
 }

proto3/models/cell_change_notification.proto

@@ -22,13 +22,13 @@ message CellChangeNotification {
   // 0 to N identifiers to associate the event for a specific UE or flow.
   repeated AssociateId associateId = 1;
 
-  // Indicate the status of the UE handover procedure. Values are defined as following: 1 = IN_PREPARATION. 2 = IN_EXECUTION. 3 = COMPLETED. 4 = REJECTED. 5 = CANCELLED.
+  // Indicate the status of the UE handover procedure. Values are defined as following: <p>1 = IN_PREPARATION. <p>2 = IN_EXECUTION. <p>3 = COMPLETED. <p>4 = REJECTED. <p>5 = CANCELLED.
   enum HoStatusEnum {
-    _1_IN_PREPARATION = 0;
-    _2_IN_EXECUTION = 1;
-    _3_COMPLETED = 2;
-    _4_REJECTED = 3;
-    _5_CANCELLED = 4;
+    _1 = 0;
+    _2 = 1;
+    _3 = 2;
+    _4 = 3;
+    _5 = 4;
   }
 
   HoStatusEnum hoStatus = 2;
@@ -36,12 +36,10 @@ message CellChangeNotification {
   // Shall be set to \"CellChangeNotification\".
   string notificationType = 3;
 
-  // E-UTRAN Cell Global Identifier of the source cell.
   Ecgi srcEcgi = 4;
 
   CellChangeNotificationTempUeId tempUeId = 5;
 
-  // Time stamp.
   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.

proto3/models/cell_change_subscription.proto

@@ -20,10 +20,9 @@ message CellChangeSubscription {
 
   CaReconfSubscriptionLinks Underscorelinks = 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 consumerto 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;
 
   CellChangeSubscriptionFilterCriteriaAssocHo filterCriteriaAssocHo = 4;

proto3/models/cell_change_subscription_filter_criteria_assoc_ho.proto

@@ -26,7 +26,7 @@ message CellChangeSubscriptionFilterCriteriaAssocHo {
   // E-UTRAN Cell Global Identifier.
   repeated Ecgi ecgi = 3;
 
-  // In case hoStatus is not included in the subscription request, the default value 3 = COMPLETED shall be used and included in the response: 1 = IN_PREPARATION. 2 = IN_EXECUTION. 3 = COMPLETED. 4 = REJECTED. 5 = CANCELLED.
+  // In case hoStatus is not included in the subscription request, the default value 3 = COMPLETED shall be used and included in the response: <p>1 = IN_PREPARATION. <p>2 = IN_EXECUTION. <p>3 = COMPLETED. <p>4 = REJECTED. <p>5 = CANCELLED.
   repeated int32 hoStatus = 4;
 
 }

proto3/models/ecgi.proto

@@ -16,10 +16,9 @@ import public "models/plmn.proto";
 
 message Ecgi {
 
-  // E-UTRAN Cell Global Identifier.
+  // String representing the E-UTRAN Cell Identity. Encoded as a bit string (size (28)) as defined in ETSI TS 136 413 [i.3].
   string cellId = 1;
 
-  // Public Land Mobile Network Identity.
   Plmn plmn = 2;
 
 }

proto3/models/expiry_notification.proto

@@ -19,10 +19,8 @@ message ExpiryNotification {
 
   ExpiryNotificationLinks Underscorelinks = 1;
 
-  // Time stamp.
   TimeStamp expiryDeadline = 2;
 
-  // Time stamp.
   TimeStamp timeStamp = 3;
 
 }

proto3/models/l2_meas.proto

@@ -24,7 +24,6 @@ message L2Meas {
   // The per cell per UE layer 2 measurements information as defined below.
   repeated L2MeasCellUEInfo cellUEInfo = 2;
 
-  // Time stamp.
   TimeStamp timeStamp = 3;
 
 }

proto3/models/l2_meas_cell_info.proto

@@ -31,7 +31,6 @@ message L2MeasCellInfo {
   // 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;
 
-  // E-UTRAN Cell Global Identifier.
   Ecgi ecgi = 6;
 
   // It indicates the number of active UEs with downlink GBR traffic, as defined in ETSI TS 136 314 [i.11].

proto3/models/l2_meas_cell_ue_info.proto

@@ -17,7 +17,6 @@ import public "models/ecgi.proto";
 
 message L2MeasCellUEInfo {
 
-  // Identifier to associate the information for a specific UE or flow.
   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].
@@ -44,7 +43,6 @@ message L2MeasCellUEInfo {
   // 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;
 
-  // E-UTRAN Cell Global Identifier.
   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].

proto3/models/meas_rep_ue_notification.proto

@@ -29,7 +29,6 @@ message MeasRepUeNotification {
   // This parameter can be repeated to contain information of all the carriers assign for Carrier Aggregation up to M.
   repeated MeasRepUeNotificationCarrierAggregationMeasInfo carrierAggregationMeasInfo = 2;
 
-  // E-UTRAN Cell Global Identifier of the Primary serving Cell (PCell), as defined in ETSI TS 136 331 [i.7].
   Ecgi ecgi = 3;
 
   // This parameter can be repeated to contain information of all the neighbouring cells up to N.
@@ -62,10 +61,8 @@ message MeasRepUeNotification {
   // Reference Signal \"Signal to Interference plus Noise Ratio\", with value mapping defined in ETSI TS 136 133 [i.16].
   int32 sinr = 13;
 
-  // Time stamp.
   TimeStamp timeStamp = 14;
 
-  // Corresponds to a specific E-UTRAN UE Measurement Report trigger.
   Trigger trigger = 15;
 
 }

proto3/models/meas_rep_ue_notification_carrier_aggregation_meas_info.proto

@@ -15,10 +15,10 @@ package mec012;
 
 message MeasRepUeNotificationCarrierAggregationMeasInfo {
 
-  // E-UTRAN Cell Identity of the best neighbouring cell (NCell) associated with the SCell, as defined in ETSI TS 136 331 [i.7].
+  // String representing the E-UTRAN Cell Identity. Encoded as a bit string (size (28)) as defined in ETSI TS 136 413 [i.3].
   string cellIdNei = 1;
 
-  // E-UTRAN Cell Identity of a Secondary serving Cell (SCell), as defined in ETSI TS 136 331 [i.7].
+  // String representing the E-UTRAN Cell Identity. Encoded as a bit string (size (28)) as defined in ETSI TS 136 413 [i.3].
   string cellIdSrv = 2;
 
   // Reference Signal Received Power as defined in ETSI TS 136 214 [i.5].

proto3/models/meas_rep_ue_notification_eutran_neighbour_cell_meas_info.proto

@@ -16,7 +16,6 @@ import public "models/ecgi.proto";
 
 message MeasRepUeNotificationEutranNeighbourCellMeasInfo {
 
-  // E-UTRAN Cell Global Identifier.
   Ecgi ecgi = 1;
 
   // Reference Signal Received Power as defined in ETSI TS 136 214 [i.5].