[RIC-346] Refactor E2 Setup flow and update EnGnb xml

[ric-plt/e2mgr.git] / E2Manager / tests / resources / setupRequest_en-gNB.xml

diff --git a/E2Manager/tests/resources/setupRequest_en-gNB.xml b/E2Manager/tests/resources/setupRequest_en-gNB.xml
index b7b216a..8d49521 100644 (file)
--- a/E2Manager/tests/resources/setupRequest_en-gNB.xml
+++ b/E2Manager/tests/resources/setupRequest_en-gNB.xml
@@ -1,21 +1,25 @@
 <E2AP-PDU>\r
     <initiatingMessage>\r
         <procedureCode>1</procedureCode>\r
-        <criticality><reject/></criticality>\r
+        <criticality>\r
+            <reject/>\r
+        </criticality>\r
         <value>\r
             <E2setupRequest>\r
                 <protocolIEs>\r
                     <E2setupRequestIEs>\r
                         <id>3</id>\r
-                        <criticality><reject/></criticality>\r
+                        <criticality>\r
+                            <reject/>\r
+                        </criticality>\r
                         <value>\r
                             <GlobalE2node-ID>\r
                                 <en-gNB>\r
                                     <global-gNB-ID>\r
-                                        <plmn-id>13 10 14</plmn-id>\r
-                                        <gnb-id>\r
-                                            <gnb-ID>10011001101010101011</gnb-ID>\r
-                                        </gnb-id>\r
+                                        <pLMN-Identity>13 10 14</pLMN-Identity>\r
+                                        <gNB-ID>\r
+                                            <gNB-ID>11000101110001101100011111111000</gNB-ID>\r
+                                        </gNB-ID>\r
                                     </global-gNB-ID>\r
                                 </en-gNB>\r
                             </GlobalE2node-ID>\r
@@ -23,12 +27,16 @@
                     </E2setupRequestIEs>\r
                     <E2setupRequestIEs>\r
                         <id>10</id>\r
-                        <criticality><reject/></criticality>\r
+                        <criticality>\r
+                            <reject/>\r
+                        </criticality>\r
                         <value>\r
                             <RANfunctions-List>\r
                                 <ProtocolIE-SingleContainer>\r
                                     <id>8</id>\r
-                                    <criticality><reject/></criticality>\r
+                                    <criticality>\r
+                                        <reject/>\r
+                                    </criticality>\r
                                     <value>\r
                                         <RANfunction-Item>\r
                                             <ranFunctionID>1</ranFunctionID>\r
@@ -39,7 +47,9 @@
                                 </ProtocolIE-SingleContainer>\r
                                 <ProtocolIE-SingleContainer>\r
                                     <id>8</id>\r
-                                    <criticality><reject/></criticality>\r
+                                    <criticality>\r
+                                        <reject/>\r
+                                    </criticality>\r
                                     <value>\r
                                         <RANfunction-Item>\r
                                             <ranFunctionID>7</ranFunctionID>\r