From abcb1375d66da08a447b9cd572959726a2a529ad Mon Sep 17 00:00:00 2001
From: featherstone <walter.featherstone@viavisolutions.com>
Date: Tue, 13 Feb 2018 16:58:59 +0000
Subject: [PATCH] =?UTF-8?q?Removed=20extra=20space=20in=20MEAS=5FREPORT=5F?=
 =?UTF-8?q?UE=20and=20implemented=20MEC(17)000475=20regarding=20ErabQosPar?=
 =?UTF-8?q?ameters,=20since=20nesting=20a=20structure=20under=20an=20integ?=
 =?UTF-8?q?er=20doesn=E2=80=99t=20work?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ic5ec23e3d58851fb690c5f7fe8b85773e2237908
Signed-off-by: featherstone <walter.featherstone@viavisolutions.com>
---
 RniAPI.json | 24 +++++++++---------------
 RniAPI.yaml | 12 ++++++------
 2 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/RniAPI.json b/RniAPI.json
index 62eb432..b724d61 100644
--- a/RniAPI.json
+++ b/RniAPI.json
@@ -2185,11 +2185,11 @@
                     "susbcription": [
                       {
                         "href": "http://meAppClient.example.com/rni/v1/notifications/ta/77777",
-                        "subscriptionType": "MEAS_ REPORT_UE"
+                        "subscriptionType": "MEAS_REPORT_UE"
                       },
                       {
                         "href": "http://meAppClient.example.com/rni/v1/notifications/ta/77778",
-                        "subscriptionType": "MEAS_ REPORT_UE"
+                        "subscriptionType": "MEAS_REPORT_UE"
                       }
                     ]
                   }
@@ -2759,11 +2759,11 @@
                     "susbcription": [
                       {
                         "href": "http://meAppClient.example.com/rni/v1/notifications/meas_rep_ue/77777",
-                        "subscriptionType": "MEAS_ REPORT_UE"
+                        "subscriptionType": "MEAS_REPORT_UE"
                       },
                       {
                         "href": "http://meAppClient.example.com/rni/v1/notifications/meas_rep_ue/77778",
-                        "subscriptionType": "MEAS_ REPORT_UE"
+                        "subscriptionType": "MEAS_REPORT_UE"
                       }
                     ]
                   }
@@ -5973,7 +5973,10 @@
       "type": "object",
       "properties": {
         "qci": {
-          "$ref": "#/definitions/ErabQosParameters_qci"
+          "$ref": "#/definitions/Qci"
+        },
+        "qci_information": {
+          "$ref": "#/definitions/QosInformation"
         }
       }
     },
@@ -6407,7 +6410,7 @@
         "RAB_ESTABLISHMENT",
         "RAB_MODIFICATION",
         "RAB_RELEASE",
-        "MEAS_ REPORT_UE",
+        "MEAS_REPORT_UE",
         "MEAS_TIMING_ADVANCE",
         "CA_RECONF",
         "S1_BEARE"
@@ -6560,15 +6563,6 @@
         "EVENT_W3"
       ],
       "example": "EVENT_A3"
-    },
-    "ErabQosParameters_qci": {
-      "type": "object",
-      "properties": {
-        "qosInformation": {
-          "$ref": "#/definitions/QosInformation"
-        }
-      },
-      "description": "QoS Class Identifier as defined in TS 23.401"
     }
   }
 }
\ No newline at end of file
diff --git a/RniAPI.yaml b/RniAPI.yaml
index af3098d..5f2cfe6 100644
--- a/RniAPI.yaml
+++ b/RniAPI.yaml
@@ -1523,10 +1523,10 @@ paths:
                   subscription:
                     - href: >-
                         http://meAppClient.example.com/rni/v1/notifications/ta/77777
-                      subscriptionType: MEAS_ REPORT_UE
+                      subscriptionType: MEAS_REPORT_UE
                     - href: >-
                         http://meAppClient.example.com/rni/v1/notifications/ta/77778
-                      subscriptionType: MEAS_ REPORT_UE
+                      subscriptionType: MEAS_REPORT_UE
         '400':
           description: Bad Request
           schema:
@@ -1911,10 +1911,10 @@ paths:
                   subscription:
                     - href: >-
                         http://meAppClient.example.com/rni/v1/notifications/meas_rep_ue/77777
-                      subscriptionType: MEAS_ REPORT_UE
+                      subscriptionType: MEAS_REPORT_UE
                     - href: >-
                         http://meAppClient.example.com/rni/v1/notifications/meas_rep_ue/77778
-                      subscriptionType: MEAS_ REPORT_UE
+                      subscriptionType: MEAS_REPORT_UE
         '400':
           description: Bad Request
           schema:
@@ -4428,7 +4428,7 @@ definitions:
       - RAB_ESTABLISHMENT
       - RAB_MODIFICATION
       - RAB_RELEASE
-      - MEAS_ REPORT_UE
+      - MEAS_REPORT_UE
       - MEAS_TIMING_ADVANCE
       - CA_RECONF
       - S1_BEARE
@@ -4546,4 +4546,4 @@ definitions:
     properties:
       qosInformation:
         $ref: '#/definitions/QosInformation'
-    description: QoS Class Identifier as defined in TS 23.401
+    description: QoS Class Identifier as defined in TS 23.401
\ No newline at end of file
-- 
GitLab