From 010d32ad318c87d169aec8c69a55c6992a0f8b43 Mon Sep 17 00:00:00 2001
From: yaoyiz <yizhi.yao@intel.com>
Date: Wed, 2 Nov 2022 18:28:16 +0000
Subject: [PATCH 1/3] Update TS28104_MdaNrm.yaml

---
 OpenAPI/TS28104_MdaNrm.yaml | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml
index b74804c5e..66dd2549c 100644
--- a/OpenAPI/TS28104_MdaNrm.yaml
+++ b/OpenAPI/TS28104_MdaNrm.yaml
@@ -45,9 +45,7 @@ components:
         threshold:
           $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ThresholdInfo'
         analyticsPeriod:
-          type: array
-          items:
-            $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
+          $ref: '#/components/schemas/AnalyticsSchedule'
         timeOut:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
 
@@ -61,7 +59,7 @@ components:
     ReportingTarget:
       $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri'
 
-    AnalyticsScope:
+    AnalyticsScopeType:
       oneOf:
         - type: object
           properties:
@@ -96,6 +94,19 @@ components:
         longitude:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/Longitude'
 
+    AnalyticsSchedule:
+      oneOf:
+        - type: object
+          properties:
+            timeDurations:
+              type: array
+              items:
+                $ref: 'TS28104_MdaReport.yaml#/components/schemas/TimeWindow'
+        - type: object
+          properties:
+            granularityPeriod:
+              type: integer
+
 
 #-------- Definition of abstract IOCs --------------------------------------------
 
@@ -170,7 +181,7 @@ components:
                     reportingTarget:
                       $ref: '#/components/schemas/ReportingTarget'
                     analyticsScope:
-                      $ref: '#/components/schemas/AnalyticsScope'
+                      $ref: '#/components/schemas/AnalyticsScopeType'
                     startTime:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
                     stopTime:
-- 
GitLab


From 34fd46abd949bfbabad12d9bd042ee1fced3b18d Mon Sep 17 00:00:00 2001
From: yaoyiz <yizhi.yao@intel.com>
Date: Wed, 2 Nov 2022 18:31:12 +0000
Subject: [PATCH 2/3] 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 66dd2549c..d8eaa5003 100644
--- a/OpenAPI/TS28104_MdaNrm.yaml
+++ b/OpenAPI/TS28104_MdaNrm.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: MDA NRM
-  version: 17.0.0
+  version: 17.2.0
   description: >-
     OAS 3.0.1 specification of the MDA NRM
     © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
-- 
GitLab


From cbbf648466c29229688b1031291dd2811c6008b5 Mon Sep 17 00:00:00 2001
From: yaoyiz <yizhi.yao@intel.com>
Date: Wed, 2 Nov 2022 18:32:55 +0000
Subject: [PATCH 3/3] Update TS28104_MdaReport.yaml

---
 OpenAPI/TS28104_MdaReport.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml
index 3f8dcf237..8e0f871b2 100644
--- a/OpenAPI/TS28104_MdaReport.yaml
+++ b/OpenAPI/TS28104_MdaReport.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: MDA Report
-  version: 17.0.0
+  version: 17.2.0
   description: >-
     OAS 3.0.1 specification of the MDA Report
     © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -43,9 +43,9 @@ components:
     TimeWindow:
       type: object
       properties:
-        startTime:
+        mDAOutputStartTime:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
-        endTime:
+        mDAOutputEndTime:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
 
 
-- 
GitLab