From 8df87181937bcc6c7929ebd3a9003db543f845c6 Mon Sep 17 00:00:00 2001 From: Elian Kraja Date: Fri, 20 Nov 2020 19:48:57 +0100 Subject: [PATCH 01/11] First draft --- .jenkins.sh | 18 + MEC030_v1.3.yaml | 1176 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1194 insertions(+) create mode 100644 .jenkins.sh create mode 100644 MEC030_v1.3.yaml diff --git a/.jenkins.sh b/.jenkins.sh new file mode 100644 index 0000000..74d0370 --- /dev/null +++ b/.jenkins.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +specfiles=$(ls | egrep "^[^.]*.(json|yaml)") + +fres=0 +for i in $specfiles ; do + echo "-- Validating and linting OpenAPI file $i..." + swagger-cli validate $i + res=$? + speccy lint "$i" + res2=$? + fres=$(($fres||$res||$res2)) + echo "--- Validator returned $res, linter returned $res2." +done + +echo "-- Final validator returns $fres." +exit $fres + diff --git a/MEC030_v1.3.yaml b/MEC030_v1.3.yaml new file mode 100644 index 0000000..0f005c0 --- /dev/null +++ b/MEC030_v1.3.yaml @@ -0,0 +1,1176 @@ +info: + title: "ETSI GS MEC 030 V2X Information Service API" + version: 2.1.1 + description: "ETSI GS MEC 030 V2X Information Service API described using OpenAPI." + license: + name: BSD-3-Clause + url: 'https://forge.etsi.org/legal-matters' +externalDocs: + description: "ETSI GS MEC 030 V2X Information Service API, v2.1.1" + url: 'https://www.etsi.org/deliver/etsi_gs/MEC/001_099/030/02.01.01_60/gs_mec030v020101p.pdf' +openapi: 3.0.0 +servers: + - url: 'https://{apiRoot}/vis/v1' +tags: + - name: queries + description: Queries + - name: subscription + description: Subscription + +paths: + /queries/uu_unicast_provisioning_info: + get: + tags: + - 'queries' + summary: 'Used to query provisioning information for V2X communication over Uu unicast.' + description: 'Used to query provisioning information for V2X communication over Uu unicast.' + operationId: prov_info_uu_unicastGET + parameters: + - in: query + name: location_info + schema: + type: string + required: true + description: 'Comma separated list of locations to identify a cell of a base station or a particular geographical area' + + responses: + '200': + description: 'A response body containing the Uu unicast provisioning information. ' + content: + application/json: + schema: + $ref: '#/components/schemas/UuUnicastProvisioningInfo' + '400': + $ref: '#/components/responses/400' + '401': + $ref: '#/components/responses/401' + '403': + $ref: '#/components/responses/403' + '404': + $ref: '#/components/responses/404' + '406': + $ref: '#/components/responses/406' + '429': + $ref: '#/components/responses/429' + /queries/uu_mbms_provisioning_info: + get: + tags: + - 'queries' + summary: 'retrieve information required for V2X communication over Uu MBMS.' + description: 'retrieve information required for V2X communication over Uu MBMS.' + operationId: prov_info_uu_mbmsGET + parameters: + - in: query + name: location_info + schema: + type: string + required: true + description: 'omma separated list of locations to identify a cell of a base station or a particular geographical area' + + responses: + '200': + description: 'A response body containing the Uu unicast provisioning information. ' + content: + application/json: + schema: + $ref: '#/components/schemas/UuMbmsProvisioningInfo' + '400': + $ref: '#/components/responses/400' + '401': + $ref: '#/components/responses/401' + '403': + $ref: '#/components/responses/403' + '404': + $ref: '#/components/responses/404' + '406': + $ref: '#/components/responses/406' + '429': + $ref: '#/components/responses/429' + #/queries/pc5_provisioning_info: + #get: + #/provide_predicted_qos: + #post: + #/publish_v2x_message: + #post: + #/subscriptions: + #get: + #post: + #/subscriptions/{subscriptionId}: + #get: + #put: + #delete: + # /notifitication_end_point_provided_by_client + #post: + +components: + schemas: + CellId: + properties: + cellId: + description: E-UTRAN Cell Identity as a bit string (size (28)). + type: string + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: String + required: + - cellId + type: object + x-etsi-ref: 6.6.2 + Earfcn: + properties: + earfcn: + description: E-UTRA Absolute Radio Frequency Channel Number, range (0... 65535) + type: integer + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: Integer + required: + - earfcn + type: object + x-etsi-ref: 6.6.3 + Ecgi: + properties: + cellId: + # description': The E-UTRAN Cell Identity. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': CellId + $ref: '#/components/schemas/CellId' + plmn: + # description': Public Land Mobile Network Identity. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': Plmn + $ref: '#/components/schemas/Plmn' + required: + - plmn + - cellId + type: object + x-etsi-ref: 6.5.5 + FddInfo: + properties: + dlEarfcn: + # description': '' + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': Earfcn + $ref: '#/components/schemas/Earfcn' + dlTransmissionBandwidth: + # description': '' + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': TransmissionBandwidth + $ref: '#/components/schemas/TransmissionBandwidth' + ulEarfcn: + # description': '' + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': Earfcn + $ref: '#/components/schemas/Earfcn' + ulTransmissionBandwidth: + # description': '' + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': TransmissionBandwidth + $ref: '#/components/schemas/TransmissionBandwidth' + required: + - ulEarfcn + - dlEarfcn + - ulTransmissionBandwidth + - dlTransmissionBandwidth + type: object + x-etsi-ref: 6.5.6 + LocalityTypes: + type: string + + LocationInfo.geoArea: + description: Information of a geographical area. + properties: + latitude: + description: 'Latitude (DATUM = WGS84) -90 to 90 in decimal degree format DDD.ddd' + format: Float + type: number + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: Float + longitude: + description: 'Longitude (DATUM = WGS84)-180 to 180 in decimal degree format DDD.ddd' + format: Float + type: number + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: Float + required: + - latitude + - longitude + type: object + x-etsi-mec-cardinality: 0..1 + + LocationInfo: + properties: + ecgi: + # description': E-UTRAN CelI Global Identifier of the serving cell. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': Ecgi + $ref: '#/components/schemas/Ecgi' + geoArea: + $ref: '#/components/schemas/LocationInfo.geoArea' + type: object + x-etsi-notes: "NOTE:\tEither ecgi or geoArea shall be present, but not both." + x-etsi-ref: 6.5.3 + Pc5NeighbourCellInfo: + properties: + ecgi: + # description': E-UTRAN CelI Global Identifier. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': Ecgi + $ref: '#/components/schemas/Ecgi' + plmn: + # description': Public Land Mobile Network Identity. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': Plmn + $ref: '#/components/schemas/Plmn' + siV2xConfig: + description: V2X sidelink communication configuration, as defined in ETSI TS 136 331 [i.11]. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': SystemInformationBlockType21 (as defined in ETSI TS 136 331 [i.11]) + type: string + required: + - plmn + - ecgi + - siV2xConfig + type: object + x-etsi-ref: 6.5.12 + + + Pc5ProvisioningInfo.proInfoPc5: + description: The provisioning information per location as defined below. + items: + type: object + minItems: 1 + properties: + dstLayer2Id: + description: "For sidelink communication, the Destination Layer-2 ID is set to the ProSe Layer-2 Group ID or Prose UE ID, see ETSI TS\_136\_321 [i.12].\nPLMN operators coordinate to make sure Destination Layer-2 ID(s) for different V2X services are configured in a consistent manner." + type: string + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: String + locationInfo: + # description': Location information to identify a cell of a base station or a particular geographical area. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': LocationInfo + $ref: '#/components/schemas/LocationInfo' + neighbourCellInfo: + description: The information of the neighbour cells in a visiting PLMN that support V2X communication over PC5. + items: + $ref: '#/components/schemas/Pc5NeighbourCellInfo' + minItems: 0 + type: array + x-etsi-mec-cardinality: 0..N + x-etsi-mec-origin-type: Pc5NeighbourCellInfo + required: + - locationInfo + - dstLayer2Id + + Pc5ProvisioningInfo: + properties: + proInfoPc5: + $ref: '#/components/schemas/Pc5ProvisioningInfo.proInfoPc5' + timeStamp: + # description': Time stamp. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': TimeStamp + $ref: '#/components/schemas/TimeStamp' + required: + - proInfoPc5 + type: object + x-etsi-ref: 6.2.4 + + Plmn: + properties: + mcc: + description: The Mobile Country Code part of PLMN Identity. + type: string + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: String + mnc: + description: The Mobile Network Code part of PLMN Identity. + type: string + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: String + required: + - mcc + - mnc + type: object + x-etsi-ref: 6.5.4 + ProvChgPc5Notification: + properties: + dstLayer2Id: + description: For sidelink communication, the Destination Layer-2 ID is set to the ProSe Layer-2 Group ID or Prose UE ID, see ETSI TS 136 321 [i.12]. + type: string + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: String + locationInfo: + # description': Location information to identify a cell of a base station or a particular geographical area. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': LocationInfo + $ref: '#/components/schemas/LocationInfo' + neighbourCellInfo: + description: The information of the neighbour cells in a visiting PLMN that support V2X communication over PC5. + items: + $ref: '#/components/schemas/Pc5NeighbourCellInfo' + minItems: 0 + type: array + x-etsi-mec-cardinality: 0..N + x-etsi-mec-origin-type: Pc5NeighbourCellInfo + notificationType: + description: Shall be set to "ProvChgPc5Notification". + type: string + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: String + timeStamp: + # description': Time stamp. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': TimeStamp + $ref: '#/components/schemas/TimeStamp' + required: + - notificationType + - locationInfo + type: object + x-etsi-ref: 6.4.4 + + ProvChgPc5Subscription.links: + description: Hyperlink related to the resource. This shall be only included in the HTTP responses and in HTTP PUT requests. + properties: + self: + # description': Self-referring URI. The URI shall be unique within the VIS API as it acts as an ID for the subscription. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': LinkType + $ref: '#/components/schemas/LinkType' + required: + - self + type: object + x-etsi-mec-cardinality: 0..1 + + ProvChgPc5Subscription.filterCriteria: + description: List of filtering criteria for the subscription. Any filtering criteria from below, which is included in the request, shall also be included in the response. + properties: + dstLayer2Id: + description: For sidelink communication, the Destination Layer-2 ID is set to the ProSe Layer-2 Group ID or Prose UE ID, see ETSI TS 136 321 [i.12]. + type: string + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: String + locationInfo: + # description': Location information to identify a cell of a base station or a particular geographical area. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': LocationInfo + $ref: '#/components/schemas/LocationInfo' + neighbourCellInfo: + description: The information of the neighbour cells in a visiting PLMN that support V2X communication over PC5. + items: + $ref: '#/components/schemas/Pc5NeighbourCellInfo' + minItems: 0 + type: array + x-etsi-mec-cardinality: 0..N + x-etsi-mec-origin-type: Pc5NeighbourCellInfo + required: + - locationInfo + - dstLayer2Id + type: object + x-etsi-mec-cardinality: '1' + ProvChgPc5Subscription: + properties: + _links: + $ref: '#/components/schemas/ProvChgPc5Subscription.links' + callbackReference: + description: URI selected by the service consumer to receive notifications on the subscribed VIS information. This shall be included both in the request and in response. + format: uri + type: string + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: URI + expiryDeadline: + # description': Time stamp. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': TimeStamp + $ref: '#/components/schemas/TimeStamp' + filterCriteria: + $ref: '#/components/schemas/ProvChgPc5Subscription.filterCriteria' + subscriptionType: + description: Shall be set to "ProvChgPc5Subscription". + type: string + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: String + required: + - subscriptionType + - callbackReference + - filterCriteria + type: object + x-etsi-ref: 6.3.4 + ProvChgUuMbmsNotification: + properties: + locationInfo: + # description': Location information to identify a cell of a base station or a particular geographical area. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': LocationInfo + $ref: '#/components/schemas/LocationInfo' + neighbourCellInfo: + description: The information of the neighbour cells in a visiting PLMN that support V2X communication over Uu MBMS. + items: + $ref: '#/components/schemas/UuMbmsNeighbourCellInfo' + minItems: 0 + type: array + x-etsi-mec-cardinality: 0..N + x-etsi-mec-origin-type: UuMbmsNeighbourCellInfo + notificationType: + description: Shall be set to "ProvChgUuMbmsNotification". + type: string + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: String + timeStamp: + # description': Time stamp. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': TimeStamp + $ref: '#/components/schemas/TimeStamp' + v2xServerUsd: + # description': User Service Description for V2X Application Server is used to configure the UE for receiving local V2X Application Server information when it is provided over MBMS. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': V2xServerUsd + $ref: '#/components/schemas/V2xServerUsd' + required: + - notificationType + - locationInfo + type: object + x-etsi-ref: 6.4.3 + ProvChgUuMbmsSubscription.links: + description: Hyperlink related to the resource. This shall be only included in the HTTP responses and in HTTP PUT requests. + properties: + self: + # description': Self-referring URI. The URI shall be unique within the VIS API as it acts as an ID for the subscription. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': LinkType + $ref: '#/components/schemas/LinkType' + required: + - self + type: object + x-etsi-mec-cardinality: 0..1 + + ProvChgUuMbmsSubscription.filterCriteria: + description: List of filtering criteria for the subscription. Any filtering criteria from below, which is included in the request, shall also be included in the response. + properties: + locationInfo: + # description': Location information to identify a cell of a base station or a particular geographical area. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': LocationInfo + $ref: '#/components/schemas/LocationInfo' + neighbourCellInfo: + description: The information of the neighbour cells in a visiting PLMN that support V2X communication over Uu MBMS. + items: + $ref: '#/components/schemas/UuMbmsNeighbourCellInfo' + minItems: 0 + type: array + x-etsi-mec-cardinality: 0..N + x-etsi-mec-origin-type: UuMbmsNeighbourCellInfo + v2xServerUsd: + # description': User Service Description for V2X Application Server is used to configure the UE for receiving local V2X Application Server information when it is provided over MBMS. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': V2xServerUsd + $ref: '#/components/schemas/V2xServerUsd' + required: + - locationInfo + - v2xServerUsd + type: object + x-etsi-mec-cardinality: '1' + + ProvChgUuMbmsSubscription: + properties: + _links: + $ref: '#/components/schemas/ProvChgUuMbmsSubscription.links' + callbackReference: + description: URI selected by the service consumer to receive notifications on the subscribed VIS information. This shall be included both in the request and in response. + format: uri + type: string + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: URI + expiryDeadline: + # description': Time stamp. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': TimeStamp + $ref: '#/components/schemas/TimeStamp' + filterCriteria: + $ref: '#/components/schemas/ProvChgUuMbmsSubscription.filterCriteria' + subscriptionType: + description: Shall be set to "ProvChgUuMbmsSubscription". + type: string + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: String + required: + - subscriptionType + - callbackReference + - filterCriteria + type: object + x-etsi-ref: 6.3.3 + ProvChgUuUniNotification: + properties: + locationInfo: + # description': Location information to identify a cell of a base station or a particular geographical area. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': LocationInfo + $ref: '#/components/schemas/LocationInfo' + neighbourCellInfo: + description: The information of the neighbour cells in a visiting PLMN that support V2X communication over Uu unicast. + items: + $ref: '#/components/schemas/UuUniNeighbourCellInfo' + minItems: 0 + type: array + x-etsi-mec-cardinality: 0..N + x-etsi-mec-origin-type: UuUniNeighbourCellInfo + notificationType: + description: Shall be set to "ProvChgUuUniNotification". + type: string + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: String + timeStamp: + # description': Time stamp. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': TimeStamp + $ref: '#/components/schemas/TimeStamp' + v2xApplicationServer: + # description': V2X Application Server address (consisting of IP address and UDP port) for unicast. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': V2xApplicationServer + $ref: '#/components/schemas/V2xApplicationServer' + required: + - notificationType + - locationInfo + type: object + x-etsi-ref: 6.4.2 + ProvChgUuUniSubscription.links: + description: Hyperlink related to the resource. This shall be only included in the HTTP responses and in HTTP PUT requests. + properties: + self: + # description': Self-referring URI. The URI shall be unique within the VIS API as it acts as an ID for the subscription. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': LinkType + $ref: '#/components/schemas/LinkType' + required: + - self + type: object + x-etsi-mec-cardinality: 0..1 + + ProvChgUuUniSubscription.filterCriteria: + description: List of filtering criteria for the subscription. Any filtering criteria from below, which is included in the request, shall also be included in the response. + properties: + locationInfo: + # description': Location information to identify a cell of a base station or a particular geographical area. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': LocationInfo + $ref: '#/components/schemas/LocationInfo' + neighbourCellInfo: + description: The information of the neighbour cells in a visiting PLMN that support V2X communication over Uu unicast. + items: + $ref: '#/components/schemas/UuUniNeighbourCellInfo' + minItems: 0 + type: array + x-etsi-mec-cardinality: 0..N + x-etsi-mec-origin-type: UuUniNeighbourCellInfo + v2xApplicationServer: + # description': V2X Application Server address (consisting of IP address and UDP port) for unicast. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': V2xApplicationServer + $ref: '#/components/schemas/V2xApplicationServer' + required: + - locationInfo + - v2xApplicationServer + type: object + x-etsi-mec-cardinality: '1' + + ProvChgUuUniSubscription: + properties: + _links: + $ref: '#/components/schemas/ProvChgUuUniSubscription.links' + callbackReference: + description: URI selected by the service consumer to receive notifications on the subscribed VIS information. This shall be included both in the request and in response. + format: uri + type: string + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: URI + expiryDeadline: + # description': Time stamp. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': TimeStamp + $ref: '#/components/schemas/TimeStamp' + filterCriteria: + $ref: '#/components/schemas/ProvChgUuUniSubscription.filterCriteria' + subscriptionType: + description: Shall be set to "ProvChgUuUniSubscription". + type: string + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: String + required: + - subscriptionType + - callbackReference + - filterCriteria + type: object + x-etsi-ref: 6.3.2 + SerializerTypes: + type: string + + SubscriptionLinkList.links.subscriptions: + description: "The service consumer\u2019s subscriptions." + properties: + href: + description: The URI referring to the subscription. + format: uri + type: string + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: URI + subscriptionType: + description: Type of the subscription. The values are as defined in the \"subscriptionType\" attribute for each different V2X information event subscription data type. + type: string + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: String + required: + - href + - subscriptionType + x-etsi-mec-cardinality: 0..N + + SubscriptionLinkList.links: + description: List of hyperlinks related to the resource. + properties: + self: + # description': URI of this resource. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': LinkType + $ref: '#/components/schemas/LinkType' + subscriptions: + type: array + items: + $ref: '#/components/schemas/SubscriptionLinkList.links.subscriptions' + type: object + required: + - self + x-etsi-mec-cardinality: '1' + + SubscriptionLinkList: + properties: + _links: + $ref: '#/components/schemas/SubscriptionLinkList.links' + required: + - _links + type: object + x-etsi-ref: 6.3.6 + + TddInfo: + properties: + earfcn: + # description': '' + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': Earfcn + $ref: '#/components/schemas/Earfcn' + subframeAssignment: + description: Uplink-downlink subframe configuration information. + type: string + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: String + transmissionBandwidth: + # description': '' + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': TransmissionBandwidth + $ref: '#/components/schemas/TransmissionBandwidth' + required: + - earfcn + - transmissionBandwidth + - subframeAssignment + type: object + x-etsi-ref: 6.5.7 + TimeStamp: + properties: + nanoSeconds: + description: The nanoseconds part of the time. Time is defined as Unix-time since January 1, 1970, 00:00:00 UTC. + format: Uint32 + type: integer + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: Uint32 + seconds: + description: The seconds part of the time. Time is defined as Unixtime since January 1, 1970, 00:00:00 UTC. + format: Uint32 + type: integer + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: Uint32 + required: + - seconds + - nanoSeconds + type: object + x-etsi-ref: 6.5.2 + TransmissionBandwidth.transmissionBandwidth: + description: 'Numeric value corresponding to the transmission bandwidth expressed in units of resource blocks as follows:1 = bw6 (6 resource blocks)2 = bw15 (15 resource blocks) 3 = bw25 (25 resource blocks) 4 = bw50 (50 resource blocks) 5 = bw75 (75 resource blocks) 6 = bw100 (100 resource blocks)' + enum: + - 1 + - 2 + - 3 + - 4 + - 5 + - 6 + type: integer + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: Enum + + TransmissionBandwidth: + properties: + transmissionBandwidth: + $ref: '#/components/schemas/TransmissionBandwidth.transmissionBandwidth' + required: + - transmissionBandwidth + type: object + x-etsi-ref: 6.6.4 + TransportTypes: + type: string + Uint32: + type: number + UnsignedInt: + type: number + UuMbmsNeighbourCellInfo: + properties: + ecgi: + # description': E-UTRAN CelI Global Identifier. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': Ecgi + $ref: '#/components/schemas/Ecgi' + fddInfo: + # description': Information for FDD operation. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': FddInfo + $ref: '#/components/schemas/FddInfo' + mbmsServiceAreaIdentity: + description: Supported MBMS Service Area Identities in the cell. + items: + type: string + minItems: 1 + type: array + x-etsi-mec-cardinality: 1..N + x-etsi-mec-origin-type: String + pci: + description: Physical Cell Identifier. + type: integer + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: Integer + plmn: + # description': Public Land Mobile Network Identity. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': Plmn + $ref: '#/components/schemas/Plmn' + tddInfo: + # description': Information for TDD operation. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': TddInfo + $ref: '#/components/schemas/TddInfo' + required: + - plmn + - ecgi + - pci + - fddInfo + - tddInfo + - mbmsServiceAreaIdentity + type: object + x-etsi-ref: 6.5.11 + + UuMbmsProvisioningInfo.proInfoUuMbms: + description: The provisioning information per location as defined below. + properties: + locationInfo: + # description': Location information to identify a cell of a base station or a particular geographical area. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': LocationInfo + $ref: '#/components/schemas/LocationInfo' + neighbourCellInfo: + description: The information of the neighbour cells in a visiting PLMN that support V2X communication over Uu MBMS. + type: array + items: + $ref: '#/components/schemas/UuMbmsNeighbourCellInfo' + minItems: 0 + + x-etsi-mec-cardinality: 0..N + x-etsi-mec-origin-type: UuMbmsNeighbourCellInfo + v2xServerUsd: + # description': User Service Description for V2X Application Server is used to configure the UE for receiving local V2X Application Server information when it is provided over MBMS. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': V2xServerUsd + $ref: '#/components/schemas/V2xServerUsd' + required: + - locationInfo + - v2xServerUsd + + UuMbmsProvisioningInfo: + properties: + proInfoUuMbms: + $ref: '#/components/schemas/UuMbmsProvisioningInfo.proInfoUuMbms' + timeStamp: + # description': Time stamp. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': TimeStamp + $ref: '#/components/schemas/TimeStamp' + required: + - proInfoUuMbms + type: object + x-etsi-ref: 6.2.3 + + UuUniNeighbourCellInfo: + properties: + ecgi: + # description': E-UTRAN CelI Global Identifier. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': Ecgi + $ref: '#/components/schemas/Ecgi' + fddInfo: + # description': Information for FDD operation. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': FddInfo + $ref: '#/components/schemas/FddInfo' + pci: + description: Physical Cell Identifier. + type: integer + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: Integer + plmn: + # description': Public Land Mobile Network Identity. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': Plmn + $ref: '#/components/schemas/Plmn' + tddInfo: + # description': Information for TDD operation. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': TddInfo + $ref: '#/components/schemas/TddInfo' + required: + - plmn + - ecgi + - pci + - fddInfo + - tddInfo + type: object + x-etsi-ref: 6.5.9 + + UuUnicastProvisioningInfo.proInfoUuUnicast: + description: The provisioning information per location as defined below. + properties: + locationInfo: + # description': Location information to identify a cell of a base station or a particular geographical area. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': LocationInfo + $ref: '#/components/schemas/LocationInfo' + neighbourCellInfo: + description: The information of the neighbour cells in a visiting PLMN that support V2X communication over Uu unicast. + items: + $ref: '#/components/schemas/UuUniNeighbourCellInfo' + minItems: 0 + type: array + x-etsi-mec-cardinality: 0..N + x-etsi-mec-origin-type: UuUniNeighbourCellInfo + v2xApplicationServer: + # description': V2X Application Server address (consisting of IP address and UDP port) for unicast. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': V2xApplicationServer + $ref: '#/components/schemas/V2xApplicationServer' + required: + - locationInfo + - v2xApplicationServer + x-etsi-mec-cardinality: 1..N + UuUnicastProvisioningInfo: + properties: + proInfoUuUnicast: + type: array + items: + $ref: '#/components/schemas/UuUnicastProvisioningInfo.proInfoUuUnicast' + timeStamp: + # description': Time stamp. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': TimeStamp + $ref: '#/components/schemas/TimeStamp' + required: + - proInfoUuUnicast + type: object + x-etsi-ref: 6.2.2 + V2xApplicationServer: + properties: + ipAddress: + description: '' + type: string + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: String + udpPort: + description: '' + type: string + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: String + required: + - ipAddress + - udpPort + type: object + x-etsi-ref: 6.5.8 + + + V2xMsgPublication: + properties: + msgContent: + description: Published V2X message content. Its format is defined by the standardization organization indicated by the attribute stdOrganization. + type: string + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: String + msgEncodeFormat: + description: The encode format of the V2X message, for example base64. + type: string + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: String + msgType: + description: Published V2X message type. Its value is defined by the standardization organization indicated by the attribute stdOrganization. See note 2. + enum: + - SEE_DESCRIPTION + type: string + x-etsi-mec-cardinality: '1' + #x-etsi-mec-origin-type: Enum + stdOrganization: + description: "Standardization organization which defines the published V2X message type: \nETSI: European Telecommunications Standards Institute. \nSee note 1." + enum: + - SEE_DESCRIPTION + type: string + x-etsi-mec-cardinality: '1' + #-etsi-mec-origin-type: Enum + required: + - stdOrganization + - msgType + - msgEncodeFormat + - msgContent + type: object + x-etsi-notes: "NOTE 1:\tOther standardization organizations could be added as needed.\nNOTE 2:\tThe V2X message types of ETSI shall be used as specified in ETSI TS 102 894-2 [6], clause A.114." + x-etsi-ref: 6.2.6 + + V2xMsgSubscription.links: + description: Hyperlink related to the resource. This shall be only included in the HTTP responses and in HTTP PUT requests. + properties: + self: + # description': Self-referring URI. The URI shall be unique within the VIS API as it acts as an ID for the subscription. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': LinkType + $ref: '#/components/schemas/LinkType' + required: + - self + type: object + x-etsi-mec-cardinality: 0..1 + V2xMsgSubscription.filterCriteria: + description: List of filtering criteria for the subscription. Any filtering criteria from below, which is included in the request, shall also be included in the response. + properties: + msgType: + description: Subscribed V2X message type. Its value is defined by the standardization organization indicated by the attribute stdOrganization. See note 2. + items: + type: string + minItems: 0 + type: array + x-etsi-mec-cardinality: 0..N + x-etsi-mec-origin-type: Enum + stdOrganization: + description: "Standardization organization which defines the subscribed V2X message type: \nETSI: European Telecommunications Standards Institute. \nSee note 1." + enum: + - SEE_DESCRIPTION + type: string + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: Enum + required: + - stdOrganization + type: object + x-etsi-mec-cardinality: '1' + + V2xMsgSubscription: + properties: + _links: + $ref: '#/components/schemas/V2xMsgSubscription.links' + callbackReference: + description: URI selected by the service consumer to receive notifications on the subscribed V2X message. This shall be included both in the request and in response. + format: uri + type: string + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: URI + expiryDeadline: + # description': Time stamp. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': TimeStamp + $ref: '#/components/schemas/TimeStamp' + filterCriteria: + $ref: '#/components/schemas/V2xMsgSubscription.filterCriteria' + subscriptionType: + description: Shall be set to "V2xMsgSubscription". + type: string + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: String + required: + - subscriptionType + - callbackReference + - filterCriteria + type: object + x-etsi-notes: "NOTE 1:\tOther standardization organizations could be added as needed.\nNOTE 2:\tThe V2X message types of ETSI shall be used as specified in ETSI TS 102 894-2 [6], clause A.114." + x-etsi-ref: 6.3.5 + + V2xServerUsd.sdpInfo: + description: SDP with IP multicast address and port number used for V2X communication via MBMS. + properties: + ipMulticastAddress: + description: '' + type: string + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: String + portNumber: + description: '' + type: string + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: String + required: + - ipMulticastAddress + - portNumber + type: object + x-etsi-mec-cardinality: '1' + V2xServerUsd.tmgi: + description: Temporary Mobile Group Identity (TMGI), which is used within MBMS to uniquely identify Multicast and Broadcast bearer services. + properties: + mbmsServiceId: + description: MBMS Service ID consisting of three octets. + type: string + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: String + mcc: + description: The Mobile Country Code part of PLMN Identity. + type: string + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: String + mnc: + description: The Mobile Network Code part of PLMN Identity. + type: string + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: String + required: + - mbmsServiceId + - mcc + - mnc + type: object + x-etsi-mec-cardinality: '' + + V2xServerUsd: + properties: + sdpInfo: + $ref: '#/components/schemas/V2xServerUsd.sdpInfo' + serviceAreaIdentifier: + description: A list of service area identifier for the applicable MBMS broadcast area. + items: + type: string + minItems: 1 + type: array + x-etsi-mec-cardinality: 1..N + x-etsi-mec-origin-type: String + tmgi: + $ref: '#/components/schemas/V2xServerUsd.tmgi' + required: + - tmgi + - serviceAreaIdentifier + - sdpInfo + type: object + x-etsi-ref: 6.5.10 + VirtualNetworkInterfaceRequirements: + type: string + + LinkType: + description: >- + 'This data type represents a type of link' + type: object + required: + - href + properties: + href: + $ref: '#/components/schemas/Href' + Href: + description: >- + The URI referring to the subscription. + type: string + format: uri + ProblemDetails: + properties: + detail: + description: A human-readable explanation specific to this occurrence of the problem + type: string + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: String + instance: + description: A URI reference that identifies the specific occurrence of the problem + format: uri + type: string + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: URI + status: + description: The HTTP status code for this occurrence of the problem + format: uint32 + type: integer + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Uint32 + title: + description: A short, human-readable summary of the problem type + type: string + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: String + type: + description: A URI reference according to IETF RFC 3986 that identifies the problem type + format: uri + type: string + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: URI + type: object + responses: + 204: + description: No Content + 206: + description: Partial content + 400: + description: 'Bad Request : used to indicate that incorrect parameters were passed to the request.' + content: + application/json: + schema: + $ref: '#/components/schemas/ProblemDetails' + 401: + description: 'Unauthorized : used when the client did not submit credentials.' + content: + application/json: + schema: + $ref: '#/components/schemas/ProblemDetails' + 403: + description: 'Forbidden : operation is not allowed given the current status of the resource.' + content: + application/json: + schema: + $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: + schema: + $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: + schema: + $ref: '#/components/schemas/ProblemDetails' + 409: + description: 'Conflict : The operation cannot be executed currently, due to a conflict with the state of the resource' + content: + application/json: + schema: + $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: + schema: + $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: + schema: + $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: + schema: + $ref: '#/components/schemas/ProblemDetails' + 429: + description: 'Too Many Requests : used when a rate limiter has triggered.' + content: + application/json: + schema: + $ref: '#/components/schemas/ProblemDetails' \ No newline at end of file -- GitLab From a9d063b899a752f65ed590a881dcb30ad14266e3 Mon Sep 17 00:00:00 2001 From: Michele Carignani Date: Mon, 23 Nov 2020 11:04:54 +0100 Subject: [PATCH 02/11] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index dec8d91..6ced7cf 100644 --- a/README.md +++ b/README.md @@ -6,3 +6,5 @@ This repository contains OpenAPIs descriptions for the interfaces specified in E Unless specified otherwise, the content of this repository and the files contained are released under the BSD-3-Clause license. See the attached LICENSE file or visit https://forge.etsi.org/legal-matters. + + -- GitLab From c12406db6f9e44c4593d267c55f20fc99fa42353 Mon Sep 17 00:00:00 2001 From: Elian Kraja Date: Mon, 23 Nov 2020 15:13:35 +0100 Subject: [PATCH 03/11] Fixing filename --- .jenkins.sh | 0 MEC030_v1.3.yaml => MEC030_V2XInformationService.yaml | 4 +++- 2 files changed, 3 insertions(+), 1 deletion(-) mode change 100644 => 100755 .jenkins.sh rename MEC030_v1.3.yaml => MEC030_V2XInformationService.yaml (99%) diff --git a/.jenkins.sh b/.jenkins.sh old mode 100644 new mode 100755 diff --git a/MEC030_v1.3.yaml b/MEC030_V2XInformationService.yaml similarity index 99% rename from MEC030_v1.3.yaml rename to MEC030_V2XInformationService.yaml index 0f005c0..01e7ca5 100644 --- a/MEC030_v1.3.yaml +++ b/MEC030_V2XInformationService.yaml @@ -2,6 +2,8 @@ info: title: "ETSI GS MEC 030 V2X Information Service API" version: 2.1.1 description: "ETSI GS MEC 030 V2X Information Service API described using OpenAPI." + contact: + url: https://forge.etsi.org/rep/mec/gs030-vis-api license: name: BSD-3-Clause url: 'https://forge.etsi.org/legal-matters' @@ -10,7 +12,7 @@ externalDocs: url: 'https://www.etsi.org/deliver/etsi_gs/MEC/001_099/030/02.01.01_60/gs_mec030v020101p.pdf' openapi: 3.0.0 servers: - - url: 'https://{apiRoot}/vis/v1' + - url: 'https://localhost/vis/v1' tags: - name: queries description: Queries -- GitLab From 9914a413502153ca695f4af89ea0384562cb03a2 Mon Sep 17 00:00:00 2001 From: Elian Kraja Date: Mon, 23 Nov 2020 15:17:14 +0100 Subject: [PATCH 04/11] Update README.md --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index 6ced7cf..9c22188 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,18 @@ This repository contains OpenAPIs descriptions for the interfaces specified in ETSI GS MEC 030. + +## Online resources + +* [Specification document](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/030/02.01.01_60/gs_MEC030v020101p.pdf) +* [Navigate the V2X Information Service API in the browser](https://forge.etsi.org/swagger/ui/?url=https://forge.etsi.org/rep/mec/gs030-vis-api/raw/stf593/MEC030_V2XInformationService.yaml). +* [Edit the V2X Information Service API online](https://forge.etsi.org/swagger/editor/?url=https://forge.etsi.org/rep/mec/gs030-vis-api/raw/stf593/MEC030_V2XInformationService.yaml). + + ## License Unless specified otherwise, the content of this repository and the files contained are released under the BSD-3-Clause license. See the attached LICENSE file or visit https://forge.etsi.org/legal-matters. +# Application package lifecycle and operation granting API -- GitLab From 77ee96e1781c5e21ff1366bd234b5e288ccf9f80 Mon Sep 17 00:00:00 2001 From: piscione Date: Fri, 27 Nov 2020 14:21:35 +0100 Subject: [PATCH 05/11] Added draft of proto files. --- proto3/models/cell_id.proto | 21 ++++++++++ proto3/models/earfcn.proto | 21 ++++++++++ proto3/models/ecgi.proto | 24 ++++++++++++ proto3/models/fdd_info.proto | 28 ++++++++++++++ proto3/models/link_type.proto | 21 ++++++++++ proto3/models/location_info.proto | 24 ++++++++++++ proto3/models/location_info_geo_area.proto | 24 ++++++++++++ proto3/models/pc5_neighbour_cell_info.proto | 27 +++++++++++++ proto3/models/pc5_provisioning_info.proto | 25 ++++++++++++ .../pc5_provisioning_info_pro_info_pc5.proto | 20 ++++++++++ proto3/models/plmn.proto | 24 ++++++++++++ proto3/models/problem_details.proto | 33 ++++++++++++++++ proto3/models/prov_chg_pc5_notification.proto | 34 +++++++++++++++++ proto3/models/prov_chg_pc5_subscription.proto | 33 ++++++++++++++++ ...chg_pc5_subscription_filter_criteria.proto | 28 ++++++++++++++ .../prov_chg_pc5_subscription_links.proto | 21 ++++++++++ .../prov_chg_uu_mbms_notification.proto | 34 +++++++++++++++++ .../prov_chg_uu_mbms_subscription.proto | 33 ++++++++++++++++ ...uu_mbms_subscription_filter_criteria.proto | 28 ++++++++++++++ .../prov_chg_uu_mbms_subscription_links.proto | 21 ++++++++++ .../models/prov_chg_uu_uni_notification.proto | 34 +++++++++++++++++ .../models/prov_chg_uu_uni_subscription.proto | 33 ++++++++++++++++ ..._uu_uni_subscription_filter_criteria.proto | 28 ++++++++++++++ .../prov_chg_uu_uni_subscription_links.proto | 21 ++++++++++ proto3/models/subscription_link_list.proto | 21 ++++++++++ .../models/subscription_link_list_links.proto | 24 ++++++++++++ ...iption_link_list_links_subscriptions.proto | 24 ++++++++++++ proto3/models/tdd_info.proto | 27 +++++++++++++ proto3/models/time_stamp.proto | 24 ++++++++++++ proto3/models/transmission_bandwidth.proto | 21 ++++++++++ ...ion_bandwidth_transmission_bandwidth.proto | 18 +++++++++ .../models/uu_mbms_neighbour_cell_info.proto | 36 ++++++++++++++++++ proto3/models/uu_mbms_provisioning_info.proto | 24 ++++++++++++ ...s_provisioning_info_pro_info_uu_mbms.proto | 28 ++++++++++++++ .../models/uu_uni_neighbour_cell_info.proto | 33 ++++++++++++++++ .../models/uu_unicast_provisioning_info.proto | 24 ++++++++++++ ...rovisioning_info_pro_info_uu_unicast.proto | 28 ++++++++++++++ proto3/models/v2x_application_server.proto | 22 +++++++++++ proto3/models/v2x_msg_publication.proto | 34 +++++++++++++++++ proto3/models/v2x_msg_subscription.proto | 33 ++++++++++++++++ ...v2x_msg_subscription_filter_criteria.proto | 26 +++++++++++++ .../models/v2x_msg_subscription_links.proto | 21 ++++++++++ proto3/models/v2x_server_usd.proto | 27 +++++++++++++ proto3/models/v2x_server_usd_sdp_info.proto | 22 +++++++++++ proto3/models/v2x_server_usd_tmgi.proto | 27 +++++++++++++ proto3/services/queries_service.proto | 38 +++++++++++++++++++ 46 files changed, 1222 insertions(+) create mode 100644 proto3/models/cell_id.proto create mode 100644 proto3/models/earfcn.proto create mode 100644 proto3/models/ecgi.proto create mode 100644 proto3/models/fdd_info.proto create mode 100644 proto3/models/link_type.proto create mode 100644 proto3/models/location_info.proto create mode 100644 proto3/models/location_info_geo_area.proto create mode 100644 proto3/models/pc5_neighbour_cell_info.proto create mode 100644 proto3/models/pc5_provisioning_info.proto create mode 100644 proto3/models/pc5_provisioning_info_pro_info_pc5.proto create mode 100644 proto3/models/plmn.proto create mode 100644 proto3/models/problem_details.proto create mode 100644 proto3/models/prov_chg_pc5_notification.proto create mode 100644 proto3/models/prov_chg_pc5_subscription.proto create mode 100644 proto3/models/prov_chg_pc5_subscription_filter_criteria.proto create mode 100644 proto3/models/prov_chg_pc5_subscription_links.proto create mode 100644 proto3/models/prov_chg_uu_mbms_notification.proto create mode 100644 proto3/models/prov_chg_uu_mbms_subscription.proto create mode 100644 proto3/models/prov_chg_uu_mbms_subscription_filter_criteria.proto create mode 100644 proto3/models/prov_chg_uu_mbms_subscription_links.proto create mode 100644 proto3/models/prov_chg_uu_uni_notification.proto create mode 100644 proto3/models/prov_chg_uu_uni_subscription.proto create mode 100644 proto3/models/prov_chg_uu_uni_subscription_filter_criteria.proto create mode 100644 proto3/models/prov_chg_uu_uni_subscription_links.proto create mode 100644 proto3/models/subscription_link_list.proto create mode 100644 proto3/models/subscription_link_list_links.proto create mode 100644 proto3/models/subscription_link_list_links_subscriptions.proto create mode 100644 proto3/models/tdd_info.proto create mode 100644 proto3/models/time_stamp.proto create mode 100644 proto3/models/transmission_bandwidth.proto create mode 100644 proto3/models/transmission_bandwidth_transmission_bandwidth.proto create mode 100644 proto3/models/uu_mbms_neighbour_cell_info.proto create mode 100644 proto3/models/uu_mbms_provisioning_info.proto create mode 100644 proto3/models/uu_mbms_provisioning_info_pro_info_uu_mbms.proto create mode 100644 proto3/models/uu_uni_neighbour_cell_info.proto create mode 100644 proto3/models/uu_unicast_provisioning_info.proto create mode 100644 proto3/models/uu_unicast_provisioning_info_pro_info_uu_unicast.proto create mode 100644 proto3/models/v2x_application_server.proto create mode 100644 proto3/models/v2x_msg_publication.proto create mode 100644 proto3/models/v2x_msg_subscription.proto create mode 100644 proto3/models/v2x_msg_subscription_filter_criteria.proto create mode 100644 proto3/models/v2x_msg_subscription_links.proto create mode 100644 proto3/models/v2x_server_usd.proto create mode 100644 proto3/models/v2x_server_usd_sdp_info.proto create mode 100644 proto3/models/v2x_server_usd_tmgi.proto create mode 100644 proto3/services/queries_service.proto diff --git a/proto3/models/cell_id.proto b/proto3/models/cell_id.proto new file mode 100644 index 0000000..c5e833d --- /dev/null +++ b/proto3/models/cell_id.proto @@ -0,0 +1,21 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + + +message CellId { + + // E-UTRAN Cell Identity as a bit string (size (28)). + string cellId = 1; + +} diff --git a/proto3/models/earfcn.proto b/proto3/models/earfcn.proto new file mode 100644 index 0000000..d9286c0 --- /dev/null +++ b/proto3/models/earfcn.proto @@ -0,0 +1,21 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + + +message Earfcn { + + // E-UTRA Absolute Radio Frequency Channel Number, range (0... 65535) + int32 earfcn = 1; + +} diff --git a/proto3/models/ecgi.proto b/proto3/models/ecgi.proto new file mode 100644 index 0000000..cde31b9 --- /dev/null +++ b/proto3/models/ecgi.proto @@ -0,0 +1,24 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + +import public "models/cell_id.proto"; +import public "models/plmn.proto"; + +message Ecgi { + + CellId cellId = 1; + + Plmn plmn = 2; + +} diff --git a/proto3/models/fdd_info.proto b/proto3/models/fdd_info.proto new file mode 100644 index 0000000..95afef6 --- /dev/null +++ b/proto3/models/fdd_info.proto @@ -0,0 +1,28 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + +import public "models/earfcn.proto"; +import public "models/transmission_bandwidth.proto"; + +message FddInfo { + + Earfcn dlEarfcn = 1; + + TransmissionBandwidth dlTransmissionBandwidth = 2; + + Earfcn ulEarfcn = 3; + + TransmissionBandwidth ulTransmissionBandwidth = 4; + +} diff --git a/proto3/models/link_type.proto b/proto3/models/link_type.proto new file mode 100644 index 0000000..ad34ffb --- /dev/null +++ b/proto3/models/link_type.proto @@ -0,0 +1,21 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + + +message LinkType { + + // The URI referring to the subscription. + string href = 1; + +} diff --git a/proto3/models/location_info.proto b/proto3/models/location_info.proto new file mode 100644 index 0000000..d7df371 --- /dev/null +++ b/proto3/models/location_info.proto @@ -0,0 +1,24 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + +import public "models/ecgi.proto"; +import public "models/location_info_geo_area.proto"; + +message LocationInfo { + + Ecgi ecgi = 1; + + LocationInfoGeoArea geoArea = 2; + +} diff --git a/proto3/models/location_info_geo_area.proto b/proto3/models/location_info_geo_area.proto new file mode 100644 index 0000000..44e3c9d --- /dev/null +++ b/proto3/models/location_info_geo_area.proto @@ -0,0 +1,24 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + + +message LocationInfoGeoArea { + + // Latitude (DATUM = WGS84) -90 to 90 in decimal degree format DDD.ddd + float latitude = 1; + + // Longitude (DATUM = WGS84)-180 to 180 in decimal degree format DDD.ddd + float longitude = 2; + +} diff --git a/proto3/models/pc5_neighbour_cell_info.proto b/proto3/models/pc5_neighbour_cell_info.proto new file mode 100644 index 0000000..cec01f0 --- /dev/null +++ b/proto3/models/pc5_neighbour_cell_info.proto @@ -0,0 +1,27 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + +import public "models/ecgi.proto"; +import public "models/plmn.proto"; + +message Pc5NeighbourCellInfo { + + Ecgi ecgi = 1; + + Plmn plmn = 2; + + // V2X sidelink communication configuration, as defined in ETSI TS 136 331 [i.11]. + string siV2xConfig = 3; + +} diff --git a/proto3/models/pc5_provisioning_info.proto b/proto3/models/pc5_provisioning_info.proto new file mode 100644 index 0000000..e842056 --- /dev/null +++ b/proto3/models/pc5_provisioning_info.proto @@ -0,0 +1,25 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + +import public "models/time_stamp.proto"; +import public "models/todo_object_mapping.proto"; + +message Pc5ProvisioningInfo { + + // The provisioning information per location as defined below. + repeated TODO_OBJECT_MAPPING proInfoPc5 = 1; + + TimeStamp timeStamp = 2; + +} diff --git a/proto3/models/pc5_provisioning_info_pro_info_pc5.proto b/proto3/models/pc5_provisioning_info_pro_info_pc5.proto new file mode 100644 index 0000000..c45c6d3 --- /dev/null +++ b/proto3/models/pc5_provisioning_info_pro_info_pc5.proto @@ -0,0 +1,20 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + +import public "models/repeat.proto"; +import public "models/todo_object_mapping.proto"; + +message Pc5ProvisioningInfoProInfoPc5 { + +} diff --git a/proto3/models/plmn.proto b/proto3/models/plmn.proto new file mode 100644 index 0000000..0cfd429 --- /dev/null +++ b/proto3/models/plmn.proto @@ -0,0 +1,24 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + + +message Plmn { + + // The Mobile Country Code part of PLMN Identity. + string mcc = 1; + + // The Mobile Network Code part of PLMN Identity. + string mnc = 2; + +} diff --git a/proto3/models/problem_details.proto b/proto3/models/problem_details.proto new file mode 100644 index 0000000..d888d1b --- /dev/null +++ b/proto3/models/problem_details.proto @@ -0,0 +1,33 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + + +message ProblemDetails { + + // A human-readable explanation specific to this occurrence of the problem + string detail = 1; + + // A URI reference that identifies the specific occurrence of the problem + string instance = 2; + + // The HTTP status code for this occurrence of the problem + int32 status = 3; + + // A short, human-readable summary of the problem type + string title = 4; + + // A URI reference according to IETF RFC 3986 that identifies the problem type + string type = 5; + +} diff --git a/proto3/models/prov_chg_pc5_notification.proto b/proto3/models/prov_chg_pc5_notification.proto new file mode 100644 index 0000000..fbf3ac6 --- /dev/null +++ b/proto3/models/prov_chg_pc5_notification.proto @@ -0,0 +1,34 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + +import public "models/location_info.proto"; +import public "models/pc5_neighbour_cell_info.proto"; +import public "models/time_stamp.proto"; + +message ProvChgPc5Notification { + + // For sidelink communication, the Destination Layer-2 ID is set to the ProSe Layer-2 Group ID or Prose UE ID, see ETSI TS 136 321 [i.12]. + string dstLayer2Id = 1; + + LocationInfo locationInfo = 2; + + // The information of the neighbour cells in a visiting PLMN that support V2X communication over PC5. + repeated Pc5NeighbourCellInfo neighbourCellInfo = 3; + + // Shall be set to \"ProvChgPc5Notification\". + string notificationType = 4; + + TimeStamp timeStamp = 5; + +} diff --git a/proto3/models/prov_chg_pc5_subscription.proto b/proto3/models/prov_chg_pc5_subscription.proto new file mode 100644 index 0000000..3bc0a73 --- /dev/null +++ b/proto3/models/prov_chg_pc5_subscription.proto @@ -0,0 +1,33 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + +import public "models/prov_chg_pc5_subscription_filter_criteria.proto"; +import public "models/prov_chg_pc5_subscription_links.proto"; +import public "models/time_stamp.proto"; + +message ProvChgPc5Subscription { + + ProvChgPc5SubscriptionLinks Underscorelinks = 1; + + // URI selected by the service consumer to receive notifications on the subscribed VIS information. This shall be included both in the request and in response. + string callbackReference = 2; + + TimeStamp expiryDeadline = 3; + + ProvChgPc5SubscriptionFilterCriteria filterCriteria = 4; + + // Shall be set to \"ProvChgPc5Subscription\". + string subscriptionType = 5; + +} diff --git a/proto3/models/prov_chg_pc5_subscription_filter_criteria.proto b/proto3/models/prov_chg_pc5_subscription_filter_criteria.proto new file mode 100644 index 0000000..2bd96f2 --- /dev/null +++ b/proto3/models/prov_chg_pc5_subscription_filter_criteria.proto @@ -0,0 +1,28 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + +import public "models/location_info.proto"; +import public "models/pc5_neighbour_cell_info.proto"; + +message ProvChgPc5SubscriptionFilterCriteria { + + // For sidelink communication, the Destination Layer-2 ID is set to the ProSe Layer-2 Group ID or Prose UE ID, see ETSI TS 136 321 [i.12]. + string dstLayer2Id = 1; + + LocationInfo locationInfo = 2; + + // The information of the neighbour cells in a visiting PLMN that support V2X communication over PC5. + repeated Pc5NeighbourCellInfo neighbourCellInfo = 3; + +} diff --git a/proto3/models/prov_chg_pc5_subscription_links.proto b/proto3/models/prov_chg_pc5_subscription_links.proto new file mode 100644 index 0000000..06d6c0d --- /dev/null +++ b/proto3/models/prov_chg_pc5_subscription_links.proto @@ -0,0 +1,21 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + +import public "models/link_type.proto"; + +message ProvChgPc5SubscriptionLinks { + + LinkType self = 1; + +} diff --git a/proto3/models/prov_chg_uu_mbms_notification.proto b/proto3/models/prov_chg_uu_mbms_notification.proto new file mode 100644 index 0000000..b6bc854 --- /dev/null +++ b/proto3/models/prov_chg_uu_mbms_notification.proto @@ -0,0 +1,34 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + +import public "models/location_info.proto"; +import public "models/time_stamp.proto"; +import public "models/uu_mbms_neighbour_cell_info.proto"; +import public "models/v2x_server_usd.proto"; + +message ProvChgUuMbmsNotification { + + LocationInfo locationInfo = 1; + + // The information of the neighbour cells in a visiting PLMN that support V2X communication over Uu MBMS. + repeated UuMbmsNeighbourCellInfo neighbourCellInfo = 2; + + // Shall be set to \"ProvChgUuMbmsNotification\". + string notificationType = 3; + + TimeStamp timeStamp = 4; + + V2xServerUsd v2xServerUsd = 5; + +} diff --git a/proto3/models/prov_chg_uu_mbms_subscription.proto b/proto3/models/prov_chg_uu_mbms_subscription.proto new file mode 100644 index 0000000..2eb4aa9 --- /dev/null +++ b/proto3/models/prov_chg_uu_mbms_subscription.proto @@ -0,0 +1,33 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + +import public "models/prov_chg_uu_mbms_subscription_filter_criteria.proto"; +import public "models/prov_chg_uu_mbms_subscription_links.proto"; +import public "models/time_stamp.proto"; + +message ProvChgUuMbmsSubscription { + + ProvChgUuMbmsSubscriptionLinks Underscorelinks = 1; + + // URI selected by the service consumer to receive notifications on the subscribed VIS information. This shall be included both in the request and in response. + string callbackReference = 2; + + TimeStamp expiryDeadline = 3; + + ProvChgUuMbmsSubscriptionFilterCriteria filterCriteria = 4; + + // Shall be set to \"ProvChgUuMbmsSubscription\". + string subscriptionType = 5; + +} diff --git a/proto3/models/prov_chg_uu_mbms_subscription_filter_criteria.proto b/proto3/models/prov_chg_uu_mbms_subscription_filter_criteria.proto new file mode 100644 index 0000000..a601a7d --- /dev/null +++ b/proto3/models/prov_chg_uu_mbms_subscription_filter_criteria.proto @@ -0,0 +1,28 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + +import public "models/location_info.proto"; +import public "models/uu_mbms_neighbour_cell_info.proto"; +import public "models/v2x_server_usd.proto"; + +message ProvChgUuMbmsSubscriptionFilterCriteria { + + LocationInfo locationInfo = 1; + + // The information of the neighbour cells in a visiting PLMN that support V2X communication over Uu MBMS. + repeated UuMbmsNeighbourCellInfo neighbourCellInfo = 2; + + V2xServerUsd v2xServerUsd = 3; + +} diff --git a/proto3/models/prov_chg_uu_mbms_subscription_links.proto b/proto3/models/prov_chg_uu_mbms_subscription_links.proto new file mode 100644 index 0000000..5423694 --- /dev/null +++ b/proto3/models/prov_chg_uu_mbms_subscription_links.proto @@ -0,0 +1,21 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + +import public "models/link_type.proto"; + +message ProvChgUuMbmsSubscriptionLinks { + + LinkType self = 1; + +} diff --git a/proto3/models/prov_chg_uu_uni_notification.proto b/proto3/models/prov_chg_uu_uni_notification.proto new file mode 100644 index 0000000..3a112b7 --- /dev/null +++ b/proto3/models/prov_chg_uu_uni_notification.proto @@ -0,0 +1,34 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + +import public "models/location_info.proto"; +import public "models/time_stamp.proto"; +import public "models/uu_uni_neighbour_cell_info.proto"; +import public "models/v2x_application_server.proto"; + +message ProvChgUuUniNotification { + + LocationInfo locationInfo = 1; + + // The information of the neighbour cells in a visiting PLMN that support V2X communication over Uu unicast. + repeated UuUniNeighbourCellInfo neighbourCellInfo = 2; + + // Shall be set to \"ProvChgUuUniNotification\". + string notificationType = 3; + + TimeStamp timeStamp = 4; + + V2xApplicationServer v2xApplicationServer = 5; + +} diff --git a/proto3/models/prov_chg_uu_uni_subscription.proto b/proto3/models/prov_chg_uu_uni_subscription.proto new file mode 100644 index 0000000..c74a43d --- /dev/null +++ b/proto3/models/prov_chg_uu_uni_subscription.proto @@ -0,0 +1,33 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + +import public "models/prov_chg_uu_uni_subscription_filter_criteria.proto"; +import public "models/prov_chg_uu_uni_subscription_links.proto"; +import public "models/time_stamp.proto"; + +message ProvChgUuUniSubscription { + + ProvChgUuUniSubscriptionLinks Underscorelinks = 1; + + // URI selected by the service consumer to receive notifications on the subscribed VIS information. This shall be included both in the request and in response. + string callbackReference = 2; + + TimeStamp expiryDeadline = 3; + + ProvChgUuUniSubscriptionFilterCriteria filterCriteria = 4; + + // Shall be set to \"ProvChgUuUniSubscription\". + string subscriptionType = 5; + +} diff --git a/proto3/models/prov_chg_uu_uni_subscription_filter_criteria.proto b/proto3/models/prov_chg_uu_uni_subscription_filter_criteria.proto new file mode 100644 index 0000000..795f632 --- /dev/null +++ b/proto3/models/prov_chg_uu_uni_subscription_filter_criteria.proto @@ -0,0 +1,28 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + +import public "models/location_info.proto"; +import public "models/uu_uni_neighbour_cell_info.proto"; +import public "models/v2x_application_server.proto"; + +message ProvChgUuUniSubscriptionFilterCriteria { + + LocationInfo locationInfo = 1; + + // The information of the neighbour cells in a visiting PLMN that support V2X communication over Uu unicast. + repeated UuUniNeighbourCellInfo neighbourCellInfo = 2; + + V2xApplicationServer v2xApplicationServer = 3; + +} diff --git a/proto3/models/prov_chg_uu_uni_subscription_links.proto b/proto3/models/prov_chg_uu_uni_subscription_links.proto new file mode 100644 index 0000000..e519e72 --- /dev/null +++ b/proto3/models/prov_chg_uu_uni_subscription_links.proto @@ -0,0 +1,21 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + +import public "models/link_type.proto"; + +message ProvChgUuUniSubscriptionLinks { + + LinkType self = 1; + +} diff --git a/proto3/models/subscription_link_list.proto b/proto3/models/subscription_link_list.proto new file mode 100644 index 0000000..2e0eb55 --- /dev/null +++ b/proto3/models/subscription_link_list.proto @@ -0,0 +1,21 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + +import public "models/subscription_link_list_links.proto"; + +message SubscriptionLinkList { + + SubscriptionLinkListLinks Underscorelinks = 1; + +} diff --git a/proto3/models/subscription_link_list_links.proto b/proto3/models/subscription_link_list_links.proto new file mode 100644 index 0000000..ff5be83 --- /dev/null +++ b/proto3/models/subscription_link_list_links.proto @@ -0,0 +1,24 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + +import public "models/link_type.proto"; +import public "models/subscription_link_list_links_subscriptions.proto"; + +message SubscriptionLinkListLinks { + + LinkType self = 1; + + repeated SubscriptionLinkListLinksSubscriptions subscriptions = 2; + +} diff --git a/proto3/models/subscription_link_list_links_subscriptions.proto b/proto3/models/subscription_link_list_links_subscriptions.proto new file mode 100644 index 0000000..e6719cc --- /dev/null +++ b/proto3/models/subscription_link_list_links_subscriptions.proto @@ -0,0 +1,24 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + + +message SubscriptionLinkListLinksSubscriptions { + + // The URI referring to the subscription. + string href = 1; + + // Type of the subscription. The values are as defined in the \\\"subscriptionType\\\" attribute for each different V2X information event subscription data type. + string subscriptionType = 2; + +} diff --git a/proto3/models/tdd_info.proto b/proto3/models/tdd_info.proto new file mode 100644 index 0000000..53676ac --- /dev/null +++ b/proto3/models/tdd_info.proto @@ -0,0 +1,27 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + +import public "models/earfcn.proto"; +import public "models/transmission_bandwidth.proto"; + +message TddInfo { + + Earfcn earfcn = 1; + + // Uplink-downlink subframe configuration information. + string subframeAssignment = 2; + + TransmissionBandwidth transmissionBandwidth = 3; + +} diff --git a/proto3/models/time_stamp.proto b/proto3/models/time_stamp.proto new file mode 100644 index 0000000..953b584 --- /dev/null +++ b/proto3/models/time_stamp.proto @@ -0,0 +1,24 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + + +message TimeStamp { + + // The nanoseconds part of the time. Time is defined as Unix-time since January 1, 1970, 00:00:00 UTC. + int32 nanoSeconds = 1; + + // The seconds part of the time. Time is defined as Unixtime since January 1, 1970, 00:00:00 UTC. + int32 seconds = 2; + +} diff --git a/proto3/models/transmission_bandwidth.proto b/proto3/models/transmission_bandwidth.proto new file mode 100644 index 0000000..31683ef --- /dev/null +++ b/proto3/models/transmission_bandwidth.proto @@ -0,0 +1,21 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + +import public "models/transmission_bandwidth_transmission_bandwidth.proto"; + +message TransmissionBandwidth { + + TransmissionBandwidthTransmissionBandwidth transmissionBandwidth = 1; + +} diff --git a/proto3/models/transmission_bandwidth_transmission_bandwidth.proto b/proto3/models/transmission_bandwidth_transmission_bandwidth.proto new file mode 100644 index 0000000..4e47df4 --- /dev/null +++ b/proto3/models/transmission_bandwidth_transmission_bandwidth.proto @@ -0,0 +1,18 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + + +message TransmissionBandwidthTransmissionBandwidth { + +} diff --git a/proto3/models/uu_mbms_neighbour_cell_info.proto b/proto3/models/uu_mbms_neighbour_cell_info.proto new file mode 100644 index 0000000..f303714 --- /dev/null +++ b/proto3/models/uu_mbms_neighbour_cell_info.proto @@ -0,0 +1,36 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + +import public "models/ecgi.proto"; +import public "models/fdd_info.proto"; +import public "models/plmn.proto"; +import public "models/tdd_info.proto"; + +message UuMbmsNeighbourCellInfo { + + Ecgi ecgi = 1; + + FddInfo fddInfo = 2; + + // Supported MBMS Service Area Identities in the cell. + repeated string mbmsServiceAreaIdentity = 3; + + // Physical Cell Identifier. + int32 pci = 4; + + Plmn plmn = 5; + + TddInfo tddInfo = 6; + +} diff --git a/proto3/models/uu_mbms_provisioning_info.proto b/proto3/models/uu_mbms_provisioning_info.proto new file mode 100644 index 0000000..5d8f255 --- /dev/null +++ b/proto3/models/uu_mbms_provisioning_info.proto @@ -0,0 +1,24 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + +import public "models/time_stamp.proto"; +import public "models/uu_mbms_provisioning_info_pro_info_uu_mbms.proto"; + +message UuMbmsProvisioningInfo { + + UuMbmsProvisioningInfoProInfoUuMbms proInfoUuMbms = 1; + + TimeStamp timeStamp = 2; + +} diff --git a/proto3/models/uu_mbms_provisioning_info_pro_info_uu_mbms.proto b/proto3/models/uu_mbms_provisioning_info_pro_info_uu_mbms.proto new file mode 100644 index 0000000..11aef9e --- /dev/null +++ b/proto3/models/uu_mbms_provisioning_info_pro_info_uu_mbms.proto @@ -0,0 +1,28 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + +import public "models/location_info.proto"; +import public "models/uu_mbms_neighbour_cell_info.proto"; +import public "models/v2x_server_usd.proto"; + +message UuMbmsProvisioningInfoProInfoUuMbms { + + LocationInfo locationInfo = 1; + + // The information of the neighbour cells in a visiting PLMN that support V2X communication over Uu MBMS. + repeated UuMbmsNeighbourCellInfo neighbourCellInfo = 2; + + V2xServerUsd v2xServerUsd = 3; + +} diff --git a/proto3/models/uu_uni_neighbour_cell_info.proto b/proto3/models/uu_uni_neighbour_cell_info.proto new file mode 100644 index 0000000..2bd3057 --- /dev/null +++ b/proto3/models/uu_uni_neighbour_cell_info.proto @@ -0,0 +1,33 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + +import public "models/ecgi.proto"; +import public "models/fdd_info.proto"; +import public "models/plmn.proto"; +import public "models/tdd_info.proto"; + +message UuUniNeighbourCellInfo { + + Ecgi ecgi = 1; + + FddInfo fddInfo = 2; + + // Physical Cell Identifier. + int32 pci = 3; + + Plmn plmn = 4; + + TddInfo tddInfo = 5; + +} diff --git a/proto3/models/uu_unicast_provisioning_info.proto b/proto3/models/uu_unicast_provisioning_info.proto new file mode 100644 index 0000000..ff48059 --- /dev/null +++ b/proto3/models/uu_unicast_provisioning_info.proto @@ -0,0 +1,24 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + +import public "models/time_stamp.proto"; +import public "models/uu_unicast_provisioning_info_pro_info_uu_unicast.proto"; + +message UuUnicastProvisioningInfo { + + repeated UuUnicastProvisioningInfoProInfoUuUnicast proInfoUuUnicast = 1; + + TimeStamp timeStamp = 2; + +} diff --git a/proto3/models/uu_unicast_provisioning_info_pro_info_uu_unicast.proto b/proto3/models/uu_unicast_provisioning_info_pro_info_uu_unicast.proto new file mode 100644 index 0000000..bf567b8 --- /dev/null +++ b/proto3/models/uu_unicast_provisioning_info_pro_info_uu_unicast.proto @@ -0,0 +1,28 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + +import public "models/location_info.proto"; +import public "models/uu_uni_neighbour_cell_info.proto"; +import public "models/v2x_application_server.proto"; + +message UuUnicastProvisioningInfoProInfoUuUnicast { + + LocationInfo locationInfo = 1; + + // The information of the neighbour cells in a visiting PLMN that support V2X communication over Uu unicast. + repeated UuUniNeighbourCellInfo neighbourCellInfo = 2; + + V2xApplicationServer v2xApplicationServer = 3; + +} diff --git a/proto3/models/v2x_application_server.proto b/proto3/models/v2x_application_server.proto new file mode 100644 index 0000000..ed5abf8 --- /dev/null +++ b/proto3/models/v2x_application_server.proto @@ -0,0 +1,22 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + + +message V2xApplicationServer { + + string ipAddress = 1; + + string udpPort = 2; + +} diff --git a/proto3/models/v2x_msg_publication.proto b/proto3/models/v2x_msg_publication.proto new file mode 100644 index 0000000..2ab1e26 --- /dev/null +++ b/proto3/models/v2x_msg_publication.proto @@ -0,0 +1,34 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + + +message V2xMsgPublication { + + // Published V2X message content. Its format is defined by the standardization organization indicated by the attribute stdOrganization. + string msgContent = 1; + + // The encode format of the V2X message, for example base64. + string msgEncodeFormat = 2; + + // Published V2X message type. Its value is defined by the standardization organization indicated by the attribute stdOrganization. See note 2. + enum msgType { + SEE_DESCRIPTION = 0; + } + + // Standardization organization which defines the published V2X message type: ETSI: European Telecommunications Standards Institute. See note 1. + enum stdOrganization { + SEE_DESCRIPTION = 0; + } + +} diff --git a/proto3/models/v2x_msg_subscription.proto b/proto3/models/v2x_msg_subscription.proto new file mode 100644 index 0000000..ec71460 --- /dev/null +++ b/proto3/models/v2x_msg_subscription.proto @@ -0,0 +1,33 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + +import public "models/time_stamp.proto"; +import public "models/v2x_msg_subscription_filter_criteria.proto"; +import public "models/v2x_msg_subscription_links.proto"; + +message V2xMsgSubscription { + + V2xMsgSubscriptionLinks Underscorelinks = 1; + + // URI selected by the service consumer to receive notifications on the subscribed V2X message. This shall be included both in the request and in response. + string callbackReference = 2; + + TimeStamp expiryDeadline = 3; + + V2xMsgSubscriptionFilterCriteria filterCriteria = 4; + + // Shall be set to \"V2xMsgSubscription\". + string subscriptionType = 5; + +} diff --git a/proto3/models/v2x_msg_subscription_filter_criteria.proto b/proto3/models/v2x_msg_subscription_filter_criteria.proto new file mode 100644 index 0000000..1835c49 --- /dev/null +++ b/proto3/models/v2x_msg_subscription_filter_criteria.proto @@ -0,0 +1,26 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + + +message V2xMsgSubscriptionFilterCriteria { + + // Subscribed V2X message type. Its value is defined by the standardization organization indicated by the attribute stdOrganization. See note 2. + repeated string msgType = 1; + + // Standardization organization which defines the subscribed V2X message type: ETSI: European Telecommunications Standards Institute. See note 1. + enum stdOrganization { + SEE_DESCRIPTION = 0; + } + +} diff --git a/proto3/models/v2x_msg_subscription_links.proto b/proto3/models/v2x_msg_subscription_links.proto new file mode 100644 index 0000000..8e3ef4f --- /dev/null +++ b/proto3/models/v2x_msg_subscription_links.proto @@ -0,0 +1,21 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + +import public "models/link_type.proto"; + +message V2xMsgSubscriptionLinks { + + LinkType self = 1; + +} diff --git a/proto3/models/v2x_server_usd.proto b/proto3/models/v2x_server_usd.proto new file mode 100644 index 0000000..f675b59 --- /dev/null +++ b/proto3/models/v2x_server_usd.proto @@ -0,0 +1,27 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + +import public "models/v2x_server_usd_sdp_info.proto"; +import public "models/v2x_server_usd_tmgi.proto"; + +message V2xServerUsd { + + V2xServerUsdSdpInfo sdpInfo = 1; + + // A list of service area identifier for the applicable MBMS broadcast area. + repeated string serviceAreaIdentifier = 2; + + V2xServerUsdTmgi tmgi = 3; + +} diff --git a/proto3/models/v2x_server_usd_sdp_info.proto b/proto3/models/v2x_server_usd_sdp_info.proto new file mode 100644 index 0000000..d2e5ca9 --- /dev/null +++ b/proto3/models/v2x_server_usd_sdp_info.proto @@ -0,0 +1,22 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + + +message V2xServerUsdSdpInfo { + + string ipMulticastAddress = 1; + + string portNumber = 2; + +} diff --git a/proto3/models/v2x_server_usd_tmgi.proto b/proto3/models/v2x_server_usd_tmgi.proto new file mode 100644 index 0000000..4857f45 --- /dev/null +++ b/proto3/models/v2x_server_usd_tmgi.proto @@ -0,0 +1,27 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + + +message V2xServerUsdTmgi { + + // MBMS Service ID consisting of three octets. + string mbmsServiceId = 1; + + // The Mobile Country Code part of PLMN Identity. + string mcc = 2; + + // The Mobile Network Code part of PLMN Identity. + string mnc = 3; + +} diff --git a/proto3/services/queries_service.proto b/proto3/services/queries_service.proto new file mode 100644 index 0000000..22c4f14 --- /dev/null +++ b/proto3/services/queries_service.proto @@ -0,0 +1,38 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + +import "google/protobuf/empty.proto"; +import public "models/problem_details.proto"; +import public "models/uu_mbms_provisioning_info.proto"; +import public "models/uu_unicast_provisioning_info.proto"; + +service QueriesService { + rpc ProvInfoUuMbmsGET (ProvInfoUuMbmsGETRequest) returns (UuMbmsProvisioningInfo); + + rpc ProvInfoUuUnicastGET (ProvInfoUuUnicastGETRequest) returns (UuUnicastProvisioningInfo); + +} + +message ProvInfoUuMbmsGETRequest { + // omma separated list of locations to identify a cell of a base station or a particular geographical area + string locationInfo = 1; + +} + +message ProvInfoUuUnicastGETRequest { + // Comma separated list of locations to identify a cell of a base station or a particular geographical area + string locationInfo = 1; + +} + -- GitLab From 823c898d20512306f1334d9d083c200f69289695 Mon Sep 17 00:00:00 2001 From: Elian Kraja Date: Tue, 1 Dec 2020 21:33:01 +0100 Subject: [PATCH 06/11] Fix on contact details --- MEC030_V2XInformationService.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MEC030_V2XInformationService.yaml b/MEC030_V2XInformationService.yaml index 01e7ca5..726d9c6 100644 --- a/MEC030_V2XInformationService.yaml +++ b/MEC030_V2XInformationService.yaml @@ -3,6 +3,8 @@ info: version: 2.1.1 description: "ETSI GS MEC 030 V2X Information Service API described using OpenAPI." contact: + name: ETSI Forge + email: cti_support@etsi.org url: https://forge.etsi.org/rep/mec/gs030-vis-api license: name: BSD-3-Clause -- GitLab From daa02b165d0d1a548b4d53d37680089ba570c11a Mon Sep 17 00:00:00 2001 From: piscione Date: Thu, 7 Jan 2021 15:05:13 +0100 Subject: [PATCH 07/11] Updated OAS YAML file and generated proto3 files. --- MEC030_V2XInformationService.yaml | 449 ++++++++++++++++-- proto3/models/cell_id.proto | 4 +- proto3/models/earfcn.proto | 2 +- proto3/models/ecgi.proto | 4 +- proto3/models/fdd_info.proto | 10 +- proto3/models/link_type.proto | 2 +- proto3/models/location_info.proto | 4 +- proto3/models/location_info_geo_area.proto | 2 +- proto3/models/msg_type.proto | 27 ++ proto3/models/pc5_neighbour_cell_info.proto | 4 +- proto3/models/pc5_provisioning_info.proto | 9 +- .../pc5_provisioning_info_pro_info_pc5.proto | 14 +- proto3/models/plmn.proto | 2 +- proto3/models/predicted_qos.proto | 27 ++ proto3/models/predicted_qos_routes.proto | 22 + .../predicted_qos_routes_route_info.proto | 30 ++ proto3/models/problem_details.proto | 2 +- proto3/models/prov_chg_pc5_notification.proto | 12 +- proto3/models/prov_chg_pc5_subscription.proto | 12 +- ...chg_pc5_subscription_filter_criteria.proto | 8 +- .../prov_chg_pc5_subscription_links.proto | 2 +- .../prov_chg_uu_mbms_notification.proto | 12 +- .../prov_chg_uu_mbms_subscription.proto | 12 +- ...uu_mbms_subscription_filter_criteria.proto | 8 +- .../prov_chg_uu_mbms_subscription_links.proto | 2 +- .../models/prov_chg_uu_uni_notification.proto | 12 +- .../models/prov_chg_uu_uni_subscription.proto | 12 +- ..._uu_uni_subscription_filter_criteria.proto | 8 +- .../prov_chg_uu_uni_subscription_links.proto | 2 +- proto3/models/subscription.proto | 27 ++ proto3/models/subscription_link_list.proto | 4 +- .../models/subscription_link_list_links.proto | 2 +- ...iption_link_list_links_subscriptions.proto | 6 +- proto3/models/tdd_info.proto | 6 +- proto3/models/time_stamp.proto | 4 +- proto3/models/transmission_bandwidth.proto | 4 +- ...ion_bandwidth_transmission_bandwidth.proto | 11 +- .../models/uu_mbms_neighbour_cell_info.proto | 8 +- proto3/models/uu_mbms_provisioning_info.proto | 6 +- ...s_provisioning_info_pro_info_uu_mbms.proto | 8 +- .../models/uu_uni_neighbour_cell_info.proto | 6 +- .../models/uu_unicast_provisioning_info.proto | 6 +- ...rovisioning_info_pro_info_uu_unicast.proto | 8 +- proto3/models/v2x_application_server.proto | 7 +- proto3/models/v2x_msg_notification.proto | 43 ++ .../models/v2x_msg_notification_links.proto | 22 + proto3/models/v2x_msg_publication.proto | 16 +- proto3/models/v2x_msg_subscription.proto | 13 +- ...v2x_msg_subscription_filter_criteria.proto | 7 +- .../models/v2x_msg_subscription_links.proto | 4 +- proto3/models/v2x_server_usd.proto | 8 +- proto3/models/v2x_server_usd_sdp_info.proto | 7 +- proto3/models/v2x_server_usd_tmgi.proto | 5 +- proto3/services/qo_s_service.proto | 27 ++ proto3/services/queries_service.proto | 16 +- proto3/services/subscription_service.proto | 62 +++ proto3/services/v2_x_msg_service.proto | 28 ++ 57 files changed, 900 insertions(+), 187 deletions(-) create mode 100644 proto3/models/msg_type.proto create mode 100644 proto3/models/predicted_qos.proto create mode 100644 proto3/models/predicted_qos_routes.proto create mode 100644 proto3/models/predicted_qos_routes_route_info.proto create mode 100644 proto3/models/subscription.proto create mode 100644 proto3/models/v2x_msg_notification.proto create mode 100644 proto3/models/v2x_msg_notification_links.proto create mode 100644 proto3/services/qo_s_service.proto create mode 100644 proto3/services/subscription_service.proto create mode 100644 proto3/services/v2_x_msg_service.proto diff --git a/MEC030_V2XInformationService.yaml b/MEC030_V2XInformationService.yaml index 726d9c6..28d7ed9 100644 --- a/MEC030_V2XInformationService.yaml +++ b/MEC030_V2XInformationService.yaml @@ -56,6 +56,7 @@ paths: $ref: '#/components/responses/406' '429': $ref: '#/components/responses/429' + /queries/uu_mbms_provisioning_info: get: tags: @@ -89,20 +90,286 @@ paths: '406': $ref: '#/components/responses/406' '429': - $ref: '#/components/responses/429' - #/queries/pc5_provisioning_info: - #get: - #/provide_predicted_qos: - #post: - #/publish_v2x_message: - #post: - #/subscriptions: - #get: - #post: - #/subscriptions/{subscriptionId}: - #get: - #put: - #delete: + $ref: '#/components/responses/429' + + /queries/pc5_provisioning_info: + get: + tags: + - 'queries' + summary: 'Query provisioning information for V2X communication over PC5.' + description: 'Query provisioning information for V2X communication over PC5.' + operationId: prov_infoGET + parameters: + - in: query + name: location_info + schema: + type: string + required: true + description: 'Comma separated list of locations to identify a cell of a base station or a particular geographical area' + responses: + '200': + description: 'A response body containing the PC5 provisioning information is returned.' + content: + application/json: + schema: + $ref: '#/components/schemas/Pc5ProvisioningInfo' + '400': + $ref: '#/components/responses/400' + '401': + $ref: '#/components/responses/401' + '403': + $ref: '#/components/responses/403' + '404': + $ref: '#/components/responses/404' + '406': + $ref: '#/components/responses/406' + '429': + $ref: '#/components/responses/429' + + /provide_predicted_qos: + post: + tags: + - 'QoS' + summary: 'Request the predicted QoS correspondent to potential routes of a vehicular UE.' + description: 'Request the predicted QoS correspondent to potential routes of a vehicular UE.' + operationId: predicted_qosPOST + requestBody: + required: true + content: + application/json: + schema: + $ref: '#/components/schemas/PredictedQos' + responses: + '200': + description: 'The response body shall contain the predicted QoS corresponding to potential routes of a vehicular UE' + content: + application/json: + schema: + $ref: '#/components/schemas/PredictedQos' + '400': + $ref: '#/components/responses/400' + '401': + $ref: '#/components/responses/401' + '403': + $ref: '#/components/responses/403' + '404': + $ref: '#/components/responses/404' + + /publish_v2x_message: + post: + tags: + - 'V2X_msg' + summary: 'Used to publish a V2X message.' + description: 'Used to publish a V2X message.' + operationId: v2x_messagePOST + requestBody: + required: true + content: + application/json: + schema: + $ref: '#/components/schemas/V2xMsgPublication' + responses: + '204': + $ref: '#/components/responses/204' + '400': + $ref: '#/components/responses/400' + '401': + $ref: '#/components/responses/401' + '403': + $ref: '#/components/responses/403' + '404': + $ref: '#/components/responses/404' + '406': + $ref: '#/components/responses/406' + '429': + $ref: '#/components/responses/429' + + /subscriptions: + get: + tags: + - 'subscription' + summary: 'Request information about the subscriptions for this requestor.' + description: 'Request information about the subscriptions for this requestor.' + operationId: subGET + parameters: + - in: query + name: subscription_type + description: 'Query parameter to filter on a specific subscription type. Permitted values: prov_chg_uu_uni: provisioning information change for V2X communication over Uuunicast prov_chg_uu_mbms: provisioning information change for V2X communication over Uu MBMS prov_chg_uu_pc5: provisioning information change for V2X communication over PC5. v2x_msg: V2X interoperability message' + schema: + type: string + required: false + responses: + '200': + description: 'A response body containing the list of links to requestor subscriptions is returned.' + content: + application/json: + schema: + $ref: '#/components/schemas/SubscriptionLinkList' + '400': + $ref: '#/components/responses/400' + '401': + $ref: '#/components/responses/401' + '403': + $ref: '#/components/responses/403' + '404': + $ref: '#/components/responses/404' + '406': + $ref: '#/components/responses/406' + '429': + $ref: '#/components/responses/429' + post: + tags: + - 'subscription' + summary: ' create a new subscription to VIS notifications.' + description: ' create a new subscription to VIS notifications.' + operationId: subPOST + requestBody: + required: true + content: + application/json: + schema: + oneOf: + - $ref: '#/components/schemas/ProvChgUuUniSubscription' + - $ref: '#/components/schemas/ProvChgUuMbmsSubscription' + - $ref: '#/components/schemas/ProvChgPc5Subscription' + - $ref: '#/components/schemas/V2xMsgSubscription' + responses: + '201': + description: 'In the returned NotificationSubscription structure, the created subscription is described using the appropriate data type.' + content: + application/json: + schema: + oneOf: + - $ref: '#/components/schemas/ProvChgUuUniSubscription' + - $ref: '#/components/schemas/ProvChgUuMbmsSubscription' + - $ref: '#/components/schemas/ProvChgPc5Subscription' + - $ref: '#/components/schemas/V2xMsgSubscription' + '400': + $ref: '#/components/responses/400' + '401': + $ref: '#/components/responses/401' + '403': + $ref: '#/components/responses/403' + '404': + $ref: '#/components/responses/404' + '406': + $ref: '#/components/responses/406' + '415': + $ref: '#/components/responses/415' + '422': + $ref: '#/components/responses/422' + '429': + $ref: '#/components/responses/429' + + + /subscriptions/{subscriptionId}: + parameters: + - in: path + name: subscriptionId + description: 'Refers to created subscription, where the VIS API allocates a unique resource name for this subscription' + schema: + type: string + required: true + + + get: + tags: + - 'subscription' + summary: 'Retrieve information about this subscription.' + description: 'Retrieve information about this subscription.' + operationId: individualSubscriptionGET + + responses: + '200': + description: 'A response body containing the data type describing the specific RNI event subscription is returned' + content: + application/json: + schema: + oneOf: + - $ref: '#/components/schemas/ProvChgUuUniSubscription' + - $ref: '#/components/schemas/ProvChgUuMbmsSubscription' + - $ref: '#/components/schemas/ProvChgPc5Subscription' + - $ref: '#/components/schemas/V2xMsgSubscription' + '400': + $ref: '#/components/responses/400' + '401': + $ref: '#/components/responses/401' + '403': + $ref: '#/components/responses/403' + '404': + $ref: '#/components/responses/404' + '406': + $ref: '#/components/responses/406' + '429': + $ref: '#/components/responses/429' + + put: + tags: + - 'subscription' + summary: 'Used to update the existing subscription.' + description: 'Used to update the existing subscription.' + operationId: individualSubscriptionPUT + requestBody: + required: true + content: + application/json: + schema: + oneOf: + - $ref: '#/components/schemas/ProvChgUuUniSubscription' + - $ref: '#/components/schemas/ProvChgUuMbmsSubscription' + - $ref: '#/components/schemas/ProvChgPc5Subscription' + - $ref: '#/components/schemas/V2xMsgSubscription' + responses: + '200': + description: 'A response body containing data type describing the updated subscription is returned' + content: + application/json: + schema: + oneOf: + - $ref: '#/components/schemas/ProvChgUuUniSubscription' + - $ref: '#/components/schemas/ProvChgUuMbmsSubscription' + - $ref: '#/components/schemas/ProvChgPc5Subscription' + - $ref: '#/components/schemas/V2xMsgSubscription' + '400': + $ref: '#/components/responses/400' + '401': + $ref: '#/components/responses/401' + + '403': + $ref: '#/components/responses/403' + + '404': + $ref: '#/components/responses/404' + + '406': + $ref: '#/components/responses/406' + + '412': + $ref: '#/components/responses/412' + + '422': + $ref: '#/components/responses/422' + + '429': + $ref: '#/components/responses/429' + delete: + tags: + - 'subscription' + summary: 'Used to cancel the existing subscription.' + description: 'Used to cancel the existing subscription.' + operationId: individualSubscriptionDELETE + responses: + '204': + $ref: '#/components/responses/204' + '401': + $ref: '#/components/responses/401' + '403': + $ref: '#/components/responses/403' + '404': + $ref: '#/components/responses/404' + '429': + $ref: '#/components/responses/429' + # /notifitication_end_point_provided_by_client #post: @@ -176,8 +443,6 @@ components: - dlTransmissionBandwidth type: object x-etsi-ref: 6.5.6 - LocalityTypes: - type: string LocationInfo.geoArea: description: Information of a geographical area. @@ -239,9 +504,7 @@ components: Pc5ProvisioningInfo.proInfoPc5: description: The provisioning information per location as defined below. - items: - type: object - minItems: 1 + properties: dstLayer2Id: description: "For sidelink communication, the Destination Layer-2 ID is set to the ProSe Layer-2 Group ID or Prose UE ID, see ETSI TS\_136\_321 [i.12].\nPLMN operators coordinate to make sure Destination Layer-2 ID(s) for different V2X services are configured in a consistent manner." @@ -268,7 +531,9 @@ components: Pc5ProvisioningInfo: properties: proInfoPc5: - $ref: '#/components/schemas/Pc5ProvisioningInfo.proInfoPc5' + type: array + items: + $ref: '#/components/schemas/Pc5ProvisioningInfo.proInfoPc5' timeStamp: # description': Time stamp. # x-etsi-mec-cardinality': 0..1 @@ -296,6 +561,55 @@ components: - mnc type: object x-etsi-ref: 6.5.4 + + PredictedQos.routes.routeInfo: + required: + - location + properties: + location: + $ref: '#/components/schemas/LocationInfo' + time: + $ref: '#/components/schemas/TimeStamp' + rsrp: + description: 'Reference Signal Received Quality as defined in ETSI TS 136 214 [i.13]. Shall only be included in the response' + type: integer + format: Uint8 + + rsrq: + description: 'Reference Signal Received Quality as defined in ETSI TS 136 214 [i.13]. Shall only be included in the response' + type: integer + format: Uint8 + + PredictedQos.routes: + properties: + routeinfo: + description: 'Information relating to a specific route. The first structure shall relate to the route origin and the last to the route destination. Intermediate waypoint locations may also be provided. ' + type: array + minItems: 2 + items: + $ref: '#/components/schemas/PredictedQos.routes.routeInfo' + required: + - routeinfo + + PredictedQos: + description: 'predicted QoS of a vehicular UE' + properties: + timeGranularity: + $ref: '#/components/schemas/TimeStamp' + locationGranularity: + description: 'Granularity of visited location. Measured in meters' + type: string + routes: + type: array + items: + $ref: '#/components/schemas/PredictedQos.routes' + required: + - locationGranularity + - routes + type: object + x-etsi-mec-cardinality: 0..1 + + ProvChgPc5Notification: properties: dstLayer2Id: @@ -605,9 +919,7 @@ components: - filterCriteria type: object x-etsi-ref: 6.3.2 - SerializerTypes: - type: string - + SubscriptionLinkList.links.subscriptions: description: "The service consumer\u2019s subscriptions." properties: @@ -716,12 +1028,6 @@ components: - transmissionBandwidth type: object x-etsi-ref: 6.6.4 - TransportTypes: - type: string - Uint32: - type: number - UnsignedInt: - type: number UuMbmsNeighbourCellInfo: properties: ecgi: @@ -901,6 +1207,20 @@ components: type: object x-etsi-ref: 6.5.8 + + msgType: + description: '− denm(1): Decentralized Environmental Notification Message (DENM) as specified in ETSI EN 302 637-3 [i.3], − cam(2): Cooperative Awareness Message (CAM) as specified in ETSI EN 302 637-2 [i.2], − poi(3): Point of Interest message as specified in ETSI TS 101 556-1 [i.11], − spat(4): Signal Phase And Timing (SPAT) message as specified in SAE J2735 [i.12], − map(5): MAP message as specified in SAE J2735 [i.12], − ivi(6): In Vehicle Information (IVI) message as defined in ISO TS 19321 [i.13], − ev-rsr(7): Electric vehicle recharging spot reservation message, as defined in ETSI TS 101 556-3 [i.14], ' + enum: + - 1 + - 2 + - 3 + - 4 + - 5 + - 6 + - 7 + type: integer + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: Enum V2xMsgPublication: properties: @@ -915,16 +1235,12 @@ components: x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: String msgType: - description: Published V2X message type. Its value is defined by the standardization organization indicated by the attribute stdOrganization. See note 2. - enum: - - SEE_DESCRIPTION - type: string - x-etsi-mec-cardinality: '1' + $ref: '#/components/schemas/msgType' #x-etsi-mec-origin-type: Enum stdOrganization: description: "Standardization organization which defines the published V2X message type: \nETSI: European Telecommunications Standards Institute. \nSee note 1." enum: - - SEE_DESCRIPTION + - ETSI type: string x-etsi-mec-cardinality: '1' #-etsi-mec-origin-type: Enum @@ -934,7 +1250,7 @@ components: - msgEncodeFormat - msgContent type: object - x-etsi-notes: "NOTE 1:\tOther standardization organizations could be added as needed.\nNOTE 2:\tThe V2X message types of ETSI shall be used as specified in ETSI TS 102 894-2 [6], clause A.114." + x-etsi-notes: "NOTE 1: Other standardization organizations could be added as needed.NOTE 2:The V2X message types of ETSI shall be used as specified in ETSI TS 102 894-2 [6], clause A.114." x-etsi-ref: 6.2.6 V2xMsgSubscription.links: @@ -949,6 +1265,7 @@ components: - self type: object x-etsi-mec-cardinality: 0..1 + V2xMsgSubscription.filterCriteria: description: List of filtering criteria for the subscription. Any filtering criteria from below, which is included in the request, shall also be included in the response. properties: @@ -963,7 +1280,7 @@ components: stdOrganization: description: "Standardization organization which defines the subscribed V2X message type: \nETSI: European Telecommunications Standards Institute. \nSee note 1." enum: - - SEE_DESCRIPTION + - ETSI type: string x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Enum @@ -1001,6 +1318,58 @@ components: type: object x-etsi-notes: "NOTE 1:\tOther standardization organizations could be added as needed.\nNOTE 2:\tThe V2X message types of ETSI shall be used as specified in ETSI TS 102 894-2 [6], clause A.114." x-etsi-ref: 6.3.5 + + + V2xMsgNotification.links: + description: 'Links to resources related to this notification.' + properties: + subscription: + # description': Self-referring URI. The URI shall be unique within the VIS API as it acts as an ID for the subscription. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': LinkType + $ref: '#/components/schemas/LinkType' + required: + - subscription + type: object + x-etsi-mec-cardinality: 0..1 + + V2xMsgNotification: + properties: + notificationType: + description: Shall be set to "V2xMsgNotification". + type: string + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: String + timeStamp: + # description': Time stamp. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': TimeStamp + $ref: '#/components/schemas/TimeStamp' + stdOrganization: + description: 'Standardization organization which defines the published V2X message type ETSI: European Telecommunications Standards Institute. See note 1.' + enum: + - "ETSI" + type: string + msgType: + $ref: '#/components/schemas/msgType' + msgEncodeFormat: + description: 'The encode format of the V2X message, for example base64 ' + type: string + msgContent: + description: 'Published V2X message content. The format of the string is defined by the standardization organization indicated by the attribute stdOrganization.' + type: string + _links: + $ref: '#/components/schemas/V2xMsgNotification.links' + required: + - notificationType + - timeStamp + - stdOrganization + - msgType + - msgEncodeFormat + - msgContent + - _links + type: object + x-etsi-notes: "NOTE 1: Other standardization organizations could be added as needed. NOTE 2: The V2X message types of ETSI shall be used as specified in ETSI TS 102 894-2 [6], clause A.114" V2xServerUsd.sdpInfo: description: SDP with IP multicast address and port number used for V2X communication via MBMS. @@ -1065,9 +1434,7 @@ components: - sdpInfo type: object x-etsi-ref: 6.5.10 - VirtualNetworkInterfaceRequirements: - type: string - + LinkType: description: >- 'This data type represents a type of link' @@ -1177,4 +1544,4 @@ components: content: application/json: schema: - $ref: '#/components/schemas/ProblemDetails' \ No newline at end of file + $ref: '#/components/schemas/ProblemDetails' diff --git a/proto3/models/cell_id.proto b/proto3/models/cell_id.proto index c5e833d..d88d637 100644 --- a/proto3/models/cell_id.proto +++ b/proto3/models/cell_id.proto @@ -4,7 +4,7 @@ ETSI GS MEC 030 V2X Information Service API described using OpenAPI. The version of the OpenAPI document: 2.1.1 - + Contact: cti_support@etsi.org Generated by OpenAPI Generator: https://openapi-generator.tech */ @@ -16,6 +16,6 @@ package mec030; message CellId { // E-UTRAN Cell Identity as a bit string (size (28)). - string cellId = 1; + string cell_id = 1; } diff --git a/proto3/models/earfcn.proto b/proto3/models/earfcn.proto index d9286c0..762f84c 100644 --- a/proto3/models/earfcn.proto +++ b/proto3/models/earfcn.proto @@ -4,7 +4,7 @@ ETSI GS MEC 030 V2X Information Service API described using OpenAPI. The version of the OpenAPI document: 2.1.1 - + Contact: cti_support@etsi.org Generated by OpenAPI Generator: https://openapi-generator.tech */ diff --git a/proto3/models/ecgi.proto b/proto3/models/ecgi.proto index cde31b9..c4bb5b4 100644 --- a/proto3/models/ecgi.proto +++ b/proto3/models/ecgi.proto @@ -4,7 +4,7 @@ ETSI GS MEC 030 V2X Information Service API described using OpenAPI. The version of the OpenAPI document: 2.1.1 - + Contact: cti_support@etsi.org Generated by OpenAPI Generator: https://openapi-generator.tech */ @@ -17,7 +17,7 @@ import public "models/plmn.proto"; message Ecgi { - CellId cellId = 1; + CellId cell_id = 1; Plmn plmn = 2; diff --git a/proto3/models/fdd_info.proto b/proto3/models/fdd_info.proto index 95afef6..a412192 100644 --- a/proto3/models/fdd_info.proto +++ b/proto3/models/fdd_info.proto @@ -4,7 +4,7 @@ ETSI GS MEC 030 V2X Information Service API described using OpenAPI. The version of the OpenAPI document: 2.1.1 - + Contact: cti_support@etsi.org Generated by OpenAPI Generator: https://openapi-generator.tech */ @@ -17,12 +17,12 @@ import public "models/transmission_bandwidth.proto"; message FddInfo { - Earfcn dlEarfcn = 1; + Earfcn dl_earfcn = 1; - TransmissionBandwidth dlTransmissionBandwidth = 2; + TransmissionBandwidth dl_transmission_bandwidth = 2; - Earfcn ulEarfcn = 3; + Earfcn ul_earfcn = 3; - TransmissionBandwidth ulTransmissionBandwidth = 4; + TransmissionBandwidth ul_transmission_bandwidth = 4; } diff --git a/proto3/models/link_type.proto b/proto3/models/link_type.proto index ad34ffb..92f2ce8 100644 --- a/proto3/models/link_type.proto +++ b/proto3/models/link_type.proto @@ -4,7 +4,7 @@ ETSI GS MEC 030 V2X Information Service API described using OpenAPI. The version of the OpenAPI document: 2.1.1 - + Contact: cti_support@etsi.org Generated by OpenAPI Generator: https://openapi-generator.tech */ diff --git a/proto3/models/location_info.proto b/proto3/models/location_info.proto index d7df371..7abcc22 100644 --- a/proto3/models/location_info.proto +++ b/proto3/models/location_info.proto @@ -4,7 +4,7 @@ ETSI GS MEC 030 V2X Information Service API described using OpenAPI. The version of the OpenAPI document: 2.1.1 - + Contact: cti_support@etsi.org Generated by OpenAPI Generator: https://openapi-generator.tech */ @@ -19,6 +19,6 @@ message LocationInfo { Ecgi ecgi = 1; - LocationInfoGeoArea geoArea = 2; + LocationInfoGeoArea geo_area = 2; } diff --git a/proto3/models/location_info_geo_area.proto b/proto3/models/location_info_geo_area.proto index 44e3c9d..3c462eb 100644 --- a/proto3/models/location_info_geo_area.proto +++ b/proto3/models/location_info_geo_area.proto @@ -4,7 +4,7 @@ ETSI GS MEC 030 V2X Information Service API described using OpenAPI. The version of the OpenAPI document: 2.1.1 - + Contact: cti_support@etsi.org Generated by OpenAPI Generator: https://openapi-generator.tech */ diff --git a/proto3/models/msg_type.proto b/proto3/models/msg_type.proto new file mode 100644 index 0000000..2eacd7a --- /dev/null +++ b/proto3/models/msg_type.proto @@ -0,0 +1,27 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + Contact: cti_support@etsi.org + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + + +message MsgType { +enum TypeEnum { + MSG_TYPE_TYPE_ENUM_1 = 0; + MSG_TYPE_TYPE_ENUM_2 = 1; + MSG_TYPE_TYPE_ENUM_3 = 2; + MSG_TYPE_TYPE_ENUM_4 = 3; + MSG_TYPE_TYPE_ENUM_5 = 4; + MSG_TYPE_TYPE_ENUM_6 = 5; + MSG_TYPE_TYPE_ENUM_7 = 6; + } +} + diff --git a/proto3/models/pc5_neighbour_cell_info.proto b/proto3/models/pc5_neighbour_cell_info.proto index cec01f0..c641550 100644 --- a/proto3/models/pc5_neighbour_cell_info.proto +++ b/proto3/models/pc5_neighbour_cell_info.proto @@ -4,7 +4,7 @@ ETSI GS MEC 030 V2X Information Service API described using OpenAPI. The version of the OpenAPI document: 2.1.1 - + Contact: cti_support@etsi.org Generated by OpenAPI Generator: https://openapi-generator.tech */ @@ -22,6 +22,6 @@ message Pc5NeighbourCellInfo { Plmn plmn = 2; // V2X sidelink communication configuration, as defined in ETSI TS 136 331 [i.11]. - string siV2xConfig = 3; + string si_v2x_config = 3; } diff --git a/proto3/models/pc5_provisioning_info.proto b/proto3/models/pc5_provisioning_info.proto index e842056..ec73054 100644 --- a/proto3/models/pc5_provisioning_info.proto +++ b/proto3/models/pc5_provisioning_info.proto @@ -4,7 +4,7 @@ ETSI GS MEC 030 V2X Information Service API described using OpenAPI. The version of the OpenAPI document: 2.1.1 - + Contact: cti_support@etsi.org Generated by OpenAPI Generator: https://openapi-generator.tech */ @@ -12,14 +12,13 @@ syntax = "proto3"; package mec030; +import public "models/pc5_provisioning_info_pro_info_pc5.proto"; import public "models/time_stamp.proto"; -import public "models/todo_object_mapping.proto"; message Pc5ProvisioningInfo { - // The provisioning information per location as defined below. - repeated TODO_OBJECT_MAPPING proInfoPc5 = 1; + repeated Pc5ProvisioningInfoProInfoPc5 pro_info_pc5 = 1; - TimeStamp timeStamp = 2; + TimeStamp time_stamp = 2; } diff --git a/proto3/models/pc5_provisioning_info_pro_info_pc5.proto b/proto3/models/pc5_provisioning_info_pro_info_pc5.proto index c45c6d3..5f18e72 100644 --- a/proto3/models/pc5_provisioning_info_pro_info_pc5.proto +++ b/proto3/models/pc5_provisioning_info_pro_info_pc5.proto @@ -4,7 +4,7 @@ ETSI GS MEC 030 V2X Information Service API described using OpenAPI. The version of the OpenAPI document: 2.1.1 - + Contact: cti_support@etsi.org Generated by OpenAPI Generator: https://openapi-generator.tech */ @@ -12,9 +12,17 @@ syntax = "proto3"; package mec030; -import public "models/repeat.proto"; -import public "models/todo_object_mapping.proto"; +import public "models/location_info.proto"; +import public "models/pc5_neighbour_cell_info.proto"; message Pc5ProvisioningInfoProInfoPc5 { + // For sidelink communication, the Destination Layer-2 ID is set to the ProSe Layer-2 Group ID or Prose UE ID, see ETSI TS 136 321 [i.12]. PLMN operators coordinate to make sure Destination Layer-2 ID(s) for different V2X services are configured in a consistent manner. + string dst_layer2_id = 1; + + LocationInfo location_info = 2; + + // The information of the neighbour cells in a visiting PLMN that support V2X communication over PC5. + repeated Pc5NeighbourCellInfo neighbour_cell_info = 3; + } diff --git a/proto3/models/plmn.proto b/proto3/models/plmn.proto index 0cfd429..fd962dd 100644 --- a/proto3/models/plmn.proto +++ b/proto3/models/plmn.proto @@ -4,7 +4,7 @@ ETSI GS MEC 030 V2X Information Service API described using OpenAPI. The version of the OpenAPI document: 2.1.1 - + Contact: cti_support@etsi.org Generated by OpenAPI Generator: https://openapi-generator.tech */ diff --git a/proto3/models/predicted_qos.proto b/proto3/models/predicted_qos.proto new file mode 100644 index 0000000..42b70a7 --- /dev/null +++ b/proto3/models/predicted_qos.proto @@ -0,0 +1,27 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + Contact: cti_support@etsi.org + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + +import public "models/predicted_qos_routes.proto"; +import public "models/time_stamp.proto"; + +message PredictedQos { + + TimeStamp time_granularity = 1; + + // Granularity of visited location. Measured in meters + string location_granularity = 2; + + repeated PredictedQosRoutes routes = 3; + +} diff --git a/proto3/models/predicted_qos_routes.proto b/proto3/models/predicted_qos_routes.proto new file mode 100644 index 0000000..0e8e04a --- /dev/null +++ b/proto3/models/predicted_qos_routes.proto @@ -0,0 +1,22 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + Contact: cti_support@etsi.org + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + +import public "models/predicted_qos_routes_route_info.proto"; + +message PredictedQosRoutes { + + // Information relating to a specific route. The first structure shall relate to the route origin and the last to the route destination. Intermediate waypoint locations may also be provided. + repeated PredictedQosRoutesRouteInfo routeinfo = 1; + +} diff --git a/proto3/models/predicted_qos_routes_route_info.proto b/proto3/models/predicted_qos_routes_route_info.proto new file mode 100644 index 0000000..db2d600 --- /dev/null +++ b/proto3/models/predicted_qos_routes_route_info.proto @@ -0,0 +1,30 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + Contact: cti_support@etsi.org + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + +import public "models/location_info.proto"; +import public "models/time_stamp.proto"; + +message PredictedQosRoutesRouteInfo { + + LocationInfo location = 1; + + TimeStamp time = 2; + + // Reference Signal Received Quality as defined in ETSI TS 136 214 [i.13]. Shall only be included in the response + int32 rsrp = 3; + + // Reference Signal Received Quality as defined in ETSI TS 136 214 [i.13]. Shall only be included in the response + int32 rsrq = 4; + +} diff --git a/proto3/models/problem_details.proto b/proto3/models/problem_details.proto index d888d1b..08e0b55 100644 --- a/proto3/models/problem_details.proto +++ b/proto3/models/problem_details.proto @@ -4,7 +4,7 @@ ETSI GS MEC 030 V2X Information Service API described using OpenAPI. The version of the OpenAPI document: 2.1.1 - + Contact: cti_support@etsi.org Generated by OpenAPI Generator: https://openapi-generator.tech */ diff --git a/proto3/models/prov_chg_pc5_notification.proto b/proto3/models/prov_chg_pc5_notification.proto index fbf3ac6..4000862 100644 --- a/proto3/models/prov_chg_pc5_notification.proto +++ b/proto3/models/prov_chg_pc5_notification.proto @@ -4,7 +4,7 @@ ETSI GS MEC 030 V2X Information Service API described using OpenAPI. The version of the OpenAPI document: 2.1.1 - + Contact: cti_support@etsi.org Generated by OpenAPI Generator: https://openapi-generator.tech */ @@ -19,16 +19,16 @@ import public "models/time_stamp.proto"; message ProvChgPc5Notification { // For sidelink communication, the Destination Layer-2 ID is set to the ProSe Layer-2 Group ID or Prose UE ID, see ETSI TS 136 321 [i.12]. - string dstLayer2Id = 1; + string dst_layer2_id = 1; - LocationInfo locationInfo = 2; + LocationInfo location_info = 2; // The information of the neighbour cells in a visiting PLMN that support V2X communication over PC5. - repeated Pc5NeighbourCellInfo neighbourCellInfo = 3; + repeated Pc5NeighbourCellInfo neighbour_cell_info = 3; // Shall be set to \"ProvChgPc5Notification\". - string notificationType = 4; + string notification_type = 4; - TimeStamp timeStamp = 5; + TimeStamp time_stamp = 5; } diff --git a/proto3/models/prov_chg_pc5_subscription.proto b/proto3/models/prov_chg_pc5_subscription.proto index 3bc0a73..1398a0e 100644 --- a/proto3/models/prov_chg_pc5_subscription.proto +++ b/proto3/models/prov_chg_pc5_subscription.proto @@ -4,7 +4,7 @@ ETSI GS MEC 030 V2X Information Service API described using OpenAPI. The version of the OpenAPI document: 2.1.1 - + Contact: cti_support@etsi.org Generated by OpenAPI Generator: https://openapi-generator.tech */ @@ -18,16 +18,16 @@ import public "models/time_stamp.proto"; message ProvChgPc5Subscription { - ProvChgPc5SubscriptionLinks Underscorelinks = 1; + ProvChgPc5SubscriptionLinks links = 1; // URI selected by the service consumer to receive notifications on the subscribed VIS information. This shall be included both in the request and in response. - string callbackReference = 2; + string callback_reference = 2; - TimeStamp expiryDeadline = 3; + TimeStamp expiry_deadline = 3; - ProvChgPc5SubscriptionFilterCriteria filterCriteria = 4; + ProvChgPc5SubscriptionFilterCriteria filter_criteria = 4; // Shall be set to \"ProvChgPc5Subscription\". - string subscriptionType = 5; + string subscription_type = 5; } diff --git a/proto3/models/prov_chg_pc5_subscription_filter_criteria.proto b/proto3/models/prov_chg_pc5_subscription_filter_criteria.proto index 2bd96f2..c52ad51 100644 --- a/proto3/models/prov_chg_pc5_subscription_filter_criteria.proto +++ b/proto3/models/prov_chg_pc5_subscription_filter_criteria.proto @@ -4,7 +4,7 @@ ETSI GS MEC 030 V2X Information Service API described using OpenAPI. The version of the OpenAPI document: 2.1.1 - + Contact: cti_support@etsi.org Generated by OpenAPI Generator: https://openapi-generator.tech */ @@ -18,11 +18,11 @@ import public "models/pc5_neighbour_cell_info.proto"; message ProvChgPc5SubscriptionFilterCriteria { // For sidelink communication, the Destination Layer-2 ID is set to the ProSe Layer-2 Group ID or Prose UE ID, see ETSI TS 136 321 [i.12]. - string dstLayer2Id = 1; + string dst_layer2_id = 1; - LocationInfo locationInfo = 2; + LocationInfo location_info = 2; // The information of the neighbour cells in a visiting PLMN that support V2X communication over PC5. - repeated Pc5NeighbourCellInfo neighbourCellInfo = 3; + repeated Pc5NeighbourCellInfo neighbour_cell_info = 3; } diff --git a/proto3/models/prov_chg_pc5_subscription_links.proto b/proto3/models/prov_chg_pc5_subscription_links.proto index 06d6c0d..8a4ec4e 100644 --- a/proto3/models/prov_chg_pc5_subscription_links.proto +++ b/proto3/models/prov_chg_pc5_subscription_links.proto @@ -4,7 +4,7 @@ ETSI GS MEC 030 V2X Information Service API described using OpenAPI. The version of the OpenAPI document: 2.1.1 - + Contact: cti_support@etsi.org Generated by OpenAPI Generator: https://openapi-generator.tech */ diff --git a/proto3/models/prov_chg_uu_mbms_notification.proto b/proto3/models/prov_chg_uu_mbms_notification.proto index b6bc854..f01e1d3 100644 --- a/proto3/models/prov_chg_uu_mbms_notification.proto +++ b/proto3/models/prov_chg_uu_mbms_notification.proto @@ -4,7 +4,7 @@ ETSI GS MEC 030 V2X Information Service API described using OpenAPI. The version of the OpenAPI document: 2.1.1 - + Contact: cti_support@etsi.org Generated by OpenAPI Generator: https://openapi-generator.tech */ @@ -19,16 +19,16 @@ import public "models/v2x_server_usd.proto"; message ProvChgUuMbmsNotification { - LocationInfo locationInfo = 1; + LocationInfo location_info = 1; // The information of the neighbour cells in a visiting PLMN that support V2X communication over Uu MBMS. - repeated UuMbmsNeighbourCellInfo neighbourCellInfo = 2; + repeated UuMbmsNeighbourCellInfo neighbour_cell_info = 2; // Shall be set to \"ProvChgUuMbmsNotification\". - string notificationType = 3; + string notification_type = 3; - TimeStamp timeStamp = 4; + TimeStamp time_stamp = 4; - V2xServerUsd v2xServerUsd = 5; + V2xServerUsd v2x_server_usd = 5; } diff --git a/proto3/models/prov_chg_uu_mbms_subscription.proto b/proto3/models/prov_chg_uu_mbms_subscription.proto index 2eb4aa9..a0f802d 100644 --- a/proto3/models/prov_chg_uu_mbms_subscription.proto +++ b/proto3/models/prov_chg_uu_mbms_subscription.proto @@ -4,7 +4,7 @@ ETSI GS MEC 030 V2X Information Service API described using OpenAPI. The version of the OpenAPI document: 2.1.1 - + Contact: cti_support@etsi.org Generated by OpenAPI Generator: https://openapi-generator.tech */ @@ -18,16 +18,16 @@ import public "models/time_stamp.proto"; message ProvChgUuMbmsSubscription { - ProvChgUuMbmsSubscriptionLinks Underscorelinks = 1; + ProvChgUuMbmsSubscriptionLinks links = 1; // URI selected by the service consumer to receive notifications on the subscribed VIS information. This shall be included both in the request and in response. - string callbackReference = 2; + string callback_reference = 2; - TimeStamp expiryDeadline = 3; + TimeStamp expiry_deadline = 3; - ProvChgUuMbmsSubscriptionFilterCriteria filterCriteria = 4; + ProvChgUuMbmsSubscriptionFilterCriteria filter_criteria = 4; // Shall be set to \"ProvChgUuMbmsSubscription\". - string subscriptionType = 5; + string subscription_type = 5; } diff --git a/proto3/models/prov_chg_uu_mbms_subscription_filter_criteria.proto b/proto3/models/prov_chg_uu_mbms_subscription_filter_criteria.proto index a601a7d..be3939f 100644 --- a/proto3/models/prov_chg_uu_mbms_subscription_filter_criteria.proto +++ b/proto3/models/prov_chg_uu_mbms_subscription_filter_criteria.proto @@ -4,7 +4,7 @@ ETSI GS MEC 030 V2X Information Service API described using OpenAPI. The version of the OpenAPI document: 2.1.1 - + Contact: cti_support@etsi.org Generated by OpenAPI Generator: https://openapi-generator.tech */ @@ -18,11 +18,11 @@ import public "models/v2x_server_usd.proto"; message ProvChgUuMbmsSubscriptionFilterCriteria { - LocationInfo locationInfo = 1; + LocationInfo location_info = 1; // The information of the neighbour cells in a visiting PLMN that support V2X communication over Uu MBMS. - repeated UuMbmsNeighbourCellInfo neighbourCellInfo = 2; + repeated UuMbmsNeighbourCellInfo neighbour_cell_info = 2; - V2xServerUsd v2xServerUsd = 3; + V2xServerUsd v2x_server_usd = 3; } diff --git a/proto3/models/prov_chg_uu_mbms_subscription_links.proto b/proto3/models/prov_chg_uu_mbms_subscription_links.proto index 5423694..e51e523 100644 --- a/proto3/models/prov_chg_uu_mbms_subscription_links.proto +++ b/proto3/models/prov_chg_uu_mbms_subscription_links.proto @@ -4,7 +4,7 @@ ETSI GS MEC 030 V2X Information Service API described using OpenAPI. The version of the OpenAPI document: 2.1.1 - + Contact: cti_support@etsi.org Generated by OpenAPI Generator: https://openapi-generator.tech */ diff --git a/proto3/models/prov_chg_uu_uni_notification.proto b/proto3/models/prov_chg_uu_uni_notification.proto index 3a112b7..088e975 100644 --- a/proto3/models/prov_chg_uu_uni_notification.proto +++ b/proto3/models/prov_chg_uu_uni_notification.proto @@ -4,7 +4,7 @@ ETSI GS MEC 030 V2X Information Service API described using OpenAPI. The version of the OpenAPI document: 2.1.1 - + Contact: cti_support@etsi.org Generated by OpenAPI Generator: https://openapi-generator.tech */ @@ -19,16 +19,16 @@ import public "models/v2x_application_server.proto"; message ProvChgUuUniNotification { - LocationInfo locationInfo = 1; + LocationInfo location_info = 1; // The information of the neighbour cells in a visiting PLMN that support V2X communication over Uu unicast. - repeated UuUniNeighbourCellInfo neighbourCellInfo = 2; + repeated UuUniNeighbourCellInfo neighbour_cell_info = 2; // Shall be set to \"ProvChgUuUniNotification\". - string notificationType = 3; + string notification_type = 3; - TimeStamp timeStamp = 4; + TimeStamp time_stamp = 4; - V2xApplicationServer v2xApplicationServer = 5; + V2xApplicationServer v2x_application_server = 5; } diff --git a/proto3/models/prov_chg_uu_uni_subscription.proto b/proto3/models/prov_chg_uu_uni_subscription.proto index c74a43d..3b9eed0 100644 --- a/proto3/models/prov_chg_uu_uni_subscription.proto +++ b/proto3/models/prov_chg_uu_uni_subscription.proto @@ -4,7 +4,7 @@ ETSI GS MEC 030 V2X Information Service API described using OpenAPI. The version of the OpenAPI document: 2.1.1 - + Contact: cti_support@etsi.org Generated by OpenAPI Generator: https://openapi-generator.tech */ @@ -18,16 +18,16 @@ import public "models/time_stamp.proto"; message ProvChgUuUniSubscription { - ProvChgUuUniSubscriptionLinks Underscorelinks = 1; + ProvChgUuUniSubscriptionLinks links = 1; // URI selected by the service consumer to receive notifications on the subscribed VIS information. This shall be included both in the request and in response. - string callbackReference = 2; + string callback_reference = 2; - TimeStamp expiryDeadline = 3; + TimeStamp expiry_deadline = 3; - ProvChgUuUniSubscriptionFilterCriteria filterCriteria = 4; + ProvChgUuUniSubscriptionFilterCriteria filter_criteria = 4; // Shall be set to \"ProvChgUuUniSubscription\". - string subscriptionType = 5; + string subscription_type = 5; } diff --git a/proto3/models/prov_chg_uu_uni_subscription_filter_criteria.proto b/proto3/models/prov_chg_uu_uni_subscription_filter_criteria.proto index 795f632..7a7918e 100644 --- a/proto3/models/prov_chg_uu_uni_subscription_filter_criteria.proto +++ b/proto3/models/prov_chg_uu_uni_subscription_filter_criteria.proto @@ -4,7 +4,7 @@ ETSI GS MEC 030 V2X Information Service API described using OpenAPI. The version of the OpenAPI document: 2.1.1 - + Contact: cti_support@etsi.org Generated by OpenAPI Generator: https://openapi-generator.tech */ @@ -18,11 +18,11 @@ import public "models/v2x_application_server.proto"; message ProvChgUuUniSubscriptionFilterCriteria { - LocationInfo locationInfo = 1; + LocationInfo location_info = 1; // The information of the neighbour cells in a visiting PLMN that support V2X communication over Uu unicast. - repeated UuUniNeighbourCellInfo neighbourCellInfo = 2; + repeated UuUniNeighbourCellInfo neighbour_cell_info = 2; - V2xApplicationServer v2xApplicationServer = 3; + V2xApplicationServer v2x_application_server = 3; } diff --git a/proto3/models/prov_chg_uu_uni_subscription_links.proto b/proto3/models/prov_chg_uu_uni_subscription_links.proto index e519e72..e2a26bf 100644 --- a/proto3/models/prov_chg_uu_uni_subscription_links.proto +++ b/proto3/models/prov_chg_uu_uni_subscription_links.proto @@ -4,7 +4,7 @@ ETSI GS MEC 030 V2X Information Service API described using OpenAPI. The version of the OpenAPI document: 2.1.1 - + Contact: cti_support@etsi.org Generated by OpenAPI Generator: https://openapi-generator.tech */ diff --git a/proto3/models/subscription.proto b/proto3/models/subscription.proto new file mode 100644 index 0000000..fe35039 --- /dev/null +++ b/proto3/models/subscription.proto @@ -0,0 +1,27 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + Contact: cti_support@etsi.org + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + +import public "models/prov_chg_uu_uni_subscription.proto"; +import public "models/prov_chg_uu_mbms_subscription.proto"; +import public "models/prov_chg_pc5_subscription.proto"; +import public "models/v2x_msg_subscription.proto"; + +message Subscription { + oneof subscription { + ProvChgUuUniSubscription prov_chg_uu_uni_subscription = 1; + ProvChgUuMbmsSubscription prov_chg_uu_mbms_subscription = 2; + ProvChgPc5Subscription prov_chg_pc5_subscription = 3; + V2xMsgSubscription v2x_msg_subscription = 4; + } +} diff --git a/proto3/models/subscription_link_list.proto b/proto3/models/subscription_link_list.proto index 2e0eb55..1171437 100644 --- a/proto3/models/subscription_link_list.proto +++ b/proto3/models/subscription_link_list.proto @@ -4,7 +4,7 @@ ETSI GS MEC 030 V2X Information Service API described using OpenAPI. The version of the OpenAPI document: 2.1.1 - + Contact: cti_support@etsi.org Generated by OpenAPI Generator: https://openapi-generator.tech */ @@ -16,6 +16,6 @@ import public "models/subscription_link_list_links.proto"; message SubscriptionLinkList { - SubscriptionLinkListLinks Underscorelinks = 1; + SubscriptionLinkListLinks links = 1; } diff --git a/proto3/models/subscription_link_list_links.proto b/proto3/models/subscription_link_list_links.proto index ff5be83..de49d73 100644 --- a/proto3/models/subscription_link_list_links.proto +++ b/proto3/models/subscription_link_list_links.proto @@ -4,7 +4,7 @@ ETSI GS MEC 030 V2X Information Service API described using OpenAPI. The version of the OpenAPI document: 2.1.1 - + Contact: cti_support@etsi.org Generated by OpenAPI Generator: https://openapi-generator.tech */ diff --git a/proto3/models/subscription_link_list_links_subscriptions.proto b/proto3/models/subscription_link_list_links_subscriptions.proto index e6719cc..611fe6a 100644 --- a/proto3/models/subscription_link_list_links_subscriptions.proto +++ b/proto3/models/subscription_link_list_links_subscriptions.proto @@ -4,7 +4,7 @@ ETSI GS MEC 030 V2X Information Service API described using OpenAPI. The version of the OpenAPI document: 2.1.1 - + Contact: cti_support@etsi.org Generated by OpenAPI Generator: https://openapi-generator.tech */ @@ -18,7 +18,7 @@ message SubscriptionLinkListLinksSubscriptions { // The URI referring to the subscription. string href = 1; - // Type of the subscription. The values are as defined in the \\\"subscriptionType\\\" attribute for each different V2X information event subscription data type. - string subscriptionType = 2; + // Type of the subscription. The values are as defined in the \\\"subscription_type\\\" attribute for each different V2X information event subscription data type. + string subscription_type = 2; } diff --git a/proto3/models/tdd_info.proto b/proto3/models/tdd_info.proto index 53676ac..ccf0b36 100644 --- a/proto3/models/tdd_info.proto +++ b/proto3/models/tdd_info.proto @@ -4,7 +4,7 @@ ETSI GS MEC 030 V2X Information Service API described using OpenAPI. The version of the OpenAPI document: 2.1.1 - + Contact: cti_support@etsi.org Generated by OpenAPI Generator: https://openapi-generator.tech */ @@ -20,8 +20,8 @@ message TddInfo { Earfcn earfcn = 1; // Uplink-downlink subframe configuration information. - string subframeAssignment = 2; + string subframe_assignment = 2; - TransmissionBandwidth transmissionBandwidth = 3; + TransmissionBandwidth transmission_bandwidth = 3; } diff --git a/proto3/models/time_stamp.proto b/proto3/models/time_stamp.proto index 953b584..f6f3b26 100644 --- a/proto3/models/time_stamp.proto +++ b/proto3/models/time_stamp.proto @@ -4,7 +4,7 @@ ETSI GS MEC 030 V2X Information Service API described using OpenAPI. The version of the OpenAPI document: 2.1.1 - + Contact: cti_support@etsi.org Generated by OpenAPI Generator: https://openapi-generator.tech */ @@ -16,7 +16,7 @@ package mec030; message TimeStamp { // The nanoseconds part of the time. Time is defined as Unix-time since January 1, 1970, 00:00:00 UTC. - int32 nanoSeconds = 1; + int32 nano_seconds = 1; // The seconds part of the time. Time is defined as Unixtime since January 1, 1970, 00:00:00 UTC. int32 seconds = 2; diff --git a/proto3/models/transmission_bandwidth.proto b/proto3/models/transmission_bandwidth.proto index 31683ef..efb16e4 100644 --- a/proto3/models/transmission_bandwidth.proto +++ b/proto3/models/transmission_bandwidth.proto @@ -4,7 +4,7 @@ ETSI GS MEC 030 V2X Information Service API described using OpenAPI. The version of the OpenAPI document: 2.1.1 - + Contact: cti_support@etsi.org Generated by OpenAPI Generator: https://openapi-generator.tech */ @@ -16,6 +16,6 @@ import public "models/transmission_bandwidth_transmission_bandwidth.proto"; message TransmissionBandwidth { - TransmissionBandwidthTransmissionBandwidth transmissionBandwidth = 1; + TransmissionBandwidthTransmissionBandwidth transmission_bandwidth = 1; } diff --git a/proto3/models/transmission_bandwidth_transmission_bandwidth.proto b/proto3/models/transmission_bandwidth_transmission_bandwidth.proto index 4e47df4..ab96007 100644 --- a/proto3/models/transmission_bandwidth_transmission_bandwidth.proto +++ b/proto3/models/transmission_bandwidth_transmission_bandwidth.proto @@ -4,7 +4,7 @@ ETSI GS MEC 030 V2X Information Service API described using OpenAPI. The version of the OpenAPI document: 2.1.1 - + Contact: cti_support@etsi.org Generated by OpenAPI Generator: https://openapi-generator.tech */ @@ -14,5 +14,12 @@ package mec030; message TransmissionBandwidthTransmissionBandwidth { - +enum TypeEnum { + TRANSMISSION_BANDWIDTH_TRANSMISSION_BANDWIDTH_TYPE_ENUM_1 = 0; + TRANSMISSION_BANDWIDTH_TRANSMISSION_BANDWIDTH_TYPE_ENUM_2 = 1; + TRANSMISSION_BANDWIDTH_TRANSMISSION_BANDWIDTH_TYPE_ENUM_3 = 2; + TRANSMISSION_BANDWIDTH_TRANSMISSION_BANDWIDTH_TYPE_ENUM_4 = 3; + TRANSMISSION_BANDWIDTH_TRANSMISSION_BANDWIDTH_TYPE_ENUM_5 = 4; + TRANSMISSION_BANDWIDTH_TRANSMISSION_BANDWIDTH_TYPE_ENUM_6 = 5; + } } diff --git a/proto3/models/uu_mbms_neighbour_cell_info.proto b/proto3/models/uu_mbms_neighbour_cell_info.proto index f303714..c6b92c3 100644 --- a/proto3/models/uu_mbms_neighbour_cell_info.proto +++ b/proto3/models/uu_mbms_neighbour_cell_info.proto @@ -4,7 +4,7 @@ ETSI GS MEC 030 V2X Information Service API described using OpenAPI. The version of the OpenAPI document: 2.1.1 - + Contact: cti_support@etsi.org Generated by OpenAPI Generator: https://openapi-generator.tech */ @@ -21,16 +21,16 @@ message UuMbmsNeighbourCellInfo { Ecgi ecgi = 1; - FddInfo fddInfo = 2; + FddInfo fdd_info = 2; // Supported MBMS Service Area Identities in the cell. - repeated string mbmsServiceAreaIdentity = 3; + repeated string mbms_service_area_identity = 3; // Physical Cell Identifier. int32 pci = 4; Plmn plmn = 5; - TddInfo tddInfo = 6; + TddInfo tdd_info = 6; } diff --git a/proto3/models/uu_mbms_provisioning_info.proto b/proto3/models/uu_mbms_provisioning_info.proto index 5d8f255..1e64c19 100644 --- a/proto3/models/uu_mbms_provisioning_info.proto +++ b/proto3/models/uu_mbms_provisioning_info.proto @@ -4,7 +4,7 @@ ETSI GS MEC 030 V2X Information Service API described using OpenAPI. The version of the OpenAPI document: 2.1.1 - + Contact: cti_support@etsi.org Generated by OpenAPI Generator: https://openapi-generator.tech */ @@ -17,8 +17,8 @@ import public "models/uu_mbms_provisioning_info_pro_info_uu_mbms.proto"; message UuMbmsProvisioningInfo { - UuMbmsProvisioningInfoProInfoUuMbms proInfoUuMbms = 1; + UuMbmsProvisioningInfoProInfoUuMbms pro_info_uu_mbms = 1; - TimeStamp timeStamp = 2; + TimeStamp time_stamp = 2; } diff --git a/proto3/models/uu_mbms_provisioning_info_pro_info_uu_mbms.proto b/proto3/models/uu_mbms_provisioning_info_pro_info_uu_mbms.proto index 11aef9e..d53981a 100644 --- a/proto3/models/uu_mbms_provisioning_info_pro_info_uu_mbms.proto +++ b/proto3/models/uu_mbms_provisioning_info_pro_info_uu_mbms.proto @@ -4,7 +4,7 @@ ETSI GS MEC 030 V2X Information Service API described using OpenAPI. The version of the OpenAPI document: 2.1.1 - + Contact: cti_support@etsi.org Generated by OpenAPI Generator: https://openapi-generator.tech */ @@ -18,11 +18,11 @@ import public "models/v2x_server_usd.proto"; message UuMbmsProvisioningInfoProInfoUuMbms { - LocationInfo locationInfo = 1; + LocationInfo location_info = 1; // The information of the neighbour cells in a visiting PLMN that support V2X communication over Uu MBMS. - repeated UuMbmsNeighbourCellInfo neighbourCellInfo = 2; + repeated UuMbmsNeighbourCellInfo neighbour_cell_info = 2; - V2xServerUsd v2xServerUsd = 3; + V2xServerUsd v2x_server_usd = 3; } diff --git a/proto3/models/uu_uni_neighbour_cell_info.proto b/proto3/models/uu_uni_neighbour_cell_info.proto index 2bd3057..eb8192c 100644 --- a/proto3/models/uu_uni_neighbour_cell_info.proto +++ b/proto3/models/uu_uni_neighbour_cell_info.proto @@ -4,7 +4,7 @@ ETSI GS MEC 030 V2X Information Service API described using OpenAPI. The version of the OpenAPI document: 2.1.1 - + Contact: cti_support@etsi.org Generated by OpenAPI Generator: https://openapi-generator.tech */ @@ -21,13 +21,13 @@ message UuUniNeighbourCellInfo { Ecgi ecgi = 1; - FddInfo fddInfo = 2; + FddInfo fdd_info = 2; // Physical Cell Identifier. int32 pci = 3; Plmn plmn = 4; - TddInfo tddInfo = 5; + TddInfo tdd_info = 5; } diff --git a/proto3/models/uu_unicast_provisioning_info.proto b/proto3/models/uu_unicast_provisioning_info.proto index ff48059..7e20586 100644 --- a/proto3/models/uu_unicast_provisioning_info.proto +++ b/proto3/models/uu_unicast_provisioning_info.proto @@ -4,7 +4,7 @@ ETSI GS MEC 030 V2X Information Service API described using OpenAPI. The version of the OpenAPI document: 2.1.1 - + Contact: cti_support@etsi.org Generated by OpenAPI Generator: https://openapi-generator.tech */ @@ -17,8 +17,8 @@ import public "models/uu_unicast_provisioning_info_pro_info_uu_unicast.proto"; message UuUnicastProvisioningInfo { - repeated UuUnicastProvisioningInfoProInfoUuUnicast proInfoUuUnicast = 1; + repeated UuUnicastProvisioningInfoProInfoUuUnicast pro_info_uu_unicast = 1; - TimeStamp timeStamp = 2; + TimeStamp time_stamp = 2; } diff --git a/proto3/models/uu_unicast_provisioning_info_pro_info_uu_unicast.proto b/proto3/models/uu_unicast_provisioning_info_pro_info_uu_unicast.proto index bf567b8..695979b 100644 --- a/proto3/models/uu_unicast_provisioning_info_pro_info_uu_unicast.proto +++ b/proto3/models/uu_unicast_provisioning_info_pro_info_uu_unicast.proto @@ -4,7 +4,7 @@ ETSI GS MEC 030 V2X Information Service API described using OpenAPI. The version of the OpenAPI document: 2.1.1 - + Contact: cti_support@etsi.org Generated by OpenAPI Generator: https://openapi-generator.tech */ @@ -18,11 +18,11 @@ import public "models/v2x_application_server.proto"; message UuUnicastProvisioningInfoProInfoUuUnicast { - LocationInfo locationInfo = 1; + LocationInfo location_info = 1; // The information of the neighbour cells in a visiting PLMN that support V2X communication over Uu unicast. - repeated UuUniNeighbourCellInfo neighbourCellInfo = 2; + repeated UuUniNeighbourCellInfo neighbour_cell_info = 2; - V2xApplicationServer v2xApplicationServer = 3; + V2xApplicationServer v2x_application_server = 3; } diff --git a/proto3/models/v2x_application_server.proto b/proto3/models/v2x_application_server.proto index ed5abf8..8aa8c64 100644 --- a/proto3/models/v2x_application_server.proto +++ b/proto3/models/v2x_application_server.proto @@ -4,7 +4,7 @@ ETSI GS MEC 030 V2X Information Service API described using OpenAPI. The version of the OpenAPI document: 2.1.1 - + Contact: cti_support@etsi.org Generated by OpenAPI Generator: https://openapi-generator.tech */ @@ -12,11 +12,12 @@ syntax = "proto3"; package mec030; +option java_outer_classname = "V2xApplicationServerProto"; message V2xApplicationServer { - string ipAddress = 1; + string ip_address = 1; - string udpPort = 2; + string udp_port = 2; } diff --git a/proto3/models/v2x_msg_notification.proto b/proto3/models/v2x_msg_notification.proto new file mode 100644 index 0000000..31ba380 --- /dev/null +++ b/proto3/models/v2x_msg_notification.proto @@ -0,0 +1,43 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + Contact: cti_support@etsi.org + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + +import public "models/msg_type.proto"; +import public "models/time_stamp.proto"; +import public "models/v2x_msg_notification_links.proto"; + +option java_outer_classname = "V2xMsgNotificationProto"; + +message V2xMsgNotification { + + // Shall be set to \"V2xMsgNotification\". + string notification_type = 1; + + TimeStamp time_stamp = 2; + + // Standardization organization which defines the published V2X message type ETSI: European Telecommunications Standards Institute. See note 1. + enum stdOrganization { + ETSI = 0; + } + + MsgType msg_type = 4; + + // The encode format of the V2X message, for example base64 + string msg_encode_format = 5; + + // Published V2X message content. The format of the string is defined by the standardization organization indicated by the attribute stdOrganization. + string msg_content = 6; + + V2xMsgNotificationLinks links = 7; + +} diff --git a/proto3/models/v2x_msg_notification_links.proto b/proto3/models/v2x_msg_notification_links.proto new file mode 100644 index 0000000..5bc0123 --- /dev/null +++ b/proto3/models/v2x_msg_notification_links.proto @@ -0,0 +1,22 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + Contact: cti_support@etsi.org + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; +option java_outer_classname = "V2xMsgNotificationLinksProto"; + +import public "models/link_type.proto"; + +message V2xMsgNotificationLinks { + + LinkType subscription = 1; + +} diff --git a/proto3/models/v2x_msg_publication.proto b/proto3/models/v2x_msg_publication.proto index 2ab1e26..ea9d00e 100644 --- a/proto3/models/v2x_msg_publication.proto +++ b/proto3/models/v2x_msg_publication.proto @@ -4,7 +4,7 @@ ETSI GS MEC 030 V2X Information Service API described using OpenAPI. The version of the OpenAPI document: 2.1.1 - + Contact: cti_support@etsi.org Generated by OpenAPI Generator: https://openapi-generator.tech */ @@ -12,23 +12,23 @@ syntax = "proto3"; package mec030; +import public "models/msg_type.proto"; + +option java_outer_classname = "V2xMsgPublicationProto"; message V2xMsgPublication { // Published V2X message content. Its format is defined by the standardization organization indicated by the attribute stdOrganization. - string msgContent = 1; + string msg_content = 1; // The encode format of the V2X message, for example base64. - string msgEncodeFormat = 2; + string msg_encode_format = 2; - // Published V2X message type. Its value is defined by the standardization organization indicated by the attribute stdOrganization. See note 2. - enum msgType { - SEE_DESCRIPTION = 0; - } + MsgType msg_type = 3; // Standardization organization which defines the published V2X message type: ETSI: European Telecommunications Standards Institute. See note 1. enum stdOrganization { - SEE_DESCRIPTION = 0; + ETSI = 0; } } diff --git a/proto3/models/v2x_msg_subscription.proto b/proto3/models/v2x_msg_subscription.proto index ec71460..c4908d9 100644 --- a/proto3/models/v2x_msg_subscription.proto +++ b/proto3/models/v2x_msg_subscription.proto @@ -4,7 +4,7 @@ ETSI GS MEC 030 V2X Information Service API described using OpenAPI. The version of the OpenAPI document: 2.1.1 - + Contact: cti_support@etsi.org Generated by OpenAPI Generator: https://openapi-generator.tech */ @@ -16,18 +16,19 @@ import public "models/time_stamp.proto"; import public "models/v2x_msg_subscription_filter_criteria.proto"; import public "models/v2x_msg_subscription_links.proto"; +option java_outer_classname = "V2xMsgSubscriptionProto"; message V2xMsgSubscription { - V2xMsgSubscriptionLinks Underscorelinks = 1; + V2xMsgSubscriptionLinks links = 1; // URI selected by the service consumer to receive notifications on the subscribed V2X message. This shall be included both in the request and in response. - string callbackReference = 2; + string callback_reference = 2; - TimeStamp expiryDeadline = 3; + TimeStamp expiry_deadline = 3; - V2xMsgSubscriptionFilterCriteria filterCriteria = 4; + V2xMsgSubscriptionFilterCriteria filter_criteria = 4; // Shall be set to \"V2xMsgSubscription\". - string subscriptionType = 5; + string subscription_type = 5; } diff --git a/proto3/models/v2x_msg_subscription_filter_criteria.proto b/proto3/models/v2x_msg_subscription_filter_criteria.proto index 1835c49..1283c6c 100644 --- a/proto3/models/v2x_msg_subscription_filter_criteria.proto +++ b/proto3/models/v2x_msg_subscription_filter_criteria.proto @@ -4,23 +4,24 @@ ETSI GS MEC 030 V2X Information Service API described using OpenAPI. The version of the OpenAPI document: 2.1.1 - + Contact: cti_support@etsi.org Generated by OpenAPI Generator: https://openapi-generator.tech */ syntax = "proto3"; package mec030; +option java_outer_classname = "V2xMsgSubscriptionFilterCriteriaProto"; message V2xMsgSubscriptionFilterCriteria { // Subscribed V2X message type. Its value is defined by the standardization organization indicated by the attribute stdOrganization. See note 2. - repeated string msgType = 1; + repeated string msg_type = 1; // Standardization organization which defines the subscribed V2X message type: ETSI: European Telecommunications Standards Institute. See note 1. enum stdOrganization { - SEE_DESCRIPTION = 0; + ETSI = 0; } } diff --git a/proto3/models/v2x_msg_subscription_links.proto b/proto3/models/v2x_msg_subscription_links.proto index 8e3ef4f..fc22f1d 100644 --- a/proto3/models/v2x_msg_subscription_links.proto +++ b/proto3/models/v2x_msg_subscription_links.proto @@ -4,7 +4,7 @@ ETSI GS MEC 030 V2X Information Service API described using OpenAPI. The version of the OpenAPI document: 2.1.1 - + Contact: cti_support@etsi.org Generated by OpenAPI Generator: https://openapi-generator.tech */ @@ -14,6 +14,8 @@ package mec030; import public "models/link_type.proto"; +option java_outer_classname = "V2xMsgSubscriptionLinksProto"; + message V2xMsgSubscriptionLinks { LinkType self = 1; diff --git a/proto3/models/v2x_server_usd.proto b/proto3/models/v2x_server_usd.proto index f675b59..81c04bb 100644 --- a/proto3/models/v2x_server_usd.proto +++ b/proto3/models/v2x_server_usd.proto @@ -4,7 +4,7 @@ ETSI GS MEC 030 V2X Information Service API described using OpenAPI. The version of the OpenAPI document: 2.1.1 - + Contact: cti_support@etsi.org Generated by OpenAPI Generator: https://openapi-generator.tech */ @@ -15,12 +15,14 @@ package mec030; import public "models/v2x_server_usd_sdp_info.proto"; import public "models/v2x_server_usd_tmgi.proto"; +option java_outer_classname = "V2xServerUsdProto"; + message V2xServerUsd { - V2xServerUsdSdpInfo sdpInfo = 1; + V2xServerUsdSdpInfo sdp_info = 1; // A list of service area identifier for the applicable MBMS broadcast area. - repeated string serviceAreaIdentifier = 2; + repeated string service_area_identifier = 2; V2xServerUsdTmgi tmgi = 3; diff --git a/proto3/models/v2x_server_usd_sdp_info.proto b/proto3/models/v2x_server_usd_sdp_info.proto index d2e5ca9..1195d26 100644 --- a/proto3/models/v2x_server_usd_sdp_info.proto +++ b/proto3/models/v2x_server_usd_sdp_info.proto @@ -4,7 +4,7 @@ ETSI GS MEC 030 V2X Information Service API described using OpenAPI. The version of the OpenAPI document: 2.1.1 - + Contact: cti_support@etsi.org Generated by OpenAPI Generator: https://openapi-generator.tech */ @@ -12,11 +12,12 @@ syntax = "proto3"; package mec030; +option java_outer_classname ="V2xServerUsdSdpInfoProto"; message V2xServerUsdSdpInfo { - string ipMulticastAddress = 1; + string ip_multicast_address = 1; - string portNumber = 2; + string port_number = 2; } diff --git a/proto3/models/v2x_server_usd_tmgi.proto b/proto3/models/v2x_server_usd_tmgi.proto index 4857f45..edc3995 100644 --- a/proto3/models/v2x_server_usd_tmgi.proto +++ b/proto3/models/v2x_server_usd_tmgi.proto @@ -4,7 +4,7 @@ ETSI GS MEC 030 V2X Information Service API described using OpenAPI. The version of the OpenAPI document: 2.1.1 - + Contact: cti_support@etsi.org Generated by OpenAPI Generator: https://openapi-generator.tech */ @@ -12,11 +12,12 @@ syntax = "proto3"; package mec030; +option java_outer_classname ="V2xServerUsdTmgiProto"; message V2xServerUsdTmgi { // MBMS Service ID consisting of three octets. - string mbmsServiceId = 1; + string mbms_service_id = 1; // The Mobile Country Code part of PLMN Identity. string mcc = 2; diff --git a/proto3/services/qo_s_service.proto b/proto3/services/qo_s_service.proto new file mode 100644 index 0000000..d9d5bb7 --- /dev/null +++ b/proto3/services/qo_s_service.proto @@ -0,0 +1,27 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + Contact: cti_support@etsi.org + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + +import public "models/predicted_qos.proto"; +import public "models/problem_details.proto"; + +service QoSService { + rpc PredictedQosPOST (PredictedQosPOSTRequest) returns (PredictedQos); + +} + +message PredictedQosPOSTRequest { + PredictedQos predicted_qos = 1; + +} + diff --git a/proto3/services/queries_service.proto b/proto3/services/queries_service.proto index 22c4f14..50e73a9 100644 --- a/proto3/services/queries_service.proto +++ b/proto3/services/queries_service.proto @@ -4,7 +4,7 @@ ETSI GS MEC 030 V2X Information Service API described using OpenAPI. The version of the OpenAPI document: 2.1.1 - + Contact: cti_support@etsi.org Generated by OpenAPI Generator: https://openapi-generator.tech */ @@ -12,27 +12,35 @@ syntax = "proto3"; package mec030; -import "google/protobuf/empty.proto"; +import public "models/pc5_provisioning_info.proto"; import public "models/problem_details.proto"; import public "models/uu_mbms_provisioning_info.proto"; import public "models/uu_unicast_provisioning_info.proto"; service QueriesService { + rpc ProvInfoGET (ProvInfoGETRequest) returns (Pc5ProvisioningInfo); + rpc ProvInfoUuMbmsGET (ProvInfoUuMbmsGETRequest) returns (UuMbmsProvisioningInfo); rpc ProvInfoUuUnicastGET (ProvInfoUuUnicastGETRequest) returns (UuUnicastProvisioningInfo); } +message ProvInfoGETRequest { + // Comma separated list of locations to identify a cell of a base station or a particular geographical area + string location_info = 1; + +} + message ProvInfoUuMbmsGETRequest { // omma separated list of locations to identify a cell of a base station or a particular geographical area - string locationInfo = 1; + string location_info = 1; } message ProvInfoUuUnicastGETRequest { // Comma separated list of locations to identify a cell of a base station or a particular geographical area - string locationInfo = 1; + string location_info = 1; } diff --git a/proto3/services/subscription_service.proto b/proto3/services/subscription_service.proto new file mode 100644 index 0000000..e75d351 --- /dev/null +++ b/proto3/services/subscription_service.proto @@ -0,0 +1,62 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + Contact: cti_support@etsi.org + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + +import "google/protobuf/empty.proto"; +import public "models/subscription.proto"; +import public "models/problem_details.proto"; +import public "models/subscription_link_list.proto"; + +service SubscriptionService { + rpc IndividualSubscriptionDELETE (IndividualSubscriptionDELETERequest) returns (google.protobuf.Empty); + + rpc IndividualSubscriptionGET (IndividualSubscriptionGETRequest) returns (Subscription); + + rpc IndividualSubscriptionPUT (IndividualSubscriptionPUTRequest) returns (Subscription); + + rpc SubGET (SubGETRequest) returns (SubscriptionLinkList); + + rpc SubPOST (SubPOSTRequest) returns (Subscription); + +} + +message IndividualSubscriptionDELETERequest { + // Refers to created subscription, where the VIS API allocates a unique resource name for this subscription + string subscription_id = 1; + +} + +message IndividualSubscriptionGETRequest { + // Refers to created subscription, where the VIS API allocates a unique resource name for this subscription + string subscription_id = 1; + +} + +message IndividualSubscriptionPUTRequest { + // Refers to created subscription, where the VIS API allocates a unique resource name for this subscription + string subscription_id = 1; + Subscription subscription = 2; + +} + +message SubGETRequest { + // Query parameter to filter on a specific subscription type. Permitted values: prov_chg_uu_uni: provisioning information change for V2X communication over Uuunicast prov_chg_uu_mbms: provisioning information change for V2X communication over Uu MBMS prov_chg_uu_pc5: provisioning information change for V2X communication over PC5. v2x_msg: V2X interoperability message + string subscription_type = 1; + +} + +message SubPOSTRequest { + Subscription subscription = 1; + +} + diff --git a/proto3/services/v2_x_msg_service.proto b/proto3/services/v2_x_msg_service.proto new file mode 100644 index 0000000..bf580b9 --- /dev/null +++ b/proto3/services/v2_x_msg_service.proto @@ -0,0 +1,28 @@ +/* + ETSI GS MEC 030 V2X Information Service API + + ETSI GS MEC 030 V2X Information Service API described using OpenAPI. + + The version of the OpenAPI document: 2.1.1 + Contact: cti_support@etsi.org + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ + +syntax = "proto3"; + +package mec030; + +import "google/protobuf/empty.proto"; +import public "models/problem_details.proto"; +import public "models/v2x_msg_publication.proto"; + +service V2XMsgService { + rpc V2xMessagePOST (V2xMessagePOSTRequest) returns (google.protobuf.Empty); + +} + +message V2xMessagePOSTRequest { + V2xMsgPublication v2x_msg_publication = 1; + +} + -- GitLab From b0d5b3dfac076822ba7a1694bc987803594d1065 Mon Sep 17 00:00:00 2001 From: piscione Date: Fri, 8 Jan 2021 10:34:09 +0100 Subject: [PATCH 08/11] Added to proto files option java_multiple_files=true; to improve Java code readability. --- proto3/models/cell_id.proto | 1 + proto3/models/earfcn.proto | 1 + proto3/models/ecgi.proto | 1 + proto3/models/fdd_info.proto | 1 + proto3/models/link_type.proto | 1 + proto3/models/location_info.proto | 1 + proto3/models/location_info_geo_area.proto | 1 + proto3/models/msg_type.proto | 1 + proto3/models/pc5_neighbour_cell_info.proto | 1 + proto3/models/pc5_provisioning_info.proto | 1 + proto3/models/pc5_provisioning_info_pro_info_pc5.proto | 1 + proto3/models/plmn.proto | 1 + proto3/models/predicted_qos.proto | 1 + proto3/models/predicted_qos_routes.proto | 1 + proto3/models/predicted_qos_routes_route_info.proto | 1 + proto3/models/problem_details.proto | 1 + proto3/models/prov_chg_pc5_notification.proto | 1 + proto3/models/prov_chg_pc5_subscription.proto | 1 + proto3/models/prov_chg_pc5_subscription_filter_criteria.proto | 1 + proto3/models/prov_chg_pc5_subscription_links.proto | 1 + proto3/models/prov_chg_uu_mbms_notification.proto | 1 + proto3/models/prov_chg_uu_mbms_subscription.proto | 1 + .../models/prov_chg_uu_mbms_subscription_filter_criteria.proto | 1 + proto3/models/prov_chg_uu_mbms_subscription_links.proto | 1 + proto3/models/prov_chg_uu_uni_notification.proto | 1 + proto3/models/prov_chg_uu_uni_subscription.proto | 1 + proto3/models/prov_chg_uu_uni_subscription_filter_criteria.proto | 1 + proto3/models/prov_chg_uu_uni_subscription_links.proto | 1 + proto3/models/subscription.proto | 1 + proto3/models/subscription_link_list.proto | 1 + proto3/models/subscription_link_list_links.proto | 1 + proto3/models/subscription_link_list_links_subscriptions.proto | 1 + proto3/models/tdd_info.proto | 1 + proto3/models/time_stamp.proto | 1 + proto3/models/transmission_bandwidth.proto | 1 + .../models/transmission_bandwidth_transmission_bandwidth.proto | 1 + proto3/models/uu_mbms_neighbour_cell_info.proto | 1 + proto3/models/uu_mbms_provisioning_info.proto | 1 + proto3/models/uu_mbms_provisioning_info_pro_info_uu_mbms.proto | 1 + proto3/models/uu_uni_neighbour_cell_info.proto | 1 + proto3/models/uu_unicast_provisioning_info.proto | 1 + .../uu_unicast_provisioning_info_pro_info_uu_unicast.proto | 1 + proto3/models/v2x_application_server.proto | 1 + proto3/models/v2x_msg_notification.proto | 1 + proto3/models/v2x_msg_notification_links.proto | 1 + proto3/models/v2x_msg_publication.proto | 1 + proto3/models/v2x_msg_subscription.proto | 1 + proto3/models/v2x_msg_subscription_filter_criteria.proto | 1 + proto3/models/v2x_msg_subscription_links.proto | 1 + proto3/models/v2x_server_usd.proto | 1 + proto3/models/v2x_server_usd_sdp_info.proto | 1 + proto3/models/v2x_server_usd_tmgi.proto | 1 + proto3/services/qo_s_service.proto | 1 + proto3/services/queries_service.proto | 1 + proto3/services/subscription_service.proto | 1 + proto3/services/v2_x_msg_service.proto | 1 + 56 files changed, 56 insertions(+) diff --git a/proto3/models/cell_id.proto b/proto3/models/cell_id.proto index d88d637..522ea17 100644 --- a/proto3/models/cell_id.proto +++ b/proto3/models/cell_id.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; message CellId { diff --git a/proto3/models/earfcn.proto b/proto3/models/earfcn.proto index 762f84c..19849cd 100644 --- a/proto3/models/earfcn.proto +++ b/proto3/models/earfcn.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; message Earfcn { diff --git a/proto3/models/ecgi.proto b/proto3/models/ecgi.proto index c4bb5b4..99c17cc 100644 --- a/proto3/models/ecgi.proto +++ b/proto3/models/ecgi.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; import public "models/cell_id.proto"; import public "models/plmn.proto"; diff --git a/proto3/models/fdd_info.proto b/proto3/models/fdd_info.proto index a412192..b193b7c 100644 --- a/proto3/models/fdd_info.proto +++ b/proto3/models/fdd_info.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; import public "models/earfcn.proto"; import public "models/transmission_bandwidth.proto"; diff --git a/proto3/models/link_type.proto b/proto3/models/link_type.proto index 92f2ce8..20c787c 100644 --- a/proto3/models/link_type.proto +++ b/proto3/models/link_type.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; message LinkType { diff --git a/proto3/models/location_info.proto b/proto3/models/location_info.proto index 7abcc22..12f0cdf 100644 --- a/proto3/models/location_info.proto +++ b/proto3/models/location_info.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; import public "models/ecgi.proto"; import public "models/location_info_geo_area.proto"; diff --git a/proto3/models/location_info_geo_area.proto b/proto3/models/location_info_geo_area.proto index 3c462eb..d1e663a 100644 --- a/proto3/models/location_info_geo_area.proto +++ b/proto3/models/location_info_geo_area.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; message LocationInfoGeoArea { diff --git a/proto3/models/msg_type.proto b/proto3/models/msg_type.proto index 2eacd7a..5c45b45 100644 --- a/proto3/models/msg_type.proto +++ b/proto3/models/msg_type.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; message MsgType { enum TypeEnum { diff --git a/proto3/models/pc5_neighbour_cell_info.proto b/proto3/models/pc5_neighbour_cell_info.proto index c641550..3fd19ca 100644 --- a/proto3/models/pc5_neighbour_cell_info.proto +++ b/proto3/models/pc5_neighbour_cell_info.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; import public "models/ecgi.proto"; import public "models/plmn.proto"; diff --git a/proto3/models/pc5_provisioning_info.proto b/proto3/models/pc5_provisioning_info.proto index ec73054..158b517 100644 --- a/proto3/models/pc5_provisioning_info.proto +++ b/proto3/models/pc5_provisioning_info.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; import public "models/pc5_provisioning_info_pro_info_pc5.proto"; import public "models/time_stamp.proto"; diff --git a/proto3/models/pc5_provisioning_info_pro_info_pc5.proto b/proto3/models/pc5_provisioning_info_pro_info_pc5.proto index 5f18e72..3efef98 100644 --- a/proto3/models/pc5_provisioning_info_pro_info_pc5.proto +++ b/proto3/models/pc5_provisioning_info_pro_info_pc5.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; import public "models/location_info.proto"; import public "models/pc5_neighbour_cell_info.proto"; diff --git a/proto3/models/plmn.proto b/proto3/models/plmn.proto index fd962dd..88e022f 100644 --- a/proto3/models/plmn.proto +++ b/proto3/models/plmn.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; message Plmn { diff --git a/proto3/models/predicted_qos.proto b/proto3/models/predicted_qos.proto index 42b70a7..c055fd4 100644 --- a/proto3/models/predicted_qos.proto +++ b/proto3/models/predicted_qos.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; import public "models/predicted_qos_routes.proto"; import public "models/time_stamp.proto"; diff --git a/proto3/models/predicted_qos_routes.proto b/proto3/models/predicted_qos_routes.proto index 0e8e04a..ee33a12 100644 --- a/proto3/models/predicted_qos_routes.proto +++ b/proto3/models/predicted_qos_routes.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; import public "models/predicted_qos_routes_route_info.proto"; message PredictedQosRoutes { diff --git a/proto3/models/predicted_qos_routes_route_info.proto b/proto3/models/predicted_qos_routes_route_info.proto index db2d600..d8728e2 100644 --- a/proto3/models/predicted_qos_routes_route_info.proto +++ b/proto3/models/predicted_qos_routes_route_info.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; import public "models/location_info.proto"; import public "models/time_stamp.proto"; diff --git a/proto3/models/problem_details.proto b/proto3/models/problem_details.proto index 08e0b55..050e6d1 100644 --- a/proto3/models/problem_details.proto +++ b/proto3/models/problem_details.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; message ProblemDetails { diff --git a/proto3/models/prov_chg_pc5_notification.proto b/proto3/models/prov_chg_pc5_notification.proto index 4000862..08a05ee 100644 --- a/proto3/models/prov_chg_pc5_notification.proto +++ b/proto3/models/prov_chg_pc5_notification.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; import public "models/location_info.proto"; import public "models/pc5_neighbour_cell_info.proto"; import public "models/time_stamp.proto"; diff --git a/proto3/models/prov_chg_pc5_subscription.proto b/proto3/models/prov_chg_pc5_subscription.proto index 1398a0e..222426d 100644 --- a/proto3/models/prov_chg_pc5_subscription.proto +++ b/proto3/models/prov_chg_pc5_subscription.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; import public "models/prov_chg_pc5_subscription_filter_criteria.proto"; import public "models/prov_chg_pc5_subscription_links.proto"; import public "models/time_stamp.proto"; diff --git a/proto3/models/prov_chg_pc5_subscription_filter_criteria.proto b/proto3/models/prov_chg_pc5_subscription_filter_criteria.proto index c52ad51..965073d 100644 --- a/proto3/models/prov_chg_pc5_subscription_filter_criteria.proto +++ b/proto3/models/prov_chg_pc5_subscription_filter_criteria.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; import public "models/location_info.proto"; import public "models/pc5_neighbour_cell_info.proto"; diff --git a/proto3/models/prov_chg_pc5_subscription_links.proto b/proto3/models/prov_chg_pc5_subscription_links.proto index 8a4ec4e..3a3acb7 100644 --- a/proto3/models/prov_chg_pc5_subscription_links.proto +++ b/proto3/models/prov_chg_pc5_subscription_links.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; import public "models/link_type.proto"; message ProvChgPc5SubscriptionLinks { diff --git a/proto3/models/prov_chg_uu_mbms_notification.proto b/proto3/models/prov_chg_uu_mbms_notification.proto index f01e1d3..6fd4069 100644 --- a/proto3/models/prov_chg_uu_mbms_notification.proto +++ b/proto3/models/prov_chg_uu_mbms_notification.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; import public "models/location_info.proto"; import public "models/time_stamp.proto"; import public "models/uu_mbms_neighbour_cell_info.proto"; diff --git a/proto3/models/prov_chg_uu_mbms_subscription.proto b/proto3/models/prov_chg_uu_mbms_subscription.proto index a0f802d..a6c7e49 100644 --- a/proto3/models/prov_chg_uu_mbms_subscription.proto +++ b/proto3/models/prov_chg_uu_mbms_subscription.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; import public "models/prov_chg_uu_mbms_subscription_filter_criteria.proto"; import public "models/prov_chg_uu_mbms_subscription_links.proto"; import public "models/time_stamp.proto"; diff --git a/proto3/models/prov_chg_uu_mbms_subscription_filter_criteria.proto b/proto3/models/prov_chg_uu_mbms_subscription_filter_criteria.proto index be3939f..fc27e8d 100644 --- a/proto3/models/prov_chg_uu_mbms_subscription_filter_criteria.proto +++ b/proto3/models/prov_chg_uu_mbms_subscription_filter_criteria.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; import public "models/location_info.proto"; import public "models/uu_mbms_neighbour_cell_info.proto"; import public "models/v2x_server_usd.proto"; diff --git a/proto3/models/prov_chg_uu_mbms_subscription_links.proto b/proto3/models/prov_chg_uu_mbms_subscription_links.proto index e51e523..c011ae5 100644 --- a/proto3/models/prov_chg_uu_mbms_subscription_links.proto +++ b/proto3/models/prov_chg_uu_mbms_subscription_links.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; import public "models/link_type.proto"; message ProvChgUuMbmsSubscriptionLinks { diff --git a/proto3/models/prov_chg_uu_uni_notification.proto b/proto3/models/prov_chg_uu_uni_notification.proto index 088e975..978b7c6 100644 --- a/proto3/models/prov_chg_uu_uni_notification.proto +++ b/proto3/models/prov_chg_uu_uni_notification.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; import public "models/location_info.proto"; import public "models/time_stamp.proto"; import public "models/uu_uni_neighbour_cell_info.proto"; diff --git a/proto3/models/prov_chg_uu_uni_subscription.proto b/proto3/models/prov_chg_uu_uni_subscription.proto index 3b9eed0..ace46ec 100644 --- a/proto3/models/prov_chg_uu_uni_subscription.proto +++ b/proto3/models/prov_chg_uu_uni_subscription.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; import public "models/prov_chg_uu_uni_subscription_filter_criteria.proto"; import public "models/prov_chg_uu_uni_subscription_links.proto"; import public "models/time_stamp.proto"; diff --git a/proto3/models/prov_chg_uu_uni_subscription_filter_criteria.proto b/proto3/models/prov_chg_uu_uni_subscription_filter_criteria.proto index 7a7918e..a1134cc 100644 --- a/proto3/models/prov_chg_uu_uni_subscription_filter_criteria.proto +++ b/proto3/models/prov_chg_uu_uni_subscription_filter_criteria.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; import public "models/location_info.proto"; import public "models/uu_uni_neighbour_cell_info.proto"; import public "models/v2x_application_server.proto"; diff --git a/proto3/models/prov_chg_uu_uni_subscription_links.proto b/proto3/models/prov_chg_uu_uni_subscription_links.proto index e2a26bf..935380f 100644 --- a/proto3/models/prov_chg_uu_uni_subscription_links.proto +++ b/proto3/models/prov_chg_uu_uni_subscription_links.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; import public "models/link_type.proto"; message ProvChgUuUniSubscriptionLinks { diff --git a/proto3/models/subscription.proto b/proto3/models/subscription.proto index fe35039..3b7fc1a 100644 --- a/proto3/models/subscription.proto +++ b/proto3/models/subscription.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; import public "models/prov_chg_uu_uni_subscription.proto"; import public "models/prov_chg_uu_mbms_subscription.proto"; import public "models/prov_chg_pc5_subscription.proto"; diff --git a/proto3/models/subscription_link_list.proto b/proto3/models/subscription_link_list.proto index 1171437..9dd5b5c 100644 --- a/proto3/models/subscription_link_list.proto +++ b/proto3/models/subscription_link_list.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; import public "models/subscription_link_list_links.proto"; message SubscriptionLinkList { diff --git a/proto3/models/subscription_link_list_links.proto b/proto3/models/subscription_link_list_links.proto index de49d73..82530ab 100644 --- a/proto3/models/subscription_link_list_links.proto +++ b/proto3/models/subscription_link_list_links.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; import public "models/link_type.proto"; import public "models/subscription_link_list_links_subscriptions.proto"; diff --git a/proto3/models/subscription_link_list_links_subscriptions.proto b/proto3/models/subscription_link_list_links_subscriptions.proto index 611fe6a..996dbfe 100644 --- a/proto3/models/subscription_link_list_links_subscriptions.proto +++ b/proto3/models/subscription_link_list_links_subscriptions.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; message SubscriptionLinkListLinksSubscriptions { diff --git a/proto3/models/tdd_info.proto b/proto3/models/tdd_info.proto index ccf0b36..a3a0a98 100644 --- a/proto3/models/tdd_info.proto +++ b/proto3/models/tdd_info.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; import public "models/earfcn.proto"; import public "models/transmission_bandwidth.proto"; diff --git a/proto3/models/time_stamp.proto b/proto3/models/time_stamp.proto index f6f3b26..3d89e0b 100644 --- a/proto3/models/time_stamp.proto +++ b/proto3/models/time_stamp.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; message TimeStamp { diff --git a/proto3/models/transmission_bandwidth.proto b/proto3/models/transmission_bandwidth.proto index efb16e4..35f54d0 100644 --- a/proto3/models/transmission_bandwidth.proto +++ b/proto3/models/transmission_bandwidth.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; import public "models/transmission_bandwidth_transmission_bandwidth.proto"; message TransmissionBandwidth { diff --git a/proto3/models/transmission_bandwidth_transmission_bandwidth.proto b/proto3/models/transmission_bandwidth_transmission_bandwidth.proto index ab96007..bff6433 100644 --- a/proto3/models/transmission_bandwidth_transmission_bandwidth.proto +++ b/proto3/models/transmission_bandwidth_transmission_bandwidth.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; message TransmissionBandwidthTransmissionBandwidth { enum TypeEnum { diff --git a/proto3/models/uu_mbms_neighbour_cell_info.proto b/proto3/models/uu_mbms_neighbour_cell_info.proto index c6b92c3..0264b08 100644 --- a/proto3/models/uu_mbms_neighbour_cell_info.proto +++ b/proto3/models/uu_mbms_neighbour_cell_info.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; import public "models/ecgi.proto"; import public "models/fdd_info.proto"; import public "models/plmn.proto"; diff --git a/proto3/models/uu_mbms_provisioning_info.proto b/proto3/models/uu_mbms_provisioning_info.proto index 1e64c19..86a7b9e 100644 --- a/proto3/models/uu_mbms_provisioning_info.proto +++ b/proto3/models/uu_mbms_provisioning_info.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; import public "models/time_stamp.proto"; import public "models/uu_mbms_provisioning_info_pro_info_uu_mbms.proto"; diff --git a/proto3/models/uu_mbms_provisioning_info_pro_info_uu_mbms.proto b/proto3/models/uu_mbms_provisioning_info_pro_info_uu_mbms.proto index d53981a..064175d 100644 --- a/proto3/models/uu_mbms_provisioning_info_pro_info_uu_mbms.proto +++ b/proto3/models/uu_mbms_provisioning_info_pro_info_uu_mbms.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; import public "models/location_info.proto"; import public "models/uu_mbms_neighbour_cell_info.proto"; import public "models/v2x_server_usd.proto"; diff --git a/proto3/models/uu_uni_neighbour_cell_info.proto b/proto3/models/uu_uni_neighbour_cell_info.proto index eb8192c..ca3a986 100644 --- a/proto3/models/uu_uni_neighbour_cell_info.proto +++ b/proto3/models/uu_uni_neighbour_cell_info.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; import public "models/ecgi.proto"; import public "models/fdd_info.proto"; import public "models/plmn.proto"; diff --git a/proto3/models/uu_unicast_provisioning_info.proto b/proto3/models/uu_unicast_provisioning_info.proto index 7e20586..efce4a6 100644 --- a/proto3/models/uu_unicast_provisioning_info.proto +++ b/proto3/models/uu_unicast_provisioning_info.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; import public "models/time_stamp.proto"; import public "models/uu_unicast_provisioning_info_pro_info_uu_unicast.proto"; diff --git a/proto3/models/uu_unicast_provisioning_info_pro_info_uu_unicast.proto b/proto3/models/uu_unicast_provisioning_info_pro_info_uu_unicast.proto index 695979b..fa21d9d 100644 --- a/proto3/models/uu_unicast_provisioning_info_pro_info_uu_unicast.proto +++ b/proto3/models/uu_unicast_provisioning_info_pro_info_uu_unicast.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; import public "models/location_info.proto"; import public "models/uu_uni_neighbour_cell_info.proto"; import public "models/v2x_application_server.proto"; diff --git a/proto3/models/v2x_application_server.proto b/proto3/models/v2x_application_server.proto index 8aa8c64..10586fa 100644 --- a/proto3/models/v2x_application_server.proto +++ b/proto3/models/v2x_application_server.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; option java_outer_classname = "V2xApplicationServerProto"; message V2xApplicationServer { diff --git a/proto3/models/v2x_msg_notification.proto b/proto3/models/v2x_msg_notification.proto index 31ba380..e61d4ec 100644 --- a/proto3/models/v2x_msg_notification.proto +++ b/proto3/models/v2x_msg_notification.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; import public "models/msg_type.proto"; import public "models/time_stamp.proto"; import public "models/v2x_msg_notification_links.proto"; diff --git a/proto3/models/v2x_msg_notification_links.proto b/proto3/models/v2x_msg_notification_links.proto index 5bc0123..4791e9a 100644 --- a/proto3/models/v2x_msg_notification_links.proto +++ b/proto3/models/v2x_msg_notification_links.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; option java_outer_classname = "V2xMsgNotificationLinksProto"; +option java_multiple_files=true; import public "models/link_type.proto"; diff --git a/proto3/models/v2x_msg_publication.proto b/proto3/models/v2x_msg_publication.proto index ea9d00e..1776943 100644 --- a/proto3/models/v2x_msg_publication.proto +++ b/proto3/models/v2x_msg_publication.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; import public "models/msg_type.proto"; option java_outer_classname = "V2xMsgPublicationProto"; diff --git a/proto3/models/v2x_msg_subscription.proto b/proto3/models/v2x_msg_subscription.proto index c4908d9..564c874 100644 --- a/proto3/models/v2x_msg_subscription.proto +++ b/proto3/models/v2x_msg_subscription.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; import public "models/time_stamp.proto"; import public "models/v2x_msg_subscription_filter_criteria.proto"; import public "models/v2x_msg_subscription_links.proto"; diff --git a/proto3/models/v2x_msg_subscription_filter_criteria.proto b/proto3/models/v2x_msg_subscription_filter_criteria.proto index 1283c6c..6035c89 100644 --- a/proto3/models/v2x_msg_subscription_filter_criteria.proto +++ b/proto3/models/v2x_msg_subscription_filter_criteria.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; option java_outer_classname = "V2xMsgSubscriptionFilterCriteriaProto"; +option java_multiple_files=true; message V2xMsgSubscriptionFilterCriteria { diff --git a/proto3/models/v2x_msg_subscription_links.proto b/proto3/models/v2x_msg_subscription_links.proto index fc22f1d..35aac96 100644 --- a/proto3/models/v2x_msg_subscription_links.proto +++ b/proto3/models/v2x_msg_subscription_links.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; import public "models/link_type.proto"; option java_outer_classname = "V2xMsgSubscriptionLinksProto"; diff --git a/proto3/models/v2x_server_usd.proto b/proto3/models/v2x_server_usd.proto index 81c04bb..8a9f85c 100644 --- a/proto3/models/v2x_server_usd.proto +++ b/proto3/models/v2x_server_usd.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; import public "models/v2x_server_usd_sdp_info.proto"; import public "models/v2x_server_usd_tmgi.proto"; diff --git a/proto3/models/v2x_server_usd_sdp_info.proto b/proto3/models/v2x_server_usd_sdp_info.proto index 1195d26..e22ae10 100644 --- a/proto3/models/v2x_server_usd_sdp_info.proto +++ b/proto3/models/v2x_server_usd_sdp_info.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; option java_outer_classname ="V2xServerUsdSdpInfoProto"; message V2xServerUsdSdpInfo { diff --git a/proto3/models/v2x_server_usd_tmgi.proto b/proto3/models/v2x_server_usd_tmgi.proto index edc3995..31ae69a 100644 --- a/proto3/models/v2x_server_usd_tmgi.proto +++ b/proto3/models/v2x_server_usd_tmgi.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; option java_outer_classname ="V2xServerUsdTmgiProto"; message V2xServerUsdTmgi { diff --git a/proto3/services/qo_s_service.proto b/proto3/services/qo_s_service.proto index d9d5bb7..8fd4e48 100644 --- a/proto3/services/qo_s_service.proto +++ b/proto3/services/qo_s_service.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; import public "models/predicted_qos.proto"; import public "models/problem_details.proto"; diff --git a/proto3/services/queries_service.proto b/proto3/services/queries_service.proto index 50e73a9..d3045ed 100644 --- a/proto3/services/queries_service.proto +++ b/proto3/services/queries_service.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; import public "models/pc5_provisioning_info.proto"; import public "models/problem_details.proto"; import public "models/uu_mbms_provisioning_info.proto"; diff --git a/proto3/services/subscription_service.proto b/proto3/services/subscription_service.proto index e75d351..f88815b 100644 --- a/proto3/services/subscription_service.proto +++ b/proto3/services/subscription_service.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; import "google/protobuf/empty.proto"; import public "models/subscription.proto"; import public "models/problem_details.proto"; diff --git a/proto3/services/v2_x_msg_service.proto b/proto3/services/v2_x_msg_service.proto index bf580b9..4016a56 100644 --- a/proto3/services/v2_x_msg_service.proto +++ b/proto3/services/v2_x_msg_service.proto @@ -12,6 +12,7 @@ syntax = "proto3"; package mec030; +option java_multiple_files=true; import "google/protobuf/empty.proto"; import public "models/problem_details.proto"; import public "models/v2x_msg_publication.proto"; -- GitLab From 558e093dd8bb25b8ee59e020ac3689f68349490b Mon Sep 17 00:00:00 2001 From: piscione Date: Mon, 11 Jan 2021 18:13:46 +0100 Subject: [PATCH 09/11] Fix. --- proto3/models/cell_id.proto | 1 - proto3/models/earfcn.proto | 1 - proto3/models/ecgi.proto | 1 - proto3/models/fdd_info.proto | 1 - proto3/models/link_type.proto | 1 - proto3/models/location_info.proto | 1 - proto3/models/location_info_geo_area.proto | 1 - proto3/models/msg_type.proto | 1 - proto3/models/pc5_neighbour_cell_info.proto | 1 - proto3/models/pc5_provisioning_info.proto | 1 - proto3/models/pc5_provisioning_info_pro_info_pc5.proto | 1 - proto3/models/plmn.proto | 1 - proto3/models/predicted_qos.proto | 1 - proto3/models/predicted_qos_routes.proto | 1 - proto3/models/predicted_qos_routes_route_info.proto | 1 - proto3/models/problem_details.proto | 1 - proto3/models/prov_chg_pc5_notification.proto | 1 - proto3/models/prov_chg_pc5_subscription.proto | 1 - proto3/models/prov_chg_pc5_subscription_filter_criteria.proto | 1 - proto3/models/prov_chg_pc5_subscription_links.proto | 1 - proto3/models/prov_chg_uu_mbms_notification.proto | 1 - proto3/models/prov_chg_uu_mbms_subscription.proto | 1 - .../models/prov_chg_uu_mbms_subscription_filter_criteria.proto | 1 - proto3/models/prov_chg_uu_mbms_subscription_links.proto | 1 - proto3/models/prov_chg_uu_uni_notification.proto | 1 - proto3/models/prov_chg_uu_uni_subscription.proto | 1 - proto3/models/prov_chg_uu_uni_subscription_filter_criteria.proto | 1 - proto3/models/prov_chg_uu_uni_subscription_links.proto | 1 - proto3/models/subscription.proto | 1 - proto3/models/subscription_link_list.proto | 1 - proto3/models/subscription_link_list_links.proto | 1 - proto3/models/subscription_link_list_links_subscriptions.proto | 1 - proto3/models/tdd_info.proto | 1 - proto3/models/time_stamp.proto | 1 - proto3/models/transmission_bandwidth.proto | 1 - .../models/transmission_bandwidth_transmission_bandwidth.proto | 1 - proto3/models/uu_mbms_neighbour_cell_info.proto | 1 - proto3/models/uu_mbms_provisioning_info.proto | 1 - proto3/models/uu_mbms_provisioning_info_pro_info_uu_mbms.proto | 1 - proto3/models/uu_uni_neighbour_cell_info.proto | 1 - proto3/models/uu_unicast_provisioning_info.proto | 1 - .../uu_unicast_provisioning_info_pro_info_uu_unicast.proto | 1 - proto3/models/v2x_application_server.proto | 1 - proto3/models/v2x_msg_notification.proto | 1 - proto3/models/v2x_msg_notification_links.proto | 1 - proto3/models/v2x_msg_publication.proto | 1 - proto3/models/v2x_msg_subscription.proto | 1 - proto3/models/v2x_msg_subscription_filter_criteria.proto | 1 - proto3/models/v2x_msg_subscription_links.proto | 1 - proto3/models/v2x_server_usd.proto | 1 - proto3/models/v2x_server_usd_sdp_info.proto | 1 - proto3/models/v2x_server_usd_tmgi.proto | 1 - proto3/services/qo_s_service.proto | 1 - proto3/services/queries_service.proto | 1 - proto3/services/subscription_service.proto | 1 - proto3/services/v2_x_msg_service.proto | 1 - 56 files changed, 56 deletions(-) diff --git a/proto3/models/cell_id.proto b/proto3/models/cell_id.proto index 522ea17..d88d637 100644 --- a/proto3/models/cell_id.proto +++ b/proto3/models/cell_id.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; message CellId { diff --git a/proto3/models/earfcn.proto b/proto3/models/earfcn.proto index 19849cd..762f84c 100644 --- a/proto3/models/earfcn.proto +++ b/proto3/models/earfcn.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; message Earfcn { diff --git a/proto3/models/ecgi.proto b/proto3/models/ecgi.proto index 99c17cc..c4bb5b4 100644 --- a/proto3/models/ecgi.proto +++ b/proto3/models/ecgi.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; import public "models/cell_id.proto"; import public "models/plmn.proto"; diff --git a/proto3/models/fdd_info.proto b/proto3/models/fdd_info.proto index b193b7c..a412192 100644 --- a/proto3/models/fdd_info.proto +++ b/proto3/models/fdd_info.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; import public "models/earfcn.proto"; import public "models/transmission_bandwidth.proto"; diff --git a/proto3/models/link_type.proto b/proto3/models/link_type.proto index 20c787c..92f2ce8 100644 --- a/proto3/models/link_type.proto +++ b/proto3/models/link_type.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; message LinkType { diff --git a/proto3/models/location_info.proto b/proto3/models/location_info.proto index 12f0cdf..7abcc22 100644 --- a/proto3/models/location_info.proto +++ b/proto3/models/location_info.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; import public "models/ecgi.proto"; import public "models/location_info_geo_area.proto"; diff --git a/proto3/models/location_info_geo_area.proto b/proto3/models/location_info_geo_area.proto index d1e663a..3c462eb 100644 --- a/proto3/models/location_info_geo_area.proto +++ b/proto3/models/location_info_geo_area.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; message LocationInfoGeoArea { diff --git a/proto3/models/msg_type.proto b/proto3/models/msg_type.proto index 5c45b45..2eacd7a 100644 --- a/proto3/models/msg_type.proto +++ b/proto3/models/msg_type.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; message MsgType { enum TypeEnum { diff --git a/proto3/models/pc5_neighbour_cell_info.proto b/proto3/models/pc5_neighbour_cell_info.proto index 3fd19ca..c641550 100644 --- a/proto3/models/pc5_neighbour_cell_info.proto +++ b/proto3/models/pc5_neighbour_cell_info.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; import public "models/ecgi.proto"; import public "models/plmn.proto"; diff --git a/proto3/models/pc5_provisioning_info.proto b/proto3/models/pc5_provisioning_info.proto index 158b517..ec73054 100644 --- a/proto3/models/pc5_provisioning_info.proto +++ b/proto3/models/pc5_provisioning_info.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; import public "models/pc5_provisioning_info_pro_info_pc5.proto"; import public "models/time_stamp.proto"; diff --git a/proto3/models/pc5_provisioning_info_pro_info_pc5.proto b/proto3/models/pc5_provisioning_info_pro_info_pc5.proto index 3efef98..5f18e72 100644 --- a/proto3/models/pc5_provisioning_info_pro_info_pc5.proto +++ b/proto3/models/pc5_provisioning_info_pro_info_pc5.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; import public "models/location_info.proto"; import public "models/pc5_neighbour_cell_info.proto"; diff --git a/proto3/models/plmn.proto b/proto3/models/plmn.proto index 88e022f..fd962dd 100644 --- a/proto3/models/plmn.proto +++ b/proto3/models/plmn.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; message Plmn { diff --git a/proto3/models/predicted_qos.proto b/proto3/models/predicted_qos.proto index c055fd4..42b70a7 100644 --- a/proto3/models/predicted_qos.proto +++ b/proto3/models/predicted_qos.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; import public "models/predicted_qos_routes.proto"; import public "models/time_stamp.proto"; diff --git a/proto3/models/predicted_qos_routes.proto b/proto3/models/predicted_qos_routes.proto index ee33a12..0e8e04a 100644 --- a/proto3/models/predicted_qos_routes.proto +++ b/proto3/models/predicted_qos_routes.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; import public "models/predicted_qos_routes_route_info.proto"; message PredictedQosRoutes { diff --git a/proto3/models/predicted_qos_routes_route_info.proto b/proto3/models/predicted_qos_routes_route_info.proto index d8728e2..db2d600 100644 --- a/proto3/models/predicted_qos_routes_route_info.proto +++ b/proto3/models/predicted_qos_routes_route_info.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; import public "models/location_info.proto"; import public "models/time_stamp.proto"; diff --git a/proto3/models/problem_details.proto b/proto3/models/problem_details.proto index 050e6d1..08e0b55 100644 --- a/proto3/models/problem_details.proto +++ b/proto3/models/problem_details.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; message ProblemDetails { diff --git a/proto3/models/prov_chg_pc5_notification.proto b/proto3/models/prov_chg_pc5_notification.proto index 08a05ee..4000862 100644 --- a/proto3/models/prov_chg_pc5_notification.proto +++ b/proto3/models/prov_chg_pc5_notification.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; import public "models/location_info.proto"; import public "models/pc5_neighbour_cell_info.proto"; import public "models/time_stamp.proto"; diff --git a/proto3/models/prov_chg_pc5_subscription.proto b/proto3/models/prov_chg_pc5_subscription.proto index 222426d..1398a0e 100644 --- a/proto3/models/prov_chg_pc5_subscription.proto +++ b/proto3/models/prov_chg_pc5_subscription.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; import public "models/prov_chg_pc5_subscription_filter_criteria.proto"; import public "models/prov_chg_pc5_subscription_links.proto"; import public "models/time_stamp.proto"; diff --git a/proto3/models/prov_chg_pc5_subscription_filter_criteria.proto b/proto3/models/prov_chg_pc5_subscription_filter_criteria.proto index 965073d..c52ad51 100644 --- a/proto3/models/prov_chg_pc5_subscription_filter_criteria.proto +++ b/proto3/models/prov_chg_pc5_subscription_filter_criteria.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; import public "models/location_info.proto"; import public "models/pc5_neighbour_cell_info.proto"; diff --git a/proto3/models/prov_chg_pc5_subscription_links.proto b/proto3/models/prov_chg_pc5_subscription_links.proto index 3a3acb7..8a4ec4e 100644 --- a/proto3/models/prov_chg_pc5_subscription_links.proto +++ b/proto3/models/prov_chg_pc5_subscription_links.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; import public "models/link_type.proto"; message ProvChgPc5SubscriptionLinks { diff --git a/proto3/models/prov_chg_uu_mbms_notification.proto b/proto3/models/prov_chg_uu_mbms_notification.proto index 6fd4069..f01e1d3 100644 --- a/proto3/models/prov_chg_uu_mbms_notification.proto +++ b/proto3/models/prov_chg_uu_mbms_notification.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; import public "models/location_info.proto"; import public "models/time_stamp.proto"; import public "models/uu_mbms_neighbour_cell_info.proto"; diff --git a/proto3/models/prov_chg_uu_mbms_subscription.proto b/proto3/models/prov_chg_uu_mbms_subscription.proto index a6c7e49..a0f802d 100644 --- a/proto3/models/prov_chg_uu_mbms_subscription.proto +++ b/proto3/models/prov_chg_uu_mbms_subscription.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; import public "models/prov_chg_uu_mbms_subscription_filter_criteria.proto"; import public "models/prov_chg_uu_mbms_subscription_links.proto"; import public "models/time_stamp.proto"; diff --git a/proto3/models/prov_chg_uu_mbms_subscription_filter_criteria.proto b/proto3/models/prov_chg_uu_mbms_subscription_filter_criteria.proto index fc27e8d..be3939f 100644 --- a/proto3/models/prov_chg_uu_mbms_subscription_filter_criteria.proto +++ b/proto3/models/prov_chg_uu_mbms_subscription_filter_criteria.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; import public "models/location_info.proto"; import public "models/uu_mbms_neighbour_cell_info.proto"; import public "models/v2x_server_usd.proto"; diff --git a/proto3/models/prov_chg_uu_mbms_subscription_links.proto b/proto3/models/prov_chg_uu_mbms_subscription_links.proto index c011ae5..e51e523 100644 --- a/proto3/models/prov_chg_uu_mbms_subscription_links.proto +++ b/proto3/models/prov_chg_uu_mbms_subscription_links.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; import public "models/link_type.proto"; message ProvChgUuMbmsSubscriptionLinks { diff --git a/proto3/models/prov_chg_uu_uni_notification.proto b/proto3/models/prov_chg_uu_uni_notification.proto index 978b7c6..088e975 100644 --- a/proto3/models/prov_chg_uu_uni_notification.proto +++ b/proto3/models/prov_chg_uu_uni_notification.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; import public "models/location_info.proto"; import public "models/time_stamp.proto"; import public "models/uu_uni_neighbour_cell_info.proto"; diff --git a/proto3/models/prov_chg_uu_uni_subscription.proto b/proto3/models/prov_chg_uu_uni_subscription.proto index ace46ec..3b9eed0 100644 --- a/proto3/models/prov_chg_uu_uni_subscription.proto +++ b/proto3/models/prov_chg_uu_uni_subscription.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; import public "models/prov_chg_uu_uni_subscription_filter_criteria.proto"; import public "models/prov_chg_uu_uni_subscription_links.proto"; import public "models/time_stamp.proto"; diff --git a/proto3/models/prov_chg_uu_uni_subscription_filter_criteria.proto b/proto3/models/prov_chg_uu_uni_subscription_filter_criteria.proto index a1134cc..7a7918e 100644 --- a/proto3/models/prov_chg_uu_uni_subscription_filter_criteria.proto +++ b/proto3/models/prov_chg_uu_uni_subscription_filter_criteria.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; import public "models/location_info.proto"; import public "models/uu_uni_neighbour_cell_info.proto"; import public "models/v2x_application_server.proto"; diff --git a/proto3/models/prov_chg_uu_uni_subscription_links.proto b/proto3/models/prov_chg_uu_uni_subscription_links.proto index 935380f..e2a26bf 100644 --- a/proto3/models/prov_chg_uu_uni_subscription_links.proto +++ b/proto3/models/prov_chg_uu_uni_subscription_links.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; import public "models/link_type.proto"; message ProvChgUuUniSubscriptionLinks { diff --git a/proto3/models/subscription.proto b/proto3/models/subscription.proto index 3b7fc1a..fe35039 100644 --- a/proto3/models/subscription.proto +++ b/proto3/models/subscription.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; import public "models/prov_chg_uu_uni_subscription.proto"; import public "models/prov_chg_uu_mbms_subscription.proto"; import public "models/prov_chg_pc5_subscription.proto"; diff --git a/proto3/models/subscription_link_list.proto b/proto3/models/subscription_link_list.proto index 9dd5b5c..1171437 100644 --- a/proto3/models/subscription_link_list.proto +++ b/proto3/models/subscription_link_list.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; import public "models/subscription_link_list_links.proto"; message SubscriptionLinkList { diff --git a/proto3/models/subscription_link_list_links.proto b/proto3/models/subscription_link_list_links.proto index 82530ab..de49d73 100644 --- a/proto3/models/subscription_link_list_links.proto +++ b/proto3/models/subscription_link_list_links.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; import public "models/link_type.proto"; import public "models/subscription_link_list_links_subscriptions.proto"; diff --git a/proto3/models/subscription_link_list_links_subscriptions.proto b/proto3/models/subscription_link_list_links_subscriptions.proto index 996dbfe..611fe6a 100644 --- a/proto3/models/subscription_link_list_links_subscriptions.proto +++ b/proto3/models/subscription_link_list_links_subscriptions.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; message SubscriptionLinkListLinksSubscriptions { diff --git a/proto3/models/tdd_info.proto b/proto3/models/tdd_info.proto index a3a0a98..ccf0b36 100644 --- a/proto3/models/tdd_info.proto +++ b/proto3/models/tdd_info.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; import public "models/earfcn.proto"; import public "models/transmission_bandwidth.proto"; diff --git a/proto3/models/time_stamp.proto b/proto3/models/time_stamp.proto index 3d89e0b..f6f3b26 100644 --- a/proto3/models/time_stamp.proto +++ b/proto3/models/time_stamp.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; message TimeStamp { diff --git a/proto3/models/transmission_bandwidth.proto b/proto3/models/transmission_bandwidth.proto index 35f54d0..efb16e4 100644 --- a/proto3/models/transmission_bandwidth.proto +++ b/proto3/models/transmission_bandwidth.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; import public "models/transmission_bandwidth_transmission_bandwidth.proto"; message TransmissionBandwidth { diff --git a/proto3/models/transmission_bandwidth_transmission_bandwidth.proto b/proto3/models/transmission_bandwidth_transmission_bandwidth.proto index bff6433..ab96007 100644 --- a/proto3/models/transmission_bandwidth_transmission_bandwidth.proto +++ b/proto3/models/transmission_bandwidth_transmission_bandwidth.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; message TransmissionBandwidthTransmissionBandwidth { enum TypeEnum { diff --git a/proto3/models/uu_mbms_neighbour_cell_info.proto b/proto3/models/uu_mbms_neighbour_cell_info.proto index 0264b08..c6b92c3 100644 --- a/proto3/models/uu_mbms_neighbour_cell_info.proto +++ b/proto3/models/uu_mbms_neighbour_cell_info.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; import public "models/ecgi.proto"; import public "models/fdd_info.proto"; import public "models/plmn.proto"; diff --git a/proto3/models/uu_mbms_provisioning_info.proto b/proto3/models/uu_mbms_provisioning_info.proto index 86a7b9e..1e64c19 100644 --- a/proto3/models/uu_mbms_provisioning_info.proto +++ b/proto3/models/uu_mbms_provisioning_info.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; import public "models/time_stamp.proto"; import public "models/uu_mbms_provisioning_info_pro_info_uu_mbms.proto"; diff --git a/proto3/models/uu_mbms_provisioning_info_pro_info_uu_mbms.proto b/proto3/models/uu_mbms_provisioning_info_pro_info_uu_mbms.proto index 064175d..d53981a 100644 --- a/proto3/models/uu_mbms_provisioning_info_pro_info_uu_mbms.proto +++ b/proto3/models/uu_mbms_provisioning_info_pro_info_uu_mbms.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; import public "models/location_info.proto"; import public "models/uu_mbms_neighbour_cell_info.proto"; import public "models/v2x_server_usd.proto"; diff --git a/proto3/models/uu_uni_neighbour_cell_info.proto b/proto3/models/uu_uni_neighbour_cell_info.proto index ca3a986..eb8192c 100644 --- a/proto3/models/uu_uni_neighbour_cell_info.proto +++ b/proto3/models/uu_uni_neighbour_cell_info.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; import public "models/ecgi.proto"; import public "models/fdd_info.proto"; import public "models/plmn.proto"; diff --git a/proto3/models/uu_unicast_provisioning_info.proto b/proto3/models/uu_unicast_provisioning_info.proto index efce4a6..7e20586 100644 --- a/proto3/models/uu_unicast_provisioning_info.proto +++ b/proto3/models/uu_unicast_provisioning_info.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; import public "models/time_stamp.proto"; import public "models/uu_unicast_provisioning_info_pro_info_uu_unicast.proto"; diff --git a/proto3/models/uu_unicast_provisioning_info_pro_info_uu_unicast.proto b/proto3/models/uu_unicast_provisioning_info_pro_info_uu_unicast.proto index fa21d9d..695979b 100644 --- a/proto3/models/uu_unicast_provisioning_info_pro_info_uu_unicast.proto +++ b/proto3/models/uu_unicast_provisioning_info_pro_info_uu_unicast.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; import public "models/location_info.proto"; import public "models/uu_uni_neighbour_cell_info.proto"; import public "models/v2x_application_server.proto"; diff --git a/proto3/models/v2x_application_server.proto b/proto3/models/v2x_application_server.proto index 10586fa..8aa8c64 100644 --- a/proto3/models/v2x_application_server.proto +++ b/proto3/models/v2x_application_server.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; option java_outer_classname = "V2xApplicationServerProto"; message V2xApplicationServer { diff --git a/proto3/models/v2x_msg_notification.proto b/proto3/models/v2x_msg_notification.proto index e61d4ec..31ba380 100644 --- a/proto3/models/v2x_msg_notification.proto +++ b/proto3/models/v2x_msg_notification.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; import public "models/msg_type.proto"; import public "models/time_stamp.proto"; import public "models/v2x_msg_notification_links.proto"; diff --git a/proto3/models/v2x_msg_notification_links.proto b/proto3/models/v2x_msg_notification_links.proto index 4791e9a..5bc0123 100644 --- a/proto3/models/v2x_msg_notification_links.proto +++ b/proto3/models/v2x_msg_notification_links.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; option java_outer_classname = "V2xMsgNotificationLinksProto"; -option java_multiple_files=true; import public "models/link_type.proto"; diff --git a/proto3/models/v2x_msg_publication.proto b/proto3/models/v2x_msg_publication.proto index 1776943..ea9d00e 100644 --- a/proto3/models/v2x_msg_publication.proto +++ b/proto3/models/v2x_msg_publication.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; import public "models/msg_type.proto"; option java_outer_classname = "V2xMsgPublicationProto"; diff --git a/proto3/models/v2x_msg_subscription.proto b/proto3/models/v2x_msg_subscription.proto index 564c874..c4908d9 100644 --- a/proto3/models/v2x_msg_subscription.proto +++ b/proto3/models/v2x_msg_subscription.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; import public "models/time_stamp.proto"; import public "models/v2x_msg_subscription_filter_criteria.proto"; import public "models/v2x_msg_subscription_links.proto"; diff --git a/proto3/models/v2x_msg_subscription_filter_criteria.proto b/proto3/models/v2x_msg_subscription_filter_criteria.proto index 6035c89..1283c6c 100644 --- a/proto3/models/v2x_msg_subscription_filter_criteria.proto +++ b/proto3/models/v2x_msg_subscription_filter_criteria.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; option java_outer_classname = "V2xMsgSubscriptionFilterCriteriaProto"; -option java_multiple_files=true; message V2xMsgSubscriptionFilterCriteria { diff --git a/proto3/models/v2x_msg_subscription_links.proto b/proto3/models/v2x_msg_subscription_links.proto index 35aac96..fc22f1d 100644 --- a/proto3/models/v2x_msg_subscription_links.proto +++ b/proto3/models/v2x_msg_subscription_links.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; import public "models/link_type.proto"; option java_outer_classname = "V2xMsgSubscriptionLinksProto"; diff --git a/proto3/models/v2x_server_usd.proto b/proto3/models/v2x_server_usd.proto index 8a9f85c..81c04bb 100644 --- a/proto3/models/v2x_server_usd.proto +++ b/proto3/models/v2x_server_usd.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; import public "models/v2x_server_usd_sdp_info.proto"; import public "models/v2x_server_usd_tmgi.proto"; diff --git a/proto3/models/v2x_server_usd_sdp_info.proto b/proto3/models/v2x_server_usd_sdp_info.proto index e22ae10..1195d26 100644 --- a/proto3/models/v2x_server_usd_sdp_info.proto +++ b/proto3/models/v2x_server_usd_sdp_info.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; option java_outer_classname ="V2xServerUsdSdpInfoProto"; message V2xServerUsdSdpInfo { diff --git a/proto3/models/v2x_server_usd_tmgi.proto b/proto3/models/v2x_server_usd_tmgi.proto index 31ae69a..edc3995 100644 --- a/proto3/models/v2x_server_usd_tmgi.proto +++ b/proto3/models/v2x_server_usd_tmgi.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; option java_outer_classname ="V2xServerUsdTmgiProto"; message V2xServerUsdTmgi { diff --git a/proto3/services/qo_s_service.proto b/proto3/services/qo_s_service.proto index 8fd4e48..d9d5bb7 100644 --- a/proto3/services/qo_s_service.proto +++ b/proto3/services/qo_s_service.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; import public "models/predicted_qos.proto"; import public "models/problem_details.proto"; diff --git a/proto3/services/queries_service.proto b/proto3/services/queries_service.proto index d3045ed..50e73a9 100644 --- a/proto3/services/queries_service.proto +++ b/proto3/services/queries_service.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; import public "models/pc5_provisioning_info.proto"; import public "models/problem_details.proto"; import public "models/uu_mbms_provisioning_info.proto"; diff --git a/proto3/services/subscription_service.proto b/proto3/services/subscription_service.proto index f88815b..e75d351 100644 --- a/proto3/services/subscription_service.proto +++ b/proto3/services/subscription_service.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; import "google/protobuf/empty.proto"; import public "models/subscription.proto"; import public "models/problem_details.proto"; diff --git a/proto3/services/v2_x_msg_service.proto b/proto3/services/v2_x_msg_service.proto index 4016a56..bf580b9 100644 --- a/proto3/services/v2_x_msg_service.proto +++ b/proto3/services/v2_x_msg_service.proto @@ -12,7 +12,6 @@ syntax = "proto3"; package mec030; -option java_multiple_files=true; import "google/protobuf/empty.proto"; import public "models/problem_details.proto"; import public "models/v2x_msg_publication.proto"; -- GitLab From 27ed830ad6b461d92efefd5a5c8a147bb2916219 Mon Sep 17 00:00:00 2001 From: piscione Date: Tue, 26 Jan 2021 18:12:12 +0100 Subject: [PATCH 10/11] Added callback into subscription endpoint. --- MEC030_V2XInformationService.yaml | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/MEC030_V2XInformationService.yaml b/MEC030_V2XInformationService.yaml index 28d7ed9..4dc7cf3 100644 --- a/MEC030_V2XInformationService.yaml +++ b/MEC030_V2XInformationService.yaml @@ -260,7 +260,28 @@ paths: $ref: '#/components/responses/422' '429': $ref: '#/components/responses/429' - + + callbacks: + notification: + '{$request.body#/callbackReference}': + post: + summary: 'Callback POST used to send a notification' + description: 'A notification from VIS.' + operationId: notificationPOST + requestBody: + description: Subscription notification + required: true + content: + application/json: + schema: + oneOf: + - $ref: '#/components/schemas/ProvChgUuUniNotification' + - $ref: '#/components/schemas/ProvChgUuMbmsNotification' + - $ref: '#/components/schemas/ProvChgPc5Notification' + - $ref: '#/components/schemas/V2xMsgNotification' + responses: + '204': + $ref: '#/components/responses/204' /subscriptions/{subscriptionId}: parameters: -- GitLab From 3ac68cd49ddfd77ac93bc65945a034523e48f05b Mon Sep 17 00:00:00 2001 From: Elian Kraja Date: Tue, 26 Jan 2021 22:50:30 +0100 Subject: [PATCH 11/11] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9c22188..c14b8fb 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,8 @@ This repository contains OpenAPIs descriptions for the interfaces specified in E ## Online resources * [Specification document](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/030/02.01.01_60/gs_MEC030v020101p.pdf) -* [Navigate the V2X Information Service API in the browser](https://forge.etsi.org/swagger/ui/?url=https://forge.etsi.org/rep/mec/gs030-vis-api/raw/stf593/MEC030_V2XInformationService.yaml). -* [Edit the V2X Information Service API online](https://forge.etsi.org/swagger/editor/?url=https://forge.etsi.org/rep/mec/gs030-vis-api/raw/stf593/MEC030_V2XInformationService.yaml). +* [Navigate the V2X Information Service API in the browser](https://forge.etsi.org/swagger/ui/?url=https://forge.etsi.org/rep/mec/gs030-vis-api/raw/develop/MEC030_V2XInformationService.yaml). +* [Edit the V2X Information Service API online](https://forge.etsi.org/swagger/editor/?url=https://forge.etsi.org/rep/mec/gs030-vis-api/raw/develop/MEC030_V2XInformationService.yaml). ## License -- GitLab