implicit naming

proto3/.openapi-generator/FILES

@@ -14,19 +14,8 @@ models/cell_change_subscription_filter_criteria_assoc_ho.proto
 models/ecgi.proto
 models/expiry_notification.proto
 models/expiry_notification_links.proto
-models/inline_object.proto
-models/inline_object1.proto
-models/inline_object2.proto
-models/inline_response200.proto
-models/inline_response2001.proto
-models/inline_response2002.proto
-models/inline_response2003.proto
-models/inline_response2004.proto
-models/inline_response2005.proto
-models/inline_response2006.proto
-models/inline_response201.proto
-models/inline_response400.proto
-models/inline_response403.proto
+models/inline_notification.proto
+models/inline_subscription.proto
 models/l2_meas.proto
 models/l2_meas_cell_info.proto
 models/l2_meas_cell_ue_info.proto

proto3/models/inline_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
+
+  Generated by OpenAPI Generator: https://openapi-generator.tech
+*/
+
+syntax = "proto3";
+
+package mec012;
+
+import public "models/cell_change_notification.proto";
+import public "models/rab_est_notification.proto";
+import public "models/rab_mod_notification.proto";
+import public "models/rab_rel_notification.proto";
+import public "models/meas_rep_ue_notification.proto";
+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";
+
+message InlineNotification {
+  oneof notification {
+    CellChangeNotification cellChangeNotification = 1;
+    RabEstNotification rabEstNotification = 2;
+    RabModNotification RabModNotification = 3;
+    RabRelNotification RabRelNotification = 4;
+    MeasRepUeNotification MeasRepUeNotification = 5;
+    NrMeasRepUeNotification NrMeasRepUeNotification = 6;
+    MeasTaNotification MeasTaNotification = 7;
+    CaReconfNotification CaReconfNotification = 8;
+    S1BearerNotification S1BearerNotification = 9;
+  }
+}

proto3/models/inline_object.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/cell_change_subscription.proto";
-import public "models/rab_est_subscription.proto";
-import public "models/rab_mod_subscription.proto";
-import public "models/rab_rel_subscription.proto";
-import public "models/meas_rep_ue_subscription.proto";
-import public "models/meas_ta_subscription.proto";
-import public "models/ca_reconf_subscription.proto";
-import public "models/s1_bearer_subscription.proto";
-import public "models/nr_meas_rep_ue_subscription.proto";
-
-message InlineObject {
-  oneof subscription {
-	  CellChangeSubscription cellChangeSubscription = 1;
-	  RabEstSubscription rabEstSubscription = 2;
-	  RabModSubscription rabModSubscription = 3;
-	  RabRelSubscription rabRelSubscription = 4;
-	  MeasRepUeSubscription measRepUeSubscription = 5;
-	  MeasTaSubscription measTaSubscription = 6;
-	  CaReconfSubscription caReconfSubscription = 7;
-	  S1BearerSubscription s1BearerSubscription = 8;
-	  NrMeasRepUeSubscription nrMeasRepUeSubscription = 9;
-  }
-}

proto3/models/inline_object2.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/cell_change_subscription.proto";
-import public "models/rab_est_subscription.proto";
-import public "models/rab_mod_subscription.proto";
-import public "models/rab_rel_subscription.proto";
-import public "models/meas_rep_ue_subscription.proto";
-import public "models/meas_ta_subscription.proto";
-import public "models/ca_reconf_subscription.proto";
-import public "models/s1_bearer_subscription.proto";
-import public "models/nr_meas_rep_ue_subscription.proto";
-
-message InlineObject2 {
-  oneof subscription {
-    CellChangeSubscription cellChangeSubscription = 1;
-    RabEstSubscription rabEstSubscription = 2;
-    RabModSubscription rabModSubscription = 3;
-    RabRelSubscription rabRelSubscription = 4;
-    MeasRepUeSubscription measRepUeSubscription = 5;
-    MeasTaSubscription measTaSubscription = 6;
-    CaReconfSubscription caReconfSubscription = 7;
-    S1BearerSubscription s1BearerSubscription = 8;
-    NrMeasRepUeSubscription nrMeasRepUeSubscription = 9;
-  }
-}

proto3/models/inline_response200.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/rab_info.proto";
-
-message InlineResponse200 {
-
-  RabInfo rabInfo = 1;
-
-}

proto3/models/inline_response2001.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/plmn_info.proto";
-
-message InlineResponse2001 {
-
-  repeated PlmnInfo plmnInfo = 1;
-
-}

proto3/models/inline_response2002.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.proto";
-
-message InlineResponse2002 {
-
-  S1BearerInfo s1BearerInfo = 1;
-
-}

proto3/models/inline_response2003.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/l2_meas.proto";
-
-message InlineResponse2003 {
-
-  L2Meas l2Meas = 1;
-
-}

proto3/models/inline_response2004.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/subscription_link_list.proto";
-
-message InlineResponse2004 {
-
-  SubscriptionLinkList subscriptionLinkList = 1;
-
-}

proto3/models/inline_response2005.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/cell_change_subscription.proto";
-import public "models/rab_est_subscription.proto";
-import public "models/rab_mod_subscription.proto";
-import public "models/rab_rel_subscription.proto";
-import public "models/meas_rep_ue_subscription.proto";
-import public "models/meas_ta_subscription.proto";
-import public "models/ca_reconf_subscription.proto";
-import public "models/s1_bearer_subscription.proto";
-import public "models/nr_meas_rep_ue_subscription.proto";
-
-message InlineResponse2005 {
-  oneof subscription {
-    CellChangeSubscription cellChangeSubscription = 1;
-    RabEstSubscription rabEstSubscription = 2;
-    RabModSubscription rabModSubscription = 3;
-    RabRelSubscription rabRelSubscription = 4;
-    MeasRepUeSubscription measRepUeSubscription = 5;
-    MeasTaSubscription measTaSubscription = 6;
-    CaReconfSubscription caReconfSubscription = 7;
-    S1BearerSubscription s1BearerSubscription = 8;
-    NrMeasRepUeSubscription nrMeasRepUeSubscription = 9;
-  }
-}

proto3/models/inline_response2006.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/cell_change_subscription.proto";
-import public "models/rab_est_subscription.proto";
-import public "models/rab_mod_subscription.proto";
-import public "models/rab_rel_subscription.proto";
-import public "models/meas_rep_ue_subscription.proto";
-import public "models/meas_ta_subscription.proto";
-import public "models/ca_reconf_subscription.proto";
-import public "models/s1_bearer_subscription.proto";
-import public "models/nr_meas_rep_ue_subscription.proto";
-
-message InlineResponse2006 {
-  oneof subscription {
-    CellChangeSubscription cellChangeSubscription = 1;
-    RabEstSubscription rabEstSubscription = 2;
-    RabModSubscription rabModSubscription = 3;
-    RabRelSubscription rabRelSubscription = 4;
-    MeasRepUeSubscription measRepUeSubscription = 5;
-    MeasTaSubscription measTaSubscription = 6;
-    CaReconfSubscription caReconfSubscription = 7;
-    S1BearerSubscription s1BearerSubscription = 8;
-    NrMeasRepUeSubscription nrMeasRepUeSubscription = 9;
-  }
-}

proto3/models/inline_response201.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/cell_change_subscription.proto";
-import public "models/rab_est_subscription.proto";
-import public "models/rab_mod_subscription.proto";
-import public "models/rab_rel_subscription.proto";
-import public "models/meas_rep_ue_subscription.proto";
-import public "models/meas_ta_subscription.proto";
-import public "models/ca_reconf_subscription.proto";
-import public "models/s1_bearer_subscription.proto";
-import public "models/nr_meas_rep_ue_subscription.proto";
-
-message InlineResponse201 {
-  oneof subscription {
-	  CellChangeSubscription cellChangeSubscription = 1;
-	  RabEstSubscription rabEstSubscription = 2;
-	  RabModSubscription rabModSubscription = 3;
-	  RabRelSubscription rabRelSubscription = 4;
-	  MeasRepUeSubscription measRepUeSubscription = 5;
-	  MeasTaSubscription measTaSubscription = 6;
-	  CaReconfSubscription caReconfSubscription = 7;
-	  S1BearerSubscription s1BearerSubscription = 8;
-	  NrMeasRepUeSubscription nrMeasRepUeSubscription = 9;
-  }
-}

proto3/models/inline_response400.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/problem_details.proto";
-
-message InlineResponse400 {
-
-  ProblemDetails problemDetails = 1;
-
-}

proto3/models/inline_response403.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/problem_details.proto";
-
-message InlineResponse403 {
-
-  ProblemDetails problemDetails = 1;
-
-}

proto3/models/inline_object1.proto → proto3/models/inline_subscription.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
 */
 
@@ -22,7 +22,7 @@ import public "models/ca_reconf_subscription.proto";
 import public "models/s1_bearer_subscription.proto";
 import public "models/nr_meas_rep_ue_subscription.proto";
 
-message InlineObject1 {
+message InlineSubscription {
   oneof subscription {
     CellChangeSubscription cellChangeSubscription = 1;
     RabEstSubscription rabEstSubscription = 2;

proto3/services/rni_service.proto

@@ -13,37 +13,32 @@ syntax = "proto3";
 package mec012;
 
 import "google/protobuf/empty.proto";
-import public "models/inline_object.proto";
-import public "models/inline_object2.proto";
-import public "models/inline_response200.proto";
-import public "models/inline_response2001.proto";
-import public "models/inline_response2002.proto";
-import public "models/inline_response2003.proto";
-import public "models/inline_response2004.proto";
-import public "models/inline_response2005.proto";
-import public "models/inline_response2006.proto";
-import public "models/inline_response201.proto";
-import public "models/inline_response400.proto";
-import public "models/inline_response403.proto";
+import public "models/inline_subscription.proto";
+import public "models/l2_meas.proto";
+import public "models/plmn_info.proto";
+import public "models/problem_details.proto";
+import public "models/rab_info.proto";
+import public "models/s1_bearer_info.proto";
+import public "models/subscription_link_list.proto";
 
 service RniService {
-  rpc Layer2MeasInfoGET (Layer2MeasInfoGETRequest) returns (InlineResponse2003);
+  rpc Layer2MeasInfoGET (Layer2MeasInfoGETRequest) returns (L2Meas);
 
-  rpc PlmnInfoGET (PlmnInfoGETRequest) returns (InlineResponse2001);
+  rpc PlmnInfoGET (PlmnInfoGETRequest) returns (PlmnInfoGETResponse);
 
-  rpc RabInfoGET (RabInfoGETRequest) returns (InlineResponse200);
+  rpc RabInfoGET (RabInfoGETRequest) returns (RabInfo);
 
-  rpc S1BearerInfoGET (S1BearerInfoGETRequest) returns (InlineResponse2002);
+  rpc S1BearerInfoGET (S1BearerInfoGETRequest) returns (S1BearerInfo);
 
-  rpc SubscriptionLinkListSubscriptionsGET (SubscriptionLinkListSubscriptionsGETRequest) returns (InlineResponse2004);
+  rpc SubscriptionLinkListSubscriptionsGET (SubscriptionLinkListSubscriptionsGETRequest) returns (SubscriptionLinkList);
 
   rpc SubscriptionsDELETE (SubscriptionsDELETERequest) returns (google.protobuf.Empty);
 
-  rpc SubscriptionsGET (SubscriptionsGETRequest) returns (InlineResponse2005);
+  rpc SubscriptionsGET (SubscriptionsGETRequest) returns (InlineSubscription);
 
-  rpc SubscriptionsPOST (SubscriptionsPOSTRequest) returns (InlineResponse201);
+  rpc SubscriptionsPOST (SubscriptionsPOSTRequest) returns (InlineSubscription);
 
-  rpc SubscriptionsPUT (SubscriptionsPUTRequest) returns (InlineResponse2006);
+  rpc SubscriptionsPUT (SubscriptionsPUTRequest) returns (InlineSubscription);
 
 }
 
@@ -135,6 +130,10 @@ message PlmnInfoGETRequest {
 
 }
 
+message PlmnInfoGETResponse {
+  repeated PlmnInfo data = 1;
+}
+
 message RabInfoGETRequest {
   // Application instance identifier
   string appInsId = 1;
@@ -200,14 +199,16 @@ message SubscriptionsGETRequest {
 }
 
 message SubscriptionsPOSTRequest {
-  InlineObject inlineObject = 1;
+  // Subscription to be created
+  InlineSubscription inlineSubscription = 1;
 
 }
 
 message SubscriptionsPUTRequest {
   // Subscription Id, specifically the \"Self-referring URI\" returned in the subscription request
   string subscriptionId = 1;
-  InlineObject2 inlineObject2 = 2;
+  // Subscription to be modified
+  InlineSubscription inlineSubscription = 2;
 
 }