From 1234305ca6f583d0ffa4ed1516cd5a55d4fe16c5 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sat, 29 Jan 2022 03:48:52 +0000 Subject: [PATCH 1/3] Update nrNrm.yaml --- OpenAPI/nrNrm.yaml | 66 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 64 insertions(+), 2 deletions(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index 53fdd7a8d..4b38218ec 100755 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -629,7 +629,13 @@ components: - PRB_DL - RRC - DRB - + ParameterInfo: + type: object + properties: + maxValue: + type: integer + minValue: + type: integer #-------- Definition of abstract IOCs -------------------------------------------- RrmPolicy_-Attr: @@ -685,7 +691,8 @@ components: $ref: '#/components/schemas/RimRSGlobal-Single' Dynamic5QISet: $ref: '5gcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple' - + CCOFunction: + $ref: '#/components/schemas/CCOFunction-Single' ManagedElement-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' @@ -1799,6 +1806,57 @@ components: $ref: '#/components/schemas/LocalAddress' remoteAddress: $ref: '#/components/schemas/RemoteAddress' + CCOFunction-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + cCOSwitch: + type: boolean + cCOWeakCoverageParameters: + $ref: '#/components/schemas/CCOWeakCoverageParameters-Single' + cCOPilotPollutionParameters: + $ref: '#/components/schemas/CCOPilotPollutionParameters-Single' + cCOOvershootCoverageParameters-Single: + $ref: '#/components/schemas/CCOOvershootCoverageParameters-Single' + CCOParameters_-Attr: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + coverageShapeList: + type: integer + downlinkTransmitPowerInfo: + $ref: '#/components/schemas/ParameterInfo' + antennaTiltInfo: + $ref: '#/components/schemas/ParameterInfo' + antennaAzimuthInfo: + $ref: '#/components/schemas/ParameterInfo' + digitalTiltInfo: + $ref: '#/components/schemas/ParameterInfo' + digitalAzimuthInfo: + $ref: '#/components/schemas/ParameterInfo' + + CCOWeakCoverageParameters-Single: + allOf: + - $ref: '#/components/schemas/CCOParameters_-Attr' + - type: object + + CCOPilotPollutionParameters-Single: + allOf: + - $ref: '#/components/schemas/CCOParameters_-Attr' + - type: object + + CCOOvershootCoverageParameters-Single: + allOf: + - $ref: '#/components/schemas/CCOParameters_-Attr' + - type: object #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -2018,3 +2076,7 @@ components: - $ref: '#/components/schemas/EP_NgU-Single' - $ref: '#/components/schemas/EP_X2U-Single' - $ref: '#/components/schemas/EP_S1U-Single' + - $ref: '#/components/schemas/CCOFunction-Single' + - $ref: '#/components/schemas/CCOWeakCoverageParameters-Single' + - $ref: '#/components/schemas/CCOPilotPollutionParameters-Single' + - $ref: '#/components/schemas/CCOOvershootCoverageParameters-Single' -- GitLab From 964a28db2487c2bc070ff8dff0802010870c893a Mon Sep 17 00:00:00 2001 From: shixixi Date: Fri, 11 Feb 2022 06:20:48 +0000 Subject: [PATCH 2/3] Update nrNrm.yaml --- OpenAPI/nrNrm.yaml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index 4b38218ec..c672dfe1a 100755 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -629,7 +629,7 @@ components: - PRB_DL - RRC - DRB - ParameterInfo: + ParameterRange: type: object properties: maxValue: @@ -1814,7 +1814,7 @@ components: attributes: type: object properties: - cCOSwitch: + cCOControl: type: boolean cCOWeakCoverageParameters: $ref: '#/components/schemas/CCOWeakCoverageParameters-Single' @@ -1832,30 +1832,30 @@ components: properties: coverageShapeList: type: integer - downlinkTransmitPowerInfo: - $ref: '#/components/schemas/ParameterInfo' - antennaTiltInfo: - $ref: '#/components/schemas/ParameterInfo' - antennaAzimuthInfo: - $ref: '#/components/schemas/ParameterInfo' - digitalTiltInfo: - $ref: '#/components/schemas/ParameterInfo' - digitalAzimuthInfo: - $ref: '#/components/schemas/ParameterInfo' + downlinkTransmitPowerRange: + $ref: '#/components/schemas/ParameterRange' + antennaTiltRange: + $ref: '#/components/schemas/ParameterRange' + antennaAzimuthRange: + $ref: '#/components/schemas/ParameterRange' + digitalTiltRange: + $ref: '#/components/schemas/ParameterRange' + digitalAzimuthRange: + $ref: '#/components/schemas/ParameterRange' CCOWeakCoverageParameters-Single: allOf: - - $ref: '#/components/schemas/CCOParameters_-Attr' + - $ref: '#/components/schemas/CCOParameters-Attr' - type: object CCOPilotPollutionParameters-Single: allOf: - - $ref: '#/components/schemas/CCOParameters_-Attr' + - $ref: '#/components/schemas/CCOParameters-Attr' - type: object CCOOvershootCoverageParameters-Single: allOf: - - $ref: '#/components/schemas/CCOParameters_-Attr' + - $ref: '#/components/schemas/CCOParameters-Attr' - type: object #-------- Definition of JSON arrays for name-contained IOCs ---------------------- -- GitLab From a3eaa17cbc3384d2d54d163de9664daa2fb63857 Mon Sep 17 00:00:00 2001 From: shixixi Date: Fri, 11 Feb 2022 06:22:41 +0000 Subject: [PATCH 3/3] Update nrNrm.yaml --- OpenAPI/nrNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index c672dfe1a..6bc664e55 100755 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -1822,7 +1822,7 @@ components: $ref: '#/components/schemas/CCOPilotPollutionParameters-Single' cCOOvershootCoverageParameters-Single: $ref: '#/components/schemas/CCOOvershootCoverageParameters-Single' - CCOParameters_-Attr: + CCOParameters-Attr: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object -- GitLab