Skip to content
Commits on Source (52)
...@@ -31,10 +31,14 @@ The links below will open the Swagger Editor/UI and auto-load the OpenAPI YAML f ...@@ -31,10 +31,14 @@ The links below will open the Swagger Editor/UI and auto-load the OpenAPI YAML f
([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml)) ([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml))
([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml)) ([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml))
* Subscription Control NRM NRM (TS 28.623) * Subscription Control NRM (TS 28.623)
([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28623_SubscriptionControlNrm.yaml)) ([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28623_SubscriptionControlNrm.yaml))
([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28623_SubscriptionControlNrm.yaml)) ([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28623_SubscriptionControlNrm.yaml))
* File Management NRM (TS 28.623)
([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28623_FileManagementNrm.yaml))
([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28623_FileManagementNrm.yaml))
* Threshold Monitor NRM(TS 28.623) * Threshold Monitor NRM(TS 28.623)
([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28623_ThresholdMonitorNrm.yaml)) ([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28623_ThresholdMonitorNrm.yaml))
([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28623_ThresholdMonitorNrm.yaml)) ([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28623_ThresholdMonitorNrm.yaml))
......
...@@ -162,6 +162,8 @@ components: ...@@ -162,6 +162,8 @@ components:
$ref: '#/components/schemas/MLUpdateFunction-Multiple' $ref: '#/components/schemas/MLUpdateFunction-Multiple'
AIMLInferenceFunction: AIMLInferenceFunction:
$ref: '#/components/schemas/AIMLInferenceFunction-Multiple' $ref: '#/components/schemas/AIMLInferenceFunction-Multiple'
AIMLInferenceEmulationFunction:
$ref: '#/components/schemas/AIMLInferenceEmulationFunction-Multiple'
ManagedElement-ncO-AiMlNrm: ManagedElement-ncO-AiMlNrm:
type: object type: object
...@@ -176,6 +178,8 @@ components: ...@@ -176,6 +178,8 @@ components:
$ref: '#/components/schemas/MLUpdateFunction-Multiple' $ref: '#/components/schemas/MLUpdateFunction-Multiple'
AIMLInferenceFunction: AIMLInferenceFunction:
$ref: '#/components/schemas/AIMLInferenceFunction-Multiple' $ref: '#/components/schemas/AIMLInferenceFunction-Multiple'
AIMLInferenceEmulationFunction:
$ref: '#/components/schemas/AIMLInferenceEmulationFunction-Multiple'
#-------- Definition of concrete IOCs -------------------------------------------- #-------- Definition of concrete IOCs --------------------------------------------
......
...@@ -312,6 +312,8 @@ components: ...@@ -312,6 +312,8 @@ components:
$ref: '#/components/schemas/AlarmType' $ref: '#/components/schemas/AlarmType'
probableCause: probableCause:
$ref: '#/components/schemas/ProbableCause' $ref: '#/components/schemas/ProbableCause'
specificProblem:
$ref: '#/components/schemas/SpecificProblem'
perceivedSeverity: perceivedSeverity:
$ref: '#/components/schemas/PerceivedSeverity' $ref: '#/components/schemas/PerceivedSeverity'
correlatedNotifications: correlatedNotifications:
...@@ -549,3 +551,10 @@ components: ...@@ -549,3 +551,10 @@ components:
type: object type: object
additionalProperties: additionalProperties:
$ref: '#/components/schemas/Comment' $ref: '#/components/schemas/Comment'
#----- Definitions in TS 28.111 for TS 28.532 --------------------------#
resources-faultNrm:
oneOf:
- $ref: '#/components/schemas/AlarmList-Single'
#----- Definitions in TS 28.111 for TS 28.532 --------------------------#
\ No newline at end of file
This diff is collapsed.
...@@ -150,13 +150,12 @@ components: ...@@ -150,13 +150,12 @@ components:
objectType: objectType:
type: string type: string
enum: enum:
- RAN_SubNetwork #value for Radio Network Expectation--# - RAN_SUBNETWORK #value for Radio Network Expectation--#
- Edge_Service_Support #value for Edge Service Support Expectation--# - EDGE_SERVICE_SUPPORT #value for Edge Service Support Expectation--#
- 5GC_SubNetwork #value for 5GC Network Expectation--# - 5GC_SUBNETWORK #value for 5GC Network Expectation--#
- Radio_Service #value for Radio Service Expectation--#
objectInstance: objectInstance:
$ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
contextSelectivity:
$ref: "#/components/schemas/Selectivity"
objectContexts: objectContexts:
type: array type: array
items: items:
...@@ -192,6 +191,7 @@ components: ...@@ -192,6 +191,7 @@ components:
enum: enum:
- FULFILLED - FULFILLED
- NOT_FULFILLED - NOT_FULFILLED
default: NOT_FULFILLED
description: It describes the current status of the intent fulfilment result. description: It describes the current status of the intent fulfilment result.
NotFulfilledState: NotFulfilledState:
type: string type: string
...@@ -203,6 +203,7 @@ components: ...@@ -203,6 +203,7 @@ components:
- SUSPENDED - SUSPENDED
- TERMINATED - TERMINATED
- FULFILMENTFAILED - FULFILMENTFAILED
default: ACKNOWLEDGED
description: It describes the current progress of or the reason for not achieving fulfilment description: It describes the current progress of or the reason for not achieving fulfilment
for the intent, intentExpectation or expectationTarget. for the intent, intentExpectation or expectationTarget.
An attribute which is used when FulfilmentInfo is implemented for IntentFulfilmentInfo An attribute which is used when FulfilmentInfo is implemented for IntentFulfilmentInfo
...@@ -227,7 +228,7 @@ components: ...@@ -227,7 +228,7 @@ components:
enum: enum:
- DELIVER - DELIVER
- ENSURE - ENSURE
description: It describes the characteristic of the intentExpectation and is the property that describes the types of intentExpectations. description: It describes the characteristic of the intentExpectation and is the property that describes the types of intentExpectations. Vendor extensions are allowed
Frequency: Frequency:
description: >- description: >-
It desribes the RF reference frequency (i.e. Absolute Radio Frequency Channel Number) It desribes the RF reference frequency (i.e. Absolute Radio Frequency Channel Number)
...@@ -360,6 +361,9 @@ components: ...@@ -360,6 +361,9 @@ components:
$ref: '#/components/schemas/FulfilmentInfo' $ref: '#/components/schemas/FulfilmentInfo'
targetAchievedValue: targetAchievedValue:
type: number type: number
description: >-
It describes the value that has been achieved for the expectation target at the time at which
the report is generated.
#-------Definition of the concrete TargetFulfilmentResult dataType----------------# #-------Definition of the concrete TargetFulfilmentResult dataType----------------#
#-------Definition of the generic IntentConflictReport dataType----------------# #-------Definition of the generic IntentConflictReport dataType----------------#
...@@ -429,6 +433,7 @@ components: ...@@ -429,6 +433,7 @@ components:
- RAN_SUBNETWORK - RAN_SUBNETWORK
- EDGE_SERVICE_SUPPORT - EDGE_SERVICE_SUPPORT
- 5GC_SUBNETWORK - 5GC_SUBNETWORK
- Radio_Service
description: It describes the expectation object type which can be supported by a specific intent handling function of MnS producer. description: It describes the expectation object type which can be supported by a specific intent handling function of MnS producer.
supportedExpectationTargetNames: supportedExpectationTargetNames:
type: array type: array
......
...@@ -25,30 +25,13 @@ components: ...@@ -25,30 +25,13 @@ components:
#-------- Definition of concrete IOCs -------------------------------------------- #-------- Definition of concrete IOCs --------------------------------------------
MnS: SubNetwork-ncO-DsoNrm:
oneOf: type: object
- type: object
properties:
SubNetwork:
$ref: '#/components/schemas/SubNetwork-Multiple'
SubNetwork-Single:
allOf:
- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
- type: object
properties:
attributes:
allOf:
- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-Attr'
- type: object
properties: properties:
Subnetwork:
$ref: '#/components/schemas/SubNetwork-Multiple'
OutageAndRecoveryInfo: OutageAndRecoveryInfo:
$ref: '#/components/schemas/OutageAndRecoveryInfo-Multiple' $ref: '#/components/schemas/OutageAndRecoveryInfo-Multiple'
DsoThresholdMonitor: DsoThresholdMonitor:
$ref: '#/components/schemas/DsoThresholdMonitor-Multiple' $ref: '#/components/schemas/DsoThresholdMonitor-Multiple'
- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-ncO'
OutageAndRecoveryInfo-Single: OutageAndRecoveryInfo-Single:
allOf: allOf:
...@@ -87,10 +70,6 @@ components: ...@@ -87,10 +70,6 @@ components:
#-------- Definition of JSON arrays for name-contained IOCs ---------------------- #-------- Definition of JSON arrays for name-contained IOCs ----------------------
SubNetwork-Multiple:
type: array
items:
$ref: '#/components/schemas/SubNetwork-Single'
OutageAndRecoveryInfo-Multiple: OutageAndRecoveryInfo-Multiple:
type: array type: array
items: items:
...@@ -104,7 +83,5 @@ components: ...@@ -104,7 +83,5 @@ components:
resources-DSORecovery: resources-DSORecovery:
oneOf: oneOf:
- $ref: '#/components/schemas/MnS'
- $ref: '#/components/schemas/SubNetwork-Single'
- $ref: '#/components/schemas/OutageAndRecoveryInfo-Single' - $ref: '#/components/schemas/OutageAndRecoveryInfo-Single'
- $ref: '#/components/schemas/DsoThresholdMonitor-Single' - $ref: '#/components/schemas/DsoThresholdMonitor-Single'
openapi: 3.0.1
info:
title: Network Slice Provisioning MnS
version: 18.5.0
description: >-
OAS 3.0.1 definition of the Network Slice Provisioning MnS
© 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
All rights reserved.
externalDocs:
description: 3GPP TS 28.531; Provisioning
url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.531/
servers:
- url: '{MnSRoot}/NSProvMnS/{MnSVersion}'
variables:
MnSRoot:
description: See clause 4.4.2 of TS 32.158
default: http://example.com/3GPPManagement
MnSVersion:
description: Version number of the OpenAPI definition
default: XXX
paths:
/ServiceProfiles:
post:
summary: Create a ServiceProfile
description: To create a ServiceProfile resource to represent network slice related requirements.
requestBody:
required: true
content:
application/json:
schema:
$ref: '#/components/schemas/ServiceProfile-Type'
responses:
'201':
description: Success case ("201 Created"). The representation of the newly created ServiceProfile resource shall be returned.
content:
application/json:
schema:
$ref: '#/components/schemas/ServiceProfileId-Type'
default:
description: Error case.
content:
application/json:
schema:
$ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponseDefault'
/ServiceProfiles/{ServiceProfileId}:
delete:
summary: Delete a ServiceProfile
description: To delete a ServiceProfile resource to represent network slice related requirements.
parameters:
- name: ServiceProfileId
in: path
description: Identifies an individual ServiceProfille.
required: true
schema:
$ref: '#/components/schemas/ServiceProfileId-Type'
- name: networkSliceDN
in: query
description: Identifies the DN of NetworkSlice MOI uniquely identifying the network slice instance
required: true
schema:
$ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
responses:
'204':
description: >-
Success case ("204 No Content").
The ServiceProfile resource has been deleted. The response message body is absent.
default:
description: Error case.
content:
application/json:
schema:
$ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponseDefault'
components:
schemas:
uri-Type:
description: Resource URI
type: string
ServiceProfileId-Type:
$ref: '#/components/schemas/uri-Type'
ServiceProfile-Type:
$ref: 'TS28541_SliceNrm.yaml#/components/schemas/ServiceProfile'
\ No newline at end of file
openapi: 3.0.1
info:
title: Network Slice Subnet Provisioning MnS
version: 18.5.0
description: >-
OAS 3.0.1 definition of the Network Slice Suubnet Provisioning MnS
© 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
All rights reserved.
externalDocs:
description: 3GPP TS 28.531; Provisioning
url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.531/
servers:
- url: '{MnSRoot}/NSSProvMnS/{MnSVersion}'
variables:
MnSRoot:
description: See clause 4.4.2 of TS 32.158
default: http://example.com/3GPPManagement
MnSVersion:
description: Version number of the OpenAPI definition
default: XXX
paths:
/SliceProfiles:
post:
summary: Create a SliceProfile
description: To create a SliceeProfile resource to represent network slice subnet related requirements.
requestBody:
required: true
content:
application/json:
schema:
$ref: '#/components/schemas/ServiceProfileId-Type'
responses:
'201':
description: Success case ("201 Created"). The representation of the newly created SliceProfile resource shall be returned.
content:
application/json:
schema:
$ref: '#/components/schemas/SliceProfileId-Type'
default:
description: Error case.
content:
application/json:
schema:
$ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponseDefault'
/SliceProfiles/{SliceProfileId}:
delete:
summary: Delete a SliceProfile
description: To delete a SliceProfile resource to represent network slice suubnet related requirements.
parameters:
- name: SliceProfileId
in: path
description: Identifies an individual SliceProfille.
required: true
schema:
$ref: '#/components/schemas/SliceProfileId-Type'
- name: networkSliceSubnetDN
in: query
description: Identifies the DN of NetworkSliceSubnet MOI uniquely identifying the network slice subnet instance
required: true
schema:
$ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
responses:
'204':
description: >-
Success case ("204 No Content").
The ServiceProfile resource has been deleted. The response message body is absent.
default:
description: Error case.
content:
application/json:
schema:
$ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponseDefault'
components:
schemas:
uri-Type:
description: Resource URI
type: string
SliceProfileId-Type:
$ref: '#/components/schemas/uri-Type'
ServiceProfileId-Type:
$ref: 'TS28541_SliceNrm.yaml#/components/schemas/SliceProfile'
\ No newline at end of file
This diff is collapsed.
...@@ -433,11 +433,13 @@ components: ...@@ -433,11 +433,13 @@ components:
- $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/resources-mgmtDataCollectionNrm' - $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/resources-mgmtDataCollectionNrm'
- $ref: 'TS28623_MnSRegistryNrm.yaml#/components/schemas/resources-mnSRegistryNrm' - $ref: 'TS28623_MnSRegistryNrm.yaml#/components/schemas/resources-mnSRegistryNrm'
- $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/resources-pmControlNrm' - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/resources-pmControlNrm'
- $ref: 'TS28111_FaultNrm.yaml#/components/schemas/resources-faultNrm'
- $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/resources-qoEMeasuremetCollectionNrm' - $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/resources-qoEMeasuremetCollectionNrm'
- $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/resources-subscriptionControlNrm' - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/resources-subscriptionControlNrm'
- $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/resources-thresholdMonitorNrm' - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/resources-thresholdMonitorNrm'
- $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/resources-traceControlNrm' - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/resources-traceControlNrm'
- $ref: 'TS28319_MsacNrm.yaml#/components/schemas/resources-msacNrm' - $ref: 'TS28319_MsacNrm.yaml#/components/schemas/resources-msacNrm'
- $ref: 'TS28318_DsoNrm.yaml#/components/schemas/resources-DSORecovery'
Scope: Scope:
type: object type: object
properties: properties:
...@@ -537,7 +539,7 @@ components: ...@@ -537,7 +539,7 @@ components:
- specificProblem - specificProblem
properties: properties:
specificProblem: specificProblem:
$ref: 'TS28532_FaultMnS.yaml#/components/schemas/SpecificProblem' $ref: 'TS28111_FaultNrm.yaml#/components/schemas/SpecificProblem'
additionalText: additionalText:
type: string type: string
additionalInformation: additionalInformation:
......
...@@ -140,21 +140,6 @@ components: ...@@ -140,21 +140,6 @@ components:
$ref: '#/components/schemas/AssuranceClosedControlLoop-Multiple' $ref: '#/components/schemas/AssuranceClosedControlLoop-Multiple'
#-------- Definition of concrete IOCs -------------------------------------------- #-------- Definition of concrete IOCs --------------------------------------------
MnS:
oneOf:
- type: object
properties:
SubNetwork:
type: array
items:
$ref: '#/components/schemas/SubNetwork-ncO-CoslaNrm'
- type: object
properties:
ManagedElement:
type: array
items:
$ref: '#/components/schemas/ManagedElement-ncO-CoslaNrm'
AssuranceClosedControlLoop-Single: AssuranceClosedControlLoop-Single:
allOf: allOf:
- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
...@@ -226,7 +211,6 @@ components: ...@@ -226,7 +211,6 @@ components:
resources-coslaNrm: resources-coslaNrm:
oneOf: oneOf:
- $ref: '#/components/schemas/MnS'
- $ref: '#/components/schemas/AssuranceClosedControlLoop-Single' - $ref: '#/components/schemas/AssuranceClosedControlLoop-Single'
- $ref: '#/components/schemas/AssuranceGoal-Single' - $ref: '#/components/schemas/AssuranceGoal-Single'
- $ref: '#/components/schemas/AssuranceReport-Single' - $ref: '#/components/schemas/AssuranceReport-Single'
...@@ -158,14 +158,6 @@ components: ...@@ -158,14 +158,6 @@ components:
$ref: '#/components/schemas/EdgeDataNetwork-Multiple' $ref: '#/components/schemas/EdgeDataNetwork-Multiple'
#-------- Definition of concrete IOCs -------------------------------------------- #-------- Definition of concrete IOCs --------------------------------------------
MnS:
oneOf:
- type: object
properties:
SubNetwork:
type: array
items:
$ref: '#/components/schemas/SubNetwork-ncO-EdgeNrm'
EdgeDataNetwork-Single: EdgeDataNetwork-Single:
allOf: allOf:
...@@ -415,7 +407,6 @@ components: ...@@ -415,7 +407,6 @@ components:
resources-edgeNrm: resources-edgeNrm:
oneOf: oneOf:
- $ref: '#/components/schemas/MnS'
- $ref: '#/components/schemas/EASFunction-Single' - $ref: '#/components/schemas/EASFunction-Single'
- $ref: '#/components/schemas/ECSFunction-Single' - $ref: '#/components/schemas/ECSFunction-Single'
- $ref: '#/components/schemas/EESFunction-Single' - $ref: '#/components/schemas/EESFunction-Single'
......
...@@ -229,6 +229,10 @@ components: ...@@ -229,6 +229,10 @@ components:
type: array type: array
items: items:
$ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
sNPNList:
type: array
items:
$ref: '#/components/schemas/SnpnId'
allowedSNPNs: allowedSNPNs:
type: array type: array
items: items:
...@@ -1352,6 +1356,38 @@ components: ...@@ -1352,6 +1356,38 @@ components:
- NG_ENB - NG_ENB
- type: string - type: string
TrpMappingInfo:
type: object
properties:
satelliteId:
type: string
pattern: '^[0-9]{5}$'
trpIds:
type: array
items:
type: integer
minimum: 1
maximum: 65535
TrpInfo:
description: The mapping relationship between TRP IDs, gNB ID and Satellite ID.
type: object
properties:
gNBId:
type: integer
minimum: 0
maximum: 4294967295
trpMappingInfoList:
type: array
items:
$ref: '#/components/schemas/TrpMappingInfo'
minItems: 1
TrpInfoList:
type: array
items:
$ref: '#/components/schemas/TrpInfo'
LmfInfo: LmfInfo:
description: Information of an LMF NF Instance description: Information of an LMF NF Instance
type: object type: object
...@@ -2985,21 +3021,6 @@ components: ...@@ -2985,21 +3021,6 @@ components:
$ref: '#/components/schemas/MnpfFunction-Multiple' $ref: '#/components/schemas/MnpfFunction-Multiple'
#-------- Definition of concrete IOCs -------------------------------------------- #-------- Definition of concrete IOCs --------------------------------------------
MnS:
oneOf:
- type: object
properties:
SubNetwork:
type: array
items:
$ref: '#/components/schemas/SubNetwork-ncO-5GcNrm'
- type: object
properties:
ManagedElement:
type: array
items:
$ref: '#/components/schemas/ManagedElement-ncO-5GcNrm'
AmfFunction-Single: AmfFunction-Single:
allOf: allOf:
- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
...@@ -3036,6 +3057,8 @@ components: ...@@ -3036,6 +3057,8 @@ components:
$ref: '#/components/schemas/SliceExpiryInfo' $ref: '#/components/schemas/SliceExpiryInfo'
SatelliteBackhaulInfoList: SatelliteBackhaulInfoList:
$ref: '#/components/schemas/SatelliteBackhaulInfo' $ref: '#/components/schemas/SatelliteBackhaulInfo'
mappedCellIdInfoList:
$ref: 'TS28541_NrNrm.yaml#/components/schemas/MappedCellIdInfoList'
- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
- type: object - type: object
properties: properties:
...@@ -3494,6 +3517,12 @@ components: ...@@ -3494,6 +3517,12 @@ components:
$ref: '#/components/schemas/CommModelList' $ref: '#/components/schemas/CommModelList'
lmfInfo: lmfInfo:
$ref: '#/components/schemas/LmfInfo' $ref: '#/components/schemas/LmfInfo'
ephemerisInfos:
$ref: 'TS28541_NrNrm.yaml#/components/schemas/EphemerisInfos'
trpInfoList:
$ref: '#/components/schemas/TrpInfoList'
mappedCellIdInfoList:
$ref: 'TS28541_NrNrm.yaml#/components/schemas/MappedCellIdInfoList'
- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
- type: object - type: object
properties: properties:
...@@ -5723,7 +5752,6 @@ components: ...@@ -5723,7 +5752,6 @@ components:
resources-5gcNrm: resources-5gcNrm:
oneOf: oneOf:
- $ref: '#/components/schemas/MnS'
- $ref: '#/components/schemas/AmfFunction-Single' - $ref: '#/components/schemas/AmfFunction-Single'
- $ref: '#/components/schemas/SmfFunction-Single' - $ref: '#/components/schemas/SmfFunction-Single'
- $ref: '#/components/schemas/UpfFunction-Single' - $ref: '#/components/schemas/UpfFunction-Single'
......
...@@ -65,34 +65,10 @@ components: ...@@ -65,34 +65,10 @@ components:
type: array type: array
items: items:
$ref: '#/components/schemas/PlmnInfo' $ref: '#/components/schemas/PlmnInfo'
cagId:
type: string
nid:
type: string
NpnIdentity:
type: object
oneOf:
- required: [ plmnId, cagidList ]
- required: [ plmnId, nidList ]
properties:
plmnId:
$ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
cagidList:
type: array
items:
$ref: '#/components/schemas/cagId'
minItems: 1
maxItems: 12
nidList:
type: array
items:
$ref: '#/components/schemas/nid'
minItems: 1
maxItems: 12
NpnIdentityList: NpnIdentityList:
type: array type: array
items: items:
$ref: '#/components/schemas/NpnIdentity' $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NpnId-Type'
GGnbId: GGnbId:
type: string type: string
pattern: '^[0-9]{3}[0-9]{2,3}-(22|23|24|25|26|27|28|29|30|31|32)-[0-9]{1,10}' pattern: '^[0-9]{3}[0-9]{2,3}-(22|23|24|25|26|27|28|29|30|31|32)-[0-9]{1,10}'
...@@ -137,75 +113,81 @@ components: ...@@ -137,75 +113,81 @@ components:
type: integer type: integer
backhaulAddress: backhaulAddress:
$ref: '#/components/schemas/BackhaulAddress' $ref: '#/components/schemas/BackhaulAddress'
IntraRatEsActivationOriginalCellLoadParameters: LoadTimeThreshold:
type: object type: object
properties: properties:
loadThreshold: loadThreshold:
type: integer type: integer
timeDuration: timeDuration:
type: integer type: integer
IntraRatEsActivationOriginalCellLoadParameters:
$ref: '#/components/schemas/LoadTimeThreshold'
IntraRatEsActivationCandidateCellsLoadParameters: IntraRatEsActivationCandidateCellsLoadParameters:
type: object $ref: '#/components/schemas/LoadTimeThreshold'
properties:
loadThreshold:
type: integer
timeDuration:
type: integer
IntraRatEsDeactivationCandidateCellsLoadParameters: IntraRatEsDeactivationCandidateCellsLoadParameters:
type: object $ref: '#/components/schemas/LoadTimeThreshold'
properties:
loadThreshold:
type: integer
timeDuration:
type: integer
EsNotAllowedTimePeriod: EsNotAllowedTimePeriod:
type: object type: object
properties: properties:
startTimeandendTime: startTime:
type: string
periodOfDay:
type: string type: string
daysOfWeekList: description: >-
Time of day is in HH:MM or H:MM 24-hour format per UTC time zone.
Examples, 20:15:00, 20:15:00-08:00 (for 8 hours behind UTC).
endTime:
type: string type: string
listoftimeperiods: description: >-
Time of day is in HH:MM or H:MM 24-hour format per UTC time zone.
Examples, 20:15:00, 20:15:00-08:00 (for 8 hours behind UTC).
daysOfWeek:
type: string type: string
enum:
- MONDAY
- TUESDAY
- WEDNESDAY
- THURSDAY
- FRIDAY
- SATURDAY
- SUNDAY
InterRatEsActivationOriginalCellParameters: InterRatEsActivationOriginalCellParameters:
type: object $ref: '#/components/schemas/LoadTimeThreshold'
properties:
loadThreshold:
type: integer
timeDuration:
type: integer
InterRatEsActivationCandidateCellParameters: InterRatEsActivationCandidateCellParameters:
type: object $ref: '#/components/schemas/LoadTimeThreshold'
properties:
loadThreshold:
type: integer
timeDuration:
type: integer
InterRatEsDeactivationCandidateCellParameters: InterRatEsDeactivationCandidateCellParameters:
type: object $ref: '#/components/schemas/LoadTimeThreshold'
properties:
loadThreshold:
type: integer
timeDuration:
type: integer
UeAccProbabilityDist: UeAccProbabilityDist:
type: array
items:
$ref: '#/components/schemas/UeAccProbability'
UeAccProbability:
type: object type: object
properties: properties:
targetProbability: targetProbability:
type: integer type: integer
numberofpreamblessent: minimum: 0
maximum: 100
numberOfPreamblesSent:
type: integer type: integer
minimum: 0
maximum: 200
UeAccDelayProbabilityDist: UeAccDelayProbabilityDist:
type: array
items:
$ref: '#/components/schemas/UeAccDelayProbability'
UeAccDelayProbability:
type: object type: object
properties: properties:
targetProbability: targetProbability:
type: integer type: integer
accessdelay: minimum: 0
maximum: 100
accessDelay:
type: integer type: integer
minimum: 10
maximum: 560
NRPciList: NRPciList:
type: array type: array
...@@ -694,6 +676,33 @@ components: ...@@ -694,6 +676,33 @@ components:
minimum: 0 minimum: 0
maximum: 16777215 maximum: 16777215
MappedCellIdInfo:
type: object
properties:
ntnGeoArea:
$ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea'
mappedCellId:
$ref: 'TS28541_5GcNrm.yaml#/components/schemas/Ncgi'
MappedCellIdInfoList:
type: array
items:
$ref: '#/components/schemas/MappedCellIdInfo'
QceIdMappingInfo:
type: object
properties:
qoECollectionEntityAddress:
oneOf:
- $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr'
- $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr'
qoECollectionEntityIdentity:
type: string
pLMNTarget:
$ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
QceIdMappingInfoList:
type: array
items:
$ref: '#/components/schemas/QceIdMappingInfo'
#-------- Definition of types for name-containments ------ #-------- Definition of types for name-containments ------
SubNetwork-ncO-NrNrm: SubNetwork-ncO-NrNrm:
type: object type: object
...@@ -773,21 +782,6 @@ components: ...@@ -773,21 +782,6 @@ components:
#-------- Definition of concrete IOCs -------------------------------------------- #-------- Definition of concrete IOCs --------------------------------------------
MnS:
oneOf:
- type: object
properties:
SubNetwork:
type: array
items:
$ref: '#/components/schemas/SubNetwork-ncO-NrNrm'
- type: object
properties:
ManagedElement:
type: array
items:
$ref: '#/components/schemas/ManagedElement-ncO-NrNrm'
GnbDuFunction-Single: GnbDuFunction-Single:
allOf: allOf:
- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
...@@ -949,6 +943,10 @@ components: ...@@ -949,6 +943,10 @@ components:
type: boolean type: boolean
dDAPSHOControl: dDAPSHOControl:
type: boolean type: boolean
mappedCellIdInfoList:
$ref: '#/components/schemas/MappedCellIdInfoList'
qceIdMappingInfoList:
$ref: '#/components/schemas/QceIdMappingInfoList'
- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
- type: object - type: object
properties: properties:
...@@ -2176,8 +2174,6 @@ components: ...@@ -2176,8 +2174,6 @@ components:
resources-nrNrm: resources-nrNrm:
oneOf: oneOf:
- $ref: '#/components/schemas/MnS'
- $ref: '#/components/schemas/GnbDuFunction-Single' - $ref: '#/components/schemas/GnbDuFunction-Single'
- $ref: '#/components/schemas/GnbCuUpFunction-Single' - $ref: '#/components/schemas/GnbCuUpFunction-Single'
- $ref: '#/components/schemas/GnbCuCpFunction-Single' - $ref: '#/components/schemas/GnbCuCpFunction-Single'
......
...@@ -826,19 +826,6 @@ components: ...@@ -826,19 +826,6 @@ components:
#------------ Definition of concrete IOCs ---------------------------------------- #------------ Definition of concrete IOCs ----------------------------------------
MnS:
oneOf:
- type: object
properties:
SubNetwork:
type: array
items:
$ref: '#/components/schemas/SubNetwork-ncO-SliceNrm'
# - type: object
# properties:
# ManagedElement:
# $ref: '#/components/schemas/ManagedElement-Multiple'
NetworkSlice-Single: NetworkSlice-Single:
allOf: allOf:
- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
...@@ -1083,8 +1070,6 @@ components: ...@@ -1083,8 +1070,6 @@ components:
resources-sliceNrm: resources-sliceNrm:
oneOf: oneOf:
- $ref: '#/components/schemas/MnS'
- $ref: '#/components/schemas/NetworkSlice-Single' - $ref: '#/components/schemas/NetworkSlice-Single'
- $ref: '#/components/schemas/NetworkSliceSubnet-Single' - $ref: '#/components/schemas/NetworkSliceSubnet-Single'
- $ref: '#/components/schemas/EP_Transport-Single' - $ref: '#/components/schemas/EP_Transport-Single'
......
...@@ -125,7 +125,9 @@ components: ...@@ -125,7 +125,9 @@ components:
type: integer type: integer
AreaOfInterest: AreaOfInterest:
oneOf: oneOf:
- $ref: '#/components/schemas/GeoAreaToCellMapping' - type: array
items:
$ref: '#/components/schemas/GeoAreaToCellMapping'
- type: array - type: array
items: items:
$ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai'
...@@ -189,15 +191,17 @@ components: ...@@ -189,15 +191,17 @@ components:
enum: enum:
- LOCKED - LOCKED
- UNLOCKED - UNLOCKED
default: LOCKED
OperationalState: OperationalState:
type: string type: string
enum: enum:
- ENABLED - ENABLED
- DISABLED - DISABLED
default: DISABLED
UsageState: UsageState:
type: string type: string
enum: enum:
- IDEL - IDLE
- ACTIVE - ACTIVE
- BUSY - BUSY
AvailabilityStatus: AvailabilityStatus:
......
...@@ -77,6 +77,7 @@ components: ...@@ -77,6 +77,7 @@ components:
enum: enum:
- TRUE - TRUE
- FALSE - FALSE
default: FALSE
jobMonitor: jobMonitor:
$ref: '#/components/schemas/FileDownloadJobProcessMonitor' $ref: '#/components/schemas/FileDownloadJobProcessMonitor'
Files-Single: Files-Single:
......
...@@ -331,7 +331,6 @@ components: ...@@ -331,7 +331,6 @@ components:
maximum: 31 maximum: 31
NpnId-Type: NpnId-Type:
type: object type: object
description: This describes the PLMN id, CAG ID list or the NID of the SNPN within the PLMN.
properties: properties:
plmnId: plmnId:
$ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
...@@ -339,10 +338,17 @@ components: ...@@ -339,10 +338,17 @@ components:
type: array type: array
items: items:
type: string type: string
minItems: 1
maxItems: 256
nIDList: nIDList:
type: array type: array
items: items:
$ref: 'TS28623_ComDefs.yaml#/components/schemas/Nid' $ref: 'TS28623_ComDefs.yaml#/components/schemas/Nid'
minItems: 1
maxItems: 16
oneOf:
- required: [plmnId, cAGIdList]
- required: [plmnId, nIDList]
#-------- Definition of abstract IOC Top ----------------------------------------- #-------- Definition of abstract IOC Top -----------------------------------------
...@@ -437,6 +443,10 @@ components: ...@@ -437,6 +443,10 @@ components:
SubNetwork-ncO: SubNetwork-ncO:
type: object type: object
properties: properties:
SubNetwork:
$ref: '#/components/schemas/SubNetwork-Multiple'
ManagedElement:
$ref: '#/components/schemas/ManagedElement-Multiple'
ManagementNode: ManagementNode:
$ref: '#/components/schemas/ManagementNode-Multiple' $ref: '#/components/schemas/ManagementNode-Multiple'
MnsAgent: MnsAgent:
...@@ -688,8 +698,6 @@ components: ...@@ -688,8 +698,6 @@ components:
- $ref: '#/components/schemas/Top' - $ref: '#/components/schemas/Top'
- $ref: '#/components/schemas/SubNetwork-Attr' - $ref: '#/components/schemas/SubNetwork-Attr'
- $ref: '#/components/schemas/SubNetwork-ncO' - $ref: '#/components/schemas/SubNetwork-ncO'
- $ref: '#/components/schemas/SubNetwork-Multiple'
- $ref: '#/components/schemas/ManagedElement-Multiple'
- $ref: 'TS28104_MdaNrm.yaml#/components/schemas/SubNetwork-ncO-MdaNrm' - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/SubNetwork-ncO-MdaNrm'
- $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/SubNetwork-ncO-AiMlNrm' - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/SubNetwork-ncO-AiMlNrm'
- $ref: 'TS28312_IntentNrm.yaml#/components/schemas/SubNetwork-ncO-IntentNrm' - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/SubNetwork-ncO-IntentNrm'
...@@ -699,6 +707,7 @@ components: ...@@ -699,6 +707,7 @@ components:
- $ref: 'TS28541_SliceNrm.yaml#/components/schemas/SubNetwork-ncO-SliceNrm' - $ref: 'TS28541_SliceNrm.yaml#/components/schemas/SubNetwork-ncO-SliceNrm'
- $ref: 'TS28541_NrNrm.yaml#/components/schemas/SubNetwork-ncO-NrNrm' - $ref: 'TS28541_NrNrm.yaml#/components/schemas/SubNetwork-ncO-NrNrm'
- $ref: 'TS28541_5GcNrm.yaml#/components/schemas/SubNetwork-ncO-5GcNrm' - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/SubNetwork-ncO-5GcNrm'
- $ref: 'TS28318_DsoNrm.yaml#/components/schemas/SubNetwork-ncO-DsoNrm'
ManagedElement-Single: ManagedElement-Single:
allOf: allOf:
...@@ -711,6 +720,17 @@ components: ...@@ -711,6 +720,17 @@ components:
- $ref: 'TS28541_NrNrm.yaml#/components/schemas/ManagedElement-ncO-NrNrm' - $ref: 'TS28541_NrNrm.yaml#/components/schemas/ManagedElement-ncO-NrNrm'
- $ref: 'TS28541_5GcNrm.yaml#/components/schemas/ManagedElement-ncO-5GcNrm' - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/ManagedElement-ncO-5GcNrm'
NrmRoot:
oneOf:
- type: object
properties:
SubNetwork:
$ref: '#/components/schemas/SubNetwork-Multiple'
- type: object
properties:
ManagedElement:
$ref: '#/components/schemas/ManagedElement-Multiple'
#-------- Definition of YAML arrays for name-contained IOCs ---------------------- #-------- Definition of YAML arrays for name-contained IOCs ----------------------
VsDataContainer-Multiple: VsDataContainer-Multiple:
...@@ -755,7 +775,7 @@ components: ...@@ -755,7 +775,7 @@ components:
resources-genericNrm: resources-genericNrm:
oneOf: oneOf:
- $ref: '#/components/schemas/NrmRoot'
- $ref: '#/components/schemas/VsDataContainer-Single' - $ref: '#/components/schemas/VsDataContainer-Single'
- $ref: '#/components/schemas/ManagementNode-Single' - $ref: '#/components/schemas/ManagementNode-Single'
- $ref: '#/components/schemas/MnsAgent-Single' - $ref: '#/components/schemas/MnsAgent-Single'
......
...@@ -58,8 +58,10 @@ components: ...@@ -58,8 +58,10 @@ components:
heartbeatNtfPeriod: heartbeatNtfPeriod:
type: integer type: integer
minimum: 0 minimum: 0
default: 0
triggerHeartbeatNtf: triggerHeartbeatNtf:
type: boolean type: boolean
default: FALSE
#-------- Definition of YAML arrays for name-contained IOCs ---------------------- #-------- Definition of YAML arrays for name-contained IOCs ----------------------
NtfSubscriptionControl-Multiple: NtfSubscriptionControl-Multiple:
......
...@@ -29,7 +29,7 @@ components: ...@@ -29,7 +29,7 @@ components:
- TRACE_AND_5GC_UE_LEVEL_MEASUREMENTS - TRACE_AND_5GC_UE_LEVEL_MEASUREMENTS
- IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS - IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS
- TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS - TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS
default: TRACE_ONLY
listOfInterfaces-Type: listOfInterfaces-Type:
description: The interfaces to be recorded in the Network Element. See 3GPP TS 32.422 clause 5.5 for additional details. description: The interfaces to be recorded in the Network Element. See 3GPP TS 32.422 clause 5.5 for additional details.
type: object type: object
...@@ -403,6 +403,13 @@ components: ...@@ -403,6 +403,13 @@ components:
- mcc - mcc
- mnc - mnc
listOfTraceMetrics:
description: The trace messages to be reported. See 3GPP TS 32.422 clause 10 for additional details.
type: array
items:
type: string
traceDepth-Type: traceDepth-Type:
description: Specifies how detailed information should be recorded in the Network Element. The Trace Depth is a paremeter for Trace Session level, i.e., the Trace Depth is the same for all of the NEs to be traced in the same Trace Session. See 3GPP TS 32.422 clause 5.3 for additional details. description: Specifies how detailed information should be recorded in the Network Element. The Trace Depth is a paremeter for Trace Session level, i.e., the Trace Depth is the same for all of the NEs to be traced in the same Trace Session. See 3GPP TS 32.422 clause 5.3 for additional details.
type: string type: string
...@@ -413,6 +420,7 @@ components: ...@@ -413,6 +420,7 @@ components:
- VENDORMINIMUM - VENDORMINIMUM
- VENDORMEDIUM - VENDORMEDIUM
- VENDORMAXIMUM - VENDORMAXIMUM
default: MAXIMUM
traceReference-Type: traceReference-Type:
type: object type: object
...@@ -435,6 +443,7 @@ components: ...@@ -435,6 +443,7 @@ components:
enum: enum:
- FILE-BASED - FILE-BASED
- STREAMING - STREAMING
default: FILE-BASED
traceTarget-Type: traceTarget-Type:
type: object type: object
...@@ -624,6 +633,7 @@ components: ...@@ -624,6 +633,7 @@ components:
enum: enum:
- NO_IDENTITY - NO_IDENTITY
- TAC_OF_IMEI - TAC_OF_IMEI
default: NO_IDENTITY
beamLevelMeasurement-Type: beamLevelMeasurement-Type:
description: Determines whether beam level measurements shall be included in case of immediate MDT M1 measurement in NR. For additional details see 3GPP TS 32.422 clause 5.10.40. description: Determines whether beam level measurements shall be included in case of immediate MDT M1 measurement in NR. For additional details see 3GPP TS 32.422 clause 5.10.40.
...@@ -1448,6 +1458,8 @@ components: ...@@ -1448,6 +1458,8 @@ components:
$ref: '#/components/schemas/plmnTarget-Type' $ref: '#/components/schemas/plmnTarget-Type'
nPNTarget: nPNTarget:
$ref: 'TS28623_GenericNrm.yaml#/components/schemas/NpnId-Type' $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NpnId-Type'
listOfTraceMetrics:
type: array
traceReportingConsumerUri: traceReportingConsumerUri:
$ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri'
traceCollectionEntityIpAddress: traceCollectionEntityIpAddress:
......