From 8ff80a1e9d389b02a7c6d8838e5b069f4eafd7ff Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 15 Feb 2023 06:58:43 +0000 Subject: [PATCH 1/2] CR0866 remove redundant definition for Mnc, PlmnId --- OpenAPI/TS28541_5GcNrm.yaml | 20 ++++++++++---------- OpenAPI/TS28541_NrNrm.yaml | 26 ++++++++------------------ 2 files changed, 18 insertions(+), 28 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index dd098b582..e4a76eab5 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -67,7 +67,7 @@ components: nFStatus: $ref: '#/components/schemas/NFStatus' plmn: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' sNssais: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' fqdn: @@ -101,7 +101,7 @@ components: apiPrfix: type: string allowedPlmns: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' allowedNfTypes: type: array items: @@ -209,7 +209,7 @@ components: allowedPLMNs: type: array items: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' allowedSNPNs: type: array items: @@ -539,7 +539,7 @@ components: type: object properties: plmnId: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' nRTACRangelist: type: array items: @@ -549,7 +549,7 @@ components: type: object properties: pLMNId: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' aMFIdentifier: type: integer @@ -1255,7 +1255,7 @@ components: - type: object properties: plmnId: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' sEPPType: $ref: '#/components/schemas/SEPPType' sEPPId: @@ -1374,7 +1374,7 @@ components: - type: object properties: plmnId: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' sBIFqdn: type: string managedNFProfile: @@ -1404,7 +1404,7 @@ components: - type: object properties: plmnId: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' sBIFqdn: type: string managedNFProfile: @@ -1501,7 +1501,7 @@ components: - type: object properties: plmnId: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' sEPPId: type: integer fqdn: @@ -1834,7 +1834,7 @@ components: - type: object properties: remotePlmnId: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' remoteSeppAddress: $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr' remoteSeppId: diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index d5b7e5189..993335174 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -44,25 +44,15 @@ components: sd: type: string - Mnc: - type: string - pattern: '[0-9]{3}|[0-9]{2}' - PlmnId: - type: object - properties: - mcc: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mcc' - mnc: - $ref: '#/components/schemas/Mnc' PlmnIdList: type: array items: - $ref: '#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' PlmnInfo: type: object properties: plmnId: - $ref: '#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' snssai: $ref: '#/components/schemas/Snssai' PlmnInfoList: @@ -77,7 +67,7 @@ components: type: object properties: plmnId: - $ref: '#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' cagidList: $ref: '#/components/schemas/cagId' nidList: @@ -117,7 +107,7 @@ components: type: object properties: plmnId: - $ref: '#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' nrTac: $ref: '#/components/schemas/NrTac' TaiList: @@ -287,7 +277,7 @@ components: type: object properties: plmnId: - $ref: '#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' snssai: $ref: '#/components/schemas/Snssai' RrmPolicyMemberList: @@ -587,7 +577,7 @@ components: TceID: type: integer PlmnTarget: - $ref: '#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' TceMappingInfoList: type: array items: @@ -822,7 +812,7 @@ components: gnbCuName: $ref: '#/components/schemas/GnbName' plmnId: - $ref: '#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' x2BlockList: $ref: '#/components/schemas/GGnbIdList' xnBlockList: @@ -1588,7 +1578,7 @@ components: gnbIdLength: $ref: '#/components/schemas/GnbIdLength' plmnId: - $ref: '#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From 2d3eadc08e6d027e792f92c314dcf18d3726f0c4 Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 15 Feb 2023 07:07:58 +0000 Subject: [PATCH 2/2] impact to IntentNrm and EdgeNrm --- OpenAPI/TS28312_IntentNrm.yaml | 2 +- OpenAPI/TS28538_EdgeNrm.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 0257e341e..69ed6f2fd 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -647,7 +647,7 @@ components: contextValueRange: type: array items: - $ref: "TS28541_NrNrm.yaml#/components/schemas/PlmnId" + $ref: "TS28623_ComDefs.yaml#/components/schemas/PlmnId" NRFqBandContext: description: >- This data type is the "ObjectContext" data type with specialisations for NRFqBandContext diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 4b3554df7..c8331d3c0 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -31,7 +31,7 @@ components: trackingAreaIdList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/TaiList' servingPLMN: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' GeoLoc: type: object properties: -- GitLab