From b569eb545431d9ce238e2951c49fb00e6b59636f Mon Sep 17 00:00:00 2001 From: shumim Date: Sun, 7 Apr 2024 10:16:00 +0000 Subject: [PATCH 1/7] add mapped cell id for gNB and AMF --- OpenAPI/TS28541_5GcNrm.yaml | 4 +++- OpenAPI/TS28541_NrNrm.yaml | 13 +++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 9379ea467..780178656 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3035,7 +3035,9 @@ components: sliceExpiryInfo: $ref: '#/components/schemas/SliceExpiryInfo' 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' - type: object properties: diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 9cfcb39b7..d7a5617a9 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -694,6 +694,17 @@ components: minimum: 0 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' #-------- Definition of types for name-containments ------ SubNetwork-ncO-NrNrm: type: object @@ -949,6 +960,8 @@ components: type: boolean dDAPSHOControl: type: boolean + mappedCellIdInfoList: + $ref: '#/components/schemas/MappedCellIdInfoList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From c300a6088e7eff253470ca3a848c504a15b9ac50 Mon Sep 17 00:00:00 2001 From: shumim Date: Sun, 7 Apr 2024 10:45:44 +0000 Subject: [PATCH 2/7] Update message --- OpenAPI/TS28541_5GcNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 780178656..5c88bac24 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3037,7 +3037,7 @@ components: SatelliteBackhaulInfoList: $ref: '#/components/schemas/SatelliteBackhaulInfo' mappedCellIdInfoList: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/mappedCellIdInfoList' + $ref: 'TS28541_NrNrm.yaml#/components/schemas/MappedCellIdInfoList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From 3a505e0b51798e45aa1996d58ce6de4b5e923518 Mon Sep 17 00:00:00 2001 From: shumim Date: Thu, 25 Apr 2024 03:47:02 +0000 Subject: [PATCH 3/7] Update TS28541_5GcNrm.yaml according to cr update --- OpenAPI/TS28541_5GcNrm.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 5c88bac24..3e508cc29 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3496,6 +3496,8 @@ components: $ref: '#/components/schemas/CommModelList' lmfInfo: $ref: '#/components/schemas/LmfInfo' + mappedCellIdInfoList: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/MappedCellIdInfoList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From d4d1b6a5671652e04a34c2a3150fb0f713ae3bbe Mon Sep 17 00:00:00 2001 From: shumim Date: Sun, 7 Apr 2024 10:16:00 +0000 Subject: [PATCH 4/7] add mapped cell id for gNB and AMF --- OpenAPI/TS28541_5GcNrm.yaml | 4 +++- OpenAPI/TS28541_NrNrm.yaml | 13 +++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 2053089df..3198d560a 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3071,7 +3071,9 @@ components: sliceExpiryInfo: $ref: '#/components/schemas/SliceExpiryInfo' 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' - type: object properties: diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 9cfcb39b7..d7a5617a9 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -694,6 +694,17 @@ components: minimum: 0 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' #-------- Definition of types for name-containments ------ SubNetwork-ncO-NrNrm: type: object @@ -949,6 +960,8 @@ components: type: boolean dDAPSHOControl: type: boolean + mappedCellIdInfoList: + $ref: '#/components/schemas/MappedCellIdInfoList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From b366dc0d8fd584e965628d8e5c65ae7912408d88 Mon Sep 17 00:00:00 2001 From: shumim Date: Sun, 7 Apr 2024 10:45:44 +0000 Subject: [PATCH 5/7] Update message --- OpenAPI/TS28541_5GcNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 3198d560a..785b7f215 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3073,7 +3073,7 @@ components: SatelliteBackhaulInfoList: $ref: '#/components/schemas/SatelliteBackhaulInfo' mappedCellIdInfoList: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/mappedCellIdInfoList' + $ref: 'TS28541_NrNrm.yaml#/components/schemas/MappedCellIdInfoList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From 641d86e82f297d764b9343ed5dad9cdb7258fabf Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 25 Apr 2024 20:25:27 +0800 Subject: [PATCH 6/7] manually resolving confliction --- OpenAPI/TS28541_5GcNrm.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 785b7f215..825a03d62 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3073,7 +3073,7 @@ components: SatelliteBackhaulInfoList: $ref: '#/components/schemas/SatelliteBackhaulInfo' mappedCellIdInfoList: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/MappedCellIdInfoList' + $ref: 'TS28541_NrNrm.yaml#/components/schemas/MappedCellIdInfoList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -3536,6 +3536,8 @@ components: $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' - type: object properties: -- GitLab From 587ecd3a8299eccbdd1eaf7aad9701759f72883f Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 25 Apr 2024 12:48:32 +0000 Subject: [PATCH 7/7] correcting the rebase issue, Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 4be19de25..825a03d62 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3532,13 +3532,10 @@ components: $ref: '#/components/schemas/CommModelList' lmfInfo: $ref: '#/components/schemas/LmfInfo' -<<<<<<< HEAD ephemerisInfos: $ref: 'TS28541_NrNrm.yaml#/components/schemas/EphemerisInfos' trpInfoList: $ref: '#/components/schemas/TrpInfoList' -======= ->>>>>>> 3a505e0b51798e45aa1996d58ce6de4b5e923518 mappedCellIdInfoList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/MappedCellIdInfoList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' -- GitLab