From d2079f29ff9eb858805af3b745472888ef1cee79 Mon Sep 17 00:00:00 2001
From: yaoyiz <yizhi.yao@intel.com>
Date: Mon, 5 Feb 2024 17:34:18 +0000
Subject: [PATCH 1/2] MDA Open API

---
 OpenAPI/TS28104_MdaNrm.yaml | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml
index 758a190c8..dd4c9204a 100644
--- a/OpenAPI/TS28104_MdaNrm.yaml
+++ b/OpenAPI/TS28104_MdaNrm.yaml
@@ -25,6 +25,18 @@ components:
       items:
         $ref: '#/components/schemas/MDAOutputPerMDAType'
 
+    AnalyticsScopeType:
+      oneOf:
+        - type: object
+          properties:
+            managedEntitiesScope:
+              $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
+        - type: object
+          properties:
+            areaScope:
+              $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea'
+ 
+
     MDAOutputPerMDAType:
       type: object
       properties:
@@ -58,18 +70,7 @@ components:
 
     ReportingTarget:
       $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri'
-
-    AnalyticsScopeType:
-      oneOf:
-        - type: object
-          properties:
-            managedEntitiesScope:
-              $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
-        - type: object
-          properties:
-            areaScope:
-              $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea'
-
+      
     AnalyticsSchedule:
       oneOf:
         - type: object
@@ -184,6 +185,8 @@ components:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
                     stopTime:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
+                    recommendationFilter:
+                      $ref: '#/components/schemas/AnalyticsScopeType'
 
     MDAReport-Single:
       $ref: 'TS28104_MdaReport.yaml#/components/schemas/MDAReport'
@@ -219,7 +222,6 @@ components:
       oneOf:
         - $ref: '#/components/schemas/SubNetwork-Single'
         - $ref: '#/components/schemas/ManagedElement-Single'
-
         - $ref: '#/components/schemas/MDAFunction-Single'
         - $ref: '#/components/schemas/MDARequest-Single'
         - $ref: '#/components/schemas/MDAReport-Single'
-- 
GitLab


From 9553878b287f7c51733ec9838ed7272d9ca21dab Mon Sep 17 00:00:00 2001
From: Hassan Al-Kanani <hassan.alkanani@emea.nec.com>
Date: Mon, 5 Feb 2024 20:47:55 +0000
Subject: [PATCH 2/2] Update TS28104_MdaNrm.yaml

---
 OpenAPI/TS28104_MdaNrm.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml
index dd4c9204a..dc708105f 100644
--- a/OpenAPI/TS28104_MdaNrm.yaml
+++ b/OpenAPI/TS28104_MdaNrm.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: MDA NRM
-  version: 18.0.0
+  version: 18.2.0
   description: >-
     OAS 3.0.1 specification of the MDA NRM
     © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
-- 
GitLab