From 988c66de086071215dc877dab89b30ca570331a7 Mon Sep 17 00:00:00 2001 From: Joey Chou Date: Wed, 16 Feb 2022 03:02:38 +0000 Subject: [PATCH 1/7] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 74 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 91383acfe..d27fb838e 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -562,6 +562,35 @@ components: type: array items: type: string + + 5GCNfConnEcmInfoList: + type: array + items: + $ref: '#/components/schemas/5GCNfConnEcmInfo' + 5GCNfConnEcmInfo: + type: object + description: 'Store the 5GC NF connection information' + properties: + 5GCNFType: + type: string + enum: + - PCF + - NEF + - SCEF + 5GCNFIpAddress: + type: string + 5GCNFRef: + $ref: 'genericNrm.yaml#/components/schemas/Dn' + + + UPFConnectionInfo: + type: object + properties: + uPFIpAddress: + type: string + uPFRef: + $ref: 'genericNrm.yaml#/components/schemas/Dn' + #-------- Definition of concrete IOCs -------------------------------------------- @@ -594,6 +623,8 @@ components: $ref: '#/components/schemas/Configurable5QISet-Multiple' Dynamic5QISet: $ref: '#/components/schemas/Dynamic5QISet-Multiple' + EcmConnectionInfo: + $ref: '#/components/schemas/EcmConnectionInfo-Multiple' ManagedElement-Single: allOf: @@ -646,6 +677,8 @@ components: $ref: '#/components/schemas/Configurable5QISet-Multiple' Dynamic5QISet: $ref: '#/components/schemas/Dynamic5QISet-Multiple' + EcmConnectionInfo: + $ref: '#/components/schemas/EcmConnectionInfo-Multiple' AmfFunction-Single: allOf: @@ -1300,6 +1333,40 @@ components: EP_Nxx: $ref: '#/components/schemas/EP_Nxx-Multiple' + EcmConnectionInfo-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - type: object + properties: + eASServiceArea: + $ref: 'EdgeNRM.yaml#/components/schemas/ServingLocation' + eESServiceArea: + $ref: 'EdgeNRM.yaml#/components/schemas/ServingLocation' + eDNServiceArea: + $ref: 'EdgeNRM.yaml#/components/schemas/ServingLocation' + eASIpAddress: + type: string + eESIpAddress: + type: string + eCSIpAddress: + type: string + ednIdentifier: + type: string + ecmConnectionType: + type: string + enum: + - USERPLANE + - CONTROLPLANE + - BOTH + 5GCNfConnEcmInfoList: + $ref: '#/components/schemas/5GCNfConnEcmInfoList' + uPFConnectionInfo: + $ref: '#/components/schemas/UPFConnectionInfo' + ExternalAmfFunction-Single: allOf: @@ -2304,6 +2371,11 @@ components: type: array items: $ref: '#/components/schemas/Dynamic5QISet-Single' + EcmConnectionInfo-Multiple: + type: array + items: + $ref: '#/components/schemas/EcmConnectionInfo-Single' + @@ -2384,3 +2456,5 @@ components: - $ref: '#/components/schemas/PredefinedPccRuleSet-Single' - $ref: '#/components/schemas/Dynamic5QISet-Single' - $ref: '#/components/schemas/EASDFFunction-Single' + - $ref: '#/components/schemas/EcmConnectionInfo-Single' + -- GitLab From 1e5d9e014264cb52958af3bf46a74abc68397f09 Mon Sep 17 00:00:00 2001 From: Joey Chou Date: Wed, 16 Feb 2022 03:02:38 +0000 Subject: [PATCH 2/7] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 73 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index fdda9b660..0232281fc 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -593,6 +593,34 @@ components: ipv6Prefix: type: string + 5GCNfConnEcmInfoList: + type: array + items: + $ref: '#/components/schemas/5GCNfConnEcmInfo' + 5GCNfConnEcmInfo: + type: object + description: 'Store the 5GC NF connection information' + properties: + 5GCNFType: + type: string + enum: + - PCF + - NEF + - SCEF + 5GCNFIpAddress: + type: string + 5GCNFRef: + $ref: 'genericNrm.yaml#/components/schemas/Dn' + + + UPFConnectionInfo: + type: object + properties: + uPFIpAddress: + type: string + uPFRef: + $ref: 'genericNrm.yaml#/components/schemas/Dn' + #-------- Definition of concrete IOCs -------------------------------------------- SubNetwork-Single: @@ -624,6 +652,8 @@ components: $ref: '#/components/schemas/Configurable5QISet-Multiple' Dynamic5QISet: $ref: '#/components/schemas/Dynamic5QISet-Multiple' + EcmConnectionInfo: + $ref: '#/components/schemas/EcmConnectionInfo-Multiple' ManagedElement-Single: allOf: @@ -676,6 +706,8 @@ components: $ref: '#/components/schemas/Configurable5QISet-Multiple' Dynamic5QISet: $ref: '#/components/schemas/Dynamic5QISet-Multiple' + EcmConnectionInfo: + $ref: '#/components/schemas/EcmConnectionInfo-Multiple' AmfFunction-Single: allOf: @@ -1358,6 +1390,40 @@ components: EP_Nxx: $ref: '#/components/schemas/EP_Nxx-Multiple' + EcmConnectionInfo-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - type: object + properties: + eASServiceArea: + $ref: 'EdgeNRM.yaml#/components/schemas/ServingLocation' + eESServiceArea: + $ref: 'EdgeNRM.yaml#/components/schemas/ServingLocation' + eDNServiceArea: + $ref: 'EdgeNRM.yaml#/components/schemas/ServingLocation' + eASIpAddress: + type: string + eESIpAddress: + type: string + eCSIpAddress: + type: string + ednIdentifier: + type: string + ecmConnectionType: + type: string + enum: + - USERPLANE + - CONTROLPLANE + - BOTH + 5GCNfConnEcmInfoList: + $ref: '#/components/schemas/5GCNfConnEcmInfoList' + uPFConnectionInfo: + $ref: '#/components/schemas/UPFConnectionInfo' + ExternalAmfFunction-Single: allOf: @@ -2362,6 +2428,11 @@ components: type: array items: $ref: '#/components/schemas/Dynamic5QISet-Single' + EcmConnectionInfo-Multiple: + type: array + items: + $ref: '#/components/schemas/EcmConnectionInfo-Single' + @@ -2448,3 +2519,5 @@ components: - $ref: '#/components/schemas/PredefinedPccRuleSet-Single' - $ref: '#/components/schemas/Dynamic5QISet-Single' - $ref: '#/components/schemas/EASDFFunction-Single' + - $ref: '#/components/schemas/EcmConnectionInfo-Single' + -- GitLab From e3caf4ec8fb724d071e46545c8f1d16a09df015b Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 17 Feb 2022 09:30:48 +0800 Subject: [PATCH 3/7] manual fix of confliction --- OpenAPI/5gcNrm.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 9204d8482..0232281fc 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -563,7 +563,6 @@ components: items: type: string -<<<<<<< HEAD DnnSmfInfoItem: type: object properties: @@ -594,8 +593,6 @@ components: ipv6Prefix: type: string -======= ->>>>>>> 988c66de086071215dc877dab89b30ca570331a7 5GCNfConnEcmInfoList: type: array items: @@ -624,10 +621,6 @@ components: uPFRef: $ref: 'genericNrm.yaml#/components/schemas/Dn' -<<<<<<< HEAD -======= - ->>>>>>> 988c66de086071215dc877dab89b30ca570331a7 #-------- Definition of concrete IOCs -------------------------------------------- SubNetwork-Single: -- GitLab From 577b39fd0cc7edf4378574fc00cd1997ff55b37d Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 17 Feb 2022 01:36:03 +0000 Subject: [PATCH 4/7] comDefs.yaml is used for Dn as per change from 139/140 delivery Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 0232281fc..ea27ca8c0 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -610,7 +610,7 @@ components: 5GCNFIpAddress: type: string 5GCNFRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' UPFConnectionInfo: @@ -619,7 +619,7 @@ components: uPFIpAddress: type: string uPFRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' #-------- Definition of concrete IOCs -------------------------------------------- -- GitLab From 48d2ecc32f7586b033447ce5d28403128ff684de Mon Sep 17 00:00:00 2001 From: Joey Chou Date: Wed, 16 Feb 2022 03:02:38 +0000 Subject: [PATCH 5/7] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 73 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index fdda9b660..0232281fc 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -593,6 +593,34 @@ components: ipv6Prefix: type: string + 5GCNfConnEcmInfoList: + type: array + items: + $ref: '#/components/schemas/5GCNfConnEcmInfo' + 5GCNfConnEcmInfo: + type: object + description: 'Store the 5GC NF connection information' + properties: + 5GCNFType: + type: string + enum: + - PCF + - NEF + - SCEF + 5GCNFIpAddress: + type: string + 5GCNFRef: + $ref: 'genericNrm.yaml#/components/schemas/Dn' + + + UPFConnectionInfo: + type: object + properties: + uPFIpAddress: + type: string + uPFRef: + $ref: 'genericNrm.yaml#/components/schemas/Dn' + #-------- Definition of concrete IOCs -------------------------------------------- SubNetwork-Single: @@ -624,6 +652,8 @@ components: $ref: '#/components/schemas/Configurable5QISet-Multiple' Dynamic5QISet: $ref: '#/components/schemas/Dynamic5QISet-Multiple' + EcmConnectionInfo: + $ref: '#/components/schemas/EcmConnectionInfo-Multiple' ManagedElement-Single: allOf: @@ -676,6 +706,8 @@ components: $ref: '#/components/schemas/Configurable5QISet-Multiple' Dynamic5QISet: $ref: '#/components/schemas/Dynamic5QISet-Multiple' + EcmConnectionInfo: + $ref: '#/components/schemas/EcmConnectionInfo-Multiple' AmfFunction-Single: allOf: @@ -1358,6 +1390,40 @@ components: EP_Nxx: $ref: '#/components/schemas/EP_Nxx-Multiple' + EcmConnectionInfo-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - type: object + properties: + eASServiceArea: + $ref: 'EdgeNRM.yaml#/components/schemas/ServingLocation' + eESServiceArea: + $ref: 'EdgeNRM.yaml#/components/schemas/ServingLocation' + eDNServiceArea: + $ref: 'EdgeNRM.yaml#/components/schemas/ServingLocation' + eASIpAddress: + type: string + eESIpAddress: + type: string + eCSIpAddress: + type: string + ednIdentifier: + type: string + ecmConnectionType: + type: string + enum: + - USERPLANE + - CONTROLPLANE + - BOTH + 5GCNfConnEcmInfoList: + $ref: '#/components/schemas/5GCNfConnEcmInfoList' + uPFConnectionInfo: + $ref: '#/components/schemas/UPFConnectionInfo' + ExternalAmfFunction-Single: allOf: @@ -2362,6 +2428,11 @@ components: type: array items: $ref: '#/components/schemas/Dynamic5QISet-Single' + EcmConnectionInfo-Multiple: + type: array + items: + $ref: '#/components/schemas/EcmConnectionInfo-Single' + @@ -2448,3 +2519,5 @@ components: - $ref: '#/components/schemas/PredefinedPccRuleSet-Single' - $ref: '#/components/schemas/Dynamic5QISet-Single' - $ref: '#/components/schemas/EASDFFunction-Single' + - $ref: '#/components/schemas/EcmConnectionInfo-Single' + -- GitLab From 7cd5c5a7e9e3525236e5a820ca2b9cf887b7f548 Mon Sep 17 00:00:00 2001 From: Joey Chou Date: Wed, 16 Feb 2022 03:02:38 +0000 Subject: [PATCH 6/7] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 0232281fc..bc535ca90 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -612,7 +612,6 @@ components: 5GCNFRef: $ref: 'genericNrm.yaml#/components/schemas/Dn' - UPFConnectionInfo: type: object properties: -- GitLab From ff22aeff9bcf7521e1dd66a5552bff636590af21 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 17 Feb 2022 01:36:03 +0000 Subject: [PATCH 7/7] comDefs.yaml is used for Dn as per change from 139/140 delivery Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index bc535ca90..6be793123 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -610,7 +610,7 @@ components: 5GCNFIpAddress: type: string 5GCNFRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' UPFConnectionInfo: type: object @@ -618,7 +618,7 @@ components: uPFIpAddress: type: string uPFRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' #-------- Definition of concrete IOCs -------------------------------------------- -- GitLab