From 93b1f7cac9b08c5588211799d5f41e9c135041e7 Mon Sep 17 00:00:00 2001 From: Michel Roy Date: Thu, 12 Nov 2020 20:54:56 -0500 Subject: [PATCH] implicit naming --- RniAPI.json | 856 ++++++------------ RniAPI.yaml | 523 ++++------- proto3/.openapi-generator/FILES | 15 +- proto3/models/inline_notification.proto | 37 + proto3/models/inline_object.proto | 37 - proto3/models/inline_object2.proto | 37 - proto3/models/inline_response200.proto | 21 - proto3/models/inline_response2001.proto | 21 - proto3/models/inline_response2002.proto | 21 - proto3/models/inline_response2003.proto | 21 - proto3/models/inline_response2004.proto | 21 - proto3/models/inline_response2005.proto | 37 - proto3/models/inline_response2006.proto | 37 - proto3/models/inline_response201.proto | 37 - proto3/models/inline_response400.proto | 21 - proto3/models/inline_response403.proto | 21 - ...bject1.proto => inline_subscription.proto} | 8 +- proto3/services/rni_service.proto | 45 +- 18 files changed, 568 insertions(+), 1248 deletions(-) create mode 100644 proto3/models/inline_notification.proto delete mode 100644 proto3/models/inline_object.proto delete mode 100644 proto3/models/inline_object2.proto delete mode 100644 proto3/models/inline_response200.proto delete mode 100644 proto3/models/inline_response2001.proto delete mode 100644 proto3/models/inline_response2002.proto delete mode 100644 proto3/models/inline_response2003.proto delete mode 100644 proto3/models/inline_response2004.proto delete mode 100644 proto3/models/inline_response2005.proto delete mode 100644 proto3/models/inline_response2006.proto delete mode 100644 proto3/models/inline_response201.proto delete mode 100644 proto3/models/inline_response400.proto delete mode 100644 proto3/models/inline_response403.proto rename proto3/models/{inline_object1.proto => inline_subscription.proto} (97%) diff --git a/RniAPI.json b/RniAPI.json index 7f006ab..c821f3c 100644 --- a/RniAPI.json +++ b/RniAPI.json @@ -79,12 +79,7 @@ "content": { "application/json": { "schema": { - "type": "object", - "properties": { - "rabInfo": { - "$ref": "#/components/schemas/RabInfo" - } - } + "$ref": "#/components/schemas/RabInfo" } } } @@ -130,14 +125,9 @@ "content": { "application/json": { "schema": { - "type": "object", - "properties": { - "plmnInfo": { - "type": "array", - "items": { - "$ref": "#/components/schemas/PlmnInfo" - } - } + "type": "array", + "items": { + "$ref": "#/components/schemas/PlmnInfo" } } } @@ -202,15 +192,7 @@ "content": { "application/json": { "schema": { - "type": "object", - "required": [ - "s1BearerInfo" - ], - "properties": { - "s1BearerInfo": { - "$ref": "#/components/schemas/S1BearerInfo" - } - } + "$ref": "#/components/schemas/S1BearerInfo" } } } @@ -370,15 +352,7 @@ "content": { "application/json": { "schema": { - "type": "object", - "required": [ - "l2Meas" - ], - "properties": { - "l2Meas": { - "$ref": "#/components/schemas/L2Meas" - } - } + "$ref": "#/components/schemas/L2Meas" } } } @@ -427,35 +401,25 @@ "content": { "application/json": { "schema": { - "type": "object", - "required": [ - "subscriptionLinkList" - ], - "properties": { - "subscriptionLinkList": { - "$ref": "#/components/schemas/SubscriptionLinkList" - } - } + "$ref": "#/components/schemas/SubscriptionLinkList" }, "example": { - "subscriptionLinkList": { - "_links": { - "self": { - "href": "http://meAppServer.example.com/rni/v2/subscriptions" - } - }, - "subscription": [ - { - "_links": { - "self": { - "href": "http://meAppServer.example.com/rni/v2/subscriptions/sub123" - } - }, - "callbackReference": "http://my.callback.com/rni-cell-change/some-id", - "subscriptionType": "CellChangeSubscription" - } - ] - } + "_links": { + "self": { + "href": "http://meAppServer.example.com/rni/v2/subscriptions" + } + }, + "subscription": [ + { + "_links": { + "self": { + "href": "http://meAppServer.example.com/rni/v2/subscriptions/sub123" + } + }, + "callbackReference": "http://my.callback.com/rni-cell-change/some-id", + "subscriptionType": "CellChangeSubscription" + } + ] } } } @@ -494,74 +458,36 @@ "content": { "application/json": { "schema": { - "type": "object", - "properties": { - "notificationSubscription": { - "oneOf": [ - { - "$ref": "#/components/schemas/CellChangeSubscription" - }, - { - "$ref": "#/components/schemas/RabEstSubscription" - }, - { - "$ref": "#/components/schemas/RabModSubscription" - }, - { - "$ref": "#/components/schemas/RabRelSubscription" - }, - { - "$ref": "#/components/schemas/MeasRepUeSubscription" - }, - { - "$ref": "#/components/schemas/NrMeasRepUeSubscription" - }, - { - "$ref": "#/components/schemas/MeasTaSubscription" - }, - { - "$ref": "#/components/schemas/CaReconfSubscription" + "$ref": "#/components/schemas/InlineSubscription" + }, + "example": { + "subscriptionType": "CellChangeSubscription", + "callbackReference": "http://my.callback.com/rni-cell-change/some-id", + "filterCriteriaAssocHo": { + "appInstanceId": "myApp", + "associateId": [ + { + "type": 1, + "value": "10.100.0.1" + } + ], + "ecgi": [ + { + "plmn": { + "mnc": "01", + "mcc": "001" }, - { - "$ref": "#/components/schemas/S1BearerSubscription" - } - ], - "discriminator": { - "propertyName": "subscriptionType" + "cellId": "ACBDEFA" } - } + ], + "hoStatus": [ + 1, + 2 + ] }, - "example": { - "notificationSubscription": { - "subscriptionType": "CellChangeSubscription", - "callbackReference": "http://my.callback.com/rni-cell-change/some-id", - "filterCriteriaAssocHo": { - "appInstanceId": "myApp", - "associateId": [ - { - "type": 1, - "value": "10.100.0.1" - } - ], - "ecgi": [ - { - "plmn": { - "mnc": "01", - "mcc": "001" - }, - "cellId": "ACBDEFA" - } - ], - "hoStatus": [ - 1, - 2 - ] - }, - "expiryDeadline": { - "seconds": 1977836800, - "nanoseconds": 0 - } - } + "expiryDeadline": { + "seconds": 1977836800, + "nanoseconds": 0 } } } @@ -573,79 +499,41 @@ "content": { "application/json": { "schema": { - "type": "object", - "properties": { - "notificationSubscription": { - "oneOf": [ - { - "$ref": "#/components/schemas/CellChangeSubscription" - }, - { - "$ref": "#/components/schemas/RabEstSubscription" - }, - { - "$ref": "#/components/schemas/RabModSubscription" - }, - { - "$ref": "#/components/schemas/RabRelSubscription" - }, - { - "$ref": "#/components/schemas/MeasRepUeSubscription" - }, - { - "$ref": "#/components/schemas/NrMeasRepUeSubscription" - }, - { - "$ref": "#/components/schemas/MeasTaSubscription" - }, - { - "$ref": "#/components/schemas/CaReconfSubscription" - }, - { - "$ref": "#/components/schemas/S1BearerSubscription" - } - ], - "discriminator": { - "propertyName": "subscriptionType" - } + "$ref": "#/components/schemas/InlineSubscription" + }, + "example": { + "subscriptionType": "CellChangeSubscription", + "callbackReference": "http://my.callback.com/rni-cell-change/some-id", + "_links": { + "self": { + "href": "http://meAppServer.example.com/rni/v2/subscriptions/sub123" } }, - "example": { - "notificationSubscription": { - "subscriptionType": "CellChangeSubscription", - "callbackReference": "http://my.callback.com/rni-cell-change/some-id", - "_links": { - "self": { - "href": "http://meAppServer.example.com/rni/v2/subscriptions/sub123" - } - }, - "filterCriteriaAssocHo": { - "appInstanceId": "myApp", - "associateId": [ - { - "type": 1, - "value": "10.100.0.1" - } - ], - "ecgi": [ - { - "plmn": { - "mnc": "01", - "mcc": "001" - }, - "cellId": "ACBDEFA" - } - ], - "hoStatus": [ - 1, - 2 - ] - }, - "expiryDeadline": { - "seconds": 1977836800, - "nanoseconds": 0 + "filterCriteriaAssocHo": { + "appInstanceId": "myApp", + "associateId": [ + { + "type": 1, + "value": "10.100.0.1" } - } + ], + "ecgi": [ + { + "plmn": { + "mnc": "01", + "mcc": "001" + }, + "cellId": "ACBDEFA" + } + ], + "hoStatus": [ + 1, + 2 + ] + }, + "expiryDeadline": { + "seconds": 1977836800, + "nanoseconds": 0 } } } @@ -689,76 +577,38 @@ "content": { "application/json": { "schema": { - "type": "object", - "properties": { - "notification": { - "oneOf": [ - { - "$ref": "#/components/schemas/CellChangeNotification" - }, - { - "$ref": "#/components/schemas/RabEstNotification" - }, - { - "$ref": "#/components/schemas/RabModNotification" - }, - { - "$ref": "#/components/schemas/RabRelNotification" - }, - { - "$ref": "#/components/schemas/MeasRepUeNotification" - }, - { - "$ref": "#/components/schemas/NrMeasRepUeNotification" - }, - { - "$ref": "#/components/schemas/MeasTaNotification" - }, - { - "$ref": "#/components/schemas/CaReconfNotification" - }, - { - "$ref": "#/components/schemas/S1BearerNotification" - } - ], - "discriminator": { - "propertyName": "notificationType" - } + "$ref": "#/components/schemas/InlineNotification" + }, + "example": { + "notificationType": "CellChangeNotification", + "associateId": [ + { + "type": 1, + "value": "10.100.0.1" } + ], + "hoStatus": 1, + "srcEcgi": { + "plmn": { + "mnc": "01", + "mcc": "001" + }, + "cellId": "ACBDEFA" }, - "example": { - "notification": { - "notificationType": "CellChangeNotification", - "associateId": [ - { - "type": 1, - "value": "10.100.0.1" - } - ], - "hoStatus": 1, - "srcEcgi": { - "plmn": { - "mnc": "01", - "mcc": "001" - }, - "cellId": "ACBDEFA" - }, - "tempUeId": { - "mmec": 1, - "mtmsi": 69967622812 - }, - "timeStamp": { - "seconds": 1977836800, - "nanoseconds": 0 - }, - "trgEcgi": { - "plmn": { - "mnc": "01", - "mcc": "001" - }, - "cellId": "FEDCBAA" - } - } + "tempUeId": { + "mmec": 1, + "mtmsi": 69967622812 + }, + "timeStamp": { + "seconds": 1977836800, + "nanoseconds": 0 + }, + "trgEcgi": { + "plmn": { + "mnc": "01", + "mcc": "001" + }, + "cellId": "FEDCBAA" } } } @@ -795,82 +645,41 @@ "content": { "application/json": { "schema": { - "type": "object", - "required": [ - "notificationSubscription" - ], - "properties": { - "notificationSubscription": { - "oneOf": [ - { - "$ref": "#/components/schemas/CellChangeSubscription" - }, - { - "$ref": "#/components/schemas/RabEstSubscription" - }, - { - "$ref": "#/components/schemas/RabModSubscription" - }, - { - "$ref": "#/components/schemas/RabRelSubscription" - }, - { - "$ref": "#/components/schemas/MeasRepUeSubscription" - }, - { - "$ref": "#/components/schemas/NrMeasRepUeSubscription" - }, - { - "$ref": "#/components/schemas/MeasTaSubscription" - }, - { - "$ref": "#/components/schemas/CaReconfSubscription" - }, - { - "$ref": "#/components/schemas/S1BearerSubscription" - } - ], - "discriminator": { - "propertyName": "subscriptionType" - } + "$ref": "#/components/schemas/InlineSubscription" + }, + "example": { + "subscriptionType": "CellChangeSubscription", + "callbackReference": "http://my.callback.com/rni-cell-change/some-id", + "_links": { + "self": { + "href": "http://meAppServer.example.com/rni/v2/subscriptions/sub123" } }, - "example": { - "notificationSubscription": { - "subscriptionType": "CellChangeSubscription", - "callbackReference": "http://my.callback.com/rni-cell-change/some-id", - "_links": { - "self": { - "href": "http://meAppServer.example.com/rni/v2/subscriptions/sub123" - } - }, - "filterCriteriaAssocHo": { - "appInstanceId": "myApp", - "associateId": [ - { - "type": 1, - "value": "10.100.0.1" - } - ], - "ecgi": [ - { - "plmn": { - "mnc": "01", - "mcc": "001" - }, - "cellId": "ACBDEFA" - } - ], - "hoStatus": [ - 1, - 2 - ] - }, - "expiryDeadline": { - "seconds": 1977836800, - "nanoseconds": 0 + "filterCriteriaAssocHo": { + "appInstanceId": "myApp", + "associateId": [ + { + "type": 1, + "value": "10.100.0.1" } - } + ], + "ecgi": [ + { + "plmn": { + "mnc": "01", + "mcc": "001" + }, + "cellId": "ACBDEFA" + } + ], + "hoStatus": [ + 1, + 2 + ] + }, + "expiryDeadline": { + "seconds": 1977836800, + "nanoseconds": 0 } } } @@ -910,79 +719,41 @@ "content": { "application/json": { "schema": { - "type": "object", - "properties": { - "notificationSubscription": { - "oneOf": [ - { - "$ref": "#/components/schemas/CellChangeSubscription" - }, - { - "$ref": "#/components/schemas/RabEstSubscription" - }, - { - "$ref": "#/components/schemas/RabModSubscription" - }, - { - "$ref": "#/components/schemas/RabRelSubscription" - }, - { - "$ref": "#/components/schemas/MeasRepUeSubscription" - }, - { - "$ref": "#/components/schemas/NrMeasRepUeSubscription" - }, - { - "$ref": "#/components/schemas/MeasTaSubscription" - }, - { - "$ref": "#/components/schemas/CaReconfSubscription" - }, - { - "$ref": "#/components/schemas/S1BearerSubscription" - } - ], - "discriminator": { - "propertyName": "subscriptionType" - } + "$ref": "#/components/schemas/InlineSubscription" + }, + "example": { + "subscriptionType": "CellChangeSubscription", + "callbackReference": "http://my.callback.com/rni-cell-change/some-id", + "_links": { + "self": { + "href": "http://meAppServer.example.com/rni/v2/subscriptions/sub123" } }, - "example": { - "notificationSubscription": { - "subscriptionType": "CellChangeSubscription", - "callbackReference": "http://my.callback.com/rni-cell-change/some-id", - "_links": { - "self": { - "href": "http://meAppServer.example.com/rni/v2/subscriptions/sub123" - } - }, - "filterCriteriaAssocHo": { - "appInstanceId": "myApp", - "associateId": [ - { - "type": 1, - "value": "10.100.0.1" - } - ], - "ecgi": [ - { - "plmn": { - "mnc": "01", - "mcc": "001" - }, - "cellId": "ACBDEFA" - } - ], - "hoStatus": [ - 1, - 2 - ] - }, - "expiryDeadline": { - "seconds": 1977836800, - "nanoseconds": 0 + "filterCriteriaAssocHo": { + "appInstanceId": "myApp", + "associateId": [ + { + "type": 1, + "value": "10.100.0.1" } - } + ], + "ecgi": [ + { + "plmn": { + "mnc": "01", + "mcc": "001" + }, + "cellId": "ACBDEFA" + } + ], + "hoStatus": [ + 1, + 2 + ] + }, + "expiryDeadline": { + "seconds": 1977836800, + "nanoseconds": 0 } } } @@ -999,79 +770,41 @@ "content": { "application/json": { "schema": { - "type": "object", - "properties": { - "notificationSubscription": { - "oneOf": [ - { - "$ref": "#/components/schemas/CellChangeSubscription" - }, - { - "$ref": "#/components/schemas/RabEstSubscription" - }, - { - "$ref": "#/components/schemas/RabModSubscription" - }, - { - "$ref": "#/components/schemas/RabRelSubscription" - }, - { - "$ref": "#/components/schemas/MeasRepUeSubscription" - }, - { - "$ref": "#/components/schemas/NrMeasRepUeSubscription" - }, - { - "$ref": "#/components/schemas/MeasTaSubscription" - }, - { - "$ref": "#/components/schemas/CaReconfSubscription" - }, - { - "$ref": "#/components/schemas/S1BearerSubscription" - } - ], - "discriminator": { - "propertyName": "subscriptionType" - } - } - } + "$ref": "#/components/schemas/InlineSubscription" }, "example": { - "notificationSubscription": { - "subscriptionType": "CellChangeSubscription", - "callbackReference": "http://my.callback.com/rni-cell-change/some-id", - "_links": { - "self": { - "href": "http://meAppServer.example.com/rni/v2/subscriptions/sub123" - } - }, - "filterCriteriaAssocHo": { - "appInstanceId": "myApp", - "associateId": [ - { - "type": 1, - "value": "10.100.0.1" - } - ], - "ecgi": [ - { - "plmn": { - "mnc": "01", - "mcc": "001" - }, - "cellId": "ACBDEFA" - } - ], - "hoStatus": [ - 1, - 2 - ] - }, - "expiryDeadline": { - "seconds": 1977836800, - "nanoseconds": 0 + "subscriptionType": "CellChangeSubscription", + "callbackReference": "http://my.callback.com/rni-cell-change/some-id", + "_links": { + "self": { + "href": "http://meAppServer.example.com/rni/v2/subscriptions/sub123" } + }, + "filterCriteriaAssocHo": { + "appInstanceId": "myApp", + "associateId": [ + { + "type": 1, + "value": "10.100.0.1" + } + ], + "ecgi": [ + { + "plmn": { + "mnc": "01", + "mcc": "001" + }, + "cellId": "ACBDEFA" + } + ], + "hoStatus": [ + 1, + 2 + ] + }, + "expiryDeadline": { + "seconds": 1977836800, + "nanoseconds": 0 } } } @@ -1145,14 +878,9 @@ "400": { "description": "Bad Request : used to indicate that incorrect parameters were passed to the request.", "content": { - "application/json": { + "application/problem+json": { "schema": { - "type": "object", - "properties": { - "problemDetails": { - "$ref": "#/components/schemas/ProblemDetails" - } - } + "$ref": "#/components/schemas/ProblemDetails" } } } @@ -1160,14 +888,9 @@ "401": { "description": "Unauthorized : used when the client did not submit credentials.", "content": { - "application/json": { + "application/problem+json": { "schema": { - "type": "object", - "properties": { - "problemDetails": { - "$ref": "#/components/schemas/ProblemDetails" - } - } + "$ref": "#/components/schemas/ProblemDetails" } } } @@ -1175,17 +898,9 @@ "403": { "description": "Forbidden : operation is not allowed given the current status of the resource.", "content": { - "application/json": { + "application/problem+json": { "schema": { - "type": "object", - "required": [ - "problemDetails" - ], - "properties": { - "problemDetails": { - "$ref": "#/components/schemas/ProblemDetails" - } - } + "$ref": "#/components/schemas/ProblemDetails" } } } @@ -1193,14 +908,9 @@ "404": { "description": "Not Found : used when a client provided a URI that cannot be mapped to a valid resource URI.", "content": { - "application/json": { + "application/problem+json": { "schema": { - "type": "object", - "properties": { - "problemDetails": { - "$ref": "#/components/schemas/ProblemDetails" - } - } + "$ref": "#/components/schemas/ProblemDetails" } } } @@ -1208,14 +918,9 @@ "406": { "description": "Not Acceptable : used to indicate that the server cannot provide the any of the content formats supported by the client.", "content": { - "application/json": { + "application/problem+json": { "schema": { - "type": "object", - "properties": { - "problemDetails": { - "$ref": "#/components/schemas/ProblemDetails" - } - } + "$ref": "#/components/schemas/ProblemDetails" } } } @@ -1223,14 +928,9 @@ "412": { "description": "Precondition failed : used when a condition has failed during conditional requests, e.g. when using ETags to avoid write conflicts when using PUT", "content": { - "application/json": { + "application/problem+json": { "schema": { - "type": "object", - "properties": { - "problemDetails": { - "$ref": "#/components/schemas/ProblemDetails" - } - } + "$ref": "#/components/schemas/ProblemDetails" } } } @@ -1238,14 +938,9 @@ "414": { "description": "URI Too Long : used to indicate that the server is refusing to process the request because the request URI is longer than the server is willing or able to process.", "content": { - "application/json": { + "application/problem+json": { "schema": { - "type": "object", - "properties": { - "problemDetails": { - "$ref": "#/components/schemas/ProblemDetails" - } - } + "$ref": "#/components/schemas/ProblemDetails" } } } @@ -1253,14 +948,9 @@ "415": { "description": "Unsupported Media Type : used to indicate that the server or the client does not support the content type of the entity body.", "content": { - "application/json": { + "application/problem+json": { "schema": { - "type": "object", - "properties": { - "problemDetails": { - "$ref": "#/components/schemas/ProblemDetails" - } - } + "$ref": "#/components/schemas/ProblemDetails" } } } @@ -1268,24 +958,17 @@ "422": { "description": "Unprocessable Entity : used to indicate that the server understands the content type of the request entity and that the syntax of the request entity is correct but that the server is unable to process the contained instructions. This error condition can occur if an JSON request body is syntactically correct but semantically incorrect, for example if the target area for the request is considered too large. This error condition can also occur if the capabilities required by the request are not supported.", "content": { - "application/json": { + "application/problem+json": { "schema": { - "type": "object", - "properties": { - "problemDetails": { - "$ref": "#/components/schemas/ProblemDetails" - } - } + "$ref": "#/components/schemas/ProblemDetails" }, "example": { "application/problem+json": { - "problemDetails": { - "type": "https://meAppServer.example.com/rni/v2/probs/too-many targets", - "title": "Too many targets", - "status": "422", - "detail": "The target area for the request is considered too large", - "instance": "/meAppClient.example.com/77777/msgs/abc" - } + "type": "https://meAppServer.example.com/rni/v2/probs/too-many targets", + "title": "Too many targets", + "status": "422", + "detail": "The target area for the request is considered too large", + "instance": "/meAppClient.example.com/77777/msgs/abc" } } } @@ -1294,14 +977,9 @@ "429": { "description": "Too Many Requests : used when a rate limiter has triggered.", "content": { - "application/json": { + "application/problem+json": { "schema": { - "type": "object", - "properties": { - "problemDetails": { - "$ref": "#/components/schemas/ProblemDetails" - } - } + "$ref": "#/components/schemas/ProblemDetails" } } } @@ -4826,6 +4504,74 @@ 31 ], "type": "integer" + }, + "InlineSubscription": { + "oneOf": [ + { + "$ref": "#/components/schemas/CellChangeSubscription" + }, + { + "$ref": "#/components/schemas/RabEstSubscription" + }, + { + "$ref": "#/components/schemas/RabModSubscription" + }, + { + "$ref": "#/components/schemas/RabRelSubscription" + }, + { + "$ref": "#/components/schemas/MeasRepUeSubscription" + }, + { + "$ref": "#/components/schemas/NrMeasRepUeSubscription" + }, + { + "$ref": "#/components/schemas/MeasTaSubscription" + }, + { + "$ref": "#/components/schemas/CaReconfSubscription" + }, + { + "$ref": "#/components/schemas/S1BearerSubscription" + } + ], + "discriminator": { + "propertyName": "subscriptionType" + } + }, + "InlineNotification": { + "oneOf": [ + { + "$ref": "#/components/schemas/CellChangeNotification" + }, + { + "$ref": "#/components/schemas/RabEstNotification" + }, + { + "$ref": "#/components/schemas/RabModNotification" + }, + { + "$ref": "#/components/schemas/RabRelNotification" + }, + { + "$ref": "#/components/schemas/MeasRepUeNotification" + }, + { + "$ref": "#/components/schemas/NrMeasRepUeNotification" + }, + { + "$ref": "#/components/schemas/MeasTaNotification" + }, + { + "$ref": "#/components/schemas/CaReconfNotification" + }, + { + "$ref": "#/components/schemas/S1BearerNotification" + } + ], + "discriminator": { + "propertyName": "notificationType" + } } } } diff --git a/RniAPI.yaml b/RniAPI.yaml index 9015e1a..786c7cb 100644 --- a/RniAPI.yaml +++ b/RniAPI.yaml @@ -42,10 +42,7 @@ paths: content: application/json: schema: - type: object - properties: - rabInfo: - $ref: '#/components/schemas/RabInfo' + $ref: '#/components/schemas/RabInfo' '400': $ref: '#/components/responses/400' '401': @@ -74,12 +71,9 @@ paths: content: application/json: schema: - type: "object" - properties: - plmnInfo: - type: "array" - items: - $ref: '#/components/schemas/PlmnInfo' + type: "array" + items: + $ref: '#/components/schemas/PlmnInfo' '400': $ref: '#/components/responses/400' '401': @@ -114,12 +108,7 @@ paths: content: application/json: schema: - type: "object" - required: - - "s1BearerInfo" - properties: - s1BearerInfo: - $ref: '#/components/schemas/S1BearerInfo' + $ref: '#/components/schemas/S1BearerInfo' '400': $ref: '#/components/responses/400' '401': @@ -186,12 +175,7 @@ paths: content: application/json: schema: - type: "object" - required: - - "l2Meas" - properties: - l2Meas: - $ref: '#/components/schemas/L2Meas' + $ref: '#/components/schemas/L2Meas' '400': $ref: '#/components/responses/400' '401': @@ -222,23 +206,17 @@ paths: content: application/json: schema: - type: object - required: - - subscriptionLinkList - properties: - subscriptionLinkList: - $ref: '#/components/schemas/SubscriptionLinkList' + $ref: '#/components/schemas/SubscriptionLinkList' example: - subscriptionLinkList: - _links: - self: - href: 'http://meAppServer.example.com/rni/v2/subscriptions' - subscription: - - _links: - self: - href: 'http://meAppServer.example.com/rni/v2/subscriptions/sub123' - callbackReference: 'http://my.callback.com/rni-cell-change/some-id' - subscriptionType: CellChangeSubscription + _links: + self: + href: 'http://meAppServer.example.com/rni/v2/subscriptions' + subscription: + - _links: + self: + href: 'http://meAppServer.example.com/rni/v2/subscriptions/sub123' + callbackReference: 'http://my.callback.com/rni-cell-change/some-id' + subscriptionType: CellChangeSubscription '400': $ref: '#/components/responses/400' '401': @@ -264,85 +242,55 @@ paths: content: application/json: schema: - type: object - properties: - notificationSubscription: - oneOf: - - $ref: '#/components/schemas/CellChangeSubscription' - - $ref: '#/components/schemas/RabEstSubscription' - - $ref: '#/components/schemas/RabModSubscription' - - $ref: '#/components/schemas/RabRelSubscription' - - $ref: '#/components/schemas/MeasRepUeSubscription' - - $ref: '#/components/schemas/NrMeasRepUeSubscription' - - $ref: '#/components/schemas/MeasTaSubscription' - - $ref: '#/components/schemas/CaReconfSubscription' - - $ref: '#/components/schemas/S1BearerSubscription' - discriminator: - propertyName: subscriptionType - example: - notificationSubscription: - subscriptionType: CellChangeSubscription - callbackReference: 'http://my.callback.com/rni-cell-change/some-id' - filterCriteriaAssocHo: - appInstanceId: 'myApp' - associateId: - - type: 1 - value: '10.100.0.1' - ecgi: - - plmn: - mnc: '01' - mcc: '001' - cellId: 'ACBDEFA' - hoStatus: - - 1 - - 2 - expiryDeadline: - seconds: 1977836800 - nanoseconds: 0 + $ref: '#/components/schemas/InlineSubscription' + example: + subscriptionType: CellChangeSubscription + callbackReference: 'http://my.callback.com/rni-cell-change/some-id' + filterCriteriaAssocHo: + appInstanceId: 'myApp' + associateId: + - type: 1 + value: '10.100.0.1' + ecgi: + - plmn: + mnc: '01' + mcc: '001' + cellId: 'ACBDEFA' + hoStatus: + - 1 + - 2 + expiryDeadline: + seconds: 1977836800 + nanoseconds: 0 responses: '201': description: Successful subscription content: application/json: schema: - type: object - properties: - notificationSubscription: - oneOf: - - $ref: '#/components/schemas/CellChangeSubscription' - - $ref: '#/components/schemas/RabEstSubscription' - - $ref: '#/components/schemas/RabModSubscription' - - $ref: '#/components/schemas/RabRelSubscription' - - $ref: '#/components/schemas/MeasRepUeSubscription' - - $ref: '#/components/schemas/NrMeasRepUeSubscription' - - $ref: '#/components/schemas/MeasTaSubscription' - - $ref: '#/components/schemas/CaReconfSubscription' - - $ref: '#/components/schemas/S1BearerSubscription' - discriminator: - propertyName: subscriptionType - example: - notificationSubscription: - subscriptionType: CellChangeSubscription - callbackReference: 'http://my.callback.com/rni-cell-change/some-id' - _links: - self: - href: 'http://meAppServer.example.com/rni/v2/subscriptions/sub123' - filterCriteriaAssocHo: - appInstanceId: 'myApp' - associateId: - - type: 1 - value: '10.100.0.1' - ecgi: - - plmn: - mnc: '01' - mcc: '001' - cellId: 'ACBDEFA' - hoStatus: - - 1 - - 2 - expiryDeadline: - seconds: 1977836800 - nanoseconds: 0 + $ref: '#/components/schemas/InlineSubscription' + example: + subscriptionType: CellChangeSubscription + callbackReference: 'http://my.callback.com/rni-cell-change/some-id' + _links: + self: + href: 'http://meAppServer.example.com/rni/v2/subscriptions/sub123' + filterCriteriaAssocHo: + appInstanceId: 'myApp' + associateId: + - type: 1 + value: '10.100.0.1' + ecgi: + - plmn: + mnc: '01' + mcc: '001' + cellId: 'ACBDEFA' + hoStatus: + - 1 + - 2 + expiryDeadline: + seconds: 1977836800 + nanoseconds: 0 '400': $ref: '#/components/responses/400' '401': @@ -372,44 +320,29 @@ paths: content: application/json: schema: - type: object - properties: - notification: - oneOf: - - $ref: '#/components/schemas/CellChangeNotification' - - $ref: '#/components/schemas/RabEstNotification' - - $ref: '#/components/schemas/RabModNotification' - - $ref: '#/components/schemas/RabRelNotification' - - $ref: '#/components/schemas/MeasRepUeNotification' - - $ref: '#/components/schemas/NrMeasRepUeNotification' - - $ref: '#/components/schemas/MeasTaNotification' - - $ref: '#/components/schemas/CaReconfNotification' - - $ref: '#/components/schemas/S1BearerNotification' - discriminator: - propertyName: notificationType - example: - notification: - notificationType: CellChangeNotification - associateId: - - type: 1 - value: '10.100.0.1' - hoStatus: 1 - srcEcgi: - plmn: - mnc: '01' - mcc: '001' - cellId: 'ACBDEFA' - tempUeId: - mmec: 1 - mtmsi: 001011231231234 - timeStamp: - seconds: 1977836800 - nanoseconds: 0 - trgEcgi: - plmn: - mnc: '01' - mcc: '001' - cellId: 'FEDCBAA' + $ref: '#/components/schemas/InlineNotification' + example: + notificationType: CellChangeNotification + associateId: + - type: 1 + value: '10.100.0.1' + hoStatus: 1 + srcEcgi: + plmn: + mnc: '01' + mcc: '001' + cellId: 'ACBDEFA' + tempUeId: + mmec: 1 + mtmsi: 001011231231234 + timeStamp: + seconds: 1977836800 + nanoseconds: 0 + trgEcgi: + plmn: + mnc: '01' + mcc: '001' + cellId: 'FEDCBAA' responses: '204': $ref: '#/components/responses/204' @@ -429,46 +362,29 @@ paths: content: application/json: schema: - type: object - required: - - notificationSubscription - properties: - notificationSubscription: - oneOf: - - $ref: '#/components/schemas/CellChangeSubscription' - - $ref: '#/components/schemas/RabEstSubscription' - - $ref: '#/components/schemas/RabModSubscription' - - $ref: '#/components/schemas/RabRelSubscription' - - $ref: '#/components/schemas/MeasRepUeSubscription' - - $ref: '#/components/schemas/NrMeasRepUeSubscription' - - $ref: '#/components/schemas/MeasTaSubscription' - - $ref: '#/components/schemas/CaReconfSubscription' - - $ref: '#/components/schemas/S1BearerSubscription' - discriminator: - propertyName: subscriptionType - example: - notificationSubscription: - subscriptionType: CellChangeSubscription - callbackReference: 'http://my.callback.com/rni-cell-change/some-id' - _links: - self: - href: 'http://meAppServer.example.com/rni/v2/subscriptions/sub123' - filterCriteriaAssocHo: - appInstanceId: 'myApp' - associateId: - - type: 1 - value: '10.100.0.1' - ecgi: - - plmn: - mnc: '01' - mcc: '001' - cellId: 'ACBDEFA' - hoStatus: - - 1 - - 2 - expiryDeadline: - seconds: 1977836800 - nanoseconds: 0 + $ref: '#/components/schemas/InlineSubscription' + example: + subscriptionType: CellChangeSubscription + callbackReference: 'http://my.callback.com/rni-cell-change/some-id' + _links: + self: + href: 'http://meAppServer.example.com/rni/v2/subscriptions/sub123' + filterCriteriaAssocHo: + appInstanceId: 'myApp' + associateId: + - type: 1 + value: '10.100.0.1' + ecgi: + - plmn: + mnc: '01' + mcc: '001' + cellId: 'ACBDEFA' + hoStatus: + - 1 + - 2 + expiryDeadline: + seconds: 1977836800 + nanoseconds: 0 '400': $ref: '#/components/responses/400' '401': @@ -494,44 +410,29 @@ paths: content: application/json: schema: - type: object - properties: - notificationSubscription: - oneOf: - - $ref: '#/components/schemas/CellChangeSubscription' - - $ref: '#/components/schemas/RabEstSubscription' - - $ref: '#/components/schemas/RabModSubscription' - - $ref: '#/components/schemas/RabRelSubscription' - - $ref: '#/components/schemas/MeasRepUeSubscription' - - $ref: '#/components/schemas/NrMeasRepUeSubscription' - - $ref: '#/components/schemas/MeasTaSubscription' - - $ref: '#/components/schemas/CaReconfSubscription' - - $ref: '#/components/schemas/S1BearerSubscription' - discriminator: - propertyName: subscriptionType - example: - notificationSubscription: - subscriptionType: CellChangeSubscription - callbackReference: 'http://my.callback.com/rni-cell-change/some-id' - _links: - self: - href: 'http://meAppServer.example.com/rni/v2/subscriptions/sub123' - filterCriteriaAssocHo: - appInstanceId: 'myApp' - associateId: - - type: 1 - value: '10.100.0.1' - ecgi: - - plmn: - mnc: '01' - mcc: '001' - cellId: 'ACBDEFA' - hoStatus: - - 1 - - 2 - expiryDeadline: - seconds: 1977836800 - nanoseconds: 0 + $ref: '#/components/schemas/InlineSubscription' + example: + subscriptionType: CellChangeSubscription + callbackReference: 'http://my.callback.com/rni-cell-change/some-id' + _links: + self: + href: 'http://meAppServer.example.com/rni/v2/subscriptions/sub123' + filterCriteriaAssocHo: + appInstanceId: 'myApp' + associateId: + - type: 1 + value: '10.100.0.1' + ecgi: + - plmn: + mnc: '01' + mcc: '001' + cellId: 'ACBDEFA' + hoStatus: + - 1 + - 2 + expiryDeadline: + seconds: 1977836800 + nanoseconds: 0 parameters: - $ref: '#/components/parameters/Path.subscrId' responses: @@ -540,44 +441,29 @@ paths: content: application/json: schema: - type: object - properties: - notificationSubscription: - oneOf: - - $ref: '#/components/schemas/CellChangeSubscription' - - $ref: '#/components/schemas/RabEstSubscription' - - $ref: '#/components/schemas/RabModSubscription' - - $ref: '#/components/schemas/RabRelSubscription' - - $ref: '#/components/schemas/MeasRepUeSubscription' - - $ref: '#/components/schemas/NrMeasRepUeSubscription' - - $ref: '#/components/schemas/MeasTaSubscription' - - $ref: '#/components/schemas/CaReconfSubscription' - - $ref: '#/components/schemas/S1BearerSubscription' - discriminator: - propertyName: subscriptionType + $ref: '#/components/schemas/InlineSubscription' example: - notificationSubscription: - subscriptionType: CellChangeSubscription - callbackReference: 'http://my.callback.com/rni-cell-change/some-id' - _links: - self: - href: 'http://meAppServer.example.com/rni/v2/subscriptions/sub123' - filterCriteriaAssocHo: - appInstanceId: 'myApp' - associateId: - - type: 1 - value: '10.100.0.1' - ecgi: - - plmn: - mnc: '01' - mcc: '001' - cellId: 'ACBDEFA' - hoStatus: - - 1 - - 2 - expiryDeadline: - seconds: 1977836800 - nanoseconds: 0 + subscriptionType: CellChangeSubscription + callbackReference: 'http://my.callback.com/rni-cell-change/some-id' + _links: + self: + href: 'http://meAppServer.example.com/rni/v2/subscriptions/sub123' + filterCriteriaAssocHo: + appInstanceId: 'myApp' + associateId: + - type: 1 + value: '10.100.0.1' + ecgi: + - plmn: + mnc: '01' + mcc: '001' + cellId: 'ACBDEFA' + hoStatus: + - 1 + - 2 + expiryDeadline: + seconds: 1977836800 + nanoseconds: 0 '400': $ref: '#/components/responses/400' '401': @@ -622,108 +508,75 @@ components: 400: description: 'Bad Request : used to indicate that incorrect parameters were passed to the request.' content: - application/json: + application/problem+json: schema: - type: object - properties: - problemDetails: - $ref: '#/components/schemas/ProblemDetails' + $ref: '#/components/schemas/ProblemDetails' 401: description: 'Unauthorized : used when the client did not submit credentials.' content: - application/json: + application/problem+json: schema: - type: object - properties: - problemDetails: - $ref: '#/components/schemas/ProblemDetails' + $ref: '#/components/schemas/ProblemDetails' 403: description: 'Forbidden : operation is not allowed given the current status of the resource.' content: - application/json: + application/problem+json: schema: - type: object - required: - - problemDetails - properties: - problemDetails: - $ref: '#/components/schemas/ProblemDetails' + $ref: '#/components/schemas/ProblemDetails' 404: description: 'Not Found : used when a client provided a URI that cannot be mapped to a valid resource URI.' content: - application/json: + application/problem+json: schema: - type: object - properties: - problemDetails: - $ref: '#/components/schemas/ProblemDetails' + $ref: '#/components/schemas/ProblemDetails' 406: description: 'Not Acceptable : used to indicate that the server cannot provide the any of the content formats supported by the client.' content: - application/json: + application/problem+json: schema: - type: object - properties: - problemDetails: - $ref: '#/components/schemas/ProblemDetails' + $ref: '#/components/schemas/ProblemDetails' 412: description: 'Precondition failed : used when a condition has failed during conditional requests, e.g. when using ETags to avoid write conflicts when using PUT' content: - application/json: + application/problem+json: schema: - type: object - properties: - problemDetails: - $ref: '#/components/schemas/ProblemDetails' + $ref: '#/components/schemas/ProblemDetails' 414: description: 'URI Too Long : used to indicate that the server is refusing to process the request because the request URI is longer than the server is willing or able to process.' content: - application/json: + application/problem+json: schema: - type: object - properties: - problemDetails: - $ref: '#/components/schemas/ProblemDetails' + $ref: '#/components/schemas/ProblemDetails' 415: description: 'Unsupported Media Type : used to indicate that the server or the client does not support the content type of the entity body.' content: - application/json: + application/problem+json: schema: - type: object - properties: - problemDetails: - $ref: '#/components/schemas/ProblemDetails' + $ref: '#/components/schemas/ProblemDetails' 422: description: 'Unprocessable Entity : used to indicate that the server understands the content type of the request entity and that the syntax of the request entity is correct but that the server is unable to process the contained instructions. This error condition can occur if an JSON request body is syntactically correct but semantically incorrect, for example if the target area for the request is considered too large. This error condition can also occur if the capabilities required by the request are not supported.' content: - application/json: + application/problem+json: schema: - type: object - properties: - problemDetails: - $ref: '#/components/schemas/ProblemDetails' + $ref: '#/components/schemas/ProblemDetails' example: application/problem+json: - problemDetails: - type: 'https://meAppServer.example.com/rni/v2/probs/too-many targets' - title: Too many targets - status: '422' - detail: The target area for the request is considered too large - instance: /meAppClient.example.com/77777/msgs/abc + type: 'https://meAppServer.example.com/rni/v2/probs/too-many targets' + title: Too many targets + status: '422' + detail: The target area for the request is considered too large + instance: /meAppClient.example.com/77777/msgs/abc 429: description: 'Too Many Requests : used when a rate limiter has triggered.' content: - application/json: + application/problem+json: schema: - type: object - properties: - problemDetails: - $ref: '#/components/schemas/ProblemDetails' + $ref: '#/components/schemas/ProblemDetails' parameters: Path.subscrId: name: subscriptionId @@ -3715,3 +3568,29 @@ components: - 30 - 31 type: integer + InlineSubscription: + oneOf: + - $ref: '#/components/schemas/CellChangeSubscription' + - $ref: '#/components/schemas/RabEstSubscription' + - $ref: '#/components/schemas/RabModSubscription' + - $ref: '#/components/schemas/RabRelSubscription' + - $ref: '#/components/schemas/MeasRepUeSubscription' + - $ref: '#/components/schemas/NrMeasRepUeSubscription' + - $ref: '#/components/schemas/MeasTaSubscription' + - $ref: '#/components/schemas/CaReconfSubscription' + - $ref: '#/components/schemas/S1BearerSubscription' + discriminator: + propertyName: subscriptionType + InlineNotification: + oneOf: + - $ref: '#/components/schemas/CellChangeNotification' + - $ref: '#/components/schemas/RabEstNotification' + - $ref: '#/components/schemas/RabModNotification' + - $ref: '#/components/schemas/RabRelNotification' + - $ref: '#/components/schemas/MeasRepUeNotification' + - $ref: '#/components/schemas/NrMeasRepUeNotification' + - $ref: '#/components/schemas/MeasTaNotification' + - $ref: '#/components/schemas/CaReconfNotification' + - $ref: '#/components/schemas/S1BearerNotification' + discriminator: + propertyName: notificationType diff --git a/proto3/.openapi-generator/FILES b/proto3/.openapi-generator/FILES index 152e265..8afafa8 100644 --- a/proto3/.openapi-generator/FILES +++ b/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 diff --git a/proto3/models/inline_notification.proto b/proto3/models/inline_notification.proto new file mode 100644 index 0000000..6a12477 --- /dev/null +++ b/proto3/models/inline_notification.proto @@ -0,0 +1,37 @@ +/* + 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; + } +} diff --git a/proto3/models/inline_object.proto b/proto3/models/inline_object.proto deleted file mode 100644 index 8cc750f..0000000 --- a/proto3/models/inline_object.proto +++ /dev/null @@ -1,37 +0,0 @@ -/* - 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; - } -} diff --git a/proto3/models/inline_object2.proto b/proto3/models/inline_object2.proto deleted file mode 100644 index 706f3e4..0000000 --- a/proto3/models/inline_object2.proto +++ /dev/null @@ -1,37 +0,0 @@ -/* - 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; - } -} diff --git a/proto3/models/inline_response200.proto b/proto3/models/inline_response200.proto deleted file mode 100644 index 0a56bd1..0000000 --- a/proto3/models/inline_response200.proto +++ /dev/null @@ -1,21 +0,0 @@ -/* - 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; - -} diff --git a/proto3/models/inline_response2001.proto b/proto3/models/inline_response2001.proto deleted file mode 100644 index 2f8a30a..0000000 --- a/proto3/models/inline_response2001.proto +++ /dev/null @@ -1,21 +0,0 @@ -/* - 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; - -} diff --git a/proto3/models/inline_response2002.proto b/proto3/models/inline_response2002.proto deleted file mode 100644 index db14aac..0000000 --- a/proto3/models/inline_response2002.proto +++ /dev/null @@ -1,21 +0,0 @@ -/* - 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; - -} diff --git a/proto3/models/inline_response2003.proto b/proto3/models/inline_response2003.proto deleted file mode 100644 index ea44cbb..0000000 --- a/proto3/models/inline_response2003.proto +++ /dev/null @@ -1,21 +0,0 @@ -/* - 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; - -} diff --git a/proto3/models/inline_response2004.proto b/proto3/models/inline_response2004.proto deleted file mode 100644 index 38a8253..0000000 --- a/proto3/models/inline_response2004.proto +++ /dev/null @@ -1,21 +0,0 @@ -/* - 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; - -} diff --git a/proto3/models/inline_response2005.proto b/proto3/models/inline_response2005.proto deleted file mode 100644 index 9bb3d51..0000000 --- a/proto3/models/inline_response2005.proto +++ /dev/null @@ -1,37 +0,0 @@ -/* - 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; - } -} diff --git a/proto3/models/inline_response2006.proto b/proto3/models/inline_response2006.proto deleted file mode 100644 index efa83c1..0000000 --- a/proto3/models/inline_response2006.proto +++ /dev/null @@ -1,37 +0,0 @@ -/* - 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; - } -} diff --git a/proto3/models/inline_response201.proto b/proto3/models/inline_response201.proto deleted file mode 100644 index bfa5aa1..0000000 --- a/proto3/models/inline_response201.proto +++ /dev/null @@ -1,37 +0,0 @@ -/* - 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; - } -} diff --git a/proto3/models/inline_response400.proto b/proto3/models/inline_response400.proto deleted file mode 100644 index 40edff5..0000000 --- a/proto3/models/inline_response400.proto +++ /dev/null @@ -1,21 +0,0 @@ -/* - 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; - -} diff --git a/proto3/models/inline_response403.proto b/proto3/models/inline_response403.proto deleted file mode 100644 index b6d7acc..0000000 --- a/proto3/models/inline_response403.proto +++ /dev/null @@ -1,21 +0,0 @@ -/* - 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; - -} diff --git a/proto3/models/inline_object1.proto b/proto3/models/inline_subscription.proto similarity index 97% rename from proto3/models/inline_object1.proto rename to proto3/models/inline_subscription.proto index a599fe1..cd7617a 100644 --- a/proto3/models/inline_object1.proto +++ b/proto3/models/inline_subscription.proto @@ -1,10 +1,10 @@ /* 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; diff --git a/proto3/services/rni_service.proto b/proto3/services/rni_service.proto index ec0658e..8bdd004 100644 --- a/proto3/services/rni_service.proto +++ b/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; } -- GitLab