0 = reserved.
1 = UE_IPv4_ADDRESS.
2 = UE_IPV6_ADDRESS.
3 = NATED_IP_ADDRESS.
4 = GTP_TEID.", "enum": [ - "0 = reserved", - "1 = UE_IPv4_ADDRESS", - "2 = UE_IPV6_ADDRESS", - "3 = NATED_IP_ADDRESS", - "4 = GTP_TEID" + 0, + 1, + 2, + 3, + 4 ], - "type": "string", + "type": "integer", "x-etsi-mec-cardinality": "1", "x-etsi-mec-origin-type": "Enum" }, @@ -1882,73 +1887,52 @@ "type": "object", "properties": { "cellIdNei": { - "allOf": [ - { - "$ref": "#/components/schemas/CellId" - } - ], - "description": "E-UTRAN Cell Identity of the best neighbouring cell associated with the Carrier Aggregation serving cell.", - "x-etsi-mec-cardinality": "1", - "x-etsi-mec-origin-type": "CellId" + "$ref": "#/components/schemas/CellId" }, "cellIdSrv": { - "allOf": [ - { - "$ref": "#/components/schemas/CellId" - } - ], - "description": "E-UTRAN Cell Identity of a Carrier Aggregation serving cell.", - "x-etsi-mec-cardinality": "1", - "x-etsi-mec-origin-type": "CellId" + "$ref": "#/components/schemas/CellId" }, "rsrpNei": { - "type": "integer", - "format": "uint32", "description": "Reference Signal Received Power as defined in ETSI TS 136 214 [i.5].", + "format": "int32", + "type": "integer", "x-etsi-mec-cardinality": "0..1", "x-etsi-mec-origin-type": "Uint32" }, "rsrpSrv": { - "type": "integer", - "format": "uint32", "description": "Reference Signal Received Power as defined in ETSI TS 136 214 [i.5].", + "format": "int32", + "type": "integer", "x-etsi-mec-cardinality": "0..1", "x-etsi-mec-origin-type": "Uint32" }, "rsrqNei": { - "type": "integer", - "format": "uint32", "description": "Reference Signal Received Quality as defined in ETSI TS 136 214 [i.5].", + "format": "int32", + "type": "integer", "x-etsi-mec-cardinality": "0..1", "x-etsi-mec-origin-type": "Uint32" }, "rsrqSrv": { - "type": "integer", - "format": "uint32", "description": "Reference Signal Received Quality as defined in ETSI TS 136 214 [i.5].", + "format": "int32", + "type": "integer", "x-etsi-mec-cardinality": "0..1", "x-etsi-mec-origin-type": "Uint32" } } }, + "minItems": 0, "required": [ "cellIdSrv", "cellIdNei" ], - "minItems": 0, "type": "array", "x-etsi-mec-cardinality": "0..M", "x-etsi-mec-origin-type": "Structure (inlined)" }, "ecgi": { - "allOf": [ - { - "$ref": "#/components/schemas/Ecgi" - } - ], - "description": "E-UTRAN Cell Global Identifier.", - "x-etsi-mec-cardinality": "1", - "x-etsi-mec-origin-type": "Ecgi" + "$ref": "#/components/schemas/Ecgi" }, "notificationType": { "description": "Shall be set to \"CaReConfNotification\".", @@ -1962,21 +1946,14 @@ "type": "object", "properties": { "ecgi": { - "allOf": [ - { - "$ref": "#/components/schemas/Ecgi" - } - ], - "description": "E-UTRAN Cell Global Identifier.", - "x-etsi-mec-cardinality": "1", - "x-etsi-mec-origin-type": "Ecgi" + "$ref": "#/components/schemas/Ecgi" } } }, + "minItems": 0, "required": [ "ecgi" ], - "minItems": 0, "type": "array", "x-etsi-mec-cardinality": "0..N", "x-etsi-mec-origin-type": "Structure (inlined)" @@ -1987,34 +1964,20 @@ "type": "object", "properties": { "ecgi": { - "allOf": [ - { - "$ref": "#/components/schemas/Ecgi" - } - ], - "description": "E-UTRAN Cell Global Identifier.", - "x-etsi-mec-cardinality": "1", - "x-etsi-mec-origin-type": "Ecgi" + "$ref": "#/components/schemas/Ecgi" } } }, + "minItems": 0, "required": [ "ecgi" ], - "minItems": 0, "type": "array", "x-etsi-mec-cardinality": "0..N", "x-etsi-mec-origin-type": "Structure (inlined)" }, "timeStamp": { - "allOf": [ - { - "$ref": "#/components/schemas/TimeStamp" - } - ], - "description": "Time stamp.", - "x-etsi-mec-cardinality": "0..1", - "x-etsi-mec-origin-type": "TimeStamp" + "$ref": "#/components/schemas/TimeStamp" } }, "required": [ @@ -2030,14 +1993,7 @@ "description": "Hyperlink related to the resource. This shall be only included in the HTTP responses and in HTTP PUT requests.", "properties": { "self": { - "allOf": [ - { - "$ref": "#/components/schemas/LinkType" - } - ], - "description": "Self referring URI. The URI shall be unique within the RNI 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": [ @@ -2055,14 +2011,7 @@ "x-etsi-mec-origin-type": "URI" }, "expiryDeadline": { - "allOf": [ - { - "$ref": "#/components/schemas/TimeStamp" - } - ], - "description": "Time stamp.", - "x-etsi-mec-cardinality": "0..1", - "x-etsi-mec-origin-type": "TimeStamp" + "$ref": "#/components/schemas/TimeStamp" }, "filterCriteriaAssoc": { "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.", @@ -2126,15 +2075,15 @@ "x-etsi-mec-origin-type": "AssociateId" }, "hoStatus": { - "description": "Indicate the status of the UE handover procedure. Values are defined as following:\n1 = IN_PREPARATION.\n2 = IN_EXECUTION.\n3 = COMPLETED.\n4 = REJECTED.\n5 = CANCELLED.", + "description": "Indicate the status of the UE handover procedure. Values are defined as following:
1 = IN_PREPARATION.
2 = IN_EXECUTION.
3 = COMPLETED.
4 = REJECTED.
5 = CANCELLED.", "enum": [ - "1 = IN_PREPARATION", - "2 = IN_EXECUTION", - "3 = COMPLETED", - "4 = REJECTED", - "5 = CANCELLED" + 1, + 2, + 3, + 4, + 5 ], - "type": "string", + "type": "integer", "x-etsi-mec-cardinality": "1", "x-etsi-mec-origin-type": "Enum" }, @@ -2145,14 +2094,7 @@ "x-etsi-mec-origin-type": "String" }, "srcEcgi": { - "allOf": [ - { - "$ref": "#/components/schemas/Ecgi" - } - ], - "description": "E-UTRAN Cell Global Identifier of the source cell.", - "x-etsi-mec-cardinality": "1", - "x-etsi-mec-origin-type": "Ecgi" + "$ref": "#/components/schemas/Ecgi" }, "tempUeId": { "description": "The temporary identifier allocated for the specific UE as defined below.", @@ -2179,17 +2121,10 @@ "x-etsi-mec-origin-type": "Structure (inlined)" }, "timeStamp": { - "allOf": [ - { - "$ref": "#/components/schemas/TimeStamp" - } - ], - "description": "Time stamp.", - "x-etsi-mec-cardinality": "0..1", - "x-etsi-mec-origin-type": "TimeStamp" + "$ref": "#/components/schemas/TimeStamp" }, "trgEcgi": { - "description": "E-UTRAN Cell Global Identifier of the target cell. NOTE: Cardinality N is valid only in case of statuses IN_PREPARATION, REJECTED and CANCELLED.", + "description": "E-UTRAN Cell Global Identifier of the target cell.\nNOTE: Cardinality N is valid only in case of statuses IN_PREPARATION, REJECTED and CANCELLED.", "items": { "$ref": "#/components/schemas/Ecgi" }, @@ -2214,14 +2149,7 @@ "description": "Hyperlink related to the resource. This shall be only included in the HTTP responses and in HTTP PUT requests.", "properties": { "self": { - "allOf": [ - { - "$ref": "#/components/schemas/LinkType" - } - ], - "description": "Self referring URI. The URI shall be unique within the RNI 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": [ @@ -2232,21 +2160,14 @@ "x-etsi-mec-origin-type": "Structure (inlined)" }, "callbackReference": { - "description": "URI selected by the service consumer to receive notifications on the subscribed RNIS information. This shall be included both in the request and in response.", + "description": "URI selected by the service consumerto receive notifications on the subscribed RNIS 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": { - "allOf": [ - { - "$ref": "#/components/schemas/TimeStamp" - } - ], - "description": "Time stamp.", - "x-etsi-mec-cardinality": "0..1", - "x-etsi-mec-origin-type": "TimeStamp" + "$ref": "#/components/schemas/TimeStamp" }, "filterCriteriaAssocHo": { "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.", @@ -2278,7 +2199,7 @@ "x-etsi-mec-origin-type": "Ecgi" }, "hoStatus": { - "description": "In case hoStatus is not included in the subscription request, the default value 3 = COMPLETED shall be used and included in the response:\n1 = IN_PREPARATION.\n2 = IN_EXECUTION.\n3 = COMPLETED.\n4 = REJECTED.\n5 = CANCELLED.", + "description": "In case hoStatus is not included in the subscription request, the default value 3 = COMPLETED shall be used and included in the response:
1 = IN_PREPARATION.
2 = IN_EXECUTION.
3 = COMPLETED.
4 = REJECTED.
5 = CANCELLED.", "items": { "$ref": "#/components/schemas/Enum" }, @@ -2314,24 +2235,10 @@ "Ecgi": { "properties": { "cellId": { - "allOf": [ - { - "$ref": "#/components/schemas/CellId" - } - ], - "description": "E-UTRAN Cell Global Identifier.", - "x-etsi-mec-cardinality": "1", - "x-etsi-mec-origin-type": "CellId" + "$ref": "#/components/schemas/CellId" }, "plmn": { - "allOf": [ - { - "$ref": "#/components/schemas/Plmn" - } - ], - "description": "Public Land Mobile Network Identity.", - "x-etsi-mec-cardinality": "1", - "x-etsi-mec-origin-type": "Plmn" + "$ref": "#/components/schemas/Plmn" } }, "required": [ @@ -2365,24 +2272,10 @@ "x-etsi-mec-origin-type": "Structure (inlined)" }, "expiryDeadline": { - "allOf": [ - { - "$ref": "#/components/schemas/TimeStamp" - } - ], - "description": "Time stamp.", - "x-etsi-mec-cardinality": "1", - "x-etsi-mec-origin-type": "TimeStamp" + "$ref": "#/components/schemas/TimeStamp" }, "timeStamp": { - "allOf": [ - { - "$ref": "#/components/schemas/TimeStamp" - } - ], - "description": "Time stamp.", - "x-etsi-mec-cardinality": "0..1", - "x-etsi-mec-origin-type": "TimeStamp" + "$ref": "#/components/schemas/TimeStamp" } }, "required": [ @@ -2430,14 +2323,7 @@ "x-etsi-mec-origin-type": "Integer (0..100)" }, "ecgi": { - "allOf": [ - { - "$ref": "#/components/schemas/Ecgi" - } - ], - "description": "E-UTRAN Cell Global Identifier.", - "x-etsi-mec-cardinality": "1", - "x-etsi-mec-origin-type": "Ecgi" + "$ref": "#/components/schemas/Ecgi" }, "number_of_active_ue_dl_gbr_cell": { "description": "It indicates the number of active UEs with downlink GBR traffic, as defined in ETSI TS 136 314 [i.11].", @@ -2513,10 +2399,10 @@ } } }, + "minItems": 0, "required": [ "ecgi" ], - "minItems": 0, "type": "array", "x-etsi-mec-cardinality": "0..N", "x-etsi-mec-origin-type": "Structure (inlined)" @@ -2527,14 +2413,7 @@ "type": "object", "properties": { "associateId": { - "allOf": [ - { - "$ref": "#/components/schemas/AssociateId" - } - ], - "description": "Identifier to associate the information for a specific UE or flow.", - "x-etsi-mec-cardinality": "1", - "x-etsi-mec-origin-type": "AssociateId" + "$ref": "#/components/schemas/AssociateId" }, "dl_gbr_data_volume_ue": { "description": "It indicates the data volume of the downlink GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11].", @@ -2585,14 +2464,7 @@ "x-etsi-mec-origin-type": "Integer" }, "ecgi": { - "allOf": [ - { - "$ref": "#/components/schemas/Ecgi" - } - ], - "description": "E-UTRAN Cell Global Identifier.", - "x-etsi-mec-cardinality": "1", - "x-etsi-mec-origin-type": "Ecgi" + "$ref": "#/components/schemas/Ecgi" }, "ul_gbr_data_volume_ue": { "description": "It indicates the data volume of the uplink GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11].", @@ -2644,24 +2516,17 @@ } } }, + "minItems": 0, "required": [ "ecgi", "associateId" ], - "minItems": 0, "type": "array", "x-etsi-mec-cardinality": "0..N", "x-etsi-mec-origin-type": "Structure (inlined)" }, "timeStamp": { - "allOf": [ - { - "$ref": "#/components/schemas/TimeStamp" - } - ], - "description": "Time stamp.", - "x-etsi-mec-cardinality": "0..1", - "x-etsi-mec-origin-type": "TimeStamp" + "$ref": "#/components/schemas/TimeStamp" } }, "type": "object", @@ -2687,18 +2552,21 @@ "properties": { "rsrp": { "description": "Reference Signal Received Power as defined in ETSI TS 138 331 [i.13].", + "format": "int32", "type": "integer", "x-etsi-mec-cardinality": "0..1", "x-etsi-mec-origin-type": "Uint8" }, "rsrq": { "description": "Reference Signal Received Quality as defined in ETSI TS 138 331 [i.13].", + "format": "int32", "type": "integer", "x-etsi-mec-cardinality": "0..1", "x-etsi-mec-origin-type": "Uint8" }, "sinr": { "description": "Reference Signal to Interference & Noise Ratio as defined in ETSI TS 138 331 [i.13].", + "format": "int32", "type": "integer", "x-etsi-mec-cardinality": "0..1", "x-etsi-mec-origin-type": "Uint8" @@ -2725,104 +2593,93 @@ "type": "object", "properties": { "cellIdNei": { - "allOf": [ - { - "$ref": "#/components/schemas/CellId" - } - ], - "description": "E-UTRAN Cell Identity of the best neighbouring cell (NCell) associated with the SCell, as defined in ETSI TS 136 331 [i.7].", - "x-etsi-mec-cardinality": "0..1", - "x-etsi-mec-origin-type": "CellId" + "$ref": "#/components/schemas/CellId" }, "cellIdSrv": { - "allOf": [ - { - "$ref": "#/components/schemas/CellId" - } - ], - "description": "E-UTRAN Cell Identity of a Secondary serving Cell (SCell), as defined in ETSI TS 136 331 [i.7].", - "x-etsi-mec-cardinality": "1", - "x-etsi-mec-origin-type": "CellId" + "$ref": "#/components/schemas/CellId" }, "rsrpNei": { "description": "Reference Signal Received Power as defined in ETSI TS 136 214 [i.5].", + "format": "int32", "type": "integer", "x-etsi-mec-cardinality": "0..1", "x-etsi-mec-origin-type": "Uint8" }, "rsrpNeiEx": { "description": "Extended Reference Signal Received Power, with value mapping defined in ETSI TS 136 133 [i.16].", + "format": "int32", "type": "integer", "x-etsi-mec-cardinality": "0..1", "x-etsi-mec-origin-type": "Uint8" }, "rsrpSrv": { "description": "Reference Signal Received Power as defined in ETSI TS 136 214 [i.5].", + "format": "int32", "type": "integer", "x-etsi-mec-cardinality": "0..1", "x-etsi-mec-origin-type": "Uint8" }, "rsrpSrvEx": { "description": "Extended Reference Signal Received Power, with value mapping defined in ETSI TS 136 133 [i.16].", + "format": "int32", "type": "integer", "x-etsi-mec-cardinality": "0..1", "x-etsi-mec-origin-type": "Uint8" }, "rsrqNei": { "description": "Reference Signal Received Quality as defined in ETSI TS 136 214 [i.5].", + "format": "int32", "type": "integer", "x-etsi-mec-cardinality": "0..1", "x-etsi-mec-origin-type": "Uint8" }, "rsrqNeiEx": { "description": "Extended Reference Signal Received Quality, with value mapping defined in ETSI TS 136 133 [i.16].", + "format": "int32", "type": "integer", "x-etsi-mec-cardinality": "0..1", "x-etsi-mec-origin-type": "Uint8" }, "rsrqSrv": { "description": "Reference Signal Received Quality as defined in ETSI TS 136 214 [i.5].", + "format": "int32", "type": "integer", "x-etsi-mec-cardinality": "0..1", "x-etsi-mec-origin-type": "Uint8" }, "rsrqSrvEx": { "description": "Extended Reference Signal Received Quality, with value mapping defined in ETSI TS 136 133 [i.16].", + "format": "int32", "type": "integer", "x-etsi-mec-cardinality": "0..1", "x-etsi-mec-origin-type": "Uint8" }, "sinrNei": { "description": "Reference Signal \"Signal to Interference plus Noise Ratio\", with value mapping defined in ETSI TS 136 133 [i.16].", + "format": "int32", "type": "integer", "x-etsi-mec-cardinality": "0..1", "x-etsi-mec-origin-type": "Uint8" }, "sinrSrv": { "description": "Reference Signal \"Signal to Interference plus Noise Ratio\", with value mapping defined in ETSI TS 136 133 [i.16].", + "format": "int32", "type": "integer", "x-etsi-mec-cardinality": "0..1", "x-etsi-mec-origin-type": "Uint8" } } }, + "minItems": 0, "required": [ "cellIdSrv" ], - "minItems": 0, "type": "array", "x-etsi-mec-cardinality": "0..M", "x-etsi-mec-origin-type": "Structure (inlined)" }, "ecgi": { - "allOf": [ - { - "$ref": "#/components/schemas/Ecgi" - } - ], - "description": "E-UTRAN Cell Global Identifier of the Primary serving Cell (PCell), as defined in ETSI TS 136 331 [i.7].", - "x-etsi-mec-cardinality": "1", - "x-etsi-mec-origin-type": "Ecgi" + "$ref": "#/components/schemas/Ecgi" }, "eutranNeighbourCellMeasInfo": { "description": "This parameter can be repeated to contain information of all the neighbouring cells up to N.", @@ -2830,51 +2687,49 @@ "type": "object", "properties": { "ecgi": { - "allOf": [ - { - "$ref": "#/components/schemas/Ecgi" - } - ], - "description": "E-UTRAN Cell Global Identifier.", - "x-etsi-mec-cardinality": "1", - "x-etsi-mec-origin-type": "Ecgi" + "$ref": "#/components/schemas/Ecgi" }, "rsrp": { "description": "Reference Signal Received Power as defined in ETSI TS 136 214 [i.5].", + "format": "int32", "type": "integer", "x-etsi-mec-cardinality": "0..1", "x-etsi-mec-origin-type": "Uint8" }, "rsrpEx": { "description": "Extended Reference Signal Received Power, with value mapping defined in ETSI TS 136 133 [i.16].", + "format": "int32", "type": "integer", "x-etsi-mec-cardinality": "0..1", "x-etsi-mec-origin-type": "Uint8" }, "rsrq": { "description": "Reference Signal Received Quality as defined in ETSI TS 136 214 [i.5].", + "format": "int32", "type": "integer", "x-etsi-mec-cardinality": "0..1", "x-etsi-mec-origin-type": "Uint8" }, "rsrqEx": { "description": "Extended Reference Signal Received Quality, with value mapping defined in ETSI TS 136 133 [i.16].", + "format": "int32", "type": "integer", "x-etsi-mec-cardinality": "0..1", "x-etsi-mec-origin-type": "Uint8" }, "sinr": { "description": "Reference Signal \"Signal to Interference plus Noise Ratio\", with value mapping defined in ETSI TS 136 133 [i.16].", + "format": "int32", "type": "integer", "x-etsi-mec-cardinality": "0..1", "x-etsi-mec-origin-type": "Uint8" } } }, + "minItems": 0, "required": [ "ecgi" ], - "minItems": 0, "type": "array", "x-etsi-mec-cardinality": "0..N", "x-etsi-mec-origin-type": "Structure (inlined)" @@ -2899,14 +2754,7 @@ "type": "object", "properties": { "nrBNCellGId": { - "allOf": [ - { - "$ref": "#/components/schemas/NrCellId" - } - ], - "description": "Cell Global Identifier, as defined in ETSI TS 138 331 [i.13].", - "x-etsi-mec-cardinality": "1", - "x-etsi-mec-origin-type": "NrCellId" + "$ref": "#/components/schemas/NrCellId" }, "nrBNCellPlmn": { "description": "Public land mobile network identities", @@ -2920,29 +2768,32 @@ } } }, + "minItems": 1, "required": [ "nrBNCellPlmn", "nrBNCellGId" ], - "minItems": 1, "type": "array", "x-etsi-mec-cardinality": "1..P", "x-etsi-mec-origin-type": "Structure (inlined)" }, "nrBNCellRsrp": { "description": "Reference Signal Received Power measurement according to mapping table in ETSI TS 138.133 [i.14].", + "format": "int32", "type": "integer", "x-etsi-mec-cardinality": "0..1", "x-etsi-mec-origin-type": "Uint8" }, "nrBNCellRsrq": { "description": "Reference Signal Received Quality measurement according to mapping table in ETSI TS 138.133 [i.14].", + "format": "int32", "type": "integer", "x-etsi-mec-cardinality": "0..1", "x-etsi-mec-origin-type": "Uint8" }, "nrBNCellRssi": { "description": "Reference signal SINR measurement according to mapping table in ETSI TS 138.133 [i.14].", + "format": "int32", "type": "integer", "x-etsi-mec-cardinality": "0..1", "x-etsi-mec-origin-type": "Uint8" @@ -2956,9 +2807,9 @@ "x-etsi-mec-origin-type": "Structure (inlined)" }, "nrCarrierFreq": { - "type": "integer", - "format": "uint32", "description": "ARFCN applicable for a downlink, uplink or bi-directional (TDD) NR carrier frequency, as defined in ETSI TS 138.101 [i.15].", + "format": "int32", + "type": "integer", "x-etsi-mec-cardinality": "1", "x-etsi-mec-origin-type": "Uint32" }, @@ -2971,14 +2822,7 @@ "type": "object", "properties": { "nrSCellGId": { - "allOf": [ - { - "$ref": "#/components/schemas/NrCellId" - } - ], - "description": "Cell Global Identifier, as defined in ETSI TS 138 331 [i.13].", - "x-etsi-mec-cardinality": "1", - "x-etsi-mec-origin-type": "NrCellId" + "$ref": "#/components/schemas/NrCellId" }, "nrSCellPlmn": { "description": "Public land mobile network identities.", @@ -2992,29 +2836,32 @@ } } }, + "minItems": 1, "required": [ "nrSCellPlmn", "nrSCellGId" ], - "minItems": 1, "type": "array", "x-etsi-mec-cardinality": "1..P", "x-etsi-mec-origin-type": "Structure (inlined)" }, "nrSCellRsrp": { "description": "Reference Signal Received Power measurement according to mapping table in ETSI TS 138.133 [i.14].", + "format": "int32", "type": "integer", "x-etsi-mec-cardinality": "0..1", "x-etsi-mec-origin-type": "Uint8" }, "nrSCellRsrq": { "description": "Reference Signal Received Quality measurement according to mapping table in ETSI TS 138.133 [i.14].", + "format": "int32", "type": "integer", "x-etsi-mec-cardinality": "0..1", "x-etsi-mec-origin-type": "Uint8" }, "nrSCellRssi": { "description": "Reference signal SINR measurement according to mapping table in ETSI TS 138.133 [i.14].", + "format": "int32", "type": "integer", "x-etsi-mec-cardinality": "0..1", "x-etsi-mec-origin-type": "Uint8" @@ -3029,11 +2876,11 @@ } } }, + "minItems": 0, "required": [ "nrCarrierFreq", "nrSCs" ], - "minItems": 0, "type": "array", "x-etsi-mec-cardinality": "0..N", "x-etsi-mec-origin-type": "Structure (inlined)" @@ -3049,14 +2896,7 @@ "type": "object", "properties": { "nrNCellGId": { - "allOf": [ - { - "$ref": "#/components/schemas/NrCellId" - } - ], - "description": "Cell Global Identifier, as defined in ETSI TS 138 331 [i.13].", - "x-etsi-mec-cardinality": "1", - "x-etsi-mec-origin-type": "NrCellId" + "$ref": "#/components/schemas/NrCellId" }, "nrNCellPlmn": { "description": "Public land mobile network identities.", @@ -3070,49 +2910,45 @@ } } }, + "minItems": 1, "required": [ "nrNCellPlmn", "nrNCellGId" ], - "minItems": 1, "type": "array", "x-etsi-mec-cardinality": "1..P", "x-etsi-mec-origin-type": "Structure (inlined)" }, "nrNCellRsrp": { "description": "Reference Signal Received Power measurement according to mapping table in ETSI TS 138.133 [i.14].", + "format": "int32", "type": "integer", "x-etsi-mec-cardinality": "0..1", "x-etsi-mec-origin-type": "Uint8" }, "nrNCellRsrq": { "description": "Reference Signal Received Quality measurement according to mapping table in ETSI TS 138.133 [i.14].", + "format": "int32", "type": "integer", "x-etsi-mec-cardinality": "0..1", "x-etsi-mec-origin-type": "Uint8" }, "nrNCellRssi": { "description": "Reference signal SINR measurement according to mapping table in ETSI TS 138.133 [i.14].", + "format": "int32", "type": "integer", "x-etsi-mec-cardinality": "0..1", "x-etsi-mec-origin-type": "Uint8" }, "rsIndexResults": { - "allOf": [ - { - "$ref": "#/components/schemas/RsIndexResults" - } - ], - "description": "Beam level measurements results of a NR cell.", - "x-etsi-mec-cardinality": "0..1", - "x-etsi-mec-origin-type": "RsIndexResults" + "$ref": "#/components/schemas/RsIndexResults" } } }, + "minItems": 0, "required": [ "nrNCellInfo" ], - "minItems": 0, "type": "array", "x-etsi-mec-cardinality": "0..N", "x-etsi-mec-origin-type": "Structure (inlined)" @@ -3125,53 +2961,44 @@ }, "rsrp": { "description": "Reference Signal Received Power as defined in ETSI TS 136 214 [i.5].", + "format": "int32", "type": "integer", "x-etsi-mec-cardinality": "1", "x-etsi-mec-origin-type": "Uint8" }, "rsrpEx": { "description": "Extended Reference Signal Received Power, with value mapping defined in ETSI TS 136 133 [i.16].", + "format": "int32", "type": "integer", "x-etsi-mec-cardinality": "0..1", "x-etsi-mec-origin-type": "Uint8" }, "rsrq": { "description": "Reference Signal Received Quality as defined in ETSI TS 136 214 [i.5].", + "format": "int32", "type": "integer", "x-etsi-mec-cardinality": "1", "x-etsi-mec-origin-type": "Uint8" }, "rsrqEx": { "description": "Extended Reference Signal Received Quality, with value mapping defined in ETSI TS 136 133 [i.16].", + "format": "int32", "type": "integer", "x-etsi-mec-cardinality": "0..1", "x-etsi-mec-origin-type": "Uint8" }, "sinr": { "description": "Reference Signal \"Signal to Interference plus Noise Ratio\", with value mapping defined in ETSI TS 136 133 [i.16].", + "format": "int32", "type": "integer", "x-etsi-mec-cardinality": "0..1", "x-etsi-mec-origin-type": "Uint8" }, "timeStamp": { - "allOf": [ - { - "$ref": "#/components/schemas/TimeStamp" - } - ], - "description": "Time stamp.", - "x-etsi-mec-cardinality": "0..1", - "x-etsi-mec-origin-type": "TimeStamp" + "$ref": "#/components/schemas/TimeStamp" }, "trigger": { - "allOf": [ - { - "$ref": "#/components/schemas/Trigger" - } - ], - "description": "Corresponds to a specific E-UTRAN UE Measurement Report trigger.", - "x-etsi-mec-cardinality": "1", - "x-etsi-mec-origin-type": "Trigger" + "$ref": "#/components/schemas/Trigger" } }, "required": [ @@ -3190,14 +3017,7 @@ "description": "Hyperlink related to the resource. This shall be only included in the HTTP responses and in HTTP PUT requests.", "properties": { "self": { - "allOf": [ - { - "$ref": "#/components/schemas/LinkType" - } - ], - "description": "Self referring URI. The URI shall be unique within the RNI 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": [ @@ -3215,14 +3035,7 @@ "x-etsi-mec-origin-type": "URI" }, "expiryDeadline": { - "allOf": [ - { - "$ref": "#/components/schemas/TimeStamp" - } - ], - "description": "Time stamp.", - "x-etsi-mec-cardinality": "0..1", - "x-etsi-mec-origin-type": "TimeStamp" + "$ref": "#/components/schemas/TimeStamp" }, "filterCriteriaAssocTri": { "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.", @@ -3296,14 +3109,7 @@ "x-etsi-mec-origin-type": "AssociateId" }, "ecgi": { - "allOf": [ - { - "$ref": "#/components/schemas/Ecgi" - } - ], - "description": "E-UTRAN Cell Global Identifier.", - "x-etsi-mec-cardinality": "1", - "x-etsi-mec-origin-type": "Ecgi" + "$ref": "#/components/schemas/Ecgi" }, "notificationType": { "description": "Shall be set to \"MeasTaNotification\".", @@ -3312,19 +3118,12 @@ "x-etsi-mec-origin-type": "String" }, "timeStamp": { - "allOf": [ - { - "$ref": "#/components/schemas/TimeStamp" - } - ], - "description": "Time stamp.", - "x-etsi-mec-cardinality": "0..1", - "x-etsi-mec-origin-type": "TimeStamp" + "$ref": "#/components/schemas/TimeStamp" }, "timingAdvance": { - "type": "integer", - "format": "uint32", "description": "The timing advance as defined in ETSI TS 136 214 [i.5].", + "format": "int32", + "type": "integer", "x-etsi-mec-cardinality": "1", "x-etsi-mec-origin-type": "Uint32" } @@ -3343,14 +3142,7 @@ "description": "Hyperlink related to the resource. This shall be only included in the HTTP responses and in HTTP PUT requests.", "properties": { "self": { - "allOf": [ - { - "$ref": "#/components/schemas/LinkType" - } - ], - "description": "Self referring URI. The URI shall be unique within the RNI 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": [ @@ -3368,14 +3160,7 @@ "x-etsi-mec-origin-type": "URI" }, "expiryDeadline": { - "allOf": [ - { - "$ref": "#/components/schemas/TimeStamp" - } - ], - "description": "Time stamp.", - "x-etsi-mec-cardinality": "0..1", - "x-etsi-mec-origin-type": "TimeStamp" + "$ref": "#/components/schemas/TimeStamp" }, "filterCriteriaAssoc": { "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.", @@ -3429,24 +3214,10 @@ "NRcgi": { "properties": { "nrcellId": { - "allOf": [ - { - "$ref": "#/components/schemas/NrCellId" - } - ], - "description": "NR Cell Global Identifier.", - "x-etsi-mec-cardinality": "1", - "x-etsi-mec-origin-type": "NrCellId" + "$ref": "#/components/schemas/NrCellId" }, "plmn": { - "allOf": [ - { - "$ref": "#/components/schemas/Plmn" - } - ], - "description": "Public Land Mobile Network Identity.", - "x-etsi-mec-cardinality": "1", - "x-etsi-mec-origin-type": "Plmn" + "$ref": "#/components/schemas/Plmn" } }, "required": [ @@ -3478,39 +3249,35 @@ "type": "object", "properties": { "ecgi": { - "allOf": [ - { - "$ref": "#/components/schemas/Ecgi" - } - ], - "description": "Cell Global Identifier.", - "x-etsi-mec-cardinality": "1", - "x-etsi-mec-origin-type": "Ecgi" + "$ref": "#/components/schemas/Ecgi" }, "rsrp": { "description": "Reference Signal Received Power as defined in ETSI TS 138 331 [i.13].", + "format": "int32", "type": "integer", "x-etsi-mec-cardinality": "0..1", "x-etsi-mec-origin-type": "Uint8" }, "rsrq": { "description": "Reference Signal Received Quality as defined in ETSI TS 138 331 [i.13].", + "format": "int32", "type": "integer", "x-etsi-mec-cardinality": "0..1", "x-etsi-mec-origin-type": "Uint8" }, "sinr": { "description": "Reference Signal plus Interference Noise Ratio as defined in ETSI TS 138 331 [i.13].", + "format": "int32", "type": "integer", "x-etsi-mec-cardinality": "0..1", "x-etsi-mec-origin-type": "Uint8" } } }, + "minItems": 0, "required": [ "ecgi" ], - "minItems": 0, "type": "array", "x-etsi-mec-cardinality": "0..N", "x-etsi-mec-origin-type": "Structure (inlined)" @@ -3527,51 +3294,23 @@ "type": "object", "properties": { "measQuantityResultsCsiRsCell": { - "allOf": [ - { - "$ref": "#/components/schemas/MeasQuantityResultsNr" - } - ], - "description": "Measurement quantity results relating to the Channel State Information Reference Signal of the neighbouring cells.", - "x-etsi-mec-cardinality": "0..1", - "x-etsi-mec-origin-type": "MeasQuantityResultsNr" + "$ref": "#/components/schemas/MeasQuantityResultsNr" }, "measQuantityResultsSsbCell": { - "allOf": [ - { - "$ref": "#/components/schemas/MeasQuantityResultsNr" - } - ], - "description": "Measurement quantity results relating to the Synchronization Signal Block of the neighbouring cells.", - "x-etsi-mec-cardinality": "0..1", - "x-etsi-mec-origin-type": "MeasQuantityResultsNr" + "$ref": "#/components/schemas/MeasQuantityResultsNr" }, "nrcgi": { - "allOf": [ - { - "$ref": "#/components/schemas/NrCellId" - } - ], - "description": "Cell Global Identifier.", - "x-etsi-mec-cardinality": "1", - "x-etsi-mec-origin-type": "NrCellId" + "$ref": "#/components/schemas/NrCellId" }, "rsIndexResults": { - "allOf": [ - { - "$ref": "#/components/schemas/RsIndexResults" - } - ], - "description": "Beam level measurement information.", - "x-etsi-mec-cardinality": "0..1", - "x-etsi-mec-origin-type": "RsIndexResults" + "$ref": "#/components/schemas/RsIndexResults" } } }, + "minItems": 0, "required": [ "nrcgi" ], - "minItems": 0, "type": "array", "x-etsi-mec-cardinality": "0..N", "x-etsi-mec-origin-type": "Structure (inlined)" @@ -3585,34 +3324,13 @@ "description": "Measurement information relating to the best neighbour of this serving cell.", "properties": { "measQuantityResultsCsiRsCell": { - "allOf": [ - { - "$ref": "#/components/schemas/MeasQuantityResultsNr" - } - ], - "description": "Measurement quantity results relating to the Channel State Information Reference Signal.", - "x-etsi-mec-cardinality": "0..1", - "x-etsi-mec-origin-type": "MeasQuantityResultsNr" + "$ref": "#/components/schemas/MeasQuantityResultsNr" }, "measQuantityResultsSsbCell": { - "allOf": [ - { - "$ref": "#/components/schemas/MeasQuantityResultsNr" - } - ], - "description": "Measurement quantity results relating to the Synchronization Signal Block.", - "x-etsi-mec-cardinality": "0..1", - "x-etsi-mec-origin-type": "MeasQuantityResultsNr" + "$ref": "#/components/schemas/MeasQuantityResultsNr" }, "rsIndexResults": { - "allOf": [ - { - "$ref": "#/components/schemas/RsIndexResults" - } - ], - "description": "Beam level measurement information", - "x-etsi-mec-cardinality": "0..1", - "x-etsi-mec-origin-type": "RsIndexResults" + "$ref": "#/components/schemas/RsIndexResults" } }, "type": "object", @@ -3620,47 +3338,19 @@ "x-etsi-mec-origin-type": "Structure (inlined)" }, "nrcgi": { - "allOf": [ - { - "$ref": "#/components/schemas/NRcgi" - } - ], - "description": "NR Cell Global Identifier.", - "x-etsi-mec-cardinality": "1", - "x-etsi-mec-origin-type": "Nrcgi" + "$ref": "#/components/schemas/NRcgi" }, "sCell": { "description": "Measurement information relating to this serving cell.", "properties": { "measQuantityResultsCsiRsCell": { - "allOf": [ - { - "$ref": "#/components/schemas/MeasQuantityResultsNr" - } - ], - "description": "Measurement quantity results relating to the Channel State Information Reference Signal.", - "x-etsi-mec-cardinality": "0..1", - "x-etsi-mec-origin-type": "MeasQuantityResultsNr" + "$ref": "#/components/schemas/MeasQuantityResultsNr" }, "measQuantityResultsSsbCell": { - "allOf": [ - { - "$ref": "#/components/schemas/MeasQuantityResultsNr" - } - ], - "description": "Measurement quantity results relating to the Synchronization Signal Block.", - "x-etsi-mec-cardinality": "0..1", - "x-etsi-mec-origin-type": "MeasQuantityResultsNr" + "$ref": "#/components/schemas/MeasQuantityResultsNr" }, "rsIndexResults": { - "allOf": [ - { - "$ref": "#/components/schemas/RsIndexResults" - } - ], - "description": "Beam level measurement information", - "x-etsi-mec-cardinality": "0..1", - "x-etsi-mec-origin-type": "RsIndexResults" + "$ref": "#/components/schemas/RsIndexResults" } }, "type": "object", @@ -3669,34 +3359,20 @@ } } }, + "minItems": 0, "required": [ "nrcgi", "sCell" ], - "minItems": 0, "type": "array", "x-etsi-mec-cardinality": "0..N", "x-etsi-mec-origin-type": "Structure (inlined)" }, "timeStamp": { - "allOf": [ - { - "$ref": "#/components/schemas/TimeStamp" - } - ], - "description": "Time stamp.", - "x-etsi-mec-cardinality": "0..1", - "x-etsi-mec-origin-type": "TimeStamp" + "$ref": "#/components/schemas/TimeStamp" }, "triggerNr": { - "allOf": [ - { - "$ref": "#/components/schemas/TriggerNr" - } - ], - "description": "Corresponds to a specific 5G UE Measurement Report trigger.", - "x-etsi-mec-cardinality": "1", - "x-etsi-mec-origin-type": "TriggerNr" + "$ref": "#/components/schemas/TriggerNr" } }, "required": [ @@ -3712,14 +3388,7 @@ "description": "Hyperlink related to the resource. This shall be only included in the HTTP responses and in HTTP PUT requests.", "properties": { "self": { - "allOf": [ - { - "$ref": "#/components/schemas/LinkType" - } - ], - "description": "Self-referring URI. The URI shall be unique within the RNI 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": [ @@ -3737,14 +3406,7 @@ "x-etsi-mec-origin-type": "URI" }, "expiryDeadline": { - "allOf": [ - { - "$ref": "#/components/schemas/TimeStamp" - } - ], - "description": "Time stamp.", - "x-etsi-mec-cardinality": "0..1", - "x-etsi-mec-origin-type": "TimeStamp" + "$ref": "#/components/schemas/TimeStamp" }, "filterCriteriaNrMrs": { "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.", @@ -3846,14 +3508,7 @@ "x-etsi-mec-origin-type": "Plmn" }, "timeStamp": { - "allOf": [ - { - "$ref": "#/components/schemas/TimeStamp" - } - ], - "description": "Time stamp.", - "x-etsi-mec-cardinality": "0..1", - "x-etsi-mec-origin-type": "TimeStamp" + "$ref": "#/components/schemas/TimeStamp" } }, "required": [ @@ -3880,7 +3535,7 @@ }, "status": { "description": "The HTTP status code for this occurrence of the problem", - "format": "uint32", + "format": "int32", "type": "integer", "x-etsi-mec-cardinality": "0..1", "x-etsi-mec-origin-type": "Uint32" @@ -3914,14 +3569,7 @@ "x-etsi-mec-origin-type": "AssociateId" }, "ecgi": { - "allOf": [ - { - "$ref": "#/components/schemas/Ecgi" - } - ], - "description": "E-UTRAN Cell Global Identifier.", - "x-etsi-mec-cardinality": "1", - "x-etsi-mec-origin-type": "Ecgi" + "$ref": "#/components/schemas/Ecgi" }, "erabId": { "description": "The attribute that uniquely identifies a Radio Access bearer for specific UE as defined in ETSI TS 136 413 [i.3].", @@ -3939,7 +3587,7 @@ "x-etsi-mec-origin-type": "Integer" }, "qosInformation": { - "description": "The RabEstNotification QoS information for the E-RAB.", + "description": "The QoS information for the E-RAB.", "properties": { "erabGbrDl": { "description": "This attribute indicates the guaranteed downlink E-RAB Bit Rate as defined in ETSI TS 123 401 [i.4] for this bearer.", @@ -4015,14 +3663,7 @@ "x-etsi-mec-origin-type": "Structure (inlined)" }, "timeStamp": { - "allOf": [ - { - "$ref": "#/components/schemas/TimeStamp" - } - ], - "description": "Time stamp.", - "x-etsi-mec-cardinality": "0..1", - "x-etsi-mec-origin-type": "TimeStamp" + "$ref": "#/components/schemas/TimeStamp" } }, "required": [ @@ -4039,14 +3680,7 @@ "description": "Hyperlink related to the resource. This shall be only included in the HTTP responses and in HTTP PUT requests.", "properties": { "self": { - "allOf": [ - { - "$ref": "#/components/schemas/LinkType" - } - ], - "description": "Self referring URI. The URI shall be unique within the RNI 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": [ @@ -4064,14 +3698,7 @@ "x-etsi-mec-origin-type": "URI" }, "expiryDeadline": { - "allOf": [ - { - "$ref": "#/components/schemas/TimeStamp" - } - ], - "description": "Time stamp.", - "x-etsi-mec-cardinality": "0..1", - "x-etsi-mec-origin-type": "TimeStamp" + "$ref": "#/components/schemas/TimeStamp" }, "filterCriteriaQci": { "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.", @@ -4135,14 +3762,7 @@ "type": "object", "properties": { "ecgi": { - "allOf": [ - { - "$ref": "#/components/schemas/Ecgi" - } - ], - "description": "E-UTRAN Cell Global Identifier.", - "x-etsi-mec-cardinality": "1", - "x-etsi-mec-origin-type": "Ecgi" + "$ref": "#/components/schemas/Ecgi" }, "ueInfo": { "description": "Information on UEs in the specific cell as defined below.", @@ -4171,7 +3791,6 @@ "x-etsi-mec-origin-type": "Integer" }, "erabQosParameters": { - "type": "object", "description": "QoS parameters for the E-RAB as defined below.", "properties": { "qci": { @@ -4181,7 +3800,7 @@ "x-etsi-mec-origin-type": "Integer" }, "qosInformation": { - "description": "The RabInfo QoS information for the E-RAB.", + "description": "The QoS information for the E-RAB.", "properties": { "erabGbrDl": { "description": "This attribute indicates the guaranteed downlink E-RAB Bit Rate as defined in ETSI TS 123 401 [i.4] for this bearer.", @@ -4222,15 +3841,16 @@ "required": [ "qci" ], + "type": "object", "x-etsi-mec-cardinality": "0..1", "x-etsi-mec-origin-type": "Structure (inlined)" } } }, + "minItems": 1, "required": [ "erabId" ], - "minItems": 1, "type": "array", "x-etsi-mec-cardinality": "1..N", "x-etsi-mec-origin-type": "Structure (inlined)" @@ -4263,14 +3883,7 @@ "x-etsi-mec-origin-type": "String" }, "timeStamp": { - "allOf": [ - { - "$ref": "#/components/schemas/TimeStamp" - } - ], - "description": "Time stamp.", - "x-etsi-mec-cardinality": "0..1", - "x-etsi-mec-origin-type": "TimeStamp" + "$ref": "#/components/schemas/TimeStamp" } }, "required": [ @@ -4293,14 +3906,7 @@ "x-etsi-mec-origin-type": "AssociateId" }, "ecgi": { - "allOf": [ - { - "$ref": "#/components/schemas/Ecgi" - } - ], - "description": "E-UTRAN Cell Global Identifier.", - "x-etsi-mec-cardinality": "1", - "x-etsi-mec-origin-type": "Ecgi" + "$ref": "#/components/schemas/Ecgi" }, "erabId": { "description": "The attribute that uniquely identifies a Radio Access bearer for specific UE as defined in ETSI TS 136 413 [i.3].", @@ -4370,14 +3976,7 @@ "x-etsi-mec-origin-type": "String" }, "timeStamp": { - "allOf": [ - { - "$ref": "#/components/schemas/TimeStamp" - } - ], - "description": "Time stamp.", - "x-etsi-mec-cardinality": "0..1", - "x-etsi-mec-origin-type": "TimeStamp" + "$ref": "#/components/schemas/TimeStamp" } }, "required": [ @@ -4394,14 +3993,7 @@ "description": "Hyperlink related to the resource. This shall be only included in the HTTP responses and in HTTP PUT requests.", "properties": { "self": { - "allOf": [ - { - "$ref": "#/components/schemas/LinkType" - } - ], - "description": "Self referring URI. The URI shall be unique within the RNI 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": [ @@ -4419,14 +4011,7 @@ "x-etsi-mec-origin-type": "URI" }, "expiryDeadline": { - "allOf": [ - { - "$ref": "#/components/schemas/TimeStamp" - } - ], - "description": "Time stamp.", - "x-etsi-mec-cardinality": "0..1", - "x-etsi-mec-origin-type": "TimeStamp" + "$ref": "#/components/schemas/TimeStamp" }, "filterCriteriaQci": { "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.", @@ -4496,14 +4081,7 @@ "x-etsi-mec-origin-type": "AssociateId" }, "ecgi": { - "allOf": [ - { - "$ref": "#/components/schemas/Ecgi" - } - ], - "description": "E-UTRAN Cell Global Identifier.", - "x-etsi-mec-cardinality": "1", - "x-etsi-mec-origin-type": "Ecgi" + "$ref": "#/components/schemas/Ecgi" }, "erabReleaseInfo": { "description": "The release information for the E-RAB as defined below.", @@ -4529,14 +4107,7 @@ "x-etsi-mec-origin-type": "String" }, "timeStamp": { - "allOf": [ - { - "$ref": "#/components/schemas/TimeStamp" - } - ], - "description": "Time stamp.", - "x-etsi-mec-cardinality": "0..1", - "x-etsi-mec-origin-type": "TimeStamp" + "$ref": "#/components/schemas/TimeStamp" } }, "required": [ @@ -4553,14 +4124,7 @@ "description": "Hyperlink related to the resource. This shall be only included in the HTTP responses and in HTTP PUT requests.", "properties": { "self": { - "allOf": [ - { - "$ref": "#/components/schemas/LinkType" - } - ], - "description": "Self referring URI. The URI shall be unique within the RNI 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": [ @@ -4578,14 +4142,7 @@ "x-etsi-mec-origin-type": "URI" }, "expiryDeadline": { - "allOf": [ - { - "$ref": "#/components/schemas/TimeStamp" - } - ], - "description": "Time stamp.", - "x-etsi-mec-cardinality": "0..1", - "x-etsi-mec-origin-type": "TimeStamp" + "$ref": "#/components/schemas/TimeStamp" }, "filterCriteriaQci": { "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.", @@ -4652,14 +4209,7 @@ "x-etsi-mec-origin-type": "Uint8" }, "csiRsResults": { - "allOf": [ - { - "$ref": "#/components/schemas/MeasQuantityResultsNr" - } - ], - "description": "", - "x-etsi-mec-cardinality": "0..1", - "x-etsi-mec-origin-type": "MeasQuantityResultsNr" + "$ref": "#/components/schemas/MeasQuantityResultsNr" } }, "required": [ @@ -4672,9 +4222,24 @@ "resultsPerCsiRsIndex": { "description": "", "items": { - "$ref": "#/components/schemas/ResultsPerCsiRsIndex" + "type": "object", + "properties": { + "csiRsIndex": { + "description": "", + "format": "int32", + "type": "integer", + "x-etsi-mec-cardinality": "1", + "x-etsi-mec-origin-type": "Uint8" + }, + "csiRsResults": { + "$ref": "#/components/schemas/MeasQuantityResultsNr" + } + } }, "minItems": 0, + "required": [ + "csiRsIndex" + ], "type": "array", "x-etsi-mec-cardinality": "0..P", "x-etsi-mec-origin-type": "Structure (inline)" @@ -4693,14 +4258,7 @@ "x-etsi-mec-origin-type": "Uint8" }, "ssbResults": { - "allOf": [ - { - "$ref": "#/components/schemas/MeasQuantityResultsNr" - } - ], - "description": "", - "x-etsi-mec-cardinality": "0..1", - "x-etsi-mec-origin-type": "MeasQuantityResultsNr" + "$ref": "#/components/schemas/MeasQuantityResultsNr" } }, "required": [ @@ -4713,9 +4271,24 @@ "resultsPerSsbIndex": { "description": "", "items": { - "$ref": "#/components/schemas/ResultsPerSsbIndex" + "type": "object", + "properties": { + "ssbIndex": { + "description": "", + "format": "int32", + "type": "integer", + "x-etsi-mec-cardinality": "1", + "x-etsi-mec-origin-type": "Uint8" + }, + "ssbResults": { + "$ref": "#/components/schemas/MeasQuantityResultsNr" + } + } }, "minItems": 0, + "required": [ + "ssbIndex" + ], "type": "array", "x-etsi-mec-cardinality": "0..P", "x-etsi-mec-origin-type": "Structure (inline)" @@ -4727,24 +4300,10 @@ "RsIndexResults": { "properties": { "resultsCsiRsIndexes": { - "allOf": [ - { - "$ref": "#/components/schemas/ResultsPerCsiRsIndexList" - } - ], - "description": "Beam level measurement results based on CSI-RS related measurements.", - "x-etsi-mec-cardinality": "1", - "x-etsi-mec-origin-type": "ResultsPerCsiRsIndexList" + "$ref": "#/components/schemas/ResultsPerCsiRsIndexList" }, "resultsSsbIndexes": { - "allOf": [ - { - "$ref": "#/components/schemas/ResultsPerSsbIndexList" - } - ], - "description": "Beam level measurement results based on SS/PBCH related measurements.", - "x-etsi-mec-cardinality": "1", - "x-etsi-mec-origin-type": "ResultsPerSsbIndexList" + "$ref": "#/components/schemas/ResultsPerSsbIndexList" } }, "required": [ @@ -4841,12 +4400,12 @@ } } }, + "minItems": 1, "required": [ "erabId", "enbInfo", "sGwInfo" ], - "minItems": 1, "type": "array", "x-etsi-mec-cardinality": "1..N", "x-etsi-mec-origin-type": "Structure (inlined)" @@ -4889,14 +4448,7 @@ "x-etsi-mec-origin-type": "Structure (inlined)" }, "timeStamp": { - "allOf": [ - { - "$ref": "#/components/schemas/TimeStamp" - } - ], - "description": "Time stamp. ", - "x-etsi-mec-cardinality": "0..1", - "x-etsi-mec-origin-type": "TimeStamp" + "$ref": "#/components/schemas/TimeStamp" } }, "required": [ @@ -4915,10 +4467,7 @@ }, "s1Event": { "description": "The subscribed event that triggered this notification in S1BearerSubscription.", - "enum": [ - "SEE_DESCRIPTION" - ], - "type": "string", + "type": "integer", "x-etsi-mec-cardinality": "1", "x-etsi-mec-origin-type": "Enum" }, @@ -4950,7 +4499,6 @@ "description": "S1 bearer information as defined below.", "items": { "type": "object", - "minItems": 1, "properties": { "enbInfo": { "description": "S1 bearer information on eNB side as defined below.", @@ -5008,6 +4556,7 @@ } } }, + "minItems": 1, "required": [ "erabId", "enbInfo", @@ -5053,14 +4602,7 @@ "x-etsi-mec-origin-type": "Structure (inlined)" }, "timeStamp": { - "allOf": [ - { - "$ref": "#/components/schemas/TimeStamp" - } - ], - "description": "Time stamp.", - "x-etsi-mec-cardinality": "0..1", - "x-etsi-mec-origin-type": "TimeStamp" + "$ref": "#/components/schemas/TimeStamp" } }, "required": [ @@ -5115,14 +4657,7 @@ "description": "Hyperlink related to the resource. This shall be only included in the HTTP responses and in HTTP PUT requests.", "properties": { "self": { - "allOf": [ - { - "$ref": "#/components/schemas/LinkType" - } - ], - "description": "Self referring URI. The URI shall be unique within the RNI 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": [ @@ -5140,7 +4675,7 @@ "x-etsi-mec-origin-type": "URI" }, "eventType": { - "description": "Description of the subscribed event. The event is included both in the request and in the response. \\nFor the eventType, the following values are currently defined: 0 = RESERVED. 1 = S1_BEARER_ESTABLISH. 2 = S1_BEARER_MODIFY. 3 = S1_BEARER_RELEASE.", + "description": "Description of the subscribed event. The event is included both in the request and in the response. \\nFor the eventType, the following values are currently defined:
0 = RESERVED.
1 = S1_BEARER_ESTABLISH.
2 = S1_BEARER_MODIFY.
3 = S1_BEARER_RELEASE.", "items": { "$ref": "#/components/schemas/Enum" }, @@ -5150,14 +4685,7 @@ "x-etsi-mec-origin-type": "Enum" }, "expiryDeadline": { - "allOf": [ - { - "$ref": "#/components/schemas/TimeStamp" - } - ], - "description": "Time stamp.", - "x-etsi-mec-cardinality": "0..1", - "x-etsi-mec-origin-type": "TimeStamp" + "$ref": "#/components/schemas/TimeStamp" }, "subscriptionType": { "description": "Shall be set to \"S1BearerSubscription\".", @@ -5181,14 +4709,7 @@ "description": "List of hyperlinks related to the resource.", "properties": { "self": { - "allOf": [ - { - "$ref": "#/components/schemas/LinkType" - } - ], - "description": "", - "x-etsi-mec-cardinality": "1", - "x-etsi-mec-origin-type": "LinkType" + "$ref": "#/components/schemas/LinkType" }, "subscription": { "description": "A link to a subscription.", @@ -5210,11 +4731,11 @@ } } }, + "minItems": 0, "required": [ "href", "subscriptionType" ], - "minItems": 0, "type": "array", "x-etsi-mec-cardinality": "0..N", "x-etsi-mec-origin-type": "Structure (inlined)" @@ -5237,16 +4758,16 @@ "TimeStamp": { "properties": { "nanoSeconds": { - "type": "integer", - "format": "uint32", "description": "The nanoseconds part of the time. Time is defined as Unix-time since January 1, 1970, 00:00:00 UTC.", + "format": "int32", + "type": "integer", "x-etsi-mec-cardinality": "1", "x-etsi-mec-origin-type": "Uint32" }, "seconds": { - "type": "integer", - "format": "uint32", "description": "The seconds part of the time. Time is defined as Unixtime since January 1, 1970, 00:00:00 UTC.", + "format": "int32", + "type": "integer", "x-etsi-mec-cardinality": "1", "x-etsi-mec-origin-type": "Uint32" } @@ -5259,54 +4780,52 @@ "x-etsi-ref": "6.5.3" }, "Trigger": { - "description": "As defined in Ref ETSI TS 136 331 [i.7]", + "description": "As defined in Ref ETSI TS 136 331 [i.7]
0 = NOT_AVAILABLE
1 = PERIODICAL_REPORT_STRONGEST_CELLS
2 = PERIODICAL_REPORT_STRONGEST_CELLS_FOR_SON
3 = PERIODICAL_REPORT_CGI
4 = INTRA_PERIODICAL_REPORT_STRONGEST_CELLS
5 = INTRA_PERIODICAL_REPORT_CGI
10 = EVENT_A1
11 = EVENT_A2
12 = EVENT_A3
13 = EVENT_A4
14 = EVENT_A5
15 = EVENT_A6
20 = EVENT_B1
21 = EVENT_B2
20 = EVENT_B1-NR
21 = EVENT_B2-NR
30 = EVENT_C1
31 = EVENT_C2
40 = EVENT_W1
41 = EVENT_W2
42 = EVENT_W3
50 = EVENT_V1
51 = EVENT_V2
60 = EVENT_H1
61 = EVENT_H2", "enum": [ - "0 = NOT_AVAILABLE", - "1 = PERIODICAL_REPORT_STRONGEST_CELLS", - "2 = PERIODICAL_REPORT_STRONGEST_CELLS_FOR_SON", - "3 = PERIODICAL_REPORT_CGI", - "4 = INTRA_PERIODICAL_REPORT_STRONGEST_CELLS", - "5 = INTRA_PERIODICAL_REPORT_CGI", - "10 = EVENT_A1", - "11 = EVENT_A2", - "12 = EVENT_A3", - "13 = EVENT_A4", - "14 = EVENT_A5", - "15 = EVENT_A6", - "20 = EVENT_B1", - "21 = EVENT_B2", - "20 = EVENT_B1-NR", - "21 = EVENT_B2-NR", - "30 = EVENT_C1", - "31 = EVENT_C2", - "40 = EVENT_W1", - "41 = EVENT_W2", - "42 = EVENT_W3", - "50 = EVENT_V1", - "51 = EVENT_V2", - "60 = EVENT_H1", - "61 = EVENT_H2" + 0, + 1, + 2, + 3, + 4, + 5, + 10, + 11, + 12, + 13, + 14, + 15, + 20, + 21, + 30, + 31, + 40, + 41, + 42, + 50, + 51, + 60, + 61 ], - "type": "string" + "type": "integer" }, "TriggerNr": { - "description": "The enumeration Trigger represents specified triggers for a 5G UE Measurement Report. Full details can be found in ETSI TS 138 331 [i.13]).", + "description": "The enumeration Trigger represents specified triggers for a 5G UE Measurement Report. Full details can be found in ETSI TS 138 331 [i.13]).
0 = NOT_AVAILABLE
1 = NR_PERIODICAL
2 = NR_CGI
10 = EVENT_A1
11 = EVENT_A2
12 = EVENT_A3
13 = EVENT_A4
14 = EVENT_A5
15 = EVENT_A6
20 = INTER_RAT_PERIODICAL
21 = INTER_RAT_CGI
30 = EVENT_B1
31 = EVENT_B2", "enum": [ - "0 = NOT_AVAILABLE", - "1 = NR_PERIODICAL", - "2 = NR_CGI", - "10 = EVENT_A1", - "11 = EVENT_A2", - "12 = EVENT_A3", - "13 = EVENT_A4", - "14 = EVENT_A5", - "15 = EVENT_A6", - "20 = INTER_RAT_PERIODICAL", - "21 = INTER_RAT_CGI", - "30 = EVENT_B1", - "31 = EVENT_B2" + 0, + 1, + 2, + 10, + 11, + 12, + 13, + 14, + 15, + 20, + 21, + 30, + 31 ], - "type": "string" + "type": "integer" } } } diff --git a/RniAPI.yaml b/RniAPI.yaml index 42d7ca7336504c15ee9b7bc9a04fe42c3e9dd786..57b3e9947679185fcf73354477ccc4cf06a1de95 100644 --- a/RniAPI.yaml +++ b/RniAPI.yaml @@ -10,12 +10,14 @@ externalDocs: description: ETSI GS MEC 012 Radio Network Information API, V2.1.1 url: 'http://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.01.01_60/gs_mec012v020101p.pdf' servers: - - url: 'https://{apiRoot}/rni/v2' + - url: 'https://localhost/rni/v2' +tags: +- name: 'rni' paths: /queries/rab_info: get: tags: - - '' + - 'rni' summary: 'Retrieve information on Radio Access Bearers' description: 'Queries information about the Radio Access Bearers' operationId: rab_infoGET @@ -58,7 +60,7 @@ paths: /queries/plmn_info: get: tags: - - '' + - 'rni' summary: 'Retrieve information on the underlying Mobile Network that the MEC application is associated to' description: 'Queries information about the Mobile Network' operationId: plmn_infoGET @@ -92,7 +94,7 @@ paths: /queries/s1_bearer_info: get: tags: - - '' + - 'rni' summary: 'Retrieve S1-U bearer information related to specific UE(s)' description: 'Queries information about the S1 bearer(s)' operationId: s1_bearer_infoGET @@ -132,7 +134,7 @@ paths: /queries/layer2_meas: get: tags: - - '' + - 'rni' summary: 'Retrieve information on layer 2 measurements' description: 'Queries information about the layer 2 measurements.' operationId: layer2_meas_infoGET @@ -203,10 +205,10 @@ paths: '429': $ref: '#/components/responses/429' x-swagger-router-controller: "queries" - /subscriptions/: + /subscriptions: get: tags: - - '' + - 'rni' summary: 'Retrieve information on subscriptions for notifications' description: 'Queries information on subscriptions for notifications' operationId: subscriptionLinkList_subscriptionsGET @@ -250,7 +252,7 @@ paths: x-swagger-router-controller: "subscriptions" post: tags: - - '' + - 'rni' summary: 'Create a new subscription' description: 'Creates a new subscription to Radio Network Information notifications' operationId: subscriptionsPOST @@ -282,7 +284,7 @@ paths: filterCriteriaAssocHo: appInstanceId: 'myApp' associateId: - - type: '1' + - type: 1 value: '10.100.0.1' ecgi: - plmn: @@ -290,8 +292,8 @@ paths: mcc: '001' cellId: 'ACBDEFA' hoStatus: - - '1' - - '2' + - 1 + - 2 expiryDeadline: seconds: 1977836800 nanoseconds: 0 @@ -326,7 +328,7 @@ paths: filterCriteriaAssocHo: appInstanceId: 'myApp' associateId: - - type: '1' + - type: 1 value: '10.100.0.1' ecgi: - plmn: @@ -334,8 +336,8 @@ paths: mcc: '001' cellId: 'ACBDEFA' hoStatus: - - '1' - - '2' + - 1 + - 2 expiryDeadline: seconds: 1977836800 nanoseconds: 0 @@ -387,9 +389,9 @@ paths: notification: notificationType: CellChangeNotification associateId: - - type: '1' + - type: 1 value: '10.100.0.1' - hoStatus: '1' + hoStatus: 1 srcEcgi: plmn: mnc: '01' @@ -413,7 +415,7 @@ paths: '/subscriptions/{subscriptionId}': get: tags: - - '' + - 'rni' summary: 'Retrieve information on current specific subscription' description: 'Queries information about an existing subscription, identified by its self-referring URI returned on creation (initial POST)' operationId: subscriptionsGET @@ -452,7 +454,7 @@ paths: filterCriteriaAssocHo: appInstanceId: 'myApp' associateId: - - type: '1' + - type: 1 value: '10.100.0.1' ecgi: - plmn: @@ -460,8 +462,8 @@ paths: mcc: '001' cellId: 'ACBDEFA' hoStatus: - - '1' - - '2' + - 1 + - 2 expiryDeadline: seconds: 1977836800 nanoseconds: 0 @@ -480,7 +482,7 @@ paths: x-swagger-router-controller: "subscriptions" put: tags: - - '' + - 'rni' summary: 'Modify an existing subscription' description: 'Updates an existing subscription, identified by its self-referring URI returned on creation (initial POST)' operationId: subscriptionsPUT @@ -515,7 +517,7 @@ paths: filterCriteriaAssocHo: appInstanceId: 'myApp' associateId: - - type: '1' + - type: 1 value: '10.100.0.1' ecgi: - plmn: @@ -523,8 +525,8 @@ paths: mcc: '001' cellId: 'ACBDEFA' hoStatus: - - '1' - - '2' + - 1 + - 2 expiryDeadline: seconds: 1977836800 nanoseconds: 0 @@ -561,7 +563,7 @@ paths: filterCriteriaAssocHo: appInstanceId: 'myApp' associateId: - - type: '1' + - type: 1 value: '10.100.0.1' ecgi: - plmn: @@ -569,8 +571,8 @@ paths: mcc: '001' cellId: 'ACBDEFA' hoStatus: - - '1' - - '2' + - 1 + - 2 expiryDeadline: seconds: 1977836800 nanoseconds: 0 @@ -593,7 +595,7 @@ paths: x-swagger-router-controller: "subscriptions" delete: tags: - - '' + - 'rni' summary: 'Cancel an existing subscription' description: 'Cancels an existing subscription, identified by its self-referring URI returned on creation (initial POST)' operationId: subscriptionsDELETE @@ -806,7 +808,7 @@ components: required: false schema: type: integer - format: uint32 + format: int32 x-exportParamName: ErabId x-optionalDataType: Int32 Query.ErabIdArr: @@ -818,7 +820,7 @@ components: type: array items: type: integer - format: uint32 + format: int32 x-exportParamName: ErabIdArr Query.Qci: name: qci @@ -827,7 +829,7 @@ components: required: false schema: type: integer - format: uint32 + format: int32 x-exportParamName: Qci x-optionalDataType: Int32 Query.ErabMbrDl: @@ -837,7 +839,7 @@ components: required: false schema: type: integer - format: uint32 + format: int32 x-exportParamName: ErabMbrDl x-optionalDataType: Int32 Query.ErabMbrUl: @@ -847,7 +849,7 @@ components: required: false schema: type: integer - format: uint32 + format: int32 x-exportParamName: ErabMbrUl x-optionalDataType: Int32 Query.ErabGbrDl: @@ -857,7 +859,7 @@ components: required: false schema: type: integer - format: uint32 + format: int32 x-exportParamName: ErabGbrDl x-optionalDataType: Int32 Query.ErabGbrUl: @@ -867,7 +869,7 @@ components: required: false schema: type: integer - format: uint32 + format: int32 x-exportParamName: ErabGbrUl x-optionalDataType: Int32 Query.TempUeId: @@ -1147,7 +1149,7 @@ components: Query.SubscriptionType: name: subscription_type in: query - description: 'Subscription type filter' + description: 'Filter on a specific subscription type. Permitted values: cell_change, rab_est, rab_mod, rab_rel, meas_rep_ue, nr_meas_rep_ue, timing_advance_ue, ca_reconf, s1_bearer.' required: false schema: type: string @@ -1156,25 +1158,14 @@ components: AssociateId: properties: type: - description: 'Numeric value (0-255) corresponding to specified type of identifier - as following: - - 0 = reserved. - - 1= UE_IPv4_ADDRESS. - - 2 = UE_IPV6_ADDRESS. - - 3 = NATED_IP_ADDRESS. - - 4 = GTP_TEID.' + description: 'Numeric value (0-255) corresponding to specified type of identifier as following:
0 = reserved.
1 = UE_IPv4_ADDRESS.
2 = UE_IPV6_ADDRESS.
3 = NATED_IP_ADDRESS.
4 = GTP_TEID.' enum: - - 0 = reserved - - 1 = UE_IPv4_ADDRESS - - 2 = UE_IPV6_ADDRESS - - 3 = NATED_IP_ADDRESS - - 4 = GTP_TEID - type: string + - 0 + - 1 + - 2 + - 3 + - 4 + type: integer x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Enum value: @@ -1185,8 +1176,7 @@ components: CaReconfNotification: properties: associateId: - description: 0 to N identifiers to associate the event for a specific - UE or flow. + description: 0 to N identifiers to associate the event for a specific UE or flow. items: $ref: '#/components/schemas/AssociateId' minItems: 0 @@ -1194,64 +1184,56 @@ components: x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: AssociateId carrierAggregationMeasInfo: - description: This parameter can be repeated to contain information of - all the carriers assign for Carrier Aggregation up to M. + description: This parameter can be repeated to contain information of all the carriers assign for Carrier Aggregation up to M. items: type: object properties: cellIdNei: - allOf: - - $ref: '#/components/schemas/CellId' - description: E-UTRAN Cell Identity of the best neighbouring cell associated with the Carrier Aggregation serving cell. - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: CellId + # description': E-UTRAN Cell Identity of the best neighbouring cell associated with the Carrier Aggregation serving cell. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': CellId + $ref: '#/components/schemas/CellId' cellIdSrv: - allOf: - - $ref: '#/components/schemas/CellId' - description: E-UTRAN Cell Identity of a Carrier Aggregation serving cell. - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: CellId + # description': E-UTRAN Cell Identity of a Carrier Aggregation serving cell. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': CellId + $ref: '#/components/schemas/CellId' rsrpNei: + description: "Reference Signal Received Power as defined in ETSI TS\_136 214 [i.5]." + format: int32 type: integer - format: uint32 - description: "Reference Signal Received Power as defined in ETSI TS\_\ - 136 214 [i.5]." x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint32 rsrpSrv: + description: "Reference Signal Received Power as defined in ETSI TS\_136 214 [i.5]." + format: int32 type: integer - format: uint32 - description: "Reference Signal Received Power as defined in ETSI TS\_\ - 136 214 [i.5]." x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint32 rsrqNei: + description: Reference Signal Received Quality as defined in ETSI TS 136 214 [i.5]. + format: int32 type: integer - format: uint32 - description: Reference Signal Received Quality as defined in ETSI - TS 136 214 [i.5]. x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint32 rsrqSrv: + description: Reference Signal Received Quality as defined in ETSI TS 136 214 [i.5]. + format: int32 type: integer - format: uint32 - description: Reference Signal Received Quality as defined in ETSI - TS 136 214 [i.5]. x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint32 + minItems: 0 required: - cellIdSrv - cellIdNei - minItems: 0 type: array x-etsi-mec-cardinality: 0..M x-etsi-mec-origin-type: Structure (inlined) ecgi: - allOf: - - $ref: '#/components/schemas/Ecgi' - description: E-UTRAN Cell Global Identifier. - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Ecgi + # description': E-UTRAN Cell Global Identifier. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': Ecgi + $ref: '#/components/schemas/Ecgi' notificationType: description: Shall be set to "CaReConfNotification". type: string @@ -1263,14 +1245,13 @@ components: type: object properties: ecgi: - allOf: - - $ref: '#/components/schemas/Ecgi' - description: E-UTRAN Cell Global Identifier. - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Ecgi + # description': E-UTRAN Cell Global Identifier. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': Ecgi + $ref: '#/components/schemas/Ecgi' + minItems: 0 required: - ecgi - minItems: 0 type: array x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: Structure (inlined) @@ -1280,23 +1261,21 @@ components: type: object properties: ecgi: - allOf: - - $ref: '#/components/schemas/Ecgi' - description: E-UTRAN Cell Global Identifier. - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Ecgi + # description': E-UTRAN Cell Global Identifier. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': Ecgi + $ref: '#/components/schemas/Ecgi' + minItems: 0 required: - ecgi - minItems: 0 type: array x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: Structure (inlined) timeStamp: - allOf: - - $ref: '#/components/schemas/TimeStamp' - description: Time stamp. - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: TimeStamp + # description': Time stamp. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': TimeStamp + $ref: '#/components/schemas/TimeStamp' required: - notificationType - ecgi @@ -1305,38 +1284,31 @@ components: CaReconfSubscription: properties: _links: - description: Hyperlink related to the resource. This shall be only included - in the HTTP responses and in HTTP PUT requests. + description: Hyperlink related to the resource. This shall be only included in the HTTP responses and in HTTP PUT requests. properties: self: - allOf: - - $ref: '#/components/schemas/LinkType' - description: Self referring URI. The URI shall be unique within the RNI API as it acts as an ID for the subscription. - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: LinkType + # description': Self referring URI. The URI shall be unique within the RNI 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 x-etsi-mec-origin-type: Structure (inlined) callbackReference: - description: URI selected by the service consumer to receive notifications - on the subscribed RNIS information. This shall be included both in the - request and in response. + description: URI selected by the service consumer to receive notifications on the subscribed RNIS information. This shall be included both in the request and in response. format: uri type: string x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: URI expiryDeadline: - allOf: - - $ref: '#/components/schemas/TimeStamp' - description: Time stamp. - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: TimeStamp + # description': Time stamp. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': TimeStamp + $ref: '#/components/schemas/TimeStamp' filterCriteriaAssoc: - 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. + 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: appInstanceId: description: Unique identifier for the MEC application instance. @@ -1344,8 +1316,7 @@ components: x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: String associateId: - description: 0 to N identifiers to associate the information for a specific - UE or flow. + description: 0 to N identifiers to associate the information for a specific UE or flow. items: $ref: '#/components/schemas/AssociateId' minItems: 0 @@ -1377,8 +1348,7 @@ components: CellChangeNotification: properties: associateId: - description: 0 to N identifiers to associate the event for a specific UE - or flow. + description: 0 to N identifiers to associate the event for a specific UE or flow. items: $ref: '#/components/schemas/AssociateId' minItems: 0 @@ -1386,25 +1356,19 @@ components: x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: AssociateId hoStatus: - description: 'Indicate the status of the UE handover procedure. Values are - defined as following: - - 1 = IN_PREPARATION. - - 2 = IN_EXECUTION. - - 3 = COMPLETED. - - 4 = REJECTED. - - 5 = CANCELLED.' + description: 'Indicate the status of the UE handover procedure. Values are defined as following: +
1 = IN_PREPARATION. +
2 = IN_EXECUTION. +
3 = COMPLETED. +
4 = REJECTED. +
5 = CANCELLED.' enum: - - 1 = IN_PREPARATION - - 2 = IN_EXECUTION - - 3 = COMPLETED - - 4 = REJECTED - - 5 = CANCELLED - type: string + - 1 + - 2 + - 3 + - 4 + - 5 + type: integer x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Enum notificationType: @@ -1413,14 +1377,12 @@ components: x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: String srcEcgi: - allOf: - - $ref: '#/components/schemas/Ecgi' - description: E-UTRAN Cell Global Identifier of the source cell. - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Ecgi + # description': E-UTRAN Cell Global Identifier of the source cell. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': Ecgi + $ref: '#/components/schemas/Ecgi' tempUeId: - description: The temporary identifier allocated for the specific UE as defined - below. + description: The temporary identifier allocated for the specific UE as defined below. properties: mmec: description: MMEC as defined in ETSI TS 136 413 [i.3]. @@ -1439,15 +1401,14 @@ components: x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Structure (inlined) timeStamp: - allOf: - - $ref: '#/components/schemas/TimeStamp' - description: Time stamp. - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: TimeStamp + # description': Time stamp. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': TimeStamp + $ref: '#/components/schemas/TimeStamp' trgEcgi: description: 'E-UTRAN Cell Global Identifier of the target cell. - NOTE: Cardinality N is valid only in case of statuses IN_PREPARATION, - REJECTED and CANCELLED.' + + NOTE: Cardinality N is valid only in case of statuses IN_PREPARATION, REJECTED and CANCELLED.' items: $ref: '#/components/schemas/Ecgi' minItems: 1 @@ -1464,38 +1425,31 @@ components: CellChangeSubscription: properties: _links: - description: Hyperlink related to the resource. This shall be only included - in the HTTP responses and in HTTP PUT requests. + description: Hyperlink related to the resource. This shall be only included in the HTTP responses and in HTTP PUT requests. properties: self: - allOf: - - $ref: '#/components/schemas/LinkType' - description: Self referring URI. The URI shall be unique within the RNI API as it acts as an ID for the subscription. - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: LinkType + # description': Self referring URI. The URI shall be unique within the RNI 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 x-etsi-mec-origin-type: Structure (inlined) callbackReference: - description: URI selected by the service consumer to receive notifications - on the subscribed RNIS information. This shall be included both in the - request and in response. + description: URI selected by the service consumerto receive notifications on the subscribed RNIS 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: - allOf: - - $ref: '#/components/schemas/TimeStamp' - description: Time stamp. - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: TimeStamp + # description': Time stamp. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': TimeStamp + $ref: '#/components/schemas/TimeStamp' filterCriteriaAssocHo: - 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. + 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: appInstanceId: description: Unique identifier for the MEC application instance. @@ -1503,8 +1457,7 @@ components: x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: String associateId: - description: 0 to N identifiers to associate the information for a specific - UE or flow. + description: 0 to N identifiers to associate the information for a specific UE or flow. items: $ref: '#/components/schemas/AssociateId' minItems: 0 @@ -1520,19 +1473,12 @@ components: x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: Ecgi hoStatus: - description: 'In case hoStatus is not included in the subscription request, - the default value 3 = COMPLETED shall be used and included in the - response: - - 1 = IN_PREPARATION. - - 2 = IN_EXECUTION. - - 3 = COMPLETED. - - 4 = REJECTED. - - 5 = CANCELLED.' + description: 'In case hoStatus is not included in the subscription request, the default value 3 = COMPLETED shall be used and included in the response: +
1 = IN_PREPARATION. +
2 = IN_EXECUTION. +
3 = COMPLETED. +
4 = REJECTED. +
5 = CANCELLED.' items: $ref: '#/components/schemas/Enum' minItems: 0 @@ -1554,23 +1500,20 @@ components: type: object x-etsi-ref: 6.3.2 CellId: - description: String representing the E-UTRAN Cell Identity. Encoded as a bit - string (size (28)) as defined in ETSI TS 136 413 [i.3]. + description: String representing the E-UTRAN Cell Identity. Encoded as a bit string (size (28)) as defined in ETSI TS 136 413 [i.3]. type: string Ecgi: properties: cellId: - allOf: - - $ref: '#/components/schemas/CellId' - description: E-UTRAN Cell Global Identifier. - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: CellId + # description': E-UTRAN Cell Global Identifier. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': CellId + $ref: '#/components/schemas/CellId' plmn: - allOf: - - $ref: '#/components/schemas/Plmn' - description: Public Land Mobile Network Identity. - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: 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 @@ -1584,9 +1527,7 @@ components: description: List of hyperlinks related to the resource. properties: self: - description: Self referring URI. This shall be included in the response - from the RNIS. The URI shall be unique within the RNI API as it acts - as an ID for the subscription. + description: Self referring URI. This shall be included in the response from the RNIS. The URI shall be unique within the RNI API as it acts as an ID for the subscription. format: uri type: string x-etsi-mec-cardinality: '1' @@ -1597,17 +1538,15 @@ components: x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Structure (inlined) expiryDeadline: - allOf: - - $ref: '#/components/schemas/TimeStamp' - description: Time stamp. - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: TimeStamp + # description': Time stamp. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': TimeStamp + $ref: '#/components/schemas/TimeStamp' timeStamp: - allOf: - - $ref: '#/components/schemas/TimeStamp' - description: Time stamp. - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: TimeStamp + # description': Time stamp. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': TimeStamp + $ref: '#/components/schemas/TimeStamp' required: - _links - expiryDeadline @@ -1621,253 +1560,196 @@ components: type: object properties: dl_gbr_pdr_cell: - description: It indicates the packet discard rate in percentage of the - downlink GBR traffic in a cell, as defined in ETSI TS 136 314 [i.11]. + description: It indicates the packet discard rate in percentage of the downlink GBR traffic in a cell, as defined in ETSI TS 136 314 [i.11]. type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Integer (0..100) dl_gbr_prb_usage_cell: - description: It indicates the PRB usage for downlink GBR traffic, as - defined in ETSI TS 136 314 [i.11] and ETSI TS 136 423 [i.12]. + description: It indicates the PRB usage for downlink GBR traffic, as defined in ETSI TS 136 314 [i.11] and ETSI TS 136 423 [i.12]. type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Integer (0..100) dl_nongbr_pdr_cell: - description: It indicates the packet discard rate in percentage of the - downlink non-GBR traffic in a cell, as defined in ETSI TS 136 314 - [i.11]. + description: It indicates the packet discard rate in percentage of the downlink non-GBR traffic in a cell, as defined in ETSI TS 136 314 [i.11]. type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Integer (0..100) dl_nongbr_prb_usage_cell: - description: "It indicates (in percentage) the PRB usage for downlink\ - \ non-GBR traffic, as defined in ETSI TS\_136\_314 [i.11] and ETSI\ - \ TS\_136 423 [i.12]." + description: "It indicates (in percentage) the PRB usage for downlink non-GBR traffic, as defined in ETSI TS\_136\_314 [i.11] and ETSI TS\_136 423 [i.12]." type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Integer (0..100) dl_total_prb_usage_cell: - description: "It indicates (in percentage) the PRB usage for total downlink\ - \ traffic, as defined in ETSI TS\_136\_314 [i.11] and ETSI TS\_136\ - \ 423 [i.12]." + description: "It indicates (in percentage) the PRB usage for total downlink traffic, as defined in ETSI TS\_136\_314 [i.11] and ETSI TS\_136 423 [i.12]." type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Integer (0..100) ecgi: - allOf: - - $ref: '#/components/schemas/Ecgi' - description: E-UTRAN Cell Global Identifier. - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Ecgi + $ref: '#/components/schemas/Ecgi' number_of_active_ue_dl_gbr_cell: - description: It indicates the number of active UEs with downlink GBR - traffic, as defined in ETSI TS 136 314 [i.11]. + description: It indicates the number of active UEs with downlink GBR traffic, as defined in ETSI TS 136 314 [i.11]. type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Integer number_of_active_ue_dl_nongbr_cell: - description: "It indicates the number of active UEs with downlink non-GBR\ - \ traffic, as defined in ETSI TS\_136\_314 [i.11]." + description: "It indicates the number of active UEs with downlink non-GBR traffic, as defined in ETSI TS\_136\_314 [i.11]." type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Integer number_of_active_ue_ul_gbr_cell: - description: It indicates the number of active UEs with uplink GBR traffic, - as defined in ETSI TS 136 314 [i.11]. + description: It indicates the number of active UEs with uplink GBR traffic, as defined in ETSI TS 136 314 [i.11]. type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Integer number_of_active_ue_ul_nongbr_cell: - description: "It indicates the number of active UEs with uplink non-GBR\ - \ traffic, as defined in ETSI TS\_136\_314\_[i.11]." + description: "It indicates the number of active UEs with uplink non-GBR traffic, as defined in ETSI TS\_136\_314\_[i.11]." type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Integer received_dedicated_preambles_cell: - description: It indicates (in percentage) the received dedicated preamples, - as defined in ETSI TS 136 314 [i.11]. + description: It indicates (in percentage) the received dedicated preamples, as defined in ETSI TS 136 314 [i.11]. type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Integer (0..100) received_randomly_selected_preambles_high_range_cell: - description: It indicates (in percentage) the received randomly selected - preambles in the high range, as defined in ETSI TS 136 314 [i.11]. + description: It indicates (in percentage) the received randomly selected preambles in the high range, as defined in ETSI TS 136 314 [i.11]. type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Integer (0..100) received_randomly_selected_preambles_low_range_cell: - description: It indicates (in percentage) the received randomly selected - preambles in the low range, as defined in ETSI TS 136 314 [i.11]. + description: It indicates (in percentage) the received randomly selected preambles in the low range, as defined in ETSI TS 136 314 [i.11]. type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Integer (0..100) ul_gbr_pdr_cell: - description: It indicates the packet discard rate in percentage of the - uplink GBR traffic in a cell, as defined in ETSI TS 136 314 [i.11]. + description: It indicates the packet discard rate in percentage of the uplink GBR traffic in a cell, as defined in ETSI TS 136 314 [i.11]. type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Integer (0..100) ul_gbr_prb_usage_cell: - description: "It indicates (in percentage) the PRB usage for uplink\ - \ GBR traffic, as defined in ETSI TS\_136\_314\_[i.11] and ETSI TS\_\ - 136 423 [i.12]." + description: "It indicates (in percentage) the PRB usage for uplink GBR traffic, as defined in ETSI TS\_136\_314\_[i.11] and ETSI TS\_136 423 [i.12]." type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Integer (0..100) ul_nongbr_pdr_cell: - description: It indicates the packet discard rate in percentage of the - uplink non-GBR traffic in a cell, as defined in ETSI TS 136 314 [i.11]. + description: It indicates the packet discard rate in percentage of the uplink non-GBR traffic in a cell, as defined in ETSI TS 136 314 [i.11]. type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Integer (0..100) ul_nongbr_prb_usage_cell: - description: "It indicates (in percentage) the PRB usage for uplink\ - \ non-GBR traffic, as defined in ETSI TS\_136\_314 [i.11] and ETSI\ - \ TS\_136 423 [i.12]." + description: "It indicates (in percentage) the PRB usage for uplink non-GBR traffic, as defined in ETSI TS\_136\_314 [i.11] and ETSI TS\_136 423 [i.12]." type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Integer (0..100) ul_total_prb_usage_cell: - description: "It indicates (in percentage) the PRB usage for total uplink\ - \ traffic, as defined in ETSI TS\_136\_314\_[i.11] and ETSI TS\_136\_\ - 423 [i.12]." + description: "It indicates (in percentage) the PRB usage for total uplink traffic, as defined in ETSI TS\_136\_314\_[i.11] and ETSI TS\_136\_423 [i.12]." type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Integer (0..100) + minItems: 0 required: - ecgi - minItems: 0 type: array x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: Structure (inlined) cellUEInfo: - description: The per cell per UE layer 2 measurements information as defined - below. + description: The per cell per UE layer 2 measurements information as defined below. items: type: object properties: associateId: - allOf: - - $ref: '#/components/schemas/AssociateId' - description: Identifier to associate the information for a specific - UE or flow. - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: AssociateId + $ref: '#/components/schemas/AssociateId' dl_gbr_data_volume_ue: - description: It indicates the data volume of the downlink GBR traffic - of a UE, as defined in ETSI TS 136 314 [i.11]. + description: It indicates the data volume of the downlink GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11]. type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Integer dl_gbr_delay_ue: - description: It indicates the packet delay of the downlink GBR traffic - of a UE, as defined in ETSI TS 136 314 [i.11]. + description: It indicates the packet delay of the downlink GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11]. type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Integer dl_gbr_pdr_ue: - description: It indicates the packet discard rate in percentage of the - downlink GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11]. + description: It indicates the packet discard rate in percentage of the downlink GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11]. type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Integer (0..100) dl_gbr_throughput_ue: - description: It indicates the scheduled throughput of the downlink GBR - traffic of a UE, as defined in ETSI TS 136 314 [i.11]. + description: It indicates the scheduled throughput of the downlink GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11]. type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Integer dl_nongbr_data_volume_ue: - description: "It indicates the data volume of the downlink non-GBR traffic\ - \ of a UE, as defined in ETSI TS\_136\_314\_[i.11]." + description: "It indicates the data volume of the downlink non-GBR traffic of a UE, as defined in ETSI TS\_136\_314\_[i.11]." type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Integer dl_nongbr_delay_ue: - description: "It indicates the packet delay of the downlink non-GBR\ - \ traffic of a UE, as defined in ETSI TS\_136\_314\_[i.11]." + description: "It indicates the packet delay of the downlink non-GBR traffic of a UE, as defined in ETSI TS\_136\_314\_[i.11]." type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Integer dl_nongbr_pdr_ue: - description: It indicates the packet discard rate in percentage of the - downlink nonGBR traffic of a UE, as defined in ETSI TS 136 314 [i.11]. + description: It indicates the packet discard rate in percentage of the downlink nonGBR traffic of a UE, as defined in ETSI TS 136 314 [i.11]. type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Integer (0..100) dl_nongbr_throughput_ue: - description: It indicates the scheduled throughput of the downlink nonGBR - traffic of a UE, as defined in ETSI TS 136 314 [i.11]. + description: It indicates the scheduled throughput of the downlink nonGBR traffic of a UE, as defined in ETSI TS 136 314 [i.11]. type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Integer ecgi: - allOf: - - $ref: '#/components/schemas/Ecgi' - description: E-UTRAN Cell Global Identifier. - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Ecgi + $ref: '#/components/schemas/Ecgi' ul_gbr_data_volume_ue: - description: It indicates the data volume of the uplink GBR traffic - of a UE, as defined in ETSI TS 136 314 [i.11]. + description: It indicates the data volume of the uplink GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11]. type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Integer ul_gbr_delay_ue: - description: It indicates the packet delay of the uplink GBR traffic - of a UE, as defined in ETSI TS 136 314 [i.11]. + description: It indicates the packet delay of the uplink GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11]. type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Integer ul_gbr_pdr_ue: - description: It indicates the packet discard rate in percentage of the - uplink GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11]. + description: It indicates the packet discard rate in percentage of the uplink GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11]. type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Integer (0..100) ul_gbr_throughput_ue: - description: It indicates the scheduled throughput of the uplink GBR - traffic of a UE, as defined in ETSI TS 136 314 [i.11]. + description: It indicates the scheduled throughput of the uplink GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11]. type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Integer ul_nongbr_data_volume_ue: - description: It indicates the data volume of the uplink non-GBR traffic - of a UE, as defined in ETSI TS 136 314 [i.11]. + description: It indicates the data volume of the uplink non-GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11]. type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Integer ul_nongbr_delay_ue: - description: It indicates the packet delay of the uplink non-GBR traffic - of a UE, as defined in ETSI TS 136 314 [i.11]. + description: It indicates the packet delay of the uplink non-GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11]. type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Integer ul_nongbr_pdr_ue: - description: It indicates the packet discard rate in percentage of the - uplink nonGBR traffic of a UE, as defined in ETSI TS 136 314 [i.11]. + description: It indicates the packet discard rate in percentage of the uplink nonGBR traffic of a UE, as defined in ETSI TS 136 314 [i.11]. type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Integer (0..100) ul_nongbr_throughput_ue: - description: It indicates the scheduled throughput of the uplink non-GBR - traffic of a UE, as defined in ETSI TS 136 314 [i.11]. + description: It indicates the scheduled throughput of the uplink non-GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11]. type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Integer + minItems: 0 required: - ecgi - associateId - minItems: 0 type: array x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: Structure (inlined) timeStamp: - allOf: - - $ref: '#/components/schemas/TimeStamp' - description: Time stamp. - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: TimeStamp + $ref: '#/components/schemas/TimeStamp' type: object x-etsi-ref: 6.2.4a LinkType: @@ -1885,20 +1767,20 @@ components: MeasQuantityResultsNr: properties: rsrp: - description: "Reference Signal Received Power as defined in ETSI TS\_138\ - \ 331 [i.13]." + description: "Reference Signal Received Power as defined in ETSI TS\_138 331 [i.13]." + format: int32 type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint8 rsrq: - description: Reference Signal Received Quality as defined in ETSI TS 138 - 331 [i.13]. + description: Reference Signal Received Quality as defined in ETSI TS 138 331 [i.13]. + format: int32 type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint8 sinr: - description: Reference Signal to Interference & Noise Ratio as defined in - ETSI TS 138 331 [i.13]. + description: Reference Signal to Interference & Noise Ratio as defined in ETSI TS 138 331 [i.13]. + format: int32 type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint8 @@ -1907,8 +1789,7 @@ components: MeasRepUeNotification: properties: associateId: - description: 0 to N identifiers to associate the event for a specific - UE or flow. + description: 0 to N identifiers to associate the event for a specific UE or flow. items: $ref: '#/components/schemas/AssociateId' minItems: 0 @@ -1916,148 +1797,139 @@ components: x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: AssociateId carrierAggregationMeasInfo: - description: This parameter can be repeated to contain information of - all the carriers assign for Carrier Aggregation up to M. + description: This parameter can be repeated to contain information of all the carriers assign for Carrier Aggregation up to M. items: type: object properties: cellIdNei: - allOf: - - $ref: '#/components/schemas/CellId' - description: "E-UTRAN Cell Identity of the best neighbouring cell\ - \ (NCell) associated with the SCell, as defined in ETSI TS\_136\ - \ 331 [i.7]." - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: CellId + # description': E-UTRAN Cell Identity of the best neighbouring cell (NCell) associated with the SCell, as defined in ETSI TS 136 331 [i.7]. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': CellId + $ref: '#/components/schemas/CellId' cellIdSrv: - allOf: - - $ref: '#/components/schemas/CellId' - description: E-UTRAN Cell Identity of a Secondary serving Cell (SCell), as defined in ETSI TS 136 331 [i.7]. - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: CellId + # description': E-UTRAN Cell Identity of a Secondary serving Cell (SCell), as defined in ETSI TS 136 331 [i.7]. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': CellId + $ref: '#/components/schemas/CellId' rsrpNei: - description: "Reference Signal Received Power as defined in ETSI TS\_\ - 136 214 [i.5]." + description: "Reference Signal Received Power as defined in ETSI TS\_136 214 [i.5]." + format: int32 type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint8 rsrpNeiEx: - description: Extended Reference Signal Received Power, with value - mapping defined in ETSI TS 136 133 [i.16]. + description: Extended Reference Signal Received Power, with value mapping defined in ETSI TS 136 133 [i.16]. + format: int32 type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint8 rsrpSrv: - description: "Reference Signal Received Power as defined in ETSI TS\_\ - 136 214 [i.5]." + description: "Reference Signal Received Power as defined in ETSI TS\_136 214 [i.5]." + format: int32 type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint8 rsrpSrvEx: - description: Extended Reference Signal Received Power, with value - mapping defined in ETSI TS 136 133 [i.16]. + description: Extended Reference Signal Received Power, with value mapping defined in ETSI TS 136 133 [i.16]. + format: int32 type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint8 rsrqNei: - description: Reference Signal Received Quality as defined in ETSI - TS 136 214 [i.5]. + description: Reference Signal Received Quality as defined in ETSI TS 136 214 [i.5]. + format: int32 type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint8 rsrqNeiEx: - description: Extended Reference Signal Received Quality, with value - mapping defined in ETSI TS 136 133 [i.16]. + description: Extended Reference Signal Received Quality, with value mapping defined in ETSI TS 136 133 [i.16]. + format: int32 type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint8 rsrqSrv: - description: Reference Signal Received Quality as defined in ETSI - TS 136 214 [i.5]. + description: Reference Signal Received Quality as defined in ETSI TS 136 214 [i.5]. + format: int32 type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint8 rsrqSrvEx: - description: Extended Reference Signal Received Quality, with value - mapping defined in ETSI TS 136 133 [i.16]. + description: Extended Reference Signal Received Quality, with value mapping defined in ETSI TS 136 133 [i.16]. + format: int32 type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint8 sinrNei: - description: "Reference Signal \"Signal to Interference plus Noise\ - \ Ratio\", with value mapping defined in ETSI TS\_136\_133\_[i.16]." + description: "Reference Signal \"Signal to Interference plus Noise Ratio\", with value mapping defined in ETSI TS\_136\_133\_[i.16]." + format: int32 type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint8 sinrSrv: - description: "Reference Signal \"Signal to Interference plus Noise\ - \ Ratio\", with value mapping defined in ETSI TS\_136\_133\_[i.16]." + description: "Reference Signal \"Signal to Interference plus Noise Ratio\", with value mapping defined in ETSI TS\_136\_133\_[i.16]." + format: int32 type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint8 + minItems: 0 required: - cellIdSrv - minItems: 0 type: array x-etsi-mec-cardinality: 0..M x-etsi-mec-origin-type: Structure (inlined) ecgi: - allOf: - - $ref: '#/components/schemas/Ecgi' - description: E-UTRAN Cell Global Identifier of the Primary serving Cell (PCell), as defined in ETSI TS 136 331 [i.7]. - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Ecgi + # description': E-UTRAN Cell Global Identifier of the Primary serving Cell (PCell), as defined in ETSI TS 136 331 [i.7]. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': Ecgi + $ref: '#/components/schemas/Ecgi' eutranNeighbourCellMeasInfo: - description: This parameter can be repeated to contain information of - all the neighbouring cells up to N. + description: This parameter can be repeated to contain information of all the neighbouring cells up to N. items: type: object properties: ecgi: - allOf: - - $ref: '#/components/schemas/Ecgi' - description: E-UTRAN Cell Global Identifier. - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Ecgi + # description': E-UTRAN Cell Global Identifier. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': Ecgi + $ref: '#/components/schemas/Ecgi' rsrp: - description: "Reference Signal Received Power as defined in ETSI TS\_\ - 136 214 [i.5]." + description: "Reference Signal Received Power as defined in ETSI TS\_136 214 [i.5]." + format: int32 type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint8 rsrpEx: - description: Extended Reference Signal Received Power, with value - mapping defined in ETSI TS 136 133 [i.16]. + description: Extended Reference Signal Received Power, with value mapping defined in ETSI TS 136 133 [i.16]. + format: int32 type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint8 rsrq: - description: Reference Signal Received Quality as defined in ETSI - TS 136 214 [i.5]. + description: Reference Signal Received Quality as defined in ETSI TS 136 214 [i.5]. + format: int32 type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint8 rsrqEx: - description: Extended Reference Signal Received Quality, with value - mapping defined in ETSI TS 136 133 [i.16]. + description: Extended Reference Signal Received Quality, with value mapping defined in ETSI TS 136 133 [i.16]. + format: int32 type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint8 sinr: - description: "Reference Signal \"Signal to Interference plus Noise\ - \ Ratio\", with value mapping defined in ETSI TS\_136\_133\_[i.16]." + description: "Reference Signal \"Signal to Interference plus Noise Ratio\", with value mapping defined in ETSI TS\_136\_133\_[i.16]." + format: int32 type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint8 + minItems: 0 required: - ecgi - minItems: 0 type: array x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: Structure (inlined) heightUe: - description: Indicates height of the UE in meters relative to the sea - level as defined in ETSI TS 136.331 [i.7]. + description: Indicates height of the UE in meters relative to the sea level as defined in ETSI TS 136.331 [i.7]. type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Int @@ -2067,22 +1939,18 @@ components: type: object properties: nrBNCs: - description: Measurement quantities concerning the best neighbours - of the secondary serving cells + description: Measurement quantities concerning the best neighbours of the secondary serving cells properties: nrBNCellInfo: - description: Best neighbours of the secondary serving cell(s) - info + description: Best neighbours of the secondary serving cell(s) info items: type: object properties: nrBNCellGId: - allOf: - - $ref: '#/components/schemas/NrCellId' - description: "Cell Global Identifier, as defined in ETSI TS\_\ - 138\_331\_[i.13]." - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: NrCellId + # description': Cell Global Identifier, as defined in ETSI TS 138 331 [i.13]. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': NrCellId + $ref: '#/components/schemas/NrCellId' nrBNCellPlmn: description: Public land mobile network identities items: @@ -2091,28 +1959,28 @@ components: type: array x-etsi-mec-cardinality: 1..P x-etsi-mec-origin-type: Plmn + minItems: 1 required: - nrBNCellPlmn - nrBNCellGId - minItems: 1 type: array x-etsi-mec-cardinality: 1..P x-etsi-mec-origin-type: Structure (inlined) nrBNCellRsrp: - description: Reference Signal Received Power measurement according - to mapping table in ETSI TS 138.133 [i.14]. + description: Reference Signal Received Power measurement according to mapping table in ETSI TS 138.133 [i.14]. + format: int32 type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint8 nrBNCellRsrq: - description: Reference Signal Received Quality measurement according - to mapping table in ETSI TS 138.133 [i.14]. + description: Reference Signal Received Quality measurement according to mapping table in ETSI TS 138.133 [i.14]. + format: int32 type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint8 nrBNCellRssi: - description: Reference signal SINR measurement according to mapping - table in ETSI TS 138.133 [i.14]. + description: Reference signal SINR measurement according to mapping table in ETSI TS 138.133 [i.14]. + format: int32 type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint8 @@ -2122,15 +1990,13 @@ components: x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Structure (inlined) nrCarrierFreq: + description: "ARFCN applicable for a downlink, uplink or bi-directional (TDD) NR carrier frequency, as defined in ETSI TS\_138.101 [i.15]." + format: int32 type: integer - format: uint32 - description: "ARFCN applicable for a downlink, uplink or bi-directional\ - \ (TDD) NR carrier frequency, as defined in ETSI TS\_138.101 [i.15]." x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Uint32 nrSCs: - description: Measurement quantities concerning the secondary serving - cells. + description: Measurement quantities concerning the secondary serving cells. properties: nrSCellInfo: description: Secondary serving cell(s) info. @@ -2138,12 +2004,10 @@ components: type: object properties: nrSCellGId: - allOf: - - $ref: '#/components/schemas/NrCellId' - description: "Cell Global Identifier, as defined in ETSI TS\_\ - 138\_331\_[i.13]." - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: NrCellId + # description': Cell Global Identifier, as defined in ETSI TS 138 331 [i.13]. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': NrCellId + $ref: '#/components/schemas/NrCellId' nrSCellPlmn: description: Public land mobile network identities. items: @@ -2152,28 +2016,28 @@ components: type: array x-etsi-mec-cardinality: 1..P x-etsi-mec-origin-type: Plmn + minItems: 1 required: - nrSCellPlmn - nrSCellGId - minItems: 1 type: array x-etsi-mec-cardinality: 1..P x-etsi-mec-origin-type: Structure (inlined) nrSCellRsrp: - description: Reference Signal Received Power measurement according - to mapping table in ETSI TS 138.133 [i.14]. + description: Reference Signal Received Power measurement according to mapping table in ETSI TS 138.133 [i.14]. + format: int32 type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint8 nrSCellRsrq: - description: Reference Signal Received Quality measurement according - to mapping table in ETSI TS 138.133 [i.14]. + description: Reference Signal Received Quality measurement according to mapping table in ETSI TS 138.133 [i.14]. + format: int32 type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint8 nrSCellRssi: - description: Reference signal SINR measurement according to mapping - table in ETSI TS 138.133 [i.14]. + description: Reference signal SINR measurement according to mapping table in ETSI TS 138.133 [i.14]. + format: int32 type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint8 @@ -2182,10 +2046,10 @@ components: type: object x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Structure (inlined) + minItems: 0 required: - nrCarrierFreq - nrSCs - minItems: 0 type: array x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: Structure (inlined) @@ -2200,12 +2064,10 @@ components: type: object properties: nrNCellGId: - allOf: - - $ref: '#/components/schemas/NrCellId' - description: "Cell Global Identifier, as defined in ETSI TS\_\ - 138\_331\_[i.13]." - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: NrCellId + # description': Cell Global Identifier, as defined in ETSI TS 138 331 [i.13]. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': NrCellId + $ref: '#/components/schemas/NrCellId' nrNCellPlmn: description: Public land mobile network identities. items: @@ -2214,40 +2076,39 @@ components: type: array x-etsi-mec-cardinality: 1..P x-etsi-mec-origin-type: Plmn + minItems: 1 required: - nrNCellPlmn - nrNCellGId - minItems: 1 type: array x-etsi-mec-cardinality: 1..P x-etsi-mec-origin-type: Structure (inlined) nrNCellRsrp: - description: Reference Signal Received Power measurement according - to mapping table in ETSI TS 138.133 [i.14]. + description: Reference Signal Received Power measurement according to mapping table in ETSI TS 138.133 [i.14]. + format: int32 type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint8 nrNCellRsrq: - description: Reference Signal Received Quality measurement according - to mapping table in ETSI TS 138.133 [i.14]. + description: Reference Signal Received Quality measurement according to mapping table in ETSI TS 138.133 [i.14]. + format: int32 type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint8 nrNCellRssi: - description: Reference signal SINR measurement according to mapping - table in ETSI TS 138.133 [i.14]. + description: Reference signal SINR measurement according to mapping table in ETSI TS 138.133 [i.14]. + format: int32 type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint8 rsIndexResults: - allOf: - - $ref: '#/components/schemas/RsIndexResults' - description: Beam level measurements results of a NR cell. - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: RsIndexResults + # description': Beam level measurements results of a NR cell. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': RsIndexResults + $ref: '#/components/schemas/RsIndexResults' + minItems: 0 required: - nrNCellInfo - minItems: 0 type: array x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: Structure (inlined) @@ -2257,47 +2118,45 @@ components: x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: String rsrp: - description: "Reference Signal Received Power as defined in ETSI TS\_\ - 136 214 [i.5]." + description: "Reference Signal Received Power as defined in ETSI TS\_136 214 [i.5]." + format: int32 type: integer x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Uint8 rsrpEx: - description: Extended Reference Signal Received Power, with value mapping - defined in ETSI TS 136 133 [i.16]. + description: Extended Reference Signal Received Power, with value mapping defined in ETSI TS 136 133 [i.16]. + format: int32 type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint8 rsrq: - description: Reference Signal Received Quality as defined in ETSI TS 136 - 214 [i.5]. + description: Reference Signal Received Quality as defined in ETSI TS 136 214 [i.5]. + format: int32 type: integer x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Uint8 rsrqEx: - description: Extended Reference Signal Received Quality, with value mapping - defined in ETSI TS 136 133 [i.16]. + description: Extended Reference Signal Received Quality, with value mapping defined in ETSI TS 136 133 [i.16]. + format: int32 type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint8 sinr: - description: "Reference Signal \"Signal to Interference plus Noise Ratio\"\ - , with value mapping defined in ETSI TS\_136\_133\_[i.16]." + description: "Reference Signal \"Signal to Interference plus Noise Ratio\", with value mapping defined in ETSI TS\_136\_133\_[i.16]." + format: int32 type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint8 timeStamp: - allOf: - - $ref: '#/components/schemas/TimeStamp' - description: Time stamp. - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: TimeStamp + # description': Time stamp. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': TimeStamp + $ref: '#/components/schemas/TimeStamp' trigger: - allOf: - - $ref: '#/components/schemas/Trigger' - description: Corresponds to a specific E-UTRAN UE Measurement Report trigger. - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Trigger + # description': Corresponds to a specific E-UTRAN UE Measurement Report trigger. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': Trigger + $ref: '#/components/schemas/Trigger' required: - notificationType - ecgi @@ -2309,38 +2168,31 @@ components: MeasRepUeSubscription: properties: _links: - description: Hyperlink related to the resource. This shall be only included - in the HTTP responses and in HTTP PUT requests. + description: Hyperlink related to the resource. This shall be only included in the HTTP responses and in HTTP PUT requests. properties: self: - allOf: - - $ref: '#/components/schemas/LinkType' - description: Self referring URI. The URI shall be unique within the RNI API as it acts as an ID for the subscription. - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: LinkType + # description': Self referring URI. The URI shall be unique within the RNI 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 x-etsi-mec-origin-type: Structure (inlined) callbackReference: - description: URI selected by the service consumer to receive notifications - on the subscribed RNIS information. This shall be included both in the - request and in response. + description: URI selected by the service consumer to receive notifications on the subscribed RNIS information. This shall be included both in the request and in response. format: uri type: string x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: URI expiryDeadline: - allOf: - - $ref: '#/components/schemas/TimeStamp' - description: Time stamp. - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: TimeStamp + # description': Time stamp. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': TimeStamp + $ref: '#/components/schemas/TimeStamp' filterCriteriaAssocTri: - 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. + 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: appInstanceId: description: Unique identifier for the MEC application instance. @@ -2348,8 +2200,7 @@ components: x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: String associateId: - description: 0 to N identifiers to associate the information for a specific - UE or flow. + description: 0 to N identifiers to associate the information for a specific UE or flow. items: $ref: '#/components/schemas/AssociateId' minItems: 0 @@ -2365,8 +2216,7 @@ components: x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: Ecgi trigger: - description: Corresponds to a specific E-UTRAN UE Measurement Report - trigger. + description: Corresponds to a specific E-UTRAN UE Measurement Report trigger. items: $ref: '#/components/schemas/Trigger' minItems: 0 @@ -2390,8 +2240,7 @@ components: MeasTaNotification: properties: associateId: - description: 0 to N identifiers to associate the event for a specific UE - or flow. + description: 0 to N identifiers to associate the event for a specific UE or flow. items: $ref: '#/components/schemas/AssociateId' minItems: 0 @@ -2399,26 +2248,24 @@ components: x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: AssociateId ecgi: - allOf: - - $ref: '#/components/schemas/Ecgi' - description: E-UTRAN Cell Global Identifier. - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Ecgi + # description': E-UTRAN Cell Global Identifier. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': Ecgi + $ref: '#/components/schemas/Ecgi' notificationType: description: Shall be set to "MeasTaNotification". type: string x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: String timeStamp: - allOf: - - $ref: '#/components/schemas/TimeStamp' - description: Time stamp. - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: TimeStamp + # description': Time stamp. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': TimeStamp + $ref: '#/components/schemas/TimeStamp' timingAdvance: - type: integer - format: uint32 description: The timing advance as defined in ETSI TS 136 214 [i.5]. + format: int32 + type: integer x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Uint32 required: @@ -2430,38 +2277,31 @@ components: MeasTaSubscription: properties: _links: - description: Hyperlink related to the resource. This shall be only included - in the HTTP responses and in HTTP PUT requests. + description: Hyperlink related to the resource. This shall be only included in the HTTP responses and in HTTP PUT requests. properties: self: - allOf: - - $ref: '#/components/schemas/LinkType' - description: Self referring URI. The URI shall be unique within the RNI API as it acts as an ID for the subscription. - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: LinkType + # description': Self referring URI. The URI shall be unique within the RNI 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 x-etsi-mec-origin-type: Structure (inlined) callbackReference: - description: URI selected by the service consumer to receive notifications - on the subscribed RNIS information. This shall be included both in the - request and in response. + description: URI selected by the service consumer to receive notifications on the subscribed RNIS information. This shall be included both in the request and in response. format: uri type: string x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: URI expiryDeadline: - allOf: - - $ref: '#/components/schemas/TimeStamp' - description: Time stamp. - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: TimeStamp + # description': Time stamp. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': TimeStamp + $ref: '#/components/schemas/TimeStamp' filterCriteriaAssoc: - 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. + 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: appInstanceId: description: Unique identifier for the MEC application instance. @@ -2469,8 +2309,7 @@ components: x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: String associateId: - description: 0 to N identifiers to associate the information for a specific - UE or flow. + description: 0 to N identifiers to associate the information for a specific UE or flow. items: $ref: '#/components/schemas/AssociateId' minItems: 0 @@ -2502,31 +2341,27 @@ components: NRcgi: properties: nrcellId: - allOf: - - $ref: '#/components/schemas/NrCellId' - description: NR Cell Global Identifier. - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: NrCellId + # description': NR Cell Global Identifier. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': NrCellId + $ref: '#/components/schemas/NrCellId' plmn: - allOf: - - $ref: '#/components/schemas/Plmn' - description: Public Land Mobile Network Identity. - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Plmn + # description': Public Land Mobile Network Identity. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': Plmn + $ref: '#/components/schemas/Plmn' required: - plmn - nrcellId type: object x-etsi-ref: 6.5.7 NrCellId: - description: String representing the NR Cell Identity. Encoded as a bit string - (size (36)) as defined in ETSI TS 138 423 [i.17]. + description: String representing the NR Cell Identity. Encoded as a bit string (size (36)) as defined in ETSI TS 138 423 [i.17]. type: string NrMeasRepUeNotification: properties: associateId: - description: 0 to N identifiers to associate the event for a specific - UE or flow. + description: 0 to N identifiers to associate the event for a specific UE or flow. items: $ref: '#/components/schemas/AssociateId' minItems: 0 @@ -2534,39 +2369,36 @@ components: x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: AssociateId eutraNeighCellMeasInfo: - description: This parameter can be repeated to contain measurement information - of all the neighbouring cells up to N. It shall not be included if nrNeighCellMeasInfo - is included. + description: This parameter can be repeated to contain measurement information of all the neighbouring cells up to N. It shall not be included if nrNeighCellMeasInfo is included. items: type: object properties: ecgi: - allOf: - - $ref: '#/components/schemas/Ecgi' - description: Cell Global Identifier. - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Ecgi + # description': Cell Global Identifier. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': Ecgi + $ref: '#/components/schemas/Ecgi' rsrp: - description: "Reference Signal Received Power as defined in ETSI TS\_\ - 138 331 [i.13]." + description: "Reference Signal Received Power as defined in ETSI TS\_138 331 [i.13]." + format: int32 type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint8 rsrq: - description: Reference Signal Received Quality as defined in ETSI - TS 138 331 [i.13]. + description: Reference Signal Received Quality as defined in ETSI TS 138 331 [i.13]. + format: int32 type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint8 sinr: - description: "Reference Signal plus Interference Noise Ratio as defined\ - \ in ETSI TS\_138\_331\_[i.13]." + description: "Reference Signal plus Interference Noise Ratio as defined in ETSI TS\_138\_331\_[i.13]." + format: int32 type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint8 + minItems: 0 required: - ecgi - minItems: 0 type: array x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: Structure (inlined) @@ -2576,122 +2408,105 @@ components: x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: String nrNeighCellMeasInfo: - description: This parameter can be repeated to contain measurement information - of all the neighbouring cells up to N. It shall not be included if eutraNeighCellMeasInfo - is included. + description: This parameter can be repeated to contain measurement information of all the neighbouring cells up to N. It shall not be included if eutraNeighCellMeasInfo is included. items: type: object properties: measQuantityResultsCsiRsCell: - allOf: - - $ref: '#/components/schemas/MeasQuantityResultsNr' - description: Measurement quantity results relating to the Channel State Information Reference Signal of the neighbouring cells. - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: MeasQuantityResultsNr + # description': Measurement quantity results relating to the Channel State Information Reference Signal of the neighbouring cells. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': MeasQuantityResultsNr + $ref: '#/components/schemas/MeasQuantityResultsNr' measQuantityResultsSsbCell: - allOf: - - $ref: '#/components/schemas/MeasQuantityResultsNr' - description: Measurement quantity results relating to the Synchronization Signal Block of the neighbouring cells. - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: MeasQuantityResultsNr + # description': Measurement quantity results relating to the Synchronization Signal Block of the neighbouring cells. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': MeasQuantityResultsNr + $ref: '#/components/schemas/MeasQuantityResultsNr' nrcgi: - allOf: - - $ref: '#/components/schemas/NrCellId' - description: Cell Global Identifier. - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: NrCellId + # description': Cell Global Identifier. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': NrCellId + $ref: '#/components/schemas/NrCellId' rsIndexResults: - allOf: - - $ref: '#/components/schemas/RsIndexResults' - description: Beam level measurement information. - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: RsIndexResults + # description': Beam level measurement information. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': RsIndexResults + $ref: '#/components/schemas/RsIndexResults' + minItems: 0 required: - nrcgi - minItems: 0 type: array x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: Structure (inlined) servCellMeasInfo: - description: This parameter can be repeated to contain information of - all the serving cells up to N. + description: This parameter can be repeated to contain information of all the serving cells up to N. items: type: object properties: nCell: - description: Measurement information relating to the best neighbour - of this serving cell. + description: Measurement information relating to the best neighbour of this serving cell. properties: measQuantityResultsCsiRsCell: - allOf: - - $ref: '#/components/schemas/MeasQuantityResultsNr' - description: Measurement quantity results relating to the Channel State Information Reference Signal. - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: MeasQuantityResultsNr + # description': Measurement quantity results relating to the Channel State Information Reference Signal. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': MeasQuantityResultsNr + $ref: '#/components/schemas/MeasQuantityResultsNr' measQuantityResultsSsbCell: - allOf: - - $ref: '#/components/schemas/MeasQuantityResultsNr' - description: Measurement quantity results relating to the Synchronization Signal Block. - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: MeasQuantityResultsNr + # description': Measurement quantity results relating to the Synchronization Signal Block. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': MeasQuantityResultsNr + $ref: '#/components/schemas/MeasQuantityResultsNr' rsIndexResults: - allOf: - - $ref: '#/components/schemas/RsIndexResults' - description: Beam level measurement information - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: RsIndexResults + # description': Beam level measurement information + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': RsIndexResults + $ref: '#/components/schemas/RsIndexResults' type: object x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Structure (inlined) nrcgi: - allOf: - - $ref: '#/components/schemas/NRcgi' - description: NR Cell Global Identifier. - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Nrcgi + # description': NR Cell Global Identifier. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': Nrcgi + $ref: '#/components/schemas/NRcgi' sCell: description: Measurement information relating to this serving cell. properties: measQuantityResultsCsiRsCell: - allOf: - - $ref: '#/components/schemas/MeasQuantityResultsNr' - description: Measurement quantity results relating to the Channel State Information Reference Signal. - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: MeasQuantityResultsNr + # description': Measurement quantity results relating to the Channel State Information Reference Signal. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': MeasQuantityResultsNr + $ref: '#/components/schemas/MeasQuantityResultsNr' measQuantityResultsSsbCell: - allOf: - - $ref: '#/components/schemas/MeasQuantityResultsNr' - description: Measurement quantity results relating to the Synchronization Signal Block. - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: MeasQuantityResultsNr + # description': Measurement quantity results relating to the Synchronization Signal Block. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': MeasQuantityResultsNr + $ref: '#/components/schemas/MeasQuantityResultsNr' rsIndexResults: - allOf: - - $ref: '#/components/schemas/RsIndexResults' - description: Beam level measurement information - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: RsIndexResults + # description': Beam level measurement information + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': RsIndexResults + $ref: '#/components/schemas/RsIndexResults' type: object x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Structure (inlined) + minItems: 0 required: - nrcgi - sCell - minItems: 0 type: array x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: Structure (inlined) timeStamp: - allOf: - - $ref: '#/components/schemas/TimeStamp' - description: Time stamp. - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: TimeStamp + # description': Time stamp. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': TimeStamp + $ref: '#/components/schemas/TimeStamp' triggerNr: - allOf: - - $ref: '#/components/schemas/TriggerNr' - description: Corresponds to a specific 5G UE Measurement Report trigger. - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: TriggerNr + # description': Corresponds to a specific 5G UE Measurement Report trigger. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': TriggerNr + $ref: '#/components/schemas/TriggerNr' required: - notificationType - triggerNr @@ -2700,38 +2515,31 @@ components: NrMeasRepUeSubscription: properties: _links: - description: Hyperlink related to the resource. This shall be only included - in the HTTP responses and in HTTP PUT requests. + description: Hyperlink related to the resource. This shall be only included in the HTTP responses and in HTTP PUT requests. properties: self: - allOf: - - $ref: '#/components/schemas/LinkType' - description: Self-referring URI. The URI shall be unique within the RNI API as it acts as an ID for the subscription. - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: LinkType + # description': Self-referring URI. The URI shall be unique within the RNI 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 x-etsi-mec-origin-type: Structure (inlined) callbackReference: - description: URI selected by the service consumer to receive notifications - on the subscribed RNIS information. This shall be included both in the - request and in response. + description: URI selected by the service consumer to receive notifications on the subscribed RNIS information. This shall be included both in the request and in response. format: uri type: string x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: URI expiryDeadline: - allOf: - - $ref: '#/components/schemas/TimeStamp' - description: Time stamp. - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: TimeStamp + # description': Time stamp. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': TimeStamp + $ref: '#/components/schemas/TimeStamp' filterCriteriaNrMrs: - 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. + 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: appInstanceId: description: Unique identifier for the MEC application instance. @@ -2739,8 +2547,7 @@ components: x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: String associateId: - description: 0 to N identifiers to associate the information for a specific - UE or flow. + description: 0 to N identifiers to associate the information for a specific UE or flow. items: $ref: '#/components/schemas/AssociateId' minItems: 0 @@ -2780,14 +2587,12 @@ components: Plmn: properties: mcc: - description: The Mobile Country Code part of PLMN Identity as defined in - ETSI TS 136 413 [i.3]. + description: The Mobile Country Code part of PLMN Identity as defined in ETSI TS 136 413 [i.3]. type: string x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: String mnc: - description: The Mobile Network Code part of PLMN Identity as defined in - ETSI TS 136 413 [i.3]. + description: The Mobile Network Code part of PLMN Identity as defined in ETSI TS 136 413 [i.3]. type: string x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: String @@ -2812,11 +2617,10 @@ components: x-etsi-mec-cardinality: 1..N x-etsi-mec-origin-type: Plmn timeStamp: - allOf: - - $ref: '#/components/schemas/TimeStamp' - description: Time stamp. - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: TimeStamp + # description': Time stamp. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': TimeStamp + $ref: '#/components/schemas/TimeStamp' required: - appInstanceId - plmn @@ -2825,21 +2629,19 @@ components: ProblemDetails: properties: detail: - description: A human-readable explanation specific to this occurrence of - the problem + 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 + 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 + format: int32 type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint32 @@ -2849,8 +2651,7 @@ components: 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 + description: A URI reference according to IETF RFC 3986 that identifies the problem type format: uri type: string x-etsi-mec-cardinality: 0..1 @@ -2859,8 +2660,7 @@ components: RabEstNotification: properties: associateId: - description: '0 to N identifiers to bind the event for a specific UE or - flow. ' + description: '0 to N identifiers to bind the event for a specific UE or flow. ' items: $ref: '#/components/schemas/AssociateId' minItems: 0 @@ -2868,14 +2668,12 @@ components: x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: AssociateId ecgi: - allOf: - - $ref: '#/components/schemas/Ecgi' - description: E-UTRAN Cell Global Identifier. - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Ecgi + # description': E-UTRAN Cell Global Identifier. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': Ecgi + $ref: '#/components/schemas/Ecgi' erabId: - description: The attribute that uniquely identifies a Radio Access bearer - for specific UE as defined in ETSI TS 136 413 [i.3]. + description: The attribute that uniquely identifies a Radio Access bearer for specific UE as defined in ETSI TS 136 413 [i.3]. type: integer x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Integer @@ -2888,29 +2686,25 @@ components: x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Integer qosInformation: - description: The RabEstNotification QoS information for the E-RAB. + description: The QoS information for the E-RAB. properties: erabGbrDl: - description: This attribute indicates the guaranteed downlink E-RAB - Bit Rate as defined in ETSI TS 123 401 [i.4] for this bearer. + description: This attribute indicates the guaranteed downlink E-RAB Bit Rate as defined in ETSI TS 123 401 [i.4] for this bearer. type: integer x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Integer erabGbrUl: - description: This attribute indicates the guaranteed uplink E-RAB - Bit Rate as defined in ETSI TS 123 401 [i.4] for this bearer. + description: This attribute indicates the guaranteed uplink E-RAB Bit Rate as defined in ETSI TS 123 401 [i.4] for this bearer. type: integer x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Integer erabMbrDl: - description: This attribute indicates the maximum downlink E-RAB - Bit Rate as defined in ETSI TS 123 401 [i.4] for this bearer. + description: This attribute indicates the maximum downlink E-RAB Bit Rate as defined in ETSI TS 123 401 [i.4] for this bearer. type: integer x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Integer erabMbrUl: - description: This attribute indicates the maximum uplink E-RAB Bit - Rate as defined in ETSI TS 123 401 [i.4] for this bearer. + description: This attribute indicates the maximum uplink E-RAB Bit Rate as defined in ETSI TS 123 401 [i.4] for this bearer. type: integer x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Integer @@ -2933,8 +2727,7 @@ components: x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: String tempUeId: - description: 'The temporary identifier allocated for the specific UE as - defined below. ' + description: 'The temporary identifier allocated for the specific UE as defined below. ' properties: mmec: description: MMEC as defined in ETSI TS 136 413 [i.3]. @@ -2953,11 +2746,10 @@ components: x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Structure (inlined) timeStamp: - allOf: - - $ref: '#/components/schemas/TimeStamp' - description: Time stamp. - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: TimeStamp + # description': Time stamp. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': TimeStamp + $ref: '#/components/schemas/TimeStamp' required: - notificationType - ecgi @@ -2967,38 +2759,31 @@ components: RabEstSubscription: properties: _links: - description: Hyperlink related to the resource. This shall be only included - in the HTTP responses and in HTTP PUT requests. + description: Hyperlink related to the resource. This shall be only included in the HTTP responses and in HTTP PUT requests. properties: self: - allOf: - - $ref: '#/components/schemas/LinkType' - description: Self referring URI. The URI shall be unique within the RNI API as it acts as an ID for the subscription. - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: LinkType + # description': Self referring URI. The URI shall be unique within the RNI 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 x-etsi-mec-origin-type: Structure (inlined) callbackReference: - description: URI selected by the service consumer to receive notifications - on the subscribed RNIS information. This shall be included both in the - request and in response. + description: URI selected by the service consumer to receive notifications on the subscribed RNIS information. This shall be included both in the request and in response. format: uri type: string x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: URI expiryDeadline: - allOf: - - $ref: '#/components/schemas/TimeStamp' - description: Time stamp. - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: TimeStamp + # description': Time stamp. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': TimeStamp + $ref: '#/components/schemas/TimeStamp' filterCriteriaQci: - 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. + 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: appInstanceId: description: Unique identifier for the MEC application instance. @@ -3047,20 +2832,17 @@ components: type: object properties: ecgi: - allOf: - - $ref: '#/components/schemas/Ecgi' - description: E-UTRAN Cell Global Identifier. - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Ecgi + # description': E-UTRAN Cell Global Identifier. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': Ecgi + $ref: '#/components/schemas/Ecgi' ueInfo: - description: Information on UEs in the specific cell as defined - below. + description: Information on UEs in the specific cell as defined below. items: type: object properties: associateId: - description: 0 to N identifiers to associate the event for - a specific UE or flow. + description: 0 to N identifiers to associate the event for a specific UE or flow. items: $ref: '#/components/schemas/AssociateId' minItems: 0 @@ -3073,50 +2855,38 @@ components: type: object properties: erabId: - description: The attribute that uniquely identifies a - Radio Access bearer for specific UE as defined in ETSI - TS 136 413 [i.3]. + description: The attribute that uniquely identifies a Radio Access bearer for specific UE as defined in ETSI TS 136 413 [i.3]. type: integer x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Integer erabQosParameters: - type: object description: QoS parameters for the E-RAB as defined below. properties: qci: - description: QoS Class Identifier as defined in ETSI - TS 123 401 [i.4]. + description: QoS Class Identifier as defined in ETSI TS 123 401 [i.4]. type: integer x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Integer qosInformation: - description: The RabInfo QoS information for the E-RAB. + description: The QoS information for the E-RAB. properties: erabGbrDl: - description: This attribute indicates the guaranteed - downlink E-RAB Bit Rate as defined in ETSI TS - 123 401 [i.4] for this bearer. + description: This attribute indicates the guaranteed downlink E-RAB Bit Rate as defined in ETSI TS 123 401 [i.4] for this bearer. type: integer x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Integer erabGbrUl: - description: This attribute indicates the guaranteed - uplink E-RAB Bit Rate as defined in ETSI TS 123 - 401 [i.4] for this bearer. + description: This attribute indicates the guaranteed uplink E-RAB Bit Rate as defined in ETSI TS 123 401 [i.4] for this bearer. type: integer x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Integer erabMbrDl: - description: This attribute indicates the maximum - downlink E-RAB Bit Rate as defined in ETSI TS - 123 401 [i.4] for this bearer. + description: This attribute indicates the maximum downlink E-RAB Bit Rate as defined in ETSI TS 123 401 [i.4] for this bearer. type: integer x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Integer erabMbrUl: - description: This attribute indicates the maximum - uplink E-RAB Bit Rate as defined in ETSI TS - 123 401 [i.4] for this bearer. + description: This attribute indicates the maximum uplink E-RAB Bit Rate as defined in ETSI TS 123 401 [i.4] for this bearer. type: integer x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Integer @@ -3130,11 +2900,12 @@ components: x-etsi-mec-origin-type: Structure (inlined) required: - qci + type: object x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Structure (inlined) + minItems: 1 required: - erabId - minItems: 1 type: array x-etsi-mec-cardinality: 1..N x-etsi-mec-origin-type: Structure (inlined) @@ -3152,17 +2923,15 @@ components: x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: Structure (inlined) requestId: - description: Unique identifier allocated by the service consumer for the - RAB Information request. + description: Unique identifier allocated by the service consumer for the RAB Information request. type: string x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: String timeStamp: - allOf: - - $ref: '#/components/schemas/TimeStamp' - description: Time stamp. - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: TimeStamp + # description': Time stamp. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': TimeStamp + $ref: '#/components/schemas/TimeStamp' required: - appInstanceId - requestId @@ -3171,8 +2940,7 @@ components: RabModNotification: properties: associateId: - description: '0 to N identifiers to bind the event for a specific UE or - flow. ' + description: '0 to N identifiers to bind the event for a specific UE or flow. ' items: $ref: '#/components/schemas/AssociateId' minItems: 0 @@ -3180,14 +2948,12 @@ components: x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: AssociateId ecgi: - allOf: - - $ref: '#/components/schemas/Ecgi' - description: E-UTRAN Cell Global Identifier. - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Ecgi + # description': E-UTRAN Cell Global Identifier. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': Ecgi + $ref: '#/components/schemas/Ecgi' erabId: - description: The attribute that uniquely identifies a Radio Access bearer - for specific UE as defined in ETSI TS 136 413 [i.3]. + description: The attribute that uniquely identifies a Radio Access bearer for specific UE as defined in ETSI TS 136 413 [i.3]. type: integer x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Integer @@ -3203,26 +2969,22 @@ components: description: The QoS Information for the E-RAB as defined below. properties: erabGbrDl: - description: This attribute indicates the guaranteed downlink E-RAB - Bit Rate as defined in ETSI TS 123 401 [i.4] for this bearer. + description: This attribute indicates the guaranteed downlink E-RAB Bit Rate as defined in ETSI TS 123 401 [i.4] for this bearer. type: integer x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Integer erabGbrUl: - description: This attribute indicates the guaranteed uplink E-RAB - Bit Rate as defined in ETSI TS 123 401 [i.4] for this bearer. + description: This attribute indicates the guaranteed uplink E-RAB Bit Rate as defined in ETSI TS 123 401 [i.4] for this bearer. type: integer x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Integer erabMbrDl: - description: This attribute indicates the maximum downlink E-RAB - Bit Rate as defined in ETSI TS 123 401 [i.4] for this bearer. + description: This attribute indicates the maximum downlink E-RAB Bit Rate as defined in ETSI TS 123 401 [i.4] for this bearer. type: integer x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Integer erabMbrUl: - description: This attribute indicates the maximum uplink E-RAB Bit - Rate as defined in ETSI TS 123 401 [i.4] for this bearer. + description: This attribute indicates the maximum uplink E-RAB Bit Rate as defined in ETSI TS 123 401 [i.4] for this bearer. type: integer x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Integer @@ -3245,11 +3007,10 @@ components: x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: String timeStamp: - allOf: - - $ref: '#/components/schemas/TimeStamp' - description: Time stamp. - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: TimeStamp + # description': Time stamp. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': TimeStamp + $ref: '#/components/schemas/TimeStamp' required: - notificationType - ecgi @@ -3259,38 +3020,31 @@ components: RabModSubscription: properties: _links: - description: Hyperlink related to the resource. This shall be only included - in the HTTP responses and in HTTP PUT requests. + description: Hyperlink related to the resource. This shall be only included in the HTTP responses and in HTTP PUT requests. properties: self: - allOf: - - $ref: '#/components/schemas/LinkType' - description: Self referring URI. The URI shall be unique within the RNI API as it acts as an ID for the subscription. - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: LinkType + # description': Self referring URI. The URI shall be unique within the RNI 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 x-etsi-mec-origin-type: Structure (inlined) callbackReference: - description: URI selected by the service consumer to receive notifications - on the subscribed RNIS information. This shall be included both in the - request and in response. + description: URI selected by the service consumer to receive notifications on the subscribed RNIS information. This shall be included both in the request and in response. format: uri type: string x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: URI expiryDeadline: - allOf: - - $ref: '#/components/schemas/TimeStamp' - description: Time stamp. - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: TimeStamp + # description': Time stamp. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': TimeStamp + $ref: '#/components/schemas/TimeStamp' filterCriteriaQci: - 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. + 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: appInstanceId: description: Unique identifier for the MEC application instance. @@ -3306,8 +3060,7 @@ components: x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: Ecgi erabId: - description: The attribute that uniquely identifies a Radio Access bearer - for specific UE as defined in ETSI TS 136 413 [i.3]. + description: The attribute that uniquely identifies a Radio Access bearer for specific UE as defined in ETSI TS 136 413 [i.3]. type: integer x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Integer @@ -3336,8 +3089,7 @@ components: RabRelNotification: properties: associateId: - description: 0 to N identifiers to bind the event for a specific UE or flow - as defined below. + description: 0 to N identifiers to bind the event for a specific UE or flow as defined below. items: $ref: '#/components/schemas/AssociateId' minItems: 0 @@ -3345,17 +3097,15 @@ components: x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: AssociateId ecgi: - allOf: - - $ref: '#/components/schemas/Ecgi' - description: E-UTRAN Cell Global Identifier. - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Ecgi + # description': E-UTRAN Cell Global Identifier. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': Ecgi + $ref: '#/components/schemas/Ecgi' erabReleaseInfo: description: The release information for the E-RAB as defined below. properties: erabId: - description: The attribute that uniquely identifies a Radio Access bearer - for specific UE as defined in ETSI TS 136 413 [i.3]. + description: The attribute that uniquely identifies a Radio Access bearer for specific UE as defined in ETSI TS 136 413 [i.3]. type: integer x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Integer @@ -3370,11 +3120,10 @@ components: x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: String timeStamp: - allOf: - - $ref: '#/components/schemas/TimeStamp' - description: Time stamp. - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: TimeStamp + # description': Time stamp. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': TimeStamp + $ref: '#/components/schemas/TimeStamp' required: - notificationType - ecgi @@ -3384,38 +3133,31 @@ components: RabRelSubscription: properties: _links: - description: Hyperlink related to the resource. This shall be only included - in the HTTP responses and in HTTP PUT requests. + description: Hyperlink related to the resource. This shall be only included in the HTTP responses and in HTTP PUT requests. properties: self: - allOf: - - $ref: '#/components/schemas/LinkType' - description: Self referring URI. The URI shall be unique within the RNI API as it acts as an ID for the subscription. - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: LinkType + # description': Self referring URI. The URI shall be unique within the RNI 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 x-etsi-mec-origin-type: Structure (inlined) callbackReference: - description: URI selected by the service consumer to receive notifications - on the subscribed RNIS information. This shall be included both in the - request and in response. + description: URI selected by the service consumer to receive notifications on the subscribed RNIS information. This shall be included both in the request and in response. format: uri type: string x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: URI expiryDeadline: - allOf: - - $ref: '#/components/schemas/TimeStamp' - description: Time stamp. - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: TimeStamp + # description': Time stamp. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': TimeStamp + $ref: '#/components/schemas/TimeStamp' filterCriteriaQci: - 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. + 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: appInstanceId: description: Unique identifier for the MEC application instance. @@ -3431,8 +3173,7 @@ components: x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: Ecgi erabId: - description: The attribute that uniquely identifies a Radio Access bearer - for specific UE as defined in ETSI TS 136 413 [i.3]. + description: The attribute that uniquely identifies a Radio Access bearer for specific UE as defined in ETSI TS 136 413 [i.3]. type: integer x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Integer @@ -3467,11 +3208,7 @@ components: x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Uint8 csiRsResults: - allOf: - - $ref: '#/components/schemas/MeasQuantityResultsNr' - description: '' - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: MeasQuantityResultsNr + $ref: '#/components/schemas/MeasQuantityResultsNr' required: - csiRsIndex type: object @@ -3480,10 +3217,24 @@ components: resultsPerCsiRsIndex: description: '' items: - $ref: '#/components/schemas/ResultsPerCsiRsIndex' + type: object + properties: + csiRsIndex: + description: '' + format: int32 + type: integer + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: Uint8 + csiRsResults: + # description': '' + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': MeasQuantityResultsNr + $ref: '#/components/schemas/MeasQuantityResultsNr' minItems: 0 + required: + - csiRsIndex type: array - x-etsi-mec-cardinality: 0..P + x-etsi-mec-cardinality: "0..P" x-etsi-mec-origin-type: Structure (inline) type: object x-etsi-ref: 6.5.10 @@ -3496,11 +3247,7 @@ components: x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Uint8 ssbResults: - allOf: - - $ref: '#/components/schemas/MeasQuantityResultsNr' - description: '' - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: MeasQuantityResultsNr + $ref: '#/components/schemas/MeasQuantityResultsNr' required: - ssbIndex type: object @@ -3509,8 +3256,22 @@ components: resultsPerSsbIndex: description: '' items: - $ref: '#/components/schemas/ResultsPerSsbIndex' + type: object + properties: + ssbIndex: + description: '' + format: int32 + type: integer + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: Uint8 + ssbResults: + # description': '' + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': MeasQuantityResultsNr + $ref: '#/components/schemas/MeasQuantityResultsNr' minItems: 0 + required: + - ssbIndex type: array x-etsi-mec-cardinality: 0..P x-etsi-mec-origin-type: Structure (inline) @@ -3519,17 +3280,15 @@ components: RsIndexResults: properties: resultsCsiRsIndexes: - allOf: - - $ref: '#/components/schemas/ResultsPerCsiRsIndexList' - description: Beam level measurement results based on CSI-RS related measurements. - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: ResultsPerCsiRsIndexList + # description': Beam level measurement results based on CSI-RS related measurements. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': ResultsPerCsiRsIndexList + $ref: '#/components/schemas/ResultsPerCsiRsIndexList' resultsSsbIndexes: - allOf: - - $ref: '#/components/schemas/ResultsPerSsbIndexList' - description: Beam level measurement results based on SS/PBCH related measurements. - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: ResultsPerSsbIndexList + # description': Beam level measurement results based on SS/PBCH related measurements. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': ResultsPerSsbIndexList + $ref: '#/components/schemas/ResultsPerSsbIndexList' required: - resultsSsbIndexes - resultsCsiRsIndexes @@ -3542,8 +3301,7 @@ components: items: properties: associateId: - description: 1 to N identifiers to associate the information for - a specific UE or flow. + description: 1 to N identifiers to associate the information for a specific UE or flow. items: $ref: '#/components/schemas/AssociateId' minItems: 1 @@ -3583,8 +3341,7 @@ components: x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Structure (inlined) erabId: - description: The attribute that uniquely identifies a S1 bearer - for a specific UE, as defined in ETSI TS 136 413 [i.3]. + description: The attribute that uniquely identifies a S1 bearer for a specific UE, as defined in ETSI TS 136 413 [i.3]. type: integer x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Integer @@ -3607,17 +3364,16 @@ components: type: object x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Structure (inlined) + minItems: 1 required: - erabId - enbInfo - sGwInfo - minItems: 1 type: array x-etsi-mec-cardinality: 1..N x-etsi-mec-origin-type: Structure (inlined) tempUeId: - description: The temporary identifier allocated for the specific - UE as defined below. + description: The temporary identifier allocated for the specific UE as defined below. properties: mmec: description: MMEC as defined in ETSI TS 136 413 [i.3]. @@ -3645,11 +3401,10 @@ components: x-etsi-mec-cardinality: 1..N x-etsi-mec-origin-type: Structure (inlined) timeStamp: - allOf: - - $ref: '#/components/schemas/TimeStamp' - description: 'Time stamp. ' - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: TimeStamp + # description': Time stamp. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': TimeStamp + $ref: '#/components/schemas/TimeStamp' required: - s1UeInfo type: object @@ -3663,19 +3418,15 @@ components: x-etsi-mec-origin-type: String s1Event: description: The subscribed event that triggered this notification in S1BearerSubscription. - enum: - - SEE_DESCRIPTION - type: string + type: integer x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Enum s1UeInfo: - description: Information on specific UE that matches the criteria in S1BearerSubscription - as defined below. + description: Information on specific UE that matches the criteria in S1BearerSubscription as defined below. items: properties: associateId: - description: 0 to N identifiers to associate the information for a - specific UE or flow. + description: 0 to N identifiers to associate the information for a specific UE or flow. items: $ref: '#/components/schemas/AssociateId' minItems: 0 @@ -3694,7 +3445,6 @@ components: description: S1 bearer information as defined below. items: type: object - minItems: 1 properties: enbInfo: description: S1 bearer information on eNB side as defined below. @@ -3716,8 +3466,7 @@ components: x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Structure (inlined) erabId: - description: The attribute that uniquely identifies a S1 bearer - for a specific UE, as defined in ETSI TS 136 413 [i.3]. + description: The attribute that uniquely identifies a S1 bearer for a specific UE, as defined in ETSI TS 136 413 [i.3]. type: integer x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Integer @@ -3740,6 +3489,7 @@ components: type: object x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Structure (inlined) + minItems: 1 required: - erabId - enbInfo @@ -3748,8 +3498,7 @@ components: x-etsi-mec-cardinality: 1..N x-etsi-mec-origin-type: Structure (inlined) tempUeId: - description: The temporary identifier allocated for the specific UE - as defined below. + description: The temporary identifier allocated for the specific UE as defined below. properties: mmec: description: MMEC as defined in ETSI TS 136 413 [i.3]. @@ -3775,11 +3524,10 @@ components: x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Structure (inlined) timeStamp: - allOf: - - $ref: '#/components/schemas/TimeStamp' - description: Time stamp. - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: TimeStamp + # description': Time stamp. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': TimeStamp + $ref: '#/components/schemas/TimeStamp' required: - notificationType - s1Event @@ -3792,8 +3540,7 @@ components: description: As defined below. properties: associateId: - description: 0 to N identifiers to associate the events for a specific - UE or a flow. + description: 0 to N identifiers to associate the events for a specific UE or a flow. items: $ref: '#/components/schemas/AssociateId' minItems: 0 @@ -3809,8 +3556,7 @@ components: x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: Ecgi erabId: - description: The attribute that uniquely identifies a S1 bearer for - a specific UE, as defined in ETSI TS 136 413 [i.3]. + description: The attribute that uniquely identifies a S1 bearer for a specific UE, as defined in ETSI TS 136 413 [i.3]. items: type: integer minItems: 0 @@ -3821,33 +3567,26 @@ components: x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Structure (inlined) _links: - description: Hyperlink related to the resource. This shall be only included - in the HTTP responses and in HTTP PUT requests. + description: Hyperlink related to the resource. This shall be only included in the HTTP responses and in HTTP PUT requests. properties: self: - allOf: - - $ref: '#/components/schemas/LinkType' - description: Self referring URI. The URI shall be unique within the RNI API as it acts as an ID for the subscription. - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: LinkType + # description': Self referring URI. The URI shall be unique within the RNI 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 x-etsi-mec-origin-type: Structure (inlined) callbackReference: - description: URI selected by the service consumer, to receive notifications - on the subscribed RNIS information. This shall be included in the request - and response. + description: URI selected by the service consumer, to receive notifications on the subscribed RNIS information. This shall be included in the request and response. format: uri type: string x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: URI eventType: - description: 'Description of the subscribed event. The event is included - both in the request and in the response. \nFor the eventType, the following - values are currently defined: 0 = RESERVED. 1 = S1_BEARER_ESTABLISH. - 2 = S1_BEARER_MODIFY. 3 = S1_BEARER_RELEASE.' + description: 'Description of the subscribed event. The event is included both in the request and in the response. \nFor the eventType, the following values are currently defined:
0 = RESERVED.
1 = S1_BEARER_ESTABLISH.
2 = S1_BEARER_MODIFY.
3 = S1_BEARER_RELEASE.' items: $ref: '#/components/schemas/Enum' minItems: 1 @@ -3855,11 +3594,10 @@ components: x-etsi-mec-cardinality: 1..N x-etsi-mec-origin-type: Enum expiryDeadline: - allOf: - - $ref: '#/components/schemas/TimeStamp' - description: Time stamp. - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: TimeStamp + # description': Time stamp. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': TimeStamp + $ref: '#/components/schemas/TimeStamp' subscriptionType: description: Shall be set to "S1BearerSubscription". type: string @@ -3878,11 +3616,10 @@ components: description: List of hyperlinks related to the resource. properties: self: - allOf: - - $ref: '#/components/schemas/LinkType' - description: '' - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: LinkType + # description': '' + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': LinkType + $ref: '#/components/schemas/LinkType' subscription: description: A link to a subscription. items: @@ -3895,16 +3632,14 @@ components: x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: URI subscriptionType: - description: "Type of the subscription. The string shall be set\ - \ according to the \"subscriptionType\" attribute of the associated\ - \ subscription data type event defined in clause\_6.3." + description: "Type of the subscription. The string shall be set according to the \"subscriptionType\" attribute of the associated subscription data type event defined in clause\_6.3." type: string x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: String + minItems: 0 required: - href - subscriptionType - minItems: 0 type: array x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: Structure (inlined) @@ -3920,17 +3655,15 @@ components: 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: int32 type: integer - format: uint32 - description: The nanoseconds part of the time. Time is defined as Unix-time - since January 1, 1970, 00:00:00 UTC. 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: int32 type: integer - format: uint32 - description: The seconds part of the time. Time is defined as Unixtime since - January 1, 1970, 00:00:00 UTC. x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Uint32 required: @@ -3939,49 +3672,46 @@ components: type: object x-etsi-ref: 6.5.3 Trigger: - description: As defined in Ref ETSI TS 136 331 [i.7] + description: As defined in Ref ETSI TS 136 331 [i.7]
0 = NOT_AVAILABLE
1 = PERIODICAL_REPORT_STRONGEST_CELLS
2 = PERIODICAL_REPORT_STRONGEST_CELLS_FOR_SON
3 = PERIODICAL_REPORT_CGI
4 = INTRA_PERIODICAL_REPORT_STRONGEST_CELLS
5 = INTRA_PERIODICAL_REPORT_CGI
10 = EVENT_A1
11 = EVENT_A2
12 = EVENT_A3
13 = EVENT_A4
14 = EVENT_A5
15 = EVENT_A6
20 = EVENT_B1
21 = EVENT_B2
20 = EVENT_B1-NR
21 = EVENT_B2-NR
30 = EVENT_C1
31 = EVENT_C2
40 = EVENT_W1
41 = EVENT_W2
42 = EVENT_W3
50 = EVENT_V1
51 = EVENT_V2
60 = EVENT_H1
61 = EVENT_H2 enum: - - 0 = NOT_AVAILABLE - - 1 = PERIODICAL_REPORT_STRONGEST_CELLS - - 2 = PERIODICAL_REPORT_STRONGEST_CELLS_FOR_SON - - 3 = PERIODICAL_REPORT_CGI - - 4 = INTRA_PERIODICAL_REPORT_STRONGEST_CELLS - - 5 = INTRA_PERIODICAL_REPORT_CGI - - 10 = EVENT_A1 - - 11 = EVENT_A2 - - 12 = EVENT_A3 - - 13 = EVENT_A4 - - 14 = EVENT_A5 - - 15 = EVENT_A6 - - 20 = EVENT_B1 - - 21 = EVENT_B2 - - 20 = EVENT_B1-NR - - 21 = EVENT_B2-NR - - 30 = EVENT_C1 - - 31 = EVENT_C2 - - 40 = EVENT_W1 - - 41 = EVENT_W2 - - 42 = EVENT_W3 - - 50 = EVENT_V1 - - 51 = EVENT_V2 - - 60 = EVENT_H1 - - 61 = EVENT_H2 - type: string + - 0 + - 1 + - 2 + - 3 + - 4 + - 5 + - 10 + - 11 + - 12 + - 13 + - 14 + - 15 + - 20 + - 21 + - 30 + - 31 + - 40 + - 41 + - 42 + - 50 + - 51 + - 60 + - 61 + type: integer TriggerNr: - description: The enumeration Trigger represents specified triggers for a 5G - UE Measurement Report. Full details can be found in ETSI TS 138 331 [i.13]). + description: The enumeration Trigger represents specified triggers for a 5G UE Measurement Report. Full details can be found in ETSI TS 138 331 [i.13]).
0 = NOT_AVAILABLE
1 = NR_PERIODICAL
2 = NR_CGI
10 = EVENT_A1
11 = EVENT_A2
12 = EVENT_A3
13 = EVENT_A4
14 = EVENT_A5
15 = EVENT_A6
20 = INTER_RAT_PERIODICAL
21 = INTER_RAT_CGI
30 = EVENT_B1
31 = EVENT_B2 enum: - - 0 = NOT_AVAILABLE - - 1 = NR_PERIODICAL - - 2 = NR_CGI - - 10 = EVENT_A1 - - 11 = EVENT_A2 - - 12 = EVENT_A3 - - 13 = EVENT_A4 - - 14 = EVENT_A5 - - 15 = EVENT_A6 - - 20 = INTER_RAT_PERIODICAL - - 21 = INTER_RAT_CGI - - 30 = EVENT_B1 - - 31 = EVENT_B2 - type: string + - 0 + - 1 + - 2 + - 10 + - 11 + - 12 + - 13 + - 14 + - 15 + - 20 + - 21 + - 30 + - 31 + type: integer diff --git a/proto3/.openapi-generator/FILES b/proto3/.openapi-generator/FILES index db7a8fe2c3e37871c3c51f83facfb8ecfaec833c..152e2653e88ab1c606057f7dda8459f068369e65 100644 --- a/proto3/.openapi-generator/FILES +++ b/proto3/.openapi-generator/FILES @@ -55,7 +55,6 @@ models/nr_meas_rep_ue_notification_s_cell.proto models/nr_meas_rep_ue_notification_serv_cell_meas_info.proto models/nr_meas_rep_ue_subscription.proto models/nr_meas_rep_ue_subscription_filter_criteria_nr_mrs.proto -models/nr_meas_rep_ue_subscription_links.proto models/plmn.proto models/plmn_info.proto models/problem_details.proto @@ -68,8 +67,6 @@ models/rab_est_subscription_filter_criteria_qci.proto models/rab_info.proto models/rab_info_cell_user_info.proto models/rab_info_erab_info.proto -models/rab_info_erab_qos_parameters.proto -models/rab_info_erab_qos_parameters_qos_information.proto models/rab_info_ue_info.proto models/rab_mod_notification.proto models/rab_mod_notification_erab_qos_parameters.proto @@ -81,8 +78,10 @@ models/rab_rel_notification_erab_release_info.proto models/rab_rel_subscription.proto models/results_per_csi_rs_index.proto models/results_per_csi_rs_index_list.proto +models/results_per_csi_rs_index_list_results_per_csi_rs_index.proto models/results_per_ssb_index.proto models/results_per_ssb_index_list.proto +models/results_per_ssb_index_list_results_per_ssb_index.proto models/rs_index_results.proto models/s1_bearer_info.proto models/s1_bearer_info_enb_info.proto @@ -90,7 +89,6 @@ models/s1_bearer_info_s1_bearer_info_detailed.proto models/s1_bearer_info_s1_ue_info.proto models/s1_bearer_info_s_gw_info.proto models/s1_bearer_notification.proto -models/s1_bearer_notification_s1_bearer_info.proto models/s1_bearer_notification_s1_ue_info.proto models/s1_bearer_subscription.proto models/s1_bearer_subscription_s1_bearer_subscription_criteria.proto @@ -100,4 +98,4 @@ models/subscription_link_list_links_subscription.proto models/time_stamp.proto models/trigger.proto models/trigger_nr.proto -services/_service.proto +services/rni_service.proto diff --git a/proto3/models/associate_id.proto b/proto3/models/associate_id.proto index e9898923a1ed80449e53fab3486975d4bd7c1ffc..f93dd7525682931aebfd311988c36590aedb4580 100644 --- a/proto3/models/associate_id.proto +++ b/proto3/models/associate_id.proto @@ -15,13 +15,13 @@ package mec012; message AssociateId { - // Numeric value (0-255) corresponding to specified type of identifier as following: 0 = reserved. 1= UE_IPv4_ADDRESS. 2 = UE_IPV6_ADDRESS. 3 = NATED_IP_ADDRESS. 4 = GTP_TEID. + // Numeric value (0-255) corresponding to specified type of identifier as following:
0 = reserved.
1 = UE_IPv4_ADDRESS.
2 = UE_IPV6_ADDRESS.
3 = NATED_IP_ADDRESS.
4 = GTP_TEID. enum TypeEnum { - _0_RESERVED = 0; - _1_UE_IPV4_ADDRESS = 1; - _2_UE_IPV6_ADDRESS = 2; - _3_NATED_IP_ADDRESS = 3; - _4_GTP_TEID = 4; + _0 = 0; + _1 = 1; + _2 = 2; + _3 = 3; + _4 = 4; } TypeEnum type = 1; diff --git a/proto3/models/ca_reconf_notification.proto b/proto3/models/ca_reconf_notification.proto index 36ba8db2dade973432710e2e92b4508fc5e962e8..5edea6ddde11729ae20a96e6a03d32b15ec70789 100644 --- a/proto3/models/ca_reconf_notification.proto +++ b/proto3/models/ca_reconf_notification.proto @@ -26,7 +26,6 @@ message CaReconfNotification { // This parameter can be repeated to contain information of all the carriers assign for Carrier Aggregation up to M. repeated CaReconfNotificationCarrierAggregationMeasInfo carrierAggregationMeasInfo = 2; - // E-UTRAN Cell Global Identifier. Ecgi ecgi = 3; // Shall be set to \"CaReConfNotification\". @@ -36,7 +35,6 @@ message CaReconfNotification { repeated CaReconfNotificationSecondaryCellAdd secondaryCellRemove = 6; - // Time stamp. TimeStamp timeStamp = 7; } diff --git a/proto3/models/ca_reconf_notification_carrier_aggregation_meas_info.proto b/proto3/models/ca_reconf_notification_carrier_aggregation_meas_info.proto index 2c9efb9d909462196b3abf1b2a38117423fce469..05f90f26d9fa6371715488b4fa77745220bae795 100644 --- a/proto3/models/ca_reconf_notification_carrier_aggregation_meas_info.proto +++ b/proto3/models/ca_reconf_notification_carrier_aggregation_meas_info.proto @@ -15,10 +15,10 @@ package mec012; message CaReconfNotificationCarrierAggregationMeasInfo { - // E-UTRAN Cell Identity of the best neighbouring cell associated with the Carrier Aggregation serving cell. + // String representing the E-UTRAN Cell Identity. Encoded as a bit string (size (28)) as defined in ETSI TS 136 413 [i.3]. string cellIdNei = 1; - // E-UTRAN Cell Identity of a Carrier Aggregation serving cell. + // String representing the E-UTRAN Cell Identity. Encoded as a bit string (size (28)) as defined in ETSI TS 136 413 [i.3]. string cellIdSrv = 2; // Reference Signal Received Power as defined in ETSI TS 136 214 [i.5]. diff --git a/proto3/models/ca_reconf_notification_secondary_cell_add.proto b/proto3/models/ca_reconf_notification_secondary_cell_add.proto index 4f97bd99b9014b57078bd1e0f9683d97a146011e..9844c6329b20f14ddac1492dd8bbbcaafa8ec920 100644 --- a/proto3/models/ca_reconf_notification_secondary_cell_add.proto +++ b/proto3/models/ca_reconf_notification_secondary_cell_add.proto @@ -16,7 +16,6 @@ import public "models/ecgi.proto"; message CaReconfNotificationSecondaryCellAdd { - // E-UTRAN Cell Global Identifier. Ecgi ecgi = 1; } diff --git a/proto3/models/ca_reconf_subscription.proto b/proto3/models/ca_reconf_subscription.proto index 91aaa4615d86a91ce67237d964d3b6529a087e57..46e5bfa6604a23b214b0c2f0fd6e590e72e87397 100644 --- a/proto3/models/ca_reconf_subscription.proto +++ b/proto3/models/ca_reconf_subscription.proto @@ -23,7 +23,6 @@ message CaReconfSubscription { // URI selected by the service consumer to receive notifications on the subscribed RNIS information. This shall be included both in the request and in response. string callbackReference = 2; - // Time stamp. TimeStamp expiryDeadline = 3; CaReconfSubscriptionFilterCriteriaAssoc filterCriteriaAssoc = 4; diff --git a/proto3/models/ca_reconf_subscription_links.proto b/proto3/models/ca_reconf_subscription_links.proto index 62ca8c724ea9bae16e38b45845e9220ab656ef1b..07c7b57fd99379878723334ef3b5a410fcb96b93 100644 --- a/proto3/models/ca_reconf_subscription_links.proto +++ b/proto3/models/ca_reconf_subscription_links.proto @@ -16,7 +16,6 @@ import public "models/link_type.proto"; message CaReconfSubscriptionLinks { - // Self referring URI. The URI shall be unique within the RNI API as it acts as an ID for the subscription. LinkType self = 1; } diff --git a/proto3/models/cell_change_notification.proto b/proto3/models/cell_change_notification.proto index b8a6ff947e88a6803fadcdb6945ee8eb0f76f69c..9e6e1e67a28d9a8e9e9f50bd4ffadc83459cb3da 100644 --- a/proto3/models/cell_change_notification.proto +++ b/proto3/models/cell_change_notification.proto @@ -22,13 +22,13 @@ message CellChangeNotification { // 0 to N identifiers to associate the event for a specific UE or flow. repeated AssociateId associateId = 1; - // Indicate the status of the UE handover procedure. Values are defined as following: 1 = IN_PREPARATION. 2 = IN_EXECUTION. 3 = COMPLETED. 4 = REJECTED. 5 = CANCELLED. + // Indicate the status of the UE handover procedure. Values are defined as following:
1 = IN_PREPARATION.
2 = IN_EXECUTION.
3 = COMPLETED.
4 = REJECTED.
5 = CANCELLED. enum HoStatusEnum { - _1_IN_PREPARATION = 0; - _2_IN_EXECUTION = 1; - _3_COMPLETED = 2; - _4_REJECTED = 3; - _5_CANCELLED = 4; + _1 = 0; + _2 = 1; + _3 = 2; + _4 = 3; + _5 = 4; } HoStatusEnum hoStatus = 2; @@ -36,12 +36,10 @@ message CellChangeNotification { // Shall be set to \"CellChangeNotification\". string notificationType = 3; - // E-UTRAN Cell Global Identifier of the source cell. Ecgi srcEcgi = 4; CellChangeNotificationTempUeId tempUeId = 5; - // Time stamp. TimeStamp timeStamp = 6; // E-UTRAN Cell Global Identifier of the target cell. NOTE: Cardinality N is valid only in case of statuses IN_PREPARATION, REJECTED and CANCELLED. diff --git a/proto3/models/cell_change_subscription.proto b/proto3/models/cell_change_subscription.proto index 8e2a027e1b90ddfc57e76ff140ad74ae51323574..f087ccc7ff72ed959db4efea24ff186c07311f76 100644 --- a/proto3/models/cell_change_subscription.proto +++ b/proto3/models/cell_change_subscription.proto @@ -20,10 +20,9 @@ message CellChangeSubscription { CaReconfSubscriptionLinks Underscorelinks = 1; - // URI selected by the service consumer to receive notifications on the subscribed RNIS information. This shall be included both in the request and in response. + // URI selected by the service consumerto receive notifications on the subscribed RNIS information. This shall be included both in the request and in response. string callbackReference = 2; - // Time stamp. TimeStamp expiryDeadline = 3; CellChangeSubscriptionFilterCriteriaAssocHo filterCriteriaAssocHo = 4; diff --git a/proto3/models/cell_change_subscription_filter_criteria_assoc_ho.proto b/proto3/models/cell_change_subscription_filter_criteria_assoc_ho.proto index e83a082351038c39a9af5c8031b7e5240a412678..7fab40f31dcee41711184958685f0cfbe4674115 100644 --- a/proto3/models/cell_change_subscription_filter_criteria_assoc_ho.proto +++ b/proto3/models/cell_change_subscription_filter_criteria_assoc_ho.proto @@ -26,7 +26,7 @@ message CellChangeSubscriptionFilterCriteriaAssocHo { // E-UTRAN Cell Global Identifier. repeated Ecgi ecgi = 3; - // In case hoStatus is not included in the subscription request, the default value 3 = COMPLETED shall be used and included in the response: 1 = IN_PREPARATION. 2 = IN_EXECUTION. 3 = COMPLETED. 4 = REJECTED. 5 = CANCELLED. + // In case hoStatus is not included in the subscription request, the default value 3 = COMPLETED shall be used and included in the response:
1 = IN_PREPARATION.
2 = IN_EXECUTION.
3 = COMPLETED.
4 = REJECTED.
5 = CANCELLED. repeated int32 hoStatus = 4; } diff --git a/proto3/models/ecgi.proto b/proto3/models/ecgi.proto index 876a2d4d5f222361a02b7c65af26db36ffe404b3..feadb294c363a4c9c1580d2324d877ea1be90328 100644 --- a/proto3/models/ecgi.proto +++ b/proto3/models/ecgi.proto @@ -16,10 +16,9 @@ import public "models/plmn.proto"; message Ecgi { - // E-UTRAN Cell Global Identifier. + // String representing the E-UTRAN Cell Identity. Encoded as a bit string (size (28)) as defined in ETSI TS 136 413 [i.3]. string cellId = 1; - // Public Land Mobile Network Identity. Plmn plmn = 2; } diff --git a/proto3/models/expiry_notification.proto b/proto3/models/expiry_notification.proto index f55eb8529b0c1734c9e64acb1a4e261b3a34557c..945bbc37aacb29e989fadc4f4d34a9af7364558b 100644 --- a/proto3/models/expiry_notification.proto +++ b/proto3/models/expiry_notification.proto @@ -19,10 +19,8 @@ message ExpiryNotification { ExpiryNotificationLinks Underscorelinks = 1; - // Time stamp. TimeStamp expiryDeadline = 2; - // Time stamp. TimeStamp timeStamp = 3; } diff --git a/proto3/models/l2_meas.proto b/proto3/models/l2_meas.proto index a3fce427d4d1b434b348bada9a86a54167f316f7..7119f86c381aa49264778e68631e0441682fb018 100644 --- a/proto3/models/l2_meas.proto +++ b/proto3/models/l2_meas.proto @@ -24,7 +24,6 @@ message L2Meas { // The per cell per UE layer 2 measurements information as defined below. repeated L2MeasCellUEInfo cellUEInfo = 2; - // Time stamp. TimeStamp timeStamp = 3; } diff --git a/proto3/models/l2_meas_cell_info.proto b/proto3/models/l2_meas_cell_info.proto index 2c332d52c4868cf51f6cfe0a4170dba68edb9175..1f2cc45feab922dad7df45c6e1a6b5994cc3e93d 100644 --- a/proto3/models/l2_meas_cell_info.proto +++ b/proto3/models/l2_meas_cell_info.proto @@ -31,7 +31,6 @@ message L2MeasCellInfo { // It indicates (in percentage) the PRB usage for total downlink traffic, as defined in ETSI TS 136 314 [i.11] and ETSI TS 136 423 [i.12]. int32 dlUnderscoretotalUnderscoreprbUnderscoreusageUnderscorecell = 5; - // E-UTRAN Cell Global Identifier. Ecgi ecgi = 6; // It indicates the number of active UEs with downlink GBR traffic, as defined in ETSI TS 136 314 [i.11]. diff --git a/proto3/models/l2_meas_cell_ue_info.proto b/proto3/models/l2_meas_cell_ue_info.proto index aea69b46a3b5f2bc00b33eeab6c46a1c2af8e50f..ef82e6b4905e9eadaf791238d93f6a848d2b5f80 100644 --- a/proto3/models/l2_meas_cell_ue_info.proto +++ b/proto3/models/l2_meas_cell_ue_info.proto @@ -17,7 +17,6 @@ import public "models/ecgi.proto"; message L2MeasCellUEInfo { - // Identifier to associate the information for a specific UE or flow. AssociateId associateId = 1; // It indicates the data volume of the downlink GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11]. @@ -44,7 +43,6 @@ message L2MeasCellUEInfo { // It indicates the scheduled throughput of the downlink nonGBR traffic of a UE, as defined in ETSI TS 136 314 [i.11]. int32 dlUnderscorenongbrUnderscorethroughputUnderscoreue = 9; - // E-UTRAN Cell Global Identifier. Ecgi ecgi = 10; // It indicates the data volume of the uplink GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11]. diff --git a/proto3/models/meas_rep_ue_notification.proto b/proto3/models/meas_rep_ue_notification.proto index 65d04aa7937fe9bdc2bb51b64ebad61e1d0eb71e..151ae82700c10fe57c3f7041e8f3987bc96cbc31 100644 --- a/proto3/models/meas_rep_ue_notification.proto +++ b/proto3/models/meas_rep_ue_notification.proto @@ -29,7 +29,6 @@ message MeasRepUeNotification { // This parameter can be repeated to contain information of all the carriers assign for Carrier Aggregation up to M. repeated MeasRepUeNotificationCarrierAggregationMeasInfo carrierAggregationMeasInfo = 2; - // E-UTRAN Cell Global Identifier of the Primary serving Cell (PCell), as defined in ETSI TS 136 331 [i.7]. Ecgi ecgi = 3; // This parameter can be repeated to contain information of all the neighbouring cells up to N. @@ -62,10 +61,8 @@ message MeasRepUeNotification { // Reference Signal \"Signal to Interference plus Noise Ratio\", with value mapping defined in ETSI TS 136 133 [i.16]. int32 sinr = 13; - // Time stamp. TimeStamp timeStamp = 14; - // Corresponds to a specific E-UTRAN UE Measurement Report trigger. Trigger trigger = 15; } diff --git a/proto3/models/meas_rep_ue_notification_carrier_aggregation_meas_info.proto b/proto3/models/meas_rep_ue_notification_carrier_aggregation_meas_info.proto index 9c97f94c0d65b81fe85a5afeec578a4b0eed615d..459a5d8c5d8895ddebb0c2b1d270f931bcd4a879 100644 --- a/proto3/models/meas_rep_ue_notification_carrier_aggregation_meas_info.proto +++ b/proto3/models/meas_rep_ue_notification_carrier_aggregation_meas_info.proto @@ -15,10 +15,10 @@ package mec012; message MeasRepUeNotificationCarrierAggregationMeasInfo { - // E-UTRAN Cell Identity of the best neighbouring cell (NCell) associated with the SCell, as defined in ETSI TS 136 331 [i.7]. + // String representing the E-UTRAN Cell Identity. Encoded as a bit string (size (28)) as defined in ETSI TS 136 413 [i.3]. string cellIdNei = 1; - // E-UTRAN Cell Identity of a Secondary serving Cell (SCell), as defined in ETSI TS 136 331 [i.7]. + // String representing the E-UTRAN Cell Identity. Encoded as a bit string (size (28)) as defined in ETSI TS 136 413 [i.3]. string cellIdSrv = 2; // Reference Signal Received Power as defined in ETSI TS 136 214 [i.5]. diff --git a/proto3/models/meas_rep_ue_notification_eutran_neighbour_cell_meas_info.proto b/proto3/models/meas_rep_ue_notification_eutran_neighbour_cell_meas_info.proto index a827f1edb2f9d8495efb894d39caec8191af6993..74d1b526e900faded574ad8b0e4610ea20e5485a 100644 --- a/proto3/models/meas_rep_ue_notification_eutran_neighbour_cell_meas_info.proto +++ b/proto3/models/meas_rep_ue_notification_eutran_neighbour_cell_meas_info.proto @@ -16,7 +16,6 @@ import public "models/ecgi.proto"; message MeasRepUeNotificationEutranNeighbourCellMeasInfo { - // E-UTRAN Cell Global Identifier. Ecgi ecgi = 1; // Reference Signal Received Power as defined in ETSI TS 136 214 [i.5]. diff --git a/proto3/models/meas_rep_ue_notification_new_radio_meas_nei_info.proto b/proto3/models/meas_rep_ue_notification_new_radio_meas_nei_info.proto index 1cd692ea9b7c4b40d9bf1ca98be1db2ba45a6d4c..af990a3a7f319292d0cdfcea913aa58c04dcb757 100644 --- a/proto3/models/meas_rep_ue_notification_new_radio_meas_nei_info.proto +++ b/proto3/models/meas_rep_ue_notification_new_radio_meas_nei_info.proto @@ -29,7 +29,6 @@ message MeasRepUeNotificationNewRadioMeasNeiInfo { // Reference signal SINR measurement according to mapping table in ETSI TS 138.133 [i.14]. int32 nrNCellRssi = 4; - // Beam level measurements results of a NR cell. RsIndexResults rsIndexResults = 5; } diff --git a/proto3/models/meas_rep_ue_notification_nr_bn_cs_nr_bn_cell_info.proto b/proto3/models/meas_rep_ue_notification_nr_bn_cs_nr_bn_cell_info.proto index 51857ea980b5d15baaef1f852cbca18561faad97..8f86c32dc803c04ff78309f698917c0c502d23ce 100644 --- a/proto3/models/meas_rep_ue_notification_nr_bn_cs_nr_bn_cell_info.proto +++ b/proto3/models/meas_rep_ue_notification_nr_bn_cs_nr_bn_cell_info.proto @@ -16,7 +16,7 @@ import public "models/plmn.proto"; message MeasRepUeNotificationNrBNCsNrBNCellInfo { - // Cell Global Identifier, as defined in ETSI TS 138 331 [i.13]. + // String representing the NR Cell Identity. Encoded as a bit string (size (36)) as defined in ETSI TS 138 423 [i.17]. string nrBNCellGId = 1; // Public land mobile network identities diff --git a/proto3/models/meas_rep_ue_notification_nr_n_cell_info.proto b/proto3/models/meas_rep_ue_notification_nr_n_cell_info.proto index 9f69e8d8595843ed7c28d574b256b7d672b4c0ad..c69a2baea5746117ce3a02f60d8821f34f36ddf2 100644 --- a/proto3/models/meas_rep_ue_notification_nr_n_cell_info.proto +++ b/proto3/models/meas_rep_ue_notification_nr_n_cell_info.proto @@ -16,7 +16,7 @@ import public "models/plmn.proto"; message MeasRepUeNotificationNrNCellInfo { - // Cell Global Identifier, as defined in ETSI TS 138 331 [i.13]. + // String representing the NR Cell Identity. Encoded as a bit string (size (36)) as defined in ETSI TS 138 423 [i.17]. string nrNCellGId = 1; // Public land mobile network identities. diff --git a/proto3/models/meas_rep_ue_notification_nr_s_cs_nr_s_cell_info.proto b/proto3/models/meas_rep_ue_notification_nr_s_cs_nr_s_cell_info.proto index 5dd54ab21a98c5ed86e7c4a066a7b4d6d420f5bd..dc25b75604e03c03e5d59b6e0a7e994beaf6a9e4 100644 --- a/proto3/models/meas_rep_ue_notification_nr_s_cs_nr_s_cell_info.proto +++ b/proto3/models/meas_rep_ue_notification_nr_s_cs_nr_s_cell_info.proto @@ -16,7 +16,7 @@ import public "models/plmn.proto"; message MeasRepUeNotificationNrSCsNrSCellInfo { - // Cell Global Identifier, as defined in ETSI TS 138 331 [i.13]. + // String representing the NR Cell Identity. Encoded as a bit string (size (36)) as defined in ETSI TS 138 423 [i.17]. string nrSCellGId = 1; // Public land mobile network identities. diff --git a/proto3/models/meas_rep_ue_subscription.proto b/proto3/models/meas_rep_ue_subscription.proto index 99db46e59ee41e38346ae8c8b9dd893e9e83946b..194a0ba54f11cdbcabdc8f12d6de1e5a898e20f0 100644 --- a/proto3/models/meas_rep_ue_subscription.proto +++ b/proto3/models/meas_rep_ue_subscription.proto @@ -23,7 +23,6 @@ message MeasRepUeSubscription { // URI selected by the service consumer to receive notifications on the subscribed RNIS information. This shall be included both in the request and in response. string callbackReference = 2; - // Time stamp. TimeStamp expiryDeadline = 3; MeasRepUeSubscriptionFilterCriteriaAssocTri filterCriteriaAssocTri = 4; diff --git a/proto3/models/meas_ta_notification.proto b/proto3/models/meas_ta_notification.proto index fb4658a7f3fe397a80247ff9f0508fb6c8c03e1c..b428cbf3a900674af8ce636c4edf3ce8d610069b 100644 --- a/proto3/models/meas_ta_notification.proto +++ b/proto3/models/meas_ta_notification.proto @@ -21,13 +21,11 @@ message MeasTaNotification { // 0 to N identifiers to associate the event for a specific UE or flow. repeated AssociateId associateId = 1; - // E-UTRAN Cell Global Identifier. Ecgi ecgi = 2; // Shall be set to \"MeasTaNotification\". string notificationType = 3; - // Time stamp. TimeStamp timeStamp = 4; // The timing advance as defined in ETSI TS 136 214 [i.5]. diff --git a/proto3/models/meas_ta_subscription.proto b/proto3/models/meas_ta_subscription.proto index 56a875ed647ebd50f214022e68c7eafe077e28b3..5f062f1f75b0d0bd3dbb04a3bce49fd1d317c9ff 100644 --- a/proto3/models/meas_ta_subscription.proto +++ b/proto3/models/meas_ta_subscription.proto @@ -23,7 +23,6 @@ message MeasTaSubscription { // URI selected by the service consumer to receive notifications on the subscribed RNIS information. This shall be included both in the request and in response. string callbackReference = 2; - // Time stamp. TimeStamp expiryDeadline = 3; CaReconfSubscriptionFilterCriteriaAssoc filterCriteriaAssoc = 4; diff --git a/proto3/models/n_rcgi.proto b/proto3/models/n_rcgi.proto index c4805f2613ed022911a30ea3c8be9a2fd909a143..16f97caeebf9678753f899fadfe3ab133104310f 100644 --- a/proto3/models/n_rcgi.proto +++ b/proto3/models/n_rcgi.proto @@ -16,10 +16,9 @@ import public "models/plmn.proto"; message NRcgi { - // NR Cell Global Identifier. + // String representing the NR Cell Identity. Encoded as a bit string (size (36)) as defined in ETSI TS 138 423 [i.17]. string nrcellId = 1; - // Public Land Mobile Network Identity. Plmn plmn = 2; } diff --git a/proto3/models/nr_meas_rep_ue_notification.proto b/proto3/models/nr_meas_rep_ue_notification.proto index 04c758b872bda38a2915694dbf7e4e789d4cd49e..8e566d2e7cea02cd27eba4e0c702f9e195b3a5e4 100644 --- a/proto3/models/nr_meas_rep_ue_notification.proto +++ b/proto3/models/nr_meas_rep_ue_notification.proto @@ -36,10 +36,8 @@ message NrMeasRepUeNotification { // This parameter can be repeated to contain information of all the serving cells up to N. repeated NrMeasRepUeNotificationServCellMeasInfo servCellMeasInfo = 5; - // Time stamp. TimeStamp timeStamp = 6; - // Corresponds to a specific 5G UE Measurement Report trigger. TriggerNr triggerNr = 7; } diff --git a/proto3/models/nr_meas_rep_ue_notification_eutra_neigh_cell_meas_info.proto b/proto3/models/nr_meas_rep_ue_notification_eutra_neigh_cell_meas_info.proto index ee753f8738efb08c9bf6d7394e93bf930ce2e760..f077dabe46822dc9a2429d17f0b1422148c4748c 100644 --- a/proto3/models/nr_meas_rep_ue_notification_eutra_neigh_cell_meas_info.proto +++ b/proto3/models/nr_meas_rep_ue_notification_eutra_neigh_cell_meas_info.proto @@ -16,7 +16,6 @@ import public "models/ecgi.proto"; message NrMeasRepUeNotificationEutraNeighCellMeasInfo { - // Cell Global Identifier. Ecgi ecgi = 1; // Reference Signal Received Power as defined in ETSI TS 138 331 [i.13]. diff --git a/proto3/models/nr_meas_rep_ue_notification_n_cell.proto b/proto3/models/nr_meas_rep_ue_notification_n_cell.proto index 3d4da28aa1747e25e0546e7f1fd47adba7ca932f..c261b8abe304b3ffef9210da1e015ef7a64a32d2 100644 --- a/proto3/models/nr_meas_rep_ue_notification_n_cell.proto +++ b/proto3/models/nr_meas_rep_ue_notification_n_cell.proto @@ -17,13 +17,10 @@ import public "models/rs_index_results.proto"; message NrMeasRepUeNotificationNCell { - // Measurement quantity results relating to the Channel State Information Reference Signal. MeasQuantityResultsNr measQuantityResultsCsiRsCell = 1; - // Measurement quantity results relating to the Synchronization Signal Block. MeasQuantityResultsNr measQuantityResultsSsbCell = 2; - // Beam level measurement information RsIndexResults rsIndexResults = 3; } diff --git a/proto3/models/nr_meas_rep_ue_notification_nr_neigh_cell_meas_info.proto b/proto3/models/nr_meas_rep_ue_notification_nr_neigh_cell_meas_info.proto index c5c02477f213c026e2fda19479c6025f7d8954f5..da0ab4176c6d3299072a3a8d617322e75a6d8025 100644 --- a/proto3/models/nr_meas_rep_ue_notification_nr_neigh_cell_meas_info.proto +++ b/proto3/models/nr_meas_rep_ue_notification_nr_neigh_cell_meas_info.proto @@ -17,16 +17,13 @@ import public "models/rs_index_results.proto"; message NrMeasRepUeNotificationNrNeighCellMeasInfo { - // Measurement quantity results relating to the Channel State Information Reference Signal of the neighbouring cells. MeasQuantityResultsNr measQuantityResultsCsiRsCell = 1; - // Measurement quantity results relating to the Synchronization Signal Block of the neighbouring cells. MeasQuantityResultsNr measQuantityResultsSsbCell = 2; - // Cell Global Identifier. + // String representing the NR Cell Identity. Encoded as a bit string (size (36)) as defined in ETSI TS 138 423 [i.17]. string nrcgi = 3; - // Beam level measurement information. RsIndexResults rsIndexResults = 4; } diff --git a/proto3/models/nr_meas_rep_ue_notification_s_cell.proto b/proto3/models/nr_meas_rep_ue_notification_s_cell.proto index 22ea47d1b911abc8ecc90bd33b9db4b7966a16f6..524ec2864029bd7e9374924c051132afd74e9a21 100644 --- a/proto3/models/nr_meas_rep_ue_notification_s_cell.proto +++ b/proto3/models/nr_meas_rep_ue_notification_s_cell.proto @@ -17,13 +17,10 @@ import public "models/rs_index_results.proto"; message NrMeasRepUeNotificationSCell { - // Measurement quantity results relating to the Channel State Information Reference Signal. MeasQuantityResultsNr measQuantityResultsCsiRsCell = 1; - // Measurement quantity results relating to the Synchronization Signal Block. MeasQuantityResultsNr measQuantityResultsSsbCell = 2; - // Beam level measurement information RsIndexResults rsIndexResults = 3; } diff --git a/proto3/models/nr_meas_rep_ue_notification_serv_cell_meas_info.proto b/proto3/models/nr_meas_rep_ue_notification_serv_cell_meas_info.proto index c0260b27485b3585704cf04c53531021e40c2920..cc396720a2975ffff071eb41e759a8e4e3b0a4e0 100644 --- a/proto3/models/nr_meas_rep_ue_notification_serv_cell_meas_info.proto +++ b/proto3/models/nr_meas_rep_ue_notification_serv_cell_meas_info.proto @@ -20,7 +20,6 @@ message NrMeasRepUeNotificationServCellMeasInfo { NrMeasRepUeNotificationNCell nCell = 1; - // NR Cell Global Identifier. NRcgi nrcgi = 2; NrMeasRepUeNotificationSCell sCell = 3; diff --git a/proto3/models/nr_meas_rep_ue_subscription.proto b/proto3/models/nr_meas_rep_ue_subscription.proto index bbc85c4911eb8a581ef3a25b2966971d35e0f2b7..b0c4c4e30c5915f402bdb42362f48c0717816c1e 100644 --- a/proto3/models/nr_meas_rep_ue_subscription.proto +++ b/proto3/models/nr_meas_rep_ue_subscription.proto @@ -12,18 +12,17 @@ syntax = "proto3"; package mec012; +import public "models/ca_reconf_subscription_links.proto"; import public "models/nr_meas_rep_ue_subscription_filter_criteria_nr_mrs.proto"; -import public "models/nr_meas_rep_ue_subscription_links.proto"; import public "models/time_stamp.proto"; message NrMeasRepUeSubscription { - NrMeasRepUeSubscriptionLinks Underscorelinks = 1; + CaReconfSubscriptionLinks Underscorelinks = 1; // URI selected by the service consumer to receive notifications on the subscribed RNIS information. This shall be included both in the request and in response. string callbackReference = 2; - // Time stamp. TimeStamp expiryDeadline = 3; NrMeasRepUeSubscriptionFilterCriteriaNrMrs filterCriteriaNrMrs = 4; diff --git a/proto3/models/plmn_info.proto b/proto3/models/plmn_info.proto index 16190a6180b3a5f47f827c12d001bb70ac6797f4..6240e7a5671dad18d435566ff08b096b6ebd3bb4 100644 --- a/proto3/models/plmn_info.proto +++ b/proto3/models/plmn_info.proto @@ -23,7 +23,6 @@ message PlmnInfo { // Public Land Mobile Network Identity. repeated Plmn plmn = 2; - // Time stamp. TimeStamp timeStamp = 3; } diff --git a/proto3/models/rab_est_notification.proto b/proto3/models/rab_est_notification.proto index debc32b8dce6cb00639792c40eb911d5e552e383..321a92315f6114be0edf2b5c250f6ae80f9743f0 100644 --- a/proto3/models/rab_est_notification.proto +++ b/proto3/models/rab_est_notification.proto @@ -23,7 +23,6 @@ message RabEstNotification { // 0 to N identifiers to bind the event for a specific UE or flow. repeated AssociateId associateId = 1; - // E-UTRAN Cell Global Identifier. Ecgi ecgi = 2; // The attribute that uniquely identifies a Radio Access bearer for specific UE as defined in ETSI TS 136 413 [i.3]. @@ -36,7 +35,6 @@ message RabEstNotification { RabEstNotificationTempUeId tempUeId = 6; - // Time stamp. TimeStamp timeStamp = 7; } diff --git a/proto3/models/rab_est_subscription.proto b/proto3/models/rab_est_subscription.proto index 73dfa3ac5f673ac5982b4cf026009d00fa238a6e..3ceeb9bb7382da8bfef50f666abf91e96fafd7c5 100644 --- a/proto3/models/rab_est_subscription.proto +++ b/proto3/models/rab_est_subscription.proto @@ -23,7 +23,6 @@ message RabEstSubscription { // URI selected by the service consumer to receive notifications on the subscribed RNIS information. This shall be included both in the request and in response. string callbackReference = 2; - // Time stamp. TimeStamp expiryDeadline = 3; RabEstSubscriptionFilterCriteriaQci filterCriteriaQci = 4; diff --git a/proto3/models/rab_info.proto b/proto3/models/rab_info.proto index aaf62ec49c708b2a3e00056756ad35d9f09a4fc6..515797a1d1550c6376f329168e387127e808bc1b 100644 --- a/proto3/models/rab_info.proto +++ b/proto3/models/rab_info.proto @@ -26,7 +26,6 @@ message RabInfo { // Unique identifier allocated by the service consumer for the RAB Information request. string requestId = 3; - // Time stamp. TimeStamp timeStamp = 4; } diff --git a/proto3/models/rab_info_cell_user_info.proto b/proto3/models/rab_info_cell_user_info.proto index f10064d63e620daf340489c9a0630108e5a021cb..9448c2543b5c286ad7ae0611d8bcc002632cabc6 100644 --- a/proto3/models/rab_info_cell_user_info.proto +++ b/proto3/models/rab_info_cell_user_info.proto @@ -17,7 +17,6 @@ import public "models/rab_info_ue_info.proto"; message RabInfoCellUserInfo { - // E-UTRAN Cell Global Identifier. Ecgi ecgi = 1; // Information on UEs in the specific cell as defined below. diff --git a/proto3/models/rab_info_erab_info.proto b/proto3/models/rab_info_erab_info.proto index 04c5a820225d16211e6d292b835f7cbb57d10f78..178d1d0161970c4ff0a9dd828c74e48dfbc829e0 100644 --- a/proto3/models/rab_info_erab_info.proto +++ b/proto3/models/rab_info_erab_info.proto @@ -12,13 +12,13 @@ syntax = "proto3"; package mec012; -import public "models/rab_info_erab_qos_parameters.proto"; +import public "models/rab_est_notification_erab_qos_parameters.proto"; message RabInfoErabInfo { // The attribute that uniquely identifies a Radio Access bearer for specific UE as defined in ETSI TS 136 413 [i.3]. int32 erabId = 1; - RabInfoErabQosParameters erabQosParameters = 2; + RabEstNotificationErabQosParameters erabQosParameters = 2; } diff --git a/proto3/models/rab_info_erab_qos_parameters_qos_information.proto b/proto3/models/rab_info_erab_qos_parameters_qos_information.proto deleted file mode 100644 index ccbf4867406703febe67824ffbe4c6f5811f8dc1..0000000000000000000000000000000000000000 --- a/proto3/models/rab_info_erab_qos_parameters_qos_information.proto +++ /dev/null @@ -1,30 +0,0 @@ -/* - ETSI GS MEC 012 - Radio Network Information API - - The ETSI MEC ISG MEC012 Radio Network Information API described using OpenAPI. - - The version of the OpenAPI document: 2.1.1 - - Generated by OpenAPI Generator: https://openapi-generator.tech -*/ - -syntax = "proto3"; - -package mec012; - - -message RabInfoErabQosParametersQosInformation { - - // This attribute indicates the guaranteed downlink E-RAB Bit Rate as defined in ETSI TS 123 401 [i.4] for this bearer. - int32 erabGbrDl = 1; - - // This attribute indicates the guaranteed uplink E-RAB Bit Rate as defined in ETSI TS 123 401 [i.4] for this bearer. - int32 erabGbrUl = 2; - - // This attribute indicates the maximum downlink E-RAB Bit Rate as defined in ETSI TS 123 401 [i.4] for this bearer. - int32 erabMbrDl = 3; - - // This attribute indicates the maximum uplink E-RAB Bit Rate as defined in ETSI TS 123 401 [i.4] for this bearer. - int32 erabMbrUl = 4; - -} diff --git a/proto3/models/rab_mod_notification.proto b/proto3/models/rab_mod_notification.proto index cafae6da6b6b14c86850dae5793391c1d81652b8..102778756566b2e370c0457b478d3f5e555dd181 100644 --- a/proto3/models/rab_mod_notification.proto +++ b/proto3/models/rab_mod_notification.proto @@ -22,7 +22,6 @@ message RabModNotification { // 0 to N identifiers to bind the event for a specific UE or flow. repeated AssociateId associateId = 1; - // E-UTRAN Cell Global Identifier. Ecgi ecgi = 2; // The attribute that uniquely identifies a Radio Access bearer for specific UE as defined in ETSI TS 136 413 [i.3]. @@ -33,7 +32,6 @@ message RabModNotification { // Shall be set to \"RabModNotification\". string notificationType = 5; - // Time stamp. TimeStamp timeStamp = 6; } diff --git a/proto3/models/rab_mod_subscription.proto b/proto3/models/rab_mod_subscription.proto index 72accd588d6b893e8494f96b4b9687335200024f..093ca085746181595d2f9f7e7d4a4402fc3644aa 100644 --- a/proto3/models/rab_mod_subscription.proto +++ b/proto3/models/rab_mod_subscription.proto @@ -23,7 +23,6 @@ message RabModSubscription { // URI selected by the service consumer to receive notifications on the subscribed RNIS information. This shall be included both in the request and in response. string callbackReference = 2; - // Time stamp. TimeStamp expiryDeadline = 3; RabModSubscriptionFilterCriteriaQci filterCriteriaQci = 4; diff --git a/proto3/models/rab_rel_notification.proto b/proto3/models/rab_rel_notification.proto index d8a71e9876300c59785b923e727615e75cfdd37c..902e6af46a3a01ca66df635fac3f62580f0b853c 100644 --- a/proto3/models/rab_rel_notification.proto +++ b/proto3/models/rab_rel_notification.proto @@ -22,7 +22,6 @@ message RabRelNotification { // 0 to N identifiers to bind the event for a specific UE or flow as defined below. repeated AssociateId associateId = 1; - // E-UTRAN Cell Global Identifier. Ecgi ecgi = 2; RabRelNotificationErabReleaseInfo erabReleaseInfo = 3; @@ -30,7 +29,6 @@ message RabRelNotification { // Shall be set to \"RabRelNotification\". string notificationType = 4; - // Time stamp. TimeStamp timeStamp = 5; } diff --git a/proto3/models/rab_rel_subscription.proto b/proto3/models/rab_rel_subscription.proto index 9a2128e57306135095d3ae15d5dae18ec8fc7faf..22d0fb9d5117640bb7cdb5d951370add22b6583d 100644 --- a/proto3/models/rab_rel_subscription.proto +++ b/proto3/models/rab_rel_subscription.proto @@ -23,7 +23,6 @@ message RabRelSubscription { // URI selected by the service consumer to receive notifications on the subscribed RNIS information. This shall be included both in the request and in response. string callbackReference = 2; - // Time stamp. TimeStamp expiryDeadline = 3; RabModSubscriptionFilterCriteriaQci filterCriteriaQci = 4; diff --git a/proto3/models/results_per_csi_rs_index_list.proto b/proto3/models/results_per_csi_rs_index_list.proto index a0491a81cd746dc38ed631f4dcd5652d8f6b6c1e..836c1c907f09710851c6e33dd165dfc86d4b8bad 100644 --- a/proto3/models/results_per_csi_rs_index_list.proto +++ b/proto3/models/results_per_csi_rs_index_list.proto @@ -12,10 +12,10 @@ syntax = "proto3"; package mec012; -import public "models/results_per_csi_rs_index.proto"; +import public "models/results_per_csi_rs_index_list_results_per_csi_rs_index.proto"; message ResultsPerCsiRsIndexList { - repeated ResultsPerCsiRsIndex resultsPerCsiRsIndex = 1; + repeated ResultsPerCsiRsIndexListResultsPerCsiRsIndex resultsPerCsiRsIndex = 1; } diff --git a/proto3/models/nr_meas_rep_ue_subscription_links.proto b/proto3/models/results_per_csi_rs_index_list_results_per_csi_rs_index.proto similarity index 58% rename from proto3/models/nr_meas_rep_ue_subscription_links.proto rename to proto3/models/results_per_csi_rs_index_list_results_per_csi_rs_index.proto index c93b48a0702aee4a9f9210369fc854c2008dbd6c..ba66be8ace14db0886f08eb62af476531edee99a 100644 --- a/proto3/models/nr_meas_rep_ue_subscription_links.proto +++ b/proto3/models/results_per_csi_rs_index_list_results_per_csi_rs_index.proto @@ -12,11 +12,12 @@ syntax = "proto3"; package mec012; -import public "models/link_type.proto"; +import public "models/meas_quantity_results_nr.proto"; -message NrMeasRepUeSubscriptionLinks { +message ResultsPerCsiRsIndexListResultsPerCsiRsIndex { - // Self-referring URI. The URI shall be unique within the RNI API as it acts as an ID for the subscription. - LinkType self = 1; + int32 csiRsIndex = 1; + + MeasQuantityResultsNr csiRsResults = 2; } diff --git a/proto3/models/results_per_ssb_index_list.proto b/proto3/models/results_per_ssb_index_list.proto index 783c5465bcef2a2875dc0432b22127848fe2a8ca..6d7d1e29e8b2911a147359bb8c7b6ba4a3aa4faa 100644 --- a/proto3/models/results_per_ssb_index_list.proto +++ b/proto3/models/results_per_ssb_index_list.proto @@ -12,10 +12,10 @@ syntax = "proto3"; package mec012; -import public "models/results_per_ssb_index.proto"; +import public "models/results_per_ssb_index_list_results_per_ssb_index.proto"; message ResultsPerSsbIndexList { - repeated ResultsPerSsbIndex resultsPerSsbIndex = 1; + repeated ResultsPerSsbIndexListResultsPerSsbIndex resultsPerSsbIndex = 1; } diff --git a/proto3/models/rab_info_erab_qos_parameters.proto b/proto3/models/results_per_ssb_index_list_results_per_ssb_index.proto similarity index 54% rename from proto3/models/rab_info_erab_qos_parameters.proto rename to proto3/models/results_per_ssb_index_list_results_per_ssb_index.proto index 8b7d6c3426b03dff7bc1073601335961eefa2ba2..51da0bb4f5cb0508cb77d7824a8ce0c27e2fd131 100644 --- a/proto3/models/rab_info_erab_qos_parameters.proto +++ b/proto3/models/results_per_ssb_index_list_results_per_ssb_index.proto @@ -12,13 +12,12 @@ syntax = "proto3"; package mec012; -import public "models/rab_info_erab_qos_parameters_qos_information.proto"; +import public "models/meas_quantity_results_nr.proto"; -message RabInfoErabQosParameters { +message ResultsPerSsbIndexListResultsPerSsbIndex { - // QoS Class Identifier as defined in ETSI TS 123 401 [i.4]. - int32 qci = 1; + int32 ssbIndex = 1; - RabInfoErabQosParametersQosInformation qosInformation = 2; + MeasQuantityResultsNr ssbResults = 2; } diff --git a/proto3/models/rs_index_results.proto b/proto3/models/rs_index_results.proto index 22a716835368f5da58b4332adfed75c4bb310951..355173caeffcb382f34beb1a1ecb610266320cec 100644 --- a/proto3/models/rs_index_results.proto +++ b/proto3/models/rs_index_results.proto @@ -17,10 +17,8 @@ import public "models/results_per_ssb_index_list.proto"; message RsIndexResults { - // Beam level measurement results based on CSI-RS related measurements. ResultsPerCsiRsIndexList resultsCsiRsIndexes = 1; - // Beam level measurement results based on SS/PBCH related measurements. ResultsPerSsbIndexList resultsSsbIndexes = 2; } diff --git a/proto3/models/s1_bearer_info.proto b/proto3/models/s1_bearer_info.proto index 206bd961794d2ea070a60c02e3054337751fb6ae..f88fd9ec7ad2b38c825e034f5cd25aa221faf0b0 100644 --- a/proto3/models/s1_bearer_info.proto +++ b/proto3/models/s1_bearer_info.proto @@ -20,7 +20,6 @@ message S1BearerInfo { // Information on a specific UE as defined below. repeated S1BearerInfoS1UeInfo s1UeInfo = 1; - // Time stamp. TimeStamp timeStamp = 2; } diff --git a/proto3/models/s1_bearer_notification.proto b/proto3/models/s1_bearer_notification.proto index 12183482a017827e4a164c989c691389e4168628..237190efb7bc4ffd9609bed55ae8dd69e51df231 100644 --- a/proto3/models/s1_bearer_notification.proto +++ b/proto3/models/s1_bearer_notification.proto @@ -21,16 +21,11 @@ message S1BearerNotification { string notificationType = 1; // The subscribed event that triggered this notification in S1BearerSubscription. - enum S1EventEnum { - SEE_DESCRIPTION = 0; - } - - S1EventEnum s1Event = 2; + int32 s1Event = 2; // Information on specific UE that matches the criteria in S1BearerSubscription as defined below. repeated S1BearerNotificationS1UeInfo s1UeInfo = 3; - // Time stamp. TimeStamp timeStamp = 4; } diff --git a/proto3/models/s1_bearer_notification_s1_bearer_info.proto b/proto3/models/s1_bearer_notification_s1_bearer_info.proto deleted file mode 100644 index 843c257c6bef172ff089bc588d6981d639260d14..0000000000000000000000000000000000000000 --- a/proto3/models/s1_bearer_notification_s1_bearer_info.proto +++ /dev/null @@ -1,27 +0,0 @@ -/* - ETSI GS MEC 012 - Radio Network Information API - - The ETSI MEC ISG MEC012 Radio Network Information API described using OpenAPI. - - The version of the OpenAPI document: 2.1.1 - - Generated by OpenAPI Generator: https://openapi-generator.tech -*/ - -syntax = "proto3"; - -package mec012; - -import public "models/s1_bearer_info_enb_info.proto"; -import public "models/s1_bearer_info_s_gw_info.proto"; - -message S1BearerNotificationS1BearerInfo { - - S1BearerInfoEnbInfo enbInfo = 1; - - // The attribute that uniquely identifies a S1 bearer for a specific UE, as defined in ETSI TS 136 413 [i.3]. - int32 erabId = 2; - - S1BearerInfoSGwInfo sGwInfo = 3; - -} diff --git a/proto3/models/s1_bearer_notification_s1_ue_info.proto b/proto3/models/s1_bearer_notification_s1_ue_info.proto index 3fd01511957c49b42c77cd26b639ee9d8ada4438..293cdac6cdd668a8c75cdaa6b8804c068632ea80 100644 --- a/proto3/models/s1_bearer_notification_s1_ue_info.proto +++ b/proto3/models/s1_bearer_notification_s1_ue_info.proto @@ -15,7 +15,7 @@ package mec012; import public "models/associate_id.proto"; import public "models/cell_change_notification_temp_ue_id.proto"; import public "models/ecgi.proto"; -import public "models/s1_bearer_notification_s1_bearer_info.proto"; +import public "models/s1_bearer_info_s1_bearer_info_detailed.proto"; message S1BearerNotificationS1UeInfo { @@ -26,7 +26,7 @@ message S1BearerNotificationS1UeInfo { repeated Ecgi ecgi = 2; // S1 bearer information as defined below. - repeated S1BearerNotificationS1BearerInfo s1BearerInfo = 3; + repeated S1BearerInfoS1BearerInfoDetailed s1BearerInfo = 3; CellChangeNotificationTempUeId tempUeId = 4; diff --git a/proto3/models/s1_bearer_subscription.proto b/proto3/models/s1_bearer_subscription.proto index d961fcbdf7502c26449134adcc0906e76eb61f34..d7a7c4dfa159d00fa0d39169c4be8451c89b3e7c 100644 --- a/proto3/models/s1_bearer_subscription.proto +++ b/proto3/models/s1_bearer_subscription.proto @@ -25,10 +25,9 @@ message S1BearerSubscription { // URI selected by the service consumer, to receive notifications on the subscribed RNIS information. This shall be included in the request and response. string callbackReference = 3; - // Description of the subscribed event. The event is included both in the request and in the response. \\nFor the eventType, the following values are currently defined: 0 = RESERVED. 1 = S1_BEARER_ESTABLISH. 2 = S1_BEARER_MODIFY. 3 = S1_BEARER_RELEASE. + // Description of the subscribed event. The event is included both in the request and in the response. \\nFor the eventType, the following values are currently defined:
0 = RESERVED.
1 = S1_BEARER_ESTABLISH.
2 = S1_BEARER_MODIFY.
3 = S1_BEARER_RELEASE. repeated int32 eventType = 4; - // Time stamp. TimeStamp expiryDeadline = 5; // Shall be set to \"S1BearerSubscription\". diff --git a/proto3/services/_service.proto b/proto3/services/rni_service.proto similarity index 97% rename from proto3/services/_service.proto rename to proto3/services/rni_service.proto index 0e3de50c09eeffb690dbd4d876a214736521b014..ec0658ec996099353a63cf460fdc51d8344682d9 100644 --- a/proto3/services/_service.proto +++ b/proto3/services/rni_service.proto @@ -26,7 +26,7 @@ import public "models/inline_response201.proto"; import public "models/inline_response400.proto"; import public "models/inline_response403.proto"; -service DefaultService { +service RniService { rpc Layer2MeasInfoGET (Layer2MeasInfoGETRequest) returns (InlineResponse2003); rpc PlmnInfoGET (PlmnInfoGETRequest) returns (InlineResponse2001); @@ -182,7 +182,7 @@ message S1BearerInfoGETRequest { } message SubscriptionLinkListSubscriptionsGETRequest { - // Subscription type filter + // Filter on a specific subscription type. Permitted values: cell_change, rab_est, rab_mod, rab_rel, meas_rep_ue, nr_meas_rep_ue, timing_advance_ue, ca_reconf, s1_bearer. string subscriptionType = 1; }